diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index d4f8a5822..1398b141d 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -54,8 +54,8 @@
 
 					<FrameLayout
 						android:id="@+id/avatar_border"
-						android:layout_width="102dp"
-						android:layout_height="102dp"
+						android:layout_width="112dp"
+						android:layout_height="112dp"
 						android:layout_below="@id/cover"
 						android:layout_alignParentStart="true"
 						android:layout_marginTop="-40dp"
@@ -65,8 +65,8 @@
 
 						<ImageView
 							android:id="@+id/avatar"
-							android:layout_width="98dp"
-							android:layout_height="98dp"
+							android:layout_width="108dp"
+							android:layout_height="108dp"
 							android:layout_gravity="center"
 							android:scaleType="centerCrop"
 							android:contentDescription="@string/profile_picture"
@@ -234,37 +234,35 @@
 						android:layout_below="@id/avatar_border"
 						android:layout_alignParentStart="true"
 						android:layout_marginStart="16dp"
-						android:layout_marginTop="12dp"
+						android:layout_marginTop="17dp"
+						android:layout_marginBottom="0.4dp"
 						android:layout_toStartOf="@id/profile_action_btn_wrap"
-						android:textAppearance="@style/m3_headline_small"
 						android:textAlignment="viewStart"
+						android:textAppearance="@style/m3_headline_small"
 						tools:text="Eugen" />
 
-					<FrameLayout
-						android:id="@+id/username_wrap"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_below="@id/name"
-						android:layout_marginStart="16dp"
-						android:layout_toStartOf="@id/profile_action_btn_wrap"						>
 
-						<TextView
-							android:id="@+id/username"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:background="?android:selectableItemBackground"
-							android:textAppearance="@style/m3_title_medium"
-							android:textColor="?android:textColorSecondary"
-							tools:text="\@Gargron" />
-					</FrameLayout>
+					<TextView
+						android:id="@+id/username"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_marginTop="2dp"
+						android:layout_below="@id/name"
+						android:paddingHorizontal="16dp"
+						android:paddingTop="2dp"
+						android:paddingBottom="4dp"
+						android:background="?android:selectableItemBackground"
+						android:textAppearance="@style/m3_title_medium"
+						android:textColor="?android:textColorSecondary"
+						tools:text="\@Gargron" />
 
 					<org.joinmastodon.android.ui.views.LinkedTextView
 						android:id="@+id/bio"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_below="@id/username_wrap"
+						android:layout_below="@id/username"
 						android:layout_marginLeft="16dp"
-						android:layout_marginTop="8dp"
+						android:layout_marginTop="4dp"
 						android:layout_marginRight="16dp"
 						android:textAppearance="@style/m3_body_large"
 						android:textSize="16sp"
@@ -291,7 +289,7 @@
 						android:id="@+id/bio_edit"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_below="@id/username_wrap"
+						android:layout_below="@id/username"
 						android:layout_marginLeft="16dp"
 						android:layout_marginTop="8dp"
 						android:layout_marginRight="16dp"