diff --git a/briar-android/res/drawable/border_explanation.xml b/briar-android/res/drawable/border_explanation.xml
new file mode 100644
index 000000000..b2e380fbc
--- /dev/null
+++ b/briar-android/res/drawable/border_explanation.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/briar-android/res/drawable/spinner_border.xml b/briar-android/res/drawable/border_spinner.xml
similarity index 100%
rename from briar-android/res/drawable/spinner_border.xml
rename to briar-android/res/drawable/border_spinner.xml
diff --git a/briar-android/res/drawable/qr_code_explanation.xml b/briar-android/res/drawable/qr_code_explanation.xml
new file mode 100644
index 000000000..157025c22
--- /dev/null
+++ b/briar-android/res/drawable/qr_code_explanation.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/briar-android/res/layout-land/fragment_keyagreement_id.xml b/briar-android/res/layout-land/fragment_keyagreement_id.xml
index 01351cd1f..492c77892 100644
--- a/briar-android/res/layout-land/fragment_keyagreement_id.xml
+++ b/briar-android/res/layout-land/fragment_keyagreement_id.xml
@@ -3,23 +3,21 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="horizontal"
- android:paddingBottom="@dimen/margin_activity_vertical"
- android:paddingEnd="@dimen/margin_activity_horizontal"
- android:paddingLeft="@dimen/margin_activity_horizontal"
- android:paddingRight="@dimen/margin_activity_horizontal"
- android:paddingStart="@dimen/margin_activity_horizontal"
- android:paddingTop="@dimen/margin_activity_vertical">
+ android:orientation="horizontal">
@@ -31,7 +29,13 @@
+ android:orientation="vertical"
+ android:paddingBottom="@dimen/margin_activity_vertical"
+ android:paddingEnd="@dimen/margin_activity_horizontal"
+ android:paddingLeft="@dimen/margin_activity_horizontal"
+ android:paddingRight="@dimen/margin_activity_horizontal"
+ android:paddingStart="@dimen/margin_activity_horizontal"
+ android:paddingTop="@dimen/margin_activity_vertical">
-
+ android:background="@drawable/border_explanation"
+ android:orientation="vertical"
+ android:padding="@dimen/margin_large">
+
+
+
+
+
+
diff --git a/briar-android/res/layout/fragment_keyagreement_id.xml b/briar-android/res/layout/fragment_keyagreement_id.xml
index a1c0e2130..643109dd0 100644
--- a/briar-android/res/layout/fragment_keyagreement_id.xml
+++ b/briar-android/res/layout/fragment_keyagreement_id.xml
@@ -28,7 +28,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_medium"
- android:background="@drawable/spinner_border"
+ android:background="@drawable/border_spinner"
android:spinnerMode="dropdown"
android:visibility="gone"/>
@@ -41,13 +41,33 @@
android:scaleType="fitCenter"
android:src="@drawable/qr_code_intro"/>
-
+ android:background="@drawable/border_explanation"
+ android:orientation="vertical"
+ android:padding="@dimen/margin_large">
+
+
+
+
+
+