diff --git a/core/lib/presentation/views/dialog/confirmation_dialog_builder.dart b/core/lib/presentation/views/dialog/confirmation_dialog_builder.dart
index b0a03881d..914a76987 100644
--- a/core/lib/presentation/views/dialog/confirmation_dialog_builder.dart
+++ b/core/lib/presentation/views/dialog/confirmation_dialog_builder.dart
@@ -79,7 +79,7 @@ class ConfirmationDialogBuilder extends StatelessWidget {
     this.listTextSpan,
     this.titleActionButtonMaxLines,
     this.isArrangeActionButtonsVertical = false,
-    this.useIconAsBasicLogo = false,
+    this.useIconAsBasicLogo = true,
     this.onConfirmButtonAction,
     this.onCancelButtonAction,
     this.onCloseButtonAction,
diff --git a/lib/features/base/base_mailbox_controller.dart b/lib/features/base/base_mailbox_controller.dart
index e2ed57ce0..6504f26b5 100644
--- a/lib/features/base/base_mailbox_controller.dart
+++ b/lib/features/base/base_mailbox_controller.dart
@@ -439,17 +439,12 @@ abstract class BaseMailboxController extends BaseController {
           child: ConfirmationDialogBuilder(
             key: const Key('confirm_dialog_delete_mailbox'),
             imagePath: imagePaths,
-            useIconAsBasicLogo: true,
             title: AppLocalizations.of(context).deleteFolders,
             textContent: AppLocalizations.of(context).message_confirmation_dialog_delete_folder(presentationMailbox.getDisplayName(context)),
-            confirmText: AppLocalizations.of(context).delete,
-            cancelText: AppLocalizations.of(context).cancel,
-            cancelBackgroundButtonColor: AppColor.blue700,
-            cancelLabelButtonColor: Colors.white,
-            confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
-            confirmLabelButtonColor: AppColor.steelGray600,
-            onConfirmButtonAction: () => onDeleteMailboxAction(presentationMailbox),
-            onCancelButtonAction: popBack,
+            confirmText: AppLocalizations.of(context).cancel,
+            cancelText: AppLocalizations.of(context).delete,
+            onCancelButtonAction: () => onDeleteMailboxAction(presentationMailbox),
+            onConfirmButtonAction: popBack,
             onCloseButtonAction: popBack,
           ),
         ),
diff --git a/lib/features/base/mixin/mailbox_action_handler_mixin.dart b/lib/features/base/mixin/mailbox_action_handler_mixin.dart
index 48ccd9dea..5ad55fbeb 100644
--- a/lib/features/base/mixin/mailbox_action_handler_mixin.dart
+++ b/lib/features/base/mixin/mailbox_action_handler_mixin.dart
@@ -83,15 +83,10 @@ mixin MailboxActionHandlerMixin {
             imagePath: imagePaths,
             title: AppLocalizations.of(context).emptyTrash,
             textContent: AppLocalizations.of(context).empty_trash_dialog_message,
-            confirmText: AppLocalizations.of(context).delete,
-            cancelText: AppLocalizations.of(context).cancel,
-            useIconAsBasicLogo: true,
-            cancelBackgroundButtonColor: AppColor.blue700,
-            cancelLabelButtonColor: Colors.white,
-            confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
-            confirmLabelButtonColor: AppColor.steelGray600,
+            confirmText: AppLocalizations.of(context).cancel,
+            cancelText: AppLocalizations.of(context).delete,
             onCloseButtonAction: popBack,
-            onConfirmButtonAction: () {
+            onCancelButtonAction: () {
               popBack();
               if (mailbox.countTotalEmails > 0) {
                 dashboardController.emptyTrashFolderAction(
@@ -105,7 +100,7 @@ mixin MailboxActionHandlerMixin {
                 );
               }
             },
-            onCancelButtonAction: popBack,
+            onConfirmButtonAction: popBack,
           ),
         ),
         barrierColor: AppColor.colorDefaultCupertinoActionSheet,
@@ -150,15 +145,10 @@ mixin MailboxActionHandlerMixin {
             imagePath: imagePaths,
             title: AppLocalizations.of(context).emptySpamFolder,
             textContent: AppLocalizations.of(context).emptySpamMessageDialog,
-            confirmText: AppLocalizations.of(context).delete_all,
-            cancelText: AppLocalizations.of(context).cancel,
-            useIconAsBasicLogo: true,
-            cancelBackgroundButtonColor: AppColor.blue700,
-            cancelLabelButtonColor: Colors.white,
-            confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
-            confirmLabelButtonColor: AppColor.steelGray600,
+            confirmText: AppLocalizations.of(context).cancel,
+            cancelText: AppLocalizations.of(context).delete_all,
             onCloseButtonAction: popBack,
-            onConfirmButtonAction: () {
+            onCancelButtonAction: () {
               popBack();
               if (mailbox.countTotalEmails > 0) {
                 dashboardController.emptySpamFolderAction(spamFolderId: mailbox.id, totalEmails: mailbox.countTotalEmails);
@@ -169,7 +159,7 @@ mixin MailboxActionHandlerMixin {
                 );
               }
             },
-            onCancelButtonAction: popBack,
+            onConfirmButtonAction: popBack,
           ),
         ),
         barrierColor: AppColor.colorDefaultCupertinoActionSheet,
diff --git a/lib/features/base/mixin/message_dialog_action_mixin.dart b/lib/features/base/mixin/message_dialog_action_mixin.dart
index 712d19071..e379d764d 100644
--- a/lib/features/base/mixin/message_dialog_action_mixin.dart
+++ b/lib/features/base/mixin/message_dialog_action_mixin.dart
@@ -45,7 +45,7 @@ mixin MessageDialogActionMixin {
         PopInvokedWithResultCallback? onPopInvoked,
         bool isArrangeActionButtonsVertical = false,
         int? titleActionButtonMaxLines,
-        bool useIconAsBasicLogo = false,
+        bool useIconAsBasicLogo = true,
         EdgeInsetsGeometry? dialogMargin,
       }
   ) async {
diff --git a/lib/features/composer/presentation/composer_controller.dart b/lib/features/composer/presentation/composer_controller.dart
index d675e0d7d..2aaf68de1 100644
--- a/lib/features/composer/presentation/composer_controller.dart
+++ b/lib/features/composer/presentation/composer_controller.dart
@@ -14,7 +14,6 @@ import 'package:filesize/filesize.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:get/get.dart';
 import 'package:html/parser.dart';
 import 'package:html_editor_enhanced/html_editor.dart';
@@ -1021,7 +1020,6 @@ class ComposerController extends BaseController
         AppLocalizations.of(context).message_dialog_send_email_without_recipient,
         AppLocalizations.of(context).add_recipients,
         title: AppLocalizations.of(context).sending_failed,
-        icon: SvgPicture.asset(imagePaths.icSendToastError, fit: BoxFit.fill),
         hasCancelButton: false,
         showAsBottomSheet: true,
       ).whenComplete(() => _sendButtonState = ButtonState.enabled);
@@ -1044,7 +1042,6 @@ class ComposerController extends BaseController
         },
         showAsBottomSheet: true,
         title: AppLocalizations.of(context).sending_failed,
