diff --git a/briar-android/build.gradle b/briar-android/build.gradle
index 0b39ba153..1bb45a77c 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'
@@ -153,8 +153,9 @@ task verifyTranslations {
 		lc.children().each { value -> translations.add(value.text()) }
 
 		def folders = ["default", "en-US"]
+		def exceptions = ["values-night", "values-v21", "values-ldrtl"]
 		project.file("src/main/res").eachDir { dir ->
-			if (dir.name.startsWith("values-") && !dir.name.endsWith("night") && !dir.name.endsWith("v21")) {
+			if (dir.name.startsWith("values-") && !exceptions.contains(dir.name)) {
 				folders.add(dir.name.substring(7).replace("-r", "-"))
 			}
 		}
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/introduction/IntroductionMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java
index dda025995..7bf01e589 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java
@@ -2,6 +2,7 @@ package org.briarproject.briar.android.introduction;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
 import android.view.LayoutInflater;
@@ -82,8 +83,8 @@ public class IntroductionMessageFragment extends BaseFragment
 	}
 
 	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container,
-			Bundle savedInstanceState) {
+	public View onCreateView(@NonNull LayoutInflater inflater,
+			ViewGroup container, Bundle savedInstanceState) {
 
 		// change toolbar text
 		ActionBar actionBar = introductionActivity.getSupportActionBar();
@@ -182,7 +183,7 @@ public class IntroductionMessageFragment extends BaseFragment
 	}
 
 	@Override
-	public void onSendClick(String text) {
+	public void onSendClick(@NonNull String text) {
 		// disable button to prevent accidental double invitations
 		ui.message.setSendButtonEnabled(false);
 
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/reporting/DevReportActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
index f4bb30d2a..9a5329c6b 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
@@ -292,8 +292,7 @@ public class DevReportActivity extends BaseCrashReportDialog
 						cb.setChecked(required || !excluded);
 						cb.setEnabled(!required);
 						cb.setOnCheckedChangeListener(DevReportActivity.this);
-						TextView title = v.findViewById(R.id.title);
-						title.setText(field.toString());
+						cb.setText(field.toString());
 						TextView content = v.findViewById(R.id.content);
 						content.setText(value);
 						report.addView(v);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationAdapter.java
index 5db6a1f0c..ab08e79b7 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationAdapter.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/InvitationAdapter.java
@@ -1,6 +1,7 @@
 package org.briarproject.briar.android.sharing;
 
 import android.content.Context;
+import android.support.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -26,7 +27,7 @@ public abstract class InvitationAdapter<I extends InvitationItem, VH extends Inv
 	}
 
 	@Override
-	public void onBindViewHolder(VH ui, int position) {
+	public void onBindViewHolder(@NonNull VH ui, int position) {
 		I item = getItemAt(position);
 		if (item == null) return;
 		ui.onBind(item, listener);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemAdapter.java
index 4cf1f630a..15bd410e6 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemAdapter.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemAdapter.java
@@ -1,5 +1,6 @@
 package org.briarproject.briar.android.threaded;
 
+import android.support.annotation.NonNull;
 import android.support.annotation.UiThread;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -36,8 +37,9 @@ public class ThreadItemAdapter<I extends ThreadItem>
 		this.layoutManager = layoutManager;
 	}
 
+	@NonNull
 	@Override
-	public BaseThreadItemViewHolder<I> onCreateViewHolder(
+	public BaseThreadItemViewHolder<I> onCreateViewHolder(@NonNull
 			ViewGroup parent, int viewType) {
 		View v = LayoutInflater.from(parent.getContext())
 				.inflate(R.layout.list_item_thread, parent, false);
@@ -45,7 +47,8 @@ public class ThreadItemAdapter<I extends ThreadItem>
 	}
 
 	@Override
-	public void onBindViewHolder(BaseThreadItemViewHolder<I> ui, int position) {
+	public void onBindViewHolder(@NonNull BaseThreadItemViewHolder<I> ui,
+			int position) {
 		I item = items.get(position);
 		ui.bind(item, listener);
 	}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/AuthorView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/AuthorView.java
index cbb3cc8d0..fa766baa4 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/AuthorView.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/AuthorView.java
@@ -5,11 +5,10 @@ import android.content.res.TypedArray;
 import android.graphics.Typeface;
 import android.support.annotation.DimenRes;
 import android.support.annotation.UiThread;
+import android.support.constraint.ConstraintLayout;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
-import android.view.View;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import org.briarproject.bramble.api.identity.Author;
@@ -30,7 +29,7 @@ import static org.briarproject.bramble.api.identity.Author.Status.OURSELVES;
 import static org.briarproject.briar.android.util.UiUtils.resolveAttribute;
 
 @UiThread
-public class AuthorView extends RelativeLayout {
+public class AuthorView extends ConstraintLayout {
 
 	public static final int NORMAL = 0;
 	public static final int REBLOGGER = 1;
@@ -133,32 +132,24 @@ public class AuthorView extends RelativeLayout {
 				date.setVisibility(VISIBLE);
 				setAvatarSize(R.dimen.blogs_avatar_normal_size);
 				setTextSize(authorName, R.dimen.text_size_small);
-				setCenterVertical(authorName, false);
-				setCenterVertical(trustIndicator, false);
 				break;
 			case REBLOGGER:
 				avatarIcon.setVisibility(VISIBLE);
 				date.setVisibility(VISIBLE);
 				setAvatarSize(R.dimen.blogs_avatar_normal_size);
 				setTextSize(authorName, R.dimen.text_size_small);
-				setCenterVertical(authorName, false);
-				setCenterVertical(trustIndicator, false);
 				break;
 			case COMMENTER:
 				avatarIcon.setVisibility(INVISIBLE);
 				date.setVisibility(VISIBLE);
 				setAvatarSize(R.dimen.blogs_avatar_comment_size);
 				setTextSize(authorName, R.dimen.text_size_tiny);
-				setCenterVertical(authorName, false);
-				setCenterVertical(trustIndicator, false);
 				break;
 			case LIST:
 				avatarIcon.setVisibility(INVISIBLE);
 				date.setVisibility(GONE);
 				setAvatarSize(R.dimen.listitem_picture_size_small);
 				setTextSize(authorName, R.dimen.text_size_medium);
-				setCenterVertical(authorName, true);
-				setCenterVertical(trustIndicator, true);
 				break;
 			case RSS_FEED:
 				avatarIcon.setVisibility(INVISIBLE);
@@ -166,8 +157,6 @@ public class AuthorView extends RelativeLayout {
 				avatar.setImageResource(R.drawable.ic_rss_feed);
 				setAvatarSize(R.dimen.blogs_avatar_normal_size);
 				setTextSize(authorName, R.dimen.text_size_small);
-				setCenterVertical(authorName, false);
-				setCenterVertical(trustIndicator, false);
 				break;
 			case RSS_FEED_REBLOGGED:
 				avatarIcon.setVisibility(INVISIBLE);
@@ -175,8 +164,6 @@ public class AuthorView extends RelativeLayout {
 				avatar.setImageResource(R.drawable.ic_rss_feed);
 				setAvatarSize(R.dimen.blogs_avatar_comment_size);
 				setTextSize(authorName, R.dimen.text_size_tiny);
-				setCenterVertical(authorName, false);
-				setCenterVertical(trustIndicator, false);
 				break;
 		}
 	}
@@ -194,10 +181,4 @@ public class AuthorView extends RelativeLayout {
 		v.setTextSize(COMPLEX_UNIT_PX, textSize);
 	}
 
-	private void setCenterVertical(View v, boolean center) {
-		LayoutParams params = (LayoutParams) v.getLayoutParams();
-		params.addRule(CENTER_VERTICAL, center ? RelativeLayout.TRUE : 0);
-		v.setLayoutParams(params);
-	}
-
 }
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/QrCodeView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/QrCodeView.java
index 32b695622..37a9f206a 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/QrCodeView.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/QrCodeView.java
@@ -19,8 +19,7 @@ public class QrCodeView extends FrameLayout {
     private boolean fullscreen = false;
     private FullscreenListener listener;
 
-    public QrCodeView(@NonNull Context context,
-                      @Nullable AttributeSet attrs) {
+    public QrCodeView(@NonNull Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
         LayoutInflater inflater = (LayoutInflater) context
                 .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAvatarView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAvatarView.java
index b06ba5419..979844796 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAvatarView.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAvatarView.java
@@ -3,7 +3,6 @@ package org.briarproject.briar.android.view;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
 import android.support.annotation.UiThread;
 import android.support.v7.widget.AppCompatTextView;
 import android.util.AttributeSet;
@@ -11,13 +10,11 @@ import android.view.LayoutInflater;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.briar.R;
 
 import javax.annotation.Nullable;
 
 import de.hdodenhof.circleimageview.CircleImageView;
-import im.delight.android.identicons.IdenticonDrawable;
 
 @UiThread
 public class TextAvatarView extends FrameLayout {
@@ -35,7 +32,6 @@ public class TextAvatarView extends FrameLayout {
 		character = findViewById(R.id.textAvatarView);
 		background = findViewById(R.id.avatarBackground);
 		badge = findViewById(R.id.unreadCountView);
-		badge.setVisibility(INVISIBLE);
 	}
 
 	public TextAvatarView(Context context) {
@@ -72,10 +68,4 @@ public class TextAvatarView extends FrameLayout {
 		}
 	}
 
-	public void setAuthorAvatar(Author author) {
-		Drawable drawable = new IdenticonDrawable(author.getId().getBytes());
-		background.setImageDrawable(drawable);
-		character.setVisibility(GONE);
-	}
-
 }
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/view/UnreadMessageButton.java b/briar-android/src/main/java/org/briarproject/briar/android/view/UnreadMessageButton.java
index ae19023dd..c2a59639b 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/UnreadMessageButton.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/UnreadMessageButton.java
@@ -49,7 +49,7 @@ public class UnreadMessageButton extends FrameLayout {
 		setDirection(direction);
 		attributes.recycle();
 
-		setUnreadCount(0);
+		if (!isInEditMode()) setUnreadCount(0);
 	}
 
 	private void setDirection(int direction) {
@@ -64,11 +64,11 @@ public class UnreadMessageButton extends FrameLayout {
 
 	public void setUnreadCount(int count) {
 		if (count == 0) {
-			setVisibility(INVISIBLE);
+			fab.hide();
+			unread.setVisibility(INVISIBLE);
 		} else {
-			// FIXME: Use animations when upgrading to support library 24.2.0
-			//        https://code.google.com/p/android/issues/detail?id=216469
-			setVisibility(VISIBLE);
+			fab.show();
+			unread.setVisibility(VISIBLE);
 			unread.setText(String.valueOf(count));
 		}
 	}
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/level_indicator_circle.xml b/briar-android/src/main/res/drawable/level_indicator_circle.xml
index 4b4869111..3fa8ee54e 100644
--- a/briar-android/src/main/res/drawable/level_indicator_circle.xml
+++ b/briar-android/src/main/res/drawable/level_indicator_circle.xml
@@ -3,9 +3,9 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:shape="oval">
 
-	<solid android:color="@color/window_background"/>
+	<solid android:color="@color/thread_item_background"/>
 
 	<stroke
-		android:width="2dp"
+		android:width="@dimen/forum_nested_line_width"
 		android:color="@color/thread_indicator"/>
 </shape>
\ No newline at end of file
diff --git a/briar-android/src/main/res/drawable/message_delivered.xml b/briar-android/src/main/res/drawable/message_delivered.xml
index 885356268..c8cbedd5b 100644
--- a/briar-android/src/main/res/drawable/message_delivered.xml
+++ b/briar-android/src/main/res/drawable/message_delivered.xml
@@ -1,8 +1,10 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="16dp"
-        android:height="16dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0">
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="16dp"
+	android:height="16dp"
+	android:autoMirrored="true"
+	android:viewportHeight="24.0"
+	android:viewportWidth="24.0">
 	<path
 		android:fillColor="#FF000000"
 		android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zm4.24,-1.41L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/>
diff --git a/briar-android/src/main/res/drawable/message_delivered_white.xml b/briar-android/src/main/res/drawable/message_delivered_white.xml
index 720dab1f7..72ae1f631 100644
--- a/briar-android/src/main/res/drawable/message_delivered_white.xml
+++ b/briar-android/src/main/res/drawable/message_delivered_white.xml
@@ -1,5 +1,11 @@
-<vector android:height="16dp"
-	android:viewportHeight="24.0" android:viewportWidth="24.0"
-	android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-	<path android:fillColor="#FFFFFFFF" android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zm4.24,-1.41L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/>
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="16dp"
+	android:height="16dp"
+	android:autoMirrored="true"
+	android:viewportHeight="24.0"
+	android:viewportWidth="24.0">
+	<path
+		android:fillColor="#FFFFFFFF"
+		android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zm4.24,-1.41L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/>
 </vector>
diff --git a/briar-android/src/main/res/drawable/message_sent.xml b/briar-android/src/main/res/drawable/message_sent.xml
index a205b178d..b3c045afa 100644
--- a/briar-android/src/main/res/drawable/message_sent.xml
+++ b/briar-android/src/main/res/drawable/message_sent.xml
@@ -1,8 +1,10 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="16dp"
-        android:height="16dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0">
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="16dp"
+	android:height="16dp"
+	android:autoMirrored="true"
+	android:viewportHeight="24.0"
+	android:viewportWidth="24.0">
 	<path
 		android:fillColor="#FF000000"
 		android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
diff --git a/briar-android/src/main/res/drawable/message_sent_white.xml b/briar-android/src/main/res/drawable/message_sent_white.xml
index 59e6d6d1d..33ec48f0c 100644
--- a/briar-android/src/main/res/drawable/message_sent_white.xml
+++ b/briar-android/src/main/res/drawable/message_sent_white.xml
@@ -1,5 +1,11 @@
-<vector android:height="16dp"
-	android:viewportHeight="24.0" android:viewportWidth="24.0"
-	android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-	<path android:fillColor="#FFFFFFFF" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="16dp"
+	android:height="16dp"
+	android:autoMirrored="true"
+	android:viewportHeight="24.0"
+	android:viewportWidth="24.0">
+	<path
+		android:fillColor="#FFFFFFFF"
+		android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
 </vector>
diff --git a/briar-android/src/main/res/drawable/msg_in.xml b/briar-android/src/main/res/drawable/msg_in.xml
index 14b8d7d83..b0a822b8c 100644
--- a/briar-android/src/main/res/drawable/msg_in.xml
+++ b/briar-android/src/main/res/drawable/msg_in.xml
@@ -5,8 +5,8 @@
 	<corners
 		android:bottomLeftRadius="@dimen/message_bubble_radius_big"
 		android:bottomRightRadius="@dimen/message_bubble_radius_big"
-		android:topLeftRadius="@dimen/message_bubble_radius_small"
-		android:topRightRadius="@dimen/message_bubble_radius_big"/>
+		android:topLeftRadius="@dimen/message_bubble_radius_top_inner"
+		android:topRightRadius="@dimen/message_bubble_radius_top_outer"/>
 	<padding
 		android:bottom="@dimen/message_bubble_padding_bottom"
 		android:left="@dimen/message_bubble_padding_sides"
diff --git a/briar-android/src/main/res/drawable/msg_in_top.xml b/briar-android/src/main/res/drawable/msg_in_top.xml
index 236c82b75..52d95b2e5 100644
--- a/briar-android/src/main/res/drawable/msg_in_top.xml
+++ b/briar-android/src/main/res/drawable/msg_in_top.xml
@@ -5,8 +5,8 @@
 	<corners
 		android:bottomLeftRadius="0dp"
 		android:bottomRightRadius="0dp"
-		android:topLeftRadius="@dimen/message_bubble_radius_small"
-		android:topRightRadius="@dimen/message_bubble_radius_big"/>
+		android:topLeftRadius="@dimen/message_bubble_radius_top_inner"
+		android:topRightRadius="@dimen/message_bubble_radius_top_outer"/>
 	<padding
 		android:bottom="@dimen/message_bubble_padding_top"
 		android:left="@dimen/message_bubble_padding_sides"
diff --git a/briar-android/src/main/res/drawable/msg_out.xml b/briar-android/src/main/res/drawable/msg_out.xml
index 35fa220ad..501294677 100644
--- a/briar-android/src/main/res/drawable/msg_out.xml
+++ b/briar-android/src/main/res/drawable/msg_out.xml
@@ -5,8 +5,8 @@
 	<corners
 		android:bottomLeftRadius="@dimen/message_bubble_radius_big"
 		android:bottomRightRadius="@dimen/message_bubble_radius_big"
-		android:topLeftRadius="@dimen/message_bubble_radius_big"
-		android:topRightRadius="@dimen/message_bubble_radius_small"/>
+		android:topLeftRadius="@dimen/message_bubble_radius_top_outer"
+		android:topRightRadius="@dimen/message_bubble_radius_top_inner"/>
 	<padding
 		android:bottom="@dimen/message_bubble_padding_bottom"
 		android:left="@dimen/message_bubble_padding_sides"
diff --git a/briar-android/src/main/res/drawable/msg_out_top.xml b/briar-android/src/main/res/drawable/msg_out_top.xml
index fe6299634..87c1b2cec 100644
--- a/briar-android/src/main/res/drawable/msg_out_top.xml
+++ b/briar-android/src/main/res/drawable/msg_out_top.xml
@@ -5,8 +5,8 @@
 	<corners
 		android:bottomLeftRadius="0dp"
 		android:bottomRightRadius="0dp"
-		android:topLeftRadius="@dimen/message_bubble_radius_big"
-		android:topRightRadius="@dimen/message_bubble_radius_small"/>
+		android:topLeftRadius="@dimen/message_bubble_radius_top_outer"
+		android:topRightRadius="@dimen/message_bubble_radius_top_inner"/>
 	<padding
 		android:bottom="@dimen/message_bubble_padding_top"
 		android:left="@dimen/message_bubble_padding_sides"
diff --git a/briar-android/src/main/res/drawable/notice_in.xml b/briar-android/src/main/res/drawable/notice_in.xml
index fbfaa069b..c6d8dd745 100644
--- a/briar-android/src/main/res/drawable/notice_in.xml
+++ b/briar-android/src/main/res/drawable/notice_in.xml
@@ -5,8 +5,8 @@
 	<corners
 		android:bottomLeftRadius="@dimen/message_bubble_radius_big"
 		android:bottomRightRadius="@dimen/message_bubble_radius_big"
-		android:topLeftRadius="@dimen/message_bubble_radius_small"
-		android:topRightRadius="@dimen/message_bubble_radius_big"/>
+		android:topLeftRadius="@dimen/message_bubble_radius_top_inner"
+		android:topRightRadius="@dimen/message_bubble_radius_top_outer"/>
 	<padding
 		android:bottom="@dimen/message_bubble_padding_bottom"
 		android:left="@dimen/message_bubble_padding_sides"
diff --git a/briar-android/src/main/res/drawable/notice_out.xml b/briar-android/src/main/res/drawable/notice_out.xml
index 8734935cf..bc2097b9a 100644
--- a/briar-android/src/main/res/drawable/notice_out.xml
+++ b/briar-android/src/main/res/drawable/notice_out.xml
@@ -5,8 +5,8 @@
 	<corners
 		android:bottomLeftRadius="@dimen/message_bubble_radius_big"
 		android:bottomRightRadius="@dimen/message_bubble_radius_big"
-		android:topLeftRadius="@dimen/message_bubble_radius_big"
-		android:topRightRadius="@dimen/message_bubble_radius_small"/>
+		android:topLeftRadius="@dimen/message_bubble_radius_top_outer"
+		android:topRightRadius="@dimen/message_bubble_radius_top_inner"/>
 	<padding
 		android:bottom="@dimen/message_bubble_padding_bottom"
 		android:left="@dimen/message_bubble_padding_sides"
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/drawable/social_send_now_white.xml b/briar-android/src/main/res/drawable/social_send_now_white.xml
index 43662f48b..57bd86462 100644
--- a/briar-android/src/main/res/drawable/social_send_now_white.xml
+++ b/briar-android/src/main/res/drawable/social_send_now_white.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
+        android:autoMirrored="true"
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
 	<path
diff --git a/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml b/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml
index f25b2c554..b7c0714ca 100644
--- a/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml
+++ b/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml
@@ -26,7 +26,8 @@
 			app:layout_constraintBottom_toBottomOf="@id/explanationText"
 			app:layout_constraintEnd_toStartOf="@id/explanationText"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent"/>
+			app:layout_constraintTop_toTopOf="parent"
+			tools:ignore="ContentDescription"/>
 
 		<ImageView
 			android:id="@+id/explanationImage"
@@ -34,8 +35,8 @@
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
 			android:adjustViewBounds="true"
-			android:paddingLeft="@dimen/margin_large"
-			android:paddingRight="@dimen/margin_large"
+			android:paddingEnd="@dimen/margin_large"
+			android:paddingStart="@dimen/margin_large"
 			android:paddingTop="@dimen/margin_large"
 			android:scaleType="fitCenter"
 			android:src="@drawable/qr_code_explanation"
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..fad60ccbc 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"
@@ -22,9 +22,11 @@
 			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:layout_constraintLeft_toLeftOf="parent"
+			app:layout_constraintRight_toRightOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
 			app:passwordToggleEnabled="true">
 
 			<EditText
@@ -40,10 +42,11 @@
 			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:layout_constraintLeft_toLeftOf="parent"
+			app:layout_constraintRight_toRightOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/current_password_entry_wrapper"
 			app:passwordToggleEnabled="true">
 
 			<EditText
@@ -59,10 +62,11 @@
 			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:layout_constraintLeft_toLeftOf="parent"
+			app:layout_constraintRight_toRightOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/new_password_entry_wrapper"
 			app:passwordToggleEnabled="true">
 
 			<EditText
@@ -79,30 +83,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_constraintLeft_toLeftOf="parent"
+			app:layout_constraintRight_toRightOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/new_password_confirm_wrapper"/>
 
 		<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"
+			app:layout_constraintLeft_toLeftOf="parent"
+			app:layout_constraintRight_toRightOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/strength_meter"
 			tools:enabled="true"/>
 
 		<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_constraintLeft_toLeftOf="parent"
+			app:layout_constraintRight_toRightOf="parent"
+			app:layout_constraintTop_toTopOf="@id/change_password"/>
 
-	</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..06c053128 100644
--- a/briar-android/src/main/res/layout/activity_conversation.xml
+++ b/briar-android/src/main/res/layout/activity_conversation.xml
@@ -20,20 +20,23 @@
 
 			<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"
-					tools:text="Contact Name"/>
+					android:maxLines="1"
+					android:ellipsize="end"
+					android:textColor="@color/action_bar_text"
+					tools:text="Contact Name of someone who chose a long 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..cd14a34c4 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,220 @@
 <?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"
+			android:layout_marginTop="@dimen/margin_large"
+			app:hintEnabled="false"
+			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"
+				android:maxLines="5"
+				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:hintEnabled="false"
+			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_constraintEnd_toStartOf="@+id/chevron"
+			app:layout_constraintStart_toStartOf="parent"
+			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_constraintEnd_toEndOf="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="match_parent"
+			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:gravity="center_horizontal"
+				android:orientation="vertical"
+				android:paddingBottom="@dimen/listitem_height_one_line_avatar"
+				android:paddingEnd="@dimen/margin_large"
+				android:paddingStart="@dimen/margin_large"
+				android:paddingTop="@dimen/margin_small"
+				android:visibility="gone"
+				tools:visibility="visible"/>
 
-				<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"/>
+		</ScrollView>
 
-			</android.support.design.widget.TextInputLayout>
+		<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_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/include_debug_report"
+			tools:visibility="visible"/>
 
-			<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"/>
+	</android.support.constraint.ConstraintLayout>
 
-			<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:visibility="gone"/>
-
-		</RelativeLayout>
-	</LinearLayout>
-
-	<RelativeLayout
+	<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_constraintBottom_toTopOf="@+id/fault"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:layout_constraintVertical_chainStyle="packed"
+			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_constraintBottom_toTopOf="@+id/pleaseSend"
+			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_constraintBottom_toTopOf="@+id/encrypted"
+			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_constraintBottom_toTopOf="@+id/acceptButton"
+			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:text="@string/close"
+			app:layout_constraintBottom_toBottomOf="@+id/acceptButton"
+			app:layout_constraintEnd_toStartOf="@+id/acceptButton"
+			app:layout_constraintHorizontal_weight="1"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="@+id/acceptButton"/>
 
 		<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"/>
 
-	</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..14a046abd 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="49"
+			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..ed332fedf 100644
--- a/briar-android/src/main/res/layout/author_view.xml
+++ b/briar-android/src/main/res/layout/author_view.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge
+	android:id="@+id/merge"
 	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"
+	tools:layout_height="wrap_content"
+	tools:layout_width="match_parent"
+	tools:parentTag="android.support.constraint.ConstraintLayout"
 	tools:showIn="@layout/list_item_blog_post">
 
 	<de.hdodenhof.circleimageview.CircleImageView
@@ -9,54 +14,62 @@
 		style="@style/BriarAvatar"
 		android:layout_width="@dimen/blogs_avatar_normal_size"
 		android:layout_height="@dimen/blogs_avatar_normal_size"
-		android:layout_alignTop="@+id/authorName"
-		android:layout_marginRight="@dimen/margin_medium"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toStartOf="@+id/authorName"
+		app:layout_constraintHorizontal_bias="0.0"
+		app:layout_constraintHorizontal_chainStyle="packed"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
 		tools:src="@mipmap/ic_launcher_round"/>
 
 	<ImageView
 		android:id="@+id/avatarIcon"
 		android:layout_width="@dimen/blogs_avatar_icon_size"
 		android:layout_height="@dimen/blogs_avatar_icon_size"
-		android:layout_alignBottom="@+id/avatar"
-		android:layout_alignRight="@+id/avatar"
 		android:background="@drawable/bubble_white"
+		android:contentDescription="@string/blogs_reblog_button"
 		android:padding="2dp"
 		android:scaleType="fitCenter"
 		android:src="@drawable/ic_repeat"
 		android:visibility="invisible"
-		tools:ignore="ContentDescription"/>
+		app:layout_constraintBottom_toBottomOf="@+id/avatar"
+		app:layout_constraintEnd_toEndOf="@+id/avatar"/>
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/authorName"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_toEndOf="@+id/avatar"
-		android:layout_toRightOf="@+id/avatar"
+		android:layout_marginEnd="@dimen/margin_medium"
+		android:layout_marginStart="@dimen/margin_medium"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_small"
-		tools:text="Author Name"/>
+		app:layout_constrainedWidth="true"
+		app:layout_constraintEnd_toStartOf="@+id/trustIndicator"
+		app:layout_constraintStart_toEndOf="@+id/avatar"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:text="Author View that can have a long name"/>
 
 	<org.briarproject.briar.android.view.TrustIndicatorView
 		android:id="@+id/trustIndicator"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_alignBottom="@+id/authorName"
-		android:layout_alignTop="@+id/authorName"
-		android:layout_marginLeft="@dimen/margin_small"
-		android:layout_toRightOf="@id/authorName"
-		android:scaleType="center"
+		app:layout_constraintBottom_toBottomOf="@+id/authorName"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@+id/authorName"
+		app:layout_constraintTop_toTopOf="@+id/authorName"
+		app:layout_goneMarginEnd="0dp"
+		app:layout_goneMarginStart="0dp"
 		tools:src="@drawable/trust_indicator_verified"/>
 
 	<TextView
 		android:id="@+id/dateView"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_below="@+id/authorName"
-		android:layout_toEndOf="@+id/avatar"
-		android:layout_toRightOf="@+id/avatar"
-		android:gravity="bottom"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_tiny"
-		tools:text="yesterday"/>
+		app:layout_constraintStart_toStartOf="@+id/authorName"
+		app:layout_constraintTop_toBottomOf="@+id/authorName"
+		tools:text="yesterday"
+		tools:visibility="visible"/>
 
 </merge>
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..eeed62851 100644
--- a/briar-android/src/main/res/layout/briar_recycler_view.xml
+++ b/briar-android/src/main/res/layout/briar_recycler_view.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout
-	android:id="@+id/relativeLayout"
 	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"
@@ -62,8 +61,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 +76,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_blog_post.xml b/briar-android/src/main/res/layout/fragment_blog_post.xml
index 3fdce0b1c..312d7704c 100644
--- a/briar-android/src/main/res/layout/fragment_blog_post.xml
+++ b/briar-android/src/main/res/layout/fragment_blog_post.xml
@@ -5,7 +5,7 @@
 	android:layout_height="match_parent">
 
 	<FrameLayout
-		android:layout_width="wrap_content"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:descendantFocusability="beforeDescendants"
 		android:focusable="true"
@@ -17,7 +17,7 @@
 			android:id="@+id/postLayout"
 			style="@style/BriarCard"
 			layout="@layout/list_item_blog_post"
-			android:layout_width="wrap_content"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"/>
 
 		<ProgressBar
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/introduction_message.xml b/briar-android/src/main/res/layout/introduction_message.xml
index 303352afa..33e6519e0 100644
--- a/briar-android/src/main/res/layout/introduction_message.xml
+++ b/briar-android/src/main/res/layout/introduction_message.xml
@@ -7,113 +7,121 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-	<LinearLayout
+	<android.support.constraint.ConstraintLayout
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="vertical">
+		android:layout_height="wrap_content">
 
-		<LinearLayout
-			android:layout_width="match_parent"
+		<de.hdodenhof.circleimageview.CircleImageView
+			android:id="@+id/avatarContact1"
+			style="@style/BriarAvatar"
+			android:layout_width="42dp"
 			android:layout_height="wrap_content"
-			android:layout_margin="@dimen/margin_activity_horizontal"
+			android:layout_margin="@dimen/margin_large"
+			app:layout_constraintEnd_toStartOf="@+id/introductionIcon"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			tools:src="@mipmap/ic_launcher_round"/>
+
+		<com.vanniktech.emoji.EmojiTextView
+			android:id="@+id/nameContact1"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginEnd="@dimen/margin_large"
+			android:layout_marginStart="@dimen/margin_large"
+			android:layout_marginTop="@dimen/margin_medium"
 			android:gravity="center"
-			android:orientation="horizontal">
+			android:textColor="?android:attr/textColorPrimary"
+			android:textSize="@dimen/text_size_small"
+			app:layout_constraintEnd_toStartOf="@+id/introductionIcon"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/avatarContact1"
+			tools:text="Contact 1"/>
 
-			<LinearLayout
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:gravity="top|center_horizontal"
-				android:orientation="vertical">
+		<android.support.v7.widget.AppCompatImageView
+			android:id="@+id/introductionIcon"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_margin="@dimen/margin_large"
+			android:src="@drawable/ic_contact_introduction"
+			app:layout_constraintBottom_toBottomOf="@+id/barrier"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="@+id/avatarContact2"
+			app:tint="?attr/colorControlNormal"
+			tools:ignore="ContentDescription"/>
 
-				<de.hdodenhof.circleimageview.CircleImageView
-					android:id="@+id/avatarContact1"
-					style="@style/BriarAvatar"
-					android:layout_width="@dimen/listitem_picture_size"
-					android:layout_height="@dimen/listitem_picture_size"
-					android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-					android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-					android:layout_marginRight="@dimen/listitem_horizontal_margin"
-					android:layout_marginStart="@dimen/listitem_horizontal_margin"
-					tools:src="@mipmap/ic_launcher_round"/>
+		<de.hdodenhof.circleimageview.CircleImageView
+			android:id="@+id/avatarContact2"
+			style="@style/BriarAvatar"
+			android:layout_width="42dp"
+			android:layout_height="wrap_content"
+			android:layout_margin="@dimen/margin_large"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toEndOf="@+id/introductionIcon"
+			app:layout_constraintTop_toTopOf="parent"
+			tools:src="@mipmap/ic_launcher_round"/>
 
-				<com.vanniktech.emoji.EmojiTextView
-					android:id="@+id/nameContact1"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_marginTop="@dimen/margin_small"
-					android:gravity="center"
-					android:textColor="?android:attr/textColorPrimary"
-					android:textSize="@dimen/text_size_small"
-					tools:text="Contact 1"/>
+		<com.vanniktech.emoji.EmojiTextView
+			android:id="@+id/nameContact2"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginEnd="@dimen/margin_large"
+			android:layout_marginStart="@dimen/margin_large"
+			android:layout_marginTop="@dimen/margin_medium"
+			android:gravity="center"
+			android:textColor="?android:attr/textColorPrimary"
+			android:textSize="@dimen/text_size_small"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toEndOf="@+id/introductionIcon"
+			app:layout_constraintTop_toBottomOf="@+id/avatarContact2"
+			tools:text="Contact 2 can have quite a long name"/>
 
-			</LinearLayout>
-
-			<android.support.v7.widget.AppCompatImageView
-				android:id="@+id/introductionIcon"
-				android:layout_width="@dimen/listitem_picture_size"
-				android:layout_height="@dimen/listitem_picture_size"
-				android:src="@drawable/ic_contact_introduction"
-				app:tint="?attr/colorControlNormal"
-				tools:ignore="ContentDescription"/>
-
-			<LinearLayout
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:gravity="top|center_horizontal"
-				android:orientation="vertical">
-
-				<de.hdodenhof.circleimageview.CircleImageView
-					android:id="@+id/avatarContact2"
-					style="@style/BriarAvatar"
-					android:layout_width="@dimen/listitem_picture_size"
-					android:layout_height="@dimen/listitem_picture_size"
-					android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-					android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-					android:layout_marginRight="@dimen/listitem_horizontal_margin"
-					android:layout_marginStart="@dimen/listitem_horizontal_margin"
-					tools:src="@mipmap/ic_launcher_round"/>
-
-				<com.vanniktech.emoji.EmojiTextView
-					android:id="@+id/nameContact2"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_marginTop="@dimen/margin_small"
-					android:gravity="center"
-					android:textColor="?android:attr/textColorPrimary"
-					android:textSize="@dimen/text_size_small"
-					tools:text="Contact 2"/>
-
-			</LinearLayout>
-
-		</LinearLayout>
+		<android.support.constraint.Barrier
+			android:id="@+id/barrier"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			app:barrierDirection="bottom"
+			app:constraint_referenced_ids="nameContact1,nameContact2"/>
 
 		<ProgressBar
 			android:id="@+id/progressBar"
 			style="?android:attr/progressBarStyleLarge"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_gravity="center"
+			android:layout_margin="@dimen/margin_large"
+			app:layout_constraintBottom_toTopOf="@+id/introductionNotPossibleView"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="@+id/barrier"
 			tools:visibility="gone"/>
 
 		<TextView
 			android:id="@+id/introductionNotPossibleView"
-			android:layout_width="match_parent"
+			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_margin="@dimen/margin_activity_horizontal"
+			android:layout_margin="@dimen/margin_large"
 			android:text="@string/introduction_not_possible"
 			android:textSize="@dimen/text_size_large"
 			android:visibility="gone"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/progressBar"
 			tools:visibility="visible"/>
 
 		<org.briarproject.briar.android.view.LargeTextInputView
 			android:id="@+id/introductionMessageView"
-			android:layout_width="match_parent"
+			android:layout_width="0dp"
 			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/margin_large"
 			android:visibility="gone"
 			app:buttonText="@string/introduction_button"
 			app:hint="@string/introduction_message_hint"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/introductionNotPossibleView"
 			app:maxLines="5"
 			tools:visibility="visible"/>
 
-	</LinearLayout>
+	</android.support.constraint.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/list_item_blog_comment.xml b/briar-android/src/main/res/layout/list_item_blog_comment.xml
index f4af71dca..6c20a7a0c 100644
--- a/briar-android/src/main/res/layout/list_item_blog_comment.xml
+++ b/briar-android/src/main/res/layout/list_item_blog_comment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<android.support.constraint.ConstraintLayout
 	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"
@@ -9,27 +9,32 @@
 
 	<View
 		android:id="@+id/inputDivider"
-		style="@style/Divider.Horizontal"/>
+		style="@style/Divider.Horizontal"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"/>
 
 	<org.briarproject.briar.android.view.AuthorView
 		android:id="@+id/authorView"
-		android:layout_width="wrap_content"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_alignParentLeft="true"
-		android:layout_alignParentTop="true"
 		android:padding="@dimen/listitem_vertical_margin"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
 		app:persona="commenter"/>
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/bodyView"
-		android:layout_width="wrap_content"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_below="@+id/authorView"
 		android:paddingBottom="@dimen/listitem_vertical_margin"
-		android:paddingLeft="@dimen/listitem_vertical_margin"
-		android:paddingRight="@dimen/listitem_vertical_margin"
+		android:paddingEnd="@dimen/listitem_vertical_margin"
+		android:paddingStart="@dimen/listitem_vertical_margin"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/authorView"
 		tools:text="This is a comment that appears below a blog post. Usually, it is expected to be rather short. Not much longer than this one."/>
 
-</RelativeLayout>
+</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..c772f7979 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
@@ -9,63 +9,67 @@
 	android:layout_height="wrap_content"
 	android:foreground="?attr/selectableItemBackground">
 
-	<LinearLayout
+	<android.support.constraint.ConstraintLayout
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="vertical">
+		android:layout_height="wrap_content">
 
-		<RelativeLayout
-			android:layout_width="match_parent"
+		<org.briarproject.briar.android.view.AuthorView
+			android:id="@+id/rebloggerView"
+			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:padding="@dimen/listitem_vertical_margin">
+			android:layout_marginBottom="@dimen/listitem_horizontal_margin"
+			android:layout_marginEnd="@dimen/listitem_vertical_margin"
+			android:layout_marginStart="@dimen/listitem_vertical_margin"
+			android:layout_marginTop="@dimen/listitem_vertical_margin"
+			app:layout_constraintEnd_toStartOf="@+id/commentView"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:persona="reblogger"/>
 
-			<org.briarproject.briar.android.view.AuthorView
-				android:id="@+id/rebloggerView"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentLeft="true"
-				android:layout_alignParentTop="true"
-				android:layout_marginBottom="@dimen/listitem_horizontal_margin"
-				android:layout_toLeftOf="@+id/commentView"
-				app:persona="reblogger"/>
+		<org.briarproject.briar.android.view.AuthorView
+			android:id="@+id/authorView"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="@dimen/listitem_horizontal_margin"
+			android:layout_marginEnd="@dimen/listitem_vertical_margin"
+			android:layout_marginStart="@dimen/listitem_vertical_margin"
+			android:layout_marginTop="@dimen/listitem_vertical_margin"
+			app:layout_constraintEnd_toStartOf="@+id/commentView"
+			app:layout_constraintLeft_toLeftOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/rebloggerView"/>
 
-			<org.briarproject.briar.android.view.AuthorView
-				android:id="@+id/authorView"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentLeft="true"
-				android:layout_below="@+id/rebloggerView"
-				android:layout_marginBottom="@dimen/listitem_vertical_margin"
-				android:layout_toLeftOf="@+id/commentView"/>
+		<android.support.v7.widget.AppCompatImageButton
+			android:id="@+id/commentView"
+			android:layout_width="@dimen/button_size"
+			android:layout_height="@dimen/button_size"
+			android:background="?attr/selectableItemBackgroundBorderless"
+			android:contentDescription="@string/blogs_reblog_comment_hint"
+			android:src="@drawable/ic_repeat"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:tint="?attr/colorControlNormal"/>
 
-			<android.support.v7.widget.AppCompatImageButton
-				android:id="@+id/commentView"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentRight="true"
-				android:layout_alignParentTop="true"
-				android:background="?attr/selectableItemBackground"
-				android:contentDescription="@string/blogs_reblog_comment_hint"
-				android:padding="@dimen/margin_small"
-				android:src="@drawable/ic_repeat"
-				app:tint="?attr/colorControlNormal"/>
-
-			<com.vanniktech.emoji.EmojiTextView
-				android:id="@+id/bodyView"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_below="@+id/authorView"
-				android:textColor="?android:attr/textColorSecondary"
-				android:textSize="@dimen/text_size_medium"
-				tools:text="This is a body text that shows the content of a blog post.\n\nThis one is not short, but it is also not too long."/>
-
-		</RelativeLayout>
+		<com.vanniktech.emoji.EmojiTextView
+			android:id="@+id/bodyView"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_margin="@dimen/listitem_vertical_margin"
+			android:textColor="?android:attr/textColorSecondary"
+			android:textSize="@dimen/text_size_medium"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/authorView"
+			tools:text="This is a body text that shows the content of a blog post.\n\nThis one is not short, but it is also not too long."/>
 
+		<!-- TODO replace with RecyclerView -->
 		<LinearLayout
 			android:id="@+id/commentContainer"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:orientation="vertical">
+			android:layout_marginTop="@dimen/listitem_vertical_margin"
+			android:orientation="vertical"
+			app:layout_constraintTop_toBottomOf="@+id/bodyView">
 
 			<include
 				layout="@layout/list_item_blog_comment"
@@ -74,6 +78,6 @@
 
 		</LinearLayout>
 
-	</LinearLayout>
+	</android.support.constraint.ConstraintLayout>
 
 </android.support.v7.widget.CardView>
diff --git a/briar-android/src/main/res/layout/list_item_contact.xml b/briar-android/src/main/res/layout/list_item_contact.xml
index 10c540df7..834801e1a 100644
--- a/briar-android/src/main/res/layout/list_item_contact.xml
+++ b/briar-android/src/main/res/layout/list_item_contact.xml
@@ -1,95 +1,100 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<android.support.constraint.ConstraintLayout
+	android:id="@+id/linearLayout4"
 	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="wrap_content"
 	android:background="?attr/selectableItemBackground"
 	android:clickable="true"
-	android:focusable="true"
-	android:orientation="vertical">
+	android:focusable="true">
 
-	<RelativeLayout
-		android:layout_width="match_parent"
+	<FrameLayout
+		android:id="@+id/avatarFrameView"
+		android:layout_width="@dimen/listitem_picture_frame_size"
+		android:layout_height="@dimen/listitem_picture_frame_size"
+		android:layout_margin="@dimen/listitem_horizontal_margin"
+		app:layout_constraintBottom_toTopOf="@+id/divider"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent">
+
+		<de.hdodenhof.circleimageview.CircleImageView
+			android:id="@+id/avatarView"
+			style="@style/BriarAvatar"
+			android:layout_width="@dimen/listitem_picture_size"
+			android:layout_height="@dimen/listitem_picture_size"
+			android:layout_gravity="bottom|left|start"
+			tools:src="@mipmap/ic_launcher_round"/>
+
+	</FrameLayout>
+
+	<TextView
+		android:id="@+id/unreadCountView"
+		android:layout_width="wrap_content"
+		android:layout_height="@dimen/unread_bubble_size"
+		android:background="@drawable/bubble"
+		android:gravity="center"
+		android:minWidth="@dimen/unread_bubble_size"
+		android:textColor="@color/briar_text_primary_inverse"
+		android:textSize="@dimen/unread_bubble_text_size"
+		android:textStyle="bold"
+		app:layout_constraintEnd_toEndOf="@+id/avatarFrameView"
+		app:layout_constraintTop_toTopOf="@+id/avatarFrameView"
+		tools:text="123"/>
+
+	<com.vanniktech.emoji.EmojiTextView
+		android:id="@+id/nameView"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:paddingBottom="@dimen/listitem_horizontal_margin"
-		android:paddingTop="@dimen/listitem_horizontal_margin">
+		android:layout_marginEnd="@dimen/margin_medium"
+		android:layout_marginStart="@dimen/margin_medium"
+		android:layout_marginTop="@dimen/listitem_vertical_margin"
+		android:paddingEnd="@dimen/margin_medium"
+		android:paddingStart="@dimen/margin_medium"
+		android:textColor="?android:attr/textColorPrimary"
+		android:textSize="@dimen/text_size_medium"
+		app:layout_constraintBottom_toTopOf="@+id/dateView"
+		app:layout_constraintEnd_toStartOf="@+id/bulbView"
+		app:layout_constraintStart_toEndOf="@+id/avatarFrameView"
+		app:layout_constraintTop_toTopOf="parent"
+		app:layout_constraintVertical_chainStyle="packed"
+		tools:text="This is a name of a contact"/>
 
-		<FrameLayout
-			android:id="@+id/avatarFrameView"
-			android:layout_width="@dimen/listitem_picture_frame_size"
-			android:layout_height="@dimen/listitem_picture_frame_size"
-			android:layout_alignParentLeft="true"
-			android:layout_alignParentStart="true"
-			android:layout_centerVertical="true"
-			android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-			android:layout_marginStart="@dimen/listitem_horizontal_margin">
+	<TextView
+		android:id="@+id/dateView"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginBottom="@dimen/listitem_vertical_margin"
+		android:layout_marginEnd="@dimen/margin_medium"
+		android:layout_marginStart="@dimen/margin_medium"
+		android:paddingEnd="@dimen/margin_medium"
+		android:paddingStart="@dimen/margin_medium"
+		android:textColor="?android:attr/textColorSecondary"
+		android:textSize="@dimen/text_size_small"
+		app:layout_constraintBottom_toTopOf="@+id/divider"
+		app:layout_constraintEnd_toStartOf="@+id/bulbView"
+		app:layout_constraintStart_toEndOf="@+id/avatarFrameView"
+		app:layout_constraintTop_toBottomOf="@+id/nameView"
+		tools:text="Dec 24"/>
 
-			<de.hdodenhof.circleimageview.CircleImageView
-				android:id="@+id/avatarView"
-				style="@style/BriarAvatar"
-				android:layout_width="@dimen/listitem_picture_size"
-				android:layout_height="@dimen/listitem_picture_size"
-				android:layout_gravity="bottom|left"
-				tools:src="@mipmap/ic_launcher_round"/>
+	<ImageView
+		android:id="@+id/bulbView"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_margin="@dimen/listitem_horizontal_margin"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:ignore="ContentDescription"
+		tools:src="@drawable/contact_connected"/>
 
-			<TextView
-				android:id="@+id/unreadCountView"
-				android:layout_width="wrap_content"
-				android:layout_height="@dimen/unread_bubble_size"
-				android:layout_gravity="right|top"
-				android:background="@drawable/bubble"
-				android:gravity="center"
-				android:minWidth="@dimen/unread_bubble_size"
-				android:textColor="@color/briar_text_primary_inverse"
-				android:textSize="@dimen/unread_bubble_text_size"
-				android:textStyle="bold"
-				tools:text="123"/>
+	<View
+		android:id="@+id/divider"
+		style="@style/Divider.ContactList"
+		android:layout_width="0dp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="@+id/nameView"/>
 
-		</FrameLayout>
-
-		<LinearLayout
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_centerVertical="true"
-			android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-			android:layout_marginStart="@dimen/listitem_horizontal_margin"
-			android:layout_toEndOf="@+id/avatarFrameView"
-			android:layout_toLeftOf="@+id/bulbView"
-			android:layout_toRightOf="@+id/avatarFrameView"
-			android:orientation="vertical">
-
-			<com.vanniktech.emoji.EmojiTextView
-				android:id="@+id/nameView"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:maxLines="2"
-				android:textColor="?android:attr/textColorPrimary"
-				android:textSize="@dimen/text_size_medium"
-				tools:text="This is a name of a contact"/>
-
-			<TextView
-				android:id="@+id/dateView"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:textColor="?android:attr/textColorSecondary"
-				android:textSize="@dimen/text_size_small"
-				tools:text="Dec 24"/>
-
-		</LinearLayout>
-
-		<ImageView
-			android:id="@+id/bulbView"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentEnd="true"
-			android:layout_alignParentRight="true"
-			android:layout_centerVertical="true"
-			android:layout_marginRight="@dimen/listitem_horizontal_margin"
-			tools:src="@drawable/contact_connected"/>
-
-	</RelativeLayout>
-
-	<View style="@style/Divider.ContactList"/>
-
-</LinearLayout>
\ No newline at end of file
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/list_item_contact_small.xml b/briar-android/src/main/res/layout/list_item_contact_small.xml
index d028aa834..07d7e1ab7 100644
--- a/briar-android/src/main/res/layout/list_item_contact_small.xml
+++ b/briar-android/src/main/res/layout/list_item_contact_small.xml
@@ -23,7 +23,7 @@
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center_vertical"
-		android:layout_marginLeft="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
 		android:layout_weight="1"
 		android:maxLines="2"
@@ -36,7 +36,9 @@
 		android:layout_width="@dimen/listitem_horizontal_margin"
 		android:layout_height="@dimen/listitem_horizontal_margin"
 		android:layout_gravity="center_vertical"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
 		android:layout_marginRight="@dimen/listitem_horizontal_margin"
+		tools:ignore="ContentDescription"
 		tools:src="@drawable/contact_connected"/>
 
 </LinearLayout>
diff --git a/briar-android/src/main/res/layout/list_item_conversation_msg_in.xml b/briar-android/src/main/res/layout/list_item_conversation_msg_in.xml
index 02830e9c0..d00379dac 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_msg_in.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_msg_in.xml
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<android.support.constraint.ConstraintLayout
 	android:id="@+id/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="wrap_content"
 	android:layout_height="wrap_content"
 	android:layout_marginBottom="@dimen/message_bubble_margin"
+	android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
 	android:layout_marginLeft="@dimen/message_bubble_margin_tail"
 	android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
+	android:layout_marginStart="@dimen/message_bubble_margin_tail"
 	android:layout_marginTop="@dimen/message_bubble_margin"
 	android:background="@drawable/msg_in"
-	android:elevation="@dimen/message_bubble_elevation"
-	android:orientation="vertical">
+	android:elevation="@dimen/message_bubble_elevation">
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/text"
@@ -19,6 +21,9 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:textColor="?android:attr/textColorPrimary"
+		app:layout_constraintBottom_toTopOf="@+id/time"
+		app:layout_constraintEnd_toEndOf="@+id/time"
+		app:layout_constraintTop_toTopOf="parent"
 		tools:text="Short message"/>
 
 	<TextView
@@ -26,8 +31,9 @@
 		style="@style/TextMessage.Timestamp"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_gravity="right|end"
-		android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/text"
 		tools:text="Dec 24, 13:37"/>
 
-</LinearLayout>
+</android.support.constraint.ConstraintLayout>
diff --git a/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml b/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml
index ccbc8e854..574bf9385 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<!-- This is needed to right-align message bubble in RecyclerView -->
+<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="wrap_content"
-	android:orientation="vertical">
+	android:layout_height="wrap_content">
 
-	<RelativeLayout
+	<android.support.constraint.ConstraintLayout
 		android:id="@+id/layout"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="right|end"
 		android:layout_marginBottom="@dimen/message_bubble_margin"
+		android:layout_marginEnd="@dimen/message_bubble_margin_tail"
 		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
 		android:layout_marginRight="@dimen/message_bubble_margin_tail"
+		android:layout_marginStart="@dimen/message_bubble_margin_non_tail"
 		android:layout_marginTop="@dimen/message_bubble_margin"
 		android:background="@drawable/msg_out"
 		android:elevation="@dimen/message_bubble_elevation">
@@ -24,6 +27,8 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:textColor="@color/briar_text_primary_inverse"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
 			tools:text="This is a long long long message that spans over several lines.\n\nIt ends here."/>
 
 		<TextView
@@ -31,24 +36,24 @@
 			style="@style/TextMessage.Timestamp"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_alignParentLeft="true"
-			android:layout_alignParentStart="true"
-			android:layout_below="@+id/text"
 			android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
 			android:textColor="@color/private_message_date_inverse"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/text"
 			tools:text="Dec 24, 13:37"/>
 
 		<ImageView
 			android:id="@+id/status"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_alignBottom="@+id/time"
 			android:layout_marginLeft="@dimen/margin_medium"
-			android:layout_toEndOf="@+id/time"
-			android:layout_toRightOf="@+id/time"
+			android:layout_marginStart="@dimen/margin_medium"
+			app:layout_constraintBottom_toBottomOf="@+id/time"
+			app:layout_constraintStart_toEndOf="@+id/time"
+			app:layout_constraintTop_toTopOf="@+id/time"
 			tools:ignore="ContentDescription"
 			tools:src="@drawable/message_delivered_white"/>
 
-	</RelativeLayout>
+	</android.support.constraint.ConstraintLayout>
 
-</LinearLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml b/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml
index 25f6a88e9..ae5e40cf0 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml
@@ -1,9 +1,15 @@
 <?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="wrap_content"
+	android:layout_marginBottom="@dimen/message_bubble_margin"
+	android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
+	android:layout_marginLeft="@dimen/message_bubble_margin_tail"
+	android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
+	android:layout_marginStart="@dimen/message_bubble_margin_tail"
 	android:layout_marginTop="@dimen/message_bubble_margin"
 	android:orientation="vertical">
 
@@ -12,20 +18,14 @@
 		style="@style/TextMessage"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_gravity="left|start"
-		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
-		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 		android:background="@drawable/msg_in_top"
 		android:elevation="@dimen/message_bubble_elevation"
 		tools:text="Short message"/>
 
-	<RelativeLayout
+	<android.support.constraint.ConstraintLayout
 		android:id="@+id/layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_margin"
-		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
-		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 		android:background="@drawable/notice_in_bottom"
 		android:elevation="@dimen/message_bubble_elevation">
 
@@ -34,7 +34,8 @@
 			style="@style/TextMessage.Notice"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:minWidth="80dp"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
 			tools:text="@string/forum_invitation_received"/>
 
 		<TextView
@@ -42,12 +43,11 @@
 			style="@style/TextMessage.Timestamp"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_alignEnd="@+id/text"
-			android:layout_alignRight="@+id/text"
-			android:layout_below="@+id/text"
 			android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
+			app:layout_constraintEnd_toEndOf="@+id/text"
+			app:layout_constraintTop_toBottomOf="@+id/text"
 			tools:text="Dec 24, 13:37"/>
 
-	</RelativeLayout>
+	</android.support.constraint.ConstraintLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml b/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml
index d686c4f17..2b89b8499 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml
@@ -5,6 +5,11 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
+	android:layout_marginBottom="@dimen/message_bubble_margin"
+	android:layout_marginEnd="@dimen/message_bubble_margin_tail"
+	android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
+	android:layout_marginRight="@dimen/message_bubble_margin_tail"
+	android:layout_marginStart="@dimen/message_bubble_margin_non_tail"
 	android:layout_marginTop="@dimen/message_bubble_margin"
 	android:orientation="vertical">
 
@@ -13,20 +18,15 @@
 		style="@style/TextMessage"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
-		android:layout_marginRight="@dimen/message_bubble_margin_tail"
 		android:background="@drawable/msg_out_top"
 		android:elevation="@dimen/message_bubble_elevation"
 		android:textColor="@color/briar_text_primary_inverse"
 		tools:text="This is a long long long message that spans over several lines.\n\nIt ends here."/>
 
-	<RelativeLayout
+	<android.support.constraint.ConstraintLayout
 		android:id="@+id/layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_margin"
-		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
-		android:layout_marginRight="@dimen/message_bubble_margin_tail"
 		android:background="@drawable/notice_out_bottom"
 		android:elevation="@dimen/message_bubble_elevation">
 
@@ -36,6 +36,8 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:textColor="@color/private_message_date_inverse"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
 			tools:text="@string/introduction_request_received"/>
 
 		<TextView
@@ -43,25 +45,25 @@
 			style="@style/TextMessage.Timestamp"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_alignParentLeft="true"
-			android:layout_alignParentStart="true"
-			android:layout_below="@+id/text"
 			android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
 			android:textColor="@color/private_message_date_inverse"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/text"
 			tools:text="Dec 24, 13:37"/>
 
 		<android.support.v7.widget.AppCompatImageView
 			android:id="@+id/status"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_alignBottom="@+id/time"
 			android:layout_marginLeft="@dimen/margin_medium"
-			android:layout_toEndOf="@+id/time"
-			android:layout_toRightOf="@+id/time"
+			android:layout_marginStart="@dimen/margin_medium"
+			app:layout_constraintBottom_toBottomOf="@+id/time"
+			app:layout_constraintStart_toEndOf="@+id/time"
+			app:layout_constraintTop_toTopOf="@+id/time"
 			app:tint="@color/private_message_date_inverse"
 			tools:ignore="ContentDescription"
 			tools:src="@drawable/message_delivered"/>
 
-	</RelativeLayout>
+	</android.support.constraint.ConstraintLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/list_item_conversation_request.xml b/briar-android/src/main/res/layout/list_item_conversation_request.xml
index 9d2abcc86..72898c5aa 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_request.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_request.xml
@@ -1,9 +1,15 @@
 <?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="wrap_content"
+	android:layout_marginBottom="@dimen/message_bubble_margin"
+	android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
+	android:layout_marginLeft="@dimen/message_bubble_margin_tail"
+	android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
+	android:layout_marginStart="@dimen/message_bubble_margin_tail"
 	android:layout_marginTop="@dimen/message_bubble_margin"
 	android:orientation="vertical">
 
@@ -12,20 +18,15 @@
 		style="@style/TextMessage"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
-		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 		android:background="@drawable/msg_in_top"
 		android:elevation="@dimen/message_bubble_elevation"
 		android:textColor="?android:attr/textColorPrimary"
 		tools:text="Short message"/>
 
-	<RelativeLayout
+	<android.support.constraint.ConstraintLayout
 		android:id="@+id/layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_margin"
-		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
-		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 		android:background="@drawable/notice_in_bottom"
 		android:elevation="@dimen/message_bubble_elevation">
 
@@ -34,41 +35,38 @@
 			style="@style/TextMessage.Notice"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
 			tools:text="@string/introduction_request_received"/>
 
-		<TextView
-			android:id="@+id/time"
-			style="@style/TextMessage.Timestamp"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignEnd="@+id/text"
-			android:layout_alignRight="@+id/text"
-			android:layout_below="@+id/acceptButton"
-			android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
-			tools:text="Dec 24, 13:37"/>
-
 		<Button
 			android:id="@+id/acceptButton"
 			style="@style/BriarButtonFlat.Positive"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_alignEnd="@+id/text"
-			android:layout_alignRight="@+id/text"
-			android:layout_below="@+id/text"
-			android:layout_marginBottom="-10dp"
-			android:text="@string/accept"/>
+			android:text="@string/accept"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/text"/>
 
 		<Button
 			android:id="@+id/declineButton"
 			style="@style/BriarButtonFlat.Negative"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_alignBottom="@+id/acceptButton"
-			android:layout_alignTop="@+id/acceptButton"
-			android:layout_toLeftOf="@+id/acceptButton"
-			android:layout_toStartOf="@+id/acceptButton"
-			android:text="@string/decline"/>
+			android:text="@string/decline"
+			app:layout_constraintBottom_toBottomOf="@+id/acceptButton"
+			app:layout_constraintEnd_toStartOf="@+id/acceptButton"
+			app:layout_constraintTop_toTopOf="@+id/acceptButton"/>
 
-	</RelativeLayout>
+		<TextView
+			android:id="@+id/time"
+			style="@style/TextMessage.Timestamp"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/acceptButton"
+			tools:text="Dec 24, 13:37"/>
+
+	</android.support.constraint.ConstraintLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/list_item_crash.xml b/briar-android/src/main/res/layout/list_item_crash.xml
index 63439eddb..1839bba88 100644
--- a/briar-android/src/main/res/layout/list_item_crash.xml
+++ b/briar-android/src/main/res/layout/list_item_crash.xml
@@ -1,38 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<android.support.constraint.ConstraintLayout
 	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:orientation="vertical">
+	android:layout_height="wrap_content">
 
-	<LinearLayout
-		android:layout_width="match_parent"
+	<CheckBox
+		android:id="@+id/include_in_report"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:orientation="horizontal">
-
-		<CheckBox
-			android:id="@+id/include_in_report"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"/>
-
-		<TextView
-			android:id="@+id/title"
-			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:layout_marginBottom="@dimen/margin_small"
-			android:gravity="bottom"
-			android:textSize="@dimen/text_size_large"
-			android:textColor="?android:attr/textColorPrimary"
-			tools:text="Crash log entry title"/>
-	</LinearLayout>
+		android:layout_marginLeft="@dimen/margin_medium"
+		android:layout_marginStart="@dimen/margin_medium"
+		android:textColor="?android:attr/textColorPrimary"
+		android:textSize="@dimen/text_size_large"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:text="Crash log entry title"/>
 
 	<TextView
 		android:id="@+id/content"
-		android:layout_width="wrap_content"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/margin_medium"
+		android:layout_marginTop="4dp"
 		android:textColor="?android:attr/textColorSecondary"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/include_in_report"
 		tools:text="Crash log entry value"/>
 
-</LinearLayout>
\ No newline at end of file
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/list_item_forum.xml b/briar-android/src/main/res/layout/list_item_forum.xml
index d446db5bb..bd732f16e 100644
--- a/briar-android/src/main/res/layout/list_item_forum.xml
+++ b/briar-android/src/main/res/layout/list_item_forum.xml
@@ -1,70 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<android.support.constraint.ConstraintLayout
 	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="wrap_content"
-	android:background="?attr/selectableItemBackground"
-	android:paddingLeft="@dimen/listitem_horizontal_margin"
-	android:paddingStart="@dimen/listitem_horizontal_margin"
-	tools:ignore="RtlSymmetry">
+	android:background="?attr/selectableItemBackground">
 
 	<org.briarproject.briar.android.view.TextAvatarView
 		android:id="@+id/avatarView"
 		android:layout_width="@dimen/listitem_picture_frame_size"
 		android:layout_height="@dimen/listitem_picture_frame_size"
-		android:layout_alignParentLeft="true"
-		android:layout_alignParentStart="true"
-		android:layout_centerVertical="true"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
-		android:layout_marginTop="@dimen/listitem_horizontal_margin"/>
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
+		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		app:layout_constraintBottom_toTopOf="@+id/divider"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"/>
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/forumNameView"
-		android:layout_width="wrap_content"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_alignParentTop="true"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginStart="@dimen/listitem_horizontal_margin"
 		android:layout_marginTop="@dimen/listitem_horizontal_margin"
-		android:layout_toEndOf="@+id/avatarView"
-		android:layout_toRightOf="@+id/avatarView"
-		android:maxLines="2"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_medium"
-		tools:text="This is a name of a forum"/>
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@+id/avatarView"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:text="This is a name of a forum which can be long"/>
 
 	<TextView
 		android:id="@+id/postCountView"
-		android:layout_width="wrap_content"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_below="@+id/forumNameView"
-		android:layout_toEndOf="@+id/avatarView"
-		android:layout_toRightOf="@+id/avatarView"
-		android:paddingBottom="@dimen/listitem_horizontal_margin"
-		android:paddingTop="@dimen/margin_medium"
+		android:layout_marginEnd="8dp"
+		android:layout_marginRight="8dp"
+		android:layout_marginTop="@dimen/margin_medium"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
-		tools:text="1337 posts"/>
+		app:layout_constraintEnd_toStartOf="@+id/dateView"
+		app:layout_constraintStart_toStartOf="@+id/forumNameView"
+		app:layout_constraintTop_toBottomOf="@+id/forumNameView"
+		tools:text="@string/no_forum_posts"/>
 
 	<TextView
 		android:id="@+id/dateView"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_alignParentEnd="true"
-		android:layout_alignParentRight="true"
-		android:layout_below="@+id/forumNameView"
 		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
 		android:layout_marginRight="@dimen/listitem_horizontal_margin"
-		android:paddingBottom="@dimen/listitem_horizontal_margin"
-		android:paddingTop="@dimen/margin_medium"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
+		app:layout_constraintBaseline_toBaselineOf="@+id/postCountView"
+		app:layout_constraintEnd_toEndOf="parent"
 		tools:text="Dec 24"/>
 
 	<View
+		android:id="@+id/divider"
 		style="@style/Divider.ThreadItem"
-		android:layout_alignParentLeft="true"
-		android:layout_alignParentStart="true"
-		android:layout_below="@+id/postCountView"/>
-
-</RelativeLayout>
+		android:layout_width="0dp"
+		android:layout_marginLeft="@dimen/margin_medium"
+		android:layout_marginStart="@dimen/margin_medium"
+		android:layout_marginTop="@dimen/listitem_horizontal_margin"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@+id/avatarView"
+		app:layout_constraintTop_toBottomOf="@id/postCountView"/>
 
+</android.support.constraint.ConstraintLayout>
diff --git a/briar-android/src/main/res/layout/list_item_group.xml b/briar-android/src/main/res/layout/list_item_group.xml
index c9143ae93..e1d436126 100644
--- a/briar-android/src/main/res/layout/list_item_group.xml
+++ b/briar-android/src/main/res/layout/list_item_group.xml
@@ -1,61 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<android.support.constraint.ConstraintLayout
 	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="wrap_content"
-	android:background="?attr/selectableItemBackground"
-	android:paddingLeft="@dimen/listitem_horizontal_margin"
-	android:paddingStart="@dimen/listitem_horizontal_margin"
-	tools:ignore="RtlSymmetry">
+	android:background="?attr/selectableItemBackground">
 
 	<org.briarproject.briar.android.view.TextAvatarView
 		android:id="@+id/avatarView"
 		android:layout_width="@dimen/listitem_picture_frame_size"
 		android:layout_height="@dimen/listitem_picture_frame_size"
-		android:layout_alignParentLeft="true"
-		android:layout_alignParentStart="true"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
-		android:layout_marginTop="@dimen/listitem_horizontal_margin"/>
+		android:layout_margin="@dimen/listitem_horizontal_margin"
+		app:layout_constraintBottom_toTopOf="@+id/divider"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"/>
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/nameView"
-		android:layout_width="wrap_content"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_alignParentTop="true"
-		android:layout_marginTop="@dimen/listitem_horizontal_margin"
-		android:layout_toEndOf="@+id/avatarView"
-		android:layout_toRightOf="@+id/avatarView"
-		android:maxLines="2"
+		android:layout_margin="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_medium"
-		tools:text="This is a name of a Private Group"/>
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@+id/avatarView"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:text="This is a name of a Private Group which can be quite long actually"/>
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/creatorView"
-		android:layout_width="wrap_content"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_below="@+id/nameView"
-		android:layout_marginBottom="@dimen/margin_small"
-		android:layout_toEndOf="@+id/avatarView"
-		android:layout_toRightOf="@+id/avatarView"
-		android:paddingTop="@dimen/margin_small"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
+		android:layout_marginTop="@dimen/margin_small"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="@+id/nameView"
+		app:layout_constraintTop_toBottomOf="@+id/nameView"
 		tools:text="Created by Santa Claus"/>
 
 	<TextView
 		android:id="@+id/messageCountView"
-		android:layout_width="wrap_content"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_below="@+id/creatorView"
-		android:layout_marginBottom="@dimen/margin_small"
-		android:layout_toEndOf="@+id/avatarView"
-		android:layout_toRightOf="@+id/avatarView"
-		android:paddingTop="@dimen/margin_small"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginTop="@dimen/margin_medium"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
+		app:layout_constraintEnd_toStartOf="@+id/dateView"
+		app:layout_constraintStart_toEndOf="@+id/avatarView"
+		app:layout_constraintTop_toBottomOf="@+id/creatorView"
 		tools:text="1337 messages"
 		tools:visibility="visible"/>
 
@@ -63,27 +61,27 @@
 		android:id="@+id/dateView"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_alignParentEnd="true"
-		android:layout_alignParentRight="true"
-		android:layout_below="@+id/creatorView"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
-		android:paddingTop="@dimen/margin_small"
+		android:layout_margin="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
+		app:layout_constraintBaseline_toBaselineOf="@+id/messageCountView"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintRight_toRightOf="parent"
 		tools:text="3 weeks ago, 12:00"
 		tools:visibility="visible"/>
 
 	<TextView
 		android:id="@+id/statusView"
-		android:layout_width="wrap_content"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_below="@+id/messageCountView"
-		android:layout_toEndOf="@+id/avatarView"
-		android:layout_toLeftOf="@+id/removeButton"
-		android:layout_toRightOf="@+id/avatarView"
-		android:paddingTop="@dimen/margin_small"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginTop="@dimen/margin_medium"
 		android:textColor="?android:attr/textColorTertiary"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintLeft_toRightOf="@+id/avatarView"
+		app:layout_constraintStart_toEndOf="@+id/avatarView"
+		app:layout_constraintTop_toBottomOf="@+id/messageCountView"
 		tools:text="@string/groups_group_is_empty"/>
 
 	<Button
@@ -91,18 +89,21 @@
 		style="@style/BriarButtonFlat.Negative"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_alignBottom="@+id/divider"
-		android:layout_alignParentRight="true"
 		android:text="@string/groups_remove"
+		app:layout_constraintBottom_toBottomOf="@+id/divider"
+		app:layout_constraintRight_toRightOf="parent"
 		tools:visibility="gone"/>
 
 	<View
 		android:id="@+id/divider"
 		style="@style/Divider.ThreadItem"
-		android:layout_alignParentLeft="true"
-		android:layout_alignParentStart="true"
-		android:layout_below="@+id/statusView"
-		android:layout_marginTop="@dimen/listitem_horizontal_margin"/>
+		android:layout_width="0dp"
+		android:layout_marginLeft="@dimen/margin_medium"
+		android:layout_marginStart="@dimen/margin_medium"
+		android:layout_marginTop="@dimen/listitem_horizontal_margin"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@+id/avatarView"
+		app:layout_constraintTop_toBottomOf="@+id/statusView"/>
 
-</RelativeLayout>
+</android.support.constraint.ConstraintLayout>
 
diff --git a/briar-android/src/main/res/layout/list_item_group_join_notice.xml b/briar-android/src/main/res/layout/list_item_group_join_notice.xml
index 2e08c5a48..99f9a280d 100644
--- a/briar-android/src/main/res/layout/list_item_group_join_notice.xml
+++ b/briar-android/src/main/res/layout/list_item_group_join_notice.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<android.support.constraint.ConstraintLayout
 	android:id="@+id/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="wrap_content"
-	android:baselineAligned="false"
-	android:orientation="vertical">
+	android:layout_height="wrap_content">
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/text"
@@ -17,20 +15,25 @@
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_medium"
 		android:textStyle="italic"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
 		tools:text="@string/groups_member_joined"/>
 
 	<org.briarproject.briar.android.view.AuthorView
 		android:id="@+id/author"
-		android:layout_width="wrap_content"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_alignLeft="@+id/text"
-		android:layout_alignStart="@+id/text"
-		android:layout_below="@+id/text"
+		android:layout_margin="@dimen/margin_medium"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/text"
 		app:persona="commenter"/>
 
 	<View
+		android:id="@+id/divider"
 		style="@style/Divider.ThreadItem"
-		android:layout_below="@+id/author"
-		android:layout_marginTop="@dimen/margin_medium"/>
+		android:layout_marginTop="@dimen/margin_medium"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/author"/>
 
-</RelativeLayout>
+</android.support.constraint.ConstraintLayout>
diff --git a/briar-android/src/main/res/layout/list_item_group_member.xml b/briar-android/src/main/res/layout/list_item_group_member.xml
index 143e15c3a..9af20d6e6 100644
--- a/briar-android/src/main/res/layout/list_item_group_member.xml
+++ b/briar-android/src/main/res/layout/list_item_group_member.xml
@@ -1,58 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<android.support.constraint.ConstraintLayout
 	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="wrap_content"
-	android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-	android:layout_marginStart="@dimen/listitem_horizontal_margin"
-	android:paddingTop="@dimen/margin_medium">
+	android:layout_height="wrap_content">
 
 	<org.briarproject.briar.android.view.AuthorView
 		android:id="@+id/authorView"
-		android:layout_width="wrap_content"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_alignParentStart="true"
-		android:layout_alignParentLeft="true"
-		android:layout_alignParentTop="true"
-		android:layout_marginBottom="@dimen/margin_small"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
-		android:layout_toStartOf="@+id/bulbView"
-		android:layout_toLeftOf="@+id/bulbView"
+		android:layout_margin="@dimen/margin_medium"
+		app:layout_constraintEnd_toStartOf="@+id/bulbView"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
 		app:persona="list"/>
 
 	<ImageView
 		android:id="@+id/bulbView"
 		android:layout_width="16dp"
 		android:layout_height="16dp"
-		android:layout_alignBottom="@+id/authorView"
-		android:layout_alignParentEnd="true"
-		android:layout_alignParentRight="true"
-		android:layout_alignTop="@+id/authorView"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
+		android:layout_margin="@dimen/margin_medium"
+		app:layout_constraintBottom_toTopOf="@+id/divider"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:ignore="ContentDescription"
 		tools:src="@drawable/contact_connected"/>
 
 	<TextView
 		android:id="@+id/creatorView"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_below="@+id/authorView"
-		android:layout_marginBottom="@dimen/margin_small"
-		android:layout_marginLeft="@dimen/listitem_group_member_indentation"
-		android:layout_marginStart="@dimen/listitem_group_member_indentation"
+		android:layout_marginLeft="40dp"
+		android:layout_marginStart="40dp"
+		android:layout_marginTop="@dimen/margin_small"
 		android:text="@string/groups_member_created_you"
 		android:textColor="?android:attr/textColorSecondary"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/authorView"
 		tools:visibility="visible"/>
 
 	<View
 		android:id="@+id/divider"
 		style="@style/Divider.ContactList"
-		android:layout_below="@+id/creatorView"
-		android:layout_marginStart="@dimen/listitem_group_member_indentation"
-		android:layout_marginLeft="@dimen/listitem_group_member_indentation"
-		android:layout_marginTop="@dimen/margin_medium"/>
+		android:layout_marginLeft="36dp"
+		android:layout_marginStart="36dp"
+		android:layout_marginTop="@dimen/margin_medium"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/creatorView"/>
 
-</RelativeLayout>
+</android.support.constraint.ConstraintLayout>
diff --git a/briar-android/src/main/res/layout/list_item_invitations.xml b/briar-android/src/main/res/layout/list_item_invitations.xml
index f33e7b110..e5df2d6c5 100644
--- a/briar-android/src/main/res/layout/list_item_invitations.xml
+++ b/briar-android/src/main/res/layout/list_item_invitations.xml
@@ -1,60 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<android.support.constraint.ConstraintLayout
 	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="wrap_content"
-	android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-	android:layout_marginStart="@dimen/listitem_horizontal_margin"
-	android:background="?attr/selectableItemBackground"
-	android:paddingTop="@dimen/listitem_horizontal_margin">
+	android:layout_height="wrap_content">
 
 	<org.briarproject.briar.android.view.TextAvatarView
 		android:id="@+id/avatarView"
 		android:layout_width="@dimen/listitem_picture_frame_size"
 		android:layout_height="@dimen/listitem_picture_frame_size"
-		android:layout_alignParentLeft="true"
-		android:layout_alignParentStart="true"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"/>
+		android:layout_margin="@dimen/listitem_horizontal_margin"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"/>
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/forumNameView"
-		android:layout_width="wrap_content"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
-		android:layout_toEndOf="@+id/avatarView"
-		android:layout_toRightOf="@+id/avatarView"
-		android:maxLines="2"
+		android:layout_margin="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_medium"
-		tools:text="This is a name of a forum that is available"/>
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@+id/avatarView"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:text="This is a name of a forum that is available and has a long name"/>
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/sharedByView"
-		android:layout_width="wrap_content"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_below="@+id/forumNameView"
 		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
 		android:layout_marginRight="@dimen/listitem_horizontal_margin"
-		android:layout_toEndOf="@+id/avatarView"
-		android:layout_toRightOf="@+id/avatarView"
-		android:paddingTop="@dimen/margin_medium"
+		android:layout_marginTop="@dimen/margin_medium"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="@+id/forumNameView"
+		app:layout_constraintTop_toBottomOf="@+id/forumNameView"
 		tools:text="Shared by Megalox"/>
 
 	<TextView
 		android:id="@+id/forumSubscribedView"
-		android:layout_width="wrap_content"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_below="@+id/sharedByView"
 		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
-		android:paddingTop="@dimen/margin_medium"
+		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginTop="@dimen/margin_medium"
 		android:text="@string/forum_invitation_exists"
 		android:textColor="?android:attr/textColorTertiary"
 		android:textSize="@dimen/text_size_small"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/sharedByView"
 		tools:visibility="visible"/>
 
 	<Button
@@ -62,28 +61,23 @@
 		style="@style/BriarButtonFlat.Positive"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_alignParentEnd="true"
-		android:layout_alignParentRight="true"
-		android:layout_below="@+id/forumSubscribedView"
-		android:layout_marginTop="-8dp"
-		android:text="@string/accept"/>
+		android:text="@string/accept"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/forumSubscribedView"/>
 
 	<Button
 		android:id="@+id/declineButton"
 		style="@style/BriarButtonFlat.Negative"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_below="@+id/forumSubscribedView"
-		android:layout_marginTop="-8dp"
-		android:layout_toLeftOf="@+id/acceptButton"
-		android:layout_toStartOf="@+id/acceptButton"
-		android:text="@string/decline"/>
+		android:text="@string/decline"
+		app:layout_constraintEnd_toStartOf="@+id/acceptButton"
+		app:layout_constraintTop_toBottomOf="@+id/forumSubscribedView"/>
 
 	<View
+		android:id="@+id/divider"
 		style="@style/Divider.ThreadItem"
-		android:layout_alignParentLeft="true"
-		android:layout_alignParentStart="true"
-		android:layout_below="@+id/acceptButton"/>
-
-</RelativeLayout>
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/acceptButton"/>
 
+</android.support.constraint.ConstraintLayout>
diff --git a/briar-android/src/main/res/layout/list_item_revealable_contact.xml b/briar-android/src/main/res/layout/list_item_revealable_contact.xml
index cba378a3e..f044117e6 100644
--- a/briar-android/src/main/res/layout/list_item_revealable_contact.xml
+++ b/briar-android/src/main/res/layout/list_item_revealable_contact.xml
@@ -1,76 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<android.support.constraint.ConstraintLayout
 	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="wrap_content"
-	android:orientation="vertical">
+	android:background="?attr/selectableItemBackground">
 
-	<RelativeLayout
-		xmlns:android="http://schemas.android.com/apk/res/android"
-		xmlns:tools="http://schemas.android.com/tools"
-		android:layout_width="match_parent"
+	<de.hdodenhof.circleimageview.CircleImageView
+		android:id="@+id/avatarView"
+		style="@style/BriarAvatar"
+		android:layout_width="@dimen/listitem_selectable_picture_size"
+		android:layout_height="@dimen/listitem_selectable_picture_size"
+		android:layout_margin="@dimen/listitem_horizontal_margin"
+		app:layout_constraintBottom_toTopOf="@+id/divider"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:src="@mipmap/ic_launcher_round"/>
+
+	<com.vanniktech.emoji.EmojiTextView
+		android:id="@+id/nameView"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:background="?attr/selectableItemBackground"
-		android:orientation="vertical"
-		android:padding="@dimen/listitem_horizontal_margin">
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginTop="@dimen/listitem_vertical_margin"
+		android:textColor="?android:attr/textColorPrimary"
+		android:textSize="@dimen/text_size_medium"
+		app:layout_constraintEnd_toStartOf="@+id/checkBox"
+		app:layout_constraintStart_toEndOf="@+id/avatarView"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:text="Revealable Contact with a long name"/>
 
-		<de.hdodenhof.circleimageview.CircleImageView
-			android:id="@+id/avatarView"
-			style="@style/BriarAvatar"
-			android:layout_width="@dimen/listitem_selectable_picture_size"
-			android:layout_height="@dimen/listitem_selectable_picture_size"
-			android:layout_alignParentLeft="true"
-			android:layout_alignParentStart="true"
-			android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-			android:layout_marginRight="@dimen/listitem_horizontal_margin"
-			tools:src="@mipmap/ic_launcher_round"/>
+	<android.support.v7.widget.AppCompatImageView
+		android:id="@+id/visibilityView"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
+		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginTop="4dp"
+		android:src="@drawable/ic_visibility"
+		app:layout_constraintStart_toEndOf="@+id/avatarView"
+		app:layout_constraintTop_toBottomOf="@+id/nameView"
+		app:tint="?attr/colorControlNormal"
+		tools:ignore="ContentDescription"/>
 
-		<com.vanniktech.emoji.EmojiTextView
-			android:id="@+id/nameView"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_toRightOf="@+id/avatarView"
-			android:textColor="?android:attr/textColorPrimary"
-			android:textSize="@dimen/text_size_large"
-			tools:text="Revealable Contact"/>
+	<TextView
+		android:id="@+id/infoView"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginBottom="@dimen/listitem_vertical_margin"
+		android:layout_marginEnd="@dimen/margin_small"
+		android:layout_marginStart="@dimen/margin_small"
+		android:text="@string/groups_reveal_visible"
+		android:textColor="?android:attr/textColorSecondary"
+		android:textSize="@dimen/text_size_small"
+		app:layout_constraintBottom_toTopOf="@+id/divider"
+		app:layout_constraintEnd_toStartOf="@+id/checkBox"
+		app:layout_constraintStart_toEndOf="@+id/visibilityView"
+		app:layout_constraintTop_toTopOf="@+id/visibilityView"
+		tools:visibility="visible"/>
 
-		<android.support.v7.widget.AppCompatImageView
-			android:id="@+id/visibilityView"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_below="@+id/nameView"
-			android:layout_marginRight="@dimen/margin_small"
-			android:layout_toRightOf="@+id/avatarView"
-			android:src="@drawable/ic_visibility"
-			app:tint="?attr/colorControlNormal"
-			tools:ignore="ContentDescription"/>
+	<CheckBox
+		android:id="@+id/checkBox"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_margin="@dimen/listitem_horizontal_margin"
+		android:clickable="false"
+		app:layout_constraintBottom_toTopOf="@+id/divider"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintTop_toTopOf="parent"/>
 
-		<TextView
-			android:id="@+id/infoView"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_below="@+id/nameView"
-			android:layout_toLeftOf="@+id/checkBox"
-			android:layout_toRightOf="@+id/visibilityView"
-			android:gravity="center_vertical"
-			android:text="@string/groups_reveal_visible"
-			android:textColor="?android:attr/textColorSecondary"
-			android:textSize="@dimen/text_size_small"
-			tools:visibility="visible"/>
+	<View
+		android:id="@+id/divider"
+		style="@style/Divider.ContactList"
+		android:layout_width="0dp"
+		android:layout_marginLeft="@dimen/margin_medium"
+		android:layout_marginStart="@dimen/margin_medium"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintStart_toEndOf="@id/avatarView"/>
 
-		<CheckBox
-			android:id="@+id/checkBox"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentEnd="true"
-			android:layout_alignParentRight="true"
-			android:layout_centerVertical="true"
-			android:clickable="false"/>
-
-	</RelativeLayout>
-
-	<View style="@style/Divider.ContactList"/>
-
-</LinearLayout>
+</android.support.constraint.ConstraintLayout>
diff --git a/briar-android/src/main/res/layout/list_item_rss_feed.xml b/briar-android/src/main/res/layout/list_item_rss_feed.xml
index 0d0b82bf9..0b2b1f1f1 100644
--- a/briar-android/src/main/res/layout/list_item_rss_feed.xml
+++ b/briar-android/src/main/res/layout/list_item_rss_feed.xml
@@ -1,124 +1,135 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<android.support.constraint.ConstraintLayout
 	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="wrap_content"
-	android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-	android:layout_marginStart="@dimen/listitem_horizontal_margin"
-	android:layout_marginTop="@dimen/listitem_horizontal_margin"
 	android:background="?attr/selectableItemBackground">
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/titleView"
-		android:layout_width="wrap_content"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_alignParentTop="true"
-		android:maxLines="2"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
+		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginTop="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_medium"
-		tools:text="This is a name of a RSS Feed"/>
+		app:layout_constraintEnd_toStartOf="@+id/deleteButton"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:text="This is a name of a RSS Feed that can be long"/>
 
 	<android.support.v7.widget.AppCompatImageButton
 		android:id="@+id/deleteButton"
 		android:layout_width="@dimen/button_size"
 		android:layout_height="@dimen/button_size"
-		android:layout_alignParentRight="true"
-		android:layout_alignParentTop="true"
-		android:background="?attr/selectableItemBackground"
+		android:layout_margin="@dimen/margin_medium"
+		android:background="?attr/selectableItemBackgroundBorderless"
 		android:contentDescription="@string/delete"
 		android:src="@drawable/action_delete_black"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
 		app:tint="?attr/colorControlNormal"/>
 
 	<TextView
 		android:id="@+id/author"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_below="@+id/titleView"
-		android:layout_marginRight="@dimen/margin_small"
-		android:paddingTop="@dimen/margin_tiny"
+		android:layout_marginTop="@dimen/margin_small"
 		android:text="@string/blogs_rss_feeds_manage_author"
 		android:textColor="?android:attr/textColorSecondary"
-		android:textSize="@dimen/text_size_small"/>
+		android:textSize="@dimen/text_size_small"
+		app:layout_constraintStart_toStartOf="@+id/titleView"
+		app:layout_constraintTop_toBottomOf="@+id/titleView"/>
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/authorView"
-		android:layout_width="wrap_content"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_alignBottom="@+id/author"
 		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/margin_small"
 		android:layout_marginRight="@dimen/listitem_horizontal_margin"
-		android:layout_toRightOf="@+id/author"
+		android:layout_marginStart="@dimen/margin_small"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
+		app:layout_constraintBaseline_toBaselineOf="@+id/author"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@+id/author"
 		tools:text="Bruce Schneier"/>
 
 	<TextView
 		android:id="@+id/imported"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_below="@+id/author"
-		android:layout_marginRight="@dimen/margin_small"
-		android:paddingTop="@dimen/margin_tiny"
+		android:layout_marginTop="@dimen/margin_tiny"
 		android:text="@string/blogs_rss_feeds_manage_imported"
 		android:textColor="?android:attr/textColorSecondary"
-		android:textSize="@dimen/text_size_small"/>
+		android:textSize="@dimen/text_size_small"
+		app:layout_constraintStart_toStartOf="@+id/titleView"
+		app:layout_constraintTop_toBottomOf="@+id/author"/>
 
 	<TextView
 		android:id="@+id/importedView"
-		android:layout_width="wrap_content"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_alignBottom="@+id/imported"
 		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/margin_small"
 		android:layout_marginRight="@dimen/listitem_horizontal_margin"
-		android:layout_toRightOf="@+id/imported"
+		android:layout_marginStart="@dimen/margin_small"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
+		app:layout_constraintBaseline_toBaselineOf="@+id/imported"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@+id/imported"
 		tools:text="July 4"/>
 
 	<TextView
 		android:id="@+id/updated"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_below="@+id/imported"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/margin_small"
-		android:paddingTop="@dimen/margin_tiny"
+		android:layout_marginTop="@dimen/margin_tiny"
 		android:text="@string/blogs_rss_feeds_manage_updated"
 		android:textColor="?android:attr/textColorSecondary"
-		android:textSize="@dimen/text_size_small"/>
+		android:textSize="@dimen/text_size_small"
+		app:layout_constraintStart_toStartOf="@+id/titleView"
+		app:layout_constraintTop_toBottomOf="@+id/imported"/>
 
 	<TextView
 		android:id="@+id/updatedView"
-		android:layout_width="wrap_content"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_alignBottom="@+id/updated"
 		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/margin_small"
 		android:layout_marginRight="@dimen/listitem_horizontal_margin"
-		android:layout_toRightOf="@+id/updated"
+		android:layout_marginStart="@dimen/margin_small"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
+		app:layout_constraintBottom_toBottomOf="@+id/updated"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@+id/updated"
 		tools:text="5 min. ago"/>
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/descriptionView"
-		android:layout_width="wrap_content"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_below="@+id/updated"
 		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
-		android:paddingTop="@dimen/margin_medium"
+		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginTop="@dimen/margin_medium"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/updated"
 		tools:text="This is a description of the RSS feed. It can be several lines long, but it can also not exist at all if it is not present in the feed itself."/>
 
 	<View
 		style="@style/Divider.ThreadItem"
-		android:layout_alignParentLeft="true"
-		android:layout_alignParentStart="true"
-		android:layout_below="@+id/descriptionView"
-		android:layout_marginTop="@dimen/listitem_horizontal_margin"/>
+		android:layout_marginTop="@dimen/listitem_horizontal_margin"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/descriptionView"/>
 
-</RelativeLayout>
+</android.support.constraint.ConstraintLayout>
 
diff --git a/briar-android/src/main/res/layout/list_item_selectable_contact.xml b/briar-android/src/main/res/layout/list_item_selectable_contact.xml
index db71428c8..6ea098ccb 100644
--- a/briar-android/src/main/res/layout/list_item_selectable_contact.xml
+++ b/briar-android/src/main/res/layout/list_item_selectable_contact.xml
@@ -1,69 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<android.support.constraint.ConstraintLayout
+	android:id="@+id/linearLayout2"
 	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="wrap_content"
-	android:orientation="vertical">
+	android:background="?attr/selectableItemBackground">
 
-	<RelativeLayout
-		android:layout_width="match_parent"
+	<de.hdodenhof.circleimageview.CircleImageView
+		android:id="@+id/avatarView"
+		style="@style/BriarAvatar"
+		android:layout_width="@dimen/listitem_selectable_picture_size"
+		android:layout_height="@dimen/listitem_selectable_picture_size"
+		android:layout_margin="@dimen/listitem_horizontal_margin"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:src="@mipmap/ic_launcher_round"/>
+
+	<com.vanniktech.emoji.EmojiTextView
+		android:id="@+id/nameView"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:background="?attr/selectableItemBackground"
-		android:padding="@dimen/listitem_horizontal_margin">
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginTop="@dimen/listitem_horizontal_margin"
+		android:textColor="?android:attr/textColorPrimary"
+		android:textSize="@dimen/text_size_medium"
+		app:layout_constraintBottom_toTopOf="@+id/infoView"
+		app:layout_constraintEnd_toStartOf="@+id/checkBox"
+		app:layout_constraintStart_toEndOf="@+id/avatarView"
+		app:layout_constraintTop_toTopOf="parent"
+		app:layout_constraintVertical_chainStyle="packed"
+		tools:text="This is a name of a contact with a long name"/>
 
-		<de.hdodenhof.circleimageview.CircleImageView
-			android:id="@+id/avatarView"
-			style="@style/BriarAvatar"
-			android:layout_width="@dimen/listitem_selectable_picture_size"
-			android:layout_height="@dimen/listitem_selectable_picture_size"
-			android:layout_alignParentLeft="true"
-			android:layout_alignParentStart="true"
-			android:layout_centerVertical="true"
-			tools:src="@mipmap/ic_launcher_round"/>
+	<TextView
+		android:id="@+id/infoView"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginBottom="@dimen/listitem_horizontal_margin"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:maxLines="2"
+		android:text="@string/forum_invitation_already_sharing"
+		android:textColor="?android:attr/textColorTertiary"
+		android:textSize="@dimen/text_size_small"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="@+id/checkBox"
+		app:layout_constraintStart_toEndOf="@+id/avatarView"
+		app:layout_constraintTop_toBottomOf="@+id/nameView"
+		tools:visibility="visible"/>
 
-		<LinearLayout
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_centerVertical="true"
-			android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-			android:layout_marginStart="@dimen/listitem_horizontal_margin"
-			android:layout_toEndOf="@+id/avatarView"
-			android:layout_toLeftOf="@+id/checkBox"
-			android:layout_toRightOf="@+id/avatarView"
-			android:orientation="vertical">
+	<CheckBox
+		android:id="@+id/checkBox"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_margin="@dimen/listitem_horizontal_margin"
+		android:clickable="false"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintTop_toTopOf="parent"/>
 
-			<com.vanniktech.emoji.EmojiTextView
-				android:id="@+id/nameView"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:textColor="?android:attr/textColorPrimary"
-				android:textSize="@dimen/text_size_large"
-				tools:text="This is a name of a contact with a long name"/>
+	<View
+		android:id="@+id/divider"
+		style="@style/Divider.ContactList"
+		android:layout_width="0dp"
+		android:layout_marginLeft="@dimen/margin_medium"
+		android:layout_marginStart="@dimen/margin_medium"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintStart_toEndOf="@id/avatarView"/>
 
-			<TextView
-				android:id="@+id/infoView"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:maxLines="2"
-				android:text="@string/forum_invitation_already_sharing"
-				android:textColor="?android:attr/textColorTertiary"
-				android:textSize="@dimen/text_size_small"
-				tools:visibility="visible"/>
-
-		</LinearLayout>
-
-		<CheckBox
-			android:id="@+id/checkBox"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentEnd="true"
-			android:layout_alignParentRight="true"
-			android:layout_centerVertical="true"
-			android:clickable="false"/>
-
-	</RelativeLayout>
-
-	<View style="@style/Divider.ContactList"/>
-
-</LinearLayout>
\ No newline at end of file
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/list_item_thread.xml b/briar-android/src/main/res/layout/list_item_thread.xml
index 7193536ab..5001b742a 100644
--- a/briar-android/src/main/res/layout/list_item_thread.xml
+++ b/briar-android/src/main/res/layout/list_item_thread.xml
@@ -1,94 +1,106 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-	android:id="@+id/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="wrap_content"
 	android:baselineAligned="false"
-	android:background="@drawable/list_item_thread_background"
 	android:orientation="horizontal">
 
-	<RelativeLayout
+	<android.support.constraint.ConstraintLayout
 		android:layout_width="wrap_content"
-		android:layout_height="match_parent">
+		android:layout_height="match_parent"
+		android:background="@drawable/list_item_thread_background">
 
 		<View
 			android:id="@+id/nested_line_1"
 			style="@style/DiscussionLevelIndicator"
-			android:layout_width="@dimen/forum_nested_line_width"
-			android:layout_height="match_parent"
-			android:visibility="gone"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
 			tools:visibility="visible"/>
 
 		<View
 			android:id="@+id/nested_line_2"
 			style="@style/DiscussionLevelIndicator"
-			android:layout_width="@dimen/forum_nested_line_width"
-			android:layout_height="match_parent"
-			android:layout_toRightOf="@id/nested_line_1"
-			android:visibility="gone"/>
+			app:layout_constraintStart_toEndOf="@id/nested_line_1"
+			app:layout_constraintTop_toTopOf="parent"
+			tools:visibility="visible"/>
 
 		<View
 			android:id="@+id/nested_line_3"
 			style="@style/DiscussionLevelIndicator"
-			android:layout_width="@dimen/forum_nested_line_width"
-			android:layout_height="match_parent"
-			android:layout_toRightOf="@id/nested_line_2"
-			android:visibility="gone"/>
+			app:layout_constraintStart_toEndOf="@id/nested_line_2"
+			app:layout_constraintTop_toTopOf="parent"
+			tools:visibility="visible"/>
 
 		<View
 			android:id="@+id/nested_line_4"
 			style="@style/DiscussionLevelIndicator"
-			android:layout_width="@dimen/forum_nested_line_width"
-			android:layout_height="match_parent"
-			android:layout_toRightOf="@id/nested_line_3"
-			android:visibility="gone"/>
+			app:layout_constraintStart_toEndOf="@id/nested_line_3"
+			app:layout_constraintTop_toTopOf="parent"/>
 
 		<View
 			android:id="@+id/nested_line_5"
 			style="@style/DiscussionLevelIndicator"
-			android:layout_width="@dimen/forum_nested_line_width"
-			android:layout_height="match_parent"
-			android:layout_toRightOf="@id/nested_line_4"
-			android:visibility="gone"/>
+			app:layout_constraintStart_toEndOf="@id/nested_line_4"
+			app:layout_constraintTop_toTopOf="parent"
+			tools:visibility="visible"/>
 
 		<TextView
 			android:id="@+id/nested_line_text"
 			android:layout_width="@dimen/forum_nested_indicator"
 			android:layout_height="@dimen/forum_nested_indicator"
-			android:layout_centerInParent="true"
 			android:background="@drawable/level_indicator_circle"
 			android:gravity="center"
 			android:textSize="@dimen/text_size_small"
-			android:visibility="gone"/>
+			android:visibility="gone"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			tools:text="42"
+			tools:visibility="visible"/>
 
-	</RelativeLayout>
+	</android.support.constraint.ConstraintLayout>
 
-	<RelativeLayout
+	<android.support.constraint.ConstraintLayout
+		android:id="@+id/layout"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_weight="1">
+		android:layout_weight="1"
+		android:background="@drawable/list_item_thread_background">
+
+		<View
+			android:id="@+id/divider"
+			style="@style/Divider.ThreadItem"
+			app:layout_constraintLeft_toLeftOf="parent"
+			app:layout_constraintTop_toTopOf="parent"/>
 
 		<com.vanniktech.emoji.EmojiTextView
 			android:id="@+id/text"
-			android:layout_width="match_parent"
+			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:padding="@dimen/margin_medium"
 			android:textColor="?android:attr/textColorPrimary"
 			android:textIsSelectable="true"
 			android:textSize="@dimen/text_size_medium"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/divider"
 			tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."/>
 
 		<org.briarproject.briar.android.view.AuthorView
 			android:id="@+id/author"
-			android:layout_width="wrap_content"
+			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_alignLeft="@id/text"
-			android:layout_below="@id/text"
-			android:layout_marginLeft="@dimen/margin_medium"
-			android:layout_toLeftOf="@+id/btn_reply"
+			android:layout_marginBottom="@dimen/margin_medium"
+			android:layout_marginEnd="@dimen/margin_medium"
+			android:layout_marginStart="@dimen/margin_medium"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toStartOf="@+id/btn_reply"
+			app:layout_constraintStart_toStartOf="@id/text"
+			app:layout_constraintTop_toBottomOf="@id/text"
 			app:persona="commenter"/>
 
 		<TextView
@@ -96,19 +108,14 @@
 			style="@style/BriarButtonFlat.Positive.Tiny"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_alignBottom="@+id/author"
-			android:layout_alignParentRight="true"
-			android:layout_below="@+id/text"
-			android:layout_marginRight="@dimen/margin_medium"
+			android:layout_marginEnd="@dimen/margin_medium"
+			android:layout_marginStart="@dimen/margin_medium"
 			android:text="@string/btn_reply"
-			android:textSize="@dimen/text_size_tiny"/>
+			android:textSize="@dimen/text_size_tiny"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/text"/>
 
-		<View
-			style="@style/Divider.ThreadItem"
-			android:layout_alignLeft="@id/text"
-			android:layout_below="@+id/author"
-			android:layout_marginTop="@dimen/margin_medium"/>
-
-	</RelativeLayout>
+	</android.support.constraint.ConstraintLayout>
 
 </LinearLayout>
diff --git a/briar-android/src/main/res/layout/list_item_transport.xml b/briar-android/src/main/res/layout/list_item_transport.xml
index ab7967049..80022b327 100644
--- a/briar-android/src/main/res/layout/list_item_transport.xml
+++ b/briar-android/src/main/res/layout/list_item_transport.xml
@@ -2,17 +2,19 @@
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
+	android:gravity="center_horizontal"
+	android:orientation="vertical"
 	android:padding="@dimen/margin_small"
-	android:gravity="center_horizontal">
+	tools:ignore="UseCompoundDrawables">
 
 	<ImageView
 		android:id="@+id/imageView"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:padding="@dimen/margin_small"
+		tools:ignore="ContentDescription"
 		tools:src="@drawable/transport_tor"/>
 
 	<TextView
diff --git a/briar-android/src/main/res/layout/navigation_header.xml b/briar-android/src/main/res/layout/navigation_header.xml
index a54b9b6a0..475224df9 100644
--- a/briar-android/src/main/res/layout/navigation_header.xml
+++ b/briar-android/src/main/res/layout/navigation_header.xml
@@ -10,9 +10,10 @@
 	<ImageView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_gravity="bottom"
+		android:layout_gravity="bottom|start"
 		android:layout_marginBottom="@dimen/margin_medium"
-		android:layout_marginLeft="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/margin_medium"
+		android:layout_marginStart="@dimen/margin_medium"
 		android:contentDescription="@string/app_name"
 		android:src="@drawable/navigation_drawer_header"/>
 
diff --git a/briar-android/src/main/res/layout/power_view.xml b/briar-android/src/main/res/layout/power_view.xml
index 2a288c217..10e461f49 100644
--- a/briar-android/src/main/res/layout/power_view.xml
+++ b/briar-android/src/main/res/layout/power_view.xml
@@ -11,9 +11,9 @@
 		android:id="@+id/textView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginTop="8dp"
-		android:paddingLeft="@dimen/margin_large"
-		android:paddingRight="@dimen/margin_large"
+		android:layout_marginEnd="@dimen/margin_large"
+		android:layout_marginStart="@dimen/margin_large"
+		android:layout_marginTop="@dimen/margin_medium"
 		android:textSize="@dimen/text_size_medium"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
@@ -24,7 +24,7 @@
 		android:id="@+id/checkImage"
 		android:layout_width="24dp"
 		android:layout_height="24dp"
-		android:layout_margin="8dp"
+		android:layout_margin="@dimen/margin_medium"
 		android:src="@drawable/ic_check_white"
 		android:visibility="invisible"
 		app:layout_constraintBottom_toBottomOf="@+id/button"
@@ -38,7 +38,7 @@
 		style="@style/BriarButton"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_margin="8dp"
+		android:layout_margin="@dimen/margin_medium"
 		app:layout_constraintEnd_toStartOf="@+id/helpButton"
 		app:layout_constraintStart_toEndOf="@+id/checkImage"
 		app:layout_constraintTop_toBottomOf="@+id/textView"
@@ -49,7 +49,7 @@
 		style="@style/BriarButtonFlat.Positive"
 		android:layout_width="24dp"
 		android:layout_height="24dp"
-		android:layout_margin="8dp"
+		android:layout_margin="@dimen/margin_medium"
 		android:contentDescription="@string/help"
 		android:src="@drawable/ic_help_outline_white"
 		android:tint="@color/briar_button_text_positive"
diff --git a/briar-android/src/main/res/layout/preferences_category.xml b/briar-android/src/main/res/layout/preferences_category.xml
index c323d8dca..853d70872 100644
--- a/briar-android/src/main/res/layout/preferences_category.xml
+++ b/briar-android/src/main/res/layout/preferences_category.xml
@@ -10,4 +10,4 @@
 	android:textColor="@color/briar_accent"
 	android:textSize="14sp"
 	android:textStyle="bold"
-	tools:text="This is a category"/>
\ No newline at end of file
+	tools:text="@string/security_settings_title"/>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/qr_code_view.xml b/briar-android/src/main/res/layout/qr_code_view.xml
index 9062428d0..95d2d8189 100644
--- a/briar-android/src/main/res/layout/qr_code_view.xml
+++ b/briar-android/src/main/res/layout/qr_code_view.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge
 	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"
 	tools:showIn="@layout/fragment_keyagreement_qr">
 
@@ -11,29 +10,22 @@
 		android:layout_height="wrap_content"
 		android:layout_gravity="center"/>
 
-	<android.support.constraint.ConstraintLayout
+	<ImageView
+		android:id="@+id/qr_code"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent">
+		android:layout_height="match_parent"
+		android:contentDescription="@string/qr_code"
+		android:scaleType="fitCenter"/>
 
-		<ImageView
-			android:id="@+id/qr_code"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:contentDescription="@string/qr_code"
-			android:scaleType="fitCenter"/>
+	<ImageView
+		android:id="@+id/fullscreen_button"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom|end|right"
+		android:layout_margin="@dimen/margin_small"
+		android:alpha="0.54"
+		android:background="?attr/selectableItemBackground"
+		android:contentDescription="@string/show_qr_code_fullscreen"
+		android:src="@drawable/ic_fullscreen_black_48dp"/>
 
-		<ImageView
-			android:id="@+id/fullscreen_button"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_margin="@dimen/margin_small"
-			android:alpha="0.54"
-			android:background="?selectableItemBackground"
-			android:contentDescription="@string/show_qr_code_fullscreen"
-			android:src="@drawable/ic_fullscreen_black_48dp"
-			app:layout_constraintBottom_toBottomOf="parent"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintRight_toRightOf="parent"/>
-
-	</android.support.constraint.ConstraintLayout>
 </merge>
diff --git a/briar-android/src/main/res/layout/splash.xml b/briar-android/src/main/res/layout/splash.xml
index bab1dc6fb..9466f9a0e 100644
--- a/briar-android/src/main/res/layout/splash.xml
+++ b/briar-android/src/main/res/layout/splash.xml
@@ -5,11 +5,11 @@
 	android:layout_height="match_parent">
 
 	<ImageView
-		android:src="@drawable/splash_screen"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center"
 		android:layout_margin="@dimen/margin_xxlarge"
-		android:contentDescription="@string/app_name"/>
+		android:contentDescription="@string/app_name"
+		android:src="@drawable/splash_screen"/>
 
 </FrameLayout>
diff --git a/briar-android/src/main/res/layout/text_avatar_view.xml b/briar-android/src/main/res/layout/text_avatar_view.xml
index 215bc510c..f124dc98c 100644
--- a/briar-android/src/main/res/layout/text_avatar_view.xml
+++ b/briar-android/src/main/res/layout/text_avatar_view.xml
@@ -9,8 +9,8 @@
 		style="@style/BriarAvatar"
 		android:layout_width="@dimen/avatar_forum_size"
 		android:layout_height="@dimen/avatar_forum_size"
-		android:layout_gravity="bottom|left"
-		android:src="@color/briar_button_text_positive"/>
+		android:layout_gravity="bottom|left|start"
+		tools:src="@color/briar_button_text_positive"/>
 
 	<android.support.v7.widget.AppCompatTextView
 		android:id="@+id/textAvatarView"
@@ -32,13 +32,15 @@
 		android:id="@+id/unreadCountView"
 		android:layout_width="wrap_content"
 		android:layout_height="@dimen/unread_bubble_size"
-		android:layout_gravity="right|top"
+		android:layout_gravity="right|end|top"
 		android:background="@drawable/bubble"
 		android:gravity="center"
 		android:minWidth="@dimen/unread_bubble_size"
 		android:textColor="@color/briar_text_primary_inverse"
 		android:textSize="@dimen/unread_bubble_text_size"
 		android:textStyle="bold"
-		tools:text="12"/>
+		android:visibility="invisible"
+		tools:text="12"
+		tools:visibility="visible"/>
 
 </merge>
diff --git a/briar-android/src/main/res/layout/text_input_view.xml b/briar-android/src/main/res/layout/text_input_view.xml
index 5f1ecbb25..d1730c469 100644
--- a/briar-android/src/main/res/layout/text_input_view.xml
+++ b/briar-android/src/main/res/layout/text_input_view.xml
@@ -22,9 +22,9 @@
 			android:layout_height="@dimen/text_input_height"
 			android:layout_gravity="bottom"
 			android:background="?attr/selectableItemBackground"
-			android:src="@drawable/ic_emoji_toggle"
 			android:padding="@dimen/margin_small"
 			android:scaleType="center"
+			android:src="@drawable/ic_emoji_toggle"
 			app:tint="?attr/colorControlNormal"/>
 
 		<com.vanniktech.emoji.EmojiEditText
@@ -37,8 +37,10 @@
 			android:maxLines="4"
 			android:minHeight="@dimen/text_input_height"
 			android:paddingLeft="2dp"
+			android:paddingStart="2dp"
 			android:textColor="?android:attr/textColorPrimary"
-			tools:ignore="RtlSymmetry"/>
+			tools:ignore="RtlSymmetry"
+			tools:text="Line 1\nLine 2\nLine 3"/>
 
 		<android.support.v7.widget.AppCompatImageButton
 			android:id="@+id/btn_send"
diff --git a/briar-android/src/main/res/layout/text_input_view_large.xml b/briar-android/src/main/res/layout/text_input_view_large.xml
index b5ced660d..2af9dc49e 100644
--- a/briar-android/src/main/res/layout/text_input_view_large.xml
+++ b/briar-android/src/main/res/layout/text_input_view_large.xml
@@ -12,8 +12,6 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginEnd="@dimen/margin_medium"
-		android:layout_marginLeft="@dimen/margin_medium"
-		android:layout_marginRight="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
 		android:layout_marginTop="@dimen/margin_medium"
 		android:elevation="@dimen/cardview_default_elevation"
@@ -33,9 +31,9 @@
 				android:layout_height="@dimen/text_input_height"
 				android:layout_gravity="bottom"
 				android:background="?attr/selectableItemBackground"
-				android:src="@drawable/ic_emoji_toggle"
 				android:padding="@dimen/margin_small"
 				android:scaleType="center"
+				android:src="@drawable/ic_emoji_toggle"
 				app:tint="?attr/colorControlNormal"/>
 
 			<com.vanniktech.emoji.EmojiEditText
@@ -51,7 +49,8 @@
 				android:paddingRight="@dimen/margin_small"
 				android:paddingTop="@dimen/margin_small"
 				android:textColor="?android:attr/textColorPrimary"
-				tools:ignore="RtlSymmetry"/>
+				tools:ignore="RtlSymmetry"
+				tools:text="Line 1\nLine 2\nLine 3"/>
 
 		</LinearLayout>
 
diff --git a/briar-android/src/main/res/layout/toolbar.xml b/briar-android/src/main/res/layout/toolbar.xml
index 9a17ba10d..e40212f95 100644
--- a/briar-android/src/main/res/layout/toolbar.xml
+++ b/briar-android/src/main/res/layout/toolbar.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.AppBarLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content">
+	android:layout_height="wrap_content"
+	tools:context="org.briarproject.briar.android.navdrawer.NavDrawerActivity">
 
 	<android.support.v7.widget.Toolbar
 		android:id="@+id/toolbar"
diff --git a/briar-android/src/main/res/layout/unread_message_button.xml b/briar-android/src/main/res/layout/unread_message_button.xml
index 9c00eca8e..53aa75097 100644
--- a/briar-android/src/main/res/layout/unread_message_button.xml
+++ b/briar-android/src/main/res/layout/unread_message_button.xml
@@ -16,7 +16,8 @@
 		android:id="@+id/unreadCountView"
 		android:layout_width="wrap_content"
 		android:layout_height="@dimen/unread_bubble_size"
-		android:layout_gravity="right|top"
+		android:layout_gravity="right|end|top"
+		android:layout_marginEnd="5dp"
 		android:layout_marginRight="5dp"
 		android:layout_marginTop="10dp"
 		android:background="@drawable/bubble"
diff --git a/briar-android/src/main/res/values-ldrtl/dimens.xml b/briar-android/src/main/res/values-ldrtl/dimens.xml
new file mode 100644
index 000000000..479081967
--- /dev/null
+++ b/briar-android/src/main/res/values-ldrtl/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<dimen name="message_bubble_radius_top_inner">@dimen/message_bubble_radius_big</dimen>
+	<dimen name="message_bubble_radius_top_outer">@dimen/message_bubble_radius_small</dimen>
+</resources>
\ No newline at end of file
diff --git a/briar-android/src/main/res/values/dimens.xml b/briar-android/src/main/res/values/dimens.xml
index cf0d23ccd..1b7f86cd8 100644
--- a/briar-android/src/main/res/values/dimens.xml
+++ b/briar-android/src/main/res/values/dimens.xml
@@ -28,7 +28,7 @@
 	<dimen name="listitem_picture_frame_offset_horizontal">1dp</dimen>
 	<dimen name="listitem_picture_frame_offset_vertical">2dp</dimen>
 	<dimen name="listitem_selectable_picture_size">40dp</dimen>
-	<dimen name="listitem_group_member_indentation">32dp</dimen>
+	<dimen name="listitem_group_member_indentation">40dp</dimen>
 	<dimen name="avatar_forum_size">48dp</dimen>
 	<dimen name="avatar_border_width">2dp</dimen>
 	<dimen name="avatar_text_size">30sp</dimen>
@@ -40,6 +40,8 @@
 
 	<dimen name="message_bubble_radius_big">16dp</dimen>
 	<dimen name="message_bubble_radius_small">4dp</dimen>
+	<dimen name="message_bubble_radius_top_inner">@dimen/message_bubble_radius_small</dimen>
+	<dimen name="message_bubble_radius_top_outer">@dimen/message_bubble_radius_big</dimen>
 	<dimen name="message_bubble_margin">6dp</dimen>
 	<dimen name="message_bubble_padding_sides">12dp</dimen>
 	<dimen name="message_bubble_padding_top">6dp</dimen>
@@ -50,8 +52,8 @@
 	<dimen name="message_bubble_margin_non_tail">30dp</dimen>
 	<dimen name="message_bubble_stroke">1px</dimen>
 
-	<dimen name="forum_nested_line_width">2dp</dimen>
-	<dimen name="forum_nested_indicator">24dp</dimen>
+	<dimen name="forum_nested_line_width">1dp</dimen>
+	<dimen name="forum_nested_indicator">25dp</dimen>
 
 	<dimen name="blogs_avatar_normal_size">30dp</dimen>
 	<dimen name="blogs_avatar_icon_size">15dp</dimen>
diff --git a/briar-android/src/main/res/values/styles.xml b/briar-android/src/main/res/values/styles.xml
index a77c76497..390abd1d5 100644
--- a/briar-android/src/main/res/values/styles.xml
+++ b/briar-android/src/main/res/values/styles.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools">
 
 	<style name="BriarToolbar" parent="Widget.AppCompat.Toolbar">
 		<item name="android:background">?colorPrimary</item>
@@ -75,12 +77,11 @@
 	<style name="Divider.ContactList" parent="Divider">
 		<item name="android:layout_width">match_parent</item>
 		<item name="android:layout_height">1px</item>
-		<item name="android:layout_marginLeft">72dp</item>
 	</style>
 
 	<style name="Divider.ThreadItem" parent="Divider">
 		<item name="android:layout_width">match_parent</item>
-		<item name="android:layout_height">1dp</item>
+		<item name="android:layout_height">@dimen/forum_nested_line_width</item>
 	</style>
 
 	<style name="BriarAvatar">
@@ -109,8 +110,12 @@
 	</style>
 
 	<style name="DiscussionLevelIndicator">
-		<item name="android:layout_marginLeft">4dp</item>
+		<item name="android:layout_height">match_parent</item>
+		<item name="android:layout_width">@dimen/forum_nested_line_width</item>
+		<item name="android:layout_marginLeft">5dp</item>
+		<item name="android:layout_marginStart" tools:targetApi="jelly_bean_mr1">5dp</item>
 		<item name="android:background">@color/thread_indicator</item>
+		<item name="android:visibility">gone</item>
 	</style>
 
 	<style name="BriarCard" parent="CardView">
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',
diff --git a/briar-core/src/main/java/org/briarproject/briar/test/TestDataCreatorImpl.java b/briar-core/src/main/java/org/briarproject/briar/test/TestDataCreatorImpl.java
index 811f3a351..fd66761ea 100644
--- a/briar-core/src/main/java/org/briarproject/briar/test/TestDataCreatorImpl.java
+++ b/briar-core/src/main/java/org/briarproject/briar/test/TestDataCreatorImpl.java
@@ -116,9 +116,8 @@ public class TestDataCreatorImpl implements TestDataCreator {
 	@Override
 	public void createTestData(int numContacts, int numPrivateMsgs,
 			int numBlogPosts, int numForums, int numForumPosts) {
-		if (numContacts == 0)
-			throw new IllegalArgumentException(
-					"Number of contacts must be >= 1");
+		if (numContacts == 0) throw new IllegalArgumentException(
+				"Number of contacts must be >= 1");
 		ioExecutor.execute(() -> {
 			try {
 				createTestDataOnIoExecutor(numContacts, numPrivateMsgs,