diff --git a/mail/templates/mobile/app.css b/mail/templates/mobile/app.css
index e0ce8466dc..98b84673ca 100644
--- a/mail/templates/mobile/app.css
+++ b/mail/templates/mobile/app.css
@@ -656,13 +656,14 @@ div.mailPreviewHeaders div.mail_extraEmails {
   vertical-align: top;
 }
 #mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubject {
-  width: 58%;
+  width: 90%;
   text-overflow: ellipsis;
   overflow: hidden;
   white-space: nowrap;
 }
-#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubject > span {
+#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubject > span:not(:first-child) {
   white-space: nowrap;
+  display: inline;
 }
 #mail-index_mail-index-header_right {
   display: inline-flex;
@@ -2219,8 +2220,8 @@ div.mailPreviewHeaders img.et2_button_icon {
 }
 /* Button after field*/
 #mail-index_mailPreviewHeadersAttachments img.et2_button_icon {
-  width: 12px;
-  height: 12px;
+  width: 16px;
+  height: 16px;
   background-color: inherit;
 }
 /*######################################################*/
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 9f887135be..4f25440f10 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -1018,14 +1018,13 @@ body {
   margin: 3px 5px 0 0;
 }
 #mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubject {
-  width: 90%;
+  width: 58%;
   text-overflow: ellipsis;
   overflow: hidden;
   white-space: nowrap;
 }
-#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubject > span:not(:first-child) {
+#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubject > span {
   white-space: nowrap;
-  display: inline;
 }
 /*##############################################
 #            #                               #
@@ -2209,8 +2208,8 @@ div.mailPreviewHeaders img.et2_button_icon {
 }
 /* Button after field*/
 #mail-index_mailPreviewHeadersAttachments img.et2_button_icon {
-  width: 12px;
-  height: 12px;
+  width: 16px;
+  height: 16px;
   background-color: inherit;
 }
 /*######################################################*/
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index cf8319659e..ada548f97b 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -1214,7 +1214,7 @@ div.mailPreviewHeaders img.et2_button_icon {
 
 /* Button after field*/
 #mail-index_mailPreviewHeadersAttachments {
-	img.et2_button_icon {.dimension_width_height_xs; background-color: inherit;}
+	img.et2_button_icon {.dimension_width_height_s; background-color: inherit;}
 }
 
 /*######################################################*/