-        icon: SvgPicture.asset(imagePaths.icSendToastError, fit: BoxFit.fill),
         hasCancelButton: false
       ).whenComplete(() => _sendButtonState = ButtonState.enabled);
       return;
@@ -1053,17 +1050,13 @@ class ComposerController extends BaseController
     if (subjectEmail.value == null || subjectEmail.isEmpty == true) {
       showConfirmDialogAction(context,
         AppLocalizations.of(context).message_dialog_send_email_without_a_subject,
-        AppLocalizations.of(context).send_anyway,
-        onConfirmAction: () => _handleSendMessages(context),
-        onCancelAction: popBack,
+        AppLocalizations.of(context).cancel,
+        cancelTitle: AppLocalizations.of(context).send_anyway,
+        onCancelAction: () => _handleSendMessages(context),
+        onConfirmAction: popBack,
         autoPerformPopBack: false,
         title: AppLocalizations.of(context).empty_subject,
-        cancelButtonColor: AppColor.blue700,
-        cancelLabelButtonColor: Colors.white,
-        actionButtonColor: AppColor.grayBackgroundColor,
-        confirmLabelButtonColor: AppColor.steelGray600,
         showAsBottomSheet: true,
-        icon: SvgPicture.asset(imagePaths.icEmpty, fit: BoxFit.fill),
       ).whenComplete(() => _sendButtonState = ButtonState.enabled);
       return;
     }
