diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
index 5034569fdb..8bd6a18e3c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
@@ -236,13 +236,9 @@ public final class ConversationReactionOverlay extends RelativeLayout {
     revealAnimatorSet.end();
     hideAnimatorSet.start();
 
-    if (Build.VERSION.SDK_INT >= 21 && activity != null) {
+    if (Build.VERSION.SDK_INT >= 23 && activity != null) {
       activity.getWindow().setStatusBarColor(originalStatusBarColor);
-
-      if (!ThemeUtil.isDarkTheme(getContext()) && Build.VERSION.SDK_INT >= 23) {
-        activity.getWindow().getDecorView().setSystemUiVisibility(activity.getWindow().getDecorView().getSystemUiVisibility() & ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-      }
-
+      activity.getWindow().getDecorView().setSystemUiVisibility(activity.getWindow().getDecorView().getSystemUiVisibility() & ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
       activity = null;
     }
 
diff --git a/app/src/main/res/layout/conversation_reaction_long_press_toolbar.xml b/app/src/main/res/layout/conversation_reaction_long_press_toolbar.xml
index f4b6f0478f..4610588f94 100644
--- a/app/src/main/res/layout/conversation_reaction_long_press_toolbar.xml
+++ b/app/src/main/res/layout/conversation_reaction_long_press_toolbar.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
     android:background="?attr/reactions_overlay_toolbar_background_color"
-    android:theme="@style/TextSecure.DarkActionBar.ReactionOverlay"
+    android:theme="?reactions_overlay_toolbar_overflow_style"
     app:contentInsetStart="0dp"
     app:contentInsetStartWithNavigation="48sp"
     app:menu="@menu/conversation_reactions_long_press_menu"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index bf7865454b..2c721d8760 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -108,6 +108,7 @@
     <attr name="emoji_variation_selector_background" format="reference|color" />
 
     <attr name="reactions_overlay_toolbar_icon_tint" format="color" />
+    <attr name="reactions_overlay_toolbar_overflow_style" format="reference" />
     <attr name="reactions_overlay_toolbar_background_color" format="color" />
     <attr name="reactions_overlay_custom_emoji_icon" format="reference" />
     <attr name="reactions_overlay_old_background" format="reference" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e62b0efed7..06bb62c5ed 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -346,6 +346,12 @@
         <item name="android:tint">@color/core_white</item>
     </style>
 
+    <style name="Signal.Toolbar.Overflow.Light">
+        <item name="srcCompat">@drawable/ic_more_vert_24</item>
+        <item name="android:src">@null</item>
+        <item name="android:tint">?icon_tint</item>
+    </style>
+
     <style name="Signal.Toolbar.Overflow.Conversation">
         <item name="srcCompat">@drawable/ic_more_vert_conversation_24</item>
         <item name="android:tint">@null</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index e994ff3928..9dfbbfebdc 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -297,6 +297,7 @@
         <item name="emoji_variation_selector_background">@drawable/emoji_variation_selector_background_light</item>
 
         <item name="reactions_overlay_toolbar_icon_tint">?icon_tint</item>
+        <item name="reactions_overlay_toolbar_overflow_style">@style/Signal.Toolbar.Overflow.Light</item>
         <item name="reactions_overlay_toolbar_background_color">@color/core_white</item>
         <item name="reactions_overlay_custom_emoji_icon">@drawable/ic_any_emoji_32_light</item>
         <item name="reactions_overlay_old_background">@drawable/reactions_old_background_light</item>
@@ -619,6 +620,7 @@
         <item name="conversation_scroll_to_bottom_foreground_color">@color/core_white</item>
 
         <item name="reactions_overlay_toolbar_icon_tint">@color/core_white</item>
+        <item name="reactions_overlay_toolbar_overflow_style">@style/Signal.Toolbar.Overflow</item>
         <item name="reactions_overlay_toolbar_background_color">@color/action_mode_status_bar</item>
         <item name="reactions_overlay_custom_emoji_icon">@drawable/ic_any_emoji_32_dark</item>
         <item name="reactions_overlay_old_background">@drawable/reactions_old_background_dark</item>