diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index c3fbf0c2c6..ec15ae2f1a 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -762,7 +762,7 @@ form.bs-docs-example {
 /* Chevrons */
 .bs-docs-sidenav .glyphicon-chevron-right {
   float: right;
-  margin-top: -2px;
+  margin-top: 1px;
   margin-right: -6px;
   opacity: .25;
   color: #000;
diff --git a/docs/components.html b/docs/components.html
index e59351782a..feec16d366 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -84,20 +84,20 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav">
-          <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="#media"><i class="icon-chevron-right"></i> Media object</a></li>
-          <li><a href="#misc"><i class="icon-chevron-right"></i> Misc</a></li>
+          <li><a href="#dropdowns"><i class="glyphicon-chevron-right"></i> Dropdowns</a></li>
+          <li><a href="#buttonGroups"><i class="glyphicon-chevron-right"></i> Button groups</a></li>
+          <li><a href="#buttonDropdowns"><i class="glyphicon-chevron-right"></i> Button dropdowns</a></li>
+          <li><a href="#navs"><i class="glyphicon-chevron-right"></i> Navs</a></li>
+          <li><a href="#navbar"><i class="glyphicon-chevron-right"></i> Navbar</a></li>
+          <li><a href="#breadcrumbs"><i class="glyphicon-chevron-right"></i> Breadcrumbs</a></li>
+          <li><a href="#pagination"><i class="glyphicon-chevron-right"></i> Pagination</a></li>
+          <li><a href="#labels-badges"><i class="glyphicon-chevron-right"></i> Labels and badges</a></li>
+          <li><a href="#typography"><i class="glyphicon-chevron-right"></i> Typography</a></li>
+          <li><a href="#thumbnails"><i class="glyphicon-chevron-right"></i> Thumbnails</a></li>
+          <li><a href="#alerts"><i class="glyphicon-chevron-right"></i> Alerts</a></li>
+          <li><a href="#progress"><i class="glyphicon-chevron-right"></i> Progress bars</a></li>
+          <li><a href="#media"><i class="glyphicon-chevron-right"></i> Media object</a></li>
+          <li><a href="#misc"><i class="glyphicon-chevron-right"></i> Misc</a></li>
         </ul>
       </div>
       <div class="span9">
diff --git a/docs/customize.html b/docs/customize.html
index 18a8debaea..483f936ea7 100644
--- a/docs/customize.html
+++ b/docs/customize.html
@@ -84,10 +84,10 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav">
-          <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>
+          <li><a href="#components"><i class="glyphicon-chevron-right"></i> 1. Choose components</a></li>
+          <li><a href="#plugins"><i class="glyphicon-chevron-right"></i> 2. Select jQuery plugins</a></li>
+          <li><a href="#variables"><i class="glyphicon-chevron-right"></i> 3. Customize variables</a></li>
+          <li><a href="#download"><i class="glyphicon-chevron-right"></i> 4. Download</a></li>
         </ul>
       </div>
       <div class="span9">
diff --git a/docs/extend.html b/docs/extend.html
index e6aa2da489..7af5a36545 100644
--- a/docs/extend.html
+++ b/docs/extend.html
@@ -83,9 +83,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 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>
+          <li><a href="#built-with-less"><i class="glyphicon-chevron-right"></i> Built with LESS</a></li>
+          <li><a href="#compiling"><i class="glyphicon-chevron-right"></i> Compiling Bootstrap</a></li>
+          <li><a href="#static-assets"><i class="glyphicon-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 cfc61cc791..a31459c44a 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -84,12 +84,12 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav">
-          <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>
+          <li><a href="#download-bootstrap"><i class="glyphicon-chevron-right"></i> Download</a></li>
+          <li><a href="#file-structure"><i class="glyphicon-chevron-right"></i> File structure</a></li>
+          <li><a href="#contents"><i class="glyphicon-chevron-right"></i> What's included</a></li>
+          <li><a href="#html-template"><i class="glyphicon-chevron-right"></i> HTML template</a></li>
+          <li><a href="#examples"><i class="glyphicon-chevron-right"></i> Examples</a></li>
+          <li><a href="#what-next"><i class="glyphicon-chevron-right"></i> What next?</a></li>
         </ul>
       </div>
       <div class="span9">
diff --git a/docs/javascript.html b/docs/javascript.html
index 1b14e4430a..b138809b71 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -83,20 +83,20 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav">
-          <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"><i class="icon-chevron-right"></i> Typeahead</a></li>
-          <li><a href="#affix"><i class="icon-chevron-right"></i> Affix</a></li>
+          <li><a href="#overview"><i class="glyphicon-chevron-right"></i> Overview</a></li>
+          <li><a href="#transitions"><i class="glyphicon-chevron-right"></i> Transitions</a></li>
+          <li><a href="#modals"><i class="glyphicon-chevron-right"></i> Modal</a></li>
+          <li><a href="#dropdowns"><i class="glyphicon-chevron-right"></i> Dropdown</a></li>
+          <li><a href="#scrollspy"><i class="glyphicon-chevron-right"></i> Scrollspy</a></li>
+          <li><a href="#tabs"><i class="glyphicon-chevron-right"></i> Tab</a></li>
+          <li><a href="#tooltips"><i class="glyphicon-chevron-right"></i> Tooltip</a></li>
+          <li><a href="#popovers"><i class="glyphicon-chevron-right"></i> Popover</a></li>
+          <li><a href="#alerts"><i class="glyphicon-chevron-right"></i> Alert</a></li>
+          <li><a href="#buttons"><i class="glyphicon-chevron-right"></i> Button</a></li>
+          <li><a href="#collapse"><i class="glyphicon-chevron-right"></i> Collapse</a></li>
+          <li><a href="#carousel"><i class="glyphicon-chevron-right"></i> Carousel</a></li>
+          <li><a href="#typeahead"><i class="glyphicon-chevron-right"></i> Typeahead</a></li>
+          <li><a href="#affix"><i class="glyphicon-chevron-right"></i> Affix</a></li>
         </ul>
       </div>
       <div class="span9">
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 596379c87e..acaf67ad38 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -83,10 +83,10 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav">
-          <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="#layouts"><i class="icon-chevron-right"></i> Layouts</a></li>
-          <li><a href="#responsive"><i class="icon-chevron-right"></i> Responsive design</a></li>
+          <li><a href="#global"><i class="glyphicon-chevron-right"></i> Global styles</a></li>
+          <li><a href="#gridSystem"><i class="glyphicon-chevron-right"></i> Grid system</a></li>
+          <li><a href="#layouts"><i class="glyphicon-chevron-right"></i> Layouts</a></li>
+          <li><a href="#responsive"><i class="glyphicon-chevron-right"></i> Responsive design</a></li>
         </ul>
       </div>
       <div class="span9">
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 4ae3467a69..b72cd01eda 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -15,20 +15,20 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav">
-          <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="#media"><i class="icon-chevron-right"></i> {{_i}}Media object{{/i}}</a></li>
-          <li><a href="#misc"><i class="icon-chevron-right"></i> {{_i}}Misc{{/i}}</a></li>
+          <li><a href="#dropdowns"><i class="glyphicon-chevron-right"></i> {{_i}}Dropdowns{{/i}}</a></li>
+          <li><a href="#buttonGroups"><i class="glyphicon-chevron-right"></i> {{_i}}Button groups{{/i}}</a></li>
+          <li><a href="#buttonDropdowns"><i class="glyphicon-chevron-right"></i> {{_i}}Button dropdowns{{/i}}</a></li>
+          <li><a href="#navs"><i class="glyphicon-chevron-right"></i> {{_i}}Navs{{/i}}</a></li>
+          <li><a href="#navbar"><i class="glyphicon-chevron-right"></i> {{_i}}Navbar{{/i}}</a></li>
+          <li><a href="#breadcrumbs"><i class="glyphicon-chevron-right"></i> {{_i}}Breadcrumbs{{/i}}</a></li>
+          <li><a href="#pagination"><i class="glyphicon-chevron-right"></i> {{_i}}Pagination{{/i}}</a></li>
+          <li><a href="#labels-badges"><i class="glyphicon-chevron-right"></i> {{_i}}Labels and badges{{/i}}</a></li>
+          <li><a href="#typography"><i class="glyphicon-chevron-right"></i> {{_i}}Typography{{/i}}</a></li>
+          <li><a href="#thumbnails"><i class="glyphicon-chevron-right"></i> {{_i}}Thumbnails{{/i}}</a></li>
+          <li><a href="#alerts"><i class="glyphicon-chevron-right"></i> {{_i}}Alerts{{/i}}</a></li>
+          <li><a href="#progress"><i class="glyphicon-chevron-right"></i> {{_i}}Progress bars{{/i}}</a></li>
+          <li><a href="#media"><i class="glyphicon-chevron-right"></i> {{_i}}Media object{{/i}}</a></li>
+          <li><a href="#misc"><i class="glyphicon-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 6674da87bc..cb1a825bb2 100644
--- a/docs/templates/pages/customize.mustache
+++ b/docs/templates/pages/customize.mustache
@@ -15,10 +15,10 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav">
-          <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>
+          <li><a href="#components"><i class="glyphicon-chevron-right"></i> {{_i}}1. Choose components{{/i}}</a></li>
+          <li><a href="#plugins"><i class="glyphicon-chevron-right"></i> {{_i}}2. Select jQuery plugins{{/i}}</a></li>
+          <li><a href="#variables"><i class="glyphicon-chevron-right"></i> {{_i}}3. Customize variables{{/i}}</a></li>
+          <li><a href="#download"><i class="glyphicon-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 c1976427cf..b2b2788510 100644
--- a/docs/templates/pages/extend.mustache
+++ b/docs/templates/pages/extend.mustache
@@ -14,9 +14,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 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>
+          <li><a href="#built-with-less"><i class="glyphicon-chevron-right"></i> {{_i}}Built with LESS{{/i}}</a></li>
+          <li><a href="#compiling"><i class="glyphicon-chevron-right"></i> {{_i}}Compiling Bootstrap{{/i}}</a></li>
+          <li><a href="#static-assets"><i class="glyphicon-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 81dab1c5b3..7632a94cb6 100644
--- a/docs/templates/pages/getting-started.mustache
+++ b/docs/templates/pages/getting-started.mustache
@@ -15,12 +15,12 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav">
-          <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>
+          <li><a href="#download-bootstrap"><i class="glyphicon-chevron-right"></i> {{_i}}Download{{/i}}</a></li>
+          <li><a href="#file-structure"><i class="glyphicon-chevron-right"></i> {{_i}}File structure{{/i}}</a></li>
+          <li><a href="#contents"><i class="glyphicon-chevron-right"></i> {{_i}}What's included{{/i}}</a></li>
+          <li><a href="#html-template"><i class="glyphicon-chevron-right"></i> {{_i}}HTML template{{/i}}</a></li>
+          <li><a href="#examples"><i class="glyphicon-chevron-right"></i> {{_i}}Examples{{/i}}</a></li>
+          <li><a href="#what-next"><i class="glyphicon-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 913c8aa951..b878f9da6e 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -14,20 +14,20 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav">
-          <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 class="icon-chevron-right"></i> {{_i}}Typeahead{{/i}}</a></li>
-          <li><a href="#affix"><i class="icon-chevron-right"></i> {{_i}}Affix{{/i}}</a></li>
+          <li><a href="#overview"><i class="glyphicon-chevron-right"></i> {{_i}}Overview{{/i}}</a></li>
+          <li><a href="#transitions"><i class="glyphicon-chevron-right"></i> {{_i}}Transitions{{/i}}</a></li>
+          <li><a href="#modals"><i class="glyphicon-chevron-right"></i> {{_i}}Modal{{/i}}</a></li>
+          <li><a href="#dropdowns"><i class="glyphicon-chevron-right"></i> {{_i}}Dropdown{{/i}}</a></li>
+          <li><a href="#scrollspy"><i class="glyphicon-chevron-right"></i> {{_i}}Scrollspy{{/i}}</a></li>
+          <li><a href="#tabs"><i class="glyphicon-chevron-right"></i> {{_i}}Tab{{/i}}</a></li>
+          <li><a href="#tooltips"><i class="glyphicon-chevron-right"></i> {{_i}}Tooltip{{/i}}</a></li>
+          <li><a href="#popovers"><i class="glyphicon-chevron-right"></i> {{_i}}Popover{{/i}}</a></li>
+          <li><a href="#alerts"><i class="glyphicon-chevron-right"></i> {{_i}}Alert{{/i}}</a></li>
+          <li><a href="#buttons"><i class="glyphicon-chevron-right"></i> {{_i}}Button{{/i}}</a></li>
+          <li><a href="#collapse"><i class="glyphicon-chevron-right"></i> {{_i}}Collapse{{/i}}</a></li>
+          <li><a href="#carousel"><i class="glyphicon-chevron-right"></i> {{_i}}Carousel{{/i}}</a></li>
+          <li><a href="#typeahead"><i class="glyphicon-chevron-right"></i> {{_i}}Typeahead{{/i}}</a></li>
+          <li><a href="#affix"><i class="glyphicon-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 6818bf459c..0382b0ee3a 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -14,10 +14,10 @@
     <div class="row">
       <div class="span3 bs-docs-sidebar">
         <ul class="nav nav-list bs-docs-sidenav">
-          <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="#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>
+          <li><a href="#global"><i class="glyphicon-chevron-right"></i> {{_i}}Global styles{{/i}}</a></li>
+          <li><a href="#gridSystem"><i class="glyphicon-chevron-right"></i> {{_i}}Grid system{{/i}}</a></li>
+          <li><a href="#layouts"><i class="glyphicon-chevron-right"></i> {{_i}}Layouts{{/i}}</a></li>
+          <li><a href="#responsive"><i class="glyphicon-chevron-right"></i> {{_i}}Responsive design{{/i}}</a></li>
         </ul>
       </div>
       <div class="span9">