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 3a73e91ca..c5fd86c8d 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,7 +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.annotation.Nullable;
 import android.support.v4.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -13,10 +13,18 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
 
 import java.util.List;
 
+import static android.content.Intent.ACTION_VIEW;
+import static android.content.pm.PackageManager.MATCH_DEFAULT_ONLY;
+import static java.util.Objects.requireNonNull;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
 public class LinkDialogFragment extends DialogFragment {
 
 	private static final String TAG = LinkDialogFragment.class.getName();
@@ -34,17 +42,19 @@ public class LinkDialogFragment extends DialogFragment {
 	}
 
 	@Override
-	public void onCreate(Bundle savedInstanceState) {
+	public void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
-		url = getArguments().getString("url");
+		Bundle args = requireNonNull(getArguments());
+		url = requireNonNull(args.getString("url"));
 
 		setStyle(STYLE_NO_TITLE, R.style.BriarDialogTheme);
 	}
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater,
-			ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 
 		View v = inflater.inflate(R.layout.fragment_link_dialog, container,
 				false);
@@ -53,10 +63,11 @@ public class LinkDialogFragment extends DialogFragment {
 		urlView.setText(url);
 
 		// prepare normal intent or intent chooser
-		Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
-		PackageManager packageManager = getContext().getPackageManager();
+		Intent i = new Intent(ACTION_VIEW, Uri.parse(url));
+		PackageManager packageManager =
+				requireNonNull(getContext()).getPackageManager();
 		List activities = packageManager.queryIntentActivities(i,
-				PackageManager.MATCH_DEFAULT_ONLY);
+				MATCH_DEFAULT_ONLY);
 		boolean choice = activities.size() > 1;
 		Intent intent = choice ? Intent.createChooser(i,
 				getString(R.string.link_warning_open_link)) : i;
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 1ad1d25c7..abc0b7818 100644
--- a/briar-android/src/main/res/layout/fragment_link_dialog.xml
+++ b/briar-android/src/main/res/layout/fragment_link_dialog.xml
@@ -1,69 +1,109 @@
 <?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:padding="16dp">
+	android:layout_height="wrap_content">
 
 	<TextView
-		android:layout_width="match_parent"
+		android:id="@+id/linkWarning"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
+		android:layout_marginEnd="16dp"
+		android:layout_marginLeft="16dp"
+		android:layout_marginRight="16dp"
+		android:layout_marginStart="16dp"
+		android:layout_marginTop="16dp"
 		android:text="@string/link_warning_title"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_large"
-		android:textStyle="bold"/>
+		android:textStyle="bold"
+		app:layout_constraintBottom_toTopOf="@+id/scrollView"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		app:layout_constraintVertical_bias="0.0"
+		app:layout_constraintVertical_chainStyle="packed"/>
 
-	<TextView
-		android:layout_width="match_parent"
+	<ScrollView
+		android:id="@+id/scrollView"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginTop="@dimen/margin_large"
-		android:text="@string/link_warning_intro"
-		android:textColor="?android:attr/textColorPrimary"
-		android:textSize="@dimen/text_size_medium"/>
+		android:layout_marginEnd="16dp"
+		android:layout_marginLeft="16dp"
+		android:layout_marginRight="16dp"
+		android:layout_marginStart="16dp"
+		android:layout_marginTop="16dp"
+		app:layout_constrainedHeight="true"
+		app:layout_constraintBottom_toTopOf="@+id/cancelButton"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/linkWarning">
 
-	<TextView
-		android:id="@+id/urlView"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="@dimen/margin_large"
-		android:textColor="?android:attr/textColorPrimary"
-		android:textIsSelectable="true"
-		android:textSize="@dimen/text_size_medium"
-		android:typeface="monospace"
-		tools:text="http://very.bad.site.com"/>
-
-	<TextView
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="@dimen/margin_large"
-		android:text="@string/link_warning_text"
-		android:textColor="?android:attr/textColorPrimary"
-		android:textSize="@dimen/text_size_medium"/>
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginLeft="@dimen/margin_xxlarge"
-		android:layout_marginStart="@dimen/margin_xxlarge"
-		android:gravity="end"
-		android:orientation="horizontal">
-
-		<Button
-			android:id="@+id/cancelButton"
-			style="@style/BriarButtonFlat.Positive"
-			android:layout_width="wrap_content"
+		<LinearLayout
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:text="@string/cancel"/>
+			android:orientation="vertical">
 
-		<Button
-			android:id="@+id/openButton"
-			style="@style/BriarButtonFlat.Negative"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/link_warning_open_link"/>
+			<TextView
+				android:id="@+id/linkIntro"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="@string/link_warning_intro"
+				android:textColor="?android:attr/textColorPrimary"
+				android:textSize="@dimen/text_size_medium"/>
 
-	</LinearLayout>
+			<TextView
+				android:id="@+id/urlView"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:layout_marginBottom="16dp"
+				android:layout_marginTop="16dp"
+				android:background="@color/briar_white"
+				android:padding="8dp"
+				android:textColor="@color/briar_text_primary"
+				android:textIsSelectable="true"
+				android:textSize="@dimen/text_size_medium"
+				android:typeface="monospace"
+				tools:text="http://very.bad.site.com/with/a/super/long/address/that/can/push/stuff/off/screen/so/much/that/buttons/are/not/visible/which/is/bad/for/users/when/they/dont/know/what/to/do/they/might/be/completely/lost/crying/in/despair/so/we/need/to/make/sure/that/they/see/all/buttons"/>
 
-</LinearLayout>
\ No newline at end of file
+			<TextView
+				android:id="@+id/thinkBeforeOpen"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="@string/link_warning_text"
+				android:textColor="?android:attr/textColorPrimary"
+				android:textSize="@dimen/text_size_medium"/>
+
+		</LinearLayout>
+
+	</ScrollView>
+
+	<Button
+		android:id="@+id/cancelButton"
+		style="@style/BriarButtonFlat.Positive"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="@string/cancel"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toStartOf="@+id/openButton"
+		app:layout_constraintHorizontal_bias="1.0"
+		app:layout_constraintHorizontal_chainStyle="packed"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/scrollView"
+		app:layout_constraintVertical_bias="1.0"/>
+
+	<Button
+		android:id="@+id/openButton"
+		style="@style/BriarButtonFlat.Negative"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="@string/link_warning_open_link"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@+id/cancelButton"
+		app:layout_constraintTop_toTopOf="@+id/cancelButton"/>
+
+</android.support.constraint.ConstraintLayout>
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 762a29427..29ee25fc0 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -456,7 +456,7 @@
 	<!-- Link Warning -->
 	<string name="link_warning_title">Link Warning</string>
 	<string name="link_warning_intro">You are about to open the following link with an external app.</string>
-	<string name="link_warning_text">This can be used to identify you. Think about whether you trust the person that sent you this link and consider opening it with Orfox.</string>
+	<string name="link_warning_text">This can be used to identify you. Think about whether you trust the person that sent you this link and consider opening it with Tor Browser.</string>
 	<string name="link_warning_open_link">Open Link</string>
 
 	<!-- Crash Reporter -->
diff --git a/briar-android/src/main/res/values/themes.xml b/briar-android/src/main/res/values/themes.xml
index 9ee91da7e..e47e9d233 100644
--- a/briar-android/src/main/res/values/themes.xml
+++ b/briar-android/src/main/res/values/themes.xml
@@ -29,7 +29,7 @@
 		<item name="android:activityCloseExitAnimation">@anim/screen_new_out</item>
 	</style>
 
-	<style name="BriarDialogTheme" parent="Theme.AppCompat.DayNight.Dialog">
+	<style name="BriarDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.MinWidth">
 		<item name="colorPrimary">@color/briar_primary</item>
 		<item name="colorPrimaryDark">@color/briar_primary_dark</item>
 		<item name="colorAccent">@color/briar_accent</item>