diff --git a/core/lib/presentation/utils/html_transformer/dom/hide_draft_signature_transformer.dart b/core/lib/presentation/utils/html_transformer/dom/hide_draft_signature_transformer.dart
index 3eb9ab930..f65cbdd6c 100644
--- a/core/lib/presentation/utils/html_transformer/dom/hide_draft_signature_transformer.dart
+++ b/core/lib/presentation/utils/html_transformer/dom/hide_draft_signature_transformer.dart
@@ -14,7 +14,7 @@ class HideDraftSignatureTransformer extends DomTransformer {
     Map<String, String>? mapUrlDownloadCID
   }) async {
     try {
-      final signature = document.querySelector('div.tmail-signature');
+      final signature = document.querySelector('.tmail-signature');
       if (signature == null) return;
       final currentStyle = signature.attributes['style']?.trim();
       if (currentStyle == null) {
diff --git a/core/lib/presentation/utils/html_transformer/dom/signature_transformers.dart b/core/lib/presentation/utils/html_transformer/dom/signature_transformers.dart
index ec21b0352..062ed3843 100644
--- a/core/lib/presentation/utils/html_transformer/dom/signature_transformers.dart
+++ b/core/lib/presentation/utils/html_transformer/dom/signature_transformers.dart
@@ -15,7 +15,7 @@ class SignatureTransformer extends DomTransformer {
     Map<String, String>? mapUrlDownloadCID,
   }) async {
     try {
-      final signatureElements = document.querySelectorAll('div.tmail-signature');
+      final signatureElements = document.querySelectorAll('.tmail-signature');
 
       if (signatureElements.isEmpty) return;
 
diff --git a/core/lib/utils/html/html_template.dart b/core/lib/utils/html/html_template.dart
index ce0574d67..1c37fdc6b 100644
--- a/core/lib/utils/html/html_template.dart
+++ b/core/lib/utils/html/html_template.dart
@@ -25,8 +25,10 @@ class HtmlTemplate {
 
   static const String printDocumentCssStyle = '''
     <style> 
+      $fontFaceStyle 
+      
       body,td,div,p,a,input {
-        font-family: arial, sans-serif;
+        font-family: 'Inter', sans-serif;
       }
     
       body, td {
@@ -102,12 +104,27 @@ class HtmlTemplate {
   ''';
 
   static const String defaultFontStyle = '''
-    body {
+    div, p, span, th, td, tr, ul, ol, li, a, button {
       font-weight: 400;
       font-size: 16px;
       line-height: 24px;
       letter-spacing: -0.01em; /* -1% */
     }
+    
+    p {
+      margin: 0px;
+    }
+  ''';
+
+  static const String defaultEditorFontStyle = '''
+   #editor, .note-editable, .note-frame {
+      font-size: 16px;
+      color: #222222;
+    }
+    
+    p {
+      margin: 0px;
+    }
   ''';
 
   static const String previewEMLFileCssStyle = '''
@@ -271,7 +288,7 @@ class HtmlTemplate {
     <style>
       ${HtmlTemplate.fontFaceStyle}
       
-      ${useDefaultFontStyle ? HtmlTemplate.defaultFontStyle : ''}
+      ${useDefaultFontStyle ? HtmlTemplate.defaultEditorFontStyle : ''}
       
       ${customScrollbar ? '''
         html, .note-editable, .note-codable {
@@ -311,7 +328,7 @@ class HtmlTemplate {
   }) => '''
     ${HtmlTemplate.fontFaceStyle}
   
-    ${useDefaultFontStyle ? HtmlTemplate.defaultFontStyle : ''}
+    ${useDefaultFontStyle ? HtmlTemplate.defaultEditorFontStyle : ''}
       
     #editor {
       direction: ${direction.name};
diff --git a/core/lib/utils/html/html_utils.dart b/core/lib/utils/html/html_utils.dart
index e6afbdb5e..6a690836c 100644
--- a/core/lib/utils/html/html_utils.dart
+++ b/core/lib/utils/html/html_utils.dart
@@ -49,6 +49,7 @@ class HtmlUtils {
       <style>
         .note-frame, .note-tooltip-content, .note-popover {
           font-family: 'Inter', sans-serif;
+          color: #222222;
         }
         
         .note-editable {
diff --git a/lib/features/composer/presentation/extensions/sanitize_signature_in_email_content_extension.dart b/lib/features/composer/presentation/extensions/sanitize_signature_in_email_content_extension.dart
index 11d4187fa..35efd98df 100644
--- a/lib/features/composer/presentation/extensions/sanitize_signature_in_email_content_extension.dart
+++ b/lib/features/composer/presentation/extensions/sanitize_signature_in_email_content_extension.dart
@@ -13,7 +13,7 @@ extension SanitizeSignatureInEmailContentExtension on ComposerController {
       final existedSignatureButton = emailDocument.querySelector('.tmail-signature-button');
       if (existedSignatureButton != null) return;
 
-      final signature = emailDocument.querySelector('div.tmail-signature');
+      final signature = emailDocument.querySelector('.tmail-signature');
       if (signature == null) return;
 
       restoringSignatureButton = true;
diff --git a/lib/features/email/data/local/html_analyzer.dart b/lib/features/email/data/local/html_analyzer.dart
index 1a564e6a1..0a7db3d73 100644
--- a/lib/features/email/data/local/html_analyzer.dart
+++ b/lib/features/email/data/local/html_analyzer.dart
@@ -192,7 +192,7 @@ class HtmlAnalyzer {
   Future<String> removeCollapsedExpandedSignatureEffect({required String emailContent}) async {
     try {
       final document = parse(emailContent);
-      final signatureElements = document.querySelectorAll('div.tmail-signature');
+      final signatureElements = document.querySelectorAll('.tmail-signature');
       await Future.wait(signatureElements.map((signatureTag) async {
         final signatureChildren = signatureTag.children;
         for (var child in signatureChildren) {