diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 3b87a25c0e..ce828690ea 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 9f0420b5b1..d4d311b200 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1128,7 +1128,7 @@ table .span12 {
   width: 924px;
   margin-left: 0;
 }
-[class^="icon-"] {
+[class^="icon-"], [class*=" icon-"] {
   display: inline-block;
   width: 14px;
   height: 14px;
@@ -1139,7 +1139,7 @@ table .span12 {
   background-repeat: no-repeat;
   *margin-right: .3em;
 }
-[class^="icon-"]:last-child {
+[class^="icon-"]:last-child, [class*=" icon-"]:last-child {
   *margin-left: 0;
 }
 .icon-white {
diff --git a/docs/base-css.html b/docs/base-css.html
index ac260bffb0..c0ad882a52 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1515,10 +1515,6 @@ For example, <code>section</code> should be wrapped as inline.
 <i class="icon-search icon-white"></i>
 </pre>
       <p>There are 120 classes to choose from for your icons. Just add an <code>&lt;i&gt;</code> tag with the right classes and you're set. You can find the full list in <strong>sprites.less</strong> or right here in this document.</p>
-      <div class="alert alert-info">
-        <strong>Heads up!</strong>
-        The <code>.icon-</code> class must be listed first in the class tag for proper CSS targeting.
-      </div>
     </div>
     <div class="span4">
       <h3>Use cases</h3>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 0be4c1e342..750957beb7 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1439,10 +1439,6 @@
 &lt;i class="icon-search icon-white"&gt;&lt;/i&gt;
 </pre>
       <p>{{_i}}There are 120 classes to choose from for your icons. Just add an <code>&lt;i&gt;</code> tag with the right classes and you're set. You can find the full list in <strong>sprites.less</strong> or right here in this document.{{/i}}</p>
-      <div class="alert alert-info">
-        <strong>{{_i}}Heads up!{{/i}}</strong>
-        {{_i}}The <code>.icon-</code> class must be listed first in the class tag for proper CSS targeting.{{/i}}
-      </div>
     </div>
     <div class="span4">
       <h3>{{_i}}Use cases{{/i}}</h3>
diff --git a/less/sprites.less b/less/sprites.less
index ce76688443..a7741661ea 100644
--- a/less/sprites.less
+++ b/less/sprites.less
@@ -14,7 +14,8 @@
 // For the white version of the  icons, just add the .icon-white class:
 // <i class="icon-inbox icon-white"></i>
 
-[class^="icon-"] {
+[class^="icon-"],
+[class*=" icon-"] {
   display: inline-block;
   width: 14px;
   height: 14px;