diff --git a/assets/images/ic_filter_advanced.svg b/assets/images/ic_filter_advanced.svg
index 16f58632c..c4e04bfa9 100644
--- a/assets/images/ic_filter_advanced.svg
+++ b/assets/images/ic_filter_advanced.svg
@@ -1,4 +1,5 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2.8246 5.21346C3.16498 6.25709 4.14611 7.01121 5.30337 7.01121C6.46063 7.01121 7.44176 6.25709 7.78214 5.21346C10.2518 5.21346 12.7214 5.21346 15.191 5.21346C15.6378 5.21346 16 4.85126 16 4.40447C16 3.95768 15.6378 3.59548 15.191 3.59548C12.7214 3.59548 10.2518 3.59548 7.78214 3.59548C7.77341 3.56819 7.7851 3.60456 7.78214 3.59548C7.44176 2.55185 6.46063 1.79773 5.30337 1.79773C4.14611 1.79773 3.16498 2.55185 2.8246 3.59548C2.15273 3.59548 1.48086 3.59548 0.808989 3.59548C0.362197 3.59548 0 3.95768 0 4.40447C0 4.85126 0.362197 5.21346 0.808989 5.21346C1.48086 5.21346 2.15273 5.21346 2.8246 5.21346ZM5.30337 3.41571C4.75729 3.41571 4.31461 3.85839 4.31461 4.40447C4.31461 4.95055 4.75729 5.39324 5.30337 5.39324C5.84945 5.39324 6.29214 4.95055 6.29214 4.40447C6.29214 3.85839 5.84945 3.41571 5.30337 3.41571Z" fill="#007AFF"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M0 11.5955C0 11.1487 0.362197 10.7865 0.808989 10.7865C3.27861 10.7865 5.74824 10.7865 8.21786 10.7865C8.55824 9.74286 9.53937 8.98874 10.6966 8.98874C11.8539 8.98874 12.835 9.74286 13.1754 10.7865C13.1754 10.7865 14.7223 10.7865 15.191 10.7865C15.6378 10.7865 16 11.1487 16 11.5955C16 12.0423 15.6378 12.4045 15.191 12.4045C14.9912 12.4045 13.1754 12.4045 13.1754 12.4045C12.835 13.4481 11.8539 14.2022 10.6966 14.2022C9.53937 14.2022 8.55824 13.4481 8.21786 12.4045C5.74824 12.4045 3.27861 12.4045 0.808989 12.4045C0.362197 12.4045 0 12.0423 0 11.5955ZM9.70787 11.5955C9.70787 11.0494 10.1506 10.6067 10.6966 10.6067C11.2427 10.6067 11.6854 11.0494 11.6854 11.5955C11.6854 12.1416 11.2427 12.5842 10.6966 12.5842C10.1506 12.5842 9.70787 12.1416 9.70787 11.5955Z" fill="#007AFF"/>
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+        d="M15.8572 12.8574C17.2163 12.8574 18.3643 13.7611 18.7331 15.0003L20.5715 15.0002C21.0449 15.0002 21.4287 15.384 21.4287 15.8574C21.4287 16.3307 21.0449 16.7145 20.5715 16.7145L18.7328 16.7152C18.3638 17.9541 17.216 18.8574 15.8572 18.8574C14.4985 18.8574 13.3507 17.9541 12.9817 16.7152L3.42868 16.7145C2.95529 16.7145 2.57153 16.3307 2.57153 15.8574C2.57153 15.384 2.95529 15.0002 3.42868 15.0002L12.9814 15.0003C13.3502 13.7611 14.4982 12.8574 15.8572 12.8574ZM15.8572 14.3574C15.0288 14.3574 14.3572 15.0289 14.3572 15.8574C14.3572 16.6858 15.0288 17.3574 15.8572 17.3574C16.6857 17.3574 17.3572 16.6858 17.3572 15.8574C17.3572 15.0289 16.6857 14.3574 15.8572 14.3574ZM9.0001 5.14307C10.3592 5.14307 11.5072 6.04678 11.8759 7.28606L20.5715 7.28592C21.0449 7.28592 21.4287 7.66968 21.4287 8.14307C21.4287 8.61645 21.0449 9.00021 20.5715 9.00021L11.8757 9.00093C11.5066 10.2398 10.3589 11.1431 9.0001 11.1431C7.64136 11.1431 6.49359 10.2398 6.12455 9.00093L3.42868 9.00021C2.95529 9.00021 2.57153 8.61645 2.57153 8.14307C2.57153 7.66968 2.95529 7.28592 3.42868 7.28592L6.1243 7.28606C6.49306 6.04678 7.64104 5.14307 9.0001 5.14307ZM9.0001 6.64307C8.17168 6.64307 7.5001 7.31464 7.5001 8.14307C7.5001 8.97149 8.17168 9.64307 9.0001 9.64307C9.82853 9.64307 10.5001 8.97149 10.5001 8.14307C10.5001 7.31464 9.82853 6.64307 9.0001 6.64307Z"
+        fill="#AEB7C2" />
 </svg>
diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/icon_open_advanced_search_widget.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/icon_open_advanced_search_widget.dart
index 40318b6d1..ca5d32640 100644
--- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/icon_open_advanced_search_widget.dart
+++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/icon_open_advanced_search_widget.dart
@@ -1,13 +1,12 @@
 import 'package:core/presentation/extensions/color_extension.dart';
 import 'package:core/presentation/resources/image_paths.dart';
-import 'package:core/presentation/views/button/icon_button_web.dart';
+import 'package:core/presentation/views/button/tmail_button_widget.dart';
 import 'package:core/utils/app_logger.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:get/get.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/search_controller.dart'  as search;
-import 'package:tmail_ui_user/main/utils/app_utils.dart';
+import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
 
 class IconOpenAdvancedSearchWidget extends StatelessWidget {
   IconOpenAdvancedSearchWidget({Key? key}) : super(key: key);
@@ -18,31 +17,29 @@ class IconOpenAdvancedSearchWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Obx(
-      () => Padding(
-        padding: EdgeInsets.only(
-          right: AppUtils.isDirectionRTL(context) ? 0 : 8,
-          left: AppUtils.isDirectionRTL(context) ? 8 : 0,
-        ),
-        child: buildIconWeb(
-            splashRadius: 15,
-            minSize: 40,
-            iconPadding: EdgeInsets.only(
-              right: AppUtils.isDirectionRTL(context) ? 0 : 2,
-              left: AppUtils.isDirectionRTL(context) ? 2 : 0,
-            ),
-            icon: SvgPicture.asset(_imagePaths.icFilterAdvanced,
-                colorFilter: searchController.isAdvancedSearchViewOpen.isTrue || searchController.advancedSearchIsActivated.isTrue
-                    ? AppColor.colorFilterMessageEnabled.asFilter()
-                    : AppColor.colorFilterMessageDisabled.asFilter(),
-                width: 16,
-                height: 16),
-            onTap: () {
-              log('IconOpenAdvancedSearchWidget::build(): clicked');
-              advancedFilterController.initSearchFilterField(context);
-              searchController.openAdvanceSearch();
-            }),
-      ),
-    );
+    return Obx(() {
+      if (searchController.isAdvancedSearchViewOpen.isTrue) {
+        return const SizedBox.shrink();
+      }
+
+      return TMailButtonWidget.fromIcon(
+        icon: _imagePaths.icFilterAdvanced,
+        iconSize: 22,
+        iconColor: searchController.advancedSearchIsActivated.isTrue
+          ? AppColor.primaryMain
+          : AppColor.steelGray400,
+        padding: const EdgeInsets.all(4),
+        margin: const EdgeInsets.symmetric(horizontal: 12),
+        backgroundColor: Colors.transparent,
+        tooltipMessage: AppLocalizations.of(context).advancedSearch,
+        onTapActionCallback: () => _onClickOpenAdvancedSearchView(context),
+      );
+    });
+  }
+
+  void _onClickOpenAdvancedSearchView(BuildContext context) {
+    log('IconOpenAdvancedSearchWidget::_onClickOpenAdvancedSearchView:');
+    advancedFilterController.initSearchFilterField(context);
+    searchController.openAdvanceSearch();
   }
 }