diff --git a/res/layout/contact_selection_activity.xml b/res/layout/contact_selection_activity.xml
index 25883ed2af..748fef44c0 100644
--- a/res/layout/contact_selection_activity.xml
+++ b/res/layout/contact_selection_activity.xml
@@ -12,6 +12,7 @@
             android:layout_width="match_parent"
             android:minHeight="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
+            android:elevation="4dp"
             android:theme="?attr/actionBarStyle"
             app:contentInsetStartWithNavigation="0dp"/>
 
diff --git a/res/layout/conversation_list_activity.xml b/res/layout/conversation_list_activity.xml
index dcd8957b3d..f0b868038d 100644
--- a/res/layout/conversation_list_activity.xml
+++ b/res/layout/conversation_list_activity.xml
@@ -13,6 +13,7 @@
             android:layout_height="?attr/actionBarSize"
             android:minHeight="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
+            android:elevation="4dp"
             android:theme="?attr/actionBarStyle">
 
         <RelativeLayout
@@ -65,6 +66,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
+            android:elevation="4dp"
             android:visibility="invisible"
             tools:visibility="visible"/>
 
diff --git a/res/layout/invite_activity.xml b/res/layout/invite_activity.xml
index 48f1d7f8af..c4526a5e31 100644
--- a/res/layout/invite_activity.xml
+++ b/res/layout/invite_activity.xml
@@ -90,6 +90,7 @@
             android:layout_width="match_parent"
             android:minHeight="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
+            android:elevation="4dp"
             android:theme="@style/TextSecure.LightActionBar" />
 
         <fragment android:id="@+id/contact_selection_list_fragment"
diff --git a/res/layout/search_toolbar.xml b/res/layout/search_toolbar.xml
index 5b5a8508e9..6a81ae1d5f 100644
--- a/res/layout/search_toolbar.xml
+++ b/res/layout/search_toolbar.xml
@@ -13,7 +13,7 @@
             android:background="?attr/search_toolbar_background"/>
 
     <View android:layout_width="match_parent"
-          android:layout_height="7dp"
+          android:layout_height="4dp"
           android:background="@drawable/search_toolbar_shadow"/>
 
 </merge>
\ No newline at end of file
diff --git a/res/layout/share_activity.xml b/res/layout/share_activity.xml
index 389a858ad8..3596cc7ceb 100644
--- a/res/layout/share_activity.xml
+++ b/res/layout/share_activity.xml
@@ -14,6 +14,7 @@
             android:layout_height="?attr/actionBarSize"
             android:minHeight="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
+            android:elevation="4dp"
             android:theme="?attr/actionBarStyle">
 
         <RelativeLayout
@@ -55,6 +56,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
+            android:elevation="4dp"
             android:visibility="invisible"
             tools:visibility="invisible"/>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0557b02808..3b0c733889 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -43,6 +43,7 @@
            parent="@style/Widget.AppCompat.ActionBar">
         <item name="background">@color/gray95</item>
         <item name="android:popupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
+        <item name="elevation">4dp</item>
         <item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="titleTextStyle">@style/TextSecure.TitleTextStyle</item>
         <item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
@@ -51,7 +52,7 @@
     <style name="TextSecure.LightActionBar"
            parent="@style/Widget.AppCompat.ActionBar">
         <item name="background">@color/textsecure_primary</item>
-        <item name="elevation">2dp</item>
+        <item name="elevation">4dp</item>
         <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
         <item name="titleTextStyle">@style/TextSecure.TitleTextStyle</item>
         <item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
@@ -68,12 +69,14 @@
         parent="@style/Widget.AppCompat.ActionBar.TabBar">
         <item name="background">@color/gray95</item>
         <item name="android:background">@color/gray95</item>
+        <item name="elevation">4dp</item>
     </style>
 
     <style name="TextSecure.LightActionBar.TabBar"
         parent="@style/Widget.AppCompat.ActionBar.TabBar">
         <item name="android:background">@color/textsecure_primary</item>
         <item name="background">@color/textsecure_primary</item>
+        <item name="elevation">4dp</item>
     </style>
 
     <style name="TextSecure.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">