diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 784aa153b..5470cfe31 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -912,6 +912,8 @@ form.bs-docs-example {
           box-shadow: 0 1px 4px rgba(0,0,0,.065);
 }
 .bs-docs-sidenav > li > a {
+  display: block;
+  *width: 190px;
   margin: 0 0 -1px;
   font-size: 14px;
   padding: 9px 14px;
diff --git a/docs/base-css.html b/docs/base-css.html
index 80bc8c9b0..50c362864 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -87,13 +87,13 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-y="80">
-          <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="#images">Images <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#icons">Icons by Glyphicons <i class="icon-chevron-right"></i></a></li>
+          <li><a href="#typography"><i class="icon-chevron-right"></i> Typography</a></li>
+          <li><a href="#code"><i class="icon-chevron-right"></i> Code</a></li>
+          <li><a href="#tables"><i class="icon-chevron-right"></i> Tables</a></li>
+          <li><a href="#forms"><i class="icon-chevron-right"></i> Forms</a></li>
+          <li><a href="#buttons"><i class="icon-chevron-right"></i> Buttons</a></li>
+          <li><a href="#images"><i class="icon-chevron-right"></i> Images</a></li>
+          <li><a href="#icons"><i class="icon-chevron-right"></i> Icons by Glyphicons</a></li>
         </ul>
       </div>
       <div class="span9">
diff --git a/docs/components.html b/docs/components.html
index d6d4cc1bc..2b2bc52e8 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -87,19 +87,19 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-y="80">
-          <li><a href="#dropdowns">Dropdowns <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#buttonGroups">Button groups <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#buttonDropdowns">Button dropdowns <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#navs">Navs <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#navbar">Navbar <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#breadcrumbs">Breadcrumbs <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#pagination">Pagination <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#labels-badges">Labels and badges <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#typography">Typography <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#thumbnails">Thumbnails <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#alerts">Alerts <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#progress">Progress bars <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#misc">Misc <i class="icon-chevron-right"></i></a></li>
+          <li><a href="#dropdowns"><i class="icon-chevron-right"></i> Dropdowns</a></li>
+          <li><a href="#buttonGroups"><i class="icon-chevron-right"></i> Button groups</a></li>
+          <li><a href="#buttonDropdowns"><i class="icon-chevron-right"></i> Button dropdowns</a></li>
+          <li><a href="#navs"><i class="icon-chevron-right"></i> Navs</a></li>
+          <li><a href="#navbar"><i class="icon-chevron-right"></i> Navbar</a></li>
+          <li><a href="#breadcrumbs"><i class="icon-chevron-right"></i> Breadcrumbs</a></li>
+          <li><a href="#pagination"><i class="icon-chevron-right"></i> Pagination</a></li>
+          <li><a href="#labels-badges"><i class="icon-chevron-right"></i> Labels and badges</a></li>
+          <li><a href="#typography"><i class="icon-chevron-right"></i> Typography</a></li>
+          <li><a href="#thumbnails"><i class="icon-chevron-right"></i> Thumbnails</a></li>
+          <li><a href="#alerts"><i class="icon-chevron-right"></i> Alerts</a></li>
+          <li><a href="#progress"><i class="icon-chevron-right"></i> Progress bars</a></li>
+          <li><a href="#misc"><i class="icon-chevron-right"></i> Misc</a></li>
         </ul>
       </div>
       <div class="span9">
diff --git a/docs/customize.html b/docs/customize.html
index 1abe9005b..1fc225e52 100644
--- a/docs/customize.html
+++ b/docs/customize.html
@@ -87,10 +87,10 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-y="80">
-          <li><a href="#components">1. Choose components</a></li>
-          <li><a href="#plugins">2. Select jQuery plugins</a></li>
-          <li><a href="#variables">3. Customize variables</a></li>
-          <li><a href="#download">4. Download</a></li>
+          <li><a href="#components"><i class="icon-chevron-right"></i> 1. Choose components</a></li>
+          <li><a href="#plugins"><i class="icon-chevron-right"></i> 2. Select jQuery plugins</a></li>
+          <li><a href="#variables"><i class="icon-chevron-right"></i> 3. Customize variables</a></li>
+          <li><a href="#download"><i class="icon-chevron-right"></i> 4. Download</a></li>
         </ul>
       </div>
       <div class="span9">
diff --git a/docs/extend.html b/docs/extend.html
index 1c1a7d9a1..efd933cb5 100644
--- a/docs/extend.html
+++ b/docs/extend.html
@@ -87,9 +87,9 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-y="80">
-          <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>
+          <li><a href="#built-with-less"><i class="icon-chevron-right"></i> Built with LESS</a></li>
+          <li><a href="#compiling"><i class="icon-chevron-right"></i> Compiling Bootstrap</a></li>
+          <li><a href="#static-assets"><i class="icon-chevron-right"></i> Use as static assets</a></li>
         </ul>
       </div>
       <div class="span9">
diff --git a/docs/getting-started.html b/docs/getting-started.html
index c245daba3..70fb74432 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -87,12 +87,12 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-y="80">
-          <li><a href="#download-bootstrap">Download <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#file-structure">File structure <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#contents">What's included <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#html-template">HTML template <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#examples">Examples <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#what-next">What next? <i class="icon-chevron-right"></i></a></li>
+          <li><a href="#download-bootstrap"><i class="icon-chevron-right"></i> Download</a></li>
+          <li><a href="#file-structure"><i class="icon-chevron-right"></i> File structure</a></li>
+          <li><a href="#contents"><i class="icon-chevron-right"></i> What's included</a></li>
+          <li><a href="#html-template"><i class="icon-chevron-right"></i> HTML template</a></li>
+          <li><a href="#examples"><i class="icon-chevron-right"></i> Examples</a></li>
+          <li><a href="#what-next"><i class="icon-chevron-right"></i> What next?</a></li>
         </ul>
       </div>
       <div class="span9">
diff --git a/docs/javascript.html b/docs/javascript.html
index 846089da8..7b015f6fe 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -87,20 +87,20 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-y="80">
-          <li><a href="#overview">Overview <i class="icon-chevron-right"></i></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>
+          <li><a href="#overview"><i class="icon-chevron-right"></i> Overview</a></li>
+          <li><a href="#transitions"><i class="icon-chevron-right"></i> Transitions</a></li>
+          <li><a href="#modals"><i class="icon-chevron-right"></i> Modal</a></li>
+          <li><a href="#dropdowns"><i class="icon-chevron-right"></i> Dropdown</a></li>
+          <li><a href="#scrollspy"><i class="icon-chevron-right"></i> Scrollspy</a></li>
+          <li><a href="#tabs"><i class="icon-chevron-right"></i> Tab</a></li>
+          <li><a href="#tooltips"><i class="icon-chevron-right"></i> Tooltip</a></li>
+          <li><a href="#popovers"><i class="icon-chevron-right"></i> Popover</a></li>
+          <li><a href="#alerts"><i class="icon-chevron-right"></i> Alert</a></li>
+          <li><a href="#buttons"><i class="icon-chevron-right"></i> Button</a></li>
+          <li><a href="#collapse"><i class="icon-chevron-right"></i> Collapse</a></li>
+          <li><a href="#carousel"><i class="icon-chevron-right"></i> Carousel</a></li>
+          <li><a href="#typeahead">Typeahead</a></li>
+          <li><a href="#affix"><i class="icon-chevron-right"></i> Affix</a></li>
         </ul>
       </div>
       <div class="span9">
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 3c49eb2e3..eb5f19ae7 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -87,11 +87,11 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-y="80">
-          <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="#layouts">Layouts <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#responsive">Responsive design <i class="icon-chevron-right"></i></a></li>
+          <li><a href="#global"><i class="icon-chevron-right"></i> Global styles</a></li>
+          <li><a href="#gridSystem"><i class="icon-chevron-right"></i> Grid system</a></li>
+          <li><a href="#fluidGridSystem"><i class="icon-chevron-right"></i> Fluid grid system</a></li>
+          <li><a href="#layouts"><i class="icon-chevron-right"></i> Layouts</a></li>
+          <li><a href="#responsive"><i class="icon-chevron-right"></i> Responsive design</a></li>
         </ul>
       </div>
       <div class="span9">
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 39d8f4fc4..89732c4fb 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -16,13 +16,13 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-y="80">
-          <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="#images">{{_i}}Images{{/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>
+          <li><a href="#typography"><i class="icon-chevron-right"></i> {{_i}}Typography{{/i}}</a></li>
+          <li><a href="#code"><i class="icon-chevron-right"></i> {{_i}}Code{{/i}}</a></li>
+          <li><a href="#tables"><i class="icon-chevron-right"></i> {{_i}}Tables{{/i}}</a></li>
+          <li><a href="#forms"><i class="icon-chevron-right"></i> {{_i}}Forms{{/i}}</a></li>
+          <li><a href="#buttons"><i class="icon-chevron-right"></i> {{_i}}Buttons{{/i}}</a></li>
+          <li><a href="#images"><i class="icon-chevron-right"></i> {{_i}}Images{{/i}}</a></li>
+          <li><a href="#icons"><i class="icon-chevron-right"></i> {{_i}}Icons by Glyphicons{{/i}}</a></li>
         </ul>
       </div>
       <div class="span9">
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index f0f19ee72..314fd23f7 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -16,19 +16,19 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-y="80">
-          <li><a href="#dropdowns">{{_i}}Dropdowns{{/i}} <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#buttonGroups">{{_i}}Button groups{{/i}} <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#buttonDropdowns">{{_i}}Button dropdowns{{/i}} <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#navs">{{_i}}Navs{{/i}} <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#navbar">{{_i}}Navbar{{/i}} <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#breadcrumbs">{{_i}}Breadcrumbs{{/i}} <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#pagination">{{_i}}Pagination{{/i}} <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#labels-badges">{{_i}}Labels and badges{{/i}} <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#typography">{{_i}}Typography{{/i}} <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#thumbnails">{{_i}}Thumbnails{{/i}} <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#alerts">{{_i}}Alerts{{/i}} <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#progress">{{_i}}Progress bars{{/i}} <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#misc">{{_i}}Misc{{/i}} <i class="icon-chevron-right"></i></a></li>
+          <li><a href="#dropdowns"><i class="icon-chevron-right"></i> {{_i}}Dropdowns{{/i}}</a></li>
+          <li><a href="#buttonGroups"><i class="icon-chevron-right"></i> {{_i}}Button groups{{/i}}</a></li>
+          <li><a href="#buttonDropdowns"><i class="icon-chevron-right"></i> {{_i}}Button dropdowns{{/i}}</a></li>
+          <li><a href="#navs"><i class="icon-chevron-right"></i> {{_i}}Navs{{/i}}</a></li>
+          <li><a href="#navbar"><i class="icon-chevron-right"></i> {{_i}}Navbar{{/i}}</a></li>
+          <li><a href="#breadcrumbs"><i class="icon-chevron-right"></i> {{_i}}Breadcrumbs{{/i}}</a></li>
+          <li><a href="#pagination"><i class="icon-chevron-right"></i> {{_i}}Pagination{{/i}}</a></li>
+          <li><a href="#labels-badges"><i class="icon-chevron-right"></i> {{_i}}Labels and badges{{/i}}</a></li>
+          <li><a href="#typography"><i class="icon-chevron-right"></i> {{_i}}Typography{{/i}}</a></li>
+          <li><a href="#thumbnails"><i class="icon-chevron-right"></i> {{_i}}Thumbnails{{/i}}</a></li>
+          <li><a href="#alerts"><i class="icon-chevron-right"></i> {{_i}}Alerts{{/i}}</a></li>
+          <li><a href="#progress"><i class="icon-chevron-right"></i> {{_i}}Progress bars{{/i}}</a></li>
+          <li><a href="#misc"><i class="icon-chevron-right"></i> {{_i}}Misc{{/i}}</a></li>
         </ul>
       </div>
       <div class="span9">
diff --git a/docs/templates/pages/customize.mustache b/docs/templates/pages/customize.mustache
index 791ca6efc..d84d02f0c 100644
--- a/docs/templates/pages/customize.mustache
+++ b/docs/templates/pages/customize.mustache
@@ -16,10 +16,10 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-y="80">
-          <li><a href="#components">{{_i}}1. Choose components{{/i}}</a></li>
-          <li><a href="#plugins">{{_i}}2. Select jQuery plugins{{/i}}</a></li>
-          <li><a href="#variables">{{_i}}3. Customize variables{{/i}}</a></li>
-          <li><a href="#download">{{_i}}4. Download{{/i}}</a></li>
+          <li><a href="#components"><i class="icon-chevron-right"></i> {{_i}}1. Choose components{{/i}}</a></li>
+          <li><a href="#plugins"><i class="icon-chevron-right"></i> {{_i}}2. Select jQuery plugins{{/i}}</a></li>
+          <li><a href="#variables"><i class="icon-chevron-right"></i> {{_i}}3. Customize variables{{/i}}</a></li>
+          <li><a href="#download"><i class="icon-chevron-right"></i> {{_i}}4. Download{{/i}}</a></li>
         </ul>
       </div>
       <div class="span9">
diff --git a/docs/templates/pages/extend.mustache b/docs/templates/pages/extend.mustache
index 22fb0d288..842f9f7a3 100644
--- a/docs/templates/pages/extend.mustache
+++ b/docs/templates/pages/extend.mustache
@@ -16,9 +16,9 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-y="80">
-          <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>
+          <li><a href="#built-with-less"><i class="icon-chevron-right"></i> {{_i}}Built with LESS{{/i}}</a></li>
+          <li><a href="#compiling"><i class="icon-chevron-right"></i> {{_i}}Compiling Bootstrap{{/i}}</a></li>
+          <li><a href="#static-assets"><i class="icon-chevron-right"></i> {{_i}}Use as static assets{{/i}}</a></li>
         </ul>
       </div>
       <div class="span9">
diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache
index b724b475b..3b026dea3 100644
--- a/docs/templates/pages/getting-started.mustache
+++ b/docs/templates/pages/getting-started.mustache
@@ -16,12 +16,12 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-y="80">
-          <li><a href="#download-bootstrap">{{_i}}Download{{/i}} <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#file-structure">{{_i}}File structure{{/i}} <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#contents">{{_i}}What's included{{/i}} <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#html-template">{{_i}}HTML template{{/i}} <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#examples">{{_i}}Examples{{/i}} <i class="icon-chevron-right"></i></a></li>
-          <li><a href="#what-next">{{_i}}What next?{{/i}} <i class="icon-chevron-right"></i></a></li>
+          <li><a href="#download-bootstrap"><i class="icon-chevron-right"></i> {{_i}}Download{{/i}}</a></li>
+          <li><a href="#file-structure"><i class="icon-chevron-right"></i> {{_i}}File structure{{/i}}</a></li>
+          <li><a href="#contents"><i class="icon-chevron-right"></i> {{_i}}What's included{{/i}}</a></li>
+          <li><a href="#html-template"><i class="icon-chevron-right"></i> {{_i}}HTML template{{/i}}</a></li>
+          <li><a href="#examples"><i class="icon-chevron-right"></i> {{_i}}Examples{{/i}}</a></li>
+          <li><a href="#what-next"><i class="icon-chevron-right"></i> {{_i}}What next?{{/i}}</a></li>
         </ul>
       </div>
       <div class="span9">
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index f4c6e8b68..0a17006f6 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -16,20 +16,20 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-y="80">
-          <li><a href="#overview">{{_i}}Overview{{/i}} <i class="icon-chevron-right"></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>
+          <li><a href="#overview"><i class="icon-chevron-right"></i> {{_i}}Overview{{/i}}</a></li>
+          <li><a href="#transitions"><i class="icon-chevron-right"></i> {{_i}}Transitions{{/i}}</a></li>
+          <li><a href="#modals"><i class="icon-chevron-right"></i> {{_i}}Modal{{/i}}</a></li>
+          <li><a href="#dropdowns"><i class="icon-chevron-right"></i> {{_i}}Dropdown{{/i}}</a></li>
+          <li><a href="#scrollspy"><i class="icon-chevron-right"></i> {{_i}}Scrollspy{{/i}}</a></li>
+          <li><a href="#tabs"><i class="icon-chevron-right"></i> {{_i}}Tab{{/i}}</a></li>
+          <li><a href="#tooltips"><i class="icon-chevron-right"></i> {{_i}}Tooltip{{/i}}</a></li>
+          <li><a href="#popovers"><i class="icon-chevron-right"></i> {{_i}}Popover{{/i}}</a></li>
+          <li><a href="#alerts"><i class="icon-chevron-right"></i> {{_i}}Alert{{/i}}</a></li>
+          <li><a href="#buttons"><i class="icon-chevron-right"></i> {{_i}}Button{{/i}}</a></li>
+          <li><a href="#collapse"><i class="icon-chevron-right"></i> {{_i}}Collapse{{/i}}</a></li>
+          <li><a href="#carousel"><i class="icon-chevron-right"></i> {{_i}}Carousel{{/i}}</a></li>
+          <li><a href="#typeahead">{{_i}}Typeahead{{/i}}</a></li>
+          <li><a href="#affix"><i class="icon-chevron-right"></i> {{_i}}Affix{{/i}}</a></li>
         </ul>
       </div>
       <div class="span9">
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 2ceaf0e4b..385c9db70 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -16,11 +16,11 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-y="80">
-          <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="#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>
+          <li><a href="#global"><i class="icon-chevron-right"></i> {{_i}}Global styles{{/i}}</a></li>
+          <li><a href="#gridSystem"><i class="icon-chevron-right"></i> {{_i}}Grid system{{/i}}</a></li>
+          <li><a href="#fluidGridSystem"><i class="icon-chevron-right"></i> {{_i}}Fluid grid system{{/i}}</a></li>
+          <li><a href="#layouts"><i class="icon-chevron-right"></i> {{_i}}Layouts{{/i}}</a></li>
+          <li><a href="#responsive"><i class="icon-chevron-right"></i> {{_i}}Responsive design{{/i}}</a></li>
         </ul>
       </div>
       <div class="span9">