diff --git a/internal_packages/thread-list/lib/thread-list.cjsx b/internal_packages/thread-list/lib/thread-list.cjsx
index 6d151ffd6..2d676cc4a 100644
--- a/internal_packages/thread-list/lib/thread-list.cjsx
+++ b/internal_packages/thread-list/lib/thread-list.cjsx
@@ -70,15 +70,16 @@ class ThreadList extends React.Component
     c1 = new ListTabular.Column
       name: "★"
       resolver: (thread) =>
-        <span>
+        [
           <ThreadListIcon thread={thread} />
           <MailImportantIcon thread={thread} />
           <InjectedComponentSet
             inline={true}
             containersRequired={false}
             matching={role: "ThreadListIcon"}
+            className="thread-injected-icons"
             exposedProps={thread: thread}/>
-        </span>
+        ]
 
     c2 = new ListTabular.Column
       name: "Participants"
diff --git a/internal_packages/thread-list/stylesheets/thread-list.less b/internal_packages/thread-list/stylesheets/thread-list.less
index 94ba6ecd6..c82fef8fc 100644
--- a/internal_packages/thread-list/stylesheets/thread-list.less
+++ b/internal_packages/thread-list/stylesheets/thread-list.less
@@ -163,14 +163,17 @@
     .inverseContent;
   }
 
+  .thread-injected-icons {
+    vertical-align: top;
+    line-height: 26px;
+  }
   .thread-icon {
-    width:15px;
-    height:15px;
+    width:26px;
+    height:26px;
     background-size: 15px;
     display:inline-block;
     background-repeat: no-repeat;
     background-position:center;
-    padding:12px;
 
     &.thread-icon-attachment {
       background-image:url(../static/images/thread-list/icon-attachment-@2x.png);