diff --git a/lib/features/composer/presentation/composer_view_web.dart b/lib/features/composer/presentation/composer_view_web.dart
index d65a324e9..46c02fdfa 100644
--- a/lib/features/composer/presentation/composer_view_web.dart
+++ b/lib/features/composer/presentation/composer_view_web.dart
@@ -64,9 +64,7 @@ class ComposerView extends GetWidget<ComposerController>
                     Expanded(child: Column(
                         children: [
                           _buildAttachmentsWidget(context),
-                          ToolbarRichTextWebBuilder(
-                            richTextWebController: controller.richTextWebController,
-                            padding: const EdgeInsets.only(left: 20, top: 8, bottom: 8)),
+                          ToolbarRichTextWebBuilder(richTextWebController: controller.richTextWebController),
                           buildInlineLoadingView(controller),
                           _buildEditorForm(context)
                         ]
diff --git a/lib/features/composer/presentation/widgets/toolbar_rich_text_builder.dart b/lib/features/composer/presentation/widgets/toolbar_rich_text_builder.dart
index e6c0928e7..f55eb20c6 100644
--- a/lib/features/composer/presentation/widgets/toolbar_rich_text_builder.dart
+++ b/lib/features/composer/presentation/widgets/toolbar_rich_text_builder.dart
@@ -36,7 +36,7 @@ class ToolbarRichTextWebBuilder extends StatelessWidget with RichTextButtonMixin
       final opacity = codeViewEnabled ? 0.5 : 1.0;
 
       return Container(
-        padding: padding,
+        padding: padding ?? const EdgeInsets.only(left: 20, top: 8, bottom: 8),
         alignment: Alignment.centerLeft,
         child: Wrap(
             crossAxisAlignment: WrapCrossAlignment.center,
diff --git a/lib/features/identity_creator/presentation/identity_creator_view.dart b/lib/features/identity_creator/presentation/identity_creator_view.dart
index 01249108c..7d48d9ea4 100644
--- a/lib/features/identity_creator/presentation/identity_creator_view.dart
+++ b/lib/features/identity_creator/presentation/identity_creator_view.dart
@@ -232,11 +232,6 @@ class IdentityCreatorView extends GetWidget<IdentityCreatorController> {
                   color: AppColor.colorContentEmail,
                 ),
               ),
-              Expanded(
-                child: Row(mainAxisAlignment: MainAxisAlignment.end, children: [
-                  _buildSignatureButton(context)
-                ]),
-              )
             ],
           ),
           const SizedBox(height: 8),
@@ -253,7 +248,7 @@ class IdentityCreatorView extends GetWidget<IdentityCreatorController> {
           ),
           if (_responsiveUtils.isTablet(context) || _responsiveUtils.isMobile(context))...[
             Obx(() => Padding(
-            padding: const EdgeInsets.only(top: 27, bottom: 135),
+            padding: const EdgeInsets.only(top: 27),
             child: SetDefaultIdentityCheckboxBuilder(
               imagePaths: _imagePaths,
               isCheck: controller.isDefaultIdentity.value,
@@ -361,18 +356,6 @@ class IdentityCreatorView extends GetWidget<IdentityCreatorController> {
     );
   }
 
-  Widget _buildSignatureButton(BuildContext context) {
-    return buildButtonWrapText(
-        AppLocalizations.of(context).html,
-        textStyle: const TextStyle(
-            fontWeight: FontWeight.w500,
-            fontSize: 14,
-            color: AppColor.colorContentEmail),
-        bgColor: AppColor.emailAddressChipColor,
-        height: 30,
-        radius: 10);
-  }
-
   Widget _buildSignatureHtmlTemplate(BuildContext context) {
     final htmlEditor = BuildUtils.isWeb 
         ? _buildHtmlEditorWeb(context, controller.contentHtmlEditor ?? '')