@@ -1075,7 +1068,6 @@ class ComposerController extends BaseController
         AppLocalizations.of(context).got_it,
         title: AppLocalizations.of(context).sending_failed,
         showAsBottomSheet: true,
-        icon: SvgPicture.asset(imagePaths.icSendToastError, fit: BoxFit.fill),
         hasCancelButton: false
       ).whenComplete(() => _sendButtonState = ButtonState.enabled);
       return;
@@ -1088,7 +1080,6 @@ class ComposerController extends BaseController
             filesize(mailboxDashBoardController.maxSizeAttachmentsPerEmail?.value ?? 0, 0)),
         AppLocalizations.of(context).got_it,
         title: AppLocalizations.of(context).sending_failed,
-        icon: SvgPicture.asset(imagePaths.icSendToastError, fit: BoxFit.fill),
         hasCancelButton: false
       ).whenComplete(() => _sendButtonState = ButtonState.enabled);
       return;
@@ -1236,12 +1227,6 @@ class ComposerController extends BaseController
         _sendButtonState = ButtonState.enabled;
         _closeComposerAction(closeOverlays: true);
       },
-      icon: SvgPicture.asset(
-        imagePaths.icQuotasWarning,
-        width: 40,
-        height: 40,
-        colorFilter: AppColor.colorBackgroundQuotasWarning.asFilter(),
-      ),
     );
   }
 
@@ -2266,12 +2251,6 @@ class ComposerController extends BaseController
           _autoFocusFieldWhenLauncher();
         }
       },
-      icon: SvgPicture.asset(
-        imagePaths.icQuotasWarning,
-        width: 40,
-        height: 40,
-        colorFilter: AppColor.colorBackgroundQuotasWarning.asFilter(),
-      ),
     );
   }
 
@@ -2467,12 +2446,6 @@ class ComposerController extends BaseController
         _closeComposerButtonState = ButtonState.enabled;
         _closeComposerAction(closeOverlays: true);
       },
-      icon: SvgPicture.asset(
-        imagePaths.icQuotasWarning,
-        width: 40,
-        height: 40,
-        colorFilter: AppColor.colorBackgroundQuotasWarning.asFilter(),
-      ),
     );
   }
 
diff --git a/lib/features/email/presentation/controller/single_email_controller.dart b/lib/features/email/presentation/controller/single_email_controller.dart
index b9c729b55..ca810231c 100644
--- a/lib/features/email/presentation/controller/single_email_controller.dart
+++ b/lib/features/email/presentation/controller/single_email_controller.dart
@@ -738,7 +738,6 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
         dialogMargin: MediaQuery.paddingOf(currentContext!).add(const EdgeInsets.only(bottom: 12)),
         title: AppLocalizations.of(currentContext!).titleReadReceiptRequestNotificationMessage,
         cancelTitle: AppLocalizations.of(currentContext!).no,
-        icon: SvgPicture.asset(imagePaths.icReadReceiptMessage, fit: BoxFit.fill),
       );
     }
   }
