diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6703c2e050..087d944da2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -289,6 +289,7 @@
             android:name="org.thoughtcrime.securesms.conversation.ConversationActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:launchMode="singleTask"
+            android:theme="@style/Session.DarkTheme.NoActionBar"
             android:parentActivityName="org.thoughtcrime.securesms.ConversationListActivity"
             android:windowSoftInputMode="stateUnchanged">
             <meta-data
diff --git a/res/drawable-anydpi-v24/ic_notification.xml b/res/drawable-anydpi-v24/ic_notification.xml
index 16a8f44ff8..3394e4180f 100644
--- a/res/drawable-anydpi-v24/ic_notification.xml
+++ b/res/drawable-anydpi-v24/ic_notification.xml
@@ -1,15 +1,19 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="1109.6405"
-    android:viewportHeight="1109.7455"
+    android:viewportWidth="487.39856"
+    android:viewportHeight="487.39856"
     android:tint="#FFFFFF">
-  <group android:translateX="-466.04904"
-      android:translateY="-466.09314">
-    <group android:translateX="492.4193"
-        android:translateY="520.9659">
-        <path android:fillColor="#FFFFFF" android:pathData="M480,730.8l-358.6,-358.5l371.8,-371.8l99,99.1l-272.6,272.7l259.4,259.5z"/>
-        <path android:fillColor="#FFFFFF" android:pathData="M563.7,999.5l-99.1,-99.1l272.7,-272.7l-259.5,-259.5l99.1,-99l358.5,358.5z"/>
+  <group android:translateX="41.656616"
+      android:translateY="19.495943">
+    <group>
+      <clip-path android:pathData="M0,0L404.085,0L404.085,448.407L0,448.407Z M 0,0"/>
+      <path
+          android:pathData="m288.607,420.376l-196.335,-0c-33.576,-0 -62.508,-25.748 -64.164,-59.281 -1.771,-35.847 26.883,-65.576 62.353,-65.576l113.072,-0c6.919,-0 12.527,-5.608 12.527,-12.525l0,-92.305L327.307,252.333C356.723,268.633 375.241,299.335 376.027,332.848 377.161,380.975 336.746,420.376 288.607,420.376m-211.829,-224.303c-29.416,-16.3 -47.933,-47.001 -48.721,-80.515 -1.132,-48.127 39.283,-87.528 87.42,-87.528L311.811,28.031c33.576,-0 62.508,25.748 64.165,59.283 1.771,35.845 -26.883,65.575 -62.352,65.575 0,-0 -81.316,0.013 -113.077,0.019 -6.915,0.001 -12.499,5.608 -12.501,12.523l-0.021,92.289zM340.891,227.816 L256.254,180.919l57.371,-0c49.877,-0 90.46,-40.579 90.46,-90.457 0,-49.877 -40.583,-90.461 -90.46,-90.461l-200.299,-0c-62.485,-0 -113.327,50.841 -113.327,113.327 0,44.567 24.216,85.664 63.195,107.265l84.636,46.896l-57.368,-0c-49.88,-0 -90.463,40.58 -90.463,90.457 0,49.877 40.583,90.461 90.463,90.461L290.758,448.407c62.488,-0 113.327,-50.84 113.327,-113.327 0,-44.567 -24.216,-85.664 -63.193,-107.264"
+          android:fillColor="#00f782"
+          android:strokeColor="#00000000"
+          android:fillType="nonZero"
+          android:fillAlpha="1"/>
     </group>
   </group>
 </vector>
diff --git a/res/drawable-hdpi/ic_notification.png b/res/drawable-hdpi/ic_notification.png
index 533399d126..6ef38a0b8a 100644
Binary files a/res/drawable-hdpi/ic_notification.png and b/res/drawable-hdpi/ic_notification.png differ
diff --git a/res/drawable-mdpi/ic_notification.png b/res/drawable-mdpi/ic_notification.png
index e8598325dd..276e9268f2 100644
Binary files a/res/drawable-mdpi/ic_notification.png and b/res/drawable-mdpi/ic_notification.png differ
diff --git a/res/drawable-xhdpi/ic_notification.png b/res/drawable-xhdpi/ic_notification.png
index cf00d2407a..ebcd1d56af 100644
Binary files a/res/drawable-xhdpi/ic_notification.png and b/res/drawable-xhdpi/ic_notification.png differ
diff --git a/res/drawable-xxhdpi/ic_notification.png b/res/drawable-xxhdpi/ic_notification.png
index b2da66255e..eac022bd0b 100644
Binary files a/res/drawable-xxhdpi/ic_notification.png and b/res/drawable-xxhdpi/ic_notification.png differ
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 42c80f875f..84051f7b96 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -15,7 +15,8 @@
         app:contentInsetLeft="24dp"
         app:contentInsetRight="20dp"
         android:background="@color/action_bar_background"
