diff --git a/build/_includes/examples/form-inputs.html b/build/_includes/examples/form-inputs.html
index 7b847176c..dcb39a8f2 100644
--- a/build/_includes/examples/form-inputs.html
+++ b/build/_includes/examples/form-inputs.html
@@ -5,11 +5,11 @@
       <form>
         <div class="input-prepend">
           <span class="add-on"><i class="icon-envelope"></i></span>
-          <input class="input-block-level" type="text" placeholder="Email address">
+          <input class="span2" type="text" placeholder="Email address">
         </div>
         <div class="input-prepend">
           <span class="add-on"><i class="icon-key"></i></span>
-          <input class="input-block-level" type="password" placeholder="Password">
+          <input class="span2" type="password" placeholder="Password">
         </div>
       </form>
     </div>
@@ -18,11 +18,11 @@
 <form>
   <div class="input-prepend">
     <span class="add-on"><i class="icon-envelope"></i></span>
-    <input class="input-block-level" type="text" placeholder="Email address">
+    <input class="span2" type="text" placeholder="Email address">
   </div>
   <div class="input-prepend">
     <span class="add-on"><i class="icon-key"></i></span>
-    <input class="input-block-level" type="password" placeholder="Password">
+    <input class="span2" type="password" placeholder="Password">
   </div>
 </form>
 {% endhighlight %}
diff --git a/build/_includes/examples/rotated-flipped.html b/build/_includes/examples/rotated-flipped.html
index 4ef40d634..cf061cd59 100644
--- a/build/_includes/examples/rotated-flipped.html
+++ b/build/_includes/examples/rotated-flipped.html
@@ -21,6 +21,9 @@
 <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
 {% endhighlight %}
+      <p class="alert alert-info">
+        <i class="icon-info-sign"></i> Rotating and flipping icons aren't yet supported in IE7.
+      </p>
     </div>
   </div>
 </section>
diff --git a/build/_includes/jumbotron-slider.html b/build/_includes/jumbotron-slider.html
index f3111c4cc..c1dc94eb5 100644
--- a/build/_includes/jumbotron-slider.html
+++ b/build/_includes/jumbotron-slider.html
@@ -28,17 +28,16 @@
           <div class="carousel-inner">
             <div class="active item"><div><i class="icon-flag"></i></div></div>
             <div class="item"><div><i class="icon-rocket"></i></div></div>
-            <div class="item"><div><i class="icon-crop"></i></div></div>
             <div class="item"><div><i class="icon-fire-extinguisher"></i></div></div>
+            <div class="item"><div><i class="icon-puzzle-piece"></i></div></div>
             <div class="item"><div><i class="icon-microphone"></i></div></div>
             <div class="item"><div><i class="icon-shield"></i></div></div>
             <div class="item"><div><i class="icon-star-half-empty"></i></div></div>
             <div class="item"><div><i class="icon-envelope"></i></div></div>
-            <div class="item"><div><i class="icon-coffee"></i></div></div>
             <div class="item"><div><i class="icon-medkit"></i></div></div>
             <div class="item"><div><i class="icon-book"></i></div></div>
+            <div class="item"><div><i class="icon-coffee"></i></div></div>
             <div class="item"><div><i class="icon-fighter-jet"></i></div></div>
-            <div class="item"><div><i class="icon-search"></i></div></div>
             <div class="item"><div><i class="icon-beer"></i></div></div>
             <div class="item"><div><i class="icon-heart-empty"></i></div></div>
             <div class="item"><div><i class="icon-thumbs-up"></i></div></div>
diff --git a/build/_includes/why.html b/build/_includes/why.html
index 0a5f39231..6ef74f414 100644
--- a/build/_includes/why.html
+++ b/build/_includes/why.html
@@ -33,7 +33,7 @@
       Designed from scratch to be fully compatible with <a href="{{ site.bootstrap.url }}">Bootstrap {{ site.bootstrap.version }}</a>.
     </div>
     <div class="span4">
-      <h4><i class="icon-crop"></i> Design Friendly</h4>
+      <h4><i class="icon-desktop"></i> Desktop Friendly</h4>
       To use on the desktop or for a complete set of vectors,
       check out the <a href="{{ page.relative_path }}cheatsheet/">cheatsheet</a>.
     </div>
diff --git a/build/assets/font-awesome/css/font-awesome-ie7.css b/build/assets/font-awesome/css/font-awesome-ie7.css
index 7402e8c64..c39ed623f 100644
--- a/build/assets/font-awesome/css/font-awesome-ie7.css
+++ b/build/assets/font-awesome/css/font-awesome-ie7.css
@@ -52,6 +52,14 @@
   margin-bottom: -5px;
   padding-bottom: 4px;
 }
+ul.icons-ul {
+  text-indent: -1em;
+  margin-left: 2.142857142857143em;
+}
+ul.icons-ul > li .icon-li {
+  width: 1em;
+  margin-right: 0;
+}
 .btn [class^="icon-"].pull-left,
 .btn [class*=" icon-"].pull-left,
 .btn [class^="icon-"].pull-right,
diff --git a/build/assets/font-awesome/css/font-awesome.css b/build/assets/font-awesome/css/font-awesome.css
index 98dc7df9f..8aa81a45b 100644
--- a/build/assets/font-awesome/css/font-awesome.css
+++ b/build/assets/font-awesome/css/font-awesome.css
@@ -27,7 +27,7 @@
 @font-face {
   font-family: 'FontAwesome';
   src: url('../font/fontawesome-webfont.eot?v=3.1.0');
-  src: url('../font/FontAwesome.otf') format('opentype');
+  src: url('../font/fontawesome-webfont.eot?#iefix&v=3.1.0') format('embedded-opentype'), url('../font/fontawesome-webfont.woff?v=3.1.0') format('woff'), url('../font/fontawesome-webfont.ttf?v=3.1.0') format('truetype');
   font-weight: normal;
   font-style: normal;
 }
diff --git a/build/assets/font-awesome/less/font-awesome-ie7.less b/build/assets/font-awesome/less/font-awesome-ie7.less
index ac0dcb6fe..8aaaee044 100644
--- a/build/assets/font-awesome/less/font-awesome-ie7.less
+++ b/build/assets/font-awesome/less/font-awesome-ie7.less
@@ -59,6 +59,19 @@
   }
 }
 
+ul.icons-ul {
+  text-indent: -1em;
+  margin-left: 30/14em;
+
+  > li {
+    .icon-li {
+      width: 1em;
+      margin-right: 0;
+    }
+  }
+}
+
+
 .btn {
   [class^="icon-"],
   [class*=" icon-"] {
diff --git a/build/assets/font-awesome/less/path.less b/build/assets/font-awesome/less/path.less
index 933120674..b080936f2 100644
--- a/build/assets/font-awesome/less/path.less
+++ b/build/assets/font-awesome/less/path.less
@@ -4,12 +4,12 @@
 @font-face {
   font-family: 'FontAwesome';
   src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=@{FontAwesomeVersion}');
-  //  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'),
-  //    url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'),
-  //    url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype');
-  //    url('@{FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=@{FontAwesomeVersion}') format('svg');
+  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'),
+    url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'),
+    url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype');
+//    url('@{FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=@{FontAwesomeVersion}') format('svg');
+//  src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype');
 
-  src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype');
 
   font-weight: normal;
   font-style: normal;