diff --git a/css/font-awesome.css b/css/font-awesome.css
index 9bb080889..bab2c2da4 100644
--- a/css/font-awesome.css
+++ b/css/font-awesome.css
@@ -5,7 +5,7 @@
   font-weight: normal;
   font-style: normal;
 }
-[class^="icon-"]:before {
+[class^="icon-"]:before, [class*=" icon-"]:before {
   font-family: FontAwesome;
   font-weight: normal;
   font-style: normal;
@@ -14,26 +14,26 @@
 .icon-large:before {
   font-size: 1.3333333333333333em;
 }
-.btn [class^="icon-"] {
+.btn [class^="icon-"], .btn [class*=" icon-"] {
   line-height: .9em;
 }
-li [class^="icon-"] {
+li [class^="icon-"], li [class*=" icon-"] {
   display: inline-block;
   width: 1.25em;
   text-align: center;
 }
-li .icon-large[class^="icon-"] {
+li .icon-large[class^="icon-"], li .icon-large[class*=" icon-"] {
   width: 1.875em;
 }
-li[class^="icon-"] {
+li[class^="icon-"], li[class*=" icon-"] {
   margin-left: 0;
   list-style-type: none;
 }
-li[class^="icon-"]:before {
+li[class^="icon-"]:before, li[class*=" icon-"]:before {
   text-indent: -2em;
   text-align: center;
 }
-li[class^="icon-"].icon-large:before {
+li[class^="icon-"].icon-large:before, li[class*=" icon-"].icon-large:before {
   text-indent: -1.3333333333333333em;
 }
 .icon-glass:before {
diff --git a/less/font-awesome.less b/less/font-awesome.less
index b57d484c6..310738231 100644
--- a/less/font-awesome.less
+++ b/less/font-awesome.less
@@ -15,7 +15,8 @@
 // -------------------------------------------
 // Font Awesome courtesy of Dave Gandy at fortaweso.me/font-awesome
 
-[class^="icon-"]:before {
+[class^="icon-"]:before,
+[class*=" icon-"]:before {
     font-family: FontAwesome;
     font-weight: normal;
     font-style: normal;
@@ -28,22 +29,28 @@
     font-size: 4/3em;
 }
 
-.btn [class^="icon-"] {
+.btn {
+    [class^="icon-"],
+    [class*=" icon-"] {
     line-height: .9em; // keeps button heights with and without icons the same
+    }
 }
 
 li {
-    [class^="icon-"] {
+    [class^="icon-"],
+    [class*=" icon-"] {
         display: inline-block;
         width: 1.25em;
         text-align: center;
     }
-    .icon-large[class^="icon-"] {
+    .icon-large[class^="icon-"],
+    .icon-large[class*=" icon-"]  {
         width: 1.5*1.25em; // 1.5 increased font size for icon-large * 1.25 width
     }
 }
 
-li[class^="icon-"] {
+li[class^="icon-"],
+li[class*=" icon-"] {
     margin-left: 0;
     list-style-type: none;
 
@@ -56,7 +63,7 @@ li[class^="icon-"] {
     }
 }
 
-// uses Unicode Private Use Area (PUA) to ensure screen readers do not read off
+// Uses Unicode Private Use Area (PUA) to ensure screen readers do not read off
 // random characters that represent icons
 .icon-glass:before              { content: "\f000"; }
 .icon-music:before              { content: "\f001"; }