diff --git a/sass/font-awesome.scss b/sass/font-awesome.scss
index 57c4fbdd3..dafddde44 100644
--- a/sass/font-awesome.scss
+++ b/sass/font-awesome.scss
@@ -106,21 +106,6 @@ $experimental-support-for-webkit: true !default;
   text-decoration: inherit;
   -webkit-font-smoothing: antialiased;
   
-  /*
-    Reset sprites.less.
-  */
-  @if $font-awesome-using-bootstrap {
-    display: inline;
-    width: auto;
-    height: auto;
-    line-height: normal;
-    vertical-align: baseline;
-    background-image: none;
-    background-position: 0% 0%;
-    background-repeat: repeat;
-    margin-top: 0;
-  }
-  
   /* Makes sure icons active on rollover in links. */
   a & {
     display: inline-block;
@@ -132,6 +117,46 @@ $experimental-support-for-webkit: true !default;
     display: inline-block;
     speak: none;
   }
+  
+  /*
+    Bootstrap element reset styles.
+  */
+  @if $font-awesome-using-bootstrap {
+    /* Reset sprites.less */
+    display: inline;
+    width: auto;
+    height: auto;
+    line-height: normal;
+    vertical-align: baseline;
+    background-image: none;
+    background-position: 0% 0%;
+    background-repeat: repeat;
+    margin-top: 0;
+    
+    /* Button reset styles. */
+    .btn &,
+    .nav & {
+      display: inline;
+      
+      /* Keeps button heights with and without icons the same. */
+      &.icon-large {
+        line-height: .9em;
+      }
+
+      &.icon-spin {
+        display: inline-block;
+      }
+    }
+    
+    /* Nav reset styles. */
+    .nav-tabs &,
+    .nav-pills & {
+      /* Keeps button heights with and without icons the same. */
+      &.icon-large {
+        line-height: .9em;
+      }
+    }
+  }
 }
 
 /*
@@ -155,33 +180,12 @@ $experimental-support-for-webkit: true !default;
   }
 }
 
-
-
-
 /* makes the font 33% larger relative to the icon container */
 .icon-large:before {
   vertical-align: -10%;
   font-size: 1.3333333333333333em;
 }
 
-.btn, .nav {
-  [class^="icon-"],
-  [class*=" icon-"] {
-    display: inline;
-    /* keeps button heights with and without icons the same */
-    &.icon-large { line-height: .9em; }
-    &.icon-spin { display: inline-block; }
-  }
-}
-
-.nav-tabs, .nav-pills {
-  [class^="icon-"],
-  [class*=" icon-"] {
-    /* keeps button heights with and without icons the same */
-    &, &.icon-large { line-height: .9em; }
-  }
-}
-
 li, .nav li {
   [class^="icon-"],
   [class*=" icon-"] {