diff --git a/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
index 873b956ae..96c66e195 100644
--- a/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
@@ -48,6 +48,7 @@ import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.IntentUtils;
 import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.util.ScreenLockUtil;
+import org.thoughtcrime.securesms.util.ViewUtil;
 
 /**
  * The Activity for application preference display and management.
@@ -77,7 +78,9 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
 
     //noinspection ConstantConditions
     this.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
+
+    // add padding to avoid content hidden behind system bars
+    ViewUtil.applyWindowInsets(findViewById(R.id.fragment));
 
     if (icicle == null) {
       initFragment(R.id.fragment, new ApplicationPreferenceFragment());
diff --git a/src/main/res/layout/activity_application_preferences.xml b/src/main/res/layout/activity_application_preferences.xml
index 5dc280304..acddaa01c 100644
--- a/src/main/res/layout/activity_application_preferences.xml
+++ b/src/main/res/layout/activity_application_preferences.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<RelativeLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="?attr/colorPrimary"
-    android:fitsSystemWindows="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+  <include layout="@layout/status_bar_background"/>
+
   <FrameLayout
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:background="?android:attr/windowBackground"
 	  android:id="@+id/fragment" />
 
-</RelativeLayout>
+</FrameLayout>