diff --git a/src/_includes/tests/stacked-inside-anchor.html b/src/_includes/tests/stacked-inside-anchor.html
index ba229d392..d034a9959 100644
--- a/src/_includes/tests/stacked-inside-anchor.html
+++ b/src/_includes/tests/stacked-inside-anchor.html
@@ -46,6 +46,10 @@
 </p>
 <p>
   <a href="#">
+    <span class="icon-stack">
+      <i class="icon-circle-blank icon-stack-base"></i>
+      <i class="icon-twitter"></i>
+    </span>
     Twitter Icon
   </a>
   <a href="#">
diff --git a/src/assets/font-awesome/less/extras.less b/src/assets/font-awesome/less/extras.less
index c71ac4d30..c93c260c8 100644
--- a/src/assets/font-awesome/less/extras.less
+++ b/src/assets/font-awesome/less/extras.less
@@ -12,6 +12,9 @@
   -webkit-animation: spin 2s infinite linear;
   animation: spin 2s infinite linear;
 }
+
+/* Prevent stack and spinners from being taken inline when inside a link */
+a .icon-stack,
 a .icon-spin {
   display: inline-block;
   text-decoration: none;
diff --git a/src/assets/font-awesome/scss/_extras.scss b/src/assets/font-awesome/scss/_extras.scss
index 9882cdc3c..9a25845d8 100644
--- a/src/assets/font-awesome/scss/_extras.scss
+++ b/src/assets/font-awesome/scss/_extras.scss
@@ -12,6 +12,9 @@
   -webkit-animation: spin 2s infinite linear;
   animation: spin 2s infinite linear;
 }
+
+/* Prevent stack and spinners from being taken inline when inside a link */
+a .icon-stack,
 a .icon-spin {
   display: inline-block;
   text-decoration: none;