diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/AliasDialogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/AliasDialogFragment.java
index 4eb192dfd..1e3df3951 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/AliasDialogFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/AliasDialogFragment.java
@@ -1,15 +1,12 @@
 package org.briarproject.briar.android.contact;
 
 import android.arch.lifecycle.ViewModelProviders;
-import android.graphics.Point;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatDialogFragment;
-import android.view.Display;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
 import android.widget.Button;
 import android.widget.EditText;
 
@@ -17,8 +14,6 @@ import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.briar.R;
 
-import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
-
 public class AliasDialogFragment extends AppCompatDialogFragment {
 
 	final static String TAG = AliasDialogFragment.class.getName();
@@ -77,19 +72,4 @@ public class AliasDialogFragment extends AppCompatDialogFragment {
 
 		return v;
 	}
-
-	@Override
-	public void onResume() {
-		Window window = getDialog().getWindow();
-		if (window == null) {
-			super.onResume();
-			return;
-		}
-		Point size = new Point();
-		Display display = window.getWindowManager().getDefaultDisplay();
-		display.getSize(size);
-		window.setLayout((int) (size.x * 0.75), WRAP_CONTENT);
-		super.onResume();
-	}
-
 }
diff --git a/briar-android/src/main/res/layout/fragment_alias_dialog.xml b/briar-android/src/main/res/layout/fragment_alias_dialog.xml
index 70920e522..0e424e5d0 100644
--- a/briar-android/src/main/res/layout/fragment_alias_dialog.xml
+++ b/briar-android/src/main/res/layout/fragment_alias_dialog.xml
@@ -1,16 +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"
-	android:layout_width="wrap_content"
+	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:orientation="vertical">
+	android:orientation="vertical"
+	android:padding="16dp">
 
 	<TextView
 		android:id="@+id/titleView"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:padding="16dp"
 		android:text="@string/set_contact_alias"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_large"
@@ -20,8 +19,7 @@
 		android:id="@+id/aliasEditText"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginLeft="16dp"
-		android:layout_marginRight="16dp"
+		android:layout_marginTop="16dp"
 		android:hint="@string/set_contact_alias_hint"
 		android:inputType="textPersonName"
 		android:textColor="?android:attr/textColorPrimary"
@@ -30,8 +28,9 @@
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:paddingLeft="16dp"
-		android:paddingRight="16dp"
+		android:layout_marginLeft="@dimen/margin_xxlarge"
+		android:layout_marginStart="@dimen/margin_xxlarge"
+		android:gravity="end"
 		android:orientation="horizontal">
 
 		<Button
@@ -39,7 +38,6 @@
 			style="@style/BriarButtonFlat.Negative"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_weight="1"
 			android:text="@string/cancel"/>
 
 		<Button
@@ -47,7 +45,6 @@
 			style="@style/BriarButtonFlat.Positive"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_weight="1"
 			android:text="@string/set_alias"/>
 
 	</LinearLayout>
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 5d7a52c1c..1ad1d25c7 100644
--- a/briar-android/src/main/res/layout/fragment_link_dialog.xml
+++ b/briar-android/src/main/res/layout/fragment_link_dialog.xml
@@ -1,75 +1,69 @@
 <?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"
-	android:orientation="vertical">
+	android:layout_height="wrap_content"
+	android:orientation="vertical"
+	android:padding="16dp">
+
+	<TextView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/link_warning_title"
+		android:textColor="?android:attr/textColorPrimary"
+		android:textSize="@dimen/text_size_large"
+		android:textStyle="bold"/>
+
+	<TextView
+		android:layout_width="match_parent"
+		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"/>
+
+	<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="wrap_content"
-		android:layout_height="wrap_content"
-		android:orientation="vertical"
-		android:padding="@dimen/margin_large">
-
-		<TextView
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="@string/link_warning_title"
-			android:textColor="?android:attr/textColorPrimary"
-			android:textSize="@dimen/text_size_large"
-			android:textStyle="bold"/>
-
-		<TextView
-			android:layout_width="match_parent"
-			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"/>
-
-		<TextView
-			android:id="@+id/urlView"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/margin_large"
-			android:textIsSelectable="true"
-			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.support.constraint.ConstraintLayout
 		android:layout_width="match_parent"
-		android:layout_height="@dimen/button_size">
+		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="0dp"
+			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:text="@string/cancel"
-			app:layout_constraintEnd_toStartOf="@+id/openButton"
-			app:layout_constraintStart_toStartOf="parent"/>
+			android:text="@string/cancel"/>
 
 		<Button
 			android:id="@+id/openButton"
 			style="@style/BriarButtonFlat.Negative"
-			android:layout_width="0dp"
+			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:text="@string/link_warning_open_link"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toEndOf="@+id/cancelButton"/>
+			android:text="@string/link_warning_open_link"/>
 
-	</android.support.constraint.ConstraintLayout>
+	</LinearLayout>
 
 </LinearLayout>
\ No newline at end of file