diff --git a/briar-android/build.gradle b/briar-android/build.gradle
index 0b39ba153..29d7f9424 100644
--- a/briar-android/build.gradle
+++ b/briar-android/build.gradle
@@ -21,7 +21,7 @@ dependencies {
 	}
 	implementation "com.android.support:cardview-v7:$supportVersion"
 	implementation "com.android.support:support-annotations:$supportVersion"
-	implementation 'com.android.support.constraint:constraint-layout:1.1.0'
+	implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 
 	implementation('ch.acra:acra:4.9.1') {
 		exclude module: 'support-v4'
diff --git a/briar-android/src/main/AndroidManifest.xml b/briar-android/src/main/AndroidManifest.xml
index b1b7c239f..a56f47021 100644
--- a/briar-android/src/main/AndroidManifest.xml
+++ b/briar-android/src/main/AndroidManifest.xml
@@ -26,6 +26,7 @@
 		android:icon="@mipmap/ic_launcher_round"
 		android:label="@string/app_name"
 		android:logo="@mipmap/ic_launcher_round"
+		android:supportsRtl="true"
 		android:theme="@style/BriarTheme">
 
 		<receiver
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/StrengthMeter.java b/briar-android/src/main/java/org/briarproject/briar/android/login/StrengthMeter.java
index b740c1431..05c71f4a6 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/StrengthMeter.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/StrengthMeter.java
@@ -7,6 +7,7 @@ import android.graphics.drawable.ClipDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.graphics.drawable.ShapeDrawable;
+import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.widget.ProgressBar;
 
@@ -15,6 +16,7 @@ import static android.graphics.Paint.Style.FILL;
 import static android.graphics.Paint.Style.STROKE;
 import static android.graphics.drawable.ClipDrawable.HORIZONTAL;
 import static android.view.Gravity.LEFT;
+import static android.view.Gravity.START;
 import static org.briarproject.bramble.api.crypto.PasswordStrengthEstimator.QUITE_STRONG;
 import static org.briarproject.bramble.api.crypto.PasswordStrengthEstimator.QUITE_WEAK;
 import static org.briarproject.bramble.api.crypto.PasswordStrengthEstimator.STRONG;
@@ -35,11 +37,11 @@ public class StrengthMeter extends ProgressBar {
 		this(context, null);
 	}
 
-	public StrengthMeter(Context context, AttributeSet attrs) {
+	public StrengthMeter(Context context, @Nullable AttributeSet attrs) {
 		super(context, attrs, android.R.attr.progressBarStyleHorizontal);
 		bar = new ShapeDrawable();
 		bar.getPaint().setColor(RED);
-		ClipDrawable clip = new ClipDrawable(bar, LEFT, HORIZONTAL);
+		ClipDrawable clip = new ClipDrawable(bar, LEFT & START, HORIZONTAL);
 		ShapeDrawable background = new ShapeDrawable();
 		Paint p = background.getPaint();
 		p.setStyle(FILL);
@@ -50,6 +52,7 @@ public class StrengthMeter extends ProgressBar {
 		Drawable[] layers = new Drawable[] { clip, background };
 		setProgressDrawable(new LayerDrawable(layers));
 		setIndeterminate(false);
+		if (isInEditMode()) setStrength(STRONG);
 	}
 
 	@Override
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java
index 0733fb4a0..638db9af9 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java
@@ -61,9 +61,11 @@ public class TextInputView extends KeyboardAwareLinearLayout {
 	public TextInputView(Context context, @Nullable AttributeSet attrs,
 			int defStyleAttr) {
 		super(context, attrs, defStyleAttr);
-		BriarApplication app =
-				(BriarApplication) context.getApplicationContext();
-		app.getApplicationComponent().inject(this);
+		if (!isInEditMode()) {
+			BriarApplication app =
+					(BriarApplication) context.getApplicationContext();
+			app.getApplicationComponent().inject(this);
+		}
 		setOrientation(VERTICAL);
 		setLayoutTransition(new LayoutTransition());
 		inflateLayout(context);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/widget/LinkDialogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/widget/LinkDialogFragment.java
index 5889294db..3a73e91ca 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/widget/LinkDialogFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/widget/LinkDialogFragment.java
@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -42,8 +43,8 @@ public class LinkDialogFragment extends DialogFragment {
 	}
 
 	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container,
-			Bundle savedInstanceState) {
+	public View onCreateView(@NonNull LayoutInflater inflater,
+			ViewGroup container, Bundle savedInstanceState) {
 
 		View v = inflater.inflate(R.layout.fragment_link_dialog, container,
 				false);
diff --git a/briar-android/src/main/res/drawable/qr_code_explanation.xml b/briar-android/src/main/res/drawable/qr_code_explanation.xml
index 157025c22..32b90e050 100644
--- a/briar-android/src/main/res/drawable/qr_code_explanation.xml
+++ b/briar-android/src/main/res/drawable/qr_code_explanation.xml
@@ -2,6 +2,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="400dp"
         android:height="100dp"
+        android:autoMirrored="true"
         android:viewportHeight="49.5"
         android:viewportWidth="194.8">
 	<path
diff --git a/briar-android/src/main/res/layout/activity_change_password.xml b/briar-android/src/main/res/layout/activity_change_password.xml
index 3ef79f9e2..7699314a9 100644
--- a/briar-android/src/main/res/layout/activity_change_password.xml
+++ b/briar-android/src/main/res/layout/activity_change_password.xml
@@ -7,7 +7,7 @@
 	android:layout_height="match_parent"
 	tools:context=".android.login.ChangePasswordActivity">
 
-	<RelativeLayout
+	<android.support.constraint.ConstraintLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="vertical"
@@ -16,16 +16,19 @@
 		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:paddingTop="@dimen/margin_activity_vertical"
+		android:id="@+id/relativeLayout2">
 
 		<android.support.design.widget.TextInputLayout
 			android:id="@+id/current_password_entry_wrapper"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_centerHorizontal="true"
 			app:errorEnabled="true"
 			app:hintEnabled="false"
-			app:passwordToggleEnabled="true">
+			app:passwordToggleEnabled="true"
+			app:layout_constraintTop_toTopOf="parent"
+			app:layout_constraintLeft_toLeftOf="parent"
+			app:layout_constraintRight_toRightOf="parent">
 
 			<EditText
 				android:id="@+id/current_password_entry"
@@ -40,11 +43,12 @@
 			android:id="@+id/new_password_entry_wrapper"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_below="@id/current_password_entry_wrapper"
-			android:layout_centerHorizontal="true"
 			app:errorEnabled="true"
 			app:hintEnabled="false"
-			app:passwordToggleEnabled="true">
+			app:passwordToggleEnabled="true"
+			app:layout_constraintTop_toBottomOf="@id/current_password_entry_wrapper"
+			app:layout_constraintLeft_toLeftOf="parent"
+			app:layout_constraintRight_toRightOf="parent">
 
 			<EditText
 				android:id="@+id/new_password_entry"
@@ -59,11 +63,12 @@
 			android:id="@+id/new_password_confirm_wrapper"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_below="@id/new_password_entry_wrapper"
-			android:layout_centerHorizontal="true"
 			app:errorEnabled="true"
 			app:hintEnabled="false"
-			app:passwordToggleEnabled="true">
+			app:passwordToggleEnabled="true"
+			app:layout_constraintTop_toBottomOf="@id/new_password_entry_wrapper"
+			app:layout_constraintLeft_toLeftOf="parent"
+			app:layout_constraintRight_toRightOf="parent">
 
 			<EditText
 				android:id="@+id/new_password_confirm"
@@ -79,30 +84,33 @@
 			android:id="@+id/strength_meter"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_below="@id/new_password_confirm_wrapper"
-			android:layout_centerHorizontal="true"
-			android:visibility="invisible"/>
+			android:visibility="invisible"
+			app:layout_constraintTop_toBottomOf="@id/new_password_confirm_wrapper"
+			app:layout_constraintLeft_toLeftOf="parent"
+			app:layout_constraintRight_toRightOf="parent"/>
 
 		<Button
 			android:id="@+id/change_password"
 			style="@style/BriarButton"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_below="@id/strength_meter"
-			android:layout_centerHorizontal="true"
 			android:layout_marginTop="@dimen/margin_medium"
 			android:enabled="false"
 			android:text="@string/change_password"
-			tools:enabled="true"/>
+			tools:enabled="true"
+			app:layout_constraintTop_toBottomOf="@id/strength_meter"
+			app:layout_constraintLeft_toLeftOf="parent"
+			app:layout_constraintRight_toRightOf="parent"/>
 
 		<ProgressBar
 			android:id="@+id/progress_wheel"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_alignTop="@id/change_password"
-			android:layout_centerHorizontal="true"
-			android:visibility="invisible"/>
+			android:visibility="invisible"
+			app:layout_constraintTop_toTopOf="@id/change_password"
+			app:layout_constraintLeft_toLeftOf="parent"
+			app:layout_constraintRight_toRightOf="parent"/>
 
-	</RelativeLayout>
+	</android.support.constraint.ConstraintLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/activity_conversation.xml b/briar-android/src/main/res/layout/activity_conversation.xml
index 229c1d13e..0991595b3 100644
--- a/briar-android/src/main/res/layout/activity_conversation.xml
+++ b/briar-android/src/main/res/layout/activity_conversation.xml
@@ -20,19 +20,20 @@
 
 			<LinearLayout
 				android:layout_width="wrap_content"
-				android:layout_height="match_parent">
+				android:layout_height="match_parent"
+				android:orientation="horizontal">
 
 				<include layout="@layout/contact_avatar_status"/>
 
 				<com.vanniktech.emoji.EmojiTextView
 					android:id="@+id/contactName"
 					style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse"
-					android:textColor="@color/action_bar_text"
 					android:layout_width="wrap_content"
 					android:layout_height="match_parent"
 					android:layout_marginLeft="@dimen/margin_medium"
 					android:layout_marginStart="@dimen/margin_medium"
 					android:gravity="center"
+					android:textColor="@color/action_bar_text"
 					tools:text="Contact Name"/>
 
 			</LinearLayout>
diff --git a/briar-android/src/main/res/layout/activity_dev_report.xml b/briar-android/src/main/res/layout/activity_dev_report.xml
index ab17da50e..e4c9d130b 100644
--- a/briar-android/src/main/res/layout/activity_dev_report.xml
+++ b/briar-android/src/main/res/layout/activity_dev_report.xml
@@ -1,186 +1,214 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<LinearLayout
+	<android.support.constraint.ConstraintLayout
 		android:id="@+id/report_form"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:orientation="vertical"
 		android:visibility="visible"
-		tools:context=".android.reporting.DevReportActivity">
+		tools:context=".android.reporting.DevReportActivity"
+		tools:visibility="invisible">
 
-		<include layout="@layout/toolbar"/>
+		<include
+			android:id="@+id/appBar"
+			layout="@layout/toolbar"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"/>
 
-		<RelativeLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
+		<android.support.design.widget.TextInputLayout
+			android:id="@+id/user_comment_layout"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
 			android:layout_marginEnd="@dimen/margin_large"
+			android:layout_marginStart="@dimen/margin_large"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/appBar">
+
+			<android.support.design.widget.TextInputEditText
+				android:id="@+id/user_comment"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:inputType="textMultiLine|textCapSentences"
+				tools:hint="@string/describe_crash"/>
+
+		</android.support.design.widget.TextInputLayout>
+
+		<android.support.design.widget.TextInputLayout
+			android:id="@+id/user_email_layout"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginEnd="@dimen/margin_large"
+			android:layout_marginStart="@dimen/margin_large"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/user_comment_layout">
+
+			<android.support.design.widget.TextInputEditText
+				android:id="@+id/user_email"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:hint="@string/optional_contact_email"
+				android:inputType="textEmailAddress"
+				android:maxLines="1"/>
+
+		</android.support.design.widget.TextInputLayout>
+
+		<CheckBox
+			android:id="@+id/include_debug_report"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
 			android:layout_marginLeft="@dimen/margin_large"
-			android:layout_marginRight="@dimen/margin_large"
-			android:layout_marginStart="@dimen/margin_large">
+			android:layout_marginStart="@dimen/margin_large"
+			android:checked="false"
+			android:text="@string/include_debug_report_crash"
+			app:layout_constraintBottom_toBottomOf="@+id/chevron"
+			app:layout_constraintLeft_toLeftOf="parent"
+			app:layout_constraintRight_toLeftOf="@+id/chevron"
+			app:layout_constraintTop_toTopOf="@+id/chevron"/>
 
-			<android.support.design.widget.TextInputLayout
-				android:id="@+id/user_comment_layout"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content">
+		<Button
+			android:id="@+id/chevron"
+			style="@style/BriarButtonFlat.Positive"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/show"
+			app:layout_constraintRight_toRightOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/user_email_layout"/>
 
-				<android.support.design.widget.TextInputEditText
-					android:id="@+id/user_comment"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:inputType="textMultiLine|textCapSentences"
-					tools:hint="@string/describe_crash"/>
+		<ScrollView
+			android:id="@+id/report_scroll"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/include_debug_report">
 
-			</android.support.design.widget.TextInputLayout>
-
-			<android.support.design.widget.TextInputLayout
-				android:id="@+id/user_email_layout"
+			<LinearLayout
+				android:id="@+id/report_content"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_below="@+id/user_comment_layout"
-				android:layout_marginTop="@dimen/margin_small">
-
-				<android.support.design.widget.TextInputEditText
-					android:id="@+id/user_email"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:hint="@string/optional_contact_email"
-					android:inputType="textEmailAddress"
-					android:maxLines="1"/>
-
-			</android.support.design.widget.TextInputLayout>
-
-			<CheckBox
-				android:id="@+id/include_debug_report"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentLeft="true"
-				android:layout_below="@+id/user_email_layout"
-				android:layout_marginTop="@dimen/margin_small"
-				android:layout_toLeftOf="@+id/chevron"
-				android:checked="false"
-				android:text="@string/include_debug_report_crash"/>
-
-			<Button
-				android:id="@+id/chevron"
-				style="@style/BriarButtonFlat.Positive"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentRight="true"
-				android:layout_alignTop="@+id/include_debug_report"
-				android:text="@string/show"/>
-
-			<ScrollView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_below="@id/include_debug_report"
-				android:layout_marginTop="@dimen/margin_small">
-
-				<LinearLayout
-					android:id="@+id/report_content"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:gravity="center_horizontal"
-					android:orientation="vertical"
-					android:paddingBottom="@dimen/listitem_height_one_line_avatar"
-					android:paddingEnd="@dimen/margin_large"
-					android:paddingLeft="@dimen/margin_large"
-					android:paddingRight="@dimen/margin_large"
-					android:paddingStart="@dimen/margin_large"
-					android:paddingTop="@dimen/margin_small"
-					android:visibility="gone"/>
-
-			</ScrollView>
-
-			<ProgressBar
-				android:id="@+id/progress_wheel"
-				style="?android:attr/progressBarStyleLarge"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentBottom="true"
-				android:layout_below="@+id/include_debug_report"
-				android:layout_centerHorizontal="true"
-				android:indeterminate="true"
+				android:gravity="center_horizontal"
+				android:orientation="vertical"
+				android:paddingBottom="@dimen/listitem_height_one_line_avatar"
+				android:paddingEnd="@dimen/margin_large"
+				android:paddingLeft="@dimen/margin_large"
+				android:paddingRight="@dimen/margin_large"
+				android:paddingStart="@dimen/margin_large"
+				android:paddingTop="@dimen/margin_small"
 				android:visibility="gone"/>
 
-		</RelativeLayout>
-	</LinearLayout>
+		</ScrollView>
 
-	<RelativeLayout
+		<ProgressBar
+			android:id="@+id/progress_wheel"
+			style="?android:attr/progressBarStyleLarge"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:indeterminate="true"
+			android:visibility="gone"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintLeft_toLeftOf="parent"
+			app:layout_constraintRight_toRightOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/include_debug_report"/>
+
+	</android.support.constraint.ConstraintLayout>
+
+	<android.support.constraint.ConstraintLayout
 		android:id="@+id/request_report"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:clickable="true"
-		android:gravity="center"
 		android:padding="@dimen/margin_large"
-		android:visibility="invisible">
+		android:visibility="invisible"
+		tools:visibility="visible">
 
 		<TextView
 			android:id="@+id/crashed"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/margin_large"
 			android:gravity="center"
 			android:text="@string/briar_crashed"
 			android:textColor="?android:attr/textColorSecondary"
-			android:textSize="@dimen/text_size_large"/>
+			android:textSize="@dimen/text_size_large"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			tools:layout_editor_absoluteY="8dp"/>
 
 		<TextView
 			android:id="@+id/fault"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_below="@+id/crashed"
 			android:layout_marginTop="@dimen/margin_large"
 			android:gravity="center"
 			android:text="@string/not_your_fault"
 			android:textColor="?android:attr/textColorSecondary"
-			android:textSize="@dimen/text_size_large"/>
+			android:textSize="@dimen/text_size_large"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/crashed"/>
 
 		<TextView
 			android:id="@+id/pleaseSend"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_below="@+id/fault"
 			android:layout_marginTop="@dimen/margin_large"
 			android:gravity="center"
 			android:text="@string/please_send_report"
 			android:textColor="?android:attr/textColorSecondary"
-			android:textSize="@dimen/text_size_large"/>
+			android:textSize="@dimen/text_size_large"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/fault"/>
 
 		<TextView
 			android:id="@+id/encrypted"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_below="@+id/pleaseSend"
-			android:layout_marginBottom="@dimen/margin_large"
 			android:layout_marginTop="@dimen/margin_large"
 			android:gravity="center"
 			android:text="@string/report_is_encrypted"
 			android:textColor="?android:attr/textColorSecondary"
-			android:textSize="@dimen/text_size_large"/>
+			android:textSize="@dimen/text_size_large"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/pleaseSend"/>
 
 		<Button
 			android:id="@+id/declineButton"
 			style="@style/BriarButtonFlat.Negative"
-			android:layout_width="wrap_content"
+			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_alignParentLeft="true"
-			android:layout_below="@+id/encrypted"
-			android:text="@string/close"/>
+			android:layout_marginTop="@dimen/margin_large"
+			android:text="@string/close"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toStartOf="@+id/acceptButton"
+			app:layout_constraintHorizontal_weight="1"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/encrypted"
+			app:layout_constraintVertical_bias="1.0"/>
 
 		<Button
 			android:id="@+id/acceptButton"
 			style="@style/BriarButtonFlat.Positive"
-			android:layout_width="wrap_content"
+			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@+id/encrypted"
-			android:text="@string/send_report"/>
+			android:layout_marginTop="@dimen/margin_large"
+			android:text="@string/send_report"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintHorizontal_weight="1"
+			app:layout_constraintStart_toEndOf="@+id/declineButton"
+			app:layout_constraintTop_toBottomOf="@+id/encrypted"
+			app:layout_constraintVertical_bias="1.0"/>
 
-	</RelativeLayout>
+	</android.support.constraint.ConstraintLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/activity_nav_drawer.xml b/briar-android/src/main/res/layout/activity_nav_drawer.xml
index ec6f40fc0..d33ed40aa 100644
--- a/briar-android/src/main/res/layout/activity_nav_drawer.xml
+++ b/briar-android/src/main/res/layout/activity_nav_drawer.xml
@@ -2,57 +2,75 @@
 <android.support.v4.widget.DrawerLayout
 	android:id="@+id/drawer_layout"
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	tools:context=".android.navdrawer.NavDrawerActivity">
 
 	<!-- The first child(root) is the content view -->
-	<LinearLayout
+	<android.support.constraint.ConstraintLayout
+		android:id="@+id/constraintLayout"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:orientation="vertical">
+		android:layout_height="match_parent">
 
-		<include layout="@layout/toolbar"/>
+		<include
+			android:id="@+id/appBar"
+			layout="@layout/toolbar"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"/>
 
-		<RelativeLayout
+		<android.support.constraint.ConstraintLayout
 			android:id="@+id/expiryWarning"
-			android:layout_width="match_parent"
+			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:background="@color/briar_warning_background"
 			android:orientation="horizontal"
 			android:padding="@dimen/margin_medium"
 			android:visibility="gone"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/appBar"
 			tools:visibility="visible">
 
 			<TextView
 				android:id="@+id/expiryWarningText"
-				android:layout_width="wrap_content"
+				android:layout_width="0dp"
 				android:layout_height="wrap_content"
-				android:layout_toLeftOf="@+id/expiryWarningClose"
 				android:text="@plurals/expiry_warning"
 				android:textColor="@color/briar_text_primary_inverse"
-				android:textSize="@dimen/text_size_small"/>
+				android:textSize="@dimen/text_size_small"
+				app:layout_constraintEnd_toStartOf="@+id/expiryWarningClose"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toTopOf="parent"/>
 
 			<ImageView
 				android:id="@+id/expiryWarningClose"
 				android:layout_width="24dp"
-				android:layout_height="24dp"
-				android:layout_alignParentRight="true"
-				android:layout_centerInParent="true"
+				android:layout_height="0dp"
 				android:contentDescription="@string/close"
 				android:scaleType="center"
 				android:src="@drawable/ic_close"
-				android:tint="@color/briar_text_tertiary_inverse"/>
+				android:tint="@color/briar_text_tertiary_inverse"
+				app:layout_constraintBottom_toBottomOf="parent"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintTop_toTopOf="parent"/>
 
-		</RelativeLayout>
+		</android.support.constraint.ConstraintLayout>
 
 		<FrameLayout
 			android:id="@+id/fragmentContainer"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"/>
+			android:layout_width="0dp"
+			android:layout_height="0dp"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/expiryWarning"/>
 
-	</LinearLayout>
+	</android.support.constraint.ConstraintLayout>
 
 	<!-- The second child is the menu -->
 	<include
diff --git a/briar-android/src/main/res/layout/activity_panic_preferences.xml b/briar-android/src/main/res/layout/activity_panic_preferences.xml
index 233f8b1a2..c7f67ea03 100644
--- a/briar-android/src/main/res/layout/activity_panic_preferences.xml
+++ b/briar-android/src/main/res/layout/activity_panic_preferences.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
diff --git a/briar-android/src/main/res/layout/activity_password.xml b/briar-android/src/main/res/layout/activity_password.xml
index 78f3242d7..3f7eee55c 100644
--- a/briar-android/src/main/res/layout/activity_password.xml
+++ b/briar-android/src/main/res/layout/activity_password.xml
@@ -5,24 +5,20 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<RelativeLayout
+	<android.support.constraint.ConstraintLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		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:padding="@dimen/margin_activity_vertical">
 
 		<android.support.design.widget.TextInputLayout
 			android:id="@+id/password_layout"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_centerHorizontal="true"
 			app:errorEnabled="true"
 			app:hintEnabled="false"
+			app:layout_constraintLeft_toLeftOf="parent"
+			app:layout_constraintRight_toRightOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
 			app:passwordToggleEnabled="true">
 
 			<EditText
@@ -40,31 +36,36 @@
 			style="@style/BriarButton"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_below="@id/password_layout"
 			android:layout_marginTop="@dimen/margin_medium"
 			android:onClick="onSignInClick"
-			android:text="@string/sign_in_button"/>
+			android:text="@string/sign_in_button"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/password_layout"/>
 
 		<ProgressBar
 			android:id="@+id/progress_wheel"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_alignTop="@id/btn_sign_in"
-			android:layout_centerHorizontal="true"
-			android:visibility="invisible"/>
+			android:visibility="invisible"
+			app:layout_constraintBottom_toBottomOf="@+id/btn_sign_in"
+			app:layout_constraintLeft_toLeftOf="parent"
+			app:layout_constraintRight_toRightOf="parent"
+			app:layout_constraintTop_toTopOf="@id/btn_sign_in"/>
 
 		<TextView
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_below="@id/btn_sign_in"
-			android:layout_centerHorizontal="true"
 			android:layout_marginTop="@dimen/margin_large"
 			android:clickable="true"
 			android:focusable="true"
 			android:onClick="onForgottenPasswordClick"
 			android:text="@string/forgotten_password"
-			android:textColor="?android:attr/textColorLink"/>
+			android:textColor="?android:attr/textColorLink"
+			app:layout_constraintLeft_toLeftOf="parent"
+			app:layout_constraintRight_toRightOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/btn_sign_in"/>
 
-	</RelativeLayout>
+	</android.support.constraint.ConstraintLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/activity_rss_feed_import.xml b/briar-android/src/main/res/layout/activity_rss_feed_import.xml
index 2c814dc4c..f3932c178 100644
--- a/briar-android/src/main/res/layout/activity_rss_feed_import.xml
+++ b/briar-android/src/main/res/layout/activity_rss_feed_import.xml
@@ -6,7 +6,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical"
-	android:padding="@dimen/margin_small"
+	android:padding="@dimen/margin_medium"
 	tools:context=".android.blog.RssFeedImportActivity">
 
 	<android.support.v7.widget.CardView
@@ -35,7 +35,8 @@
 		android:id="@+id/importButton"
 		style="@style/BriarButton"
 		android:enabled="false"
-		android:text="@string/blogs_rss_feeds_import_button"/>
+		android:text="@string/blogs_rss_feeds_import_button"
+		tools:enabled="true"/>
 
 	<ProgressBar
 		android:id="@+id/progressBar"
@@ -43,6 +44,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center"
-		android:visibility="gone"/>
+		android:visibility="gone"
+		tools:visibility="gone"/>
 
 </LinearLayout>
diff --git a/briar-android/src/main/res/layout/activity_settings.xml b/briar-android/src/main/res/layout/activity_settings.xml
index 4ef0a4157..a75d590ab 100644
--- a/briar-android/src/main/res/layout/activity_settings.xml
+++ b/briar-android/src/main/res/layout/activity_settings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
diff --git a/briar-android/src/main/res/layout/activity_test_data.xml b/briar-android/src/main/res/layout/activity_test_data.xml
index 33a659c86..190cc68c7 100644
--- a/briar-android/src/main/res/layout/activity_test_data.xml
+++ b/briar-android/src/main/res/layout/activity_test_data.xml
@@ -1,178 +1,179 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<ScrollView
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:fillViewport="true"
+	android:padding="@dimen/margin_medium"
+	tools:ignore="HardcodedText">
 
-	<ScrollView
+	<android.support.constraint.ConstraintLayout
 		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:padding="8dp"
-		tools:ignore="HardcodedText">
+		android:layout_height="wrap_content">
 
-		<android.support.constraint.ConstraintLayout
-			xmlns:android="http://schemas.android.com/apk/res/android"
-			xmlns:app="http://schemas.android.com/apk/res-auto"
+		<TextView
+			android:id="@+id/textViewContacts"
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content">
+			android:layout_height="wrap_content"
+			android:layout_margin="@dimen/margin_medium"
+			android:text="Number of contacts"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"/>
 
-			<TextView
-				android:id="@+id/textViewContacts"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_margin="@dimen/margin_medium"
-				android:text="Number of contacts"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toTopOf="parent"/>
+		<SeekBar
+			android:id="@+id/seekBarContacts"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:max="50"
+			android:progress="20"
+			app:layout_constraintEnd_toStartOf="@+id/textViewContactsSb"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/textViewContacts"/>
 
-			<SeekBar
-				android:id="@+id/seekBarContacts"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:max="49"
-				android:progress="20"
-				app:layout_constraintEnd_toStartOf="@+id/textViewContactsSb"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@+id/textViewContacts"/>
+		<TextView
+			android:id="@+id/textViewContactsSb"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:ems="2"
+			android:text="20"
+			app:layout_constraintBottom_toBottomOf="@+id/seekBarContacts"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/textViewContacts"/>
 
-			<TextView
-				android:id="@+id/textViewContactsSb"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:ems="2"
-				android:text="20"
-				app:layout_constraintBottom_toBottomOf="@+id/seekBarContacts"
-				app:layout_constraintEnd_toEndOf="parent"/>
+		<TextView
+			android:id="@+id/textViewMessages"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_margin="@dimen/margin_medium"
+			android:text="Number of messages per contact"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/seekBarContacts"/>
 
+		<SeekBar
+			android:id="@+id/seekBarMessages"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:max="50"
+			android:paddingTop="5dp"
+			android:progress="20"
+			app:layout_constraintEnd_toStartOf="@+id/textViewMessagesSb"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/textViewMessages"/>
 
-			<TextView
-				android:id="@+id/textViewMessages"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_margin="@dimen/margin_medium"
-				android:text="Number of messages per contact"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@+id/seekBarContacts"/>
+		<TextView
+			android:id="@+id/textViewMessagesSb"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:ems="2"
+			android:text="20"
+			app:layout_constraintBottom_toBottomOf="@+id/seekBarMessages"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/textViewMessages"/>
 
-			<SeekBar
-				android:id="@+id/seekBarMessages"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:max="50"
-				android:paddingTop="5dp"
-				android:progress="15"
-				app:layout_constraintEnd_toStartOf="@+id/textViewMessagesSb"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@+id/textViewMessages"/>
+		<TextView
+			android:id="@+id/textViewBlogPosts"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_margin="@dimen/margin_medium"
+			android:text="Number of blog posts"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/seekBarMessages"/>
 
-			<TextView
-				android:id="@+id/textViewMessagesSb"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:ems="2"
-				android:text="20"
-				app:layout_constraintBottom_toBottomOf="@+id/seekBarMessages"
-				app:layout_constraintEnd_toEndOf="parent"/>
+		<SeekBar
+			android:id="@+id/seekBarBlogPosts"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:max="50"
+			android:paddingTop="5dp"
+			android:progress="20"
+			app:layout_constraintEnd_toStartOf="@+id/TextViewBlogPostsSb"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/textViewBlogPosts"/>
 
-			<TextView
-				android:id="@+id/textViewBlogPosts"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_margin="@dimen/margin_medium"
-				android:text="Number of blog posts"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@+id/seekBarMessages"/>
+		<TextView
+			android:id="@+id/TextViewBlogPostsSb"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:ems="2"
+			android:text="20"
+			app:layout_constraintBottom_toBottomOf="@+id/seekBarBlogPosts"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/textViewBlogPosts"/>
 
-			<SeekBar
-				android:id="@+id/seekBarBlogPosts"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:max="50"
-				android:paddingTop="5dp"
-				android:progress="30"
-				app:layout_constraintEnd_toStartOf="@+id/TextViewBlogPostsSb"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@+id/textViewBlogPosts"/>
+		<TextView
+			android:id="@+id/textViewForums"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_margin="@dimen/margin_medium"
+			android:text="Number of forums"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/seekBarBlogPosts"/>
 
-			<TextView
-				android:id="@+id/TextViewBlogPostsSb"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:ems="2"
-				android:text="20"
-				app:layout_constraintBottom_toBottomOf="@+id/seekBarBlogPosts"
-				app:layout_constraintEnd_toEndOf="parent"/>
+		<SeekBar
+			android:id="@+id/seekBarForums"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:max="50"
+			android:paddingTop="5dp"
+			android:progress="5"
+			app:layout_constraintEnd_toStartOf="@+id/TextViewForumsSb"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/textViewForums"/>
 
-			<TextView
-				android:id="@+id/textViewForums"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_margin="@dimen/margin_medium"
-				android:text="Number of forums"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@+id/seekBarBlogPosts"/>
+		<TextView
+			android:id="@+id/TextViewForumsSb"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:ems="2"
+			android:text="5"
+			app:layout_constraintBottom_toBottomOf="@+id/seekBarForums"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/textViewForums"/>
 
-			<SeekBar
-				android:id="@+id/seekBarForums"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:max="10"
-				android:paddingTop="5dp"
-				android:progress="3"
-				app:layout_constraintEnd_toStartOf="@+id/TextViewForumsSb"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@+id/textViewForums"/>
+		<TextView
+			android:id="@+id/textViewForumMessages"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_margin="@dimen/margin_medium"
+			android:text="Number of forum messages"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/seekBarForums"/>
 
-			<TextView
-				android:id="@+id/TextViewForumsSb"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:ems="2"
-				android:text="20"
-				app:layout_constraintBottom_toBottomOf="@+id/seekBarForums"
-				app:layout_constraintEnd_toEndOf="parent"/>
+		<SeekBar
+			android:id="@+id/seekBarForumMessages"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:max="50"
+			android:paddingTop="5dp"
+			android:progress="20"
+			app:layout_constraintEnd_toStartOf="@+id/TextViewForumMessagesSb"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/textViewForumMessages"/>
 
-			<TextView
-				android:id="@+id/textViewForumMessages"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_margin="@dimen/margin_medium"
-				android:text="Number of forum messages"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@+id/seekBarForums"/>
+		<TextView
+			android:id="@+id/TextViewForumMessagesSb"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:ems="2"
+			android:text="20"
+			app:layout_constraintBottom_toBottomOf="@+id/seekBarForumMessages"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/textViewForumMessages"/>
 
-			<SeekBar
-				android:id="@+id/seekBarForumMessages"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:max="50"
-				android:paddingTop="5dp"
-				android:progress="30"
-				app:layout_constraintEnd_toStartOf="@+id/TextViewForumMessagesSb"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@+id/textViewForumMessages"/>
+		<Button
+			android:id="@+id/buttonCreateTestData"
+			style="@style/BriarButton"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_margin="10dp"
+			android:text="Create test data"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/seekBarForumMessages"
+			app:layout_constraintVertical_bias="1.0"/>
+	</android.support.constraint.ConstraintLayout>
 
-			<TextView
-				android:id="@+id/TextViewForumMessagesSb"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:ems="2"
-				android:text="20"
-				app:layout_constraintBottom_toBottomOf="@+id/seekBarForumMessages"
-				app:layout_constraintEnd_toEndOf="parent"/>
-
-			<Button
-				android:id="@+id/buttonCreateTestData"
-				style="@style/BriarButton"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_margin="10dp"
-				android:text="Create test data"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@+id/seekBarForumMessages"/>
-		</android.support.constraint.ConstraintLayout>
-	</ScrollView>
-</android.support.constraint.ConstraintLayout>
+</ScrollView>
diff --git a/briar-android/src/main/res/layout/activity_threaded_conversation.xml b/briar-android/src/main/res/layout/activity_threaded_conversation.xml
index 752b9f491..e5d4941db 100644
--- a/briar-android/src/main/res/layout/activity_threaded_conversation.xml
+++ b/briar-android/src/main/res/layout/activity_threaded_conversation.xml
@@ -26,14 +26,14 @@
 			android:id="@+id/upButton"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_gravity="top|right"
+			android:layout_gravity="top|right|end"
 			app:direction="up"/>
 
 		<org.briarproject.briar.android.view.UnreadMessageButton
 			android:id="@+id/downButton"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_gravity="bottom|right"
+			android:layout_gravity="bottom|right|end"
 			app:direction="down"/>
 
 	</FrameLayout>
diff --git a/briar-android/src/main/res/layout/activity_write_blog_post.xml b/briar-android/src/main/res/layout/activity_write_blog_post.xml
index a70a8c31e..8376d5804 100644
--- a/briar-android/src/main/res/layout/activity_write_blog_post.xml
+++ b/briar-android/src/main/res/layout/activity_write_blog_post.xml
@@ -13,8 +13,8 @@
 		android:layout_height="match_parent"
 		android:gravity="bottom"
 		app:buttonText="@string/blogs_publish_blog_post"
-		app:hint="@string/blogs_write_blog_post_body_hint"
-		app:fillHeight="true"/>
+		app:fillHeight="true"
+		app:hint="@string/blogs_write_blog_post_body_hint"/>
 
 	<ProgressBar
 		android:id="@+id/progressBar"
diff --git a/briar-android/src/main/res/layout/author_view.xml b/briar-android/src/main/res/layout/author_view.xml
index c81b66301..087c7dc0b 100644
--- a/briar-android/src/main/res/layout/author_view.xml
+++ b/briar-android/src/main/res/layout/author_view.xml
@@ -10,6 +10,7 @@
 		android:layout_width="@dimen/blogs_avatar_normal_size"
 		android:layout_height="@dimen/blogs_avatar_normal_size"
 		android:layout_alignTop="@+id/authorName"
+		android:layout_marginEnd="@dimen/margin_medium"
 		android:layout_marginRight="@dimen/margin_medium"
 		tools:src="@mipmap/ic_launcher_round"/>
 
@@ -18,6 +19,7 @@
 		android:layout_width="@dimen/blogs_avatar_icon_size"
 		android:layout_height="@dimen/blogs_avatar_icon_size"
 		android:layout_alignBottom="@+id/avatar"
+		android:layout_alignEnd="@+id/avatar"
 		android:layout_alignRight="@+id/avatar"
 		android:background="@drawable/bubble_white"
 		android:padding="2dp"
@@ -43,6 +45,8 @@
 		android:layout_alignBottom="@+id/authorName"
 		android:layout_alignTop="@+id/authorName"
 		android:layout_marginLeft="@dimen/margin_small"
+		android:layout_marginStart="@dimen/margin_small"
+		android:layout_toEndOf="@id/authorName"
 		android:layout_toRightOf="@id/authorName"
 		android:scaleType="center"
 		tools:src="@drawable/trust_indicator_verified"/>
diff --git a/briar-android/src/main/res/layout/briar_recycler_view.xml b/briar-android/src/main/res/layout/briar_recycler_view.xml
index b0f9b1b19..3578555d5 100644
--- a/briar-android/src/main/res/layout/briar_recycler_view.xml
+++ b/briar-android/src/main/res/layout/briar_recycler_view.xml
@@ -62,8 +62,6 @@
 		android:textSize="@dimen/text_size_large"
 		app:layout_constraintBottom_toTopOf="@+id/emptyAction"
 		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintLeft_toLeftOf="parent"
-		app:layout_constraintRight_toRightOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/emptyImage"
 		tools:text="@string/no_contacts"/>
@@ -79,8 +77,6 @@
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintLeft_toLeftOf="parent"
-		app:layout_constraintRight_toRightOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/emptyText"
 		tools:text="@string/no_contacts_action"/>
diff --git a/briar-android/src/main/res/layout/contact_avatar_status.xml b/briar-android/src/main/res/layout/contact_avatar_status.xml
index 0d47e786e..18fee6a1d 100644
--- a/briar-android/src/main/res/layout/contact_avatar_status.xml
+++ b/briar-android/src/main/res/layout/contact_avatar_status.xml
@@ -19,7 +19,7 @@
 		android:id="@+id/contactStatus"
 		android:layout_width="15dp"
 		android:layout_height="15dp"
-		android:layout_gravity="bottom|right"
+		android:layout_gravity="bottom|end|right"
 		android:scaleType="fitCenter"
 		tools:ignore="ContentDescription"
 		tools:src="@drawable/contact_online"/>
diff --git a/briar-android/src/main/res/layout/dialog_screen_filter.xml b/briar-android/src/main/res/layout/dialog_screen_filter.xml
index b883d16e7..b15e6b310 100644
--- a/briar-android/src/main/res/layout/dialog_screen_filter.xml
+++ b/briar-android/src/main/res/layout/dialog_screen_filter.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical"
-              android:padding="@dimen/margin_large">
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical"
+	android:padding="@dimen/margin_large">
 
 	<ScrollView
 		android:layout_width="wrap_content"
@@ -13,7 +15,8 @@
 		<TextView
 			android:id="@+id/screen_filter_message"
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content"/>
+			android:layout_height="wrap_content"
+			tools:text="@string/screen_filter_body"/>
 
 	</ScrollView>
 
@@ -21,8 +24,8 @@
 		android:id="@+id/screen_filter_checkbox"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_weight="0"
 		android:layout_marginTop="@dimen/margin_large"
+		android:layout_weight="0"
 		android:text="@string/screen_filter_allow"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/fragment_keyagreement_qr.xml b/briar-android/src/main/res/layout/fragment_keyagreement_qr.xml
index f992ee203..c96c725fb 100644
--- a/briar-android/src/main/res/layout/fragment_keyagreement_qr.xml
+++ b/briar-android/src/main/res/layout/fragment_keyagreement_qr.xml
@@ -39,7 +39,7 @@
 				android:layout_height="wrap_content"
 				android:gravity="center"
 				android:paddingTop="@dimen/margin_large"
-				tools:text="Connection failed"/>
+				tools:text="@string/waiting_for_contact_to_scan"/>
 		</LinearLayout>
 
 		<org.briarproject.briar.android.view.QrCodeView
@@ -47,6 +47,9 @@
 			android:layout_width="match_parent"
 			android:layout_height="0dp"
 			android:layout_weight="1"
-			android:background="@android:color/white"/>
+			android:background="@android:color/white"
+			tools:visibility="visible"/>
+
 	</LinearLayout>
+
 </FrameLayout>
diff --git a/briar-android/src/main/res/layout/fragment_link_dialog.xml b/briar-android/src/main/res/layout/fragment_link_dialog.xml
index 328185e42..5d7a52c1c 100644
--- a/briar-android/src/main/res/layout/fragment_link_dialog.xml
+++ b/briar-android/src/main/res/layout/fragment_link_dialog.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
@@ -47,27 +48,28 @@
 
 	</LinearLayout>
 
-	<LinearLayout
+	<android.support.constraint.ConstraintLayout
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal">
+		android:layout_height="@dimen/button_size">
 
 		<Button
 			android:id="@+id/cancelButton"
 			style="@style/BriarButtonFlat.Positive"
-			android:layout_width="wrap_content"
+			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_weight="0.5"
-			android:text="@string/cancel"/>
+			android:text="@string/cancel"
+			app:layout_constraintEnd_toStartOf="@+id/openButton"
+			app:layout_constraintStart_toStartOf="parent"/>
 
 		<Button
 			android:id="@+id/openButton"
 			style="@style/BriarButtonFlat.Negative"
-			android:layout_width="wrap_content"
+			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_weight="0.5"
-			android:text="@string/link_warning_open_link"/>
+			android:text="@string/link_warning_open_link"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toEndOf="@+id/cancelButton"/>
 
-	</LinearLayout>
+	</android.support.constraint.ConstraintLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/fragment_setup_doze.xml b/briar-android/src/main/res/layout/fragment_setup_doze.xml
index 124046fcf..45125a6ee 100644
--- a/briar-android/src/main/res/layout/fragment_setup_doze.xml
+++ b/briar-android/src/main/res/layout/fragment_setup_doze.xml
@@ -10,19 +10,13 @@
 	<android.support.constraint.ConstraintLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		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:padding="@dimen/margin_activity_vertical">
 
 		<org.briarproject.briar.android.login.DozeView
 			android:id="@+id/dozeView"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			app:layout_constraintLeft_toLeftOf="parent"
-			app:layout_constraintRight_toRightOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toTopOf="parent"/>
 
@@ -30,8 +24,8 @@
 			android:id="@+id/huaweiView"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			app:layout_constraintLeft_toLeftOf="parent"
-			app:layout_constraintRight_toRightOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/dozeView"/>
 
 		<Button
@@ -42,8 +36,8 @@
 			android:enabled="false"
 			android:text="@string/create_account_button"
 			app:layout_constraintBottom_toBottomOf="parent"
-			app:layout_constraintLeft_toLeftOf="parent"
-			app:layout_constraintRight_toRightOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/huaweiView"
 			app:layout_constraintVertical_bias="1.0"
 			tools:enabled="true"/>
@@ -55,8 +49,8 @@
 			android:layout_height="wrap_content"
 			android:visibility="invisible"
 			app:layout_constraintBottom_toBottomOf="@+id/next"
-			app:layout_constraintLeft_toLeftOf="parent"
-			app:layout_constraintRight_toRightOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toTopOf="@+id/next"/>
 
 	</android.support.constraint.ConstraintLayout>
diff --git a/briar-android/src/main/res/layout/list_item_blog_post.xml b/briar-android/src/main/res/layout/list_item_blog_post.xml
index 4e741fa34..11c570e69 100644
--- a/briar-android/src/main/res/layout/list_item_blog_post.xml
+++ b/briar-android/src/main/res/layout/list_item_blog_post.xml
@@ -24,6 +24,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_alignParentLeft="true"
+				android:layout_alignParentStart="true"
 				android:layout_alignParentTop="true"
 				android:layout_marginBottom="@dimen/listitem_horizontal_margin"
 				android:layout_toLeftOf="@+id/commentView"
@@ -34,6 +35,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_alignParentLeft="true"
+				android:layout_alignParentStart="true"
 				android:layout_below="@+id/rebloggerView"
 				android:layout_marginBottom="@dimen/listitem_vertical_margin"
 				android:layout_toLeftOf="@+id/commentView"/>
@@ -42,6 +44,7 @@
 				android:id="@+id/commentView"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
+				android:layout_alignParentEnd="true"
 				android:layout_alignParentRight="true"
 				android:layout_alignParentTop="true"
 				android:background="?attr/selectableItemBackground"
diff --git a/briar-android/witness.gradle b/briar-android/witness.gradle
index e262ffb0c..2a5727a16 100644
--- a/briar-android/witness.gradle
+++ b/briar-android/witness.gradle
@@ -11,8 +11,8 @@ dependencyVerification {
         'ch.acra:acra:4.9.1:acra-4.9.1.aar:d2762968c448757a7d6acc9f141881d9632f664988e9723ece33b5f7c79f3bc9',
         'classworlds:classworlds:1.1-alpha-2:classworlds-1.1-alpha-2.jar:2bf4e59f3acd106fea6145a9a88fe8956509f8b9c0fdd11eb96fee757269e3f3',
         'com.almworks.sqlite4java:sqlite4java:0.282:sqlite4java-0.282.jar:9e1d8dd83ca6003f841e3af878ce2dc7c22497493a7bb6d1b62ec1b0d0a83c05',
-        'com.android.support.constraint:constraint-layout-solver:1.1.0:constraint-layout-solver-1.1.0.jar:fcb4c7d705754ca3d69b1b2c3caf445a425599fda8caabbcf855d98ea0663e4e',
-        'com.android.support.constraint:constraint-layout:1.1.0:constraint-layout-1.1.0.aar:d490188709b7bb2f11609beadd7e5eb7538892f308828ec3ff261a74e6ecf47e',
+        'com.android.support.constraint:constraint-layout-solver:1.1.3:constraint-layout-solver-1.1.3.jar:2cafbe356f71c208013d021f32943904798cd6459e5107f9fe27000eb5bc2aef',
+        'com.android.support.constraint:constraint-layout:1.1.3:constraint-layout-1.1.3.aar:27b4e5c0b80d3ff8b92f4c93b3b4d3ecf16c01589f4cdf70ca7cf64cb42d8122',
         'com.android.support.test.espresso:espresso-contrib:3.0.2:espresso-contrib-3.0.2.aar:eacb4a10dde5597b8a6b8668804d4b63e3ae2d46a78192068532922fec0b4a66',
         'com.android.support.test.espresso:espresso-core:3.0.2:espresso-core-3.0.2.aar:f40bf62e26e6f95a9c376c4e318415a77053b7dbb7ec12688eb6fab93dffdf73',
         'com.android.support.test.espresso:espresso-idling-resource:3.0.2:espresso-idling-resource-3.0.2.aar:c6485150f9f4aea1ce9d138f3d60d82ebed3fe35b340a8b1dc975ff01f3b17b2',