diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/notifications/CustomNotificationsDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/notifications/CustomNotificationsDialogFragment.java
index d28ae22e79..9aecdee4e2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/notifications/CustomNotificationsDialogFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/notifications/CustomNotificationsDialogFragment.java
@@ -70,11 +70,7 @@ public class CustomNotificationsDialogFragment extends DialogFragment {
   @Override
   public void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    if (ThemeUtil.isDarkTheme(requireActivity())) {
-      setStyle(STYLE_NO_FRAME, R.style.TextSecure_DarkTheme_AnimatedDialog);
-    } else {
-      setStyle(STYLE_NO_FRAME, R.style.TextSecure_LightTheme_AnimatedDialog);
-    }
+    setStyle(STYLE_NO_FRAME, R.style.Signal_DayNight_Dialog_Animated);
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/ShareableGroupLinkDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/ShareableGroupLinkDialogFragment.java
index b9d87285ae..2e60f1d6c3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/ShareableGroupLinkDialogFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/ShareableGroupLinkDialogFragment.java
@@ -43,9 +43,7 @@ public final class ShareableGroupLinkDialogFragment extends DialogFragment {
   @Override
   public void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    
-    setStyle(STYLE_NO_FRAME, ThemeUtil.isDarkTheme(requireActivity()) ? R.style.TextSecure_DarkTheme_AnimatedDialog
-                                                                      : R.style.TextSecure_LightTheme_AnimatedDialog);
+    setStyle(STYLE_NO_FRAME, R.style.Signal_DayNight_Dialog_Animated);
   }
 
   @Override
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 671dfe9626..e932a6b794 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -300,11 +300,7 @@
         <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Signal.BottomSheet.Rounded</item>
     </style>
 
-    <style name="TextSecure.DarkTheme.AnimatedDialog">
-        <item name="android:windowAnimationStyle">@style/FadeScale</item>
-    </style>
-
-    <style name="TextSecure.LightTheme.AnimatedDialog">
+    <style name="Signal.DayNight.Dialog.Animated" parent="Signal.DayNight">
         <item name="android:windowAnimationStyle">@style/FadeScale</item>
     </style>