diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index cdf3a9daa..9b5ab6f01 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -40,6 +40,16 @@
     cursor: default;
   }
 
+  &::-moz-focus-inner {
+    border: 0;
+  }
+
+  &::-moz-focus-inner,
+  &:focus,
+  &:active {
+    outline: 0 !important;
+  }
+
   &.button-primary,
   &.button-alternative,
   &.button-secondary,
@@ -666,6 +676,16 @@
       background: lighten($action-button-color, 7%);
       text-decoration: none;
     }
+
+    &::-moz-focus-inner {
+      border: 0;
+    }
+
+    &::-moz-focus-inner,
+    &:focus,
+    &:active {
+      outline: 0 !important;
+    }
   }
 
   .status__content__text {
@@ -3899,6 +3919,10 @@ a.status-card {
     top: 10px;
     width: 48px;
   }
+
+  .status__content__spoiler-link {
+    color: lighten($ui-secondary-color, 8%);
+  }
 }
 
 .actions-modal {