diff --git a/briar-android/res/layout/activity_startup_failure.xml b/briar-android/res/layout/activity_startup_failure.xml
index 4ae08197a..c73dfbaae 100644
--- a/briar-android/res/layout/activity_startup_failure.xml
+++ b/briar-android/res/layout/activity_startup_failure.xml
@@ -4,13 +4,13 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="7dp">
+    android:padding="@dimen/margin_activity_horizontal">
 
     <TextView
         android:id="@+id/headlineView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
+        style="@style/BriarTextTitle"
         android:text="@string/startup_failed_notification_title"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="7dp"
diff --git a/briar-android/src/org/briarproject/android/CrashReportActivity.java b/briar-android/src/org/briarproject/android/CrashReportActivity.java
index ed6723a44..e412a1c41 100644
--- a/briar-android/src/org/briarproject/android/CrashReportActivity.java
+++ b/briar-android/src/org/briarproject/android/CrashReportActivity.java
@@ -1,7 +1,6 @@
 package org.briarproject.android;
 
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.app.ActivityManager;
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
@@ -16,6 +15,7 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ImageButton;
@@ -69,7 +69,7 @@ import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
 import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP;
 import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP_1;
 
-public class CrashReportActivity extends Activity implements OnClickListener {
+public class CrashReportActivity extends AppCompatActivity implements OnClickListener {
 
 	private static final Logger LOG =
 			Logger.getLogger(CrashReportActivity.class.getName());
@@ -143,6 +143,14 @@ public class CrashReportActivity extends Activity implements OnClickListener {
 		if (temp != null) temp.delete();
 	}
 
+	@Override
+	public void onBackPressed() {
+		// show home screen, otherwise we are crashing again
+		Intent intent = new Intent(Intent.ACTION_MAIN);
+		intent.addCategory(Intent.CATEGORY_HOME);
+		startActivity(intent);
+	}
+
 	public void onClick(View view) {
 		share();
 	}
diff --git a/briar-android/src/org/briarproject/android/StartupFailureActivity.java b/briar-android/src/org/briarproject/android/StartupFailureActivity.java
index 3742156d3..25d037289 100644
--- a/briar-android/src/org/briarproject/android/StartupFailureActivity.java
+++ b/briar-android/src/org/briarproject/android/StartupFailureActivity.java
@@ -7,8 +7,6 @@ import android.widget.TextView;
 
 import org.briarproject.R;
 
-import roboguice.activity.RoboActivity;
-
 import static org.briarproject.api.lifecycle.LifecycleManager.StartResult;
 
 public class StartupFailureActivity extends BaseActivity {