-        android:theme="@style/Session.DarkActionBar">
+        android:theme="@style/Session.DarkActionBar"
+        app:popupTheme="@style/Session.DarkActionBar">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/res/layout/conversation_item_update.xml b/res/layout/conversation_item_update.xml
index 9a2368a43a..357bab2683 100644
--- a/res/layout/conversation_item_update.xml
+++ b/res/layout/conversation_item_update.xml
@@ -10,8 +10,8 @@
     android:gravity="center"
     android:orientation="vertical"
     android:paddingBottom="6dp"
-    android:paddingStart="28dp"
-    android:paddingEnd="28dp"
+    android:paddingStart="48dp"
+    android:paddingEnd="48dp"
     android:paddingTop="8dp">
 
     <LinearLayout
@@ -34,8 +34,8 @@
             style="@style/Signal.Text.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAllCaps="true"
-            android:textColor="?conversation_item_update_text_color"
+            android:textSize="@dimen/small_font_size"
+            android:textColor="@color/text"
             tools:text="1 hour" />
 
     </LinearLayout>
@@ -56,7 +56,8 @@
             android:autoLink="all"
             android:gravity="center"
             android:linksClickable="true"
-            android:textColor="?attr/conversation_item_update_text_color"
+            android:textSize="@dimen/small_font_size"
+            android:textColor="@color/text"
             tools:text="Gwen Stacy set the disappearing message timer to 1 hour" />
 
         <TextView
@@ -70,8 +71,8 @@
             android:gravity="center"
             android:linksClickable="false"
             android:minWidth="15sp"
-            android:textAllCaps="true"
-            android:textColor="?conversation_item_update_text_color"
+            android:textSize="@dimen/small_font_size"
+            android:textColor="@color/text"
             tools:text="30 min ago" />
 
     </LinearLayout>
diff --git a/res/layout/conversation_search_nav.xml b/res/layout/conversation_search_nav.xml
index 0a5cab6192..5ce5b5b575 100644
--- a/res/layout/conversation_search_nav.xml
+++ b/res/layout/conversation_search_nav.xml
@@ -54,20 +54,16 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <com.pnikosis.materialishprogress.ProgressWheel
+    <com.github.ybq.android.spinkit.SpinKitView
+        style="@style/SpinKitView.DoubleBounce"
         android:id="@+id/conversation_search_progress_wheel"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_gravity="center"
-        android:layout_marginTop="0dp"
-        android:layout_marginBottom="0dp"
-        android:indeterminate="true"
         android:padding="8dp"
-        android:background="?conversation_background"
+        android:background="@color/compose_view_background"
         android:visibility="gone"
+        app:SpinKit_Color="@color/text"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:matProg_barColor="@color/core_grey_25"
-        app:matProg_progressIndeterminate="true" />
+        app:layout_constraintTop_toTopOf="parent" />
 
 </org.thoughtcrime.securesms.components.ConversationSearchBottomBar>
\ No newline at end of file
diff --git a/res/layout/expiration_timer_menu.xml b/res/layout/expiration_timer_menu.xml
index f95b562bfb..4e146fea64 100644
--- a/res/layout/expiration_timer_menu.xml
+++ b/res/layout/expiration_timer_menu.xml
@@ -13,6 +13,7 @@
             android:layout_height="20dp"
             android:layout_gravity="center"
             android:src="@drawable/ic_timer"
+            android:background="@color/transparent"
             android:scaleType="fitCenter"/>
 
     <TextView
@@ -23,6 +24,7 @@
             android:gravity="center_horizontal|bottom"
             android:paddingBottom="3dp"
             android:paddingTop="1dp"
