diff --git a/Opus/Code/UI/Fragments/DownloadQueue.cs b/Opus/Code/UI/Fragments/DownloadQueue.cs
index a6e6815..7a5fed9 100644
--- a/Opus/Code/UI/Fragments/DownloadQueue.cs
+++ b/Opus/Code/UI/Fragments/DownloadQueue.cs
@@ -1,6 +1,7 @@
 using Android.App;
-using Android.Graphics;
 using Android.OS;
+using Android.Support.Design.Widget;
+using Android.Support.V4.View;
 using Android.Support.V7.App;
 using Android.Support.V7.Widget;
 using Android.Views;
@@ -26,8 +27,9 @@ namespace Opus.Fragments
             instance = this;
             SetContentView(Resource.Layout.DownloadQueue);
 
-            Toolbar ToolBar = FindViewById<Toolbar>(Resource.Id.toolbar);
-            SetSupportActionBar(ToolBar);
+            Toolbar toolbar = FindViewById<Toolbar>(Resource.Id.toolbar);
+            ViewCompat.SetOnApplyWindowInsetsListener(toolbar, new FixToolbarPadding());
+            SetSupportActionBar(toolbar);
             SupportActionBar.Title = GetString(Resource.String.download_queue);
             SupportActionBar.SetHomeAsUpIndicator(Resource.Drawable.Close);
             SupportActionBar.SetDisplayHomeAsUpEnabled(true);
@@ -96,5 +98,16 @@ namespace Opus.Fragments
 
             return true;
         }
+
+        
+    }
+
+    class FixToolbarPadding : Java.Lang.Object, IOnApplyWindowInsetsListener
+    {
+        public WindowInsetsCompat OnApplyWindowInsets(View v, WindowInsetsCompat insets)
+        {
+            ((AppBarLayout.LayoutParams)v.LayoutParameters).TopMargin =  insets.SystemWindowInsetTop;
+            return insets;
+        }
     }
 }
\ No newline at end of file
diff --git a/Opus/Resources/layout/DownloadQueue.xml b/Opus/Resources/layout/DownloadQueue.xml
index edf2348..91a4b45 100644
--- a/Opus/Resources/layout/DownloadQueue.xml
+++ b/Opus/Resources/layout/DownloadQueue.xml
@@ -2,14 +2,14 @@
 <android.support.design.widget.CoordinatorLayout
   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:fitsSystemWindows="true"
   android:orientation="vertical" >
   <android.support.design.widget.AppBarLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="@*android:dimen/status_bar_height"
+    android:fitsSystemWindows="true"
     android:background="?colorAccent"
     android:id="@+id/appbar" >
     <android.support.v7.widget.Toolbar
@@ -21,6 +21,7 @@
   </android.support.design.widget.AppBarLayout>
   <android.support.v7.widget.RecyclerView
     android:id="@+id/list"
+    android:background="?android:colorBackground"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
     android:layout_height="match_parent"
     android:layout_width="match_parent" />