diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileActivity.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileActivity.java
index 9eb3ef2bd4..59a3da55b1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileActivity.java
@@ -13,7 +13,6 @@ import androidx.navigation.fragment.NavHostFragment;
 
 import org.thoughtcrime.securesms.PassphraseRequiredActivity;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.reactions.any.ReactWithAnyEmojiBottomSheetDialogFragment;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
@@ -64,13 +63,8 @@ public class EditProfileActivity extends PassphraseRequiredActivity implements R
       navController.setGraph(graph, extras != null ? extras : new Bundle());
 
       if (extras != null && extras.getBoolean(START_AT_USERNAME, false)) {
-        if (SignalStore.uiHints().hasSeenUsernameEducation()) {
-          NavDirections action = EditProfileFragmentDirections.actionManageUsername();
-          SafeNavigation.safeNavigate(navController, action);
-        } else {
-          NavDirections action = EditProfileFragmentDirections.actionManageProfileFragmentToUsernameEducationFragment();
-          SafeNavigation.safeNavigate(navController, action);
-        }
+        NavDirections action = EditProfileFragmentDirections.actionManageUsername();
+        SafeNavigation.safeNavigate(navController, action);
       }
 
       if (extras != null && extras.getBoolean(START_AT_AVATAR, false)) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt
index 4ad391ec88..0d376f9b15 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt
@@ -42,7 +42,6 @@ import org.thoughtcrime.securesms.util.NameUtil.getAbbreviation
 import org.thoughtcrime.securesms.util.livedata.LiveDataUtil
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog
-import org.thoughtcrime.securesms.util.visible
 import java.util.Arrays
 import java.util.Optional
 