+            android:background="@color/transparent"
             android:textColor="@android:color/white"
             android:textSize="10sp" />
 </FrameLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 45648aa914..84ad12fff5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -496,8 +496,8 @@
     <string name="MessageRecord_s_joined_signal">%s is on Loki Messenger!</string>
     <string name="MessageRecord_you_disabled_disappearing_messages">You disabled disappearing messages.</string>
     <string name="MessageRecord_s_disabled_disappearing_messages">%1$s disabled disappearing messages.</string>
-    <string name="MessageRecord_you_set_disappearing_message_time_to_s">You set the disappearing message timer to %1$s.</string>
-    <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s set the disappearing message timer to %2$s.</string>
+    <string name="MessageRecord_you_set_disappearing_message_time_to_s">You set the disappearing message timer to %1$s</string>
+    <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s set the disappearing message timer to %2$s</string>
     <string name="MessageRecord_your_safety_number_with_s_has_changed">Your safety number with %s has changed.</string>
     <string name="MessageRecord_you_marked_your_safety_number_with_s_verified">You marked your safety number with %s verified</string>
     <string name="MessageRecord_you_marked_your_safety_number_with_s_verified_from_another_device">You marked your safety number with %s verified from another device</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6695193cde..d490519ad8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -40,6 +40,10 @@
         <item name="android:textStyle">normal</item>
     </style>
 
+    <style name="TextSecure.BaseDarkTheme.SearchView" parent="@style/Widget.AppCompat.SearchView">
+        <item name="closeIcon">@drawable/ic_close_white_24dp</item>
+    </style>
+
     <style name="Session.AlertDialog" parent="ThemeOverlay.AppCompat.Dialog.Alert">
         <item name="buttonBarNegativeButtonStyle">@style/Session.AlertDialog.NegativeButtonStyle</item>
         <item name="buttonBarPositiveButtonStyle">@style/Session.AlertDialog.PositiveButtonStyle</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 7f3288ee58..edd5adf795 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -12,6 +12,8 @@
         <item name="android:windowBackground">@drawable/default_session_background</item>
         <item name="preferenceTheme">@style/Session.SettingsTheme</item>
         <item name="colorAccent">@color/accent</item>
+        <item name="actionModeBackground">@color/compose_view_background</item>
+        <item name="windowActionModeOverlay">true</item>
     </style>
 
     <style name="Session.DarkTheme.NoActionBar" parent="@style/Theme.AppCompat.NoActionBar">
@@ -23,6 +25,8 @@
         <item name="android:windowBackground">@drawable/default_session_background</item>
         <item name="preferenceTheme">@style/Session.SettingsTheme</item>
         <item name="colorAccent">@color/accent</item>
+        <item name="actionModeBackground">@color/compose_view_background</item>
+        <item name="windowActionModeOverlay">true</item>
     </style>
 
     <style name="Session.DarkTheme.SubtitleActionBar" parent="@style/Theme.AppCompat">
@@ -34,6 +38,8 @@
         <item name="android:windowBackground">@drawable/default_session_background</item>
         <item name="preferenceTheme">@style/Session.SettingsTheme</item>
         <item name="colorAccent">@color/accent</item>
+        <item name="actionModeBackground">@color/compose_view_background</item>
+        <item name="windowActionModeOverlay">true</item>
     </style>
     <!-- Session -->
 
@@ -160,13 +166,15 @@
     <style name="TextSecure.LightTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
         <item name="theme_type">light</item>
         <item name="actionBarStyle">@style/Session.DarkActionBar</item>
+        <item name="searchViewStyle">@style/TextSecure.BaseDarkTheme.SearchView</item>
         <item name="actionBarTabBarStyle">@style/TextSecure.LightActionBar.TabBar</item>
-        <item name="actionModeBackground">@color/gray50</item>
+        <item name="actionModeBackground">@color/compose_view_background</item>
         <item name="actionModeCloseDrawable">@drawable/ic_close_white_24dp</item>
         <item name="colorPrimary">@color/action_bar_background</item>
         <item name="colorPrimaryDark">@color/action_bar_background</item>
         <item name="colorAccent">@color/accent</item>
         <item name="colorControlActivated">@color/accent</item>
