diff --git a/build/_includes/tests/rotated-flipped.html b/build/_includes/tests/rotated-flipped.html
index 3e973a87d..a6620cd3f 100644
--- a/build/_includes/tests/rotated-flipped.html
+++ b/build/_includes/tests/rotated-flipped.html
@@ -1,6 +1,6 @@
-<i class="icon-shield"></i>&nbsp; normal<br>
-<i class="icon-shield icon-rotate-90"></i>&nbsp; icon-rotate-90<br>
-<i class="icon-shield icon-rotate-180"></i>&nbsp; icon-rotate-180<br>
-<i class="icon-shield icon-rotate-270"></i>&nbsp; icon-rotate-270<br>
-<i class="icon-shield icon-flip-horizontal"></i>&nbsp; icon-flip-horizontal<br>
-<i class="icon-shield icon-flip-vertical"></i>&nbsp; icon-flip-vertical
+<i class="icon-flag"></i>&nbsp; normal<br>
+<i class="icon-flag icon-rotate-90"></i>&nbsp; icon-rotate-90<br>
+<i class="icon-flag icon-rotate-180"></i>&nbsp; icon-rotate-180<br>
+<i class="icon-flag icon-rotate-270"></i>&nbsp; icon-rotate-270<br>
+<i class="icon-flag icon-flip-horizontal"></i>&nbsp; icon-flip-horizontal<br>
+<i class="icon-flag icon-flip-vertical"></i>&nbsp; icon-flip-vertical
diff --git a/build/assets/font-awesome/css/font-awesome.css b/build/assets/font-awesome/css/font-awesome.css
index e6efefec2..34fd78b12 100644
--- a/build/assets/font-awesome/css/font-awesome.css
+++ b/build/assets/font-awesome/css/font-awesome.css
@@ -255,17 +255,13 @@ ul.icons-ul > li .icon-li {
 .icon-stack [class*=" icon-"] {
   display: block;
   position: absolute;
-  width: inherit;
-  height: inherit;
+  width: 100%;
+  height: 100%;
   font-size: 1em;
   line-height: inherit;
 }
 .icon-stack .icon-stack-base {
-  display: block;
-  width: inherit;
-  height: inherit;
   font-size: 2em;
-  line-height: inherit;
 }
 /* Animated rotating icon */
 .icon-spin {
diff --git a/build/assets/font-awesome/less/mixins.less b/build/assets/font-awesome/less/mixins.less
index eeb52aec1..c4859435e 100644
--- a/build/assets/font-awesome/less/mixins.less
+++ b/build/assets/font-awesome/less/mixins.less
@@ -20,17 +20,13 @@
     [class*=" icon-"] {
       display: block;
       position: absolute;
-      width: inherit;
-      height: inherit;
+      width: 100%;
+      height: 100%;
       font-size: @top-font-size;
       line-height: inherit;
     }
     .icon-stack-base {
-      display: block;
-      width: inherit;
-      height: inherit;
       font-size: @base-font-size;
-      line-height: inherit;
     }
   }
 }