diff --git a/css/font-awesome.css b/css/font-awesome.css
index 52bd4a967..a2603a619 100644
--- a/css/font-awesome.css
+++ b/css/font-awesome.css
@@ -30,13 +30,18 @@
 
 /*  Font Awesome styles
     ------------------------------------------------------- */
-[class^="icon-"]:before,
-[class*=" icon-"]:before {
-  font-family: FontAwesome;
-  font-weight: normal;
-  font-style: normal;
-  display: inline-block;
-  text-decoration: inherit; }
+[class^="icon-"],
+[class*=" icon-"] {
+  background: none;
+  width: auto;
+  line-height: 1; }
+  [class^="icon-"]:before,
+  [class*=" icon-"]:before {
+    font-family: FontAwesome;
+    font-weight: normal;
+    font-style: normal;
+    display: inline-block;
+    text-decoration: inherit; }
 
 a [class^="icon-"],
 a [class*=" icon-"] {
diff --git a/less/font-awesome.less b/less/font-awesome.less
index a53dd4c25..1e3466a95 100644
--- a/less/font-awesome.less
+++ b/less/font-awesome.less
@@ -36,13 +36,19 @@
 
 /*  Font Awesome styles
     ------------------------------------------------------- */
-[class^="icon-"]:before,
-[class*=" icon-"]:before {
-  font-family: FontAwesome;
-  font-weight: normal;
-  font-style: normal;
-  display: inline-block;
-  text-decoration: inherit;
+[class^="icon-"],
+[class*=" icon-"] {
+  background: none;
+  width: auto;
+  line-height: 1;
+  
+  &:before {
+    font-family: FontAwesome;
+    font-weight: normal;
+    font-style: normal;
+    display: inline-block;
+    text-decoration: inherit;
+  }
 }
 
 a [class^="icon-"],
diff --git a/sass/font-awesome.sass b/sass/font-awesome.sass
index 4a0fc4e99..050938c51 100644
--- a/sass/font-awesome.sass
+++ b/sass/font-awesome.sass
@@ -29,13 +29,18 @@ $font_path: "fontawesome-webfont" !default
 /*  Font Awesome styles
  *  -------------------------------------------------------
 
-[class^="icon-"]:before,
-[class*=" icon-"]:before
-  font-family: FontAwesome
-  font-weight: normal
-  font-style: normal
-  display: inline-block
-  text-decoration: inherit
+[class^="icon-"],
+[class*=" icon-"]
+  background: none
+  width: auto
+  line-height: 1
+  
+  &:before
+    font-family: FontAwesome
+    font-weight: normal
+    font-style: normal
+    display: inline-block
+    text-decoration: inherit
 
 a [class^="icon-"],
 a [class*=" icon-"]
diff --git a/sass/font-awesome.scss b/sass/font-awesome.scss
index 2eaf90e96..1c28fc261 100644
--- a/sass/font-awesome.scss
+++ b/sass/font-awesome.scss
@@ -37,13 +37,19 @@ $font_path: "fontawesome-webfont" !default;
 
 /*  Font Awesome styles
     ------------------------------------------------------- */
-[class^="icon-"]:before,
-[class*=" icon-"]:before {
-  font-family: FontAwesome;
-  font-weight: normal;
-  font-style: normal;
-  display: inline-block;
-  text-decoration: inherit;
+[class^="icon-"],
+[class*=" icon-"] {
+  background: none;
+  width: auto;
+  line-height: 1;
+  
+  &:before {
+    font-family: FontAwesome;
+    font-weight: normal;
+    font-style: normal;
+    display: inline-block;
+    text-decoration: inherit;
+  }
 }
 
 a [class^="icon-"],