diff --git a/briar-android/src/main/res/layout/activity_settings.xml b/briar-android/src/main/res/layout/activity_settings.xml
index 027f2b6fc..88bf95130 100644
--- a/briar-android/src/main/res/layout/activity_settings.xml
+++ b/briar-android/src/main/res/layout/activity_settings.xml
@@ -69,10 +69,10 @@
 	</com.google.android.material.appbar.AppBarLayout>
 
 	<fragment
-		app:layout_behavior="@string/appbar_scrolling_view_behavior"
 		android:id="@+id/fragment"
 		android:name="org.briarproject.briar.android.settings.SettingsFragment"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent" />
+		android:layout_height="match_parent"
+		app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/fragment_confirm_avatar_dialog.xml b/briar-android/src/main/res/layout/fragment_confirm_avatar_dialog.xml
index 59d16b5da..db7c6a5cc 100644
--- a/briar-android/src/main/res/layout/fragment_confirm_avatar_dialog.xml
+++ b/briar-android/src/main/res/layout/fragment_confirm_avatar_dialog.xml
@@ -10,33 +10,33 @@
 	<de.hdodenhof.circleimageview.CircleImageView
 		android:id="@+id/image"
 		style="@style/BriarAvatar"
-		android:layout_marginTop="@dimen/listitem_vertical_margin"
 		android:layout_width="@dimen/listitem_picture_size"
 		android:layout_height="@dimen/listitem_picture_size"
 		android:layout_gravity="bottom|left|start"
+		android:layout_marginTop="@dimen/listitem_vertical_margin"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
 		tools:src="@mipmap/ic_launcher_round" />
 
 	<TextView
-		android:layout_marginTop="@dimen/listitem_vertical_margin"
 		android:id="@+id/username"
 		android:layout_width="wrap_content"
 		android:layout_height="0dp"
 		android:layout_marginStart="@dimen/margin_medium"
 		android:layout_marginLeft="@dimen/margin_medium"
+		android:layout_marginTop="@dimen/listitem_vertical_margin"
 		android:gravity="center_vertical"
+		android:textSize="@dimen/text_size_medium"
 		app:layout_constraintBottom_toBottomOf="@+id/image"
 		app:layout_constraintStart_toEndOf="@+id/image"
 		app:layout_constraintTop_toTopOf="parent"
-		android:textSize="@dimen/text_size_medium"
 		tools:text="username" />
 
 	<TextView
 		android:id="@+id/remark"
-		android:layout_marginTop="@dimen/listitem_vertical_margin"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/listitem_vertical_margin"
 		android:text="@string/dialog_confirm_profile_picture_remark"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/image" />