diff --git a/lib/features/base/widget/material_text_icon_button.dart b/lib/features/base/widget/material_text_icon_button.dart
index 32783f739..d3690a9ec 100644
--- a/lib/features/base/widget/material_text_icon_button.dart
+++ b/lib/features/base/widget/material_text_icon_button.dart
@@ -18,7 +18,6 @@ class MaterialTextIconButton extends StatelessWidget {
   final Color? iconColor;
   final Color? backgroundColor;
   final TextStyle? labelStyle;
-  final EdgeInsets? padding;
 
   const MaterialTextIconButton({
     Key? key,
@@ -31,7 +30,6 @@ class MaterialTextIconButton extends StatelessWidget {
     this.labelColor,
     this.iconColor,
     this.backgroundColor,
-    this.padding,
     this.labelStyle,
     this.minimumSize
   }) : super(key: key);
@@ -59,9 +57,8 @@ class MaterialTextIconButton extends StatelessWidget {
         foregroundColor: labelColor ?? AppColor.colorTextButton,
         backgroundColor: backgroundColor ?? AppColor.colorCreateNewIdentityButton,
         elevation: 0,
-        padding: padding,
+        minimumSize: minimumSize,
         shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(borderRadius)),
-        minimumSize: minimumSize
       )
     );
   }
diff --git a/lib/features/contact/presentation/widgets/autocomplete_contact_text_field_with_tags.dart b/lib/features/contact/presentation/widgets/autocomplete_contact_text_field_with_tags.dart
index 0251ef4f2..eeaa2a063 100644
--- a/lib/features/contact/presentation/widgets/autocomplete_contact_text_field_with_tags.dart
+++ b/lib/features/contact/presentation/widgets/autocomplete_contact_text_field_with_tags.dart
@@ -7,6 +7,7 @@ import 'package:core/presentation/resources/image_paths.dart';
 import 'package:core/presentation/utils/responsive_utils.dart';
 import 'package:core/utils/app_logger.dart';
 import 'package:core/utils/build_utils.dart';
+import 'package:core/utils/platform_info.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
@@ -272,8 +273,7 @@ class _AutocompleteContactTextFieldWithTagsState extends State<AutocompleteConta
       backgroundColor: AppColor.colorTextButton,
       labelColor: Colors.white,
       iconColor: Colors.white,
-      minimumSize: Size(maxWidth ?? 167, 54),
-      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 20),
+      minimumSize: Size(maxWidth ?? 167, PlatformInfo.isMobile ? 44 : 54),
       onTap: _handleAddRecipientAction
     );
   }
diff --git a/lib/features/manage_account/presentation/forward/controller/forward_recipient_controller.dart b/lib/features/manage_account/presentation/forward/controller/forward_recipient_controller.dart
index 8dc3dd7b7..3681f7c77 100644
--- a/lib/features/manage_account/presentation/forward/controller/forward_recipient_controller.dart
+++ b/lib/features/manage_account/presentation/forward/controller/forward_recipient_controller.dart
@@ -81,10 +81,6 @@ class ForwardRecipientController {
     }
   }
 
-  void updateListRecipient(List<EmailAddress> listEmailAddress) {
-    listRecipients.value = listEmailAddress;
-  }
-
   void clearAll() {
     inputRecipientController.clear();
     listRecipients.clear();
diff --git a/lib/features/manage_account/presentation/forward/forward_view.dart b/lib/features/manage_account/presentation/forward/forward_view.dart
index b29522fea..b0a07f3b4 100644
--- a/lib/features/manage_account/presentation/forward/forward_view.dart
+++ b/lib/features/manage_account/presentation/forward/forward_view.dart
@@ -44,7 +44,10 @@ class ForwardView extends GetWidget<ForwardController> with AppLoaderMixin {
                 if (!_responsiveUtils.isWebDesktop(context))
                   _buildTitleHeader(context),
                 _buildKeepLocalSwitchButton(context),
-                _buildAddRecipientsFormWidget(context),
+                Obx(() => controller.currentForward.value != null
+                  ? _buildAddRecipientsFormWidget(context)
+                  : const SizedBox.shrink()
+                ),
                 _buildLoadingView(),
                 Obx(() {
                   if (controller.listRecipientForward.isNotEmpty) {
diff --git a/lib/features/manage_account/presentation/profiles/identities/widgets/identities_header_widget.dart b/lib/features/manage_account/presentation/profiles/identities/widgets/identities_header_widget.dart
index 7d4ca163d..2173a705c 100644
--- a/lib/features/manage_account/presentation/profiles/identities/widgets/identities_header_widget.dart
+++ b/lib/features/manage_account/presentation/profiles/identities/widgets/identities_header_widget.dart
@@ -42,7 +42,6 @@ class IdentitiesHeaderWidget extends StatelessWidget {
           label: AppLocalizations.of(context).createNewIdentity,
           icon: imagePaths.icAddIdentity,
           iconSize: 28,
-          padding: const EdgeInsets.all(16),
           minimumSize: const Size(double.infinity, 44),
           onTap: onAddNewIdentityAction
         )