diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 4672c46636..7ee9106ffc 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -1,108 +1,130 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<org.thoughtcrime.securesms.components.InputAwareLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout_container"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout
-        android:id="@+id/conversation_container"
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        android:gravity="bottom"
-        android:orientation="vertical"
-        android:paddingTop="?attr/actionBarSize">
+        android:layout_height="?attr/actionBarSize"
+        android:theme="@style/TextSecure.LightActionBar"
+        app:contentInsetStartWithNavigation="0dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:navigationIcon="?homeAsUpIndicator"
+        tools:background="#ff007f00">
 
-        <ViewStub
-            android:id="@+id/group_share_profile_view_stub"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inflatedId="@+id/group_share_profile_view"
-            android:layout="@layout/conversation_activity_group_share_profile_stub" />
+        <include layout="@layout/conversation_title_view" />
 
-        <ViewStub
-            android:id="@+id/unverified_banner_stub"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inflatedId="@+id/unverified_banner"
-            android:layout="@layout/conversation_activity_unverified_banner_stub" />
+    </android.support.v7.widget.Toolbar>
 
-        <ViewStub
-            android:id="@+id/reminder_stub"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inflatedId="@+id/reminder"
-            android:layout="@layout/conversation_activity_reminderview_stub" />
+    <org.thoughtcrime.securesms.components.InputAwareLayout
+        android:id="@+id/layout_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
-        <FrameLayout
-            android:id="@+id/fragment_content"
+        <LinearLayout
+            android:id="@+id/conversation_container"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1" />
-
-        <ViewStub
-            android:id="@+id/attachment_editor_stub"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inflatedId="@+id/attachment_editor"
-            android:layout="@layout/conversation_activity_attachment_editor_stub" />
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:clipChildren="false"
-            android:clipToPadding="false">
+            android:clipToPadding="false"
+            android:gravity="bottom"
+            android:orientation="vertical"
+            android:paddingTop="?attr/actionBarSize">
 
-            <include layout="@layout/conversation_input_panel" />
+            <ViewStub
+                android:id="@+id/group_share_profile_view_stub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inflatedId="@+id/group_share_profile_view"
+                android:layout="@layout/conversation_activity_group_share_profile_stub" />
 
-            <include layout="@layout/conversation_search_nav" />
+            <ViewStub
+                android:id="@+id/unverified_banner_stub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inflatedId="@+id/unverified_banner"
+                android:layout="@layout/conversation_activity_unverified_banner_stub" />
 
-        </FrameLayout>
+            <ViewStub
+                android:id="@+id/reminder_stub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inflatedId="@+id/reminder"
+                android:layout="@layout/conversation_activity_reminderview_stub" />
 
-        <Button
-            android:id="@+id/register_button"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:padding="20dp"
-            android:text="@string/conversation_activity__enable_signal_messages"
-            android:visibility="gone" />
+            <FrameLayout
+                android:id="@+id/fragment_content"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
 
-        <Button
-            android:id="@+id/unblock_button"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:padding="20dp"
-            android:text="@string/ConversationActivity_unblock"
-            android:visibility="gone" />
+            <ViewStub
+                android:id="@+id/attachment_editor_stub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inflatedId="@+id/attachment_editor"
+                android:layout="@layout/conversation_activity_attachment_editor_stub" />
 
-        <Button
-            android:id="@+id/make_default_sms_button"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:padding="20dp"
-            android:text="@string/conversation_activity__enable_signal_for_sms"
-            android:visibility="gone" />
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:clipChildren="false"
+                android:clipToPadding="false">
 
