diff --git a/src/main/res/layout-w820dp/task_list_wrapper.xml b/src/main/res/layout-w820dp/task_list_wrapper.xml
index ecedd4635..bf251fe8a 100644
--- a/src/main/res/layout-w820dp/task_list_wrapper.xml
+++ b/src/main/res/layout-w820dp/task_list_wrapper.xml
@@ -12,6 +12,8 @@
 
         <include layout="@layout/toolbar" />
 
+        <include layout="@layout/toolbar_separator"/>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/src/main/res/layout/activity_prefs.xml b/src/main/res/layout/activity_prefs.xml
index 7453acf8d..e113d2f6d 100644
--- a/src/main/res/layout/activity_prefs.xml
+++ b/src/main/res/layout/activity_prefs.xml
@@ -7,4 +7,6 @@
 
     <include layout="@layout/toolbar" />
 
+    <include layout="@layout/toolbar_separator"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/task_edit_wrapper_activity.xml b/src/main/res/layout/task_edit_wrapper_activity.xml
index ab00b3fd0..95a821d35 100644
--- a/src/main/res/layout/task_edit_wrapper_activity.xml
+++ b/src/main/res/layout/task_edit_wrapper_activity.xml
@@ -11,6 +11,8 @@
 
     <include layout="@layout/toolbar" />
 
+    <include layout="@layout/toolbar_separator"/>
+
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/src/main/res/layout/task_list_wrapper.xml b/src/main/res/layout/task_list_wrapper.xml
index f1d45018f..877391928 100644
--- a/src/main/res/layout/task_list_wrapper.xml
+++ b/src/main/res/layout/task_list_wrapper.xml
@@ -12,6 +12,8 @@
 
         <include layout="@layout/toolbar"/>
 
+        <include layout="@layout/toolbar_separator"/>
+
         <FrameLayout
             android:id="@+id/tasklist_fragment_container"
             android:background="?attr/asContentBackground"
diff --git a/src/main/res/layout/toolbar.xml b/src/main/res/layout/toolbar.xml
index d45ac7648..5ecff5ba9 100644
--- a/src/main/res/layout/toolbar.xml
+++ b/src/main/res/layout/toolbar.xml
@@ -1,21 +1,10 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="wrap_content"
+<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tasks="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/toolbar"
     android:layout_width="match_parent"
-    android:orientation="vertical">
-
-    <android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tasks="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/asAbBackgroundColor"
-        tasks:theme="@style/ActionBarThemeOverlay"
-        tasks:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-        tasks:titleTextAppearance="@style/ActionBar.TitleText" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:background="?attr/asToolbarSeparator" />
-
-</LinearLayout>
+    android:layout_height="?attr/actionBarSize"
+    android:background="?attr/asAbBackgroundColor"
+    android:elevation="4dp"
+    tasks:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+    tasks:theme="@style/ActionBarThemeOverlay"
+    tasks:titleTextAppearance="@style/ActionBar.TitleText" />
diff --git a/src/main/res/layout/toolbar_separator.xml b/src/main/res/layout/toolbar_separator.xml
new file mode 100644
index 000000000..a7767a9a4
--- /dev/null
+++ b/src/main/res/layout/toolbar_separator.xml
@@ -0,0 +1,4 @@
+<View xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/toolbarSeparatorHeight"
+    android:background="?attr/asToolbarSeparator" />
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 28a14ca6c..74a5eb8bb 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -48,6 +48,7 @@
     <attr name="drawer_text" format="color"/>
     <attr name="importance_background_selected" format="reference"/>
   <attr name="fab_icon" format="reference"/>
+  <attr name="toolbarSeparatorHeight" format="dimension"/>
 
   <declare-styleable name="DateAndTimePicker">
     <attr name="shortcutLabels" format="reference" />
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 99028be5e..66a1472d2 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -28,6 +28,7 @@
         <item name="drawer_background_selected">@color/drawer_background_selected</item>
         <item name="asDueDateCompletedColor">#ff777777</item>
         <item name="asToolbarSeparator">@android:color/transparent</item>
+        <item name="toolbarSeparatorHeight">0dp</item>
         <item name="asSeparatorBackground">#888888</item>
 
         <item name="android:actionModeBackground">@color/primary</item>
@@ -66,6 +67,7 @@
         <item name="android:windowBackground">@android:color/black</item>
         <item name="drawer_background">@color/drawer_background_dark</item>
         <item name="drawer_background_selected">@color/drawer_background_selected_dark</item>
+        <item name="toolbarSeparatorHeight">1px</item>
         <item name="asToolbarSeparator">@android:color/white</item>
         <item name="android:actionModeBackground">@android:color/black</item>
         <item name="asContentBackground">@android:color/black</item>