diff --git a/docs/_includes/nav-components.html b/docs/_includes/nav-components.html
index 08be1ad8f9..8c7728bc8f 100644
--- a/docs/_includes/nav-components.html
+++ b/docs/_includes/nav-components.html
@@ -1,4 +1,11 @@
-<li><a href="#icons">Glyphicons</a></li>
+<li>
+  <a href="#icons">Glyphicons</a>
+  <ul class="nav">
+    <li><a href="#icons-list">Icon list</a></li>
+    <li><a href="#icons-how-to">How to use</a></li>
+    <li><a href="#icons-examples">Examples</a></li>
+  </ul>
+</li>
 <li>
   <a href="#dropdowns">Dropdowns</a>
   <ul class="nav">
diff --git a/docs/components.html b/docs/components.html
index 33ebeeacff..e2916c7cd2 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -13,7 +13,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
       <h1>Icons font <small>by <a href="http://glyphicons.com" target="_blank">Glyphicons</a></small></h1>
     </div>
 
-    <h2>Included glyphs</h2>
+    <h2 id="icons-list">Included glyphs</h2>
     <p>Bootstrap comes with all 160 of <a href="http://glyphicons.com" target="_blank">Glyphicons</a> Halflings set, all available in font formats for easy coloring, sizing, and placement.</p>
 
     <ul class="the-icons clearfix">
@@ -189,7 +189,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
     <p><a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creator have made this possible at no cost to you as developers. As a thank you, we ask you to include an optional link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever practical.</p>
 
 
-    <h2>How to use</h2>
+    <h2 id="icons-how-to">How to use</h2>
     <p>Add the appropriate class to any inline element. All icon classes are prefixed with <code>glyphicon-</code> for easy styling. To use, place the following code just about anywhere:</p>
 {% highlight html %}
 <span class="glyphicon glyphicon-search"></span>
@@ -198,7 +198,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
     <p>When using beside strings of text, as in buttons or nav links, be sure to leave a space after the icon for proper spacing.</p>
 
 
-    <h2>Icon examples</h2>
+    <h2 id="icons-examples">Icon examples</h2>
     <p>Use them in buttons, button groups for a toolbar, navigation, or prepended form inputs.</p>
 
     <h4>Buttons</h4>