-        <TextView
-            android:id="@+id/space_left"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:background="?android:windowBackground"
-            android:paddingStart="5dip"
-            android:text="160/160 (1)"
-            android:visibility="gone" />
+                <include layout="@layout/conversation_input_panel" />
+
+                <include layout="@layout/conversation_search_nav" />
+
+            </FrameLayout>
+
+            <Button
+                android:id="@+id/register_button"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:padding="20dp"
+                android:text="@string/conversation_activity__enable_signal_messages"
+                android:visibility="gone" />
+
+            <Button
+                android:id="@+id/unblock_button"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:padding="20dp"
+                android:text="@string/ConversationActivity_unblock"
+                android:visibility="gone" />
+
+            <Button
+                android:id="@+id/make_default_sms_button"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:padding="20dp"
+                android:text="@string/conversation_activity__enable_signal_for_sms"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/space_left"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:background="?android:windowBackground"
+                android:paddingStart="5dip"
+                android:text="160/160 (1)"
+                android:visibility="gone" />
 
 
-        <ViewStub
-            android:id="@+id/emoji_drawer_stub"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inflatedId="@+id/emoji_drawer"
-            android:layout="@layout/conversation_activity_emojidrawer_stub" />
+            <ViewStub
+                android:id="@+id/emoji_drawer_stub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inflatedId="@+id/emoji_drawer"
+                android:layout="@layout/conversation_activity_emojidrawer_stub" />
 
-    </LinearLayout>
+        </LinearLayout>
 
-</org.thoughtcrime.securesms.components.InputAwareLayout>
+    </org.thoughtcrime.securesms.components.InputAwareLayout>
+
+</FrameLayout>
diff --git a/res/layout/conversation_title_view.xml b/res/layout/conversation_title_view.xml
index f16882db49..b4abaf761d 100644
--- a/res/layout/conversation_title_view.xml
+++ b/res/layout/conversation_title_view.xml
@@ -2,30 +2,19 @@
 <org.thoughtcrime.securesms.conversation.ConversationTitleView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/conversation_title_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_gravity="center_vertical"
         android:gravity="center_vertical">
 
-    <ImageView android:id="@+id/up_button"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:src="@drawable/ic_arrow_back_white_24dp"
-               android:clickable="true"
-               android:paddingEnd="12dp"
-               android:layout_marginEnd="12dp"
-               android:layout_alignParentStart="true"
-               android:layout_centerVertical="true"
-               android:background="?selectableItemBackgroundBorderless"
-               android:visibility="visible"/>
-
     <org.thoughtcrime.securesms.components.AvatarImageView
             android:id="@+id/contact_photo_image"
             android:foreground="@drawable/contact_photo_background"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_toEndOf="@id/up_button"
+            android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
             android:layout_marginEnd="10dp"
             android:cropToPadding="true"
@@ -55,6 +44,7 @@
             android:gravity="center_vertical"
             android:layout_gravity="center_vertical"
             style="@style/TextSecure.TitleTextStyle"
+            tools:text="Contact name"
             tools:ignore="UnusedAttribute"/>
 
         <LinearLayout
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 465bc7ec9f..3f36fca063 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -48,10 +48,10 @@ import android.support.v4.content.pm.ShortcutInfoCompat;
 import android.support.v4.content.pm.ShortcutManagerCompat;
 import android.support.v4.graphics.drawable.IconCompat;
 import android.support.v4.view.MenuItemCompat;
-import android.support.v4.view.WindowCompat;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.SearchView;
+import android.support.v7.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -193,7 +193,7 @@ import org.thoughtcrime.securesms.util.CommunicationActions;
 import org.thoughtcrime.securesms.util.Dialogs;
 import org.thoughtcrime.securesms.util.DirectoryHelper;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
-import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.ExpirationUtil;
 import org.thoughtcrime.securesms.util.GroupUtil;
 import org.thoughtcrime.securesms.util.IdentityUtil;
@@ -308,9 +308,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private boolean    isMmsEnabled          = true;
   private boolean    isSecurityInitialized = false;
 
