diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index 57c0d57f7..47a0ad853 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -258,6 +258,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		list=content.findViewById(R.id.metadata);
 		rolesView=content.findViewById(R.id.roles);
 
+		avatarBorder.setOutlineProvider(OutlineProviders.roundedRect(26));
+		avatarBorder.setClipToOutline(true);
 		avatar.setOutlineProvider(OutlineProviders.roundedRect(24));
 		avatar.setClipToOutline(true);
 
diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index 433ef9c3b..9126eb9f7 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -62,8 +62,7 @@
 						android:layout_alignParentStart="true"
 						android:layout_marginStart="12dp"
 						android:layout_marginTop="-44dp"
-						android:background="@drawable/profile_ava_bg"
-						android:outlineProvider="@null">
+						android:background="?colorM3Surface">
 
 						<ImageView
 							android:id="@+id/avatar"