diff --git a/docs/base-css.html b/docs/base-css.html
index 75296003b..b79d5295a 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -82,12 +82,12 @@
 <div class="row">
   <div class="span3 bs-docs-sidebar">
     <ul class="nav nav-list bs-docs-sidenav">
-      <li><a href="#typography">Typography</a></li>
-      <li><a href="#code">Code</a></li>
-      <li><a href="#tables">Tables</a></li>
-      <li><a href="#forms">Forms</a></li>
-      <li><a href="#buttons">Buttons</a></li>
-      <li><a href="#icons">Icons by Glyphicons</a></li>
+      <li><a href="#typography">Typography <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#code">Code <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#tables">Tables <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#forms">Forms <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#buttons">Buttons <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#icons">Icons by Glyphicons <i class="icon-chevron-right"></i></a></li>
     </ul>
   </div>
   <div class="span9">
diff --git a/docs/extend.html b/docs/extend.html
index 967c37743..a372361a0 100644
--- a/docs/extend.html
+++ b/docs/extend.html
@@ -82,9 +82,9 @@
 <div class="row">
   <div class="span3 bs-docs-sidebar">
     <ul class="nav nav-list bs-docs-sidenav">
-      <li><a href="#built-with-less">Built with LESS</a></li>
-      <li><a href="#compiling">Compiling Bootstrap</a></li>
-      <li><a href="#static-assets">Use as static assets</a></li>
+      <li><a href="#built-with-less">Built with LESS <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#compiling">Compiling Bootstrap <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#static-assets">Use as static assets <i class="icon-chevron-right"></i></a></li>
     </ul>
   </div>
   <div class="span9">
diff --git a/docs/javascript.html b/docs/javascript.html
index 43b0ca711..0b475ae3b 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -82,19 +82,19 @@
 <div class="row">
   <div class="span3 bs-docs-sidebar">
     <ul class="nav nav-list bs-docs-sidenav">
-      <li><a href="#transitions">Transitions</a></li>
-      <li><a href="#modals">Modal</a></li>
-      <li><a href="#dropdowns">Dropdown</a></li>
-      <li><a href="#scrollspy">Scrollspy</a></li>
-      <li><a href="#tabs">Tab</a></li>
-      <li><a href="#tooltips">Tooltip</a></li>
-      <li><a href="#popovers">Popover</a></li>
-      <li><a href="#alerts">Alert</a></li>
-      <li><a href="#buttons">Button</a></li>
-      <li><a href="#collapse">Collapse</a></li>
-      <li><a href="#carousel">Carousel</a></li>
-      <li><a href="#typeahead">Typeahead</a></li>
-      <li><a href="#affix">Affix</a></li>
+      <li><a href="#transitions">Transitions <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#modals">Modal <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#dropdowns">Dropdown <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#scrollspy">Scrollspy <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#tabs">Tab <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#tooltips">Tooltip <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#popovers">Popover <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#alerts">Alert <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#buttons">Button <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#collapse">Collapse <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#carousel">Carousel <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#typeahead">Typeahead <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#affix">Affix <i class="icon-chevron-right"></i></a></li>
     </ul>
   </div>
   <div class="span9">
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index b09d50408..b703ad89d 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -82,12 +82,12 @@
 <div class="row">
   <div class="span3 bs-docs-sidebar">
     <ul class="nav nav-list bs-docs-sidenav">
-      <li><a href="#global">Global styles</a></li>
-      <li><a href="#gridSystem">Grid system</a></li>
-      <li><a href="#fluidGridSystem">Fluid grid system</a></li>
-      <li><a href="#gridCustomization">Customizing</a></li>
-      <li><a href="#layouts">Layouts</a></li>
-      <li><a href="#responsive">Responsive design</a></li>
+      <li><a href="#global">Global styles <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#gridSystem">Grid system <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#fluidGridSystem">Fluid grid system <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#gridCustomization">Customizing <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#layouts">Layouts <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#responsive">Responsive design <i class="icon-chevron-right"></i></a></li>
     </ul>
   </div>
   <div class="span9">
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 21c24657a..6f4e84975 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -12,12 +12,12 @@
 <div class="row">
   <div class="span3 bs-docs-sidebar">
     <ul class="nav nav-list bs-docs-sidenav">