-  private final IdentityRecordList identityRecords = new IdentityRecordList();
-  private final DynamicTheme       dynamicTheme    = new DynamicTheme();
-  private final DynamicLanguage    dynamicLanguage = new DynamicLanguage();
+  private final IdentityRecordList      identityRecords = new IdentityRecordList();
+  private final DynamicNoActionBarTheme dynamicTheme    = new DynamicNoActionBarTheme();
+  private final DynamicLanguage         dynamicLanguage = new DynamicLanguage();
 
   @Override
   protected void onPreCreate() {
@@ -322,7 +322,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   protected void onCreate(Bundle state, boolean ready) {
     Log.i(TAG, "onCreate()");
 
-    supportRequestWindowFeature(WindowCompat.FEATURE_ACTION_BAR_OVERLAY);
     setContentView(R.layout.conversation_activity);
 
     TypedArray typedArray = obtainStyledAttributes(new int[] {R.attr.conversation_background});
@@ -1467,10 +1466,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void initializeViews() {
-    ActionBar supportActionBar = getSupportActionBar();
-    if (supportActionBar == null) throw new AssertionError();
-
-    titleView              = (ConversationTitleView) supportActionBar.getCustomView();
+    titleView              = findViewById(R.id.conversation_title_view);
     buttonToggle           = ViewUtil.findById(this, R.id.button_toggle);
     sendButton             = ViewUtil.findById(this, R.id.send_button);
     attachButton           = ViewUtil.findById(this, R.id.attach_button);
@@ -1522,7 +1518,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     titleView.setOnClickListener(v -> handleConversationSettings());
     titleView.setOnLongClickListener(v -> handleDisplayQuickContact());
-    titleView.setOnBackClickedListener(view -> super.onBackPressed());
     unblockButton.setOnClickListener(v -> handleUnblock());
     makeDefaultSmsButton.setOnClickListener(v -> handleMakeDefaultSms());
     registerButton.setOnClickListener(v -> handleRegisterForSignal());
@@ -1546,12 +1541,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   protected void initializeActionBar() {
+    Toolbar toolbar = findViewById(R.id.toolbar);
+    setSupportActionBar(toolbar);
+
     ActionBar supportActionBar = getSupportActionBar();
     if (supportActionBar == null) throw new AssertionError();
 
-    supportActionBar.setDisplayHomeAsUpEnabled(false);
-    supportActionBar.setCustomView(R.layout.conversation_title_view);
-    supportActionBar.setDisplayShowCustomEnabled(true);
+    supportActionBar.setDisplayHomeAsUpEnabled(true);
     supportActionBar.setDisplayShowTitleEnabled(false);
   }
 
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java b/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
index 2950b97d09..37458f67f6 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
@@ -27,7 +27,6 @@ public class ConversationTitleView extends RelativeLayout {
   private static final String TAG = ConversationTitleView.class.getSimpleName();
 
   private View            content;
-  private ImageView       back;
   private AvatarImageView avatar;
   private TextView        title;
   private TextView        subtitle;
@@ -47,7 +46,6 @@ public class ConversationTitleView extends RelativeLayout {
   public void onFinishInflate() {
     super.onFinishInflate();
 
-    this.back              = ViewUtil.findById(this, R.id.up_button);
     this.content           = ViewUtil.findById(this, R.id.content);
     this.title             = ViewUtil.findById(this, R.id.title);
     this.subtitle          = ViewUtil.findById(this, R.id.subtitle);
@@ -92,10 +90,6 @@ public class ConversationTitleView extends RelativeLayout {
     this.avatar.setOnLongClickListener(listener);
   }
 
-  public void setOnBackClickedListener(@Nullable OnClickListener listener) {
-    this.back.setOnClickListener(listener);
-  }
-
   private void setComposeTitle() {
     this.title.setText(R.string.ConversationActivity_compose_message);
     this.subtitle.setText(null);
diff --git a/src/org/thoughtcrime/securesms/util/ThemeUtil.java b/src/org/thoughtcrime/securesms/util/ThemeUtil.java
index 4fbda71cfe..719a93b494 100644
--- a/src/org/thoughtcrime/securesms/util/ThemeUtil.java
+++ b/src/org/thoughtcrime/securesms/util/ThemeUtil.java
@@ -38,9 +38,12 @@ public class ThemeUtil {
     TypedValue outValue = new TypedValue();
 
     if (context.getTheme().resolveAttribute(attribute, outValue, true)) {
-      return outValue.coerceToString().toString();
-    } else {
-      return defaultValue;
+      CharSequence charSequence = outValue.coerceToString();
+      if (charSequence != null) {
+        return charSequence.toString();
+      }
     }
+
+    return defaultValue;
   }
 }