diff --git a/mastodon/src/main/res/drawable/bg_note_edit.xml b/mastodon/src/main/res/drawable/bg_note_edit.xml
index 6b4581877..5f6087637 100644
--- a/mastodon/src/main/res/drawable/bg_note_edit.xml
+++ b/mastodon/src/main/res/drawable/bg_note_edit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?colorM3OnBackground"/>
+    <solid android:color="?colorM3SurfaceVariant"/>
     <corners android:radius="10dp"/>
 </shape>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index 9ec3df69b..e21befcb8 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -180,6 +180,47 @@
 					android:textColor="?colorM3OnSurfaceVariant"
 					tools:text="\@Gargron" />
 
+				<FrameLayout
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_below="@id/username"
+					android:id="@+id/note_edit_wrap"
+					android:layout_marginTop="4dp"
+					android:layout_marginBottom="16dp"
+					android:layout_marginHorizontal="16dp"
+					android:visibility="gone">
+
+					<EditText
+						android:id="@+id/note_edit"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:paddingVertical="16dp"
+						android:inputType="textMultiLine|textCapSentences"
+						android:singleLine="false"
+						android:drawablePadding="12dp"
+						android:drawableTint="?android:textColorSecondary"
+						android:background="@drawable/bg_note_edit"
+						android:paddingEnd="48dp"
+						android:paddingHorizontal="16dp"
+						android:elevation="0dp"
+						android:visibility="gone"
+						android:hint="@string/mo_personal_note"/>
+
+					<Button
+						android:id="@+id/note_edit_confirm"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_marginEnd="8dp"
+						android:paddingBottom="8dp"
+						android:visibility="invisible"
+						android:backgroundTint="?colorM3SurfaceVariant"
+						android:layout_gravity="right|bottom"
+						android:tooltipText="@string/mo_personal_note_confirm"
+						android:contentDescription="@string/mo_personal_note_confirm"
+						android:drawableStart="@drawable/ic_fluent_checkmark_24_regular"
+						/>
+				</FrameLayout>
+
 				<org.joinmastodon.android.ui.views.LinkedTextView
 					android:id="@+id/bio"
 					android:layout_width="match_parent"
@@ -215,48 +256,6 @@
 						tools:text="Eugen"
 						android:autofillHints="" />
 
-					<FrameLayout
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_below="@id/username"
-						android:id="@+id/note_edit_wrap"
-						android:layout_marginTop="4dp"
-						android:layout_marginBottom="16dp"
-						android:layout_marginHorizontal="16dp"
-						android:visibility="gone">
-
-						<EditText
-							android:id="@+id/note_edit"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:paddingVertical="16dp"
-							android:inputType="textMultiLine|textCapSentences"
-							android:singleLine="false"
-							android:drawableStart="@drawable/ic_fluent_notepad_20_regular"
-							android:drawablePadding="12dp"
-							android:drawableTint="?android:textColorSecondary"
-							android:background="@drawable/bg_note_edit"
-							android:paddingEnd="48dp"
-							android:paddingHorizontal="16dp"
-							android:elevation="0dp"
-							android:visibility="gone"
-							android:hint="@string/mo_personal_note"/>
-
-						<Button
-							android:id="@+id/note_edit_confirm"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:layout_marginEnd="8dp"
-							android:paddingHorizontal="8dp"
-							android:visibility="invisible"
-							android:backgroundTint="?colorM3SurfaceVariant"
-							android:layout_gravity="right|center_vertical"
-							android:tooltipText="@string/mo_personal_note_confirm"
-							android:contentDescription="@string/mo_personal_note_confirm"
-							android:drawableStart="@drawable/ic_fluent_checkmark_24_regular"
-							/>
-					</FrameLayout>
-
 <!--					<org.joinmastodon.android.ui.views.LinkedTextView-->
 <!--						android:id="@+id/bio"-->
 <!--						android:layout_width="match_parent"-->