diff --git a/src/main/java/org/thoughtcrime/securesms/LogViewActivity.java b/src/main/java/org/thoughtcrime/securesms/LogViewActivity.java
index 4a08e35a9..0f6ff0b6c 100644
--- a/src/main/java/org/thoughtcrime/securesms/LogViewActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/LogViewActivity.java
@@ -36,7 +36,6 @@ public class LogViewActivity extends BaseActionBarActivity {
     transaction.commit();
 
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
   }
 
   @Override
diff --git a/src/main/java/org/thoughtcrime/securesms/LogViewFragment.java b/src/main/java/org/thoughtcrime/securesms/LogViewFragment.java
index bb58bfbef..66ccd18b6 100644
--- a/src/main/java/org/thoughtcrime/securesms/LogViewFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/LogViewFragment.java
@@ -43,6 +43,7 @@ import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.notifications.FcmReceiveService;
 import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.ViewUtil;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -77,6 +78,10 @@ public class LogViewFragment extends Fragment {
     super.onViewCreated(view, savedInstanceState);
 
     logPreview   = (EditText) getView().findViewById(R.id.log_preview);
+
+    // add padding to avoid content hidden behind system bars
+    ViewUtil.applyWindowInsets(getView().findViewById(R.id.content_container), true, false, true, true);
+
     new PopulateLogcatAsyncTask(this).execute();
   }
 
diff --git a/src/main/res/layout/fragment_view_log.xml b/src/main/res/layout/fragment_view_log.xml
index ebbb470f6..c9b3608a7 100644
--- a/src/main/res/layout/fragment_view_log.xml
+++ b/src/main/res/layout/fragment_view_log.xml
@@ -6,12 +6,15 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent">
 
+  <include layout="@layout/status_bar_background"/>
+
     <ScrollView
         android:layout_width="fill_parent"
                 android:layout_height="0dp"
                 android:layout_weight="2">
 
-        <LinearLayout android:layout_width="match_parent"
+        <LinearLayout android:id="@+id/content_container"
+                      android:layout_width="match_parent"
                       android:layout_height="wrap_content"
                       android:orientation="vertical">
 
@@ -29,4 +32,4 @@
         </LinearLayout>
     </ScrollView>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/src/main/res/layout/log_view_activity.xml b/src/main/res/layout/log_view_activity.xml
index 9d6e1f4eb..669844f7f 100644
--- a/src/main/res/layout/log_view_activity.xml
+++ b/src/main/res/layout/log_view_activity.xml
@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    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">
-
 <LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/fragment_container"
     android:orientation="vertical"
-    android:background="?android:attr/windowBackground"
     android:layout_width="match_parent"
     android:layout_height="match_parent"/>
-
-</RelativeLayout>