diff --git a/res/layout/giphy_activity.xml b/res/layout/giphy_activity.xml
index 41521bb26..d0b7257ff 100644
--- a/res/layout/giphy_activity.xml
+++ b/res/layout/giphy_activity.xml
@@ -14,7 +14,6 @@
         <android.support.design.widget.AppBarLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:theme="?attr/actionBarStyle"
                 android:background="?attr/colorPrimary">
 
             <org.thoughtcrime.securesms.giph.ui.GiphyActivityToolbar
@@ -29,6 +28,7 @@
                     android:id="@+id/tab_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:theme="?attr/actionBarTabBarStyle"
                     android:scrollbars="horizontal"/>
 
         </android.support.design.widget.AppBarLayout>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3b0c73388..4896af331 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -47,6 +47,7 @@
         <item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="titleTextStyle">@style/TextSecure.TitleTextStyle</item>
         <item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
+        <item name="android:textColorSecondary">@color/white</item>
     </style>
 
     <style name="TextSecure.LightActionBar"
@@ -57,7 +58,7 @@
         <item name="titleTextStyle">@style/TextSecure.TitleTextStyle</item>
         <item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
         <item name="android:textColorPrimary">@color/white</item>
-        <item name="android:textColorSecondary">#BFffffff</item>
+        <item name="android:textColorSecondary">@color/white</item>
     </style>
 
     <style name="TextSecure.FlatLightActionBar"
@@ -76,6 +77,8 @@
         parent="@style/Widget.AppCompat.ActionBar.TabBar">
         <item name="android:background">@color/textsecure_primary</item>
         <item name="background">@color/textsecure_primary</item>
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:textColorSecondary">#BFffffff</item>
         <item name="elevation">4dp</item>
     </style>