@@ -1553,17 +1552,12 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
         PointerInterceptor(child: ConfirmationDialogBuilder(
           key: const Key('confirm_dialog_delete_email_permanently'),
           imagePath: imagePaths,
-          useIconAsBasicLogo: true,
           title: DeleteActionType.single.getTitleDialog(context),
           textContent: DeleteActionType.single.getContentDialog(context),
-          confirmText: DeleteActionType.single.getConfirmActionName(context),
-          cancelText: AppLocalizations.of(context).cancel,
-          cancelBackgroundButtonColor: AppColor.blue700,
-          cancelLabelButtonColor: Colors.white,
-          confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
-          confirmLabelButtonColor: AppColor.steelGray600,
-          onConfirmButtonAction: () => _deleteEmailPermanentlyAction(context, email),
-          onCancelButtonAction: popBack,
+          cancelText: DeleteActionType.single.getConfirmActionName(context),
+          confirmText: AppLocalizations.of(context).cancel,
+          onCancelButtonAction: () => _deleteEmailPermanentlyAction(context, email),
+          onConfirmButtonAction: popBack,
           onCloseButtonAction: popBack,
         )),
         barrierColor: AppColor.colorDefaultCupertinoActionSheet,
@@ -1948,7 +1942,6 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
       },
       showAsBottomSheet: true,
       title: AppLocalizations.of(context).unsubscribeMail,
