diff --git a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
index fa9cb2e475..71e04230f2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
@@ -114,14 +114,14 @@ class SessionDialogBuilder(val context: Context) {
         options,
     ) { dialog, it -> onSelect(it); dialog.dismiss() }
 
-    fun destructiveButton(
+    fun dangerButton(
         @StringRes text: Int,
         @StringRes contentDescription: Int = text,
         listener: () -> Unit = {}
     ) = button(
         text,
         contentDescription,
-        R.style.Widget_Session_Button_Dialog_DestructiveText,
+        R.style.Widget_Session_Button_Dialog_DangerText,
     ) { listener() }
 
     fun okButton(listener: (() -> Unit) = {}) = button(android.R.string.ok) { listener() }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessages.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessages.kt
index d336c967ce..38da11ae24 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessages.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessages.kt
@@ -14,7 +14,6 @@ import org.session.libsession.utilities.ExpirationUtil
 import org.session.libsession.utilities.SSKEnvironment.MessageExpirationManagerProtocol
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.getExpirationTypeDisplayValue
-import org.thoughtcrime.securesms.database.ThreadDatabase
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.showSessionDialog
 import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
@@ -57,7 +56,7 @@ class DisappearingMessages @Inject constructor(
                     context.getExpirationTypeDisplayValue(message.isNotDisappearAfterRead)
                 )
         })
