diff --git a/res/drawable/actionbar_cursor.xml b/res/drawable/actionbar_cursor.xml
new file mode 100644
index 0000000000..2f788448bc
--- /dev/null
+++ b/res/drawable/actionbar_cursor.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+    <solid android:color="@color/signal_primary_dark" />
+    <size android:width="2dp" />
+</shape>
\ No newline at end of file
diff --git a/res/layout/contact_filter_toolbar.xml b/res/layout/contact_filter_toolbar.xml
index 6738e2bace..cc5ff4b52b 100644
--- a/res/layout/contact_filter_toolbar.xml
+++ b/res/layout/contact_filter_toolbar.xml
@@ -19,7 +19,10 @@
                       style="@style/TextSecure.TitleTextStyle"
                       android:background="@android:color/transparent"
                       android:layout_gravity="center_vertical"
-                      android:gravity="center_vertical"/>
+                      android:gravity="center_vertical"
+                      android:textCursorDrawable="@drawable/actionbar_cursor"
+                      android:textSize="18sp"
+                      android:fontFamily="sans-serif"/>
 
             <org.thoughtcrime.securesms.components.AnimatingToggle
                 android:id="@+id/button_toggle"
diff --git a/res/values/themes.xml b/res/values/themes.xml
index f392753adb..fb8221e3b8 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -11,6 +11,7 @@
         <item name="colorAccent">@color/textsecure_primary_dark</item>
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleLight</item>
         <item name="android:alertDialogTheme">@style/AppCompatDialogStyleLight</item>
+        <item name="android:windowBackground">@color/gray5</item>
 
         <item name="recipient_preference_blocked">#d00000</item>
         <item name="contact_selection_label_text">#66000000</item>
@@ -33,8 +34,12 @@
         <item name="actionBarStyle">@style/TextSecure.DarkActionBar</item>
         <item name="actionBarTabBarStyle">@style/TextSecure.DarkActionBar.TabBar</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
+        <item name="colorPrimary">@color/gray95</item>
+        <item name="colorAccent">@color/signal_primary_dark</item>
+        <item name="android:colorControlActivated">@color/signal_primary_dark</item>
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleDark</item>
         <item name="android:alertDialogTheme">@style/AppCompatDialogStyleDark</item>
+        <item name="android:windowBackground">@color/black</item>
 
         <item name="recipient_preference_blocked">#d00000</item>
         <item name="contact_selection_label_text">#66eeeeee</item>