1 files changed, 55 insertions, 29 deletions

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index ffae32fc..21412faa 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -10,17 +10,20 @@
       class="alert error"
     >
       {{ error }}
-      <i
-        class="button-icon icon-cancel"
+      <span
+        class="fa-scale-110 fa-old-padding"
         @click="clearError"
-      />
+      >
+        <FAIcon icon="times" />
+      </span>
     </div>
     <template v-if="muted && !isPreview">
       <div class="status-container muted">
         <small class="status-username">
-          <i
+          <FAIcon
             v-if="muted && retweet"
-            class="button-icon icon-retweet"
+            class="fa-scale-110 fa-old-padding repeat-icon"
+            icon="retweet"
           />
           <router-link :to="userProfileLink">
             {{ status.user.screen_name }}
@@ -46,9 +49,14 @@
         </small>
         <a
           href="#"
-          class="unmute"
+          class="unmute fa-scale-110 fa-old-padding"
           @click.prevent="toggleMute"
-        ><i class="button-icon icon-eye-off" /></a>
+        >
+          <FAIcon
+            icon="eye-slash"
+            class="fa-scale-110 fa-old-padding"
+          />
+        </a>
       </div>
     </template>
     <template v-else>
@@ -56,7 +64,10 @@
         v-if="showPinned"
         class="pin"
       >
-        <i class="fa icon-pin faint" />
+        <FAIcon
+          icon="thumbtack"
+          class="faint"
+        />
         <span class="faint">{{ $t('status.pinned') }}</span>
       </div>
       <div
@@ -86,8 +97,9 @@
               :to="retweeterProfileLink"
             >{{ retweeter }}</router-link>
           </span>
-          <i
-            class="fa icon-retweet retweeted"
+          <FAIcon
+            icon="retweet"
+            class="repeat-icon"
             :title="$t('tool_tip.repeat')"
           />
           {{ $t('timeline.repeated') }}
@@ -167,15 +179,16 @@
                     :auto-update="60"
                   />
                 </router-link>
-                <div
+                <span
                   v-if="status.visibility"
-                  class="button-icon visibility-icon"
+                  class="visibility-icon"
+                  :title="status.visibility | capitalize"
                 >
-                  <i
-                    :class="visibilityIcon(status.visibility)"
-                    :title="status.visibility | capitalize"
+                  <FAIcon
+                    class="fa-scale-110 fa-old-padding"
+                    :icon="visibilityIcon(status.visibility)"
                   />
-                </div>
+                </span>
                 <a
                   v-if="!status.is_local && !isPreview"
                   :href="status.external_url"
@@ -183,22 +196,32 @@
                   class="source_url"
                   title="Source"
                 >
-                  <i class="button-icon icon-link-ext-alt" />
+                  <FAIcon
+                    class="fa-scale-110 fa-old-padding"
+                    icon="external-link-square-alt"
+                  />
+                </a>
+                <a
+                  v-if="expandable && !isPreview"
+                  href="#"
+                  title="Expand"
+                  @click.prevent="toggleExpanded"
+                >
+                  <FAIcon
+                    class="fa-scale-110 fa-old-padding"
+                    icon="plus-square"
+                  />
                 </a>
-                <template v-if="expandable && !isPreview">
-                  <a
-                    href="#"
-                    title="Expand"
-                    @click.prevent="toggleExpanded"
-                  >
-                    <i class="button-icon icon-plus-squared" />
-                  </a>
-                </template>
                 <a
                   v-if="unmuted"
                   href="#"
                   @click.prevent="toggleMute"
-                ><i class="button-icon icon-eye-off" /></a>
+                >
+                  <FAIcon
+                    icon="eye-slash"
+                    class="fa-scale-110 fa-old-padding"
+                  />
+                </a>
               </span>
             </div>
 
@@ -220,7 +243,11 @@
                     :aria-label="$t('tool_tip.reply')"
                     @click.prevent="gotoOriginal(status.in_reply_to_status_id)"
                   >
-                    <i class="button-icon reply-button icon-reply" />
+                    <FAIcon
+                      class="fa-scale-110 fa-old-padding"
+                      icon="reply"
+                      flip="horizontal"
+                    />
                     <span
                       class="faint-link reply-to-text"
                     >
@@ -348,7 +375,6 @@
               @onSuccess="clearError"
             />
           </div>
-
         </div>
       </div>
       <div