diff --git a/briar-android/src/main/res/layout/fragment_final.xml b/briar-android/src/main/res/layout/fragment_final.xml
index 1139a6ab6..c4866d8ae 100644
--- a/briar-android/src/main/res/layout/fragment_final.xml
+++ b/briar-android/src/main/res/layout/fragment_final.xml
@@ -10,16 +10,29 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
+		<androidx.constraintlayout.widget.Guideline
+			android:id="@+id/imageLeftGuideline"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			app:layout_constraintGuide_percent=".3" />
+
+		<androidx.constraintlayout.widget.Guideline
+			android:id="@+id/imageRightGuideline"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			app:layout_constraintGuide_percent=".7" />
+
 		<ImageView
 			android:id="@+id/iconView"
 			android:layout_width="0dp"
 			android:layout_height="0dp"
-			android:layout_margin="32dp"
+			android:layout_marginTop="32dp"
 			app:layout_constraintBottom_toTopOf="@+id/titleView"
 			app:layout_constraintDimensionRatio="1:1"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintHeight_max="200dp"
-			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintEnd_toEndOf="@+id/imageRightGuideline"
+			app:layout_constraintStart_toStartOf="@+id/imageLeftGuideline"
 			app:layout_constraintTop_toTopOf="parent"
 			app:layout_constraintVertical_bias="0.25"
 			app:layout_constraintVertical_chainStyle="packed"
@@ -49,7 +62,10 @@
 			android:id="@+id/textView"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_margin="32dp"
+			android:layout_marginStart="32dp"
+			android:layout_marginTop="32dp"
+			android:layout_marginEnd="32dp"
+			android:layout_marginBottom="16dp"
 			android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
 			app:layout_constraintBottom_toTopOf="@+id/button"
 			app:layout_constraintEnd_toEndOf="parent"
diff --git a/briar-android/src/main/res/layout/fragment_transfer_data_chooser.xml b/briar-android/src/main/res/layout/fragment_transfer_data_chooser.xml
index b254b2085..ce75d30b5 100644
--- a/briar-android/src/main/res/layout/fragment_transfer_data_chooser.xml
+++ b/briar-android/src/main/res/layout/fragment_transfer_data_chooser.xml
@@ -10,18 +10,29 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
+		<androidx.constraintlayout.widget.Guideline
+			android:id="@+id/imageLeftGuideline"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			app:layout_constraintGuide_percent=".3" />
+
+		<androidx.constraintlayout.widget.Guideline
+			android:id="@+id/imageRightGuideline"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			app:layout_constraintGuide_percent=".7" />
+
 		<ImageView
 			android:id="@+id/imageView"
 			android:layout_width="0dp"
 			android:layout_height="0dp"
-			android:layout_marginLeft="32dp"
 			android:layout_marginTop="32dp"
-			android:layout_marginRight="32dp"
 			app:layout_constraintBottom_toTopOf="@+id/introView"
 			app:layout_constraintDimensionRatio="1,1"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintHeight_max="200dp"
-			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintEnd_toEndOf="@+id/imageRightGuideline"
+			app:layout_constraintStart_toStartOf="@+id/imageLeftGuideline"
 			app:layout_constraintTop_toTopOf="parent"
 			app:layout_constraintVertical_chainStyle="spread"
 			app:srcCompat="@drawable/ic_transfer_data"
@@ -31,7 +42,10 @@
 			android:id="@+id/introView"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_margin="32dp"
+			android:layout_marginStart="32dp"
+			android:layout_marginTop="32dp"
+			android:layout_marginEnd="32dp"
+			android:layout_marginBottom="16dp"
 			android:text="@string/removable_drive_intro"
 			android:textSize="16sp"
 			app:layout_constraintBottom_toTopOf="@+id/sendButton"
diff --git a/briar-android/src/main/res/layout/fragment_transfer_data_receive.xml b/briar-android/src/main/res/layout/fragment_transfer_data_receive.xml
index c35f36266..d222572d4 100644
--- a/briar-android/src/main/res/layout/fragment_transfer_data_receive.xml
+++ b/briar-android/src/main/res/layout/fragment_transfer_data_receive.xml
@@ -10,18 +10,30 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
+		<androidx.constraintlayout.widget.Guideline
+			android:id="@+id/imageLeftGuideline"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			app:layout_constraintGuide_percent=".2" />
+
+		<androidx.constraintlayout.widget.Guideline
+			android:id="@+id/imageRightGuideline"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			app:layout_constraintGuide_percent=".8" />
+
 		<ImageView
 			android:id="@+id/imageView"
 			android:layout_width="0dp"
 			android:layout_height="0dp"
-			android:layout_marginStart="32dp"
 			android:layout_marginTop="32dp"
-			android:layout_marginEnd="32dp"
 			app:layout_constraintWidth_max="300dp"
 			app:layout_constraintBottom_toTopOf="@+id/progressBar"
 			app:layout_constraintDimensionRatio="1,2"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintEnd_toEndOf="@+id/imageRightGuideline"
+			app:layout_constraintStart_toStartOf="@+id/imageLeftGuideline"
 			app:layout_constraintTop_toTopOf="parent"
 			app:layout_constraintVertical_chainStyle="spread"
 			app:srcCompat="@drawable/ic_transfer_data_send"
diff --git a/briar-android/src/main/res/layout/fragment_transfer_data_send.xml b/briar-android/src/main/res/layout/fragment_transfer_data_send.xml
index d0d9d6486..7925869d4 100644
--- a/briar-android/src/main/res/layout/fragment_transfer_data_send.xml
+++ b/briar-android/src/main/res/layout/fragment_transfer_data_send.xml
@@ -10,17 +10,29 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
+		<androidx.constraintlayout.widget.Guideline
+			android:id="@+id/imageLeftGuideline"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			app:layout_constraintGuide_percent=".2" />
+
+		<androidx.constraintlayout.widget.Guideline
+			android:id="@+id/imageRightGuideline"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			app:layout_constraintGuide_percent=".8" />
+
 		<ImageView
 			android:id="@+id/imageView"
 			android:layout_width="0dp"
 			android:layout_height="0dp"
-			android:layout_marginStart="32dp"
 			android:layout_marginTop="32dp"
-			android:layout_marginEnd="32dp"
 			app:layout_constraintBottom_toTopOf="@+id/progressBar"
 			app:layout_constraintDimensionRatio="1,2"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintEnd_toEndOf="@+id/imageRightGuideline"
+			app:layout_constraintStart_toStartOf="@+id/imageLeftGuideline"
 			app:layout_constraintTop_toTopOf="parent"
 			app:layout_constraintVertical_chainStyle="spread"
 			app:layout_constraintWidth_max="300dp"