diff --git a/lib/features/manage_account/presentation/menu/settings/settings_first_level_view.dart b/lib/features/manage_account/presentation/menu/settings/settings_first_level_view.dart
index 35f0b3dc9..b010dd267 100644
--- a/lib/features/manage_account/presentation/menu/settings/settings_first_level_view.dart
+++ b/lib/features/manage_account/presentation/menu/settings/settings_first_level_view.dart
@@ -23,7 +23,7 @@ class SettingsFirstLevelView extends GetWidget<SettingsController> {
           padding: SettingsUtils.getPaddingInFirstLevel(context, controller.responsiveUtils),
           titlePadding: const EdgeInsetsDirectional.only(start: 16))),
         Divider(
-          color: AppColor.colorDividerComposer,
+          color: AppColor.colorDividerHorizontal,
           height: 1,
           indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils),
           endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils)
@@ -35,7 +35,7 @@ class SettingsFirstLevelView extends GetWidget<SettingsController> {
           () => controller.selectSettings(AccountMenuItem.profiles)
         ),
         Divider(
-          color: AppColor.colorDividerComposer,
+          color: AppColor.colorDividerHorizontal,
           height: 1,
           indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils),
           endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils)
@@ -50,7 +50,7 @@ class SettingsFirstLevelView extends GetWidget<SettingsController> {
                 () => controller.selectSettings(AccountMenuItem.emailRules)
               ),
               Divider(
-                color: AppColor.colorDividerComposer,
+                color: AppColor.colorDividerHorizontal,
                 height: 1,
                 indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils),
                 endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils)
@@ -70,7 +70,7 @@ class SettingsFirstLevelView extends GetWidget<SettingsController> {
                 () => controller.selectSettings(AccountMenuItem.forward)
               ),
               Divider(
-                color: AppColor.colorDividerComposer,
+                color: AppColor.colorDividerHorizontal,
                 height: 1,
                 indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils),
                 endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils)
@@ -90,7 +90,7 @@ class SettingsFirstLevelView extends GetWidget<SettingsController> {
                 () => controller.selectSettings(AccountMenuItem.vacation)
               ),
               Divider(
-                color: AppColor.colorDividerComposer,
+                color: AppColor.colorDividerHorizontal,
                 height: 1,
                 indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils),
                 endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils)
@@ -108,7 +108,7 @@ class SettingsFirstLevelView extends GetWidget<SettingsController> {
             () => controller.selectSettings(AccountMenuItem.mailboxVisibility)
           ),
           Divider(
-            color: AppColor.colorDividerComposer,
+            color: AppColor.colorDividerHorizontal,
             height: 1,
             indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils),
             endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils)
@@ -120,7 +120,7 @@ class SettingsFirstLevelView extends GetWidget<SettingsController> {
           () => controller.selectSettings(AccountMenuItem.languageAndRegion)
         ),
         Divider(
-          color: AppColor.colorDividerComposer,
+          color: AppColor.colorDividerHorizontal,
           height: 1,
           indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils),
           endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils)
diff --git a/lib/features/manage_account/presentation/menu/settings/settings_view.dart b/lib/features/manage_account/presentation/menu/settings/settings_view.dart
index 9ef981242..d6f83f8b1 100644
--- a/lib/features/manage_account/presentation/menu/settings/settings_view.dart
+++ b/lib/features/manage_account/presentation/menu/settings/settings_view.dart
@@ -20,7 +20,6 @@ import 'package:tmail_ui_user/features/manage_account/presentation/profiles/prof
 import 'package:tmail_ui_user/features/manage_account/presentation/vacation/vacation_view.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/vacation/widgets/vacation_notification_message_widget.dart';
 import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
-import 'package:tmail_ui_user/main/utils/app_utils.dart';
 
 typedef CloseSettingsViewAction = void Function();
 
