diff --git a/internal_packages/attachments/stylesheets/attachments.less b/internal_packages/attachments/stylesheets/attachments.less
index c4035cb42..7fa53b8d1 100644
--- a/internal_packages/attachments/stylesheets/attachments.less
+++ b/internal_packages/attachments/stylesheets/attachments.less
@@ -57,10 +57,12 @@
 
   .attachment-file-name {
     font-weight: @font-weight-medium;
+    vertical-align: middle;
   }
   .attachment-file-and-name {
     position: relative;
     z-index: 2;
+    vertical-align: middle;
   }
 
   .attachment-file-actions {
@@ -68,8 +70,6 @@
     z-index: 3;
     .attachment-icon {
       float: right;
-      position: relative;
-      top: 2px;
       margin-left: 10px;
     }
   }
diff --git a/internal_packages/message-list/stylesheets/message-list.less b/internal_packages/message-list/stylesheets/message-list.less
index 59066a8db..d382b8f0d 100644
--- a/internal_packages/message-list/stylesheets/message-list.less
+++ b/internal_packages/message-list/stylesheets/message-list.less
@@ -176,6 +176,8 @@
         padding:12px;
         margin-left: 0.5em;
         background-image:url(../static/images/message-list/icon-attachment-@2x.png);
+        position: relative;
+        top: -2px;
       }
 
       .collapsed-from {