-        destructiveButton(
+        dangerButton(
                 text = if (message.expiresIn == 0L) R.string.dialog_disappearing_messages_follow_setting_confirm else R.string.dialog_disappearing_messages_follow_setting_set,
                 contentDescription = if (message.expiresIn == 0L) R.string.AccessibilityId_confirm else R.string.AccessibilityId_set_button
         ) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index ccd3be2636..060da324d0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -1120,7 +1120,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         showSessionDialog {
             title(R.string.RecipientPreferenceActivity_block_this_contact_question)
             text(R.string.RecipientPreferenceActivity_you_will_no_longer_receive_messages_and_calls_from_this_contact)
-            destructiveButton(R.string.RecipientPreferenceActivity_block, R.string.AccessibilityId_block_confirm) {
+            dangerButton(R.string.RecipientPreferenceActivity_block, R.string.AccessibilityId_block_confirm) {
                 viewModel.block()
                 if (deleteThread) {
                     viewModel.deleteThread()
@@ -1163,7 +1163,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         showSessionDialog {
             title(R.string.ConversationActivity_unblock_this_contact_question)
             text(R.string.ConversationActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact)
-            destructiveButton(
+            dangerButton(
                 R.string.ConversationActivity_unblock,
                 R.string.AccessibilityId_block_confirm
             ) { viewModel.unblock() }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt
index 56c6540ed5..9f2046334b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt
@@ -545,7 +545,8 @@ class ConversationReactionOverlay : FrameLayout {
         }
         // Delete message
         if (userCanDeleteSelectedItems(context, message, openGroup, userPublicKey, blindedPublicKey)) {
-            items += ActionItem(R.attr.menu_trash_icon, R.string.delete, { handleActionItemClicked(Action.DELETE) }, R.string.AccessibilityId_delete_message, message.subtitle, R.color.destructive)
+            items += ActionItem(R.attr.menu_trash_icon, R.string.delete, { handleActionItemClicked(Action.DELETE) },
+                R.string.AccessibilityId_delete_message, message.subtitle, ThemeUtil.getThemedColor(context, R.attr.danger))
         }
         // Ban user
         if (userCanBanSelectedUsers(context, message, openGroup, userPublicKey, blindedPublicKey)) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
index fddc815bec..342cd9369b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
@@ -74,7 +74,7 @@ import org.thoughtcrime.securesms.ui.theme.baseMonospace
 import org.thoughtcrime.securesms.ui.theme.ThemeColors
 import org.thoughtcrime.securesms.ui.theme.LocalColors
 import org.thoughtcrime.securesms.ui.theme.blackAlpha40
-import org.thoughtcrime.securesms.ui.theme.destructiveButtonColors
+import org.thoughtcrime.securesms.ui.theme.dangerButtonColors
 import org.thoughtcrime.securesms.ui.setComposeContent
 import javax.inject.Inject
 
@@ -236,7 +236,7 @@ fun CellButtons(
             LargeItemButton(
                 R.string.delete,
                 R.drawable.ic_message_details__trash,
-                colors = destructiveButtonColors(),
+                colors = dangerButtonColors(),
                 onClick = onDelete
             )
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
index 2019867f80..b2e3bba81b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
@@ -36,6 +36,7 @@ import org.session.libsession.messaging.contacts.Contact.ContactContext
 import org.session.libsession.messaging.open_groups.OpenGroupApi
 import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment
 import org.session.libsession.utilities.Address
+import org.session.libsession.utilities.ThemeUtil.getThemedColor
 import org.session.libsession.utilities.ViewUtil
 import org.session.libsession.utilities.getColorFromAttr
 import org.session.libsession.utilities.modifyLayoutParams
@@ -382,7 +383,7 @@ class VisibleMessageView : FrameLayout {
     private fun getMessageStatusInfo(message: MessageRecord): MessageStatusInfo = when {
         message.isFailed ->
             MessageStatusInfo(R.drawable.ic_delivery_status_failed,
-                resources.getColor(R.color.destructive, context.theme),
+                getThemedColor(context, R.attr.danger),
                 R.string.delivery_status_failed
             )
         message.isSyncFailed ->
diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
index 36ea3a4371..7db87f17dc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
@@ -16,6 +16,7 @@ import androidx.recyclerview.widget.RecyclerView
 import dagger.hilt.android.AndroidEntryPoint
 import network.loki.messenger.R
 import network.loki.messenger.databinding.ViewConversationBinding
+import org.session.libsession.utilities.ThemeUtil
 import org.session.libsession.utilities.recipients.Recipient
 import org.thoughtcrime.securesms.conversation.v2.utilities.MentionUtilities.highlightMentions
 import org.thoughtcrime.securesms.database.RecipientDatabase.NOTIFY_TYPE_ALL
@@ -69,7 +70,7 @@ class ConversationView : LinearLayout {
         }
         val unreadCount = thread.unreadCount
         if (thread.recipient.isBlocked) {
-            binding.accentView.setBackgroundResource(R.color.destructive)
+            binding.accentView.setBackgroundColor(ThemeUtil.getThemedColor(context, R.attr.danger))
             binding.accentView.visibility = View.VISIBLE
         } else {
             val accentColor = context.getAccentColor()
@@ -122,7 +123,7 @@ class ConversationView : LinearLayout {
             !thread.isOutgoing -> binding.statusIndicatorImageView.visibility = View.GONE
             thread.isFailed -> {
                 val drawable = ContextCompat.getDrawable(context, R.drawable.ic_error)?.mutate()
-                drawable?.setTint(ContextCompat.getColor(context, R.color.destructive))
+                drawable?.setTint(ThemeUtil.getThemedColor(context, R.attr.danger))
                 binding.statusIndicatorImageView.setImageDrawable(drawable)
             }
             thread.isPending -> binding.statusIndicatorImageView.setImageResource(R.drawable.ic_circle_dot_dot_dot)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsAdapter.kt
index 10142cc8fc..3040bb774f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsAdapter.kt
@@ -10,6 +10,7 @@ import android.view.ViewGroup
 import android.widget.PopupMenu
 import androidx.recyclerview.widget.RecyclerView
 import network.loki.messenger.R
+import org.session.libsession.utilities.ThemeUtil
 import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter
 import org.thoughtcrime.securesms.database.model.ThreadRecord
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
@@ -60,8 +61,9 @@ class MessageRequestsAdapter(
         for (i in 0 until popupMenu.menu.size()) {
             val item = popupMenu.menu.getItem(i)
             val s = SpannableString(item.title)
-            s.setSpan(ForegroundColorSpan(context.getColor(R.color.destructive)), 0, s.length, 0)
-            item.iconTintList = ColorStateList.valueOf(context.getColor(R.color.destructive))
+            val danger = ThemeUtil.getThemedColor(context, R.attr.danger)
+            s.setSpan(ForegroundColorSpan(danger), 0, s.length, 0)
+            item.iconTintList = ColorStateList.valueOf(danger)
             item.title = s
         }
         popupMenu.setForceShowIcon(true)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
index d08644c1bd..4ff6812e3d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
@@ -82,7 +82,7 @@ import org.thoughtcrime.securesms.ui.Divider
 import org.thoughtcrime.securesms.ui.LargeItemButton
 import org.thoughtcrime.securesms.ui.LargeItemButtonWithDrawable
 import org.thoughtcrime.securesms.ui.theme.LocalDimensions
-import org.thoughtcrime.securesms.ui.theme.destructiveButtonColors
+import org.thoughtcrime.securesms.ui.theme.dangerButtonColors
 import org.thoughtcrime.securesms.ui.components.PrimaryOutlineButton
 import org.thoughtcrime.securesms.ui.components.PrimaryOutlineCopyButton
 import org.thoughtcrime.securesms.ui.contentDescription
@@ -472,7 +472,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
                     }
                     LargeItemButton(R.string.activity_settings_help_button, R.drawable.ic_help, Modifier.contentDescription(R.string.AccessibilityId_help)) { show<HelpSettingsActivity>() }
                     Divider()
-                    LargeItemButton(R.string.activity_settings_clear_all_data_button_title, R.drawable.ic_clear_data, Modifier.contentDescription(R.string.AccessibilityId_clear_data), destructiveButtonColors()) { ClearAllDataDialog().show(supportFragmentManager, "Clear All Data Dialog") }
+                    LargeItemButton(R.string.activity_settings_clear_all_data_button_title, R.drawable.ic_message_details__trash, Modifier.contentDescription(R.string.AccessibilityId_clear_data), dangerButtonColors()) { ClearAllDataDialog().show(supportFragmentManager, "Clear All Data Dialog") }
                 }
             }
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPasswordActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPasswordActivity.kt
index 8d1a80fb0c..a46b4a1d63 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPasswordActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPasswordActivity.kt
@@ -34,7 +34,7 @@ class RecoveryPasswordActivity : BaseActionBarActivity() {
         showSessionDialog {
             title(R.string.recoveryPasswordHidePermanently)
             htmlText(R.string.recoveryPasswordHidePermanentlyDescription1)
-            destructiveButton(R.string.continue_2, R.string.AccessibilityId_continue) { onHideConfirm() }
+            dangerButton(R.string.continue_2, R.string.AccessibilityId_continue) { onHideConfirm() }
             cancelButton()
         }
     }
@@ -44,7 +44,7 @@ class RecoveryPasswordActivity : BaseActionBarActivity() {
             title(R.string.recoveryPasswordHidePermanently)
             text(R.string.recoveryPasswordHidePermanentlyDescription2)
             cancelButton()
-            destructiveButton(
+            dangerButton(
                 R.string.yes,
                 contentDescription = R.string.AccessibilityId_confirm_button
             ) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/Carousel.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/Carousel.kt
index b7b40b41b0..2eb1ea3ec8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ui/Carousel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ui/Carousel.kt
@@ -38,6 +38,7 @@ import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.ui.theme.LocalColors
+import org.thoughtcrime.securesms.ui.theme.blackAlpha40
 import org.thoughtcrime.securesms.ui.theme.pillShape
 import kotlin.math.absoluteValue
 import kotlin.math.sign
@@ -47,7 +48,7 @@ import kotlin.math.sign
 fun BoxScope.HorizontalPagerIndicator(pagerState: PagerState) {
     if (pagerState.pageCount >= 2) Card(
         shape = pillShape,
-        backgroundColor = Color.Black.copy(alpha = 0.4f),
+        backgroundColor = blackAlpha40,
         modifier = Modifier
             .align(Alignment.BottomCenter)
             .padding(8.dp)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/theme/ThemeColors.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/theme/ThemeColors.kt
index 5631a3a4d9..03e742a969 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ui/theme/ThemeColors.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ui/theme/ThemeColors.kt
@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.ui.theme
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.text.selection.TextSelectionColors
@@ -14,7 +13,6 @@ import androidx.compose.material.primarySurface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.takeOrElse
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 
@@ -78,7 +76,7 @@ fun ThemeColors.radioButtonColors() = RadioButtonDefaults.colors(
 fun transparentButtonColors() = ButtonDefaults.buttonColors(backgroundColor = Color.Transparent)
 
 @Composable
-fun destructiveButtonColors() = ButtonDefaults.buttonColors(backgroundColor = Color.Transparent, contentColor = LocalColors.current.danger)
+fun dangerButtonColors() = ButtonDefaults.buttonColors(backgroundColor = Color.Transparent, contentColor = LocalColors.current.danger)
 
 
 // Our themes
diff --git a/app/src/main/res/color/button_destructive.xml b/app/src/main/res/color/button_danger.xml
similarity index 81%
rename from app/src/main/res/color/button_destructive.xml
rename to app/src/main/res/color/button_danger.xml
index cefbfed23a..d1d41b95e5 100644
--- a/app/src/main/res/color/button_destructive.xml
+++ b/app/src/main/res/color/button_danger.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="?android:textColorTertiary"/>
-    <item android:color="@color/destructive"/>
+    <item android:color="?danger"/>
 </selector>
diff --git a/app/src/main/res/color/state_list_call_action_mic_background.xml b/app/src/main/res/color/state_list_call_action_mic_background.xml
index 1e40a3a054..f8ec990e18 100644
--- a/app/src/main/res/color/state_list_call_action_mic_background.xml
+++ b/app/src/main/res/color/state_list_call_action_mic_background.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/destructive" android:state_selected="true"/>
+    <item android:color="?danger" android:state_selected="true"/>
     <item android:color="@color/call_action_button" android:state_selected="false"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/destructive_dialog_button_background.xml b/app/src/main/res/drawable/danger_dialog_button_background.xml
similarity index 78%
rename from app/src/main/res/drawable/destructive_dialog_button_background.xml
rename to app/src/main/res/drawable/danger_dialog_button_background.xml
index 9d3ac00b07..0f72e98c74 100644
--- a/app/src/main/res/drawable/destructive_dialog_button_background.xml
+++ b/app/src/main/res/drawable/danger_dialog_button_background.xml
@@ -3,9 +3,9 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid  android:color="@color/destructive" />
+    <solid  android:color="?danger" />
 
     <corners android:radius="@dimen/dialog_button_corner_radius" />
 
-    <stroke android:width="@dimen/border_thickness" android:color="@color/destructive" />
+    <stroke android:width="@dimen/border_thickness" android:color="?danger" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/destructive_dialog_text_button_background.xml b/app/src/main/res/drawable/danger_dialog_text_button_background.xml
similarity index 100%
rename from app/src/main/res/drawable/destructive_dialog_text_button_background.xml
rename to app/src/main/res/drawable/danger_dialog_text_button_background.xml
diff --git a/app/src/main/res/drawable/destructive_outline_button_medium_background.xml b/app/src/main/res/drawable/danger_outline_button_medium_background.xml
similarity index 79%
rename from app/src/main/res/drawable/destructive_outline_button_medium_background.xml
rename to app/src/main/res/drawable/danger_outline_button_medium_background.xml
index c6e01ef98e..7894c24be8 100644
--- a/app/src/main/res/drawable/destructive_outline_button_medium_background.xml
+++ b/app/src/main/res/drawable/danger_outline_button_medium_background.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/button_destructive">
+    android:color="@color/button_danger">
     <item>
         <shape android:shape="rectangle">
             <solid android:color="?colorPrimary"/>
             <corners android:radius="@dimen/medium_button_corner_radius" />
             <stroke
-                android:color="@color/button_destructive"
+                android:color="@color/button_danger"
                 android:width="@dimen/border_thickness" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_clear_data.xml b/app/src/main/res/drawable/ic_clear_data.xml
deleted file mode 100644
index 84465dd4cb..0000000000
--- a/app/src/main/res/drawable/ic_clear_data.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="26dp"
-    android:viewportWidth="25"
-    android:viewportHeight="26">
-  <path
-      android:pathData="M19.907,7.674H19.907H4.54H4.54C4.317,7.674 4.095,7.719 3.888,7.806L3.888,7.806C3.681,7.893 3.491,8.023 3.334,8.189C3.176,8.355 3.054,8.554 2.978,8.775L3.922,9.097L2.978,8.775C2.903,8.996 2.877,9.231 2.904,9.465L2.904,9.465L2.904,9.469L4.555,23.412C4.555,23.413 4.555,23.413 4.555,23.414C4.603,23.823 4.807,24.189 5.111,24.447C5.415,24.705 5.798,24.84 6.187,24.84H6.188H18.26H18.26C18.649,24.84 19.032,24.705 19.336,24.447C19.64,24.189 19.844,23.823 19.892,23.414C19.892,23.413 19.892,23.413 19.892,23.412L21.543,9.469L21.544,9.465C21.57,9.231 21.544,8.996 21.469,8.775L21.469,8.775C21.393,8.554 21.271,8.355 21.113,8.189C20.956,8.023 20.766,7.893 20.559,7.806L20.17,8.728L20.559,7.806C20.352,7.719 20.13,7.674 19.907,7.674ZM21.412,1.84H3.031C2.045,1.84 1.149,2.609 1.149,3.674V5.828C1.149,6.893 2.045,7.662 3.031,7.662H21.412C22.398,7.662 23.294,6.893 23.294,5.828V3.674C23.294,2.609 22.398,1.84 21.412,1.84Z"
-      android:strokeWidth="2"
-      android:fillColor="#FF3A3A"
-      android:strokeColor="?backgroundSecondary"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_delete_24.xml b/app/src/main/res/drawable/ic_delete_24.xml
index 178806738a..48fa95783f 100644
--- a/app/src/main/res/drawable/ic_delete_24.xml
+++ b/app/src/main/res/drawable/ic_delete_24.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="@color/destructive">
+    android:tint="?danger">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
diff --git a/app/src/main/res/layout/activity_blocked_contacts.xml b/app/src/main/res/layout/activity_blocked_contacts.xml
index 8d960ad231..8bc458da02 100644
--- a/app/src/main/res/layout/activity_blocked_contacts.xml
+++ b/app/src/main/res/layout/activity_blocked_contacts.xml
@@ -39,7 +39,7 @@
         />
 
     <TextView
-        style="@style/Widget.Session.Button.Common.DestructiveOutline"
+        style="@style/Widget.Session.Button.Common.DangerOutline"
         android:paddingHorizontal="@dimen/large_spacing"
         android:paddingVertical="@dimen/small_spacing"
         android:text="@string/ConversationActivity_unblock"
diff --git a/app/src/main/res/layout/activity_conversation_v2.xml b/app/src/main/res/layout/activity_conversation_v2.xml
index 91c60f2126..be93efa248 100644
--- a/app/src/main/res/layout/activity_conversation_v2.xml
+++ b/app/src/main/res/layout/activity_conversation_v2.xml
@@ -228,7 +228,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toBottomOf="@+id/toolbar"
-        android:background="@color/destructive"
+        android:background="?danger"
         android:visibility="gone"
         tools:visibility="visible">
 
@@ -300,7 +300,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:contentDescription="@string/AccessibilityId_block_message_request_button"
-            android:textColor="@color/destructive"
+            android:textColor="?danger"
             android:paddingHorizontal="@dimen/massive_spacing"
             android:paddingVertical="@dimen/small_spacing"
             android:textSize="@dimen/text_size"
@@ -334,7 +334,7 @@
 
             <Button
                 android:id="@+id/declineMessageRequestButton"
-                style="@style/Widget.Session.Button.Common.DestructiveOutline"
+                style="@style/Widget.Session.Button.Common.DangerOutline"
                 android:contentDescription="@string/AccessibilityId_decline_message_request_button"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/medium_button_height"
diff --git a/app/src/main/res/layout/activity_message_requests.xml b/app/src/main/res/layout/activity_message_requests.xml
index 083b5b9c44..71b8992c56 100644
--- a/app/src/main/res/layout/activity_message_requests.xml
+++ b/app/src/main/res/layout/activity_message_requests.xml
@@ -51,7 +51,7 @@
         <Button
             android:contentDescription="@string/AccessibilityId_clear_all_message_requests"
             android:id="@+id/clearAllMessageRequestsButton"
-            style="@style/Widget.Session.Button.Common.DestructiveOutline"
+            style="@style/Widget.Session.Button.Common.DangerOutline"
             android:layout_width="196dp"
             android:layout_height="@dimen/medium_button_height"
             android:layout_alignParentBottom="true"
diff --git a/app/src/main/res/layout/activity_webrtc.xml b/app/src/main/res/layout/activity_webrtc.xml
index c285616a11..d7fb776da7 100644
--- a/app/src/main/res/layout/activity_webrtc.xml
+++ b/app/src/main/res/layout/activity_webrtc.xml
@@ -163,7 +163,7 @@
         android:src="@drawable/ic_baseline_call_end_24"
         android:padding="@dimen/medium_spacing"
         android:foregroundTint="@color/call_action_foreground"
-        android:backgroundTint="@color/destructive"
+        android:backgroundTint="?danger"
         android:layout_width="@dimen/large_button_height"
         android:layout_height="@dimen/large_button_height"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -253,7 +253,7 @@
         android:src="@drawable/ic_baseline_call_end_24"
         android:padding="@dimen/medium_spacing"
         android:foregroundTint="@color/call_action_foreground"
-        android:backgroundTint="@color/destructive"
+        android:backgroundTint="?danger"
         android:layout_width="@dimen/large_button_height"
         android:layout_height="@dimen/large_button_height"
         android:layout_marginBottom="@dimen/very_large_spacing"
diff --git a/app/src/main/res/layout/blocked_contacts_preference.xml b/app/src/main/res/layout/blocked_contacts_preference.xml
index 673d5316a1..509b185f10 100644
--- a/app/src/main/res/layout/blocked_contacts_preference.xml
+++ b/app/src/main/res/layout/blocked_contacts_preference.xml
@@ -9,7 +9,7 @@
     android:layout_marginHorizontal="@dimen/large_spacing"
     android:layout_marginVertical="@dimen/medium_spacing"
     android:text="@string/blocked_contacts_title"
-    android:textColor="@color/destructive"
+    android:textColor="?danger"
     android:textSize="16sp"
     android:textStyle="bold"
 />
diff --git a/app/src/main/res/layout/dialog_clear_all_data.xml b/app/src/main/res/layout/dialog_clear_all_data.xml
index 4ef5c40e8e..050bc4fd34 100644
--- a/app/src/main/res/layout/dialog_clear_all_data.xml
+++ b/app/src/main/res/layout/dialog_clear_all_data.xml
@@ -44,7 +44,7 @@
         android:orientation="horizontal">
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.DestructiveText"
+            style="@style/Widget.Session.Button.Dialog.DangerText"
             android:id="@+id/clearAllDataButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/dialog_button_height"
diff --git a/app/src/main/res/layout/dialog_send_seed.xml b/app/src/main/res/layout/dialog_send_seed.xml
index 725c9c4d83..f1934abe97 100644
--- a/app/src/main/res/layout/dialog_send_seed.xml
+++ b/app/src/main/res/layout/dialog_send_seed.xml
@@ -43,7 +43,7 @@
             android:text="@string/cancel" />
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.DestructiveText"
+            style="@style/Widget.Session.Button.Dialog.DangerText"
             android:id="@+id/sendSeedButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/dialog_button_height"
diff --git a/app/src/main/res/layout/fragment_call_bottom_sheet.xml b/app/src/main/res/layout/fragment_call_bottom_sheet.xml
index 6ec1c76136..0910f7af5c 100644
--- a/app/src/main/res/layout/fragment_call_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_call_bottom_sheet.xml
@@ -62,7 +62,7 @@
 
         <TextView
             style="@style/Widget.Session.Button.Common.ProminentFilled"
-            android:backgroundTint="@color/destructive"
+            android:backgroundTint="?danger"
             android:layout_marginHorizontal="@dimen/small_spacing"
             android:id="@+id/declineButton"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_delete_message_bottom_sheet.xml b/app/src/main/res/layout/fragment_delete_message_bottom_sheet.xml
index 21bf4cd906..aacb594076 100644
--- a/app/src/main/res/layout/fragment_delete_message_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_delete_message_bottom_sheet.xml
@@ -14,14 +14,14 @@
         android:contentDescription="@string/AccessibilityId_delete_just_for_me"
         style="@style/BottomSheetActionItem"
         android:text="@string/delete_message_for_me"
-        android:textColor="@color/destructive"/>
+        android:textColor="?danger"/>
 
     <TextView
         android:id="@+id/deleteForEveryoneTextView"
         android:contentDescription="@string/delete_message_for_everyone"
         style="@style/BottomSheetActionItem"
         android:text="@string/delete_message_for_everyone"
-        android:textColor="@color/destructive"/>
+        android:textColor="?danger"/>
 
     <TextView
         android:id="@+id/cancelTextView"
diff --git a/app/src/main/res/layout/fragment_modal_url_bottom_sheet.xml b/app/src/main/res/layout/fragment_modal_url_bottom_sheet.xml
index ccf4caa87b..04e3ec0a6e 100644
--- a/app/src/main/res/layout/fragment_modal_url_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_modal_url_bottom_sheet.xml
@@ -46,7 +46,7 @@
         />
 
     <TextView
-        android:textColor="@color/destructive"
+        android:textColor="?danger"
         android:id="@+id/cancelButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/layout_conversation_block_icon.xml b/app/src/main/res/layout/layout_conversation_block_icon.xml
index 341b3ec7df..ee87126d9e 100644
--- a/app/src/main/res/layout/layout_conversation_block_icon.xml
+++ b/app/src/main/res/layout/layout_conversation_block_icon.xml
@@ -13,13 +13,13 @@
         android:layout_width="13dp"
         android:layout_height="13dp"
         android:src="@drawable/ic_baseline_block_24"
-        app:tint="@color/destructive" />
+        app:tint="?danger" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textStyle="bold"
-        android:textColor="@color/destructive"
+        android:textColor="?danger"
         android:textSize="16sp"
         android:text="@string/recipient_preferences__block"
         />
diff --git a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recycler_header.xml b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recycler_header.xml
index 338ea70244..8776d3cd47 100644
--- a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recycler_header.xml
+++ b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recycler_header.xml
@@ -31,7 +31,7 @@
             android:layout_height="wrap_content"/>
         <TextView
             android:text="@string/message_requests_clear_all"
-            android:textColor="@color/destructive"
+            android:textColor="?danger"
             android:visibility="gone"
             android:id="@+id/header_view_clear_all"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/view_input_bar_recording.xml b/app/src/main/res/layout/view_input_bar_recording.xml
index d4b8ba1fa4..73099e808a 100644
--- a/app/src/main/res/layout/view_input_bar_recording.xml
+++ b/app/src/main/res/layout/view_input_bar_recording.xml
@@ -35,7 +35,7 @@
                 android:layout_width="16dp"
                 android:layout_height="16dp"
                 android:background="@drawable/circle_tintable"
-                android:backgroundTint="@color/destructive" />
+                android:backgroundTint="?danger" />
 
             <TextView
                 android:id="@+id/recordingViewDurationTextView"
@@ -121,7 +121,7 @@
             android:alpha="0.5"
             android:layout_centerInParent="true"
             android:background="@drawable/circle_tintable"
-            android:backgroundTint="@color/destructive" />
+            android:backgroundTint="?danger" />
 
     </RelativeLayout>
 
@@ -136,7 +136,7 @@
         android:layout_marginEnd="-8dp"
         android:layout_marginBottom="0dp"
         android:background="@drawable/circle_tintable"
-        android:backgroundTint="@color/destructive" >
+        android:backgroundTint="?danger" >
 
         <ImageView
             android:id="@+id/recordButtonOverlayImageView"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 1131fbafba..e9fb04f341 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -32,6 +32,7 @@
     <attr name="onLightCell" format="reference|color"/>
 
     <attr name="accentColor" format="reference|color"/>
+    <attr name="danger" format="reference|color"/>
     <attr name="backgroundSecondary" format="reference|color"/>
     <attr name="prominentButtonColor" format="reference|color"/>
     <attr name="elementBorderColor" format="reference|color"/>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a427629180..ff73134643 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <color name="destructive">#FF453A</color>
     <color name="unimportant">#D8D8D8</color>
     <color name="profile_picture_background">#353535</color>
     <color name="action_bar_background">#161616</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a45a6e8495..634e45643e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -108,9 +108,9 @@
         <item name="android:textColor">?android:textColorPrimary</item>
     </style>
 
-    <style name="Widget.Session.Button.Common.DestructiveOutline">
-        <item name="android:background">@drawable/destructive_outline_button_medium_background</item>
-        <item name="android:textColor">@color/button_destructive</item>
+    <style name="Widget.Session.Button.Common.DangerOutline">
+        <item name="android:background">@drawable/danger_outline_button_medium_background</item>
+        <item name="android:textColor">@color/button_danger</item>
     </style>
 
     <style name="Widget.Session.Button.Dialog" parent="">
@@ -125,9 +125,9 @@
         <item name="android:background">@drawable/unimportant_dialog_text_button_background</item>
     </style>
     
-    <style name="Widget.Session.Button.Dialog.DestructiveText">
-        <item name="android:background">@drawable/destructive_dialog_text_button_background</item>
-        <item name="android:textColor">@color/destructive</item>
+    <style name="Widget.Session.Button.Dialog.DangerText">
+        <item name="android:background">@drawable/danger_dialog_text_button_background</item>
+        <item name="android:textColor">?danger</item>
     </style>
 
     <style name="Widget.Session.EditText.Compose" parent="@style/Signal.Text.Body">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 0a875be4a7..0402faaefd 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -58,7 +58,7 @@
        <item name="prominentButtonColor">?colorAccent</item>
        <item name="attachment_document_icon_small">@drawable/ic_document_small_dark</item>
        <item name="attachment_document_icon_large">@drawable/ic_document_large_dark</item>
-       <item name="colorError">@color/destructive</item>
+       <item name="colorError">?danger</item>
     </style>
 
     <!-- This should be the default theme for the application. -->
@@ -318,6 +318,7 @@
         <item name="backgroundSecondary">@color/classic_dark_1</item>
         <item name="colorControlNormal">?android:textColorPrimary</item>
         <item name="colorControlActivated">?colorAccent</item>
+        <item name="danger">@color/danger_dark</item>
         <item name="android:textColorPrimary">@color/classic_dark_6</item>
         <item name="android:textColorSecondary">?android:textColorPrimary</item>
         <item name="android:textColorTertiary">@color/classic_dark_5</item>
@@ -399,6 +400,7 @@
         <item name="colorPrimaryDark">@color/classic_light_6</item>
         <item name="colorControlNormal">?android:textColorPrimary</item>
         <item name="colorControlActivated">?colorAccent</item>
+        <item name="danger">@color/danger_light</item>
         <item name="android:textColorPrimary">@color/classic_light_0</item>
         <item name="android:textColorSecondary">@color/classic_light_1</item>
         <item name="android:textColorTertiary">@color/classic_light_1</item>
@@ -488,6 +490,7 @@
         <item name="backgroundSecondary">@color/ocean_dark_1</item>
         <item name="colorControlNormal">@color/ocean_dark_7</item>
         <item name="colorControlActivated">?colorAccent</item>
+        <item name="danger">@color/danger_dark</item>
         <item name="android:textColorPrimary">@color/ocean_dark_7</item>
         <item name="android:textColorSecondary">@color/ocean_dark_5</item>
         <item name="android:textColorTertiary">@color/ocean_dark_5</item>
@@ -574,6 +577,7 @@
         <item name="backgroundSecondary">@color/ocean_light_6</item>
         <item name="colorControlNormal">@color/ocean_light_1</item>
         <item name="colorControlActivated">?colorAccent</item>
+        <item name="danger">@color/danger_light</item>
         <item name="android:textColorPrimary">@color/ocean_light_1</item>
         <item name="android:textColorSecondary">@color/ocean_light_2</item>
         <item name="android:textColorTertiary">@color/ocean_light_2</item>
@@ -686,6 +690,7 @@
         <item name="actionBarStyle">@style/Widget.Session.ActionBar</item>
         <item name="prominentButtonColor">?colorAccent</item>
         <item name="elementBorderColor">@color/classic_dark_3</item>
+        <item name="danger">@color/danger_dark</item>
 
         <!-- Home screen -->
         <item name="searchBackgroundColor">#1B1B1B</item>
diff --git a/libsession/src/main/res/values/colors.xml b/libsession/src/main/res/values/colors.xml
index 9f94120b59..32d64c9970 100644
--- a/libsession/src/main/res/values/colors.xml
+++ b/libsession/src/main/res/values/colors.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <color name="destructive">#FF453A</color>
     <color name="unimportant">#D8D8D8</color>
     <color name="profile_picture_background">#353535</color>
     <color name="cell_background">#1B1B1B</color>