diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/RegistrationLockV1Dialog.java b/app/src/main/java/org/thoughtcrime/securesms/lock/RegistrationLockV1Dialog.java
index ce2e30d8e9..4826503e95 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/RegistrationLockV1Dialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/RegistrationLockV1Dialog.java
@@ -72,7 +72,7 @@ public final class RegistrationLockV1Dialog {
   }
 
   private static void showLegacyPinReminder(@NonNull Context context) {
-    AlertDialog dialog = new AlertDialog.Builder(context, ThemeUtil.isDarkTheme(context) ? R.style.RationaleDialogDark : R.style.RationaleDialogLight)
+    AlertDialog dialog = new AlertDialog.Builder(context, ThemeUtil.isDarkTheme(context) ? R.style.Theme_Signal_AlertDialog_Dark_Cornered : R.style.Theme_Signal_AlertDialog_Light_Cornered)
                                         .setView(R.layout.registration_lock_reminder_view)
                                         .setCancelable(true)
                                         .setOnCancelListener(d -> RegistrationLockReminders.scheduleReminder(context, false))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/SignalPinReminderDialog.java b/app/src/main/java/org/thoughtcrime/securesms/lock/SignalPinReminderDialog.java
index 4216125f4f..a3e4fd452b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/SignalPinReminderDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/SignalPinReminderDialog.java
@@ -44,7 +44,7 @@ public final class SignalPinReminderDialog {
   public static void show(@NonNull Context context, @NonNull Launcher launcher, @NonNull Callback mainCallback) {
     Log.i(TAG, "Showing PIN reminder dialog.");
 
-    AlertDialog dialog = new AlertDialog.Builder(context, ThemeUtil.isDarkTheme(context) ? R.style.RationaleDialogDark_SignalAccent : R.style.RationaleDialogLight_SignalAccent)
+    AlertDialog dialog = new AlertDialog.Builder(context, ThemeUtil.isDarkTheme(context) ? R.style.Theme_Signal_AlertDialog_Dark_Cornered_ColoredAccent : R.style.Theme_Signal_AlertDialog_Light_Cornered_ColoredAccent)
                                         .setView(R.layout.kbs_pin_reminder_view)
                                         .setCancelable(false)
                                         .setOnCancelListener(d -> RegistrationLockReminders.scheduleReminder(context, false))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java b/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java
index dcd4e6a4da..952719f321 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java
@@ -54,7 +54,7 @@ public class RationaleDialog {
 
     text.setText(message);
 
-    return new AlertDialog.Builder(context, ThemeUtil.isDarkTheme(context) ? R.style.RationaleDialogDark : R.style.RationaleDialogLight)
+    return new AlertDialog.Builder(context, ThemeUtil.isDarkTheme(context) ? R.style.Theme_Signal_AlertDialog_Dark_Cornered : R.style.Theme_Signal_AlertDialog_Light_Cornered)
                           .setView(view);
   }
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 937c83a2c0..0f87ba7e29 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -696,19 +696,19 @@
         <item name="colorControlNormal">@color/core_white</item>
     </style>
 
-    <style name="RationaleDialogLight" parent="Theme.AppCompat.Light.Dialog.Alert">
+    <style name="Theme.Signal.AlertDialog.Light.Cornered" parent="Theme.AppCompat.Light.Dialog.Alert">
         <item name="android:windowBackground">@drawable/dialog_corners_light</item>
     </style>
 
-    <style name="RationaleDialogDark" parent="Theme.AppCompat.Dialog.Alert">
+    <style name="Theme.Signal.AlertDialog.Dark.Cornered" parent="Theme.AppCompat.Dialog.Alert">
         <item name="android:windowBackground">@drawable/dialog_corners_dark</item>
     </style>
 
-    <style name="RationaleDialogLight.SignalAccent">
+    <style name="Theme.Signal.AlertDialog.Light.Cornered.ColoredAccent">
         <item name="colorAccent">@color/core_ultramarine</item>
     </style>
 
-    <style name="RationaleDialogDark.SignalAccent">
+    <style name="Theme.Signal.AlertDialog.Dark.Cornered.ColoredAccent">
         <item name="colorAccent">@color/core_ultramarine_light</item>
     </style>