diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/BriarButton.java b/briar-android/src/main/java/org/briarproject/briar/android/view/BriarButton.java
index 1a5b6b567..608af7f01 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/BriarButton.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/BriarButton.java
@@ -48,8 +48,7 @@ public class BriarButton extends FrameLayout {
 		attributes.recycle();
 
 		ContextThemeWrapper wrapper = new ContextThemeWrapper(context, style);
-		button = isInEditMode() ? new MaterialButton(context) :
-				new MaterialButton(wrapper, null, style);
+		button = new MaterialButton(wrapper, null, style);
 		button.setText(text);
 		addView(button);
 		progressBar = findViewById(R.id.briar_button_progress_bar);
diff --git a/briar-android/src/main/res/values/styles.xml b/briar-android/src/main/res/values/styles.xml
index 085ff7b24..1df8cee2a 100644
--- a/briar-android/src/main/res/values/styles.xml
+++ b/briar-android/src/main/res/values/styles.xml
@@ -56,6 +56,7 @@
 		<item name="android:layout_height">wrap_content</item>
 		<item name="android:textSize">@dimen/text_size_medium</item>
 		<item name="android:padding">@dimen/margin_large</item>
+		<item name="android:backgroundTint">@color/window_background</item>
 		<item name="android:minHeight">@dimen/button_size</item>
 		<item name="cornerRadius">6dp</item>
 	</style>