diff --git a/res/drawable-v16/compat_actionbar_shadow_background.xml b/res/drawable-v16/compat_actionbar_shadow_background.xml
new file mode 100644
index 0000000000..c613b0b60a
--- /dev/null
+++ b/res/drawable-v16/compat_actionbar_shadow_background.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/transparent" />
+        </shape>
+    </item>
+
+</layer-list>
diff --git a/res/drawable/compat_actionbar_shadow_background.xml b/res/drawable/compat_actionbar_shadow_background.xml
new file mode 100644
index 0000000000..202d9c1603
--- /dev/null
+++ b/res/drawable/compat_actionbar_shadow_background.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/conversation_item_sent_shadow_light" />
+        </shape>
+    </item>
+
+    <item android:bottom="2dp">
+        <shape xmlns:android="http://schemas.android.com/apk/res/android">
+            <solid android:color="@color/conversation_list_divider_light" />
+        </shape>
+    </item>
+
+</layer-list>
diff --git a/res/layout/conversation_list_fragment.xml b/res/layout/conversation_list_fragment.xml
index c358f1f9a1..1f699d2977 100644
--- a/res/layout/conversation_list_fragment.xml
+++ b/res/layout/conversation_list_fragment.xml
@@ -12,6 +12,8 @@
                   android:scrollbarStyle="insideOverlay"
                   android:fadingEdgeLength="16dip"
                   android:divider="?conversation_list_item_divider"
+                  android:headerDividersEnabled="false"
+                  android:footerDividersEnabled="false"
                   android:dividerHeight="1px" />
 
 </LinearLayout>
diff --git a/res/values-v11/themes.xml b/res/values-v11/themes.xml
index d81e4e7b9c..77c649e2bf 100644
--- a/res/values-v11/themes.xml
+++ b/res/values-v11/themes.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <style name="TextSecure.Light.Dialog" parent="@android:style/Theme.Holo.Light.Dialog"/>
 
 </resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 549a0ee850..bcaa4fcbfa 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -17,14 +17,14 @@
     <style name="TextSecure.DarkActionBar"
            parent="@style/Widget.AppCompat.ActionBar">
         <item name="background">@color/gray95</item>
-        <item name="elevation">1dp</item>
+        <item name="elevation">2dp</item>
         <item name="logo">@drawable/actionbar_icon_holo_dark</item>
     </style>
 
     <style name="TextSecure.LightActionBar"
            parent="@style/Widget.AppCompat.ActionBar">
         <item name="background">@color/gray5</item>
-        <item name="elevation">1dp</item>
+        <item name="elevation">2dp</item>
         <item name="logo">@drawable/actionbar_icon_holo_light</item>
     </style>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 3d01d46611..d577f8c186 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -8,10 +8,10 @@
 
     <style name="TextSecure.LightTheme" parent="@style/Theme.AppCompat.Light">
         <item name="actionBarStyle">@style/TextSecure.LightActionBar</item>
-        <item name="android:windowContentOverlay">@null</item>
         <item name="colorPrimary">@color/gray5</item>
         <item name="colorPrimaryDark">@color/gray95</item>
         <item name="colorAccent">#ff259b24</item>
+        <item name="android:windowContentOverlay">@drawable/compat_actionbar_shadow_background</item>
         <item name="conversation_list_item_background_read">@drawable/conversation_list_item_background_read_light</item>
         <item name="conversation_list_item_background_unread">@drawable/conversation_list_item_background_unread_light</item>
         <item name="conversation_list_item_background_selected">@drawable/list_selected_holo_light</item>