diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 0afb67fd..88be3c0c 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -142,12 +142,12 @@
                   :to="userProfileLink"
                 >
                   {{ status.user.screen_name }}
-                  <img
-                    height="18px"
-                    v-if="!!(status.user && status.user.favicon)"
-                    :src="status.user.favicon"
-                  >
                 </router-link>
+                <img
+                  class="status-favicon"
+                  v-if="!!(status.user && status.user.favicon)"
+                  :src="status.user.favicon"
+                >
               </div>
 
               <span class="heading-right">
@@ -176,18 +176,8 @@
                   class="source_url"
                   title="Source"
                 >
-                  <img
-                    height="18px"
-                    v-if="!!(status.user && status.user.favicon)"
-                    :src="status.user.favicon"
-                  >
-                  <i v-else class="button-icon icon-link-ext-alt" />
+                  <i class="button-icon icon-link-ext-alt" />
                 </a>
-                <img
-                  v-else-if="!!(status.user && status.user.favicon)"
-                  height="18px"
-                  :src="status.user.favicon"
-                >
                 <template v-if="expandable && !isPreview">
                   <a
                     href="#"
@@ -441,6 +431,12 @@ $status-margin: 0.75em;
     }
   }
 
+  .status-favicon {
+    height: 18px;
+    width: 18px;
+    margin-right: 0.4em;
+  }
+
   .media-heading {
     padding: 0;
     vertical-align: bottom;