@@ -46,9 +45,9 @@ class SettingsView extends GetWidget<SettingsController> {
             Obx(() {
               if (controller.manageAccountDashboardController.vacationResponse.value?.vacationResponderIsValid == true) {
                 return VacationNotificationMessageWidget(
-                    margin: const EdgeInsets.only(
-                        left: PlatformInfo.isWeb ? 24 : 16,
-                        right: PlatformInfo.isWeb ? 24 : 16,
+                    margin: const EdgeInsetsDirectional.only(
+                        start: PlatformInfo.isWeb ? 24 : 16,
+                        end: PlatformInfo.isWeb ? 24 : 16,
                         top: 16),
                     fromAccountDashBoard: true,
                     vacationResponse: controller.manageAccountDashboardController.vacationResponse.value!,
@@ -60,19 +59,16 @@ class SettingsView extends GetWidget<SettingsController> {
                   || controller.manageAccountDashboardController.vacationResponse.value?.vacationResponderIsStopped == true)
                   && controller.manageAccountDashboardController.inVacationSettings()) {
                 return VacationNotificationMessageWidget(
-                  margin: const EdgeInsets.only(
-                    left: PlatformInfo.isWeb ? 24 : 16,
-                    right: PlatformInfo.isWeb ? 24 : 16,
+                  margin: const EdgeInsetsDirectional.only(
+                    start: PlatformInfo.isWeb ? 24 : 16,
+                    end: PlatformInfo.isWeb ? 24 : 16,
                     top: 16),
                   fromAccountDashBoard: true,
                   vacationResponse: controller.manageAccountDashboardController.vacationResponse.value!,
                   padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 16),
-                  leadingIcon: Padding(
-                    padding: EdgeInsets.only(
-                      right: AppUtils.isDirectionRTL(context) ? 0 : 16,
-                      left: AppUtils.isDirectionRTL(context) ? 16 : 0,
-                    ),
-                    child: const Icon(Icons.timer, size: 20),
+                  leadingIcon: const Padding(
+                    padding: EdgeInsetsDirectional.only(end: 16),
+                    child: Icon(Icons.timer, size: 20),
                   )
                 );
               } else {
@@ -139,10 +135,7 @@ class SettingsView extends GetWidget<SettingsController> {
                   colorFilter: AppColor.colorTextButton.asFilter(),
                   fit: BoxFit.fill),
                 Container(
-                  margin: EdgeInsets.only(
-                    left: AppUtils.isDirectionRTL(context) ? 0 : 4,
-                    right: AppUtils.isDirectionRTL(context) ? 4 : 0,
-                  ),
+                  margin: const EdgeInsetsDirectional.only(start: 4),
                   constraints: const BoxConstraints(maxWidth: 80),
                   child: Text(
                     AppLocalizations.of(context).settings,
diff --git a/lib/features/manage_account/presentation/vacation/widgets/vacation_notification_message_widget.dart b/lib/features/manage_account/presentation/vacation/widgets/vacation_notification_message_widget.dart
index 4dfb120c3..8fc8e9c42 100644
--- a/lib/features/manage_account/presentation/vacation/widgets/vacation_notification_message_widget.dart
+++ b/lib/features/manage_account/presentation/vacation/widgets/vacation_notification_message_widget.dart
@@ -14,8 +14,8 @@ class VacationNotificationMessageWidget extends StatelessWidget {
   final VacationResponse vacationResponse;
   final EndNowVacationSettingAction? actionEndNow;
   final GoToVacationSettingAction? actionGotoVacationSetting;
-  final EdgeInsets? margin;
-  final EdgeInsets? padding;
+  final EdgeInsetsGeometry? margin;
+  final EdgeInsetsGeometry? padding;
   final double? radius;
   final Widget? leadingIcon;
   final Color? backgroundColor;
@@ -41,7 +41,7 @@ class VacationNotificationMessageWidget extends StatelessWidget {
     return Container(
       width: double.infinity,
       margin: margin ?? const EdgeInsets.symmetric(horizontal: 12),
-      padding: padding ?? const EdgeInsets.only(left: 12),
+      padding: padding ?? const EdgeInsetsDirectional.only(start: 12),
       decoration: BoxDecoration(
         borderRadius: BorderRadius.circular(radius ?? 8),
         color: backgroundColor ?? AppColor.colorBackgroundNotificationVacationSetting,