diff --git a/res/values/themes.xml b/res/values/themes.xml
index 0269144c02..3d65e4a0d6 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -87,6 +87,8 @@
         <item name="colorPrimary">@color/textsecure_primary</item>
         <item name="colorPrimaryDark">@color/textsecure_primary_dark</item>
         <item name="colorAccent">@color/textsecure_primary_dark</item>
+        <item name="colorControlActivated">@color/signal_primary</item>
+        <item name="colorControlHighlight">@color/signal_primary</item>
         <item name="android:windowBackground">@color/gray5</item>
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyle</item>
         <!--<item name="android:windowContentOverlay">@drawable/compat_actionbar_shadow_background</item>-->
@@ -202,7 +204,8 @@
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="android:textColor">@color/text_color_dark_theme</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_dark_theme</item>
-        <item name="colorControlActivated">@color/textsecure_primary_dark</item>
+        <item name="colorControlActivated">@color/signal_primary_dark</item>
+        <item name="colorControlHighlight">@color/signal_primary_dark</item>
         <item name="android:windowBackground">@color/black</item>
         <item name="conversation_list_item_background_selected">@drawable/list_selected_holo_dark</item>
         <item name="conversation_list_item_background_unread">@drawable/conversation_list_item_unread_background_dark</item>