diff --git a/src/_includes/footer.html b/src/_includes/footer.html
index 8631722be..7cdc852b0 100644
--- a/src/_includes/footer.html
+++ b/src/_includes/footer.html
@@ -3,7 +3,7 @@
     <div>
       <i class="fa fa-flag"></i> Font Awesome {{ site.fontawesome.version }}
       <span class="hide-xs">&middot;</span><br class="hide-sm hide-md hide-lg">
-      Created and Maintained by <a href="http://twitter.com/{{ site.fontawesome.author.twitter }}">Dave Gandy</a>
+      Created by <a href="http://twitter.com/{{ site.fontawesome.author.twitter }}">Dave Gandy</a>
     </div>
     <div>
       Font Awesome licensed under <a href="{{ site.fontawesome.license.font.url }}">{{ site.fontawesome.license.font.version }}</a>
@@ -16,9 +16,9 @@
       Thanks to <a href="http://maxcdn.com"><i class="fa fa-maxcdn"></i> MaxCDN</a> for providing the excellent <a href="http://www.bootstrapcdn.com/#fontawesome_tab">BootstrapCDN for Font Awesome</a>
     </div>
     <div class="project">
-      <a href="{{ page.relative_path }}3.2.1">Font Awesome 3.2.1 docs</a> &middot;
       <a href="{{ site.fontawesome.github.url }}">GitHub Project</a> &middot;
-      <a href="{{ site.fontawesome.github.url }}/issues">Issues</a>
+      <a href="{{ site.fontawesome.github.url }}/issues">Issues</a> &middot;
+      <a href="{{ page.relative_path }}3.2.1">Old 3.2.1 Docs</a>
     </div>
   </div>
 </footer>
diff --git a/src/_includes/jumbotron-carousel.html b/src/_includes/jumbotron-carousel.html
index 9330a8d89..49ef1cf9f 100644
--- a/src/_includes/jumbotron-carousel.html
+++ b/src/_includes/jumbotron-carousel.html
@@ -12,11 +12,12 @@
           </a>
         </div>
         <div class="shameless-self-promotion">
+          Version {{ site.fontawesome.version }} &nbsp;&nbsp;&middot;&nbsp;&nbsp;
           <a href="{{ site.fontawesome.github.url }}"
              onClick="_gaq.push(['_trackEvent', 'Outbound Link', 'View Project on GitHub']);">
             GitHub Project</a> &nbsp;&nbsp;&middot;&nbsp;&nbsp;
-          Version {{ site.fontawesome.version }} &nbsp;&nbsp;&middot;&nbsp;&nbsp;
-          Created &amp; Maintained by <a href="http://twitter.com/{{ site.fontawesome.author.twitter }}">Dave Gandy</a>
+          <a href="{{ page.relative_path }}3.2.1">Old 3.2.1 Docs</a> &nbsp;&nbsp;&middot;&nbsp;&nbsp;
+          Created by <a href="http://twitter.com/{{ site.fontawesome.author.twitter }}">Dave Gandy</a>
         </div>
       </div>
       <div class="col-md-4 col-sm-4">
diff --git a/src/assets/less/site/jumbotron-carousel.less b/src/assets/less/site/jumbotron-carousel.less
index 9f00083c1..ab7568aff 100644
--- a/src/assets/less/site/jumbotron-carousel.less
+++ b/src/assets/less/site/jumbotron-carousel.less
@@ -46,10 +46,10 @@
     margin-top: @buffer-lg;
     font-size: @font-size-base;
     line-height: @line-height-base;