-      <li><a href="#typography">{{_i}}Typography{{/i}}</a></li>
-      <li><a href="#code">{{_i}}Code{{/i}}</a></li>
-      <li><a href="#tables">{{_i}}Tables{{/i}}</a></li>
-      <li><a href="#forms">{{_i}}Forms{{/i}}</a></li>
-      <li><a href="#buttons">{{_i}}Buttons{{/i}}</a></li>
-      <li><a href="#icons">{{_i}}Icons by Glyphicons{{/i}}</a></li>
+      <li><a href="#typography">{{_i}}Typography{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#code">{{_i}}Code{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#tables">{{_i}}Tables{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#forms">{{_i}}Forms{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#buttons">{{_i}}Buttons{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#icons">{{_i}}Icons by Glyphicons{{/i}} <i class="icon-chevron-right"></i></a></li>
     </ul>
   </div>
   <div class="span9">
diff --git a/docs/templates/pages/extend.mustache b/docs/templates/pages/extend.mustache
index 12a198c3c..2449ae839 100644
--- a/docs/templates/pages/extend.mustache
+++ b/docs/templates/pages/extend.mustache
@@ -12,9 +12,9 @@
 <div class="row">
   <div class="span3 bs-docs-sidebar">
     <ul class="nav nav-list bs-docs-sidenav">
-      <li><a href="#built-with-less">{{_i}}Built with LESS{{/i}}</a></li>
-      <li><a href="#compiling">{{_i}}Compiling Bootstrap{{/i}}</a></li>
-      <li><a href="#static-assets">{{_i}}Use as static assets{{/i}}</a></li>
+      <li><a href="#built-with-less">{{_i}}Built with LESS{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#compiling">{{_i}}Compiling Bootstrap{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#static-assets">{{_i}}Use as static assets{{/i}} <i class="icon-chevron-right"></i></a></li>
     </ul>
   </div>
   <div class="span9">
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 442a7e29e..4c25bb08b 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -12,19 +12,19 @@
 <div class="row">
   <div class="span3 bs-docs-sidebar">
     <ul class="nav nav-list bs-docs-sidenav">
-      <li><a href="#transitions">{{_i}}Transitions{{/i}}</a></li>
-      <li><a href="#modals">{{_i}}Modal{{/i}}</a></li>
-      <li><a href="#dropdowns">{{_i}}Dropdown{{/i}}</a></li>
-      <li><a href="#scrollspy">{{_i}}Scrollspy{{/i}}</a></li>
-      <li><a href="#tabs">{{_i}}Tab{{/i}}</a></li>
-      <li><a href="#tooltips">{{_i}}Tooltip{{/i}}</a></li>
-      <li><a href="#popovers">{{_i}}Popover{{/i}}</a></li>
-      <li><a href="#alerts">{{_i}}Alert{{/i}}</a></li>
-      <li><a href="#buttons">{{_i}}Button{{/i}}</a></li>
-      <li><a href="#collapse">{{_i}}Collapse{{/i}}</a></li>
-      <li><a href="#carousel">{{_i}}Carousel{{/i}}</a></li>
-      <li><a href="#typeahead">{{_i}}Typeahead{{/i}}</a></li>
-      <li><a href="#affix">{{_i}}Affix{{/i}}</a></li>
+      <li><a href="#transitions">{{_i}}Transitions{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#modals">{{_i}}Modal{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#dropdowns">{{_i}}Dropdown{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#scrollspy">{{_i}}Scrollspy{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#tabs">{{_i}}Tab{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#tooltips">{{_i}}Tooltip{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#popovers">{{_i}}Popover{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#alerts">{{_i}}Alert{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#buttons">{{_i}}Button{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#collapse">{{_i}}Collapse{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#carousel">{{_i}}Carousel{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#typeahead">{{_i}}Typeahead{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#affix">{{_i}}Affix{{/i}} <i class="icon-chevron-right"></i></a></li>
     </ul>
   </div>
   <div class="span9">
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 6888747dd..05e1c4e2a 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -12,12 +12,12 @@
 <div class="row">
   <div class="span3 bs-docs-sidebar">
     <ul class="nav nav-list bs-docs-sidenav">
-      <li><a href="#global">{{_i}}Global styles{{/i}}</a></li>
-      <li><a href="#gridSystem">{{_i}}Grid system{{/i}}</a></li>
-      <li><a href="#fluidGridSystem">{{_i}}Fluid grid system{{/i}}</a></li>
-      <li><a href="#gridCustomization">{{_i}}Customizing{{/i}}</a></li>
-      <li><a href="#layouts">{{_i}}Layouts{{/i}}</a></li>
-      <li><a href="#responsive">{{_i}}Responsive design{{/i}}</a></li>
+      <li><a href="#global">{{_i}}Global styles{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#gridSystem">{{_i}}Grid system{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#fluidGridSystem">{{_i}}Fluid grid system{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#gridCustomization">{{_i}}Customizing{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#layouts">{{_i}}Layouts{{/i}} <i class="icon-chevron-right"></i></a></li>
+      <li><a href="#responsive">{{_i}}Responsive design{{/i}} <i class="icon-chevron-right"></i></a></li>
     </ul>
   </div>
   <div class="span9">