@@ -81,22 +80,18 @@ class EditProfileFragment : LoggingFragment() {
     binding.manageProfileNameContainer.setOnClickListener { v: View -> findNavController(v).safeNavigate(EditProfileFragmentDirections.actionManageProfileName()) }
 
     binding.manageProfileUsernameContainer.setOnClickListener { v: View ->
-      if (SignalStore.uiHints().hasSeenUsernameEducation() || SignalStore.account().username != null) {
-        if (SignalStore.account().username != null) {
-          MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Signal_MaterialAlertDialog_List)
-            .setItems(R.array.username_edit_entries) { _: DialogInterface?, w: Int ->
-              when (w) {
-                0 -> findNavController(v).safeNavigate(EditProfileFragmentDirections.actionManageUsername())
-                1 -> displayConfirmUsernameDeletionDialog()
-                else -> throw IllegalStateException()
-              }
+      if (SignalStore.account().username != null) {
+        MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Signal_MaterialAlertDialog_List)
+          .setItems(R.array.username_edit_entries) { _: DialogInterface?, w: Int ->
+            when (w) {
+              0 -> findNavController(v).safeNavigate(EditProfileFragmentDirections.actionManageUsername())
+              1 -> displayConfirmUsernameDeletionDialog()
+              else -> throw IllegalStateException()
             }
-            .show()
-        } else {
-          findNavController(v).safeNavigate(EditProfileFragmentDirections.actionManageUsername())
-        }
+          }
+          .show()
       } else {
-        findNavController(v).safeNavigate(EditProfileFragmentDirections.actionManageProfileFragmentToUsernameEducationFragment())
+        findNavController(v).safeNavigate(EditProfileFragmentDirections.actionManageUsername())
       }
     }
 
@@ -322,6 +317,7 @@ class EditProfileFragment : LoggingFragment() {
         Snackbar.make(requireView(), R.string.ManageProfileFragment__username_deleted, Snackbar.LENGTH_SHORT).show()
         binding.usernameLinkContainer.visibility = View.GONE
       }
+
       UsernameDeleteResult.NETWORK_ERROR -> Snackbar.make(requireView(), R.string.ManageProfileFragment__couldnt_delete_username, Snackbar.LENGTH_SHORT).show()
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameEducationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameEducationFragment.kt
deleted file mode 100644
index 8b784f91ea..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameEducationFragment.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.thoughtcrime.securesms.profiles.manage
-
-import android.os.Bundle
-import android.view.View
-import androidx.fragment.app.Fragment
-import androidx.navigation.fragment.findNavController
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.components.ViewBinderDelegate
-import org.thoughtcrime.securesms.databinding.UsernameEducationFragmentBinding
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.megaphone.Megaphones
-import org.thoughtcrime.securesms.util.CommunicationActions
-import org.thoughtcrime.securesms.util.navigation.safeNavigate
-
-/**
- * Displays a Username education screen which displays some basic information
- * about usernames and provides a learn-more link.
- */
-class UsernameEducationFragment : Fragment(R.layout.username_education_fragment) {
-  private val binding by ViewBinderDelegate(UsernameEducationFragmentBinding::bind)
-
-  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    binding.toolbar.setNavigationOnClickListener {
-      findNavController().popBackStack()
-    }
-
-    binding.usernameEducationLearnMore.setOnClickListener {
-      CommunicationActions.openBrowserLink(requireContext(), getString(R.string.username_support_url))
-    }
-
-    binding.continueButton.setOnClickListener {
-      SignalStore.uiHints().markHasSeenUsernameEducation()
-      ApplicationDependencies.getMegaphoneRepository().markFinished(Megaphones.Event.SET_UP_YOUR_USERNAME)
-      findNavController().safeNavigate(UsernameEducationFragmentDirections.actionUsernameEducationFragmentToUsernameManageFragment())
-    }
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/username/NewWaysToConnectDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/profiles/username/NewWaysToConnectDialogFragment.kt
index ee5ed6c157..5dd3c2ff6d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/username/NewWaysToConnectDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/username/NewWaysToConnectDialogFragment.kt
@@ -5,6 +5,7 @@
 
 package org.thoughtcrime.securesms.profiles.username
 
+import android.content.res.Configuration
 import android.os.Bundle
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Column
diff --git a/app/src/main/res/drawable/link_color_48.xml b/app/src/main/res/drawable/link_color_48.xml
deleted file mode 100644
index 0d36036d7d..0000000000
--- a/app/src/main/res/drawable/link_color_48.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48">
-  <group>
-    <clip-path
-        android:pathData="M0,48l0,-48l48,0"/>
-    <group>
-      <clip-path
-          android:pathData="M17.49,18.018h29v30h-29zM 0,0m37.869,35.442c-0.387,-0.395 -0.387,-1.035 0,-1.43l3.27,-3.338c1.935,-1.975 1.935,-5.177 0,-7.152 -1.935,-1.975 -5.071,-1.975 -7.006,0l-3.27,3.338c-0.387,0.395 -1.014,0.395 -1.401,0 -0.387,-0.395 -0.387,-1.035 0,-1.43l3.269,-3.338c2.709,-2.765 7.1,-2.765 9.809,0 2.709,2.765 2.709,7.248 0,10.013l-3.27,3.338c-0.387,0.395 -1.014,0.395 -1.401,0ZM26.193,30.198c0.387,0.395 0.387,1.035 0,1.43l-3.27,3.338c-1.935,1.975 -1.935,5.177 0,7.152 1.935,1.975 5.072,1.975 7.006,0l3.27,-3.338c0.387,-0.395 1.014,-0.395 1.401,0 0.387,0.395 0.387,1.035 0,1.431l-3.27,3.338c-2.709,2.765 -7.1,2.765 -9.809,0 -2.709,-2.765 -2.709,-7.248 0,-10.013l3.27,-3.338c0.387,-0.395 1.014,-0.395 1.401,0ZM35.534,30.675c0.387,-0.395 0.387,-1.035 0,-1.431 -0.387,-0.395 -1.014,-0.395 -1.401,0l-5.605,5.722c-0.387,0.395 -0.387,1.035 0,1.43s1.014,0.395 1.401,0l5.605,-5.722Z"/>
-      <path
-          android:pathData="m34.132,23.522l-1.143,-1.12h0l1.143,1.12ZM30.862,26.86l-1.143,-1.12h0l1.143,1.12ZM29.461,25.43l1.143,1.12h0l-1.143,-1.12ZM32.73,22.092l1.143,1.12h0l-1.143,-1.12ZM26.192,31.629l-1.143,-1.12h0l1.143,1.12ZM26.192,30.199l1.143,-1.12h0l-1.143,1.12ZM21.779,33.847h0m-0.258,-0.311l-1.143,-1.12 1.143,1.12ZM24.791,30.198l-1.143,-1.12h0l1.143,1.12ZM35.534,29.244 L35.534,30.675 34.133,29.244l1.143,1.12h0l-1.143,-1.12ZM28.786,33.846h0m5.605,-11.444l2.286,2.239m-3.27,3.338l3.27,-3.338 -2.286,-2.239 -3.27,3.338 2.286,2.239ZM29.72,27.979c1.014,1.035 2.673,1.036 3.687,0l-2.286,-2.239c0.24,-0.245 0.644,-0.245 0.885,0l-2.286,2.239ZM29.72,24.309c-0.996,1.017 -0.996,2.653 0,3.67l2.286,-2.239c0.222,0.227 0.222,0.582 0,0.809l-2.286,-2.239ZM32.989,20.971l-3.269,3.338 2.286,2.239 3.27,-3.338 -2.286,-2.239ZM32.989,20.971l2.286,2.239m-6.539,9.537c0.996,-1.017 0.996,-2.653 0,-3.67l-2.286,2.239c-0.222,-0.227 -0.222,-0.582 0,-0.809l2.286,2.239ZM28.736,32.747l-2.286,-2.239 -3.27,3.338m0,0 l-1.401,-1.43 5.556,-1.098l-2.286,-2.239 -3.269,3.338m6.957,-3.338c-1.014,-1.035 -2.673,-1.035 -3.687,0l2.286,2.239c-0.24,0.246 -0.644,0.246 -0.885,0l2.286,-2.239ZM35.793,30.365c-0.222,-0.227 -0.222,-0.582 0,-0.809m-1.401,-1.43l2.286,2.239c-0.24,0.245 -0.644,0.245 -0.885,0m0.885,0l-2.286,-2.239 -5.605,5.722m0,0 l7.006,-4.291"
-          android:fillColor="#647392"/>
-    </group>
-    <path
-        android:pathData="m2.781,6.581c0,-1.68 0,-2.52 0.327,-3.162 0.288,-0.564 0.747,-1.023 1.311,-1.311 0.642,-0.327 1.482,-0.327 3.162,-0.327h0.712c1.68,0 2.52,0 3.162,0.327 0.564,0.288 1.023,0.747 1.311,1.311 0.327,0.642 0.327,1.482 0.327,3.162v0.712c0,1.68 0,2.52 -0.327,3.162 -0.288,0.564 -0.747,1.023 -1.311,1.311 -0.642,0.327 -1.482,0.327 -3.162,0.327h-0.712c-1.68,0 -2.52,0 -3.162,-0.327 -0.564,-0.288 -1.023,-0.747 -1.311,-1.311 -0.327,-0.642 -0.327,-1.482 -0.327,-3.162v-0.712Z"
-        android:fillColor="#c2e0f0"/>
-    <path
-        android:pathData="m7.544,0.906h0.786c0.809,0 1.469,0 2.005,0.044 0.554,0.045 1.053,0.142 1.518,0.379 0.729,0.372 1.322,0.964 1.693,1.693 0.237,0.465 0.333,0.963 0.379,1.518 0.044,0.536 0.044,1.196 0.044,2.005v0.786c0,0.809 0,1.469 -0.044,2.005 -0.045,0.554 -0.142,1.053 -0.379,1.518 -0.372,0.729 -0.964,1.322 -1.693,1.693 -0.465,0.237 -0.963,0.333 -1.518,0.379 -0.536,0.044 -1.196,0.044 -2.005,0.044h-0.786c-0.809,0 -1.469,0 -2.005,-0.044 -0.554,-0.045 -1.053,-0.142 -1.518,-0.379 -0.729,-0.372 -1.322,-0.964 -1.693,-1.693 -0.237,-0.465 -0.333,-0.963 -0.379,-1.518 -0.044,-0.536 -0.044,-1.196 -0.044,-2.005v-0.786c0,-0.809 0,-1.469 0.044,-2.005 0.045,-0.554 0.142,-1.053 0.379,-1.518 0.372,-0.729 0.964,-1.322 1.693,-1.693 0.465,-0.237 0.963,-0.333 1.518,-0.379 0.536,-0.044 1.196,-0.044 2.005,-0.044ZM5.682,2.694c-0.446,0.036 -0.689,0.103 -0.866,0.194 -0.4,0.204 -0.725,0.529 -0.929,0.929 -0.09,0.177 -0.157,0.419 -0.194,0.866 -0.037,0.456 -0.038,1.045 -0.038,1.899v0.712c0,0.855 0,1.443 0.038,1.899 0.036,0.446 0.103,0.689 0.194,0.866 0.204,0.4 0.529,0.725 0.929,0.929 0.177,0.09 0.419,0.157 0.866,0.194 0.456,0.037 1.045,0.038 1.899,0.038h0.712c0.855,0 1.443,0 1.899,-0.038 0.446,-0.036 0.689,-0.104 0.866,-0.194 0.4,-0.204 0.725,-0.529 0.929,-0.929 0.09,-0.177 0.157,-0.419 0.194,-0.866 0.037,-0.456 0.038,-1.045 0.038,-1.899v-0.712c0,-0.855 0,-1.443 -0.038,-1.899 -0.036,-0.446 -0.104,-0.689 -0.194,-0.866 -0.204,-0.4 -0.529,-0.725 -0.929,-0.929 -0.177,-0.09 -0.42,-0.157 -0.866,-0.194 -0.456,-0.037 -1.045,-0.038 -1.899,-0.038h-0.712c-0.855,0 -1.443,0 -1.899,0.038Z"
-        android:fillColor="#628192"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="m2.781,21.706c0,-1.68 0,-2.52 0.327,-3.162 0.288,-0.565 0.747,-1.023 1.311,-1.311 0.642,-0.327 1.482,-0.327 3.162,-0.327h0.712c1.68,0 2.52,0 3.162,0.327 0.564,0.288 1.023,0.747 1.311,1.311 0.327,0.642 0.327,1.482 0.327,3.162v0.712c0,1.68 0,2.52 -0.327,3.162 -0.288,0.565 -0.747,1.023 -1.311,1.311 -0.642,0.327 -1.482,0.327 -3.162,0.327h-0.712c-1.68,0 -2.52,0 -3.162,-0.327 -0.564,-0.288 -1.023,-0.747 -1.311,-1.311 -0.327,-0.642 -0.327,-1.482 -0.327,-3.162v-0.712Z"
-        android:fillColor="#c2e0f0"/>
-    <path
-        android:pathData="m7.544,16.031h0.786c0.809,0 1.469,0 2.005,0.044 0.554,0.045 1.053,0.142 1.518,0.379 0.729,0.372 1.322,0.964 1.693,1.693 0.237,0.465 0.333,0.963 0.379,1.518 0.044,0.536 0.044,1.196 0.044,2.005v0.786c0,0.809 0,1.469 -0.044,2.005 -0.045,0.554 -0.142,1.053 -0.379,1.518 -0.372,0.729 -0.964,1.322 -1.693,1.693 -0.465,0.237 -0.963,0.333 -1.518,0.379 -0.536,0.044 -1.196,0.044 -2.005,0.044h-0.786c-0.809,0 -1.469,0 -2.005,-0.044 -0.554,-0.045 -1.053,-0.142 -1.518,-0.379 -0.729,-0.372 -1.322,-0.964 -1.693,-1.693 -0.237,-0.465 -0.333,-0.963 -0.379,-1.518 -0.044,-0.536 -0.044,-1.196 -0.044,-2.005v-0.786c0,-0.809 0,-1.469 0.044,-2.005 0.045,-0.554 0.142,-1.053 0.379,-1.518 0.372,-0.729 0.964,-1.322 1.693,-1.693 0.465,-0.237 0.963,-0.333 1.518,-0.379 0.536,-0.044 1.196,-0.044 2.005,-0.044ZM5.682,17.819c-0.446,0.036 -0.689,0.104 -0.866,0.194 -0.4,0.204 -0.725,0.529 -0.929,0.929 -0.09,0.177 -0.157,0.42 -0.194,0.866 -0.037,0.456 -0.038,1.045 -0.038,1.899v0.712c0,0.854 0,1.443 0.038,1.899 0.036,0.446 0.103,0.689 0.194,0.866 0.204,0.4 0.529,0.725 0.929,0.929 0.177,0.09 0.419,0.157 0.866,0.194 0.456,0.037 1.045,0.038 1.899,0.038h0.712c0.855,0 1.443,0 1.899,-0.038 0.446,-0.036 0.689,-0.104 0.866,-0.194 0.4,-0.204 0.725,-0.529 0.929,-0.929 0.09,-0.177 0.157,-0.42 0.194,-0.866 0.037,-0.456 0.038,-1.045 0.038,-1.899v-0.712c0,-0.855 0,-1.443 -0.038,-1.899 -0.036,-0.446 -0.104,-0.689 -0.194,-0.866 -0.204,-0.4 -0.529,-0.725 -0.929,-0.929 -0.177,-0.09 -0.42,-0.157 -0.866,-0.194 -0.456,-0.037 -1.045,-0.038 -1.899,-0.038h-0.712c-0.855,0 -1.443,0 -1.899,0.038Z"
-        android:fillColor="#628192"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="m17.906,6.581c0,-1.68 0,-2.52 0.327,-3.162 0.288,-0.564 0.747,-1.023 1.311,-1.311 0.642,-0.327 1.482,-0.327 3.162,-0.327h0.712c1.68,0 2.52,0 3.162,0.327 0.565,0.288 1.023,0.747 1.311,1.311 0.327,0.642 0.327,1.482 0.327,3.162v0.712c0,1.68 0,2.52 -0.327,3.162 -0.288,0.564 -0.747,1.023 -1.311,1.311 -0.642,0.327 -1.482,0.327 -3.162,0.327h-0.712c-1.68,0 -2.52,0 -3.162,-0.327 -0.565,-0.288 -1.023,-0.747 -1.311,-1.311 -0.327,-0.642 -0.327,-1.482 -0.327,-3.162v-0.712Z"
-        android:fillColor="#c2e0f0"/>
-    <path
-        android:pathData="m22.67,0.906h0.786c0.809,0 1.469,0 2.005,0.044 0.554,0.045 1.053,0.142 1.518,0.379 0.729,0.372 1.322,0.964 1.693,1.693 0.237,0.465 0.333,0.963 0.379,1.518 0.044,0.536 0.044,1.196 0.044,2.005v0.786c0,0.809 0,1.469 -0.044,2.005 -0.045,0.554 -0.142,1.053 -0.379,1.518 -0.372,0.729 -0.964,1.322 -1.693,1.693 -0.465,0.237 -0.963,0.333 -1.518,0.379 -0.536,0.044 -1.196,0.044 -2.005,0.044h-0.786c-0.809,0 -1.469,0 -2.005,-0.044 -0.554,-0.045 -1.053,-0.142 -1.518,-0.379 -0.729,-0.372 -1.322,-0.964 -1.693,-1.693 -0.237,-0.465 -0.333,-0.963 -0.379,-1.518 -0.044,-0.536 -0.044,-1.196 -0.044,-2.005v-0.786c0,-0.809 0,-1.469 0.044,-2.005 0.045,-0.554 0.142,-1.053 0.379,-1.518 0.372,-0.729 0.964,-1.322 1.693,-1.693 0.465,-0.237 0.963,-0.333 1.518,-0.379 0.536,-0.044 1.196,-0.044 2.005,-0.044ZM20.808,2.694c-0.446,0.036 -0.689,0.103 -0.866,0.194 -0.4,0.204 -0.725,0.529 -0.929,0.929 -0.09,0.177 -0.157,0.419 -0.194,0.866 -0.037,0.456 -0.038,1.045 -0.038,1.899v0.712c0,0.855 0,1.443 0.038,1.899 0.036,0.446 0.104,0.689 0.194,0.866 0.204,0.4 0.529,0.725 0.929,0.929 0.177,0.09 0.42,0.157 0.866,0.194 0.456,0.037 1.045,0.038 1.899,0.038h0.712c0.854,0 1.443,0 1.899,-0.038 0.446,-0.036 0.689,-0.104 0.866,-0.194 0.4,-0.204 0.725,-0.529 0.929,-0.929 0.09,-0.177 0.157,-0.419 0.194,-0.866 0.037,-0.456 0.038,-1.045 0.038,-1.899v-0.712c0,-0.855 0,-1.443 -0.038,-1.899 -0.036,-0.446 -0.104,-0.689 -0.194,-0.866 -0.204,-0.4 -0.529,-0.725 -0.929,-0.929 -0.177,-0.09 -0.42,-0.157 -0.866,-0.194 -0.456,-0.037 -1.045,-0.038 -1.899,-0.038h-0.712c-0.855,0 -1.443,0 -1.899,0.038Z"
-        android:fillColor="#628192"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="m18.25,17.75c0,-0.276 0.224,-0.5 0.5,-0.5h1.062c0.276,0 0.5,0.224 0.5,0.5v1.062c0,0.276 -0.224,0.5 -0.5,0.5h-1.062c-0.276,0 -0.5,-0.224 -0.5,-0.5v-1.062Z"
-        android:fillColor="#628192"/>
-    <path
-        android:pathData="m17.75,17.75c0,-0.552 0.448,-1 1,-1h1.062c0.552,0 1,0.448 1,1v1.062c0,0.552 -0.448,1 -1,1h-1.062c-0.552,0 -1,-0.448 -1,-1v-1.062ZM19.812,17.75h-1.062v1.062h1.062v-1.062Z"
-        android:fillColor="#628192"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="m22.031,21.531c0,-0.276 0.224,-0.5 0.5,-0.5h1.063c0.276,0 0.5,0.224 0.5,0.5v1.063c0,0.276 -0.224,0.5 -0.5,0.5h-1.063c-0.276,0 -0.5,-0.224 -0.5,-0.5v-1.063Z"
-        android:fillColor="#628192"/>
-    <path
-        android:pathData="m21.531,21.531c0,-0.552 0.448,-1 1,-1h1.063c0.552,0 1,0.448 1,1v1.063c0,0.552 -0.448,1 -1,1h-1.063c-0.552,0 -1,-0.448 -1,-1v-1.063ZM23.594,21.531h-1.063v1.063h1.063v-1.063Z"
-        android:fillColor="#628192"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="m6.906,21.531c0,-0.276 0.224,-0.5 0.5,-0.5h1.062c0.276,0 0.5,0.224 0.5,0.5v1.063c0,0.276 -0.224,0.5 -0.5,0.5h-1.062c-0.276,0 -0.5,-0.224 -0.5,-0.5v-1.063Z"
-        android:fillColor="#628192"/>
-    <path
-        android:pathData="m5.906,21.531c0,-0.828 0.672,-1.5 1.5,-1.5h1.062c0.828,0 1.5,0.672 1.5,1.5v1.063c0,0.828 -0.672,1.5 -1.5,1.5h-1.062c-0.828,0 -1.5,-0.672 -1.5,-1.5v-1.063ZM7.906,22.031v0.063h0.062v-0.063h-0.062Z"
-        android:fillColor="#628192"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="m6.906,6.406c0,-0.276 0.224,-0.5 0.5,-0.5h1.062c0.276,0 0.5,0.224 0.5,0.5v1.062c0,0.276 -0.224,0.5 -0.5,0.5h-1.062c-0.276,0 -0.5,-0.224 -0.5,-0.5v-1.062Z"
-        android:fillColor="#628192"/>
-    <path
-        android:pathData="m5.906,6.406c0,-0.828 0.672,-1.5 1.5,-1.5h1.062c0.828,0 1.5,0.672 1.5,1.5v1.062c0,0.828 -0.672,1.5 -1.5,1.5h-1.062c-0.828,0 -1.5,-0.672 -1.5,-1.5v-1.062ZM7.906,6.906v0.062h0.062v-0.062h-0.062Z"
-        android:fillColor="#628192"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="m22.031,6.406c0,-0.276 0.224,-0.5 0.5,-0.5h1.063c0.276,0 0.5,0.224 0.5,0.5v1.062c0,0.276 -0.224,0.5 -0.5,0.5h-1.063c-0.276,0 -0.5,-0.224 -0.5,-0.5v-1.062Z"
-        android:fillColor="#628192"/>
-    <path
-        android:pathData="m21.031,6.406c0,-0.828 0.672,-1.5 1.5,-1.5h1.063c0.828,0 1.5,0.672 1.5,1.5v1.062c0,0.828 -0.672,1.5 -1.5,1.5h-1.063c-0.828,0 -1.5,-0.672 -1.5,-1.5v-1.062ZM23.031,6.906v0.062h0.063v-0.062h-0.063Z"
-        android:fillColor="#628192"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="m25.812,17.75c0,-0.276 0.224,-0.5 0.5,-0.5h1.062c0.276,0 0.5,0.224 0.5,0.5v1.062c0,0.276 -0.224,0.5 -0.5,0.5h-1.062c-0.276,0 -0.5,-0.224 -0.5,-0.5v-1.062Z"
-        android:fillColor="#628192"/>
-    <path
-        android:pathData="m25.312,17.75c0,-0.552 0.448,-1 1,-1h1.062c0.552,0 1,0.448 1,1v1.062c0,0.552 -0.448,1 -1,1h-1.062c-0.552,0 -1,-0.448 -1,-1v-1.062ZM27.374,17.75h-1.062v1.062h1.062v-1.062Z"
-        android:fillColor="#628192"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="m18.25,25.312c0,-0.276 0.224,-0.5 0.5,-0.5h1.062c0.276,0 0.5,0.224 0.5,0.5v1.062c0,0.276 -0.224,0.5 -0.5,0.5h-1.062c-0.276,0 -0.5,-0.224 -0.5,-0.5v-1.062Z"
-        android:fillColor="#628192"/>
-    <path
-        android:pathData="m17.75,25.312c0,-0.552 0.448,-1 1,-1h1.062c0.552,0 1,0.448 1,1v1.062c0,0.552 -0.448,1 -1,1h-1.062c-0.552,0 -1,-0.448 -1,-1v-1.062ZM19.812,25.312h-1.062v1.062h1.062v-1.062Z"
-        android:fillColor="#628192"
-        android:fillType="evenOdd"/>
-  </group>
-  <path
-      android:pathData="m26.361,46.44c-2.07,0 -4.015,-0.821 -5.477,-2.314 -3.006,-3.068 -3.006,-8.062 0,-11.132l3.27,-3.338c0.339,-0.346 0.791,-0.536 1.272,-0.536s0.933,0.19 1.271,0.536c0.69,0.704 0.689,1.849 0,2.551l-3.268,3.337c-1.629,1.663 -1.629,4.369 0,6.033 0.784,0.8 1.825,1.24 2.932,1.24s2.147,-0.44 2.932,-1.24l3.27,-3.338c0.338,-0.347 0.79,-0.537 1.271,-0.537s0.934,0.19 1.272,0.537c0.688,0.702 0.688,1.846 0,2.55l-3.271,3.337c-1.462,1.493 -3.406,2.314 -5.476,2.314ZM29.163,37.51c-0.481,0 -0.933,-0.19 -1.271,-0.536 -0.69,-0.704 -0.689,-1.849 0,-2.551l5.604,-5.721c0.338,-0.347 0.79,-0.537 1.272,-0.537s0.934,0.19 1.272,0.537c0.688,0.702 0.688,1.846 0,2.55l-5.605,5.722c-0.34,0.347 -0.791,0.536 -1.272,0.536ZM38.504,36.556c-0.481,0 -0.933,-0.19 -1.271,-0.536 -0.688,-0.704 -0.688,-1.848 0,-2.55l3.27,-3.338c1.629,-1.663 1.629,-4.369 0,-6.033 -0.784,-0.8 -1.825,-1.241 -2.932,-1.241s-2.147,0.44 -2.932,1.241l-3.27,3.337c-0.339,0.347 -0.791,0.537 -1.272,0.537s-0.934,-0.19 -1.272,-0.537c-0.688,-0.702 -0.688,-1.846 0,-2.549l3.271,-3.338c1.461,-1.492 3.406,-2.313 5.476,-2.313s4.014,0.822 5.476,2.313c3.007,3.07 3.007,8.064 0,11.133l-3.27,3.338c-0.339,0.346 -0.79,0.536 -1.272,0.536Z"
-      android:fillColor="#dce1f9"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="m37.57,20.036c1.775,0 3.55,0.691 4.904,2.074 2.708,2.765 2.708,7.248 0,10.013l-3.27,3.338c-0.193,0.198 -0.447,0.296 -0.701,0.296s-0.507,-0.099 -0.701,-0.296c-0.387,-0.395 -0.387,-1.035 0,-1.431l3.27,-3.338c1.935,-1.975 1.935,-5.177 0,-7.152 -0.967,-0.988 -2.235,-1.481 -3.503,-1.481 -1.268,0 -2.536,0.494 -3.503,1.481l-3.27,3.338c-0.193,0.198 -0.447,0.296 -0.701,0.296s-0.507,-0.099 -0.701,-0.296c-0.387,-0.395 -0.387,-1.035 0,-1.43l3.27,-3.338c1.354,-1.383 3.129,-2.074 4.904,-2.074m-2.802,8.93c0.254,0 0.507,0.099 0.701,0.296 0.387,0.395 0.387,1.035 0,1.43l-5.605,5.722c-0.193,0.198 -0.447,0.296 -0.701,0.296s-0.507,-0.099 -0.701,-0.296c-0.387,-0.395 -0.387,-1.035 0,-1.43l5.605,-5.722c0.193,-0.198 0.447,-0.296 0.701,-0.296m-9.341,0.954c0.254,0 0.507,0.099 0.701,0.296 0.387,0.395 0.387,1.036 0,1.431l-3.27,3.338c-1.935,1.975 -1.935,5.177 0,7.152 0.967,0.988 2.235,1.481 3.503,1.481s2.536,-0.494 3.503,-1.481l3.269,-3.338c0.193,-0.198 0.447,-0.296 0.701,-0.296s0.507,0.099 0.701,0.296c0.387,0.395 0.387,1.035 0,1.43l-3.27,3.338c-1.354,1.383 -3.129,2.074 -4.904,2.074s-3.55,-0.691 -4.904,-2.074c-2.709,-2.765 -2.709,-7.248 0,-10.013l3.27,-3.338c0.193,-0.197 0.447,-0.296 0.701,-0.296m12.143,-11.484c-2.286,0 -4.434,0.907 -6.047,2.554l-3.27,3.338c-0.991,1.012 -0.991,2.658 0,3.67 0.491,0.501 1.145,0.777 1.844,0.777s1.353,-0.276 1.844,-0.777l3.27,-3.338c0.632,-0.645 1.47,-1.001 2.36,-1.001s1.728,0.355 2.36,1.001c1.327,1.354 1.327,3.558 0,4.913l-3.269,3.338c-0.991,1.012 -0.991,2.658 0,3.67 0.491,0.501 1.145,0.777 1.844,0.777s1.353,-0.276 1.844,-0.777l3.27,-3.338c3.309,-3.378 3.309,-8.874 0,-12.252 -1.613,-1.647 -3.761,-2.554 -6.047,-2.554h0ZM34.767,27.366c-0.698,0 -1.353,0.276 -1.844,0.777l-5.605,5.722c-0.991,1.012 -0.991,2.658 0,3.67 0.491,0.501 1.145,0.777 1.844,0.777s1.353,-0.276 1.844,-0.777l5.605,-5.722c0.991,-1.012 0.991,-2.658 0,-3.67 -0.49,-0.501 -1.145,-0.777 -1.843,-0.777h0ZM25.426,28.32c-0.698,0 -1.353,0.276 -1.844,0.777l-3.27,3.338c-3.309,3.378 -3.309,8.874 0,12.252 1.613,1.647 3.761,2.554 6.047,2.554s4.434,-0.907 6.047,-2.554l3.269,-3.338c0.991,-1.012 0.991,-2.658 0,-3.67 -0.49,-0.501 -1.145,-0.776 -1.843,-0.776s-1.353,0.276 -1.844,0.777l-3.269,3.338c-0.632,0.645 -1.47,1.001 -2.36,1.001s-1.728,-0.355 -2.36,-1.001c-1.327,-1.354 -1.327,-3.558 0,-4.913l3.27,-3.338c0.991,-1.012 0.991,-2.658 0,-3.67 -0.491,-0.501 -1.145,-0.777 -1.844,-0.777h0Z"
-      android:fillColor="#647392"/>
-</vector>
diff --git a/app/src/main/res/drawable/lock_color_48.xml b/app/src/main/res/drawable/lock_color_48.xml
deleted file mode 100644
index 0dd82a324d..0000000000
--- a/app/src/main/res/drawable/lock_color_48.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48">
-  <path
-      android:pathData="m24,2c-6.075,0 -11,4.925 -11,11v16c0,6.075 4.925,11 11,11s11,-4.925 11,-11L35,13c0,-6.075 -4.925,-11 -11,-11ZM30.2,26.8c0,3.424 -2.776,6.2 -6.2,6.2s-6.2,-2.776 -6.2,-6.2v-13.6c0,-3.424 2.776,-6.2 6.2,-6.2s6.2,2.776 6.2,6.2v13.6Z"
-      android:fillColor="#ffe3a5"/>
-  <path
-      android:pathData="m24,41c-6.617,0 -12,-5.383 -12,-12L12,13c0,-6.617 5.383,-12 12,-12s12,5.383 12,12v16c0,6.617 -5.383,12 -12,12ZM24,3c-5.514,0 -10,4.486 -10,10v16c0,5.514 4.486,10 10,10s10,-4.486 10,-10L34,13c0,-5.514 -4.486,-10 -10,-10Z"
-      android:fillColor="#b3841c"/>
-  <path
-      android:pathData="m24,7h0c3.424,0 6.2,2.776 6.2,6.2v13.6c0,3.424 -2.776,6.2 -6.2,6.2h0c-3.424,0 -6.2,-2.776 -6.2,-6.2v-13.6c0,-3.424 2.776,-6.2 6.2,-6.2Z"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#b3841c"/>
-  <path
-      android:pathData="M14.541,20.239L33.668,20.239A4.323,4.323 0,0 1,37.991 24.562L37.991,39.693A4.323,4.323 0,0 1,33.668 44.016L14.541,44.016A4.323,4.323 0,0 1,10.218 39.693L10.218,24.562A4.323,4.323 0,0 1,14.541 20.239z"
-      android:fillColor="#ffe3a5"/>
-  <path
-      android:pathData="m33.668,45.016H14.541c-2.935,0 -5.323,-2.388 -5.323,-5.323v-15.13c0,-2.935 2.388,-5.323 5.323,-5.323h19.127c2.936,0 5.323,2.388 5.323,5.323v15.13c0,2.936 -2.388,5.323 -5.323,5.323ZM14.541,21.239c-1.833,0 -3.323,1.491 -3.323,3.323v15.13c0,1.832 1.491,3.323 3.323,3.323h19.127c1.832,0 3.323,-1.491 3.323,-3.323v-15.13c0,-1.833 -1.491,-3.323 -3.323,-3.323H14.541Z"
-      android:fillColor="#b3841c"/>
-  <path
-      android:pathData="m22.5,31.599c-0.897,-0.519 -1.5,-1.488 -1.5,-2.599 0,-1.657 1.343,-3 3,-3s3,1.343 3,3c0,1.11 -0.603,2.08 -1.5,2.599v3.151c0,0.828 -0.672,1.5 -1.5,1.5s-1.5,-0.672 -1.5,-1.5v-3.151Z"
-      android:fillColor="#b0831e"/>
-</vector>
diff --git a/app/src/main/res/drawable/number_color_48.xml b/app/src/main/res/drawable/number_color_48.xml
deleted file mode 100644
index 9ee7d9c842..0000000000
--- a/app/src/main/res/drawable/number_color_48.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48">
-  <path
-      android:pathData="M35.709,8.374C35.916,7.43 35.318,6.497 34.374,6.29C33.43,6.084 32.497,6.682 32.29,7.626L30.623,15.25L21.205,15.25L22.71,8.374C22.916,7.43 22.318,6.497 21.374,6.29C20.43,6.084 19.497,6.682 19.29,7.626L17.623,15.25H11C10.033,15.25 9.25,16.034 9.25,17C9.25,17.966 10.033,18.75 11,18.75H16.857L14.56,29.25H8C7.034,29.25 6.25,30.034 6.25,31C6.25,31.966 7.034,32.75 8,32.75H13.795L12.29,39.626C12.084,40.57 12.682,41.503 13.626,41.71C14.57,41.916 15.503,41.318 15.71,40.374L17.377,32.75H26.795L25.29,39.626C25.084,40.57 25.682,41.503 26.626,41.71C27.57,41.916 28.503,41.318 28.709,40.374L30.377,32.75H37C37.966,32.75 38.75,31.966 38.75,31C38.75,30.034 37.966,29.25 37,29.25H31.143L33.44,18.75H40C40.966,18.75 41.75,17.966 41.75,17C41.75,16.034 40.966,15.25 40,15.25H34.205L35.709,8.374ZM29.857,18.75H20.44L18.143,29.25H27.56L29.857,18.75Z"
-      android:fillColor="#CCD1FF"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M34.801,4.337C36.825,4.779 38.106,6.778 37.663,8.801L36.69,13.25H40C42.071,13.25 43.75,14.929 43.75,17C43.75,19.071 42.071,20.75 40,20.75H35.049L33.628,27.25H37C39.071,27.25 40.75,28.929 40.75,31C40.75,33.071 39.071,34.75 37,34.75H31.987L30.663,40.801C30.221,42.825 28.222,44.106 26.199,43.663C24.175,43.221 22.894,41.222 23.337,39.199L24.31,34.75H18.987L17.663,40.801C17.221,42.825 15.222,44.106 13.199,43.663C11.175,43.221 9.894,41.222 10.337,39.199L11.31,34.75H8C5.929,34.75 4.25,33.071 4.25,31C4.25,28.929 5.929,27.25 8,27.25H12.95L14.372,20.75H11C8.929,20.75 7.25,19.071 7.25,17C7.25,14.929 8.929,13.25 11,13.25H16.013L17.337,7.199C17.779,5.175 19.778,3.894 21.801,4.337C23.825,4.779 25.106,6.778 24.663,8.801L23.69,13.25L29.013,13.25L30.337,7.199C30.779,5.175 32.778,3.894 34.801,4.337ZM30.623,15.25L32.29,7.626C32.497,6.682 33.43,6.084 34.374,6.29C35.318,6.497 35.916,7.43 35.709,8.374L34.205,15.25H40C40.966,15.25 41.75,16.034 41.75,17C41.75,17.966 40.966,18.75 40,18.75H33.44L31.143,29.25H37C37.966,29.25 38.75,30.034 38.75,31C38.75,31.966 37.966,32.75 37,32.75H30.377L28.709,40.374C28.503,41.318 27.57,41.916 26.626,41.71C25.682,41.503 25.084,40.57 25.29,39.626L26.795,32.75H17.377L15.71,40.374C15.503,41.318 14.57,41.916 13.626,41.71C12.682,41.503 12.084,40.57 12.29,39.626L13.795,32.75H8C7.034,32.75 6.25,31.966 6.25,31C6.25,30.034 7.034,29.25 8,29.25H14.56L16.857,18.75H11C10.033,18.75 9.25,17.966 9.25,17C9.25,16.034 10.033,15.25 11,15.25H17.623L19.29,7.626C19.497,6.682 20.43,6.084 21.374,6.29C22.318,6.497 22.916,7.43 22.71,8.374L21.205,15.25L30.623,15.25ZM22.05,20.75L20.628,27.25H25.95L27.372,20.75H22.05ZM20.44,18.75L18.143,29.25H27.56L29.857,18.75H20.44Z"
-      android:fillColor="#6771CC"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/layout/username_education_fragment.xml b/app/src/main/res/layout/username_education_fragment.xml
deleted file mode 100644
index 1f368ea047..0000000000
--- a/app/src/main/res/layout/username_education_fragment.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView 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:fillViewport="true">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/signal_m3_toolbar_height"
-            android:minHeight="@dimen/signal_m3_toolbar_height"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:navigationIcon="@drawable/ic_arrow_left_24" />
-
-        <com.google.android.material.imageview.ShapeableImageView
-            android:id="@+id/username_symbol"
-            android:layout_width="72dp"
-            android:layout_height="72dp"
-            android:layout_marginTop="64dp"
-            android:background="@color/signal_colorSurface2"
-            app:contentPadding="16dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.Circle"
-            app:srcCompat="@drawable/symbol_at_24"
-            app:tint="@color/signal_colorOnSurface"/>
-
-        <TextView
-            android:id="@+id/title"
-            style="@style/Signal.Text.HeadlineLarge"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/dsl_settings_gutter"
-            android:layout_marginTop="12dp"
-            android:text="@string/UsernameEducationFragment__set_up_your_signal_username"
-            android:textAlignment="center"
-            android:textColor="@color/signal_colorOnSurface"
-            app:layout_constrainedWidth="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/username_symbol" />
-
-        <ImageView
-            android:id="@+id/username_education_icon_1"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginStart="32dp"
-            android:layout_marginTop="40dp"
-            android:importantForAccessibility="no"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/title"
-            app:srcCompat="@drawable/number_color_48" />
-
-        <TextView
-            android:id="@+id/username_education_text_1"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="32dp"
-            android:textAppearance="@style/Signal.Text.BodyLarge"
-            android:textColor="@color/signal_colorOnSurfaceVariant"
-            android:text="@string/UsernameEducationFragment__usernames_are_paired_with_a_set_of_digits"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/username_education_icon_1"
-            app:layout_constraintTop_toTopOf="@id/username_education_icon_1" />
-
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/username_education_row_1_barrier"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:barrierDirection="bottom"
-            app:constraint_referenced_ids="username_education_icon_1,username_education_text_1" />
-
-        <ImageView
-            android:id="@+id/username_education_icon_2"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginStart="32dp"
-            android:layout_marginTop="36dp"
-            android:importantForAccessibility="no"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/username_education_row_1_barrier"
-            app:srcCompat="@drawable/link_color_48" />
-
-        <TextView
-            android:id="@+id/username_education_text_2"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="32dp"
-            android:textAppearance="@style/Signal.Text.BodyLarge"
-            android:textColor="@color/signal_colorOnSurfaceVariant"
-            android:text="@string/UsernameEducationFragment__each_username_has_a_unique_qr_code"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/username_education_icon_2"
-            app:layout_constraintTop_toTopOf="@id/username_education_icon_2" />
-
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/username_education_row_2_barrier"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:barrierDirection="bottom"
-            app:constraint_referenced_ids="username_education_icon_2,username_education_text_2" />
-
-        <ImageView
-            android:id="@+id/username_education_icon_3"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginStart="32dp"
-            android:layout_marginTop="36dp"
-            android:importantForAccessibility="no"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/username_education_row_2_barrier"
-            app:srcCompat="@drawable/lock_color_48" />
-
-        <TextView
-            android:id="@+id/username_education_text_3"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="32dp"
-            android:textAppearance="@style/Signal.Text.BodyLarge"
-            android:textColor="@color/signal_colorOnSurfaceVariant"
-            android:text="@string/UsernameEducationFragment__turn_off_phone_number_discovery"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/username_education_icon_3"
-            app:layout_constraintTop_toTopOf="@id/username_education_icon_3" />
-
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/username_education_row_3_barrier"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:barrierDirection="bottom"
-            app:constraint_referenced_ids="username_education_icon_3,username_education_text_3" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/username_education_learn_more"
-            style="@style/Widget.Signal.Button.TextButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:text="@string/LearnMoreTextView_learn_more"
-            android:textAppearance="@style/Signal.Text.BodyLarge"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/username_education_row_3_barrier" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/continue_button"
-            style="@style/Signal.Widget.Button.Large.Tonal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="64dp"
-            android:text="@string/UsernameEducationFragment__continue"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/username_education_learn_more"
-            app:layout_constraintVertical_bias="1" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
diff --git a/app/src/main/res/navigation/edit_profile.xml b/app/src/main/res/navigation/edit_profile.xml
index 27583b916a..741b55c3b3 100644
--- a/app/src/main/res/navigation/edit_profile.xml
+++ b/app/src/main/res/navigation/edit_profile.xml
@@ -67,14 +67,6 @@
             android:id="@+id/action_manageProfileFragment_to_shareUsernameDialog"
             app:destination="@id/shareUsernameDialog" />
 
-        <action
-            android:id="@+id/action_manageProfileFragment_to_usernameEducationFragment"
-            app:destination="@id/usernameEducationFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-
         <action
             android:id="@+id/action_manageProfileFragment_to_usernameLinkFragment"
             app:destination="@id/username_link_settings"
@@ -91,17 +83,6 @@
         android:label="fragment_manage_username"
         tools:layout="@layout/username_edit_fragment" />
 
-    <fragment
-        android:id="@+id/usernameEducationFragment"
-        android:name="org.thoughtcrime.securesms.profiles.manage.UsernameEducationFragment"
-        android:label="fragment_username_education"
-        tools:layout="@layout/username_education_fragment">
-        <action
-            android:id="@+id/action_usernameEducationFragment_to_usernameManageFragment"
-            app:destination="@id/usernameManageFragment"
-            app:popUpTo="@id/manageProfileFragment" />
-    </fragment>
-
     <fragment
         android:id="@+id/profileNameManageFragment"
         android:name="org.thoughtcrime.securesms.profiles.manage.EditProfileNameFragment"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0936a82bbc..8fc9a0d1db 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6105,18 +6105,6 @@
     <!-- Popup menu label for clearing applied formatting -->
     <string name="TextFormatting_clear_formatting">Clear formatting</string>
 
-    <!-- UsernameEducationFragment -->
-    <!-- Continue button which takes the user to the add a username screen -->
-    <string name="UsernameEducationFragment__continue">Continue</string>
-    <!-- Displayed as a title on the username education screen -->
-    <string name="UsernameEducationFragment__set_up_your_signal_username">Set up your Signal username</string>
-    <!-- Displayed as body text in the username education screen -->
-    <string name="UsernameEducationFragment__usernames_are_paired_with_a_set_of_digits">Usernames are paired with a set of digits and aren\'t shared on your profile</string>
-    <!-- Displayed as body text in the username education screen -->
-    <string name="UsernameEducationFragment__each_username_has_a_unique_qr_code">Each username has a unique QR code and link you can share with friends to start a chat with you</string>
-    <!-- Displayed as body text in the username education screen. The string references the names of settings, so they should match our translations for those settings. -->
-    <string name="UsernameEducationFragment__turn_off_phone_number_discovery">Turn off phone number discovery under Settings > Privacy > Phone number > Who can find my number, to use your username as the primary way others can contact you</string>
-
     <!-- Username edit dialog -->
     <!-- Option to open username editor displayed as a list item in a dialog -->
     <string name="UsernameEditDialog__edit_username">Edit username</string>