diff --git a/app/src/main/res/layouts/mastodon/layout/activity_profile.xml b/app/src/main/res/layouts/mastodon/layout/activity_profile.xml
index d10e52a7..f4e43217 100644
--- a/app/src/main/res/layouts/mastodon/layout/activity_profile.xml
+++ b/app/src/main/res/layouts/mastodon/layout/activity_profile.xml
@@ -64,16 +64,14 @@
                             tools:src="@tools:sample/backgrounds/scenic" />
                         <com.google.android.material.button.MaterialButton
                             android:id="@+id/qr_code_generator"
-                            style="@style/Widget.Material3.Button.ElevatedButton"
-                            android:layout_width="48dp"
-                            android:layout_height="36dp"
+                            style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             app:iconGravity="textStart"
                             app:iconPadding="0dp"
                             android:contentDescription="@string/qr_code_generator"
                             android:scaleType="fitCenter"
                             android:visibility="gone"
-                            android:layout_marginEnd="10dp"
-                            android:layout_marginBottom="5dp"
                             app:icon="@drawable/baseline_qr_code_24"
                             android:layout_alignParentBottom="true"
                             android:layout_alignParentEnd="true"
@@ -108,13 +106,12 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/account_follow"
-                    style="@style/Widget.Material3.Button.Icon"
+                    style="@style/Widget.Material3.Button.IconButton.Filled"
                     android:layout_width="48dp"
                     android:layout_height="48dp"
                     android:layout_marginStart="6dp"
                     android:layout_marginTop="6dp"
                     android:contentDescription="@string/make_an_action"
-                    android:scaleType="fitCenter"
                     android:visibility="gone"
                     app:layout_constraintStart_toEndOf="@id/avatar_container"
                     app:layout_constraintTop_toBottomOf="@id/banner_container"
@@ -123,13 +120,12 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/account_notification"
-                    style="@style/Widget.Material3.Button.Icon"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
+                    style="@style/Widget.Material3.Button.IconButton.Filled"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:layout_marginTop="6dp"
                     android:layout_marginEnd="6dp"
                     android:contentDescription="@string/set_notify"
-                    android:scaleType="fitCenter"
                     android:visibility="gone"
                     app:icon="@drawable/ic_baseline_notifications_off_24"
                     app:layout_constraintEnd_toStartOf="@id/avatar_container"
@@ -138,13 +134,12 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/header_edit_profile"
-                    style="@style/Widget.Material3.Button.Icon"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
+                    style="@style/Widget.Material3.Button.IconButton.Filled"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:layout_marginStart="6dp"
                     android:layout_marginTop="6dp"
                     android:contentDescription="@string/edit_profile"
-                    android:scaleType="fitCenter"
                     android:visibility="gone"
                     app:icon="@drawable/ic_baseline_edit_24"
                     app:layout_constraintStart_toEndOf="@id/avatar_container"
@@ -441,6 +436,9 @@
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
                     android:visibility="gone"
+                    android:layout_marginTop="6dp"
+                    android:layout_marginHorizontal="6dp"
+                    android:gravity="center_vertical"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/familiar_followers"
@@ -457,11 +455,10 @@
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/open_remote_profile"
-                        style="@style/Widget.Material3.Button.Icon"
+                        style="@style/Widget.Material3.Button.IconButton.Outlined"
                         android:layout_width="48dp"
                         android:layout_height="48dp"
                         android:layout_marginStart="6dp"
-                        android:layout_marginTop="6dp"
                         android:contentDescription="@string/display_remote_profile"
                         android:scaleType="fitCenter"
                         app:icon="@drawable/ic_baseline_manage_search_24" />