diff --git a/res/layout/drawer_fragment.xml b/res/layout/drawer_fragment.xml
index ea9eed0..eeb792e 100644
--- a/res/layout/drawer_fragment.xml
+++ b/res/layout/drawer_fragment.xml
@@ -15,15 +15,18 @@
      limitations under the License.
 -->
 
+<!-- Layout for the navigation drawer. The content view needs to be wrapped in a FrameLayout in
+     order to go full screen with a ScrimDrawable. -->
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_fragment_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/list"
-        android:background="#FAFAFA"
+        android:background="@color/navigation_drawer_background_color"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:divider="@null" />
diff --git a/res/layout/nav_drawer_spacer b/res/layout/nav_drawer_spacer.xml
similarity index 100%
rename from res/layout/nav_drawer_spacer
rename to res/layout/nav_drawer_spacer.xml
diff --git a/res/layout/nav_header_main.xml b/res/layout/nav_header_main.xml
index 518e6e6..7a2e3cb 100644
--- a/res/layout/nav_header_main.xml
+++ b/res/layout/nav_header_main.xml
@@ -16,16 +16,10 @@
   limitations under the License.
   -->
 
-<LinearLayout
+<View
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/nav_status_bar_spacer"
     android:layout_width="match_parent"
     android:layout_height="@dimen/nav_header_height"
     android:background="@color/contacts_accent_color"
-    android:gravity="bottom"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:theme="@style/ThemeOverlay.AppCompat.Dark">
-</LinearLayout>
+    android:importantForAccessibility="no"/>