-    color: mix(@jumbotron-color, @jumbotron-bg, 50%);
+    color: mix(@jumbotron-color, @jumbotron-bg, 60%);
     text-shadow: 0 1px 0 rgba(0,0,0,0.15);
     a {
-      color: mix(@jumbotron-color, @jumbotron-bg, 70%);
+      color: mix(@jumbotron-color, @jumbotron-bg, 80%);
       border-bottom: dotted 1px mix(@jumbotron-color, @jumbotron-bg, 50%);
       &:hover {
         color: @jumbotron-color;
diff --git a/src/test-2.3.2.html b/src/test-2.3.2.html
new file mode 100644
index 000000000..764f99cc7
--- /dev/null
+++ b/src/test-2.3.2.html
@@ -0,0 +1,824 @@
+---
+title: Font Awesome + Bootstrap 2.3.2 Test Cases
+relative_path: ../
+---
+
+
+<!DOCTYPE html>
+<!--[if lt IE 7 ]><html class="ie ie6" lang="en"> <![endif]-->
+<!--[if IE 7 ]><html class="ie ie7" lang="en"> <![endif]-->
+<!--[if IE 8 ]><html class="ie ie8" lang="en"> <![endif]-->
+<!--[if (gte IE 9)|!(IE)]><!-->
+<html lang="en" xmlns="http://www.w3.org/1999/html"> <!--<![endif]-->
+<head>
+  <!-- Basic Page Needs
+ ================================================== -->
+  <meta charset="utf-8" />
+  <title>{% if page.title %}{{ page.title }}{% endif %}</title>
+  <meta name="description" content="Font Awesome, the iconic font designed for Bootstrap">
+  <meta name="author" content="Dave Gandy">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <!--<meta name="viewport" content="initial-scale=1; maximum-scale=1">-->
+
+  <!--[if lt IE 9]>
+  <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+  <![endif]-->
+
+  <!-- CSS
+ ================================================== -->
+
+  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/2.3.2/css/bootstrap.min.css">
+  <link rel="stylesheet" href="{{ page.relative_path }}assets/font-awesome/css/font-awesome.css">
+  <!-- Le fav and touch icons -->
+  <link rel="shortcut icon" href="{{ page.relative_path }}assets/ico/favicon.ico">
+
+  <script type="text/javascript" src="//use.typekit.net/wnc7ioh.js"></script>
+  <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
+
+  <script type="text/javascript">
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', 'UA-30136587-1']);
+    _gaq.push(['_trackPageview']);
+
+    (function() {
+      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    })();
+  </script>
+</head>
+<body data-spy="scroll" data-target=".navbar">
+<div class="wrapper"> <!-- necessary for sticky footer. wrap all content except footer -->
+
+<section class="container">
+<h1 class="page-header">Visual Test Cases</h1>
+
+<h3>Icons <small>Icons should have proper alignment and not be clipped</small></h3>
+<div class="row-fluid">
+  <div class="span3">
+    <div class="well">
+      <i class="fa fa-building"></i> Building
+    </div>
+  </div>
+  <div class="span3">
+    <div class="well">
+      <i class="fa fa-building fa-lg"></i> Building Large
+    </div>
+  </div>
+  <div class="span3">
+    <i class="fa fa-building"></i> Building
+  </div>
+  <div class="span3">
+    <i class="fa fa-building fa-lg"></i> Building Large
+  </div>
+</div>
+<div class="row-fluid" style="font-size: 24px; line-height: 1.5em;">
+  <div class="span4">
+    <div class="well">
+      <i class="fa fa-building"></i> Building
+    </div>
+  </div>
+  <div class="span4">
+    <div class="well">
+      <i class="fa fa-building fa-lg"></i> Building Large
+    </div>
+  </div>
+  <div class="span4">
+    <i class="fa fa-building fa-lg"></i> Building Large
+  </div>
+</div>
+<div class="row-fluid">
+  <div class="span3">
+    <div class="well">
+      <i class="fa fa-circle"></i> Circle
+    </div>
+  </div>
+  <div class="span3">
+    <div class="well">
+      <i class="fa fa-circle fa-lg"></i> Circle Large
+    </div>
+  </div>
+  <div class="span3">
+    <i class="fa fa-circle"></i> Circle
+  </div>
+  <div class="span3">
+    <i class="fa fa-circle fa-lg"></i> Circle Large
+  </div>
+</div>
+<div class="row-fluid" style="font-size: 24px; line-height: 1.5em;">
+  <div class="span4">
+    <div class="well">
+      <i class="fa fa-circle"></i> Circle
+    </div>
+  </div>
+  <div class="span4">
+    <div class="well">
+      <i class="fa fa-circle fa-lg"></i> Circle Large
+    </div>
+  </div>
+  <div class="span4">
+    <i class="fa fa-circle fa-lg"></i> Circle Large
+  </div>
+</div>
+
+
+<h3>Links with Icons <small>icon should activate link & NOT underline</small></h3>
+<div class="row-fluid lead">
+  <div class="span2">
+    <a href="#"><i class="fa fa-building padding-right"></i> Link Here</a>
+  </div>
+  <div class="span2">
+    <a href="#"><i class="fa fa-building fa-lg padding-right"></i> Link Here</a>
+  </div>
+  <div class="span2">
+    <a href="#"><i class="fa fa-caret-down padding-right"></i> Link Here</a>
+  </div>
+  <div class="span2">
+    <a href="#">Link Here <i class="fa fa-angle-double-right padding-left"></i></a>
+  </div>
+  <div class="span2">
+    <a href="#">Link Here <i class="fa fa-angle-double-right fa-lg padding-left"></i></a>
+  </div>
+  <div class="span2">
+    <a href="#">Link Here <i class="fa fa-caret-down padding-left"></i></a>
+  </div>
+</div>
+<div class="row-fluid">
+  <div class="span2">
+    <a href="#"><i class="fa fa-building padding-right-sm"></i> Link Here</a>
+  </div>
+  <div class="span2">
+    <a href="#"><i class="fa fa-building fa-lg padding-right-sm"></i> Link Here</a>
+  </div>
+  <div class="span2">
+    <a href="#"><i class="fa fa-caret-down padding-right-sm"></i> Link Here</a>
+  </div>
+  <div class="span2">
+    <a href="#">Link Here <i class="fa fa-angle-double-right padding-left-sm"></i></a>
+  </div>
+  <div class="span2">
+    <a href="#">Link Here <i class="fa fa-angle-double-right fa-lg padding-left-sm"></i></a>
+  </div>
+  <div class="span2">
+    <a href="#">Link Here <i class="fa fa-caret-down padding-left-sm"></i></a>
+  </div>
+</div>
+
+
+<h3>Navbar  <small>should stay same height </small></h3>
+<div class="navbar navbar-inverse navbar-static-top">
+  <div class="navbar-inner">
+    <div class="container">
+      <a class="brand" href="#"><i class="fa fa-flag"></i> Font Awesome</a>
+      <ul class="nav">
+        <li style="border: solid 1px white;"><a href="#">Nav Item 1</a></li>
+        <li class="dropdown" style="border: solid 1px white;">
+          <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">
+            Nav Item 2
+            <i class="fa fa-caret-down"></i>
+          </a>
+          <ul class="dropdown-menu" role="menu">
+            <li><a href="#"><i class="fa fa-building"></i> Menu Item 1</a></li>
+            <li><a href="#"><i class="fa fa-building fa fa-lg"></i> Menu Item 2</a></li>
+          </ul>
+        </li>
+        <li style="border: solid 1px white;"><a href="#examples"><i class="fa fa-building fa fa-lg"></i> Nav Item 3</a></li>
+        <li style="border: solid 1px white;"><a href="#examples"><i class="fa fa-envelope-o"></i> Nav Item 4</a></li>
+        <li style="border: solid 1px white;"><a href="#examples"><i class="fa fa-circle fa fa-lg"></i> Nav Item 5</a></li>
+        <li style="border: solid 1px white;"><a href="#examples"><i class="fa fa-circle"></i> Nav Item 6</a></li>
+      </ul>
+    </div>
+  </div>
+</div>
+
+
+<h3>Plain buttons next to buttons w/icons <small>should be same height, icons not clipped</small></h3>
+<h4>Buttons</h4>
+<div class="row-fluid">
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3; text-align: center;">
+      <div>
+        <button class="btn btn-default btn-mini">Button</button>
+        <button class="btn btn-default btn-mini"><i class="fa fa-building"></i> Button</button>
+        <button class="btn btn-default btn-mini"><i class="fa fa-building"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default btn-small">Button</button>
+        <button class="btn btn-default btn-small"><i class="fa fa-building"></i> Button</button>
+        <button class="btn btn-default btn-small"><i class="fa fa-building"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default">Button</button>
+        <button class="btn btn-default"><i class="fa fa-building"></i> Button</button>
+        <button class="btn btn-default"><i class="fa fa-building"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default btn-large">Button</button>
+        <button class="btn btn-default btn-large"><i class="fa fa-building"></i> Button</button>
+        <button class="btn btn-default btn-large"><i class="fa fa-building"></i></button>
+      </div>
+    </div>
+  </div>
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3; text-align: center;">
+      <div>
+        <button class="btn btn-default btn-mini">Button</button>
+        <button class="btn btn-default btn-mini"><i class="fa fa-building fa-lg"></i> Button</button>
+        <button class="btn btn-default btn-mini"><i class="fa fa-building fa-lg"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default btn-small">Button</button>
+        <button class="btn btn-default btn-small"><i class="fa fa-building fa-lg"></i> Button</button>
+        <button class="btn btn-default btn-small"><i class="fa fa-building fa-lg"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default">Button</button>
+        <button class="btn btn-default"><i class="fa fa-building fa-lg"></i> Button</button>
+        <button class="btn btn-default"><i class="fa fa-building fa-lg"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default btn-large">Button</button>
+        <button class="btn btn-default btn-large"><i class="fa fa-building fa-lg"></i> Button</button>
+        <button class="btn btn-default btn-large"><i class="fa fa-building fa-lg"></i></button>
+      </div>
+    </div>
+  </div>
+</div>
+<div class="row-fluid">
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3; text-align: center;">
+      <div>
+        <button class="btn btn-default btn-mini">Button</button>
+        <button class="btn btn-default btn-mini"><i class="fa fa-circle"></i> Button</button>
+        <button class="btn btn-default btn-mini"><i class="fa fa-circle"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default btn-small">Button</button>
+        <button class="btn btn-default btn-small"><i class="fa fa-circle"></i> Button</button>
+        <button class="btn btn-default btn-small"><i class="fa fa-circle"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default">Button</button>
+        <button class="btn btn-default"><i class="fa fa-circle"></i> Button</button>
+        <button class="btn btn-default"><i class="fa fa-circle"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default btn-large">Button</button>
+        <button class="btn btn-default btn-large"><i class="fa fa-circle"></i> Button</button>
+        <button class="btn btn-default btn-large"><i class="fa fa-circle"></i></button>
+      </div>
+    </div>
+  </div>
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3; text-align: center;">
+      <div>
+        <button class="btn btn-default btn-mini">Button</button>
+        <button class="btn btn-default btn-mini"><i class="fa fa-circle fa-lg"></i> Button</button>
+        <button class="btn btn-default btn-mini"><i class="fa fa-circle fa-lg"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default btn-small">Button</button>
+        <button class="btn btn-default btn-small"><i class="fa fa-circle fa-lg"></i> Button</button>
+        <button class="btn btn-default btn-small"><i class="fa fa-circle fa-lg"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default">Button</button>
+        <button class="btn btn-default"><i class="fa fa-circle fa-lg"></i> Button</button>
+        <button class="btn btn-default"><i class="fa fa-circle fa-lg"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default btn-large">Button</button>
+        <button class="btn btn-default btn-large"><i class="fa fa-circle fa-lg"></i> Button</button>
+        <button class="btn btn-default btn-large"><i class="fa fa-circle fa-lg"></i></button>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<h4>Anchors</h4>
+<div class="row-fluid">
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3; text-align: center;">
+      <div>
+        <a class="btn btn-default btn-mini">Button</a>
+        <a class="btn btn-default btn-mini"><i class="fa fa-building"></i> Button</a>
+        <a class="btn btn-default btn-mini"><i class="fa fa-building"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default btn-small">Button</a>
+        <a class="btn btn-default btn-small"><i class="fa fa-building"></i> Button</a>
+        <a class="btn btn-default btn-small"><i class="fa fa-building"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default">Button</a>
+        <a class="btn btn-default"><i class="fa fa-building"></i> Button</a>
+        <a class="btn btn-default"><i class="fa fa-building"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default btn-large">Button</a>
+        <a class="btn btn-default btn-large"><i class="fa fa-building"></i> Button</a>
+        <a class="btn btn-default btn-large"><i class="fa fa-building"></i></a>
+      </div>
+    </div>
+  </div>
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3; text-align: center;">
+      <div>
+        <a class="btn btn-default btn-mini">Button</a>
+        <a class="btn btn-default btn-mini"><i class="fa fa-building fa-lg"></i> Button</a>
+        <a class="btn btn-default btn-mini"><i class="fa fa-building fa-lg"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default btn-small">Button</a>
+        <a class="btn btn-default btn-small"><i class="fa fa-building fa-lg"></i> Button</a>
+        <a class="btn btn-default btn-small"><i class="fa fa-building fa-lg"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default">Button</a>
+        <a class="btn btn-default"><i class="fa fa-building fa-lg"></i> Button</a>
+        <a class="btn btn-default"><i class="fa fa-building fa-lg"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default btn-large">Button</a>
+        <a class="btn btn-default btn-large"><i class="fa fa-building fa-lg"></i> Button</a>
+        <a class="btn btn-default btn-large"><i class="fa fa-building fa-lg"></i></a>
+      </div>
+    </div>
+  </div>
+</div>
+<div class="row-fluid">
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3; text-align: center;">
+      <div>
+        <a class="btn btn-default btn-mini">Button</a>
+        <a class="btn btn-default btn-mini"><i class="fa fa-circle"></i> Button</a>
+        <a class="btn btn-default btn-mini"><i class="fa fa-circle"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default btn-small">Button</a>
+        <a class="btn btn-default btn-small"><i class="fa fa-circle"></i> Button</a>
+        <a class="btn btn-default btn-small"><i class="fa fa-circle"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default">Button</a>
+        <a class="btn btn-default"><i class="fa fa-circle"></i> Button</a>
+        <a class="btn btn-default"><i class="fa fa-circle"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default btn-large">Button</a>
+        <a class="btn btn-default btn-large"><i class="fa fa-circle"></i> Button</a>
+        <a class="btn btn-default btn-large"><i class="fa fa-circle"></i></a>
+      </div>
+    </div>
+  </div>
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3; text-align: center;">
+      <div>
+        <a class="btn btn-default btn-mini">Button</a>
+        <a class="btn btn-default btn-mini"><i class="fa fa-circle fa-lg"></i> Button</a>
+        <a class="btn btn-default btn-mini"><i class="fa fa-circle fa-lg"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default btn-small">Button</a>
+        <a class="btn btn-default btn-small"><i class="fa fa-circle fa-lg"></i> Button</a>
+        <a class="btn btn-default btn-small"><i class="fa fa-circle fa-lg"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default">Button</a>
+        <a class="btn btn-default"><i class="fa fa-circle fa-lg"></i> Button</a>
+        <a class="btn btn-default"><i class="fa fa-circle fa-lg"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default btn-large">Button</a>
+        <a class="btn btn-default btn-large"><i class="fa fa-circle fa-lg"></i> Button</a>
+        <a class="btn btn-default btn-large"><i class="fa fa-circle fa-lg"></i></a>
+      </div>
+    </div>
+  </div>
+</div>
+
+<h3>Button groups <small>should be same height</small></h3>
+<div class="row-fluid">
+  <div class="span4">
+    <div style="border: solid 1px #d3d3d3;">
+      <div class="btn-group">
+        <button class="btn btn-default btn-large">
+          <i class="fa fa-adjust"></i>
+        </button>
+        <button class="btn btn-default btn-large">
+          Text
+        </button>
+      </div>
+    </div>
+  </div>
+  <div class="span4">
+    <div style="border: solid 1px #d3d3d3;">
+      <div class="btn-group">
+        <button class="btn btn-default">
+          <i class="fa fa-adjust"></i>
+        </button>
+        <button class="btn btn-default">
+          Text
+        </button>
+      </div>
+    </div>
+  </div>
+  <div class="span4">
+    <div style="border: solid 1px #d3d3d3;">
+      <div class="btn-group">
+        <button class="btn btn-default btn-small">
+          <i class="fa fa-adjust"></i>
+        </button>
+        <button class="btn btn-default btn-small">
+          Text
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
+
+<h3>Buttons with pulled 2x, 3x, 4x <small>should be same height, have correct line height</small></h3>
+<div class="row-fluid">
+  <div class="span4">
+    <div style="border: solid 1px #d3d3d3;">
+      <a class="btn btn-default btn-large" href="#">
+        <i class="fa fa-github fa-2x pull-left"></i>
+        Longer<br>Button</a>
+      <a class="btn btn-default btn-large" href="#">
+        Longer<br>Button</a>
+    </div>
+  </div>
+  <div class="span4">
+    <div style="border: solid 1px #d3d3d3;">
+      <a class="btn btn-default" href="#">
+        <i class="fa fa-github fa-2x pull-left"></i>
+        Longer<br>Button</a>
+      <a class="btn btn-default" href="#">
+        Longer<br>Button</a>
+    </div>
+  </div>
+  <div class="span4">
+    <div style="border: solid 1px #d3d3d3;">
+      <a class="btn btn-default btn-small" href="#">
+        <i class="fa fa-github fa-2x pull-left"></i>
+        Longer<br>Button</a>
+      <a class="btn btn-default btn-small" href="#">
+        Longer<br>Button</a>
+    </div>
+  </div>
+</div>
+
+
+<h3>Nav pills & nav tabs <small>should be same height and properly vertically aligned</small></h3>
+<div class="row-fluid">
+  <div class="span9">
+    <ul class="nav nav-pills" style="border: solid 1px #d3d3d3;">
+      <li class="active"><a href="#">Nav Item 1</a></li>
+      <li class="dropdown active">
+        <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">
+          Nav Item 2
+          <i class="fa fa-caret-down"></i>
+        </a>
+        <ul class="dropdown-menu" role="menu">
+          <li><a href="#"><i class="fa fa-building"></i> Menu Item 1</a></li>
+          <li><a href="#"><i class="fa fa-building fa-lg"></i> Menu Item 2</a></li>
+        </ul>
+      </li>
+      <li class="dropdown active">
+        <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">
+          Nav Item 3
+          <i class="fa fa-caret-down"></i>
+        </a>
+        <ul class="dropdown-menu" role="menu">
+          <li><a href="#"><i class="fa fa-building"></i> Menu Item 1</a></li>
+          <li><a href="#"><i class="fa fa-building fa-lg"></i> Menu Item 2</a></li>
+        </ul>
+      </li>
+      <li class="active"><a href="#examples"><i class="fa fa-building fa-lg"></i> Nav Item 4</a></li>
+      <li class="active"><a href="#examples"><i class="fa fa-spinner fa-spin"></i> Nav Item 5</a></li>
+      <li class="active"><a href="#examples"><i class="fa fa-circle fa-lg"></i> Nav Item 6</a></li>
+      <li class="active"><a href="#examples"><i class="fa fa-circle"></i> Nav Item 7</a></li>
+    </ul>
+    <ul class="nav nav-tabs">
+      <li class="active"><a href="#">Nav Item 1</a></li>
+      <li class="dropdown active">
+        <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">
+          Nav Item 2
+          <i class="fa fa-caret-down"></i>
+        </a>
+        <ul class="dropdown-menu" role="menu">
+          <li><a href="#"><i class="fa fa-building"></i> Menu Item 1</a></li>
+          <li><a href="#"><i class="fa fa-building fa-lg"></i> Menu Item 2</a></li>
+        </ul>
+      </li>
+      <li class="dropdown active">
+        <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">
+          Nav Item 3
+          <i class="fa fa-caret-down"></i>
+        </a>
+        <ul class="dropdown-menu" role="menu">
+          <li><a href="#"><i class="fa fa-building"></i> Menu Item 1</a></li>
+          <li><a href="#"><i class="fa fa-building fa-lg"></i> Menu Item 2</a></li>
+        </ul>
+      </li>
+      <li class="active"><a href="#examples"><i class="fa fa-building fa-lg"></i> Nav Item 4</a></li>
+      <li class="active"><a href="#examples"><i class="fa fa-spinner fa-spin"></i> Nav Item 5</a></li>
+      <li class="active"><a href="#examples"><i class="fa fa-circle fa-lg"></i> Nav Item 6</a></li>
+      <li class="active"><a href="#examples"><i class="fa fa-circle"></i> Nav Item 7</a></li>
+    </ul>
+  </div>
+  <div class="span3">
+    <ul class="nav nav-list">
+      <li>
+        <a href="#c1">
+          <i class="fa fa-chevron-right fa fa-fw pull-right"></i> Overview
+        </a>
+      </li>
+      <li>
+        <a href="#c1">
+          Overview
+          <i class="fa fa-chevron-right fa fa-fw pull-right"></i>
+        </a>
+      </li>
+    </ul>
+  </div>
+</div>
+
+<h3>Hide class directly on icons</h3>
+<div class="row-fluid">
+  <div class="span6">
+    <div class="well">
+      <i class="hide fa fa-circle"></i> Icon should be hidden
+    </div>
+  </div>
+  <div class="span6">
+    <i class="hide fa fa-circle"></i> Icon should be hidden
+  </div>
+</div>
+
+
+<h3>2x, 3x, 4x icons in text <small>should have margins next to and below text</small></h3>
+<div class="row-fluid">
+  <div class="span6">
+    <p class="lead">
+      <i class="fa fa-stethoscope fa-3x pull-left fa-border"></i>
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
+    </p>
+  </div>
+  <div class="span6">
+    <p class="lead">
+      <i class="fa fa-ambulance fa-4x pull-right fa-border"></i>
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
+    </p>
+  </div>
+</div>
+<div class="row-fluid">
+  <div class="span4">
+    <i class="fa fa-building fa-2x pull-left fa-border"></i>
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
+  </div>
+  <div class="span4">
+    <i class="fa fa-stethoscope fa-3x pull-right fa-border"></i>
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
+  </div>
+  <div class="span4">
+    <i class="fa fa-ambulance fa-4x pull-left"></i>
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
+  </div>
+</div>
+
+
+<h3>Bullets <small>should wrap appropriately, have proper spacing</small></h3>
+<div class="row-fluid">
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3;">
+      <ul class="fa-ul">
+        <li><i class="fa-li fa fa-angle-double-right"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+        <li><i class="fa-li fa fa-arrow-right"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
+        <li><i class="fa-li fa fa-building"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+          <i class="fa fa-building"></i>
+          <span class="label label-default">foo</span>
+          <a class="btn btn-default btn-mini">foo</a>
+        </li>
+      </ul>
+    </div>
+  </div>
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3;">
+      <ul class="fa-ul">
+        <li><i class="fa-li fa fa-angle-double-right fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+        <li><i class="fa-li fa fa-arrow-right fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
+        <li><i class="fa-li fa fa-building fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+          <i class="fa fa-building"></i>
+          <span class="label label-default">foo</span>
+          <a class="btn btn-default btn-mini">foo</a>
+        </li>
+      </ul>
+    </div>
+  </div>
+</div>
+<div class="row-fluid">
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3;">
+      <ul class="fa-ul lead">
+        <li><i class="fa-li fa fa-angle-double-right"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+        <li><i class="fa-li fa fa-arrow-right"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
+        <li><i class="fa-li fa fa-building"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+      </ul>
+    </div>
+  </div>
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3;">
+      <ul class="fa-ul lead">
+        <li><i class="fa-li fa fa-angle-double-right fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+        <li><i class="fa-li fa fa-arrow-right fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
+        <li><i class="fa-li fa fa-building fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+      </ul>
+    </div>
+  </div>
+</div>
+<div class="row-fluid">
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3;">
+      <ul class="fa-ul">
+        <li><a href="#"><i class="fa-li fa fa-angle-double-right"></i></a>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+        <li><a href="#"><i class="fa-li fa fa-arrow-right"></i></a>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
+        <li><a href="#"><i class="fa-li fa fa-building"></i></a>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+      </ul>
+    </div>
+  </div>
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3;">
+      <ul class="fa-ul">
+        <li><a href="#"><i class="fa-li fa fa-angle-double-right fa-lg"></i></a>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+        <li><a href="#"><i class="fa-li fa fa-arrow-right fa-lg"></i></a>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
+        <li><a href="#"><i class="fa-li fa fa-building fa-lg"></i></a>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+      </ul>
+    </div>
+  </div>
+</div>
+<div class="row-fluid">
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3;">
+      <ul class="fa-ul">
+        <li><i class="fa-li fa fa-refresh fa-spin"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+        <li><i class="fa-li fa fa-spinner fa-spin"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
+        <li><i class="fa-li fa fa-spinner fa-spin"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+          <i class="fa fa-building"></i>
+          <span class="label label-default">foo</span>
+          <a class="btn btn-default btn-mini">foo</a>
+        </li>
+      </ul>
+    </div>
+  </div>
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3;">
+      <ul class="fa-ul">
+        <li><i class="fa-li fa fa-refresh fa-spin fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+        <li><i class="fa-li fa fa-spinner fa-spin fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
+        <li><i class="fa-li fa fa-spinner fa-spin fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+          <i class="fa fa-building"></i>
+          <span class="label label-default">foo</span>
+          <a class="btn btn-default btn-mini">foo</a>
+        </li>
+      </ul>
+    </div>
+  </div>
+</div>
+
+
+<div class="row-fluid">
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3;">
+      <ul>
+        <li>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+        <li>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
+        <li>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+      </ul>
+    </div>
+  </div>
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3;">
+      <ul>
+        <li>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+        <li>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
+        <li>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+      </ul>
+    </div>
+  </div>
+</div>
+
+
+<h3>Spinning icons <small>icons should be aligned well and on center, buttons should be same height, won't work in ie7</small></h3>
+<div style="border: solid 1px #d3d3d3;">
+  <i class="fa fa-refresh fa-spin"></i> Loading...
+  <button class="btn btn-default btn-small"><i class="fa fa-refresh fa-spin"></i> Loading...</button>
+  <button class="btn btn-default btn-small">Loading...</button>
+  <i class="fa fa-circle-o fa-spin"></i> Loading...
+  <button class="btn btn-default btn-small"><i class="fa fa-circle-o fa-spin"></i> Loading...</button>
+  <a href="#"><i class="fa fa-refresh fa-spin"></i> Loading...</a>
+</div>
+<div style="border: solid 1px #d3d3d3;">
+  <i class="fa fa-refresh fa-spin"></i> Loading...
+  <button class="btn btn-default"><i class="fa fa-refresh fa-spin"></i> Loading...</button>
+  <button class="btn btn-default">Loading...</button>
+  <i class="fa fa-circle-o fa-spin"></i> Loading...
+  <button class="btn btn-default"><i class="fa fa-circle-o fa-spin"></i> Loading...</button>
+</div>
+<div style="border: solid 1px #d3d3d3;">
+  <i class="fa fa-spinner fa-spin"></i> Loading...
+  <button class="btn btn-default btn-large"><i class="fa fa-spinner fa-spin"></i> Loading...</button>
+  <button class="btn btn-default btn-large">Loading...</button>
+  <i class="fa fa-circle-o fa-spin"></i> Loading...
+  <button class="btn btn-default btn-large"><i class="fa fa-circle-o fa-spin"></i> Loading...</button>
+</div>
+<h4>fa-lg</h4>
+<div style="border: solid 1px #d3d3d3;">
+  <i class="fa fa-refresh fa-lg fa-spin"></i> Loading...
+  <button class="btn btn-default btn-small"><i class="fa fa-refresh fa-lg fa-spin"></i> Loading...</button>
+  <button class="btn btn-default btn-small">Loading...</button>
+  <i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...
+  <button class="btn btn-default btn-small"><i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...</button>
+</div>
+<div style="border: solid 1px #d3d3d3;">
+  <i class="fa fa-refresh fa-lg fa-spin"></i> Loading...
+  <button class="btn btn-default"><i class="fa fa-refresh fa-lg fa-spin"></i> Loading...</button>
+  <button class="btn btn-default">Loading...</button>
+  <i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...
+  <button class="btn btn-default"><i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...</button>
+</div>
+<div style="border: solid 1px #d3d3d3;">
+  <i class="fa fa-spinner fa-lg fa-spin"></i> Loading...
+  <button class="btn btn-default btn-large"><i class="fa fa-spinner fa-lg fa-spin"></i> Loading...</button>
+  <button class="btn btn-default btn-large">Loading...</button>
+  <i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...
+  <button class="btn btn-default btn-large"><i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...</button>
+</div>
+<h4>Bootstrap Prepend and Append</h4>
+<div class="row">
+  <div class="span6">
+    <div class="input-prepend">
+      <span class="add-on"><i class="fa fa-spinner fa fa-spin"></i></span>
+      <input class="span2" id="prependedInput" type="text" placeholder="Username">
+    </div>
+  </div>
+  <div class="span6">
+    <div class="input-append">
+      <input class="span2" id="appendedInput" type="text">
+      <span class="add-on"><i class="fa fa-spinner fa fa-spin"></i></span>
+    </div>
+  </div>
+</div>
+<h3>Stacked icons</h3>
+<div class="well">
+  {% include tests/stacked.html %}
+</div>
+<div class="well lead">
+  {% include tests/stacked.html %}
+</div>
+<h4>Stacked icons inside anchor</h4>
+<div class="well">
+  {% include tests/stacked-inside-anchor.html %}
+</div>
+
+
+<h3>Mirrored and rotated icons</h3>
+<div class="row-fluid">
+  <div class="span6">
+    <div class="well">
+      {% include tests/rotated-flipped.html %}
+    </div>
+  </div>
+  <div class="span6">
+    <div class="well lead">
+      {% include tests/rotated-flipped.html %}
+    </div>
+  </div>
+</div>
+<h4>Mirrored and rotated icons inside anchors and buttons</h4>
+<div class="row-fluid">
+  <div class="span6">
+    <div class="well">
+      {% include tests/rotated-flipped-inside-anchor.html %}
+    </div>
+  </div>
+  <div class="span6">
+    <div class="well">
+      {% include tests/rotated-flipped-inside-btn.html %}
+    </div>
+  </div>
+</div>
+
+</section>
+
+<div class="push"><!-- necessary for sticky footer --></div>
+</div>
+
+<script src="http://code.jquery.com/jquery-1.7.1.min.js"></script>
+<script src="//netdna.bootstrapcdn.com/bootstrap/2.3.2/js/bootstrap.min.js"></script>
+
+</body>
+</html>
+
+
diff --git a/src/test.html b/src/test.html
index 1dd1f5c16..836bd1c03 100644
--- a/src/test.html
+++ b/src/test.html
@@ -662,45 +662,45 @@ relative_path: ../
     <i class="fa fa-refresh fa-spin"></i> Loading...
     <button class="btn btn-default btn-sm"><i class="fa fa-refresh fa-spin"></i> Loading...</button>
     <button class="btn btn-default btn-sm">Loading...</button>
-    <i class="fa fa-circle-blank fa-spin"></i> Loading...
-    <button class="btn btn-default btn-sm"><i class="fa fa-circle-blank fa-spin"></i> Loading...</button>
+    <i class="fa fa-circle-o fa-spin"></i> Loading...
+    <button class="btn btn-default btn-sm"><i class="fa fa-circle-o fa-spin"></i> Loading...</button>
     <a href="#"><i class="fa fa-refresh fa-spin"></i> Loading...</a>
   </div>
   <div style="border: solid 1px #d3d3d3;">
     <i class="fa fa-refresh fa-spin"></i> Loading...
     <button class="btn btn-default"><i class="fa fa-refresh fa-spin"></i> Loading...</button>
     <button class="btn btn-default">Loading...</button>
-    <i class="fa fa-circle-blank fa-spin"></i> Loading...
-    <button class="btn btn-default"><i class="fa fa-circle-blank fa-spin"></i> Loading...</button>
+    <i class="fa fa-circle-o fa-spin"></i> Loading...
+    <button class="btn btn-default"><i class="fa fa-circle-o fa-spin"></i> Loading...</button>
   </div>
   <div style="border: solid 1px #d3d3d3;">
     <i class="fa fa-spinner fa-spin"></i> Loading...
     <button class="btn btn-default btn-lg"><i class="fa fa-spinner fa-spin"></i> Loading...</button>
     <button class="btn btn-default btn-lg">Loading...</button>
-    <i class="fa fa-circle-blank fa-spin"></i> Loading...
-    <button class="btn btn-default btn-lg"><i class="fa fa-circle-blank fa-spin"></i> Loading...</button>
+    <i class="fa fa-circle-o fa-spin"></i> Loading...
+    <button class="btn btn-default btn-lg"><i class="fa fa-circle-o fa-spin"></i> Loading...</button>
   </div>
   <h4>fa-lg</h4>
   <div style="border: solid 1px #d3d3d3;">
     <i class="fa fa-refresh fa-lg fa-spin"></i> Loading...
     <button class="btn btn-default btn-sm"><i class="fa fa-refresh fa-lg fa-spin"></i> Loading...</button>
     <button class="btn btn-default btn-sm">Loading...</button>
-    <i class="fa fa-circle-blank fa-lg fa-spin"></i> Loading...
-    <button class="btn btn-default btn-sm"><i class="fa fa-circle-blank fa-lg fa-spin"></i> Loading...</button>
+    <i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...
+    <button class="btn btn-default btn-sm"><i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...</button>
   </div>
   <div style="border: solid 1px #d3d3d3;">
     <i class="fa fa-refresh fa-lg fa-spin"></i> Loading...
     <button class="btn btn-default"><i class="fa fa-refresh fa-lg fa-spin"></i> Loading...</button>
     <button class="btn btn-default">Loading...</button>
-    <i class="fa fa-circle-blank fa-lg fa-spin"></i> Loading...
-    <button class="btn btn-default"><i class="fa fa-circle-blank fa-lg fa-spin"></i> Loading...</button>
+    <i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...
+    <button class="btn btn-default"><i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...</button>
   </div>
   <div style="border: solid 1px #d3d3d3;">
     <i class="fa fa-spinner fa-lg fa-spin"></i> Loading...
     <button class="btn btn-default btn-lg"><i class="fa fa-spinner fa-lg fa-spin"></i> Loading...</button>
     <button class="btn btn-default btn-lg">Loading...</button>
-    <i class="fa fa-circle-blank fa-lg fa-spin"></i> Loading...
-    <button class="btn btn-default btn-lg"><i class="fa fa-circle-blank fa-lg fa-spin"></i> Loading...</button>
+    <i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...
+    <button class="btn btn-default btn-lg"><i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...</button>
   </div>
   <h4>Bootstrap Prepend and Append</h4>
   <div class="row">
