diff --git a/core/lib/presentation/extensions/string_extension.dart b/core/lib/presentation/extensions/string_extension.dart
index 1609b3906..7f15e5453 100644
--- a/core/lib/presentation/extensions/string_extension.dart
+++ b/core/lib/presentation/extensions/string_extension.dart
@@ -42,7 +42,6 @@ extension StringExtension on String {
 
   String get withUnicodeCharacter {
     return characters
-      .replaceAll(Characters(' '), Characters('\u{00A0}'))
       .replaceAll(Characters('-'), Characters('\u{2011}'))
       .toString();
   }
diff --git a/lib/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart b/lib/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart
index 6258ed4a3..1aad0cb5e 100644
--- a/lib/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart
+++ b/lib/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart
@@ -113,7 +113,6 @@ class MailBoxFolderTileBuilder {
                         _buildLeadingMailboxItem(context),
                         const SizedBox(width: 4),
                         Expanded(child: _buildTitleFolderItem(context)),
-
                     ])
                 ),
               );
@@ -172,7 +171,7 @@ class MailBoxFolderTileBuilder {
                   child: Row(children: [
                     _buildLeadingMailboxItem(context),
                     const SizedBox(width: 8),
-                    Expanded(child: _buildTitleFolderItem(context)),
+                    Expanded(child: _buildTitleFolderItem(context, showTrailingItem: false)),
                     _buildSelectedIcon()
                   ])
               ),
@@ -292,7 +291,7 @@ class MailBoxFolderTileBuilder {
     }
   }
 
-  Widget _buildTitleFolderItem(BuildContext context) {
+  Widget _buildTitleFolderItem(BuildContext context, {bool showTrailingItem = true}) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -311,7 +310,8 @@ class MailBoxFolderTileBuilder {
                     fontWeight: _mailboxNode.item.isTeamMailboxes ? FontWeight.bold : FontWeight.normal),
               ),
             ),
-            _buildTrailingItemForMailboxView(context)
+            if (showTrailingItem)
+              _buildTrailingItemForMailboxView(context)
           ],
         ),
         if(_mailboxNode.item.isTeamMailboxes)
diff --git a/lib/features/manage_account/presentation/email_rules/widgets/email_rule_item_widget.dart b/lib/features/manage_account/presentation/email_rules/widgets/email_rule_item_widget.dart
index ae2ab5658..ce657ae35 100644
--- a/lib/features/manage_account/presentation/email_rules/widgets/email_rule_item_widget.dart
+++ b/lib/features/manage_account/presentation/email_rules/widgets/email_rule_item_widget.dart
@@ -39,6 +39,7 @@ class EmailRulesItemWidget extends StatelessWidget {
               icon: SvgPicture.asset(
                 _imagePaths.icEditRule,
                 fit: BoxFit.fill,
+                colorFilter: AppColor.primaryColor.asFilter(),
               ),
               onTap: () {
                 _emailRuleController.editEmailRule(context, rule);