+        <item name="colorControlNormal">@color/text</item>
         <item name="colorControlHighlight">@color/accent</item>
         <item name="android:windowBackground">@color/loki_darkest_gray</item>
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleLight</item>
@@ -345,14 +353,16 @@
     <style name="TextSecure.BaseDarkTheme" parent="@style/Theme.AppCompat">
         <item name="theme_type">dark</item>
         <item name="actionBarStyle">@style/Session.DarkActionBar</item>
+        <item name="searchViewStyle">@style/TextSecure.BaseDarkTheme.SearchView</item>
         <item name="actionBarTabBarStyle">@style/TextSecure.DarkActionBar.TabBar</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
-        <item name="actionModeBackground">@color/gray50</item>
+        <item name="actionModeBackground">@color/compose_view_background</item>
         <item name="actionModeCloseDrawable">@drawable/ic_close_white_24dp</item>
         <item name="android:textColor">@color/text_color_dark_theme</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_dark_theme</item>
         <item name="colorAccent">@color/accent</item>
         <item name="colorControlActivated">@color/accent</item>
+        <item name="colorControlNormal">@color/text</item>
         <item name="colorControlHighlight">@color/accent</item>
         <item name="android:windowBackground">@color/loki_darkest_gray</item>
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleDark</item>
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 70d2f8d189..be8b221447 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -739,7 +739,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     searchViewItem = menu.findItem(R.id.menu_search);
 
-    SearchView                     searchView    = (SearchView) searchViewItem.getActionView();
+    SearchView                     searchView    = (SearchView)searchViewItem.getActionView();
     SearchView.OnQueryTextListener queryListener = new SearchView.OnQueryTextListener() {
       @Override
       public boolean onQueryTextSubmit(String query) {
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index 0981a2125c..0ab5c36206 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -47,6 +47,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.view.Window;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
@@ -966,6 +967,15 @@ public class ConversationFragment extends Fragment
         list.getAdapter().notifyDataSetChanged();
 
         actionMode = ((AppCompatActivity)getActivity()).startSupportActionMode(actionModeCallback);
+
+        View titleTextView = (getActivity().findViewById(R.id.action_bar_title));
+        if (titleTextView != null) {
+          titleTextView.setBackgroundColor(getResources().getColor(R.color.transparent));
+          ViewParent titleTextViewContainerView = titleTextView.getParent();
+          if (titleTextViewContainerView != null) {
+            ((View)titleTextViewContainerView).setBackgroundColor(getResources().getColor(R.color.transparent));
+          }
+        }
       }
     }
 
@@ -1082,7 +1092,6 @@ public class ConversationFragment extends Fragment
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
         Window window = getActivity().getWindow();
         statusBarColor = window.getStatusBarColor();
-        window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
       }
 
       setCorrectMenuVisibility(menu);
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
index 89219d3321..ca2b715c30 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
@@ -14,7 +14,6 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import org.thoughtcrime.securesms.BindableConversationItem;
-import network.loki.messenger.R;
 import org.thoughtcrime.securesms.VerifyIdentityActivity;
 import org.thoughtcrime.securesms.crypto.IdentityKeyParcelable;
 import org.thoughtcrime.securesms.database.IdentityDatabase;
@@ -36,6 +35,8 @@ import java.util.Locale;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 
+import network.loki.messenger.R;
+
 public class ConversationUpdateItem extends LinearLayout
     implements RecipientModifiedListener, BindableConversationItem
 {
@@ -134,10 +135,10 @@ public class ConversationUpdateItem extends LinearLayout
   private void setTimerRecord(final MessageRecord messageRecord) {
     if (messageRecord.getExpiresIn() > 0) {
       icon.setImageResource(R.drawable.ic_timer);
-      icon.setColorFilter(new PorterDuffColorFilter(Color.parseColor("#757575"), PorterDuff.Mode.MULTIPLY));
+      icon.setColorFilter(new PorterDuffColorFilter(Color.WHITE, PorterDuff.Mode.MULTIPLY));
     } else {
       icon.setImageResource(R.drawable.ic_timer_disabled);
-      icon.setColorFilter(new PorterDuffColorFilter(Color.parseColor("#757575"), PorterDuff.Mode.MULTIPLY));
+      icon.setColorFilter(new PorterDuffColorFilter(Color.WHITE, PorterDuff.Mode.MULTIPLY));
     }
 
     title.setText(ExpirationUtil.getExpirationDisplayValue(getContext(), (int)(messageRecord.getExpiresIn() / 1000)));