diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.java
index e26ae841c2..ff3fe94422 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.java
@@ -149,10 +149,6 @@ public class EditProfileFragment extends LoggingFragment {
       startActivity(AvatarPreviewActivity.intentFromRecipientId(requireContext(), Recipient.self().getId()),
                     AvatarPreviewActivity.createTransitionBundle(requireActivity(), binding.manageProfileAvatar));
     });
-
-    binding.manageProfileUsernameShare.setOnClickListener(v -> {
-      SafeNavigation.safeNavigate(Navigation.findNavController(v), EditProfileFragmentDirections.actionManageProfileFragmentToShareUsernameDialog());
-    });
   }
 
   @Override
@@ -242,11 +238,8 @@ public class EditProfileFragment extends LoggingFragment {
   private void presentUsername(@Nullable String username) {
     if (username == null || username.isEmpty()) {
       binding.manageProfileUsername.setText(R.string.ManageProfileFragment_username);
-      binding.manageProfileUsernameSubtitle.setText(R.string.ManageProfileFragment_your_username);
-      binding.manageProfileUsernameShare.setVisibility(View.GONE);
     } else {
       binding.manageProfileUsername.setText(username);
-      binding.manageProfileUsernameShare.setVisibility(View.VISIBLE);
     }
   }
 
diff --git a/app/src/main/res/layout/edit_profile_fragment.xml b/app/src/main/res/layout/edit_profile_fragment.xml
index 6531fb9e6e..7c8a7d574b 100644
--- a/app/src/main/res/layout/edit_profile_fragment.xml
+++ b/app/src/main/res/layout/edit_profile_fragment.xml
@@ -115,9 +115,9 @@
                     android:id="@+id/manage_profile_name_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:layout_constraintBottom_toBottomOf="@id/manage_profile_name_subtitle"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="@id/manage_profile_name"
                     app:srcCompat="@drawable/symbol_person_24"
                     app:tint="@color/signal_text_primary" />
 
@@ -128,21 +128,12 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="24dp"
                     android:textAlignment="viewStart"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@id/manage_profile_name_icon"
-                    app:layout_constraintTop_toTopOf="parent"
                     tools:text="Peter Parker" />
 
-                <TextView
-                    android:id="@+id/manage_profile_name_subtitle"
-                    style="@style/Signal.Text.Preview"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:text="@string/ManageProfileFragment_your_name"
-                    android:textColor="@color/signal_text_secondary"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="@id/manage_profile_name"
-                    app:layout_constraintTop_toBottomOf="@id/manage_profile_name" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -160,9 +151,9 @@
                     android:id="@+id/manage_profile_username_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:layout_constraintBottom_toBottomOf="@id/manage_profile_username_subtitle"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="@id/manage_profile_username"
                     app:srcCompat="@drawable/symbol_at_24"
                     app:tint="@color/signal_text_primary" />
 
@@ -173,40 +164,13 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="24dp"
                     android:textAlignment="viewStart"
-                    app:layout_constraintBottom_toTopOf="@id/manage_profile_username_subtitle"
-                    app:layout_constraintEnd_toStartOf="@id/manage_profile_username_share"
-                    app:layout_constraintStart_toEndOf="@id/manage_profile_username_icon"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_chainStyle="packed"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/manage_profile_username_icon"
                     app:layout_goneMarginEnd="48dp"
                     tools:text="\@spiderman" />
 
-                <TextView
-                    android:id="@+id/manage_profile_username_subtitle"
-                    style="@style/Signal.Text.Preview"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:lines="1"
-                    android:text="@string/ManageProfileFragment_your_username"
-                    android:textColor="@color/signal_text_secondary"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toStartOf="@id/manage_profile_username_share"
-                    app:layout_constraintStart_toStartOf="@id/manage_profile_username"
-                    app:layout_constraintTop_toBottomOf="@id/manage_profile_username"
-                    app:layout_goneMarginEnd="48dp" />
 
-                <ImageView
-                    android:id="@+id/manage_profile_username_share"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:layout_marginTop="4dp"
-                    android:background="?selectableItemBackground"
-                    android:scaleType="centerInside"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/symbol_share_android_24"
-                    app:tint="@color/signal_colorOnSurface" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -226,9 +190,9 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:scaleType="fitCenter"
-                    app:layout_constraintBottom_toBottomOf="@id/manage_profile_about_subtitle"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="@id/manage_profile_about"
                     app:srcCompat="@drawable/symbol_edit_24"
                     app:tint="@color/signal_text_primary" />
 
@@ -240,22 +204,12 @@
                     android:layout_marginStart="24dp"
                     android:textAlignment="viewStart"
                     app:emoji_forceCustom="true"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@id/manage_profile_about_icon"
-                    app:layout_constraintTop_toTopOf="parent"
                     tools:text="Photographer for the Daily Bugle" />
 
-                <TextView
-                    android:id="@+id/manage_profile_about_subtitle"
-                    style="@style/Signal.Text.Preview"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:text="@string/ManageProfileFragment_write_a_few_words_about_yourself"
-                    android:textColor="@color/signal_text_secondary"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="@id/manage_profile_about"
-                    app:layout_constraintTop_toBottomOf="@id/manage_profile_about" />
-
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1d6003a8db..816b51c555 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -991,9 +991,6 @@
     <string name="ManageProfileFragment_profile_name">Profile name</string>
     <string name="ManageProfileFragment_username">Username</string>
     <string name="ManageProfileFragment_about">About</string>
-    <string name="ManageProfileFragment_write_a_few_words_about_yourself">Write a few words about yourself</string>
-    <string name="ManageProfileFragment_your_name">Your name</string>
-    <string name="ManageProfileFragment_your_username">Your username</string>
     <string name="ManageProfileFragment_failed_to_set_avatar">Failed to set avatar</string>
     <string name="ManageProfileFragment_badges">Badges</string>
     <string name="ManageProfileFragment__edit_photo">Edit photo</string>