diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/CustomExpireTimerSelectDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/CustomExpireTimerSelectDialog.kt
index 8eee2cdbda..0a206f434a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/CustomExpireTimerSelectDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/CustomExpireTimerSelectDialog.kt
@@ -23,9 +23,8 @@ class CustomExpireTimerSelectDialog : DialogFragment() {
     val dialogView: View = LayoutInflater.from(context).inflate(R.layout.custom_expire_timer_select_dialog, null, false)
     selector = dialogView.findViewById(R.id.custom_expire_timer_select_dialog_selector)
 
-    val builder = MaterialAlertDialogBuilder(requireContext(), R.style.Signal_ThemeOverlay_Dialog_Rounded)
-
-    return builder.setTitle(R.string.ExpireTimerSettingsFragment__custom_time)
+    return MaterialAlertDialogBuilder(requireContext())
+      .setTitle(R.string.ExpireTimerSettingsFragment__custom_time)
       .setView(dialogView)
       .setPositiveButton(R.string.ExpireTimerSettingsFragment__set) { _, _ ->
         viewModel.select(selector.getTimer())
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index a0431a5666..0f8ca44dd8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -1941,7 +1941,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
     public void onInMemoryMessageClicked(@NonNull InMemoryMessageRecord messageRecord) {
       if (messageRecord instanceof InMemoryMessageRecord.NoGroupsInCommon) {
         boolean isGroup = ((InMemoryMessageRecord.NoGroupsInCommon) messageRecord).isGroup();
-        new MaterialAlertDialogBuilder(requireContext(), R.style.Signal_ThemeOverlay_Dialog_Rounded)
+        new MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Signal_MaterialAlertDialog)
             .setMessage(isGroup ? R.string.GroupsInCommonMessageRequest__none_of_your_contacts_or_people_you_chat_with_are_in_this_group
                                 : R.string.GroupsInCommonMessageRequest__you_have_no_groups_in_common_with_this_person)
             .setNeutralButton(R.string.GroupsInCommonMessageRequest__about_message_requests, (d, w) -> CommunicationActions.openBrowserLink(requireContext(), getString(R.string.GroupsInCommonMessageRequest__support_article)))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/EnableCallNotificationSettingsDialog.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/EnableCallNotificationSettingsDialog.java
index ee562bf06d..389eef3eb9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/EnableCallNotificationSettingsDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/EnableCallNotificationSettingsDialog.java
@@ -69,7 +69,7 @@ public final class EnableCallNotificationSettingsDialog extends DialogFragment {
 
   @Override
   public Dialog onCreateDialog(Bundle savedInstanceState) {
-    MaterialAlertDialogBuilder dialogBuilder = new MaterialAlertDialogBuilder(requireContext(), R.style.Signal_ThemeOverlay_Dialog_Rounded);
+    MaterialAlertDialogBuilder dialogBuilder = new MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Signal_MaterialAlertDialog);
 
     Runnable action = null;
     switch (getCallNotificationSettingsBitmask(requireContext())) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceTransferLockedDialog.java b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceTransferLockedDialog.java
index 692f301541..6c7e11e52b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceTransferLockedDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceTransferLockedDialog.java
@@ -41,7 +41,7 @@ public final class OldDeviceTransferLockedDialog extends DialogFragment {
 
   @Override
   public Dialog onCreateDialog(Bundle savedInstanceState) {
-    MaterialAlertDialogBuilder dialogBuilder = new MaterialAlertDialogBuilder(requireContext(), R.style.Signal_ThemeOverlay_Dialog_Rounded);
+    MaterialAlertDialogBuilder dialogBuilder = new MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Signal_MaterialAlertDialog);
     dialogBuilder.setView(R.layout.old_device_transfer_locked_dialog_fragment)
                  .setPositiveButton(R.string.OldDeviceTransferLockedDialog__done, (d, w) -> OldDeviceExitActivity.exit(requireActivity()))
                  .setNegativeButton(R.string.OldDeviceTransferLockedDialog__cancel_and_activate_this_device, (d, w) -> onUnlockRequest());
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/dialogs/GroupDescriptionDialog.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/dialogs/GroupDescriptionDialog.java
index d506000f2d..0f61e9ca51 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/dialogs/GroupDescriptionDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/dialogs/GroupDescriptionDialog.java
@@ -69,7 +69,7 @@ public final class GroupDescriptionDialog extends DialogFragment {
     descriptionText = dialogView.findViewById(R.id.group_description_dialog_text);
     descriptionText.setMovementMethod(LongClickMovementMethod.getInstance(requireContext()));
 
-    MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext(), R.style.Signal_ThemeOverlay_Dialog_Rounded);
+    MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Signal_MaterialAlertDialog);
     Dialog dialog = builder.setTitle(TextUtils.isEmpty(argumentTitle) ? getString(R.string.GroupDescriptionDialog__group_description) : argumentTitle)
                            .setView(dialogView)
                            .setPositiveButton(android.R.string.ok, null)
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 1b6388398a..d46444eb6c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/SignalPinReminderDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/SignalPinReminderDialog.java
@@ -25,6 +25,8 @@ import androidx.autofill.HintConstants;
 import androidx.core.app.DialogCompat;
 import androidx.core.view.ViewCompat;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.contactshare.SimpleTextWatcher;
@@ -32,7 +34,6 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.lock.v2.CreateKbsPinActivity;
 import org.thoughtcrime.securesms.lock.v2.KbsConstants;
 import org.thoughtcrime.securesms.util.ServiceUtil;
-import org.thoughtcrime.securesms.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
 import java.util.Objects;
@@ -48,7 +49,7 @@ public final class SignalPinReminderDialog {
 
     Log.i(TAG, "Showing PIN reminder dialog.");
 
-    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)
+    AlertDialog dialog = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Signal_MaterialAlertDialog_Wide)
                                         .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/stories/dialogs/StoryDialogs.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/dialogs/StoryDialogs.kt
index 934fabc46e..b856fc3f0b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/dialogs/StoryDialogs.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/dialogs/StoryDialogs.kt
@@ -27,7 +27,7 @@ object StoryDialogs {
       onAddToStory()
     } else {
       SignalStore.storyValues().userHasBeenNotifiedAboutStories = true
-      MaterialAlertDialogBuilder(context, R.style.Signal_ThemeOverlay_Dialog_Rounded)
+      MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Signal_MaterialAlertDialog)
         .setTitle(R.string.StoryDialogs__add_to_story_q)
         .setMessage(R.string.StoryDialogs__adding_content)
         .setPositiveButton(R.string.StoryDialogs__add_to_story) { _, _ ->
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt
index 9f04c84e81..dc7a181428 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt
@@ -276,7 +276,7 @@ class StoriesLandingFragment : DSLSettingsFragment(layoutId = R.layout.stories_l
   }
 
   private fun handleHideStory(model: StoriesLandingItem.Model) {
-    MaterialAlertDialogBuilder(requireContext(), R.style.Signal_ThemeOverlay_Dialog_Rounded)
+    MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Signal_MaterialAlertDialog)
       .setTitle(R.string.StoriesLandingFragment__hide_story)
       .setMessage(getString(R.string.StoriesLandingFragment__new_story_updates, model.data.storyRecipient.getShortDisplayName(requireContext())))
       .setPositiveButton(R.string.StoriesLandingFragment__hide) { _, _ ->
diff --git a/app/src/main/res/color/text_color_accent_enabled_selector.xml b/app/src/main/res/color/text_color_accent_enabled_selector.xml
index 764c361f5b..1fa8fab244 100644
--- a/app/src/main/res/color/text_color_accent_enabled_selector.xml
+++ b/app/src/main/res/color/text_color_accent_enabled_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/signal_text_hint" android:state_enabled="false" />
-    <item android:color="?colorAccent" />
+    <item android:color="@color/signal_colorOnSurfaceVariant_60" android:state_enabled="false" />
+    <item android:color="@color/signal_colorPrimary" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/text_color_dark_theme.xml b/app/src/main/res/color/text_color_dark_theme.xml
index 224c4d4ad5..68b5f0486d 100644
--- a/app/src/main/res/color/text_color_dark_theme.xml
+++ b/app/src/main/res/color/text_color_dark_theme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-<item android:state_enabled="false" android:color="@color/core_grey_50"/>
-<item android:color="@color/core_grey_05"/>
+<item android:state_enabled="false" android:color="@color/signal_colorOnSurfaceVariant_60"/>
+<item android:color="@color/signal_colorOnSurface"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/text_color_light_theme.xml b/app/src/main/res/color/text_color_light_theme.xml
index 6eb49ffcaa..68b5f0486d 100644
--- a/app/src/main/res/color/text_color_light_theme.xml
+++ b/app/src/main/res/color/text_color_light_theme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-<item android:state_enabled="false" android:color="@color/core_grey_50"/>
-<item android:color="@color/core_grey_90"/>
+<item android:state_enabled="false" android:color="@color/signal_colorOnSurfaceVariant_60"/>
+<item android:color="@color/signal_colorOnSurface"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/text_color_primary_enabled_selector.xml b/app/src/main/res/color/text_color_primary_enabled_selector.xml
index 84a7fdf432..dc8f1a5691 100644
--- a/app/src/main/res/color/text_color_primary_enabled_selector.xml
+++ b/app/src/main/res/color/text_color_primary_enabled_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/signal_text_primary_disabled" android:state_enabled="false" />
-    <item android:color="@color/signal_text_primary" />
+    <item android:color="@color/signal_colorOnSurfaceVariant_60" android:state_enabled="false" />
+    <item android:color="@color/signal_colorOnSurface" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/text_color_secondary_dark_theme.xml b/app/src/main/res/color/text_color_secondary_dark_theme.xml
index 1ce14a89f3..1e62e51c9c 100644
--- a/app/src/main/res/color/text_color_secondary_dark_theme.xml
+++ b/app/src/main/res/color/text_color_secondary_dark_theme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-<item android:state_enabled="false" android:color="@color/core_grey_50"/>
-<item android:color="@color/core_grey_30"/>
+<item android:state_enabled="false" android:color="@color/signal_colorOnSurfaceVariant_60"/>
+<item android:color="@color/signal_colorOnSurfaceVariant"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/text_color_secondary_enabled_selector.xml b/app/src/main/res/color/text_color_secondary_enabled_selector.xml
index ec930105b2..e96dd84762 100644
--- a/app/src/main/res/color/text_color_secondary_enabled_selector.xml
+++ b/app/src/main/res/color/text_color_secondary_enabled_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/signal_text_primary_disabled" android:state_enabled="false" />
-    <item android:color="@color/signal_text_secondary" />
+    <item android:color="@color/signal_colorOnSurfaceVariant_60" android:state_enabled="false" />
+    <item android:color="@color/signal_colorOnSurfaceVariant" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/text_color_secondary_light_theme.xml b/app/src/main/res/color/text_color_secondary_light_theme.xml
index 5f5cbf8149..1e62e51c9c 100644
--- a/app/src/main/res/color/text_color_secondary_light_theme.xml
+++ b/app/src/main/res/color/text_color_secondary_light_theme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-<item android:state_enabled="false" android:color="@color/core_grey_50"/>
-<item android:color="@color/core_grey_60"/>
+<item android:state_enabled="false" android:color="@color/signal_colorOnSurfaceVariant_60"/>
+<item android:color="@color/signal_colorOnSurfaceVariant"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dsl_switch_preference_item.xml b/app/src/main/res/layout/dsl_switch_preference_item.xml
index ee745a7b2b..c9bbdf1553 100644
--- a/app/src/main/res/layout/dsl_switch_preference_item.xml
+++ b/app/src/main/res/layout/dsl_switch_preference_item.xml
@@ -62,6 +62,7 @@
         android:clickable="false"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:useMaterialThemeColors="true" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/signal_styles.xml b/app/src/main/res/values/signal_styles.xml
index fcdb9e3d61..611592e6a4 100644
--- a/app/src/main/res/values/signal_styles.xml
+++ b/app/src/main/res/values/signal_styles.xml
@@ -158,14 +158,10 @@
     </style>
 
     <style name="Signal.Widget.Button.Dialog" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
-        <item name="android:textAppearance">@style/Signal.TextAppearance.Button.Dialog</item>
+        <item name="android:textAppearance">@style/Signal.Text.LabelLarge</item>
         <item name="android:textColor">@color/signal_button_secondary_text_selector</item>
     </style>
 
-    <style name="Signal.TextAppearance.Button.Dialog" parent="TextAppearance.MaterialComponents.Button">
-        <item name="android:textAllCaps">false</item>
-    </style>
-
     <style name="Signal.ShapeOverlay.Rounded" parent="ShapeAppearance.MaterialComponents.MediumComponent">
         <item name="cornerFamily">rounded</item>
         <item name="cornerSize">8dp</item>
@@ -183,6 +179,12 @@
         <item name="shapeAppearance">@style/Signal.ShapeOverlay.Rounded</item>
     </style>
 
+    <style name="Signal.MaterialAlertDialog.Wide" parent="MaterialAlertDialog.MaterialComponents">
+        <item name="shapeAppearance">@style/Signal.ShapeOverlay.Rounded</item>
+        <item name="backgroundInsetStart">0dp</item>
+        <item name="backgroundInsetEnd">0dp</item>
+    </style>
+
     <style name="Signal.DayNight.Popup" parent="@style/ThemeOverlay.AppCompat.Light" />
 
     <style name="Signal.DayNight.Toolbar.Overflow" parent="@style/Signal.Toolbar.Overflow.Light" />
@@ -197,15 +199,39 @@
         <item name="android:windowAnimationStyle">@style/TextSecure.Animation.AddMessageDialog</item>
     </style>
 
-    <style name="Signal.ThemeOverlay.Dialog.Rounded" parent="@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog">
+    <style name="ThemeOverlay.Signal.MaterialAlertDialog" parent="@style/ThemeOverlay.Material3.MaterialAlertDialog">
         <item name="alertDialogStyle">@style/Signal.MaterialAlertDialog</item>
-        <item name="android:background">@color/signal_background_dialog</item>
-        <item name="materialAlertDialogTitleTextStyle">@style/TextAppearance.Signal.Title2.MaterialDialog</item>
-        <item name="materialAlertDialogBodyTextStyle">@style/TextAppearance.Signal.Body1</item>
+        <item name="android:background">@color/signal_colorSurface1</item>
+        <item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialog.Signal.Title.Text</item>
+        <item name="materialAlertDialogBodyTextStyle">@style/MaterialAlertDialog.Signal.Body.Text</item>
         <item name="buttonBarPositiveButtonStyle">@style/Signal.Widget.Button.Dialog</item>
         <item name="buttonBarNeutralButtonStyle">@style/Signal.Widget.Button.Dialog</item>
         <item name="buttonBarNegativeButtonStyle">@style/Signal.Widget.Button.Dialog</item>
-        <item name="textColorAlertDialogListItem">@color/signal_text_secondary</item>
+        <item name="textColorAlertDialogListItem">@color/signal_colorOnSurfaceVariant</item>
+        <item name="android:checkedTextViewStyle">@style/Widget.Signal.CheckedTextView</item>
+    </style>
+    
+    <style name="ThemeOverlay.Signal.MaterialAlertDialog.Wide">
+        <item name="alertDialogStyle">@style/Signal.MaterialAlertDialog.Wide</item>
+    </style>
+
+    <style name="Widget.Signal.CheckedTextView" parent="Widget.Material3.CheckedTextView">
+        <item name="android:textAppearance">@style/Signal.Text.BodyLarge</item>
+        <item name="android:textColor">@color/signal_colorOnSurfaceVariant</item>
+        <item name="drawableTint">@color/signal_selection_control_button_tint</item>
+        <item name="android:drawableTint" tools:ignore="NewApi">@color/signal_selection_control_button_tint</item>
+    </style>
+
+    <style name="MaterialAlertDialog.Signal.Title.Text" parent="MaterialAlertDialog.Material3.Title.Text">
+        <item name="android:textAppearance">@style/Signal.Text.TitleLarge</item>
+    </style>
+
+    <style name="MaterialAlertDialog.Signal.Body.Text" parent="MaterialAlertDialog.Material3.Body.Text">
+        <item name="android:textAppearance">@style/Signal.Text.BodyMedium</item>
+    </style>
+
+    <style name="Widget.Signal.Dialog.Body" parent="Signal.Text.BodyMedium">
+        <item name="android:textColor">@color/signal_colorOnSurfaceVariant</item>
     </style>
 
     <style name="Signal.Widget.TimePicker" parent="Widget.MaterialComponents.TimePicker">
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 17b0d26cf1..b5594e0c11 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,6 +16,9 @@
         <item name="android:textAppearance">@style/Signal.Text.BodyLarge</item>
     </style>
 
+    <style name="Widget.Signal.Button.TextButton" parent="Widget.Material3.Button.TextButton">
+    </style>
+
     <style name="NoAnimation.Theme.BlackScreen" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowAnimationStyle">@null</item>
         <item name="android:windowBackground">@android:color/black</item>
@@ -35,23 +38,23 @@
     </style>
 
     <style name="AppCompatAlertDialogStyleLight" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name="colorAccent">@color/core_ultramarine</item>
+        <item name="colorAccent">@color/signal_colorPrimary</item>
         <item name="android:textColor">@null</item>
     </style>
 
     <style name="AppCompatAlertDialogStyleDark" parent="Theme.AppCompat.Dialog.Alert">
-        <item name="colorAccent">@color/core_ultramarine_light</item>
+        <item name="colorAccent">@color/signal_colorPrimary</item>
         <item name="android:textColor">@null</item>
     </style>
 
     <style name="AppCompatDialogStyleLight" parent="Theme.AppCompat.Light.Dialog">
-        <item name="colorAccent">@color/core_ultramarine</item>
+        <item name="colorAccent">@color/signal_colorPrimary</item>
         <item name="android:textColor">@null</item>
         <item name="android:windowBackground">@drawable/dialog_background</item>
     </style>
 
     <style name="AppCompatDialogStyleDark" parent="Theme.AppCompat.Dialog">
-        <item name="colorAccent">@color/core_ultramarine_light</item>
+        <item name="colorAccent">@color/signal_colorPrimary</item>
         <item name="android:windowBackground">@drawable/dialog_background</item>
         <item name="android:textColor">@null</item>
     </style>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 7782f48bf1..9605c8b79a 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -186,9 +186,9 @@
         <item name="actionModeStyle">@style/TextSecure.ActionModeStyle</item>
         <item name="android:textColor">@color/text_color_light_theme</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_light_theme</item>
-        <item name="colorPrimaryDark">@color/core_ultramarine</item>
-        <item name="colorAccent">@color/core_ultramarine</item>
-        <item name="colorControlActivated">@color/core_ultramarine</item>
+        <item name="colorPrimaryDark">@color/signal_colorPrimary</item>
+        <item name="colorAccent">@color/signal_colorPrimary</item>
+        <item name="colorControlActivated">@color/signal_colorPrimary</item>
         <item name="colorControlHighlight">@color/transparent_black_10</item>
         <item name="android:windowBackground">@color/signal_colorBackground</item>
         <item name="android:windowContentOverlay">@null</item>
@@ -218,7 +218,7 @@
 
         <item name="colorControlNormal">@color/core_grey_90</item>
 
-        <item name="materialAlertDialogTheme">@style/Signal.ThemeOverlay.Dialog.Rounded</item>
+        <item name="materialAlertDialogTheme">@style/ThemeOverlay.Signal.MaterialAlertDialog</item>
         <item name="materialTimePickerTheme">@style/Signal.ThemeOverlay.TimePicker</item>
         <item name="materialTimePickerStyle">@style/Signal.Widget.TimePicker</item>
     </style>
@@ -268,8 +268,8 @@
         <item name="actionModeStyle">@style/TextSecure.ActionModeStyle</item>
         <item name="android:textColor">@color/text_color_dark_theme</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_dark_theme</item>
-        <item name="colorAccent">@color/core_ultramarine_light</item>
-        <item name="colorControlActivated">@color/core_ultramarine_light</item>
+        <item name="colorAccent">@color/signal_colorPrimary</item>
+        <item name="colorControlActivated">@color/signal_colorPrimary</item>
         <item name="colorControlHighlight">@color/transparent_white_10</item>
         <item name="android:colorControlHighlight" tools:ignore="NewApi">@color/transparent_white_10</item>
         <item name="android:windowBackground">@color/signal_colorBackground</item>
@@ -304,7 +304,7 @@
 
         <item name="colorControlNormal">@color/core_white</item>
 
-        <item name="materialAlertDialogTheme">@style/Signal.ThemeOverlay.Dialog.Rounded</item>
+        <item name="materialAlertDialogTheme">@style/ThemeOverlay.Signal.MaterialAlertDialog</item>
         <item name="materialTimePickerTheme">@style/Signal.ThemeOverlay.TimePicker</item>
         <item name="materialTimePickerStyle">@style/Signal.Widget.TimePicker</item>
     </style>