chance icon class

15 files changed, 479 insertions, 479 deletions

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index c8e342106..c507815f6 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index ce589dd80..7d519a608 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1112,7 +1112,7 @@ table .span12 {
   width: 924px;
   margin-left: 0;
 }
-[class*="i-"] {
+[class*="icon-"] {
   display: inline-block;
   width: 14px;
   height: 14px;
@@ -1122,370 +1122,370 @@ table .span12 {
   background-repeat: no-repeat;
   *margin-right: .3em;
 }
-[class*="i-"]:last-child {
+[class*="icon-"]:last-child {
   *margin-left: 0;
 }
-.i-white {
+.icon-white {
   background-image: url(../img/glyphicons-halflings-white.png);
 }
-.i-glass {
+.icon-glass {
   background-position: 0      0;
 }
-.i-music {
+.icon-music {
   background-position: -24px 0;
 }
-.i-search {
+.icon-search {
   background-position: -48px 0;
 }
-.i-envelope {
+.icon-envelope {
   background-position: -72px 0;
 }
-.i-heart {
+.icon-heart {
   background-position: -96px 0;
 }
-.i-star {
+.icon-star {
   background-position: -120px 0;
 }
-.i-star-empty {
+.icon-star-empty {
   background-position: -144px 0;
 }
-.i-user {
+.icon-user {
   background-position: -168px 0;
 }
-.i-film {
+.icon-film {
   background-position: -192px 0;
 }
-.i-th-large {
+.icon-th-large {
   background-position: -216px 0;
 }
-.i-th {
+.icon-th {
   background-position: -240px 0;
 }
-.i-th-list {
+.icon-th-list {
   background-position: -264px 0;
 }
-.i-ok {
+.icon-ok {
   background-position: -288px 0;
 }
-.i-remove {
+.icon-remove {
   background-position: -312px 0;
 }
-.i-zoom-in {
+.icon-zoom-in {
   background-position: -336px 0;
 }
-.i-zoom-out {
+.icon-zoom-out {
   background-position: -360px 0;
 }
-.i-off {
+.icon-off {
   background-position: -384px 0;
 }
-.i-signal {
+.icon-signal {
   background-position: -408px 0;
 }
-.i-cog {
+.icon-cog {
   background-position: -432px 0;
 }
-.i-trash {
+.icon-trash {
   background-position: -456px 0;
 }
-.i-home {
+.icon-home {
   background-position: 0 -24px;
 }
-.i-file {
+.icon-file {
   background-position: -24px -24px;
 }
-.i-time {
+.icon-time {
   background-position: -48px -24px;
 }
-.i-road {
+.icon-road {
   background-position: -72px -24px;
 }
-.i-download-alt {
+.icon-download-alt {
   background-position: -96px -24px;
 }
-.i-download {
+.icon-download {
   background-position: -120px -24px;
 }
-.i-upload {
+.icon-upload {
   background-position: -144px -24px;
 }
-.i-inbox {
+.icon-inbox {
   background-position: -168px -24px;
 }
-.i-play-circle {
+.icon-play-circle {
   background-position: -192px -24px;
 }
-.i-repeat {
+.icon-repeat {
   background-position: -216px -24px;
 }
-.i-refresh {
+.icon-refresh {
   background-position: -240px -24px;
 }
-.i-list-alt {
+.icon-list-alt {
   background-position: -264px -24px;
 }
-.i-lock {
+.icon-lock {
   background-position: -287px -24px;
 }
-.i-flag {
+.icon-flag {
   background-position: -312px -24px;
 }
-.i-headphones {
+.icon-headphones {
   background-position: -336px -24px;
 }
-.i-volume-off {
+.icon-volume-off {
   background-position: -360px -24px;
 }
-.i-volume-down {
+.icon-volume-down {
   background-position: -384px -24px;
 }
-.i-volume-up {
+.icon-volume-up {
   background-position: -408px -24px;
 }
-.i-qrcode {
+.icon-qrcode {
   background-position: -432px -24px;
 }
-.i-barcode {
+.icon-barcode {
   background-position: -456px -24px;
 }
-.i-tag {
+.icon-tag {
   background-position: 0 -48px;
 }
-.i-tags {
+.icon-tags {
   background-position: -25px -48px;
 }
-.i-book {
+.icon-book {
   background-position: -48px -48px;
 }
-.i-bookmark {
+.icon-bookmark {
   background-position: -72px -48px;
 }
-.i-print {
+.icon-print {
   background-position: -96px -48px;
 }
-.i-camera {
+.icon-camera {
   background-position: -120px -48px;
 }
-.i-font {
+.icon-font {
   background-position: -144px -48px;
 }
-.i-bold {
+.icon-bold {
   background-position: -167px -48px;
 }
-.i-italic {
+.icon-italic {
   background-position: -192px -48px;
 }
-.i-text-height {
+.icon-text-height {
   background-position: -216px -48px;
 }
-.i-text-width {
+.icon-text-width {
   background-position: -240px -48px;
 }
-.i-align-left {
+.icon-align-left {
   background-position: -264px -48px;
 }
-.i-align-center {
+.icon-align-center {
   background-position: -288px -48px;
 }
-.i-align-right {
+.icon-align-right {
   background-position: -312px -48px;
 }
-.i-align-justify {
+.icon-align-justify {
   background-position: -336px -48px;
 }
-.i-list {
+.icon-list {
   background-position: -360px -48px;
 }
-.i-indent-left {
+.icon-indent-left {
   background-position: -384px -48px;
 }
-.i-indent-right {
+.icon-indent-right {
   background-position: -408px -48px;
 }
-.i-facetime-video {
+.icon-facetime-video {
   background-position: -432px -48px;
 }
-.i-picture {
+.icon-picture {
   background-position: -456px -48px;
 }
-.i-pencil {
+.icon-pencil {
   background-position: 0 -72px;
 }
-.i-map-marker {
+.icon-map-marker {
   background-position: -24px -72px;
 }
-.i-adjust {
+.icon-adjust {
   background-position: -48px -72px;
 }
-.i-tint {
+.icon-tint {
   background-position: -72px -72px;
 }
-.i-edit {
+.icon-edit {
   background-position: -96px -72px;
 }
-.i-share {
+.icon-share {
   background-position: -120px -72px;
 }
-.i-check {
+.icon-check {
   background-position: -144px -72px;
 }
-.i-move {
+.icon-move {
   background-position: -168px -72px;
 }
-.i-step-backward {
+.icon-step-backward {
   background-position: -192px -72px;
 }
-.i-fast-backward {
+.icon-fast-backward {
   background-position: -216px -72px;
 }
-.i-backward {
+.icon-backward {
   background-position: -240px -72px;
 }
-.i-play {
+.icon-play {
   background-position: -264px -72px;
 }
-.i-pause {
+.icon-pause {
   background-position: -288px -72px;
 }
-.i-stop {
+.icon-stop {
   background-position: -312px -72px;
 }
-.i-forward {
+.icon-forward {
   background-position: -336px -72px;
 }
-.i-fast-forward {
+.icon-fast-forward {
   background-position: -360px -72px;
 }
-.i-step-forward {
+.icon-step-forward {
   background-position: -384px -72px;
 }
-.i-eject {
+.icon-eject {
   background-position: -408px -72px;
 }
-.i-chevron-left {
+.icon-chevron-left {
   background-position: -432px -72px;
 }
-.i-chevron-right {
+.icon-chevron-right {
   background-position: -456px -72px;
 }
-.i-plus-sign {
+.icon-plus-sign {
   background-position: 0 -96px;
 }
-.i-minus-sign {
+.icon-minus-sign {
   background-position: -24px -96px;
 }
-.i-remove-sign {
+.icon-remove-sign {
   background-position: -48px -96px;
 }
-.i-ok-sign {
+.icon-ok-sign {
   background-position: -72px -96px;
 }
-.i-question-sign {
+.icon-question-sign {
   background-position: -96px -96px;
 }
-.i-info-sign {
+.icon-info-sign {
   background-position: -120px -96px;
 }
-.i-screenshot {
+.icon-screenshot {
   background-position: -144px -96px;
 }
-.i-remove-circle {
+.icon-remove-circle {
   background-position: -168px -96px;
 }
-.i-ok-circle {
+.icon-ok-circle {
   background-position: -192px -96px;
 }
-.i-ban-circle {
+.icon-ban-circle {
   background-position: -216px -96px;
 }
-.i-arrow-left {
+.icon-arrow-left {
   background-position: -240px -96px;
 }
-.i-arrow-right {
+.icon-arrow-right {
   background-position: -264px -96px;
 }
-.i-arrow-up {
+.icon-arrow-up {
   background-position: -289px -96px;
 }
-.i-arrow-down {
+.icon-arrow-down {
   background-position: -312px -96px;
 }
-.i-share-alt {
+.icon-share-alt {
   background-position: -336px -96px;
 }
-.i-resize-full {
+.icon-resize-full {
   background-position: -360px -96px;
 }
-.i-resize-small {
+.icon-resize-small {
   background-position: -384px -96px;
 }
-.i-plus {
+.icon-plus {
   background-position: -408px -96px;
 }
-.i-minus {
+.icon-minus {
   background-position: -433px -96px;
 }
-.i-asterisk {
+.icon-asterisk {
   background-position: -456px -96px;
 }
-.i-exclamation-sign {
+.icon-exclamation-sign {
   background-position: 0 -120px;
 }
-.i-gift {
+.icon-gift {
   background-position: -24px -120px;
 }
-.i-leaf {
+.icon-leaf {
   background-position: -48px -120px;
 }
-.i-fire {
+.icon-fire {
   background-position: -72px -120px;
 }
-.i-eye-open {
+.icon-eye-open {
   background-position: -96px -120px;
 }
-.i-eye-close {
+.icon-eye-close {
   background-position: -120px -120px;
 }
-.i-warning-sign {
+.icon-warning-sign {
   background-position: -144px -120px;
 }
-.i-plane {
+.icon-plane {
   background-position: -168px -120px;
 }
-.i-calendar {
+.icon-calendar {
   background-position: -192px -120px;
 }
-.i-random {
+.icon-random {
   background-position: -216px -120px;
 }
-.i-comment {
+.icon-comment {
   background-position: -240px -120px;
 }
-.i-magnet {
+.icon-magnet {
   background-position: -264px -120px;
 }
-.i-chevron-up {
+.icon-chevron-up {
   background-position: -288px -120px;
 }
-.i-chevron-down {
+.icon-chevron-down {
   background-position: -313px -119px;
 }
-.i-retweet {
+.icon-retweet {
   background-position: -336px -120px;
 }
-.i-shopping-cart {
+.icon-shopping-cart {
   background-position: -360px -120px;
 }
-.i-folder-close {
+.icon-folder-close {
   background-position: -384px -120px;
 }
-.i-folder-open {
+.icon-folder-open {
   background-position: -408px -120px;
 }
-.i-resize-vertical {
+.icon-resize-vertical {
   background-position: -432px -119px;
 }
-.i-resize-horizontal {
+.icon-resize-horizontal {
   background-position: -456px -118px;
 }
 .dropdown {
@@ -2381,7 +2381,7 @@ button.btn.small, input[type="submit"].btn.small {
 .btn-navbar:active, .btn-navbar.active {
   background-color: #080808 \9;
 }
-.btn-navbar .i-bar {
+.btn-navbar .icon-bar {
   display: block;
   width: 18px;
   height: 2px;
@@ -2393,7 +2393,7 @@ button.btn.small, input[type="submit"].btn.small {
   -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
   box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
 }
-.btn-navbar .i-bar + .i-bar {
+.btn-navbar .icon-bar + .icon-bar {
   margin-top: 3px;
 }
 .nav-collapse.collapse {
diff --git a/docs/base-css.html b/docs/base-css.html
index 654775fc1..298312edd 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -34,9 +34,9 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
           <div class="nav-collapse">
@@ -931,7 +931,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
             </div>
           </div>
           <div class="control-group">
-            <label class="control-label" for="multiSelect">Multi-select</label>
+            <label class="control-label" for="multiSelect">Multicon-select</label>
             <div class="controls">
               <select multiple="multiple" id="multiSelect">
                 <option>1</option>
@@ -1303,142 +1303,142 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
   <div class="row">
     <div class="span3">
       <div class="the-icons">
-        <i class="i-glass"></i>
-        <i class="i-music"></i>
-        <i class="i-search"></i>
-        <i class="i-envelope"></i>
-        <i class="i-heart"></i>
-        <i class="i-star"></i>
-        <i class="i-star-empty"></i>
-        <i class="i-user"></i>
-        <i class="i-film"></i>
-        <i class="i-th-large"></i>
-        <i class="i-th"></i>
-        <i class="i-th-list"></i>
-        <i class="i-ok"></i>
-        <i class="i-remove"></i>
-        <i class="i-zoom-in"></i>
-        <i class="i-zoom-out"></i>
-        <i class="i-off"></i>
-        <i class="i-signal"></i>
-        <i class="i-cog"></i>
-        <i class="i-trash"></i>
-
-        <i class="i-home"></i>
-        <i class="i-file"></i>
-        <i class="i-time"></i>
-        <i class="i-road"></i>
-        <i class="i-download-alt"></i>
-        <i class="i-download"></i>
-        <i class="i-upload"></i>
-        <i class="i-inbox"></i>
-        <i class="i-play-circle"></i>
-        <i class="i-repeat"></i>
+        <i class="icon-glass"></i>
+        <i class="icon-music"></i>
+        <i class="icon-search"></i>
+        <i class="icon-envelope"></i>
+        <i class="icon-heart"></i>
+        <i class="icon-star"></i>
+        <i class="icon-star-empty"></i>
+        <i class="icon-user"></i>
+        <i class="icon-film"></i>
+        <i class="icon-th-large"></i>
+        <i class="icon-th"></i>
+        <i class="icon-th-list"></i>
+        <i class="icon-ok"></i>
+        <i class="icon-remove"></i>
+        <i class="icon-zoom-in"></i>
+        <i class="icon-zoom-out"></i>
+        <i class="icon-off"></i>
+        <i class="icon-signal"></i>
+        <i class="icon-cog"></i>
+        <i class="icon-trash"></i>
+
+        <i class="icon-home"></i>
+        <i class="icon-file"></i>
+        <i class="icon-time"></i>
+        <i class="icon-road"></i>
+        <i class="icon-download-alt"></i>
+        <i class="icon-download"></i>
+        <i class="icon-upload"></i>
+        <i class="icon-inbox"></i>
+        <i class="icon-play-circle"></i>
+        <i class="icon-repeat"></i>
       </div>
     </div>
     <div class="span3">
       <div class="the-icons">
-        <i class="i-refresh"></i>
-        <i class="i-list-alt"></i>
-        <i class="i-lock"></i>
-        <i class="i-flag"></i>
-        <i class="i-headphones"></i>
-        <i class="i-volume-off"></i>
-        <i class="i-volume-down"></i>
-        <i class="i-volume-up"></i>
-        <i class="i-qrcode"></i>
-        <i class="i-barcode"></i>
-
-        <i class="i-tag"></i>
-        <i class="i-tags"></i>
-        <i class="i-book"></i>
-        <i class="i-bookmark"></i>
-        <i class="i-print"></i>
-        <i class="i-camera"></i>
-        <i class="i-font"></i>
-        <i class="i-bold"></i>
-        <i class="i-italic"></i>
-        <i class="i-text-height"></i>
-        <i class="i-text-width"></i>
-        <i class="i-align-left"></i>
-        <i class="i-align-center"></i>
-        <i class="i-align-right"></i>
-        <i class="i-align-justify"></i>
-        <i class="i-list"></i>
-        <i class="i-indent-left"></i>
-        <i class="i-indent-right"></i>
-        <i class="i-facetime-video"></i>
-        <i class="i-picture"></i>
+        <i class="icon-refresh"></i>
+        <i class="icon-list-alt"></i>
+        <i class="icon-lock"></i>
+        <i class="icon-flag"></i>
+        <i class="icon-headphones"></i>
+        <i class="icon-volume-off"></i>
+        <i class="icon-volume-down"></i>
+        <i class="icon-volume-up"></i>
+        <i class="icon-qrcode"></i>
+        <i class="icon-barcode"></i>
+
+        <i class="icon-tag"></i>
+        <i class="icon-tags"></i>
+        <i class="icon-book"></i>
+        <i class="icon-bookmark"></i>
+        <i class="icon-print"></i>
+        <i class="icon-camera"></i>
+        <i class="icon-font"></i>
+        <i class="icon-bold"></i>
+        <i class="icon-italic"></i>
+        <i class="icon-text-height"></i>
+        <i class="icon-text-width"></i>
+        <i class="icon-align-left"></i>
+        <i class="icon-align-center"></i>
+        <i class="icon-align-right"></i>
+        <i class="icon-align-justify"></i>
+        <i class="icon-list"></i>
+        <i class="icon-indent-left"></i>
+        <i class="icon-indent-right"></i>
+        <i class="icon-facetime-video"></i>
+        <i class="icon-picture"></i>
       </div>
     </div>
     <div class="span3">
       <div class="the-icons">
-        <i class="i-pencil"></i>
-        <i class="i-map-marker"></i>
-        <i class="i-adjust"></i>
-        <i class="i-tint"></i>
-        <i class="i-edit"></i>
-        <i class="i-share"></i>
-        <i class="i-check"></i>
-        <i class="i-move"></i>
-        <i class="i-step-backward"></i>
-        <i class="i-fast-backward"></i>
-        <i class="i-backward"></i>
-        <i class="i-play"></i>
-        <i class="i-pause"></i>
-        <i class="i-stop"></i>
-        <i class="i-forward"></i>
-        <i class="i-fast-forward"></i>
-        <i class="i-step-forward"></i>
-        <i class="i-eject"></i>
-        <i class="i-chevron-left"></i>
-        <i class="i-chevron-right"></i>
-
-        <i class="i-plus-sign"></i>
-        <i class="i-minus-sign"></i>
-        <i class="i-remove-sign"></i>
-        <i class="i-ok-sign"></i>
-        <i class="i-question-sign"></i>
-        <i class="i-info-sign"></i>
-        <i class="i-screenshot"></i>
-        <i class="i-remove-circle"></i>
-        <i class="i-ok-circle"></i>
-        <i class="i-ban-circle"></i>
+        <i class="icon-pencil"></i>
+        <i class="icon-map-marker"></i>
+        <i class="icon-adjust"></i>
+        <i class="icon-tint"></i>
+        <i class="icon-edit"></i>
+        <i class="icon-share"></i>
+        <i class="icon-check"></i>
+        <i class="icon-move"></i>
+        <i class="icon-step-backward"></i>
+        <i class="icon-fast-backward"></i>
+        <i class="icon-backward"></i>
+        <i class="icon-play"></i>
+        <i class="icon-pause"></i>
+        <i class="icon-stop"></i>
+        <i class="icon-forward"></i>
+        <i class="icon-fast-forward"></i>
+        <i class="icon-step-forward"></i>
+        <i class="icon-eject"></i>
+        <i class="icon-chevron-left"></i>
+        <i class="icon-chevron-right"></i>
+
+        <i class="icon-plus-sign"></i>
+        <i class="icon-minus-sign"></i>
+        <i class="icon-remove-sign"></i>
+        <i class="icon-ok-sign"></i>
+        <i class="icon-question-sign"></i>
+        <i class="icon-info-sign"></i>
+        <i class="icon-screenshot"></i>
+        <i class="icon-remove-circle"></i>
+        <i class="icon-ok-circle"></i>
+        <i class="icon-ban-circle"></i>
       </div>
     </div>
     <div class="span3">
       <div class="the-icons">
-        <i class="i-arrow-left"></i>
-        <i class="i-arrow-right"></i>
-        <i class="i-arrow-up"></i>
-        <i class="i-arrow-down"></i>
-        <i class="i-share-alt"></i>
-        <i class="i-resize-full"></i>
-        <i class="i-resize-small"></i>
-        <i class="i-plus"></i>
-        <i class="i-minus"></i>
-        <i class="i-asterisk"></i>
-
-        <i class="i-exclamation-sign"></i>
-        <i class="i-gift"></i>
-        <i class="i-leaf"></i>
-        <i class="i-fire"></i>
-        <i class="i-eye-open"></i>
-        <i class="i-eye-close"></i>
-        <i class="i-warning-sign"></i>
-        <i class="i-plane"></i>
-        <i class="i-calendar"></i>
-        <i class="i-random"></i>
-        <i class="i-comment"></i>
-        <i class="i-magnet"></i>
-        <i class="i-chevron-up"></i>
-        <i class="i-chevron-down"></i>
-        <i class="i-retweet"></i>
-        <i class="i-shopping-cart"></i>
-        <i class="i-folder-close"></i>
-        <i class="i-folder-open"></i>
-        <i class="i-resize-vertical"></i>
-        <i class="i-resize-horizontal"></i>
+        <i class="icon-arrow-left"></i>
+        <i class="icon-arrow-right"></i>
+        <i class="icon-arrow-up"></i>
+        <i class="icon-arrow-down"></i>
+        <i class="icon-share-alt"></i>
+        <i class="icon-resize-full"></i>
+        <i class="icon-resize-small"></i>
+        <i class="icon-plus"></i>
+        <i class="icon-minus"></i>
+        <i class="icon-asterisk"></i>
+
+        <i class="icon-exclamation-sign"></i>
+        <i class="icon-gift"></i>
+        <i class="icon-leaf"></i>
+        <i class="icon-fire"></i>
+        <i class="icon-eye-open"></i>
+        <i class="icon-eye-close"></i>
+        <i class="icon-warning-sign"></i>
+        <i class="icon-plane"></i>
+        <i class="icon-calendar"></i>
+        <i class="icon-random"></i>
+        <i class="icon-comment"></i>
+        <i class="icon-magnet"></i>
+        <i class="icon-chevron-up"></i>
+        <i class="icon-chevron-down"></i>
+        <i class="icon-retweet"></i>
+        <i class="icon-shopping-cart"></i>
+        <i class="icon-folder-close"></i>
+        <i class="icon-folder-open"></i>
+        <i class="icon-resize-vertical"></i>
+        <i class="icon-resize-horizontal"></i>
       </div>
     </div>
   </div>
@@ -1452,18 +1452,18 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
     <div class="span4">
       <h3>Built as a sprite</h3>
       <p>Instead of making every icon an extra request, we've compiled them into a sprite&mdash;a bunch of images in one file that uses CSS to position the images with <code>background-position</code>. This is the same method we use on Twitter.com and it has worked well for us.</p>
-      <p>All icons classes are prefixed with <code>.i-</code> for proper namespacing and scoping, much like our other components. This will help avoid conflicts with other tools.</p>
+      <p>All icons classes are prefixed with <code>.icon-</code> for proper namespacing and scoping, much like our other components. This will help avoid conflicts with other tools.</p>
       <p><a href="http://glyphicons.com" target="_blank">Glyphicons</a> has granted us use of the Halflings set in our open-source toolkit so long as we provide a link and credit here in the docs. Please consider doing the same in your projects.</p>
     </div>
     <div class="span4">
       <h3>How to use</h3>
       <p>With v2.0.0, we have opted to use an <code>&lt;i&gt;</code> tag for all our icons, but they have no case class&mdash;only a shared prefix. To use, place the following code just about anywhere:</p>
 <pre class="prettyprint linenums">
-&lt;i class="i-search"&gt;&lt;/i&gt;
+&lt;i class="icon-search"&gt;&lt;/i&gt;
 </pre>
       <p>There are also styles available for inverted (white) icons, made ready with one extra class:</p>
 <pre class="prettyprint linenums">
-&lt;i class="i-search i-white"&gt;&lt;/i&gt;
+&lt;i class="icon-search icon-white"&gt;&lt;/i&gt;
 </pre>
       <p>There are 120 classes to choose from for your icons. Just add an <code>&lt;i&gt;</code> tag with the right classes and you're set. You can find the full list in <strong>sprites.less</strong> or right here in this document.</p>
     </div>
@@ -1486,40 +1486,40 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
     <div class="span4">
       <div class="btn-toolbar" style="margin-bottom: 9px">
         <div class="btn-group">
-          <a class="btn" href="#"><i class="i-align-left"></i></a>
-          <a class="btn" href="#"><i class="i-align-center"></i></a>
-          <a class="btn" href="#"><i class="i-align-right"></i></a>
-          <a class="btn" href="#"><i class="i-align-justify"></i></a>
+          <a class="btn" href="#"><i class="icon-align-left"></i></a>
+          <a class="btn" href="#"><i class="icon-align-center"></i></a>
+          <a class="btn" href="#"><i class="icon-align-right"></i></a>
+          <a class="btn" href="#"><i class="icon-align-justify"></i></a>
         </div>
         <div class="btn-group">
           <a class="btn btn-primary" href="#"><i class="icon white user"></i> User</a>
           <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="#"><i class="i-pencil"></i> Edit</a></li>
-            <li><a href="#"><i class="i-trash"></i> Delete</a></li>
-            <li><a href="#"><i class="i-ban-circle"></i> Ban</a></li>
+            <li><a href="#"><i class="icon-pencil"></i> Edit</a></li>
+            <li><a href="#"><i class="icon-trash"></i> Delete</a></li>
+            <li><a href="#"><i class="icon-ban-circle"></i> Ban</a></li>
             <li class="divider"></li>
             <li><a href="#"><i class="i"></i> Make admin</a></li>
           </ul>
         </div>
       </div>
       <p>
-        <a class="btn" href="#"><i class="i-refresh"></i> Refresh</a>
-        <a class="btn btn-success" href="#"><i class="i-shopping-cart i-white"></i> Checkout</a>
-        <a class="btn btn-danger" href="#"><i class="i-trash i-white"></i> Delete</a>
+        <a class="btn" href="#"><i class="icon-refresh"></i> Refresh</a>
+        <a class="btn btn-success" href="#"><i class="icon-shopping-cart icon-white"></i> Checkout</a>
+        <a class="btn btn-danger" href="#"><i class="icon-trash icon-white"></i> Delete</a>
       </p>
       <p>
-        <a class="btn btn-large" href="#"><i class="i-comment"></i> Comment</a>
-        <a class="btn btn-small" href="#"><i class="i-cog"></i> Settings</a>
-        <a class="btn btn-small btn-info" href="#"><i class="i-info-sign i-white"></i> More Info</a>
+        <a class="btn btn-large" href="#"><i class="icon-comment"></i> Comment</a>
+        <a class="btn btn-small" href="#"><i class="icon-cog"></i> Settings</a>
+        <a class="btn btn-small btn-info" href="#"><i class="icon-info-sign icon-white"></i> More Info</a>
       </p>
     </div>
     <div class="span4">
       <div class="well" style="padding: 8px 0;">
         <ul class="nav nav-list">
-          <li class="active"><a href="#"><i class="i-home i-white"></i> Home</a></li>
-          <li><a href="#"><i class="i-book"></i> Library</a></li>
-          <li><a href="#"><i class="i-pencil"></i> Applications</a></li>
+          <li class="active"><a href="#"><i class="icon-home icon-white"></i> Home</a></li>
+          <li><a href="#"><i class="icon-book"></i> Library</a></li>
+          <li><a href="#"><i class="icon-pencil"></i> Applications</a></li>
           <li><a href="#"><i class="i"></i> Misc</a></li>
         </ul>
       </div> <!-- /well -->
@@ -1530,7 +1530,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
           <label class="control-label" for="prependedInput">Email address</label>
           <div class="controls">
             <div class="input-prepend">
-              <span class="add-on"><i class="i-envelope"></i></span>
+              <span class="add-on"><i class="icon-envelope"></i></span>
               <input class="span2" id="iconInput" type="text">
             </div>
           </div>
diff --git a/docs/components.html b/docs/components.html
index a26fed219..af15572dc 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -34,9 +34,9 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
           <div class="nav-collapse">
@@ -548,13 +548,13 @@
       <div class="well" style="padding: 8px 0;">
         <ul class="nav nav-list">
           <li class="nav-header">List header</li>
-          <li class="active"><a href="#"><i class="i-white i-home"></i> Home</a></li>
-          <li><a href="#"><i class="i-book"></i> Library</a></li>
-          <li><a href="#"><i class="i-pencil"></i> Applications</a></li>
+          <li class="active"><a href="#"><i class="icon-white icon-home"></i> Home</a></li>
+          <li><a href="#"><i class="icon-book"></i> Library</a></li>
+          <li><a href="#"><i class="icon-pencil"></i> Applications</a></li>
           <li class="nav-header">Another list header</li>
-          <li><a href="#"><i class="i-user"></i> Profile</a></li>
-          <li><a href="#"><i class="i-cog"></i> Settings</a></li>
-          <li><a href="#"><i class="i-flag"></i> Help</a></li>
+          <li><a href="#"><i class="icon-user"></i> Profile</a></li>
+          <li><a href="#"><i class="icon-cog"></i> Settings</a></li>
+          <li><a href="#"><i class="icon-flag"></i> Help</a></li>
         </ul>
       </div> <!-- /well -->
 <pre class="prettyprint linenums">
@@ -562,7 +562,7 @@
   ...
   &lt;li&gt;
     &lt;a href="#"&gt;
-      &lt;i class="i-book"&gt;&lt;/i&gt;
+      &lt;i class="icon-book"&gt;&lt;/i&gt;
       Library
     &lt;/a&gt;
   &lt;/li&gt;
@@ -744,9 +744,9 @@
     <div class="navbar-inner">
       <div class="container" style="width: auto;">
         <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-          <span class="i-bar"></span>
-          <span class="i-bar"></span>
-          <span class="i-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
         </a>
         <a class="brand" href="#">Project name</a>
         <div class="nav-collapse">
@@ -830,9 +830,9 @@
       
       &lt;!-- .btn-navbar is used as the toggle for collapsed navbar content --&gt;
       &lt;a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"&gt;
-        &lt;span class="i-bar"&gt;&lt;/span&gt;
-        &lt;span class="i-bar"&gt;&lt;/span&gt;
-        &lt;span class="i-bar"&gt;&lt;/span&gt;
+        &lt;span class="icon-bar"&gt;&lt;/span&gt;
+        &lt;span class="icon-bar"&gt;&lt;/span&gt;
+        &lt;span class="icon-bar"&gt;&lt;/span&gt;
       &lt;/a&gt;
       
       &lt;!-- Be sure to leave the brand out there if you want it shown --&gt;
@@ -946,7 +946,7 @@
     <h1>Pagination <small>Two options for paging through content</small></h1>
   </div>
 
-  <h2>Multi-page pagination</h2>
+  <h2>Multicon-page pagination</h2>
   <div class="row">
     <div class="span4">
       <h3>When to use</h3>
diff --git a/docs/download.html b/docs/download.html
index ea096d290..8367e2e83 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -34,9 +34,9 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
           <div class="nav-collapse">
diff --git a/docs/examples.html b/docs/examples.html
index 43c0ad496..83188c77f 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -34,9 +34,9 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
           <div class="nav-collapse">
diff --git a/docs/index.html b/docs/index.html
index 71c2970a0..d74424852 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -34,9 +34,9 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
           <div class="nav-collapse">
diff --git a/docs/javascript.html b/docs/javascript.html
index 0c064a6ac..188d26e34 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -34,9 +34,9 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
           <div class="nav-collapse">
diff --git a/docs/less.html b/docs/less.html
index 996ad31b9..0bc7a71ac 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -34,9 +34,9 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
           <div class="nav-collapse">
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 813ec27ae..e41bb2fb7 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -34,9 +34,9 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
           <div class="nav-collapse">
@@ -265,8 +265,8 @@
     <div class="span6">
       <h2>Fixed layout</h2>
       <p>The default and simple 940px-wide, centered layout for just about any website or page provided by a single <code>&lt;div class="container"&gt;</code>.</p>
-      <div class="mini-layout">
-        <div class="mini-layout-body"></div>
+      <div class="minicon-layout">
+        <div class="minicon-layout-body"></div>
       </div>
 <pre class="prettyprint linenums">
 &lt;body&gt;
@@ -279,9 +279,9 @@
     <div class="span6">
       <h2>Fluid layout</h2>
       <p><code>&lt;div class="container-fluid"&gt;</code> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.</p>
-      <div class="mini-layout fluid">
-        <div class="mini-layout-sidebar"></div>
-        <div class="mini-layout-body"></div>
+      <div class="minicon-layout fluid">
+        <div class="minicon-layout-sidebar"></div>
+        <div class="minicon-layout-body"></div>
       </div>
 <pre class="prettyprint linenums">
 &lt;div class="container-fluid"&gt;
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 6923be7dc..77f584cd1 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -34,9 +34,9 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
           <div class="nav-collapse">
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 7b174d604..4d9533522 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -855,7 +855,7 @@
             </div>
           </div>
           <div class="control-group">
-            <label class="control-label" for="multiSelect">{{_i}}Multi-select{{/i}}</label>
+            <label class="control-label" for="multiSelect">{{_i}}Multicon-select{{/i}}</label>
             <div class="controls">
               <select multiple="multiple" id="multiSelect">
                 <option>1</option>
@@ -1227,142 +1227,142 @@
   <div class="row">
     <div class="span3">
       <div class="the-icons">
-        <i class="i-glass"></i>
-        <i class="i-music"></i>
-        <i class="i-search"></i>
-        <i class="i-envelope"></i>
-        <i class="i-heart"></i>
-        <i class="i-star"></i>
-        <i class="i-star-empty"></i>
-        <i class="i-user"></i>
-        <i class="i-film"></i>
-        <i class="i-th-large"></i>
-        <i class="i-th"></i>
-        <i class="i-th-list"></i>
-        <i class="i-ok"></i>
-        <i class="i-remove"></i>
-        <i class="i-zoom-in"></i>
-        <i class="i-zoom-out"></i>
-        <i class="i-off"></i>
-        <i class="i-signal"></i>
-        <i class="i-cog"></i>
-        <i class="i-trash"></i>
+        <i class="icon-glass"></i>
+        <i class="icon-music"></i>
+        <i class="icon-search"></i>
+        <i class="icon-envelope"></i>
+        <i class="icon-heart"></i>
+        <i class="icon-star"></i>
+        <i class="icon-star-empty"></i>
+        <i class="icon-user"></i>
+        <i class="icon-film"></i>
+        <i class="icon-th-large"></i>
+        <i class="icon-th"></i>
+        <i class="icon-th-list"></i>
+        <i class="icon-ok"></i>
+        <i class="icon-remove"></i>
+        <i class="icon-zoom-in"></i>
+        <i class="icon-zoom-out"></i>
+        <i class="icon-off"></i>
+        <i class="icon-signal"></i>
+        <i class="icon-cog"></i>
+        <i class="icon-trash"></i>
 
-        <i class="i-home"></i>
-        <i class="i-file"></i>
-        <i class="i-time"></i>
-        <i class="i-road"></i>
-        <i class="i-download-alt"></i>
-        <i class="i-download"></i>
-        <i class="i-upload"></i>
-        <i class="i-inbox"></i>
-        <i class="i-play-circle"></i>
-        <i class="i-repeat"></i>
+        <i class="icon-home"></i>
+        <i class="icon-file"></i>
+        <i class="icon-time"></i>
+        <i class="icon-road"></i>
+        <i class="icon-download-alt"></i>
+        <i class="icon-download"></i>
+        <i class="icon-upload"></i>
+        <i class="icon-inbox"></i>
+        <i class="icon-play-circle"></i>
+        <i class="icon-repeat"></i>
       </div>
     </div>
     <div class="span3">
       <div class="the-icons">
-        <i class="i-refresh"></i>
-        <i class="i-list-alt"></i>
-        <i class="i-lock"></i>
-        <i class="i-flag"></i>
-        <i class="i-headphones"></i>
-        <i class="i-volume-off"></i>
-        <i class="i-volume-down"></i>
-        <i class="i-volume-up"></i>
-        <i class="i-qrcode"></i>
-        <i class="i-barcode"></i>
+        <i class="icon-refresh"></i>
+        <i class="icon-list-alt"></i>
+        <i class="icon-lock"></i>
+        <i class="icon-flag"></i>
+        <i class="icon-headphones"></i>
+        <i class="icon-volume-off"></i>
+        <i class="icon-volume-down"></i>
+        <i class="icon-volume-up"></i>
+        <i class="icon-qrcode"></i>
+        <i class="icon-barcode"></i>
 
-        <i class="i-tag"></i>
-        <i class="i-tags"></i>
-        <i class="i-book"></i>
-        <i class="i-bookmark"></i>
-        <i class="i-print"></i>
-        <i class="i-camera"></i>
-        <i class="i-font"></i>
-        <i class="i-bold"></i>
-        <i class="i-italic"></i>
-        <i class="i-text-height"></i>
-        <i class="i-text-width"></i>
-        <i class="i-align-left"></i>
-        <i class="i-align-center"></i>
-        <i class="i-align-right"></i>
-        <i class="i-align-justify"></i>
-        <i class="i-list"></i>
-        <i class="i-indent-left"></i>
-        <i class="i-indent-right"></i>
-        <i class="i-facetime-video"></i>
-        <i class="i-picture"></i>
+        <i class="icon-tag"></i>
+        <i class="icon-tags"></i>
+        <i class="icon-book"></i>
+        <i class="icon-bookmark"></i>
+        <i class="icon-print"></i>
+        <i class="icon-camera"></i>
+        <i class="icon-font"></i>
+        <i class="icon-bold"></i>
+        <i class="icon-italic"></i>
+        <i class="icon-text-height"></i>
+        <i class="icon-text-width"></i>
+        <i class="icon-align-left"></i>
+        <i class="icon-align-center"></i>
+        <i class="icon-align-right"></i>
+        <i class="icon-align-justify"></i>
+        <i class="icon-list"></i>
+        <i class="icon-indent-left"></i>
+        <i class="icon-indent-right"></i>
+        <i class="icon-facetime-video"></i>
+        <i class="icon-picture"></i>
       </div>
     </div>
     <div class="span3">
       <div class="the-icons">
-        <i class="i-pencil"></i>
-        <i class="i-map-marker"></i>
-        <i class="i-adjust"></i>
-        <i class="i-tint"></i>
-        <i class="i-edit"></i>
-        <i class="i-share"></i>
-        <i class="i-check"></i>
-        <i class="i-move"></i>
-        <i class="i-step-backward"></i>
-        <i class="i-fast-backward"></i>
-        <i class="i-backward"></i>
-        <i class="i-play"></i>
-        <i class="i-pause"></i>
-        <i class="i-stop"></i>
-        <i class="i-forward"></i>
-        <i class="i-fast-forward"></i>
-        <i class="i-step-forward"></i>
-        <i class="i-eject"></i>
-        <i class="i-chevron-left"></i>
-        <i class="i-chevron-right"></i>
+        <i class="icon-pencil"></i>
+        <i class="icon-map-marker"></i>
+        <i class="icon-adjust"></i>
+        <i class="icon-tint"></i>
+        <i class="icon-edit"></i>
+        <i class="icon-share"></i>
+        <i class="icon-check"></i>
+        <i class="icon-move"></i>
+        <i class="icon-step-backward"></i>
+        <i class="icon-fast-backward"></i>
+        <i class="icon-backward"></i>
+        <i class="icon-play"></i>
+        <i class="icon-pause"></i>
+        <i class="icon-stop"></i>
+        <i class="icon-forward"></i>
+        <i class="icon-fast-forward"></i>
+        <i class="icon-step-forward"></i>
+        <i class="icon-eject"></i>
+        <i class="icon-chevron-left"></i>
+        <i class="icon-chevron-right"></i>
 
-        <i class="i-plus-sign"></i>
-        <i class="i-minus-sign"></i>
-        <i class="i-remove-sign"></i>
-        <i class="i-ok-sign"></i>
-        <i class="i-question-sign"></i>
-        <i class="i-info-sign"></i>
-        <i class="i-screenshot"></i>
-        <i class="i-remove-circle"></i>
-        <i class="i-ok-circle"></i>
-        <i class="i-ban-circle"></i>
+        <i class="icon-plus-sign"></i>
+        <i class="icon-minus-sign"></i>
+        <i class="icon-remove-sign"></i>
+        <i class="icon-ok-sign"></i>
+        <i class="icon-question-sign"></i>
+        <i class="icon-info-sign"></i>
+        <i class="icon-screenshot"></i>
+        <i class="icon-remove-circle"></i>
+        <i class="icon-ok-circle"></i>
+        <i class="icon-ban-circle"></i>
       </div>
     </div>
     <div class="span3">
       <div class="the-icons">
-        <i class="i-arrow-left"></i>
-        <i class="i-arrow-right"></i>
-        <i class="i-arrow-up"></i>
-        <i class="i-arrow-down"></i>
-        <i class="i-share-alt"></i>
-        <i class="i-resize-full"></i>
-        <i class="i-resize-small"></i>
-        <i class="i-plus"></i>
-        <i class="i-minus"></i>
-        <i class="i-asterisk"></i>
+        <i class="icon-arrow-left"></i>
+        <i class="icon-arrow-right"></i>
+        <i class="icon-arrow-up"></i>
+        <i class="icon-arrow-down"></i>
+        <i class="icon-share-alt"></i>
+        <i class="icon-resize-full"></i>
+        <i class="icon-resize-small"></i>
+        <i class="icon-plus"></i>
+        <i class="icon-minus"></i>
+        <i class="icon-asterisk"></i>
 
-        <i class="i-exclamation-sign"></i>
-        <i class="i-gift"></i>
-        <i class="i-leaf"></i>
-        <i class="i-fire"></i>
-        <i class="i-eye-open"></i>
-        <i class="i-eye-close"></i>
-        <i class="i-warning-sign"></i>
-        <i class="i-plane"></i>
-        <i class="i-calendar"></i>
-        <i class="i-random"></i>
-        <i class="i-comment"></i>
-        <i class="i-magnet"></i>
-        <i class="i-chevron-up"></i>
-        <i class="i-chevron-down"></i>
-        <i class="i-retweet"></i>
-        <i class="i-shopping-cart"></i>
-        <i class="i-folder-close"></i>
-        <i class="i-folder-open"></i>
-        <i class="i-resize-vertical"></i>
-        <i class="i-resize-horizontal"></i>
+        <i class="icon-exclamation-sign"></i>
+        <i class="icon-gift"></i>
+        <i class="icon-leaf"></i>
+        <i class="icon-fire"></i>
+        <i class="icon-eye-open"></i>
+        <i class="icon-eye-close"></i>
+        <i class="icon-warning-sign"></i>
+        <i class="icon-plane"></i>
+        <i class="icon-calendar"></i>
+        <i class="icon-random"></i>
+        <i class="icon-comment"></i>
+        <i class="icon-magnet"></i>
+        <i class="icon-chevron-up"></i>
+        <i class="icon-chevron-down"></i>
+        <i class="icon-retweet"></i>
+        <i class="icon-shopping-cart"></i>
+        <i class="icon-folder-close"></i>
+        <i class="icon-folder-open"></i>
+        <i class="icon-resize-vertical"></i>
+        <i class="icon-resize-horizontal"></i>
       </div>
     </div>
   </div>
@@ -1376,18 +1376,18 @@
     <div class="span4">
       <h3>{{_i}}Built as a sprite{{/i}}</h3>
       <p>{{_i}}Instead of making every icon an extra request, we've compiled them into a sprite&mdash;a bunch of images in one file that uses CSS to position the images with <code>background-position</code>. This is the same method we use on Twitter.com and it has worked well for us.{{/i}}</p>
-      <p>{{_i}}All icons classes are prefixed with <code>.i-</code> for proper namespacing and scoping, much like our other components. This will help avoid conflicts with other tools.{{/i}}</p>
+      <p>{{_i}}All icons classes are prefixed with <code>.icon-</code> for proper namespacing and scoping, much like our other components. This will help avoid conflicts with other tools.{{/i}}</p>
       <p>{{_i}}<a href="http://glyphicons.com" target="_blank">Glyphicons</a> has granted us use of the Halflings set in our open-source toolkit so long as we provide a link and credit here in the docs. Please consider doing the same in your projects.{{/i}}</p>
     </div>
     <div class="span4">
       <h3>{{_i}}How to use{{/i}}</h3>
       <p>{{_i}}With v2.0.0, we have opted to use an <code>&lt;i&gt;</code> tag for all our icons, but they have no case class&mdash;only a shared prefix. To use, place the following code just about anywhere:{{/i}}</p>
 <pre class="prettyprint linenums">
-&lt;i class="i-search"&gt;&lt;/i&gt;
+&lt;i class="icon-search"&gt;&lt;/i&gt;
 </pre>
       <p>{{_i}}There are also styles available for inverted (white) icons, made ready with one extra class:{{/i}}</p>
 <pre class="prettyprint linenums">
-&lt;i class="i-search i-white"&gt;&lt;/i&gt;
+&lt;i class="icon-search icon-white"&gt;&lt;/i&gt;
 </pre>
       <p>{{_i}}There are 120 classes to choose from for your icons. Just add an <code>&lt;i&gt;</code> tag with the right classes and you're set. You can find the full list in <strong>sprites.less</strong> or right here in this document.{{/i}}</p>
     </div>
@@ -1410,40 +1410,40 @@
     <div class="span4">
       <div class="btn-toolbar" style="margin-bottom: 9px">
         <div class="btn-group">
-          <a class="btn" href="#"><i class="i-align-left"></i></a>
-          <a class="btn" href="#"><i class="i-align-center"></i></a>
-          <a class="btn" href="#"><i class="i-align-right"></i></a>
-          <a class="btn" href="#"><i class="i-align-justify"></i></a>
+          <a class="btn" href="#"><i class="icon-align-left"></i></a>
+          <a class="btn" href="#"><i class="icon-align-center"></i></a>
+          <a class="btn" href="#"><i class="icon-align-right"></i></a>
+          <a class="btn" href="#"><i class="icon-align-justify"></i></a>
         </div>
         <div class="btn-group">
           <a class="btn btn-primary" href="#"><i class="icon white user"></i> {{_i}}User{{/i}}</a>
           <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="#"><i class="i-pencil"></i> {{_i}}Edit{{/i}}</a></li>
-            <li><a href="#"><i class="i-trash"></i> {{_i}}Delete{{/i}}</a></li>
-            <li><a href="#"><i class="i-ban-circle"></i> {{_i}}Ban{{/i}}</a></li>
+            <li><a href="#"><i class="icon-pencil"></i> {{_i}}Edit{{/i}}</a></li>
+            <li><a href="#"><i class="icon-trash"></i> {{_i}}Delete{{/i}}</a></li>
+            <li><a href="#"><i class="icon-ban-circle"></i> {{_i}}Ban{{/i}}</a></li>
             <li class="divider"></li>
             <li><a href="#"><i class="i"></i> {{_i}}Make admin{{/i}}</a></li>
           </ul>
         </div>
       </div>
       <p>
-        <a class="btn" href="#"><i class="i-refresh"></i> {{_i}}Refresh{{/i}}</a>
-        <a class="btn btn-success" href="#"><i class="i-shopping-cart i-white"></i> {{_i}}Checkout{{/i}}</a>
-        <a class="btn btn-danger" href="#"><i class="i-trash i-white"></i> {{_i}}Delete{{/i}}</a>
+        <a class="btn" href="#"><i class="icon-refresh"></i> {{_i}}Refresh{{/i}}</a>
+        <a class="btn btn-success" href="#"><i class="icon-shopping-cart icon-white"></i> {{_i}}Checkout{{/i}}</a>
+        <a class="btn btn-danger" href="#"><i class="icon-trash icon-white"></i> {{_i}}Delete{{/i}}</a>
       </p>
       <p>
-        <a class="btn btn-large" href="#"><i class="i-comment"></i> {{_i}}Comment{{/i}}</a>
-        <a class="btn btn-small" href="#"><i class="i-cog"></i> {{_i}}Settings{{/i}}</a>
-        <a class="btn btn-small btn-info" href="#"><i class="i-info-sign i-white"></i> {{_i}}More Info{{/i}}</a>
+        <a class="btn btn-large" href="#"><i class="icon-comment"></i> {{_i}}Comment{{/i}}</a>
+        <a class="btn btn-small" href="#"><i class="icon-cog"></i> {{_i}}Settings{{/i}}</a>
+        <a class="btn btn-small btn-info" href="#"><i class="icon-info-sign icon-white"></i> {{_i}}More Info{{/i}}</a>
       </p>
     </div>
     <div class="span4">
       <div class="well" style="padding: 8px 0;">
         <ul class="nav nav-list">
-          <li class="active"><a href="#"><i class="i-home i-white"></i> {{_i}}Home{{/i}}</a></li>
-          <li><a href="#"><i class="i-book"></i> {{_i}}Library{{/i}}</a></li>
-          <li><a href="#"><i class="i-pencil"></i> {{_i}}Applications{{/i}}</a></li>
+          <li class="active"><a href="#"><i class="icon-home icon-white"></i> {{_i}}Home{{/i}}</a></li>
+          <li><a href="#"><i class="icon-book"></i> {{_i}}Library{{/i}}</a></li>
+          <li><a href="#"><i class="icon-pencil"></i> {{_i}}Applications{{/i}}</a></li>
           <li><a href="#"><i class="i"></i> {{_i}}Misc{{/i}}</a></li>
         </ul>
       </div> <!-- /well -->
@@ -1454,7 +1454,7 @@
           <label class="control-label" for="prependedInput">{{_i}}Email address{{/i}}</label>
           <div class="controls">
             <div class="input-prepend">
-              <span class="add-on"><i class="i-envelope"></i></span>
+              <span class="add-on"><i class="icon-envelope"></i></span>
               <input class="span2" id="iconInput" type="text">
             </div>
           </div>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 69ee4c16a..d26abba7b 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -472,13 +472,13 @@
       <div class="well" style="padding: 8px 0;">
         <ul class="nav nav-list">
           <li class="nav-header">{{_i}}List header{{/i}}</li>
-          <li class="active"><a href="#"><i class="i-white i-home"></i> {{_i}}Home{{/i}}</a></li>
-          <li><a href="#"><i class="i-book"></i> {{_i}}Library{{/i}}</a></li>
-          <li><a href="#"><i class="i-pencil"></i> {{_i}}Applications{{/i}}</a></li>
+          <li class="active"><a href="#"><i class="icon-white icon-home"></i> {{_i}}Home{{/i}}</a></li>
+          <li><a href="#"><i class="icon-book"></i> {{_i}}Library{{/i}}</a></li>
+          <li><a href="#"><i class="icon-pencil"></i> {{_i}}Applications{{/i}}</a></li>
           <li class="nav-header">{{_i}}Another list header{{/i}}</li>
-          <li><a href="#"><i class="i-user"></i> {{_i}}Profile{{/i}}</a></li>
-          <li><a href="#"><i class="i-cog"></i> {{_i}}Settings{{/i}}</a></li>
-          <li><a href="#"><i class="i-flag"></i> {{_i}}Help{{/i}}</a></li>
+          <li><a href="#"><i class="icon-user"></i> {{_i}}Profile{{/i}}</a></li>
+          <li><a href="#"><i class="icon-cog"></i> {{_i}}Settings{{/i}}</a></li>
+          <li><a href="#"><i class="icon-flag"></i> {{_i}}Help{{/i}}</a></li>
         </ul>
       </div> <!-- /well -->
 <pre class="prettyprint linenums">
@@ -486,7 +486,7 @@
   ...
   &lt;li&gt;
     &lt;a href="#"&gt;
-      &lt;i class="i-book"&gt;&lt;/i&gt;
+      &lt;i class="icon-book"&gt;&lt;/i&gt;
       {{_i}}Library{{/i}}
     &lt;/a&gt;
   &lt;/li&gt;
@@ -668,9 +668,9 @@
     <div class="navbar-inner">
       <div class="container" style="width: auto;">
         <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-          <span class="i-bar"></span>
-          <span class="i-bar"></span>
-          <span class="i-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
         </a>
         <a class="brand" href="#">{{_i}}Project name{{/i}}</a>
         <div class="nav-collapse">
@@ -754,9 +754,9 @@
       
       &lt;!-- .btn-navbar is used as the toggle for collapsed navbar content --&gt;
       &lt;a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"&gt;
-        &lt;span class="i-bar"&gt;&lt;/span&gt;
-        &lt;span class="i-bar"&gt;&lt;/span&gt;
-        &lt;span class="i-bar"&gt;&lt;/span&gt;
+        &lt;span class="icon-bar"&gt;&lt;/span&gt;
+        &lt;span class="icon-bar"&gt;&lt;/span&gt;
+        &lt;span class="icon-bar"&gt;&lt;/span&gt;
       &lt;/a&gt;
       
       &lt;!-- Be sure to leave the brand out there if you want it shown --&gt;
@@ -870,7 +870,7 @@
     <h1>{{_i}}Pagination{{/i}} <small>{{_i}}Two options for paging through content{{/i}}</small></h1>
   </div>
 
-  <h2>{{_i}}Multi-page pagination{{/i}}</h2>
+  <h2>{{_i}}Multicon-page pagination{{/i}}</h2>
   <div class="row">
     <div class="span4">
       <h3>{{_i}}When to use{{/i}}</h3>
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index d192709c3..bfbd879d5 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -189,8 +189,8 @@
     <div class="span6">
       <h2>{{_i}}Fixed layout{{/i}}</h2>
       <p>{{_i}}The default and simple 940px-wide, centered layout for just about any website or page provided by a single <code>&lt;div class="container"&gt;</code>.{{/i}}</p>
-      <div class="mini-layout">
-        <div class="mini-layout-body"></div>
+      <div class="minicon-layout">
+        <div class="minicon-layout-body"></div>
       </div>
 <pre class="prettyprint linenums">
 &lt;body&gt;
@@ -203,9 +203,9 @@
     <div class="span6">
       <h2>{{_i}}Fluid layout{{/i}}</h2>
       <p>{{_i}}<code>&lt;div class="container-fluid"&gt;</code> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.{{/i}}</p>
-      <div class="mini-layout fluid">
-        <div class="mini-layout-sidebar"></div>
-        <div class="mini-layout-body"></div>
+      <div class="minicon-layout fluid">
+        <div class="minicon-layout-sidebar"></div>
+        <div class="minicon-layout-body"></div>
       </div>
 <pre class="prettyprint linenums">
 &lt;div class="container-fluid"&gt;
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 6e1180f16..0cf2c9d69 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -34,9 +34,9 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
           <div class="nav-collapse">