diff --git a/build.gradle b/build.gradle
index 1736def16d..b6cbf4abb9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,7 +36,7 @@ dependencies {
     compile 'org.w3c:smil:1.0.0'
     compile 'org.apache.httpcomponents:httpclient-android:4.3.5'
     compile 'com.github.chrisbanes.photoview:library:1.2.3'
-    compile 'com.android.support:appcompat-v7:21.0.2'
+    compile 'com.android.support:appcompat-v7:20.0.0'
     compile 'com.madgag.spongycastle:prov:1.51.0.0'
     compile 'com.google.zxing:android-integration:3.1.0'
     compile ('com.android.support:support-v4-preferencefragment:1.0.0@aar'){
@@ -61,18 +61,18 @@ dependencyVerification {
             'org.w3c:smil:085dc40f2bb249651578bfa07499fd08b16ad0886dbe2c4078586a408da62f9b',
             'org.apache.httpcomponents:httpclient-android:6f56466a9bd0d42934b90bfbfe9977a8b654c058bf44a12bdc2877c4e1f033f1',
             'com.github.chrisbanes.photoview:library:8b5344e206f125e7ba9d684008f36c4992d03853c57e5814125f88496126e3cc',
-            'com.android.support:appcompat-v7:b760fd3d0b0b0547a1bcef9031b40939f31049ba955f04c8fdc5aa09a25d19e9',
+            'com.android.support:appcompat-v7:736f576ab0b68d27bdf18b1e7931566e6d8254b73965175313e87f8866b91547',
             'com.madgag.spongycastle:prov:b8c3fec3a59aac1aa04ccf4dad7179351e54ef7672f53f508151b614c131398a',
             'com.google.zxing:android-integration:89e56aadf1164bd71e57949163c53abf90af368b51669c0d4a47a163335f95c4',
             'com.android.support:support-v4-preferencefragment:5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad',
             'com.squareup.dagger:dagger:789aca24537022e49f91fc6444078d9de8f1dd99e1bfb090f18491b186967883',
+            'com.android.support:support-v4:81f2b1c2c94efd5a4ec7fcd97b6cdcd00e87a933905c5c86103c7319eb024572',
             'com.madgag.spongycastle:core:8d6240b974b0aca4d3da9c7dd44d42339d8a374358aca5fc98e50a995764511f',
             'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
             'com.google.protobuf:protobuf-java:e0c1c64575c005601725e7c6a02cebf9e1285e888f756b2a1d73ffa8d725cc74',
             'com.googlecode.libphonenumber:libphonenumber:eba17eae81dd622ea89a00a3a8c025b2f25d342e0d9644c5b62e16f15687c3ab',
             'org.whispersystems:gson:08f4f7498455d1539c9233e5aac18e9b1805815ef29221572996508eb512fe51',
-            'com.android.support:support-v4:126a4c291f41f75f3fff4968e9d397bc8454cdff4d8f994cbe0524e3bad76e72',
-            'com.android.support:support-annotations:7e37f00e3d932c4d9a6dd84604a99133bb5ae7d81cbd1aee69861fcf2f91e5e9',
+            'com.android.support:support-annotations:1aa96ef0cc4a445bfc2f93ccf762305bc57fa107b12afe9d11f3863ae8a11036',
     ]
 }
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index bcaa4fcbfa..3793c6c0ce 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -16,16 +16,25 @@
     <!-- ActionBar styles -->
     <style name="TextSecure.DarkActionBar"
            parent="@style/Widget.AppCompat.ActionBar">
+        <item name="android:icon">@drawable/actionbar_icon_holo_dark</item>
+        <item name="icon">@drawable/actionbar_icon_holo_dark</item>
         <item name="background">@color/gray95</item>
-        <item name="elevation">2dp</item>
+        <item name="android:logo">@drawable/actionbar_icon_holo_dark</item>
         <item name="logo">@drawable/actionbar_icon_holo_dark</item>
     </style>
 
     <style name="TextSecure.LightActionBar"
            parent="@style/Widget.AppCompat.ActionBar">
+        <item name="android:icon">@drawable/actionbar_icon_holo_light</item>
+        <item name="icon">@drawable/actionbar_icon_holo_light</item>
+        <item name="android:background">@color/gray5</item>
         <item name="background">@color/gray5</item>
-        <item name="elevation">2dp</item>
+        <item name="android:logo">@drawable/actionbar_icon_holo_light</item>
         <item name="logo">@drawable/actionbar_icon_holo_light</item>
+        <item name="android:titleTextStyle">@style/TextSecure.TitleTextStyle</item>
+        <item name="titleTextStyle">@style/TextSecure.TitleTextStyle</item>
+        <item name="android:subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
+        <item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
     </style>
 
     <style name="TextSecure.ClearTitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
@@ -43,7 +52,8 @@
 
     <style name="TextSecure.IntroActionBar" parent="Widget.AppCompat.Light.ActionBar.Solid">
         <item name="background">@drawable/background_pattern_repeat</item>
-        <item name="elevation">0dp</item>
+        <item name="titleTextStyle">@style/TextSecure.ClearTitleTextStyle</item>
+        <item name="icon">@android:color/transparent</item>
     </style>
 
 	<style name="transparent_progress">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 4f8d005551..8efd011101 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
     <style name="TextSecure.IntroTheme" parent="@style/Theme.AppCompat.Light">
-        <item name="colorPrimary">@android:color/transparent</item>
+        <!--<item name="colorPrimary">@android:color/transparent</item>-->
         <item name="actionBarStyle">@style/TextSecure.IntroActionBar</item>
         <item name="android:windowContentOverlay">@null</item>
     </style>
 
     <style name="TextSecure.LightTheme" parent="@style/Theme.AppCompat.Light">
+        <item name="logo">@drawable/actionbar_icon_holo_light</item>
+        <item name="android:logo">@drawable/actionbar_icon_holo_light</item>
+        <item name="android:actionBarStyle">@style/TextSecure.LightActionBar</item>
         <item name="actionBarStyle">@style/TextSecure.LightActionBar</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>
@@ -84,10 +83,11 @@
     </style>
 
     <style name="TextSecure.DarkTheme" parent="@style/Theme.AppCompat">
+        <item name="logo">@drawable/actionbar_icon_holo_dark</item>
+        <item name="android:logo">@drawable/actionbar_icon_holo_dark</item>
+
+        <item name="android:actionBarStyle">@style/TextSecure.DarkActionBar</item>
         <item name="actionBarStyle">@style/TextSecure.DarkActionBar</item>
-        <item name="colorPrimary">@color/gray95</item>
-        <item name="colorPrimaryDark">@color/gray95</item>
-        <item name="colorAccent">#ff259b24</item>
         <item name="conversation_list_item_background_read">@drawable/conversation_list_item_background_read_dark</item>
         <item name="conversation_list_item_background_unread">@drawable/conversation_list_item_background_unread_dark</item>
         <item name="conversation_list_item_background_selected">@drawable/list_selected_holo_dark</item>
@@ -160,7 +160,7 @@
     </style>
 
     <style name="TextSecure.Light.Dialog"
-           parent="Theme.AppCompat.Light.Dialog"
+           parent="Theme.AppCompat.Light.DialogWhenLarge"
            tools:ignore="NewApi">
         <item name="android:windowFrame">@null</item>
         <item name="android:windowTitleStyle">@style/TextSecureDialogWindowTitle</item>
diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index 6668536c0a..56375d6cbf 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -69,10 +69,6 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
 
     setContentView(R.layout.conversation_list_activity);
 
-    getSupportActionBar().setHomeButtonEnabled(true);
-    getSupportActionBar().setDisplayShowHomeEnabled(true);
-    getSupportActionBar().setDisplayUseLogoEnabled(true);
-
     getSupportActionBar().setTitle(R.string.app_name);
 
     initializeResources();