-      icon: SvgPicture.asset(imagePaths.icEmpty),
       messageStyle: ThemeUtils.textStyleBodyBody2(color: AppColor.steelGray400),
       listTextSpan: [
         TextSpan(text: AppLocalizations.of(context).unsubscribeMailDialogMessage),
diff --git a/lib/features/mailbox/presentation/mailbox_controller.dart b/lib/features/mailbox/presentation/mailbox_controller.dart
index 850f93c11..4373582e9 100644
--- a/lib/features/mailbox/presentation/mailbox_controller.dart
+++ b/lib/features/mailbox/presentation/mailbox_controller.dart
@@ -1073,15 +1073,12 @@ class MailboxController extends BaseMailboxController
         PointerInterceptor(child: ConfirmationDialogBuilder(
           key: const Key('confirm_dialog_delete_multiple_mailbox'),
           imagePath: imagePaths,
-          useIconAsBasicLogo: true,
           title: AppLocalizations.of(context).deleteFolders,
-          cancelBackgroundButtonColor: AppColor.blue700,
-          cancelLabelButtonColor: Colors.white,
-          confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
-          confirmLabelButtonColor: AppColor.steelGray600,
           textContent: AppLocalizations.of(context).messageConfirmationDialogDeleteMultipleFolder(selectedMailboxList.length),
-          onConfirmButtonAction: () => _deleteMultipleMailboxAction(selectedMailboxList),
-          onCancelButtonAction: popBack,
+          confirmText: AppLocalizations.of(context).cancel,
+          cancelText: AppLocalizations.of(context).delete,
+          onCancelButtonAction: () => _deleteMultipleMailboxAction(selectedMailboxList),
+          onConfirmButtonAction: popBack,
           onCloseButtonAction: popBack,
         )),
         barrierColor: AppColor.colorDefaultCupertinoActionSheet,
@@ -1718,7 +1715,6 @@ class MailboxController extends BaseMailboxController
           child: ConfirmationDialogBuilder(
             key: const Key('confirm_dialog_subaddressing'),
             imagePath: imagePaths,
-            useIconAsBasicLogo: true,
             title: AppLocalizations.of(context).allowSubaddressing,
             textContent: AppLocalizations.of(context).message_confirmation_dialog_allow_subaddressing(mailboxName),
             confirmText: AppLocalizations.of(context).allow,
diff --git a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
index 137da0c31..546baa81d 100644
--- a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
+++ b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
@@ -1554,25 +1554,20 @@ class MailboxDashBoardController extends ReloadableController
         PointerInterceptor(child: ConfirmationDialogBuilder(
           key: const Key('confirm_dialog_delete_emails_permanently'),
           imagePath: imagePaths,
-          useIconAsBasicLogo: true,
           title: actionType.getTitleDialog(context),
           textContent: actionType.getContentDialog(
             context,
             count: listEmails?.length,
             mailboxName: mailboxCurrent?.getDisplayName(context),
           ),
-          confirmText: actionType.getConfirmActionName(context),
-          cancelText: AppLocalizations.of(context).cancel,
-          cancelBackgroundButtonColor: AppColor.blue700,
-          cancelLabelButtonColor: Colors.white,
-          confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
-          confirmLabelButtonColor: AppColor.steelGray600,
-          onConfirmButtonAction: () => _deleteSelectionEmailsPermanentlyAction(
+          cancelText: actionType.getConfirmActionName(context),
+          confirmText: AppLocalizations.of(context).cancel,
+          onCancelButtonAction: () => _deleteSelectionEmailsPermanentlyAction(
             actionType,
             listEmails: listEmails,
             onCancelSelectionEmail: onCancelSelectionEmail,
           ),
-          onCancelButtonAction: popBack,
+          onConfirmButtonAction: popBack,
           onCloseButtonAction: popBack,
         )),
         barrierColor: AppColor.colorDefaultCupertinoActionSheet,
@@ -2627,16 +2622,11 @@ class MailboxDashBoardController extends ReloadableController
         PointerInterceptor(child: ConfirmationDialogBuilder(
           key: const Key('confirm_dialog_empty_spam'),
           imagePath: imagePaths,
-          useIconAsBasicLogo: true,
           title: AppLocalizations.of(context).emptySpamFolder,
           textContent: AppLocalizations.of(context).emptySpamMessageDialog,
-          confirmText: AppLocalizations.of(context).delete_all,
-          cancelText: AppLocalizations.of(context).cancel,
-          cancelBackgroundButtonColor: AppColor.blue700,
-          cancelLabelButtonColor: Colors.white,
-          confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
-          confirmLabelButtonColor: AppColor.steelGray600,
-          onConfirmButtonAction: () {
+          cancelText: AppLocalizations.of(context).delete_all,
+          confirmText: AppLocalizations.of(context).cancel,
+          onCancelButtonAction: () {
             popBack();
             if (spamMailbox.countTotalEmails > 0) {
               emptySpamFolderAction(
@@ -2650,7 +2640,7 @@ class MailboxDashBoardController extends ReloadableController
               );
             }
           },
-          onCancelButtonAction: popBack,
+          onConfirmButtonAction: popBack,
           onCloseButtonAction: popBack,
         )),
         barrierColor: AppColor.colorDefaultCupertinoActionSheet,
diff --git a/lib/features/manage_account/presentation/email_rules/email_rules_controller.dart b/lib/features/manage_account/presentation/email_rules/email_rules_controller.dart
index 7efe726d6..70822f7eb 100644
--- a/lib/features/manage_account/presentation/email_rules/email_rules_controller.dart
+++ b/lib/features/manage_account/presentation/email_rules/email_rules_controller.dart
@@ -170,17 +170,12 @@ class EmailRulesController extends BaseController {
         PointerInterceptor(
           child: ConfirmationDialogBuilder(
             imagePath: imagePaths,
-            useIconAsBasicLogo: true,
             title: AppLocalizations.of(context).deleteEmailRule,
             textContent: AppLocalizations.of(context).messageConfirmationDialogDeleteEmailRule(emailRule.name),
-            confirmText: AppLocalizations.of(context).delete,
-            cancelText: AppLocalizations.of(context).cancel,
-            cancelBackgroundButtonColor: AppColor.blue700,
-            cancelLabelButtonColor: Colors.white,
-            confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
-            confirmLabelButtonColor: AppColor.steelGray600,
-            onConfirmButtonAction: () => _handleDeleteEmailRuleAction(emailRule),
-            onCancelButtonAction: popBack,
+            cancelText: AppLocalizations.of(context).delete,
+            confirmText: AppLocalizations.of(context).cancel,
+            onCancelButtonAction: () => _handleDeleteEmailRuleAction(emailRule),
+            onConfirmButtonAction: popBack,
             onCloseButtonAction: popBack,
           ),
         ),
diff --git a/lib/features/manage_account/presentation/forward/forward_controller.dart b/lib/features/manage_account/presentation/forward/forward_controller.dart
index e53acdb0c..3b7a1920b 100644
--- a/lib/features/manage_account/presentation/forward/forward_controller.dart
+++ b/lib/features/manage_account/presentation/forward/forward_controller.dart
@@ -1,4 +1,3 @@
-import 'package:core/presentation/extensions/color_extension.dart';
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:core/presentation/utils/keyboard_utils.dart';
@@ -119,14 +118,10 @@ class ForwardController extends BaseController {
       context,
       title: AppLocalizations.of(context).deleteRecipient,
       AppLocalizations.of(context).messageConfirmationDialogDeleteRecipientForward(emailAddress),
-      AppLocalizations.of(context).remove,
-      onConfirmAction: () => _handleDeleteRecipientAction({emailAddress}),
+      AppLocalizations.of(context).cancel,
+      cancelTitle: AppLocalizations.of(context).remove,
+      onCancelAction: () => _handleDeleteRecipientAction({emailAddress}),
       showAsBottomSheet: true,
-      useIconAsBasicLogo: true,
-      cancelButtonColor: AppColor.blue700,
-      cancelLabelButtonColor: Colors.white,
-      actionButtonColor: AppColor.grayBackgroundColor,
-      confirmLabelButtonColor: AppColor.steelGray600,
     );
   }
 
@@ -202,17 +197,14 @@ class ForwardController extends BaseController {
   }
 
   void deleteMultipleRecipients(BuildContext context, Set<String> listEmailAddress) {
-    showConfirmDialogAction(currentContext!,
+    showConfirmDialogAction(
+      context,
       title: AppLocalizations.of(context).deleteRecipient,
       AppLocalizations.of(context).messageConfirmationDialogDeleteAllRecipientForward,
-      AppLocalizations.of(currentContext!).remove,
-      onConfirmAction: () => _handleDeleteRecipientAction(listEmailAddress),
+      AppLocalizations.of(context).cancel,
+      cancelTitle: AppLocalizations.of(context).remove,
+      onCancelAction: () => _handleDeleteRecipientAction(listEmailAddress),
       showAsBottomSheet: true,
-      useIconAsBasicLogo: true,
-      cancelButtonColor: AppColor.blue700,
-      cancelLabelButtonColor: Colors.white,
-      actionButtonColor: AppColor.grayBackgroundColor,
-      confirmLabelButtonColor: AppColor.steelGray600,
     );
   }
 
diff --git a/lib/features/manage_account/presentation/forward/widgets/autocomplete_contact_text_field_with_tags.dart b/lib/features/manage_account/presentation/forward/widgets/autocomplete_contact_text_field_with_tags.dart
index 4cccb8ae9..68b05d151 100644
--- a/lib/features/manage_account/presentation/forward/widgets/autocomplete_contact_text_field_with_tags.dart
+++ b/lib/features/manage_account/presentation/forward/widgets/autocomplete_contact_text_field_with_tags.dart
@@ -9,7 +9,6 @@ import 'package:core/presentation/utils/responsive_utils.dart';
 import 'package:core/utils/app_logger.dart';
 import 'package:core/utils/platform_info.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:get/get.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
 import 'package:model/model.dart';
@@ -443,22 +442,12 @@ class _AutocompleteContactTextFieldWithTagsState extends State<AutocompleteConta
     await showConfirmDialogAction(
       context,
       AppLocalizations.of(context).doYouWantToProceed,
-      AppLocalizations.of(context).yes,
+      AppLocalizations.of(context).no,
       title: AppConfig.getForwardWarningMessage(context),
-      cancelTitle: AppLocalizations.of(context).no,
+      cancelTitle: AppLocalizations.of(context).yes,
       alignCenter: true,
-      onConfirmAction: confirmAction,
-      onCancelAction: cancelAction,
-      cancelButtonColor: AppColor.blue700,
-      cancelLabelButtonColor: Colors.white,
-      actionButtonColor: AppColor.grayBackgroundColor,
-      confirmLabelButtonColor: AppColor.steelGray600,
-      icon: SvgPicture.asset(
-        _imagePaths.icQuotasWarning,
-        width: 40,
-        height: 40,
-        colorFilter: AppColor.colorQuotaError.asFilter(),
-      ),
+      onConfirmAction: cancelAction,
+      onCancelAction: confirmAction,
     );
   }
 }
\ No newline at end of file
diff --git a/lib/features/manage_account/presentation/profiles/identities/identities_controller.dart b/lib/features/manage_account/presentation/profiles/identities/identities_controller.dart
index def8e0b12..231fe4ea2 100644
--- a/lib/features/manage_account/presentation/profiles/identities/identities_controller.dart
+++ b/lib/features/manage_account/presentation/profiles/identities/identities_controller.dart
@@ -315,7 +315,6 @@ class IdentitiesController extends ReloadableController implements BeforeReconne
         ConfirmationDialogBuilder(
           key: const Key('dialog_message_delete_identity_failed'),
           imagePath: imagePaths,
-          useIconAsBasicLogo: true,
           title: AppLocalizations.of(currentContext!).delete_failed,
           confirmText: '${AppLocalizations.of(currentContext!).got_it}!',
           onConfirmButtonAction: popBack,
diff --git a/lib/features/manage_account/presentation/profiles/identities/widgets/delete_identity_dialog_builder.dart b/lib/features/manage_account/presentation/profiles/identities/widgets/delete_identity_dialog_builder.dart
index 7519d520c..0dd07f649 100644
--- a/lib/features/manage_account/presentation/profiles/identities/widgets/delete_identity_dialog_builder.dart
+++ b/lib/features/manage_account/presentation/profiles/identities/widgets/delete_identity_dialog_builder.dart
@@ -1,4 +1,3 @@
-import 'package:core/presentation/extensions/color_extension.dart';
 import 'package:core/presentation/resources/image_paths.dart';
 import 'package:core/presentation/utils/responsive_utils.dart';
 import 'package:core/presentation/views/dialog/confirmation_dialog_builder.dart';
@@ -56,20 +55,15 @@ class DeleteIdentityDialogBuilder extends StatelessWidget {
     return ConfirmationDialogBuilder(
       key: const Key('confirm_dialog_delete_identity'),
       imagePath: imagePaths,
-      useIconAsBasicLogo: true,
       title: appLocalizations.delete_identity,
       textContent: appLocalizations.message_confirmation_dialog_delete_identity,
-      confirmText: appLocalizations.delete,
-      cancelText: appLocalizations.cancel,
+      cancelText: appLocalizations.delete,
+      confirmText: appLocalizations.cancel,
       alignment: alignment,
       outsideDialogPadding: outsideDialogPadding,
       widthDialog: widthDialog,
-      cancelBackgroundButtonColor: AppColor.blue700,
-      cancelLabelButtonColor: Colors.white,
-      confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
-      confirmLabelButtonColor: AppColor.steelGray600,
-      onConfirmButtonAction: onDeleteIdentityAction,
-      onCancelButtonAction: popBack,
+      onCancelButtonAction: onDeleteIdentityAction,
+      onConfirmButtonAction: popBack,
       onCloseButtonAction: popBack,
     );
   }
diff --git a/lib/features/sending_queue/presentation/sending_queue_controller.dart b/lib/features/sending_queue/presentation/sending_queue_controller.dart
index 8dece9256..a78fb193f 100644
--- a/lib/features/sending_queue/presentation/sending_queue_controller.dart
+++ b/lib/features/sending_queue/presentation/sending_queue_controller.dart
@@ -3,7 +3,6 @@ import 'package:core/presentation/state/success.dart';
 import 'package:core/utils/app_logger.dart';
 import 'package:core/utils/platform_info.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:get/get.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/core/id.dart';
@@ -195,11 +194,11 @@ class SendingQueueController extends BaseController with MessageDialogActionMixi
     showConfirmDialogAction(
       context,
       AppLocalizations.of(context).messageDialogDeleteSendingEmail,
-      AppLocalizations.of(currentContext!).delete,
-      title: AppLocalizations.of(currentContext!).deleteOfflineEmail,
-      icon: SvgPicture.asset(imagePaths.icDeleteDialogRecipients),
+      AppLocalizations.of(context).cancel,
+      title: AppLocalizations.of(context).deleteOfflineEmail,
       alignCenter: true,
-      onConfirmAction: () => _handleDeleteListSendingEmail(listSendingEmails),
+      cancelTitle: AppLocalizations.of(context).delete,
+      onCancelAction: () => _handleDeleteListSendingEmail(listSendingEmails),
     );
   }
 
diff --git a/lib/features/thread/presentation/mixin/email_action_controller.dart b/lib/features/thread/presentation/mixin/email_action_controller.dart
index 707f2ef12..3fa7996ea 100644
--- a/lib/features/thread/presentation/mixin/email_action_controller.dart
+++ b/lib/features/thread/presentation/mixin/email_action_controller.dart
@@ -241,17 +241,12 @@ mixin EmailActionController {
         PointerInterceptor(child: ConfirmationDialogBuilder(
           key: const Key('confirm_dialog_delete_email_permanently'),
           imagePath: imagePaths,
-          useIconAsBasicLogo: true,
           title: DeleteActionType.single.getTitleDialog(context),
           textContent: DeleteActionType.single.getContentDialog(context),
-          confirmText: DeleteActionType.single.getConfirmActionName(context),
-          cancelText: AppLocalizations.of(context).cancel,
-          cancelBackgroundButtonColor: AppColor.blue700,
-          cancelLabelButtonColor: Colors.white,
-          confirmBackgroundButtonColor: AppColor.grayBackgroundColor,
-          confirmLabelButtonColor: AppColor.steelGray600,
-          onConfirmButtonAction: () => _deleteEmailPermanentlyAction(context, email),
-          onCancelButtonAction: popBack,
+          cancelText: DeleteActionType.single.getConfirmActionName(context),
+          confirmText: AppLocalizations.of(context).cancel,
+          onCancelButtonAction: () => _deleteEmailPermanentlyAction(context, email),
+          onConfirmButtonAction: popBack,
           onCloseButtonAction: popBack,
         )),
         barrierColor: AppColor.colorDefaultCupertinoActionSheet,
diff --git a/lib/features/upload/presentation/controller/upload_controller.dart b/lib/features/upload/presentation/controller/upload_controller.dart
index 4e4d8ad67..553590707 100644
--- a/lib/features/upload/presentation/controller/upload_controller.dart
+++ b/lib/features/upload/presentation/controller/upload_controller.dart
@@ -3,7 +3,6 @@ import 'dart:async';
 
 import 'package:async/async.dart';
 import 'package:collection/collection.dart';
-import 'package:core/presentation/extensions/color_extension.dart';
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:core/utils/app_logger.dart';
@@ -11,7 +10,6 @@ import 'package:dartz/dartz.dart';
 import 'package:dio/dio.dart';
 import 'package:filesize/filesize.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:get/get.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email_body_part.dart';
 import 'package:model/email/attachment.dart';
@@ -386,20 +384,10 @@ class UploadController extends BaseController {
       context,
       title: '',
       AppLocalizations.of(context).warningMessageWhenExceedGenerallySizeInComposer,
-      AppLocalizations.of(context).continueAction,
-      cancelTitle: AppLocalizations.of(context).cancel,
-      cancelButtonColor: AppColor.blue700,
-      cancelLabelButtonColor: Colors.white,
-      actionButtonColor: AppColor.grayBackgroundColor,
-      confirmLabelButtonColor: AppColor.steelGray600,
+      AppLocalizations.of(context).cancel,
+      cancelTitle: AppLocalizations.of(context).continueAction,
       alignCenter: true,
-      onConfirmAction: confirmAction,
-      icon: SvgPicture.asset(
-        imagePaths.icQuotasWarning,
-        width: 40,
-        height: 40,
-        colorFilter: AppColor.colorBackgroundQuotasWarning.asFilter(),
-      ),
+      onCancelAction: confirmAction,
     );
   }