shortening license to preserve bandwidth (#1594 )

getting license added back in to minified css (#2337 )
updating version to 4.0.2 in config.yml, adding documentation for FA SASS and LESS ruby gems (#2336 )
2026-01-13 00:17:56 -05:00 · 2013-11-04 12:18:27 -05:00 · 2013-11-04 11:51:18 -05:00 · 2013-11-04 11:38:17 -05:00 · 2013-11-04 11:25:59 -05:00 · 2013-11-04 11:17:24 -05:00
51 changed files with 10971 additions and 829 deletions
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-#[Font Awesome v4.0.0](http://fontawesome.io)
+#[Font Awesome v4.0.2](http://fontawesome.io)
 ###the iconic font designed for Bootstrap

-Font Awesome is a full suite of 361 pictographic icons for easy scalable vector graphics on websites, created and
+Font Awesome is a full suite of 369 pictographic icons for easy scalable vector graphics on websites, created and
 maintained by [Dave Gandy](http://twitter.com/davegandy). Stay up to date [@fontawesome](http://twitter.com/fontawesome).

 Get started at http://fontawesome.io!
@@ -26,6 +26,8 @@ Get started at http://fontawesome.io!
 - [v3.2.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=3&page=1&state=closed)
 - [v3.2.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=5&page=1&state=closed)
 - [v4.0.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=2&page=1&state=closed)
+- [v4.0.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=7&page=1&state=closed)
+- [v4.0.2 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=8&page=1&state=closed)

 ##Versioning

--- a/_config.yml
+++ b/_config.yml
@@ -19,7 +19,7 @@ icon_layout:      icon.html    # Relative to _layouts directory
 icon_destination: icon         # Relative to destination

 fontawesome:
-  version:        4.0.0
+  version:        4.0.2
  minor_version:  4.0
  url:            http://fontawesome.io
  legacy_url:     http://fortawesome.github.com/Font-Awesome/
--- a/component.json
+++ b/component.json
@@ -2,7 +2,7 @@
  "name": "Font-Awesome",
  "repo": "FortAwesome/Font-Awesome",
  "description": "Font Awesome",
-  "version": "4.0.0",
+  "version": "4.0.1",
  "keywords": [],
  "dependencies": {},
  "development": {},
--- a/css/font-awesome.css
+++ b/css/font-awesome.css
@@ -1,34 +1,13 @@
 /*!
- *  Font Awesome 4.0.0
- *  the iconic font designed for Bootstrap
- *  ------------------------------------------------------------------------------
- *  The full suite of pictographic icons, examples, and documentation can be
- *  found at http://fontawesome.io.  Stay up to date on Twitter at
- *  http://twitter.com/fontawesome.
- *
- *  License
- *  ------------------------------------------------------------------------------
- *  - The Font Awesome font is licensed under SIL OFL 1.1 -
- *    http://scripts.sil.org/OFL
- *  - Font Awesome CSS, LESS, and SASS files are licensed under MIT License -
- *    http://opensource.org/licenses/mit-license.html
- *  - Font Awesome documentation licensed under CC BY 3.0 -
- *    http://creativecommons.org/licenses/by/3.0/
- *  - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
- *    "Font Awesome by Dave Gandy - http://fontawesome.io"
- *
- *  Author - Dave Gandy
- *  ------------------------------------------------------------------------------
- *  Email: dave@fontawesome.io
- *  Twitter: http://twitter.com/davegandy
- *  Work: Lead Product Designer @ Kyruus - http://kyruus.com
+ *  Font Awesome 4.0.2 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
 */
 /* FONT PATH
 * -------------------------- */
@font-face {
  font-family: 'FontAwesome';
-  src: url('../fonts/fontawesome-webfont.eot?v=4.0.0');
-  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.0.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.0.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.0.0#fontawesomeregular') format('svg');
+  src: url('../fonts/fontawesome-webfont.eot?v=4.0.2');
+  src: url('../fonts/fontawesome-webfont.eot?v=4.0.2#iefix') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.0.2') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.0.2') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.0.2#fontawesomeregular') format('svg');
  font-weight: normal;
  font-style: normal;
 }
@@ -195,6 +174,7 @@
 .fa-stack-1x,
 .fa-stack-2x {
  position: absolute;
+  left: 0;
  width: 100%;
  text-align: center;
 }
@@ -414,7 +394,7 @@
 .fa-check-square-o:before {
  content: "\f046";
 }
-.fa-move:before {
+.fa-arrows:before {
  content: "\f047";
 }
 .fa-step-backward:before {
@@ -499,10 +479,10 @@
 .fa-share:before {
  content: "\f064";
 }
-.fa-resize-full:before {
+.fa-expand:before {
  content: "\f065";
 }
-.fa-resize-small:before {
+.fa-compress:before {
  content: "\f066";
 }
 .fa-plus:before {
@@ -569,10 +549,10 @@
 .fa-folder-open:before {
  content: "\f07c";
 }
-.fa-resize-vertical:before {
+.fa-arrows-v:before {
  content: "\f07d";
 }
-.fa-resize-horizontal:before {
+.fa-arrows-h:before {
  content: "\f07e";
 }
 .fa-bar-chart-o:before {
@@ -666,7 +646,7 @@
 .fa-rss:before {
  content: "\f09e";
 }
-.fa-hdd:before {
+.fa-hdd-o:before {
  content: "\f0a0";
 }
 .fa-bullhorn:before {
@@ -717,10 +697,11 @@
 .fa-briefcase:before {
  content: "\f0b1";
 }
-.fa-fullscreen:before {
+.fa-arrows-alt:before {
  content: "\f0b2";
 }
-.fa-group:before {
+.fa-group:before,
+.fa-users:before {
  content: "\f0c0";
 }
 .fa-chain:before,
@@ -751,7 +732,7 @@
 .fa-square:before {
  content: "\f0c8";
 }
-.fa-reorder:before {
+.fa-bars:before {
  content: "\f0c9";
 }
 .fa-list-ul:before {
@@ -888,10 +869,10 @@
 .fa-file-text-o:before {
  content: "\f0f6";
 }
-.fa-building:before {
+.fa-building-o:before {
  content: "\f0f7";
 }
-.fa-hospital:before {
+.fa-hospital-o:before {
  content: "\f0f8";
 }
 .fa-ambulance:before {
@@ -977,12 +958,6 @@
 .fa-folder-open-o:before {
  content: "\f115";
 }
-.fa-expand-o:before {
-  content: "\f116";
-}
-.fa-collapse-o:before {
-  content: "\f117";
-}
 .fa-smile-o:before {
  content: "\f118";
 }
@@ -1097,16 +1072,16 @@
 .fa-anchor:before {
  content: "\f13d";
 }
-.fa-unlock-o:before {
+.fa-unlock-alt:before {
  content: "\f13e";
 }
 .fa-bullseye:before {
  content: "\f140";
 }
-.fa-ellipsis-horizontal:before {
+.fa-ellipsis-h:before {
  content: "\f141";
 }
-.fa-ellipsis-vertical:before {
+.fa-ellipsis-v:before {
  content: "\f142";
 }
 .fa-rss-square:before {
@@ -1358,3 +1333,6 @@
 .fa-try:before {
  content: "\f195";
 }
+.fa-plus-square-o:before {
+  content: "\f196";
+}
--- a/css/font-awesome.min.css
+++ b/css/font-awesome.min.css
--- a/fonts/FontAwesome.otf
+++ b/fonts/FontAwesome.otf
--- a/fonts/fontawesome-webfont.eot
+++ b/fonts/fontawesome-webfont.eot
--- a/fonts/fontawesome-webfont.svg
+++ b/fonts/fontawesome-webfont.svg
@@ -280,8 +280,8 @@
 <glyph unicode="&#xf113;" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />
 <glyph unicode="&#xf114;" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
 <glyph unicode="&#xf115;" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />
-<glyph unicode="&#xf116;" horiz-adv-x="1152" d="M896 608v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h224q14 0 23 -9t9 -23zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28 t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68zM1152 928v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704q93 0 158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf117;" horiz-adv-x="1152" d="M928 1152q93 0 158.5 -65.5t65.5 -158.5v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68z M864 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576z" />
+<glyph unicode="&#xf116;" horiz-adv-x="1792" />
+<glyph unicode="&#xf117;" horiz-adv-x="1792" />
 <glyph unicode="&#xf118;" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf119;" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf11a;" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
@@ -400,7 +400,7 @@
 <glyph unicode="&#xf193;" horiz-adv-x="1664" d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128 q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 16 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
 <glyph unicode="&#xf194;" d="M1254 899q16 85 -21 132q-52 65 -187 45q-17 -3 -41 -12.5t-57.5 -30.5t-64.5 -48.5t-59.5 -70t-44.5 -91.5q80 7 113.5 -16t26.5 -99q-5 -52 -52 -143q-43 -78 -71 -99q-44 -32 -87 14q-23 24 -37.5 64.5t-19 73t-10 84t-8.5 71.5q-23 129 -34 164q-12 37 -35.5 69 t-50.5 40q-57 16 -127 -25q-54 -32 -136.5 -106t-122.5 -102v-7q16 -8 25.5 -26t21.5 -20q21 -3 54.5 8.5t58 10.5t41.5 -30q11 -18 18.5 -38.5t15 -48t12.5 -40.5q17 -46 53 -187q36 -146 57 -197q42 -99 103 -125q43 -12 85 -1.5t76 31.5q131 77 250 237 q104 139 172.5 292.5t82.5 226.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
 <glyph unicode="&#xf195;" horiz-adv-x="1152" d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160 q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf196;" horiz-adv-x="1792" />
+<glyph unicode="&#xf196;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832 q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
 <glyph unicode="&#xf197;" horiz-adv-x="1792" />
 <glyph unicode="&#xf198;" horiz-adv-x="1792" />
 <glyph unicode="&#xf199;" horiz-adv-x="1792" />
--- a/fonts/fontawesome-webfont.ttf
+++ b/fonts/fontawesome-webfont.ttf
--- a/fonts/fontawesome-webfont.woff
+++ b/fonts/fontawesome-webfont.woff
--- a/less/font-awesome.less
+++ b/less/font-awesome.less
@@ -1,27 +1,6 @@
 /*!
- *  Font Awesome 4.0.0
- *  the iconic font designed for Bootstrap
- *  ------------------------------------------------------------------------------
- *  The full suite of pictographic icons, examples, and documentation can be
- *  found at http://fontawesome.io.  Stay up to date on Twitter at
- *  http://twitter.com/fontawesome.
- *
- *  License
- *  ------------------------------------------------------------------------------
- *  - The Font Awesome font is licensed under SIL OFL 1.1 -
- *    http://scripts.sil.org/OFL
- *  - Font Awesome CSS, LESS, and SASS files are licensed under MIT License -
- *    http://opensource.org/licenses/mit-license.html
- *  - Font Awesome documentation licensed under CC BY 3.0 -
- *    http://creativecommons.org/licenses/by/3.0/
- *  - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
- *    "Font Awesome by Dave Gandy - http://fontawesome.io"
- *
- *  Author - Dave Gandy
- *  ------------------------------------------------------------------------------
- *  Email: dave@fontawesome.io
- *  Twitter: http://twitter.com/davegandy
- *  Work: Lead Product Designer @ Kyruus - http://kyruus.com
+ *  Font Awesome 4.0.2 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
 */

@import "variables";
--- a/less/icons.less
+++ b/less/icons.less
@@ -72,7 +72,7 @@
 .@{fa-css-prefix}-pencil-square-o:before { content: @fa-var-pencil-square-o; }
 .@{fa-css-prefix}-share-square-o:before { content: @fa-var-share-square-o; }
 .@{fa-css-prefix}-check-square-o:before { content: @fa-var-check-square-o; }
-.@{fa-css-prefix}-move:before { content: @fa-var-move; }
+.@{fa-css-prefix}-arrows:before { content: @fa-var-arrows; }
 .@{fa-css-prefix}-step-backward:before { content: @fa-var-step-backward; }
 .@{fa-css-prefix}-fast-backward:before { content: @fa-var-fast-backward; }
 .@{fa-css-prefix}-backward:before { content: @fa-var-backward; }
@@ -101,8 +101,8 @@
 .@{fa-css-prefix}-arrow-down:before { content: @fa-var-arrow-down; }
 .@{fa-css-prefix}-mail-forward:before,
 .@{fa-css-prefix}-share:before { content: @fa-var-share; }
-.@{fa-css-prefix}-resize-full:before { content: @fa-var-resize-full; }
-.@{fa-css-prefix}-resize-small:before { content: @fa-var-resize-small; }
+.@{fa-css-prefix}-expand:before { content: @fa-var-expand; }
+.@{fa-css-prefix}-compress:before { content: @fa-var-compress; }
 .@{fa-css-prefix}-plus:before { content: @fa-var-plus; }
 .@{fa-css-prefix}-minus:before { content: @fa-var-minus; }
 .@{fa-css-prefix}-asterisk:before { content: @fa-var-asterisk; }
@@ -125,8 +125,8 @@
 .@{fa-css-prefix}-shopping-cart:before { content: @fa-var-shopping-cart; }
 .@{fa-css-prefix}-folder:before { content: @fa-var-folder; }
 .@{fa-css-prefix}-folder-open:before { content: @fa-var-folder-open; }
-.@{fa-css-prefix}-resize-vertical:before { content: @fa-var-resize-vertical; }
-.@{fa-css-prefix}-resize-horizontal:before { content: @fa-var-resize-horizontal; }
+.@{fa-css-prefix}-arrows-v:before { content: @fa-var-arrows-v; }
+.@{fa-css-prefix}-arrows-h:before { content: @fa-var-arrows-h; }
 .@{fa-css-prefix}-bar-chart-o:before { content: @fa-var-bar-chart-o; }
 .@{fa-css-prefix}-twitter-square:before { content: @fa-var-twitter-square; }
 .@{fa-css-prefix}-facebook-square:before { content: @fa-var-facebook-square; }
@@ -158,7 +158,7 @@
 .@{fa-css-prefix}-unlock:before { content: @fa-var-unlock; }
 .@{fa-css-prefix}-credit-card:before { content: @fa-var-credit-card; }
 .@{fa-css-prefix}-rss:before { content: @fa-var-rss; }
-.@{fa-css-prefix}-hdd:before { content: @fa-var-hdd; }
+.@{fa-css-prefix}-hdd-o:before { content: @fa-var-hdd-o; }
 .@{fa-css-prefix}-bullhorn:before { content: @fa-var-bullhorn; }
 .@{fa-css-prefix}-bell:before { content: @fa-var-bell; }
 .@{fa-css-prefix}-certificate:before { content: @fa-var-certificate; }
@@ -175,8 +175,9 @@
 .@{fa-css-prefix}-tasks:before { content: @fa-var-tasks; }
 .@{fa-css-prefix}-filter:before { content: @fa-var-filter; }
 .@{fa-css-prefix}-briefcase:before { content: @fa-var-briefcase; }
-.@{fa-css-prefix}-fullscreen:before { content: @fa-var-fullscreen; }
-.@{fa-css-prefix}-group:before { content: @fa-var-group; }
+.@{fa-css-prefix}-arrows-alt:before { content: @fa-var-arrows-alt; }
+.@{fa-css-prefix}-group:before,
+.@{fa-css-prefix}-users:before { content: @fa-var-users; }
 .@{fa-css-prefix}-chain:before,
 .@{fa-css-prefix}-link:before { content: @fa-var-link; }
 .@{fa-css-prefix}-cloud:before { content: @fa-var-cloud; }
@@ -189,7 +190,7 @@
 .@{fa-css-prefix}-save:before,
 .@{fa-css-prefix}-floppy-o:before { content: @fa-var-floppy-o; }
 .@{fa-css-prefix}-square:before { content: @fa-var-square; }
-.@{fa-css-prefix}-reorder:before { content: @fa-var-reorder; }
+.@{fa-css-prefix}-bars:before { content: @fa-var-bars; }
 .@{fa-css-prefix}-list-ul:before { content: @fa-var-list-ul; }
 .@{fa-css-prefix}-list-ol:before { content: @fa-var-list-ol; }
 .@{fa-css-prefix}-strikethrough:before { content: @fa-var-strikethrough; }
@@ -240,8 +241,8 @@
 .@{fa-css-prefix}-coffee:before { content: @fa-var-coffee; }
 .@{fa-css-prefix}-cutlery:before { content: @fa-var-cutlery; }
 .@{fa-css-prefix}-file-text-o:before { content: @fa-var-file-text-o; }
-.@{fa-css-prefix}-building:before { content: @fa-var-building; }
-.@{fa-css-prefix}-hospital:before { content: @fa-var-hospital; }
+.@{fa-css-prefix}-building-o:before { content: @fa-var-building-o; }
+.@{fa-css-prefix}-hospital-o:before { content: @fa-var-hospital-o; }
 .@{fa-css-prefix}-ambulance:before { content: @fa-var-ambulance; }
 .@{fa-css-prefix}-medkit:before { content: @fa-var-medkit; }
 .@{fa-css-prefix}-fighter-jet:before { content: @fa-var-fighter-jet; }
@@ -271,8 +272,6 @@
 .@{fa-css-prefix}-github-alt:before { content: @fa-var-github-alt; }
 .@{fa-css-prefix}-folder-o:before { content: @fa-var-folder-o; }
 .@{fa-css-prefix}-folder-open-o:before { content: @fa-var-folder-open-o; }
-.@{fa-css-prefix}-expand-o:before { content: @fa-var-expand-o; }
-.@{fa-css-prefix}-collapse-o:before { content: @fa-var-collapse-o; }
 .@{fa-css-prefix}-smile-o:before { content: @fa-var-smile-o; }
 .@{fa-css-prefix}-frown-o:before { content: @fa-var-frown-o; }
 .@{fa-css-prefix}-meh-o:before { content: @fa-var-meh-o; }
@@ -313,10 +312,10 @@
 .@{fa-css-prefix}-html5:before { content: @fa-var-html5; }
 .@{fa-css-prefix}-css3:before { content: @fa-var-css3; }
 .@{fa-css-prefix}-anchor:before { content: @fa-var-anchor; }
-.@{fa-css-prefix}-unlock-o:before { content: @fa-var-unlock-o; }
+.@{fa-css-prefix}-unlock-alt:before { content: @fa-var-unlock-alt; }
 .@{fa-css-prefix}-bullseye:before { content: @fa-var-bullseye; }
-.@{fa-css-prefix}-ellipsis-horizontal:before { content: @fa-var-ellipsis-horizontal; }
-.@{fa-css-prefix}-ellipsis-vertical:before { content: @fa-var-ellipsis-vertical; }
+.@{fa-css-prefix}-ellipsis-h:before { content: @fa-var-ellipsis-h; }
+.@{fa-css-prefix}-ellipsis-v:before { content: @fa-var-ellipsis-v; }
 .@{fa-css-prefix}-rss-square:before { content: @fa-var-rss-square; }
 .@{fa-css-prefix}-play-circle:before { content: @fa-var-play-circle; }
 .@{fa-css-prefix}-ticket:before { content: @fa-var-ticket; }
@@ -410,3 +409,4 @@
 .@{fa-css-prefix}-vimeo-square:before { content: @fa-var-vimeo-square; }
 .@{fa-css-prefix}-turkish-lira:before,
 .@{fa-css-prefix}-try:before { content: @fa-var-try; }
+.@{fa-css-prefix}-plus-square-o:before { content: @fa-var-plus-square-o; }
--- a/less/path.less
+++ b/less/path.less
@@ -4,7 +4,7 @@
@font-face {
  font-family: 'FontAwesome';
  src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}');
-  src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
+  src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}#iefix') format('embedded-opentype'),
    url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
    url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
    url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg');
--- a/less/stacked.less
+++ b/less/stacked.less
@@ -11,6 +11,7 @@
 }
 .@{fa-css-prefix}-stack-1x, .@{fa-css-prefix}-stack-2x {
  position: absolute;
+  left: 0;
  width: 100%;
  text-align: center;
 }
--- a/less/variables.less
+++ b/less/variables.less
@@ -2,9 +2,9 @@
 // --------------------------

@fa-font-path:        "../fonts";
-//@fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.0.0/font"; // for referencing Bootstrap CDN font files directly
+//@fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.0.2/fonts"; // for referencing Bootstrap CDN font files directly
@fa-css-prefix:       fa;
-@fa-version:          "4.0.0";
+@fa-version:          "4.0.2";
@fa-border-color:     #eee;
@fa-inverse:          #fff;
@fa-li-width:         (30em / 14);
@@ -76,7 +76,7 @@
@fa-var-pencil-square-o: "\f044";
@fa-var-share-square-o: "\f045";
@fa-var-check-square-o: "\f046";
-@fa-var-move: "\f047";
+@fa-var-arrows: "\f047";
@fa-var-step-backward: "\f048";
@fa-var-fast-backward: "\f049";
@fa-var-backward: "\f04a";
@@ -104,8 +104,8 @@
@fa-var-arrow-up: "\f062";
@fa-var-arrow-down: "\f063";
@fa-var-share: "\f064";
-@fa-var-resize-full: "\f065";
-@fa-var-resize-small: "\f066";
+@fa-var-expand: "\f065";
+@fa-var-compress: "\f066";
@fa-var-plus: "\f067";
@fa-var-minus: "\f068";
@fa-var-asterisk: "\f069";
@@ -127,8 +127,8 @@
@fa-var-shopping-cart: "\f07a";
@fa-var-folder: "\f07b";
@fa-var-folder-open: "\f07c";
-@fa-var-resize-vertical: "\f07d";
-@fa-var-resize-horizontal: "\f07e";
+@fa-var-arrows-v: "\f07d";
+@fa-var-arrows-h: "\f07e";
@fa-var-bar-chart-o: "\f080";
@fa-var-twitter-square: "\f081";
@fa-var-facebook-square: "\f082";
@@ -159,7 +159,7 @@
@fa-var-unlock: "\f09c";
@fa-var-credit-card: "\f09d";
@fa-var-rss: "\f09e";
-@fa-var-hdd: "\f0a0";
+@fa-var-hdd-o: "\f0a0";
@fa-var-bullhorn: "\f0a1";
@fa-var-bell: "\f0f3";
@fa-var-certificate: "\f0a3";
@@ -176,8 +176,8 @@
@fa-var-tasks: "\f0ae";
@fa-var-filter: "\f0b0";
@fa-var-briefcase: "\f0b1";
-@fa-var-fullscreen: "\f0b2";
-@fa-var-group: "\f0c0";
+@fa-var-arrows-alt: "\f0b2";
+@fa-var-users: "\f0c0";
@fa-var-link: "\f0c1";
@fa-var-cloud: "\f0c2";
@fa-var-flask: "\f0c3";
@@ -186,7 +186,7 @@
@fa-var-paperclip: "\f0c6";
@fa-var-floppy-o: "\f0c7";
@fa-var-square: "\f0c8";
-@fa-var-reorder: "\f0c9";
+@fa-var-bars: "\f0c9";
@fa-var-list-ul: "\f0ca";
@fa-var-list-ol: "\f0cb";
@fa-var-strikethrough: "\f0cc";
@@ -229,8 +229,8 @@
@fa-var-coffee: "\f0f4";
@fa-var-cutlery: "\f0f5";
@fa-var-file-text-o: "\f0f6";
-@fa-var-building: "\f0f7";
-@fa-var-hospital: "\f0f8";
+@fa-var-building-o: "\f0f7";
+@fa-var-hospital-o: "\f0f8";
@fa-var-ambulance: "\f0f9";
@fa-var-medkit: "\f0fa";
@fa-var-fighter-jet: "\f0fb";
@@ -258,8 +258,6 @@
@fa-var-github-alt: "\f113";
@fa-var-folder-o: "\f114";
@fa-var-folder-open-o: "\f115";
-@fa-var-expand-o: "\f116";
-@fa-var-collapse-o: "\f117";
@fa-var-smile-o: "\f118";
@fa-var-frown-o: "\f119";
@fa-var-meh-o: "\f11a";
@@ -297,10 +295,10 @@
@fa-var-html5: "\f13b";
@fa-var-css3: "\f13c";
@fa-var-anchor: "\f13d";
-@fa-var-unlock-o: "\f13e";
+@fa-var-unlock-alt: "\f13e";
@fa-var-bullseye: "\f140";
-@fa-var-ellipsis-horizontal: "\f141";
-@fa-var-ellipsis-vertical: "\f142";
+@fa-var-ellipsis-h: "\f141";
+@fa-var-ellipsis-v: "\f142";
@fa-var-rss-square: "\f143";
@fa-var-play-circle: "\f144";
@fa-var-ticket: "\f145";
@@ -379,4 +377,5 @@
@fa-var-wheelchair: "\f193";
@fa-var-vimeo-square: "\f194";
@fa-var-try: "\f195";
+@fa-var-plus-square-o: "\f196";

--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "font-awesome",
  "description": "The iconic font designed for Bootstrap",
-  "version": "4.0.0",
+  "version": "4.0.1",
  "keywords": ["font", "awesome", "fontawesome", "icon", "font", "bootstrap"],
  "homepage": "http://fontawesome.io/",
  "author": {
--- a/scss/_bootstrap.scss
+++ b/scss/_bootstrap.scss
@@ -1,84 +0,0 @@
-/* BOOTSTRAP SPECIFIC CLASSES
- * -------------------------- */
-
-/* Bootstrap 2.0 sprites.less reset */
-[class^="icon-"],
-[class*=" icon-"] {
-  display: inline;
-  width: auto;
-  height: auto;
-  margin-top: 0;
-  line-height: normal;
-  vertical-align: baseline;
-  background-image: none;
-  background-position: 0 0;
-  background-repeat: repeat;
-}
-
-/* more sprites.less reset */
-.icon-white,
-.nav-pills > .active > a > [class^="icon-"],
-.nav-pills > .active > a > [class*=" icon-"],
-.nav-list > .active > a > [class^="icon-"],
-.nav-list > .active > a > [class*=" icon-"],
-.navbar-inverse .nav > .active > a > [class^="icon-"],
-.navbar-inverse .nav > .active > a > [class*=" icon-"],
-.dropdown-menu > li > a:hover > [class^="icon-"],
-.dropdown-menu > li > a:hover > [class*=" icon-"],
-.dropdown-menu > .active > a > [class^="icon-"],
-.dropdown-menu > .active > a > [class*=" icon-"],
-.dropdown-submenu:hover > a > [class^="icon-"],
-.dropdown-submenu:hover > a > [class*=" icon-"] {
-  background-image: none;
-}
-
-
-/* keeps Bootstrap styles with and without icons the same */
-.btn, .nav {
-  [class^="icon-"],
-  [class*=" icon-"] {
-    //    display: inline;
-    &.icon-large { line-height: .9em; }
-    &.icon-spin { display: inline-block; }
-  }
-}
-.nav-tabs, .nav-pills {
-  [class^="icon-"],
-  [class*=" icon-"] {
-    &, &.icon-large { line-height: .9em; }
-  }
-}
-.btn {
-  [class^="icon-"],
-  [class*=" icon-"] {
-    &.pull-left, &.pull-right {
-      &.icon-2x { margin-top: .18em; }
-    }
-    &.icon-spin.icon-large { line-height: .8em; }
-  }
-}
-.btn.btn-small {
-  [class^="icon-"],
-  [class*=" icon-"] {
-    &.pull-left, &.pull-right {
-      &.icon-2x { margin-top: .25em; }
-    }
-  }
-}
-.btn.btn-large {
-  [class^="icon-"],
-  [class*=" icon-"] {
-    margin-top: 0; // overrides bootstrap default
-    &.pull-left, &.pull-right {
-      &.icon-2x { margin-top: .05em; }
-    }
-    &.pull-left.icon-2x { margin-right: .2em; }
-    &.pull-right.icon-2x { margin-left: .2em; }
-  }
-}
-
-/* Fixes alignment in nav lists */
-.nav-list [class^="icon-"],
-.nav-list [class*=" icon-"] {
-  line-height: inherit;
-}
--- a/scss/_icons.scss
+++ b/scss/_icons.scss
@@ -72,7 +72,7 @@
 .#{$fa-css-prefix}-pencil-square-o:before { content: $fa-var-pencil-square-o; }
 .#{$fa-css-prefix}-share-square-o:before { content: $fa-var-share-square-o; }
 .#{$fa-css-prefix}-check-square-o:before { content: $fa-var-check-square-o; }
-.#{$fa-css-prefix}-move:before { content: $fa-var-move; }
+.#{$fa-css-prefix}-arrows:before { content: $fa-var-arrows; }
 .#{$fa-css-prefix}-step-backward:before { content: $fa-var-step-backward; }
 .#{$fa-css-prefix}-fast-backward:before { content: $fa-var-fast-backward; }
 .#{$fa-css-prefix}-backward:before { content: $fa-var-backward; }
@@ -101,8 +101,8 @@
 .#{$fa-css-prefix}-arrow-down:before { content: $fa-var-arrow-down; }
 .#{$fa-css-prefix}-mail-forward:before,
 .#{$fa-css-prefix}-share:before { content: $fa-var-share; }
-.#{$fa-css-prefix}-resize-full:before { content: $fa-var-resize-full; }
-.#{$fa-css-prefix}-resize-small:before { content: $fa-var-resize-small; }
+.#{$fa-css-prefix}-expand:before { content: $fa-var-expand; }
+.#{$fa-css-prefix}-compress:before { content: $fa-var-compress; }
 .#{$fa-css-prefix}-plus:before { content: $fa-var-plus; }
 .#{$fa-css-prefix}-minus:before { content: $fa-var-minus; }
 .#{$fa-css-prefix}-asterisk:before { content: $fa-var-asterisk; }
@@ -125,8 +125,8 @@
 .#{$fa-css-prefix}-shopping-cart:before { content: $fa-var-shopping-cart; }
 .#{$fa-css-prefix}-folder:before { content: $fa-var-folder; }
 .#{$fa-css-prefix}-folder-open:before { content: $fa-var-folder-open; }
-.#{$fa-css-prefix}-resize-vertical:before { content: $fa-var-resize-vertical; }
-.#{$fa-css-prefix}-resize-horizontal:before { content: $fa-var-resize-horizontal; }
+.#{$fa-css-prefix}-arrows-v:before { content: $fa-var-arrows-v; }
+.#{$fa-css-prefix}-arrows-h:before { content: $fa-var-arrows-h; }
 .#{$fa-css-prefix}-bar-chart-o:before { content: $fa-var-bar-chart-o; }
 .#{$fa-css-prefix}-twitter-square:before { content: $fa-var-twitter-square; }
 .#{$fa-css-prefix}-facebook-square:before { content: $fa-var-facebook-square; }
@@ -158,7 +158,7 @@
 .#{$fa-css-prefix}-unlock:before { content: $fa-var-unlock; }
 .#{$fa-css-prefix}-credit-card:before { content: $fa-var-credit-card; }
 .#{$fa-css-prefix}-rss:before { content: $fa-var-rss; }
-.#{$fa-css-prefix}-hdd:before { content: $fa-var-hdd; }
+.#{$fa-css-prefix}-hdd-o:before { content: $fa-var-hdd-o; }
 .#{$fa-css-prefix}-bullhorn:before { content: $fa-var-bullhorn; }
 .#{$fa-css-prefix}-bell:before { content: $fa-var-bell; }
 .#{$fa-css-prefix}-certificate:before { content: $fa-var-certificate; }
@@ -175,8 +175,9 @@
 .#{$fa-css-prefix}-tasks:before { content: $fa-var-tasks; }
 .#{$fa-css-prefix}-filter:before { content: $fa-var-filter; }
 .#{$fa-css-prefix}-briefcase:before { content: $fa-var-briefcase; }
-.#{$fa-css-prefix}-fullscreen:before { content: $fa-var-fullscreen; }
-.#{$fa-css-prefix}-group:before { content: $fa-var-group; }
+.#{$fa-css-prefix}-arrows-alt:before { content: $fa-var-arrows-alt; }
+.#{$fa-css-prefix}-group:before,
+.#{$fa-css-prefix}-users:before { content: $fa-var-users; }
 .#{$fa-css-prefix}-chain:before,
 .#{$fa-css-prefix}-link:before { content: $fa-var-link; }
 .#{$fa-css-prefix}-cloud:before { content: $fa-var-cloud; }
@@ -189,7 +190,7 @@
 .#{$fa-css-prefix}-save:before,
 .#{$fa-css-prefix}-floppy-o:before { content: $fa-var-floppy-o; }
 .#{$fa-css-prefix}-square:before { content: $fa-var-square; }
-.#{$fa-css-prefix}-reorder:before { content: $fa-var-reorder; }
+.#{$fa-css-prefix}-bars:before { content: $fa-var-bars; }
 .#{$fa-css-prefix}-list-ul:before { content: $fa-var-list-ul; }
 .#{$fa-css-prefix}-list-ol:before { content: $fa-var-list-ol; }
 .#{$fa-css-prefix}-strikethrough:before { content: $fa-var-strikethrough; }
@@ -240,8 +241,8 @@
 .#{$fa-css-prefix}-coffee:before { content: $fa-var-coffee; }
 .#{$fa-css-prefix}-cutlery:before { content: $fa-var-cutlery; }
 .#{$fa-css-prefix}-file-text-o:before { content: $fa-var-file-text-o; }
-.#{$fa-css-prefix}-building:before { content: $fa-var-building; }
-.#{$fa-css-prefix}-hospital:before { content: $fa-var-hospital; }
+.#{$fa-css-prefix}-building-o:before { content: $fa-var-building-o; }
+.#{$fa-css-prefix}-hospital-o:before { content: $fa-var-hospital-o; }
 .#{$fa-css-prefix}-ambulance:before { content: $fa-var-ambulance; }
 .#{$fa-css-prefix}-medkit:before { content: $fa-var-medkit; }
 .#{$fa-css-prefix}-fighter-jet:before { content: $fa-var-fighter-jet; }
@@ -271,8 +272,6 @@
 .#{$fa-css-prefix}-github-alt:before { content: $fa-var-github-alt; }
 .#{$fa-css-prefix}-folder-o:before { content: $fa-var-folder-o; }
 .#{$fa-css-prefix}-folder-open-o:before { content: $fa-var-folder-open-o; }
-.#{$fa-css-prefix}-expand-o:before { content: $fa-var-expand-o; }
-.#{$fa-css-prefix}-collapse-o:before { content: $fa-var-collapse-o; }
 .#{$fa-css-prefix}-smile-o:before { content: $fa-var-smile-o; }
 .#{$fa-css-prefix}-frown-o:before { content: $fa-var-frown-o; }
 .#{$fa-css-prefix}-meh-o:before { content: $fa-var-meh-o; }
@@ -313,10 +312,10 @@
 .#{$fa-css-prefix}-html5:before { content: $fa-var-html5; }
 .#{$fa-css-prefix}-css3:before { content: $fa-var-css3; }
 .#{$fa-css-prefix}-anchor:before { content: $fa-var-anchor; }
-.#{$fa-css-prefix}-unlock-o:before { content: $fa-var-unlock-o; }
+.#{$fa-css-prefix}-unlock-alt:before { content: $fa-var-unlock-alt; }
 .#{$fa-css-prefix}-bullseye:before { content: $fa-var-bullseye; }
-.#{$fa-css-prefix}-ellipsis-horizontal:before { content: $fa-var-ellipsis-horizontal; }
-.#{$fa-css-prefix}-ellipsis-vertical:before { content: $fa-var-ellipsis-vertical; }
+.#{$fa-css-prefix}-ellipsis-h:before { content: $fa-var-ellipsis-h; }
+.#{$fa-css-prefix}-ellipsis-v:before { content: $fa-var-ellipsis-v; }
 .#{$fa-css-prefix}-rss-square:before { content: $fa-var-rss-square; }
 .#{$fa-css-prefix}-play-circle:before { content: $fa-var-play-circle; }
 .#{$fa-css-prefix}-ticket:before { content: $fa-var-ticket; }
@@ -410,3 +409,4 @@
 .#{$fa-css-prefix}-vimeo-square:before { content: $fa-var-vimeo-square; }
 .#{$fa-css-prefix}-turkish-lira:before,
 .#{$fa-css-prefix}-try:before { content: $fa-var-try; }
+.#{$fa-css-prefix}-plus-square-o:before { content: $fa-var-plus-square-o; }
--- a/scss/_path.scss
+++ b/scss/_path.scss
@@ -4,7 +4,7 @@
@font-face {
  font-family: 'FontAwesome';
  src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}');
-  src: url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'),
+  src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}#iefix') format('embedded-opentype'),
    url('#{$fa-font-path}/fontawesome-webfont.woff?v=#{$fa-version}') format('woff'),
    url('#{$fa-font-path}/fontawesome-webfont.ttf?v=#{$fa-version}') format('truetype'),
    url('#{$fa-font-path}/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular') format('svg');
--- a/scss/_stacked.scss
+++ b/scss/_stacked.scss
@@ -11,6 +11,7 @@
 }
 .#{$fa-css-prefix}-stack-1x, .#{$fa-css-prefix}-stack-2x {
  position: absolute;
+  left: 0;
  width: 100%;
  text-align: center;
 }
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -2,12 +2,12 @@
 // --------------------------

 $fa-font-path:        "../fonts" !default;
-//$fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.0.0/font" !default; // for referencing Bootstrap CDN font files directly
-$fa-css-prefix:       fa;
-$fa-version:          "4.0.0" !default;
+//$fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.0.2/fonts" !default; // for referencing Bootstrap CDN font files directly
+$fa-css-prefix:       fa !default;
+$fa-version:          "4.0.2" !default;
 $fa-border-color:     #eee !default;
 $fa-inverse:          #fff !default;
-$fa-li-width:        (30em / 14);
+$fa-li-width:        (30em / 14) !default;

 $fa-var-glass: "\f000";
 $fa-var-music: "\f001";
@@ -76,7 +76,7 @@ $fa-var-tint: "\f043";
 $fa-var-pencil-square-o: "\f044";
 $fa-var-share-square-o: "\f045";
 $fa-var-check-square-o: "\f046";
-$fa-var-move: "\f047";
+$fa-var-arrows: "\f047";
 $fa-var-step-backward: "\f048";
 $fa-var-fast-backward: "\f049";
 $fa-var-backward: "\f04a";
@@ -104,8 +104,8 @@ $fa-var-arrow-right: "\f061";
 $fa-var-arrow-up: "\f062";
 $fa-var-arrow-down: "\f063";
 $fa-var-share: "\f064";
-$fa-var-resize-full: "\f065";
-$fa-var-resize-small: "\f066";
+$fa-var-expand: "\f065";
+$fa-var-compress: "\f066";
 $fa-var-plus: "\f067";
 $fa-var-minus: "\f068";
 $fa-var-asterisk: "\f069";
@@ -127,8 +127,8 @@ $fa-var-retweet: "\f079";
 $fa-var-shopping-cart: "\f07a";
 $fa-var-folder: "\f07b";
 $fa-var-folder-open: "\f07c";
-$fa-var-resize-vertical: "\f07d";
-$fa-var-resize-horizontal: "\f07e";
+$fa-var-arrows-v: "\f07d";
+$fa-var-arrows-h: "\f07e";
 $fa-var-bar-chart-o: "\f080";
 $fa-var-twitter-square: "\f081";
 $fa-var-facebook-square: "\f082";
@@ -159,7 +159,7 @@ $fa-var-github: "\f09b";
 $fa-var-unlock: "\f09c";
 $fa-var-credit-card: "\f09d";
 $fa-var-rss: "\f09e";
-$fa-var-hdd: "\f0a0";
+$fa-var-hdd-o: "\f0a0";
 $fa-var-bullhorn: "\f0a1";
 $fa-var-bell: "\f0f3";
 $fa-var-certificate: "\f0a3";
@@ -176,8 +176,8 @@ $fa-var-wrench: "\f0ad";
 $fa-var-tasks: "\f0ae";
 $fa-var-filter: "\f0b0";
 $fa-var-briefcase: "\f0b1";
-$fa-var-fullscreen: "\f0b2";
-$fa-var-group: "\f0c0";
+$fa-var-arrows-alt: "\f0b2";
+$fa-var-users: "\f0c0";
 $fa-var-link: "\f0c1";
 $fa-var-cloud: "\f0c2";
 $fa-var-flask: "\f0c3";
@@ -186,7 +186,7 @@ $fa-var-files-o: "\f0c5";
 $fa-var-paperclip: "\f0c6";
 $fa-var-floppy-o: "\f0c7";
 $fa-var-square: "\f0c8";
-$fa-var-reorder: "\f0c9";
+$fa-var-bars: "\f0c9";
 $fa-var-list-ul: "\f0ca";
 $fa-var-list-ol: "\f0cb";
 $fa-var-strikethrough: "\f0cc";
@@ -229,8 +229,8 @@ $fa-var-bell-o: "\f0a2";
 $fa-var-coffee: "\f0f4";
 $fa-var-cutlery: "\f0f5";
 $fa-var-file-text-o: "\f0f6";
-$fa-var-building: "\f0f7";
-$fa-var-hospital: "\f0f8";
+$fa-var-building-o: "\f0f7";
+$fa-var-hospital-o: "\f0f8";
 $fa-var-ambulance: "\f0f9";
 $fa-var-medkit: "\f0fa";
 $fa-var-fighter-jet: "\f0fb";
@@ -258,8 +258,6 @@ $fa-var-reply: "\f112";
 $fa-var-github-alt: "\f113";
 $fa-var-folder-o: "\f114";
 $fa-var-folder-open-o: "\f115";
-$fa-var-expand-o: "\f116";
-$fa-var-collapse-o: "\f117";
 $fa-var-smile-o: "\f118";
 $fa-var-frown-o: "\f119";
 $fa-var-meh-o: "\f11a";
@@ -297,10 +295,10 @@ $fa-var-chevron-circle-down: "\f13a";
 $fa-var-html5: "\f13b";
 $fa-var-css3: "\f13c";
 $fa-var-anchor: "\f13d";
-$fa-var-unlock-o: "\f13e";
+$fa-var-unlock-alt: "\f13e";
 $fa-var-bullseye: "\f140";
-$fa-var-ellipsis-horizontal: "\f141";
-$fa-var-ellipsis-vertical: "\f142";
+$fa-var-ellipsis-h: "\f141";
+$fa-var-ellipsis-v: "\f142";
 $fa-var-rss-square: "\f143";
 $fa-var-play-circle: "\f144";
 $fa-var-ticket: "\f145";
@@ -379,4 +377,5 @@ $fa-var-dot-circle-o: "\f192";
 $fa-var-wheelchair: "\f193";
 $fa-var-vimeo-square: "\f194";
 $fa-var-try: "\f195";
+$fa-var-plus-square-o: "\f196";

--- a/scss/font-awesome.scss
+++ b/scss/font-awesome.scss
@@ -1,27 +1,6 @@
 /*!
- *  Font Awesome 4.0.0
- *  the iconic font designed for Bootstrap
- *  ------------------------------------------------------------------------------
- *  The full suite of pictographic icons, examples, and documentation can be
- *  found at http://fontawesome.io.  Stay up to date on Twitter at
- *  http://twitter.com/fontawesome.
- *
- *  License
- *  ------------------------------------------------------------------------------
- *  - The Font Awesome font is licensed under SIL OFL 1.1 -
- *    http://scripts.sil.org/OFL
- *  - Font Awesome CSS, LESS, and SASS files are licensed under MIT License -
- *    http://opensource.org/licenses/mit-license.html
- *  - Font Awesome documentation licensed under CC BY 3.0 -
- *    http://creativecommons.org/licenses/by/3.0/
- *  - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
- *    "Font Awesome by Dave Gandy - http://fontawesome.io"
- *
- *  Author - Dave Gandy
- *  ------------------------------------------------------------------------------
- *  Email: dave@fontawesome.io
- *  Twitter: http://twitter.com/davegandy
- *  Work: Lead Product Designer @ Kyruus - http://kyruus.com
+ *  Font Awesome 4.0.2 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
 */

@import "variables";
--- a/src/Makefile
+++ b/src/Makefile
@@ -24,7 +24,7 @@ build:
 	@mkdir -p ${FA_CSS_DIRECTORY}

 	lessc ${FA_LESS_MODERN} > ${FA_CSS_MODERN}
-	lessc --compress ${FA_LESS_MODERN} > ${FA_CSS_MODERN_MIN}
+	lessc --yui-compress ${FA_LESS_MODERN} > ${FA_CSS_MODERN_MIN}
 #	sass ${FA_SCSS_MODERN} ${FA_CSS_MODERN}

 	lessc --compress ${SITE_LESS} > ${SITE_CSS_MIN}
--- a/src/_includes/examples/bootstrap.html
+++ b/src/_includes/examples/bootstrap.html
@@ -22,11 +22,11 @@
      </div>
      <div class="margin-bottom">
        <div class="input-group margin-bottom-sm">
-          <span class="input-group-addon"><i class="fa fa-envelope-o"></i></span>
+          <span class="input-group-addon"><i class="fa fa-envelope-o fa-fw"></i></span>
          <input class="form-control" type="text" placeholder="Email address">
        </div>
        <div class="input-group">
-          <span class="input-group-addon"><i class="fa fa-key"></i></span>
+          <span class="input-group-addon"><i class="fa fa-key fa-fw"></i></span>
          <input class="form-control" type="password" placeholder="Password">
        </div>
      </div>
@@ -67,11 +67,11 @@
 </div>

 <div class="input-group margin-bottom-sm">
-  <span class="input-group-addon"><i class="fa fa-envelope-o"></i></span>
+  <span class="input-group-addon"><i class="fa fa-envelope-o fa-fw"></i></span>
  <input class="form-control" type="text" placeholder="Email address">
 </div>
 <div class="input-group">
-  <span class="input-group-addon"><i class="fa fa-key"></i></span>
+  <span class="input-group-addon"><i class="fa fa-key fa-fw"></i></span>
  <input class="form-control" type="password" placeholder="Password">
 </div>

--- a/src/_includes/footer.html
+++ b/src/_includes/footer.html
@@ -3,7 +3,7 @@
    <div>
      <i class="fa fa-flag"></i> Font Awesome {{ site.fontawesome.version }}
      <span class="hide-xs">&middot;</span><br class="hide-sm hide-md hide-lg">
-      Created and Maintained by <a href="http://twitter.com/{{ site.fontawesome.author.twitter }}">Dave Gandy</a>
+      Created by <a href="http://twitter.com/{{ site.fontawesome.author.twitter }}">Dave Gandy</a>
    </div>
    <div>
      Font Awesome licensed under <a href="{{ site.fontawesome.license.font.url }}">{{ site.fontawesome.license.font.version }}</a>
@@ -17,7 +17,8 @@
    </div>
    <div class="project">
      <a href="{{ site.fontawesome.github.url }}">GitHub Project</a> &middot;
-      <a href="{{ site.fontawesome.github.url }}/issues">Issues</a>
+      <a href="{{ site.fontawesome.github.url }}/issues">Issues</a> &middot;
+      <a href="{{ page.relative_path }}3.2.1">Old 3.2.1 Docs</a>
    </div>
  </div>
 </footer>
--- a/src/_includes/jumbotron-carousel.html
+++ b/src/_includes/jumbotron-carousel.html
@@ -12,11 +12,12 @@
          </a>
        </div>
        <div class="shameless-self-promotion">
+          Version {{ site.fontawesome.version }} &nbsp;&nbsp;&middot;&nbsp;&nbsp;
          <a href="{{ site.fontawesome.github.url }}"
             onClick="_gaq.push(['_trackEvent', 'Outbound Link', 'View Project on GitHub']);">
            GitHub Project</a> &nbsp;&nbsp;&middot;&nbsp;&nbsp;
-          Version {{ site.fontawesome.version }} &nbsp;&nbsp;&middot;&nbsp;&nbsp;
-          Created &amp; Maintained by <a href="http://twitter.com/{{ site.fontawesome.author.twitter }}">Dave Gandy</a>
+          <a href="{{ page.relative_path }}3.2.1">Old 3.2.1 Docs</a> &nbsp;&nbsp;&middot;&nbsp;&nbsp;
+          Created by <a href="http://twitter.com/{{ site.fontawesome.author.twitter }}">Dave Gandy</a>
        </div>
      </div>
      <div class="col-md-4 col-sm-4">
--- a/src/_includes/license-code.less
+++ b/src/_includes/license-code.less
@@ -1,25 +1,4 @@
 /*!
- *  Font Awesome {{ site.fontawesome.version }}
- *  the iconic font designed for Bootstrap
- *  ------------------------------------------------------------------------------
- *  The full suite of pictographic icons, examples, and documentation can be
- *  found at {{ site.fontawesome.url }}.  Stay up to date on Twitter at
- *  http://twitter.com/{{ site.fontawesome.twitter }}.
- *
- *  License
- *  ------------------------------------------------------------------------------
- *  - The Font Awesome font is licensed under {{ site.fontawesome.license.font.version }} -
- *    {{ site.fontawesome.license.font.url }}
- *  - Font Awesome CSS, LESS, and SASS files are licensed under {{ site.fontawesome.license.code.version }} -
- *    {{ site.fontawesome.license.code.url }}
- *  - Font Awesome documentation licensed under {{ site.fontawesome.license.documentation.version }} -
- *    {{ site.fontawesome.license.documentation.url }}
- *  - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
- *    "Font Awesome by Dave Gandy - {{ site.fontawesome.url }}"
- *
- *  Author - Dave Gandy
- *  ------------------------------------------------------------------------------
- *  Email: {{ site.fontawesome.author.email }}
- *  Twitter: http://twitter.com/{{ site.fontawesome.author.twitter }}
- *  Work: {{ site.fontawesome.author.work.title }} @ {{ site.fontawesome.author.work.name }} - {{ site.fontawesome.author.work.url }}
+ *  Font Awesome {{ site.fontawesome.version }} by @{{ site.fontawesome.author.twitter }} - {{ site.fontawesome.url }} - @{{ site.fontawesome.twitter }}
+ *  License - {{ site.fontawesome.url }}/license (Font: {{ site.fontawesome.license.font.version }}, CSS: {{ site.fontawesome.license.code.version }})
 */
--- a/src/_includes/navbar.html
+++ b/src/_includes/navbar.html
@@ -3,7 +3,7 @@
    <div class="navbar-header">
      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
        <span class="sr-only">Toggle navigation</span>
-        <i class="fa fa-reorder fa-lg"></i>
+        <i class="fa fa-bars fa-lg"></i>
      </button>
      <a class="navbar-brand" href="{{ page.relative_path }}"><i class="fa fa-flag"></i> Font Awesome</a>
    </div>
--- a/src/_includes/new-naming.html
+++ b/src/_includes/new-naming.html
@@ -7,7 +7,7 @@
    the names of variants.
  </p>
  <div class="row">
-    <div class="col-md-4 col-sm-6">
+    <div class="col-lg-3 col-md-4 col-sm-6">
      <h4 class="margin-bottom-sm">fa-*</h4>
      <p class="margin-bottom-sm">Solid icons as the base variant</p>
      <ul class="fa-ul padding-left-sm">
@@ -25,7 +25,7 @@
        </li>
      </ul>
    </div>
-    <div class="col-md-4 col-sm-6">
+    <div class="col-lg-3 col-md-4 col-sm-6">
      <h4 class="margin-bottom-sm">*-o</h4>
      <p class="margin-bottom-sm">Outlined version of previous modifier</p>
      <ul class="fa-ul padding-left-sm">
@@ -43,7 +43,7 @@
        </li>
      </ul>
    </div>
-    <div class="col-md-4 col-sm-6">
+    <div class="col-lg-3 col-md-4 col-sm-6">
      <h4 class="margin-bottom-sm">*-circle</h4>
      <p class="margin-bottom-sm">Circle under previous modifier</p>
      <ul class="fa-ul padding-left-sm">
@@ -61,7 +61,7 @@
        </li>
      </ul>
    </div>
-    <div class="col-md-4 col-sm-6">
+    <div class="col-lg-3 col-md-4 col-sm-6">
      <h4 class="margin-bottom-sm">*-square</h4>
      <p class="margin-bottom-sm">Square under previous modifier</p>
      <ul class="fa-ul padding-left-sm">
@@ -79,7 +79,7 @@
        </li>
      </ul>
    </div>
-    <div class="col-md-4 col-sm-6">
+    <div class="col-lg-3 col-md-4 col-sm-6">
      <h4 class="margin-bottom-sm">*-right, *-up, etc.</h4>
      <p class="margin-bottom-sm">Directional modifier always at the end</p>
      <ul class="fa-ul padding-left-sm">
@@ -97,7 +97,43 @@
        </li>
      </ul>
    </div>
-    <div class="col-md-4 col-sm-6">
+    <div class="col-lg-3 col-md-4 col-sm-6">
+      <h4 class="margin-bottom-sm">*-alt</h4>
+      <p class="margin-bottom-sm">Alternative to the original</p>
+      <ul class="fa-ul padding-left-sm">
+        <li>
+          <i class="fa fa-unlock-alt fa-li"></i>
+          fa-unlock-alt
+        </li>
+        <li>
+          <i class="fa fa-list-alt fa-li"></i>
+          fa-list-alt
+        </li>
+        <li>
+          <i class="fa fa-github-alt fa-li"></i>
+          fa-github-alt
+        </li>
+      </ul>
+    </div>
+    <div class="col-lg-3 col-md-4 col-sm-6">
+      <h4 class="margin-bottom-sm">*-h, *-v</h4>
+      <p class="margin-bottom-sm">Horizontal &amp; vertical modifiers</p>
+      <ul class="fa-ul padding-left-sm">
+        <li>
+          <i class="fa fa-arrows-v fa-li"></i>
+          fa-arrows-v
+        </li>
+        <li>
+          <i class="fa fa-arrows-h fa-li"></i>
+          fa-arrows-h
+        </li>
+        <li>
+          <i class="fa fa-ellipsis-v fa-li"></i>
+          fa-ellipsis-v
+        </li>
+      </ul>
+    </div>
+    <div class="col-lg-3 col-md-4 col-sm-6">
      <h4 class="margin-bottom-sm">Combine 'em up...</h4>
      <p class="margin-bottom-sm">Consistent when strung together</p>
      <ul class="fa-ul padding-left-sm">
--- a/src/_includes/new-upgrading.html
+++ b/src/_includes/new-upgrading.html
@@ -0,0 +1,10 @@
+<section id="new-upgrading">
+  <h2 class="page-header">Upgrading from 3.2.1?</h2>
+  <p>
+    For complete documentation of the syntax changes in {{ site.fontawesome.minor_version }}, check out the
+    <a href="{{ page.relative_path }}examples">examples</a>. For the changes to icon names,
+    <a href="https://twitter.com/gtagliala">@gtagliala</a> has put together a
+    <a href="{{ site.fontawesome.github.url }}/wiki/Upgrading-from-3.2.1-to-4">great wiki page</a> that
+    documents all the changes.
+  </p>
+</section>
--- a/src/_includes/tests/stacked.html
+++ b/src/_includes/tests/stacked.html
@@ -1,3 +1,10 @@
+<span style="border: solid 1px #d3d3d3; display: inline-block; text-align: center">
+  <span class="fa-stack">
+    <i class="fa fa-square fa-stack-2x"></i>
+    <i class="fa fa-twitter fa-stack-1x fa-inverse"></i>
+  </span><br>Center
+</span>
+<hr>
 <p>
  <span class="fa-stack">
    <i class="fa fa-square fa-stack-2x"></i>
--- a/src/assets/font-awesome/fonts/FontAwesome.otf
+++ b/src/assets/font-awesome/fonts/FontAwesome.otf
--- a/src/assets/font-awesome/fonts/fontawesome-webfont.eot
+++ b/src/assets/font-awesome/fonts/fontawesome-webfont.eot
--- a/src/assets/font-awesome/fonts/fontawesome-webfont.svg
+++ b/src/assets/font-awesome/fonts/fontawesome-webfont.svg
@@ -280,8 +280,8 @@
 <glyph unicode="&#xf113;" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />
 <glyph unicode="&#xf114;" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
 <glyph unicode="&#xf115;" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />
-<glyph unicode="&#xf116;" horiz-adv-x="1152" d="M896 608v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h224q14 0 23 -9t9 -23zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28 t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68zM1152 928v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704q93 0 158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf117;" horiz-adv-x="1152" d="M928 1152q93 0 158.5 -65.5t65.5 -158.5v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68z M864 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576z" />
+<glyph unicode="&#xf116;" horiz-adv-x="1792" />
+<glyph unicode="&#xf117;" horiz-adv-x="1792" />
 <glyph unicode="&#xf118;" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf119;" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf11a;" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
@@ -400,7 +400,7 @@
 <glyph unicode="&#xf193;" horiz-adv-x="1664" d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128 q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 16 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
 <glyph unicode="&#xf194;" d="M1254 899q16 85 -21 132q-52 65 -187 45q-17 -3 -41 -12.5t-57.5 -30.5t-64.5 -48.5t-59.5 -70t-44.5 -91.5q80 7 113.5 -16t26.5 -99q-5 -52 -52 -143q-43 -78 -71 -99q-44 -32 -87 14q-23 24 -37.5 64.5t-19 73t-10 84t-8.5 71.5q-23 129 -34 164q-12 37 -35.5 69 t-50.5 40q-57 16 -127 -25q-54 -32 -136.5 -106t-122.5 -102v-7q16 -8 25.5 -26t21.5 -20q21 -3 54.5 8.5t58 10.5t41.5 -30q11 -18 18.5 -38.5t15 -48t12.5 -40.5q17 -46 53 -187q36 -146 57 -197q42 -99 103 -125q43 -12 85 -1.5t76 31.5q131 77 250 237 q104 139 172.5 292.5t82.5 226.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
 <glyph unicode="&#xf195;" horiz-adv-x="1152" d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160 q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf196;" horiz-adv-x="1792" />
+<glyph unicode="&#xf196;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832 q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
 <glyph unicode="&#xf197;" horiz-adv-x="1792" />
 <glyph unicode="&#xf198;" horiz-adv-x="1792" />
 <glyph unicode="&#xf199;" horiz-adv-x="1792" />
--- a/src/assets/font-awesome/fonts/fontawesome-webfont.ttf
+++ b/src/assets/font-awesome/fonts/fontawesome-webfont.ttf
--- a/src/assets/font-awesome/fonts/fontawesome-webfont.woff
+++ b/src/assets/font-awesome/fonts/fontawesome-webfont.woff
--- a/src/assets/font-awesome/less/path.less
+++ b/src/assets/font-awesome/less/path.less
@@ -4,7 +4,7 @@
@font-face {
  font-family: 'FontAwesome';
  src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}');
-  src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
+  src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}#iefix') format('embedded-opentype'),
    url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
    url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
    url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg');
--- a/src/assets/font-awesome/less/stacked.less
+++ b/src/assets/font-awesome/less/stacked.less
@@ -14,6 +14,7 @@
 }
 .@{fa-css-prefix}-stack-1x, .@{fa-css-prefix}-stack-2x {
  position: absolute;
+  left: 0;
  width: 100%;
  text-align: center;
 }
--- a/src/assets/font-awesome/less/variables.less
+++ b/src/assets/font-awesome/less/variables.less
@@ -4,7 +4,7 @@
 // --------------------------

@fa-font-path:        "../fonts";
-//@fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/{{ site.fontawesome.version}}/font"; // for referencing Bootstrap CDN font files directly
+//@fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/{{site.fontawesome.version}}/fonts"; // for referencing Bootstrap CDN font files directly
@fa-css-prefix:       {{ site.fontawesome.css_prefix }};
@fa-version:          "{{ site.fontawesome.version }}";
@fa-border-color:     #eee;
--- a/src/assets/font-awesome/scss/_path.scss
+++ b/src/assets/font-awesome/scss/_path.scss
@@ -4,7 +4,7 @@
@font-face {
  font-family: 'FontAwesome';
  src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}');
-  src: url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'),
+  src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}#iefix') format('embedded-opentype'),
    url('#{$fa-font-path}/fontawesome-webfont.woff?v=#{$fa-version}') format('woff'),
    url('#{$fa-font-path}/fontawesome-webfont.ttf?v=#{$fa-version}') format('truetype'),
    url('#{$fa-font-path}/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular') format('svg');
--- a/src/assets/font-awesome/scss/_stacked.scss
+++ b/src/assets/font-awesome/scss/_stacked.scss
@@ -14,6 +14,7 @@
 }
 .#{$fa-css-prefix}-stack-1x, .#{$fa-css-prefix}-stack-2x {
  position: absolute;
+  left: 0;
  width: 100%;
  text-align: center;
 }
--- a/src/assets/font-awesome/scss/_variables.scss
+++ b/src/assets/font-awesome/scss/_variables.scss
@@ -4,12 +4,12 @@
 // --------------------------

 $fa-font-path:        "../fonts" !default;
-//$fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/{{ site.fontawesome.version}}/font" !default; // for referencing Bootstrap CDN font files directly
-$fa-css-prefix:       {{ site.fontawesome.css_prefix }};
+//$fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/{{site.fontawesome.version}}/fonts" !default; // for referencing Bootstrap CDN font files directly
+$fa-css-prefix:       {{ site.fontawesome.css_prefix }} !default;
 $fa-version:          "{{ site.fontawesome.version }}" !default;
 $fa-border-color:     #eee !default;
 $fa-inverse:          #fff !default;
-$fa-li-width:        (30em / 14);
+$fa-li-width:        (30em / 14) !default;

 {% for icon in icons %}$fa-var-{{ icon.id }}: "\{{ icon.unicode }}";
 {% endfor %}
--- a/src/assets/js/jquery-1.10.2.js
+++ b/src/assets/js/jquery-1.10.2.js
--- a/src/assets/js/jquery-1.10.2.min.map
+++ b/src/assets/js/jquery-1.10.2.min.map
--- a/src/assets/less/bootstrap-3.0.0/bootstrap.less
+++ b/src/assets/less/bootstrap-3.0.0/bootstrap.less
@@ -27,7 +27,7 @@

 // Components
@import "component-animations.less";
-@import "glyphicons.less";
+//@import "glyphicons.less";
@import "dropdowns.less";
@import "button-groups.less";
@import "input-groups.less";
--- a/src/assets/less/site/jumbotron-carousel.less
+++ b/src/assets/less/site/jumbotron-carousel.less
@@ -46,10 +46,10 @@
    margin-top: @buffer-lg;
    font-size: @font-size-base;
    line-height: @line-height-base;
-    color: mix(@jumbotron-color, @jumbotron-bg, 50%);
+    color: mix(@jumbotron-color, @jumbotron-bg, 60%);
    text-shadow: 0 1px 0 rgba(0,0,0,0.15);
    a {
-      color: mix(@jumbotron-color, @jumbotron-bg, 70%);
+      color: mix(@jumbotron-color, @jumbotron-bg, 80%);
      border-bottom: dotted 1px mix(@jumbotron-color, @jumbotron-bg, 50%);
      &:hover {
        color: @jumbotron-color;
--- a/src/get-started.html
+++ b/src/get-started.html
@@ -55,11 +55,38 @@ relative_path: ../
    </ol>
  </section>

-  <section id="ruby-gem">
-    <h2 class="page-header">EASY: <a href="https://github.com/FortAwesome/font-awesome-sass">Font Awesome Ruby Gem</a></h2>
+  <section id="ruby-gem-less">
+    <h2 class="page-header">EASY: <a href="https://github.com/FortAwesome/font-awesome-less">LESS Ruby Gem</a></h2>
    <p>
-      Use the <a href="https://github.com/FortAwesome/font-awesome-sass">Official Font Awesome Ruby Gem</a> to easily get Font
-      Awesome into a Rails project. Generously maintained by <a href="https://twitter.com/supercodepoet/">@supercodepoet</a>.
+      Use the <a href="https://github.com/FortAwesome/font-awesome-less">Official Font Awesome LESS Ruby Gem</a> to easily get Font
+      Awesome LESS into a Rails project. Generously maintained by <a href="https://twitter.com/supercodepoet/">@supercodepoet</a>.
+    </p>
+    <ol>
+      <li>
+        Add this line to your application's Gemfile:
+{% highlight bash %}
+gem 'font-awesome-less'
+{% endhighlight %}
+      </li>
+      <li>
+        And then execute:
+{% highlight bash %}
+$ bundle
+{% endhighlight %}
+      </li>
+      <li>Or install it yourself as:
+{% highlight bash %}
+$ gem install font-awesome-less
+{% endhighlight %}
+      </li>
+    </ol>
+  </section>
+
+  <section id="ruby-gem-sass">
+    <h2 class="page-header">EASY: <a href="https://github.com/FortAwesome/font-awesome-sass">SASS Ruby Gem</a></h2>
+    <p>
+      Use the <a href="https://github.com/FortAwesome/font-awesome-sass">Official Font Awesome SASS Ruby Gem</a> to easily get Font
+      Awesome SASS into a Rails project. Generously maintained by <a href="https://twitter.com/supercodepoet/">@supercodepoet</a>.
    </p>
    <ol>
      <li>
@@ -83,19 +110,19 @@ $ gem install font-awesome-sass
  </section>

  <section id="custom-less">
-    <h2 class="page-header">PRO: Custom LESS or SCSS</h2>
-    <p>Use this method to customize Font Awesome {{ site.bootstrap.version }} using LESS or SCSS.</p>
+    <h2 class="page-header">PRO: Custom LESS or SASS</h2>
+    <p>Use this method to customize Font Awesome {{ site.fontawesome.version }} using LESS or SASS.</p>
    <ol>
      <li>Copy the <code>font-awesome/</code> directory into your project.</li>
      <li>
-        Open your project's font-awesome/variables.less and edit the <code>@fa-font-path</code> or <code>$fa-font-path</code>
+        Open your project's <code>font-awesome/less/variables.less</code> or <code>font-awesome/scss/_variables.scss</code> and edit the <code>@fa-font-path</code> or <code>$fa-font-path</code>
        variable to point to your font directory.
 {% highlight scss %}
@fa-font-path:   "../font";
 {% endhighlight %}
        <p class="alert alert-success"><i class="fa fa-info-circle"></i> The font path is relative from your compiled CSS directory.</p>
      </li>
-      <li>Re-compile your LESS or SCSS if using a static compiler. Otherwise, you should be good to go.</li>
+      <li>Re-compile your LESS or SASS if using a static compiler. Otherwise, you should be good to go.</li>
      <li>Check out the <a href="{{ page.relative_path }}examples/">examples</a> to start using Font Awesome!</li>
    </ol>
  </section>
--- a/src/icons.yml
+++ b/src/icons.yml
@@ -481,12 +481,13 @@ icons:
      - Web Application Icons
      - Form Control Icons

-  - name:       move
-    id:         move
+  - name:       Arrows
+    id:         arrows
    unicode:    f047
    created:    1.0
    categories:
      - Web Application Icons
+      - Directional Icons

  - name:       step-backward
    id:         step-backward
@@ -681,15 +682,15 @@ icons:
    categories:
      - Web Application Icons

-  - name:       resize-full
-    id:         resize-full
+  - name:       Expand
+    id:         expand
    unicode:    f065
    created:    1.0
    categories:
      - Video Player Icons

-  - name:       resize-small
-    id:         resize-small
+  - name:       Compress
+    id:         compress
    unicode:    f066
    created:    1.0
    categories:
@@ -845,19 +846,21 @@ icons:
    categories:
      - Web Application Icons

-  - name:       resize-vertical
-    id:         resize-vertical
+  - name:       Arrows Vertical
+    id:         arrows-v
    unicode:    f07d
    created:    1.0
    categories:
      - Web Application Icons
+      - Directional Icons

-  - name:       resize-horizontal
-    id:         resize-horizontal
+  - name:       Arrows Horizontal
+    id:         arrows-h
    unicode:    f07e
    created:    1.0
    categories:
      - Web Application Icons
+      - Directional Icons


  - name:       Bar Chart Outlined
@@ -1077,7 +1080,7 @@ icons:


  - name:       HDD
-    id:         hdd
+    id:         hdd-o
    unicode:    f0a0
    created:    2.0
    categories:
@@ -1196,18 +1199,21 @@ icons:
    categories:
      - Web Application Icons

-  - name:       fullscreen
-    id:         fullscreen
+  - name:       Arrows Alt
+    id:         arrows-alt
    unicode:    f0b2
    created:    2.0
    categories:
      - Video Player Icons
+      - Directional Icons


-  - name:       Group
-    id:         group
+  - name:       Users
+    id:         users
    unicode:    f0c0
    created:    2.0
+    aliases:
+      - group
    categories:
      - Web Application Icons

@@ -1276,8 +1282,8 @@ icons:
      - Web Application Icons
      - Form Control Icons

-  - name:       Reorder
-    id:         reorder
+  - name:       Bars
+    id:         bars
    unicode:    f0c9
    created:    2.0
    categories:
@@ -1598,15 +1604,15 @@ icons:
    categories:
      - Text Editor Icons

-  - name:       Building
-    id:         building
+  - name:       Building Outlined
+    id:         building-o
    unicode:    f0f7
    created:    3.0
    categories:
      - Web Application Icons

-  - name:       hospital
-    id:         hospital
+  - name:       hospital Outlined
+    id:         hospital-o
    unicode:    f0f8
    created:    3.0
    categories:
@@ -1654,6 +1660,7 @@ icons:
    categories:
      - Medical Icons
      - Web Application Icons
+      - Form Control Icons


  - name:       Angle Double Left
@@ -1810,20 +1817,6 @@ icons:
    categories:
      - Web Application Icons

-  - name:       Expand Outlined
-    id:         expand-o
-    unicode:    f116
-    created:    3.1
-    categories:
-      - Web Application Icons
-
-  - name:       Collapse Outlined
-    id:         collapse-o
-    unicode:    f117
-    created:    3.1
-    categories:
-      - Web Application Icons
-
  - name:       Smile Outlined
    id:         smile-o
    unicode:    f118
@@ -2091,8 +2084,8 @@ icons:
    categories:
      - Web Application Icons

-  - name:       Unlock Outlined
-    id:         unlock-o
+  - name:       Unlock Alt
+    id:         unlock-alt
    unicode:    f13e
    created:    3.1
    categories:
@@ -2106,15 +2099,15 @@ icons:
    categories:
      - Web Application Icons

-  - name:       Horizontal Ellipsis
-    id:         ellipsis-horizontal
+  - name:       Ellipsis Horizontal
+    id:         ellipsis-h
    unicode:    f141
    created:    3.1
    categories:
      - Web Application Icons

-  - name:       Vertical Ellipsis
-    id:         ellipsis-vertical
+  - name:       Ellipsis Vertical
+    id:         ellipsis-v
    unicode:    f142
    created:    3.1
    categories:
@@ -2710,3 +2703,11 @@ icons:
      - turkish-lira
    categories:
      - Currency Icons
+
+  - name:       Plus Square Outlined
+    id:         plus-square-o
+    unicode:    f196
+    created:    4.0
+    categories:
+      - Web Application Icons
+      - Form Control Icons
--- a/src/test-2.3.2.html
+++ b/src/test-2.3.2.html
@@ -0,0 +1,824 @@
+---
+title: Font Awesome + Bootstrap 2.3.2 Test Cases
+relative_path: ../
+---
+
+
+<!DOCTYPE html>
+<!--[if lt IE 7 ]><html class="ie ie6" lang="en"> <![endif]-->
+<!--[if IE 7 ]><html class="ie ie7" lang="en"> <![endif]-->
+<!--[if IE 8 ]><html class="ie ie8" lang="en"> <![endif]-->
+<!--[if (gte IE 9)|!(IE)]><!-->
+<html lang="en" xmlns="http://www.w3.org/1999/html"> <!--<![endif]-->
+<head>
+  <!-- Basic Page Needs
+ ================================================== -->
+  <meta charset="utf-8" />
+  <title>{% if page.title %}{{ page.title }}{% endif %}</title>
+  <meta name="description" content="Font Awesome, the iconic font designed for Bootstrap">
+  <meta name="author" content="Dave Gandy">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <!--<meta name="viewport" content="initial-scale=1; maximum-scale=1">-->
+
+  <!--[if lt IE 9]>
+  <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+  <![endif]-->
+
+  <!-- CSS
+ ================================================== -->
+
+  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/2.3.2/css/bootstrap.min.css">
+  <link rel="stylesheet" href="{{ page.relative_path }}assets/font-awesome/css/font-awesome.css">
+  <!-- Le fav and touch icons -->
+  <link rel="shortcut icon" href="{{ page.relative_path }}assets/ico/favicon.ico">
+
+  <script type="text/javascript" src="//use.typekit.net/wnc7ioh.js"></script>
+  <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
+
+  <script type="text/javascript">
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', 'UA-30136587-1']);
+    _gaq.push(['_trackPageview']);
+
+    (function() {
+      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    })();
+  </script>
+</head>
+<body data-spy="scroll" data-target=".navbar">
+<div class="wrapper"> <!-- necessary for sticky footer. wrap all content except footer -->
+
+<section class="container">
+<h1 class="page-header">Visual Test Cases</h1>
+
+<h3>Icons <small>Icons should have proper alignment and not be clipped</small></h3>
+<div class="row-fluid">
+  <div class="span3">
+    <div class="well">
+      <i class="fa fa-building-o"></i> Building
+    </div>
+  </div>
+  <div class="span3">
+    <div class="well">
+      <i class="fa fa-building-o fa-lg"></i> Building Large
+    </div>
+  </div>
+  <div class="span3">
+    <i class="fa fa-building-o"></i> Building
+  </div>
+  <div class="span3">
+    <i class="fa fa-building-o fa-lg"></i> Building Large
+  </div>
+</div>
+<div class="row-fluid" style="font-size: 24px; line-height: 1.5em;">
+  <div class="span4">
+    <div class="well">
+      <i class="fa fa-building-o"></i> Building
+    </div>
+  </div>
+  <div class="span4">
+    <div class="well">
+      <i class="fa fa-building-o fa-lg"></i> Building Large
+    </div>
+  </div>
+  <div class="span4">
+    <i class="fa fa-building-o fa-lg"></i> Building Large
+  </div>
+</div>
+<div class="row-fluid">
+  <div class="span3">
+    <div class="well">
+      <i class="fa fa-circle"></i> Circle
+    </div>
+  </div>
+  <div class="span3">
+    <div class="well">
+      <i class="fa fa-circle fa-lg"></i> Circle Large
+    </div>
+  </div>
+  <div class="span3">
+    <i class="fa fa-circle"></i> Circle
+  </div>
+  <div class="span3">
+    <i class="fa fa-circle fa-lg"></i> Circle Large
+  </div>
+</div>
+<div class="row-fluid" style="font-size: 24px; line-height: 1.5em;">
+  <div class="span4">
+    <div class="well">
+      <i class="fa fa-circle"></i> Circle
+    </div>
+  </div>
+  <div class="span4">
+    <div class="well">
+      <i class="fa fa-circle fa-lg"></i> Circle Large
+    </div>
+  </div>
+  <div class="span4">
+    <i class="fa fa-circle fa-lg"></i> Circle Large
+  </div>
+</div>
+
+
+<h3>Links with Icons <small>icon should activate link & NOT underline</small></h3>
+<div class="row-fluid lead">
+  <div class="span2">
+    <a href="#"><i class="fa fa-building-o padding-right"></i> Link Here</a>
+  </div>
+  <div class="span2">
+    <a href="#"><i class="fa fa-building-o fa-lg padding-right"></i> Link Here</a>
+  </div>
+  <div class="span2">
+    <a href="#"><i class="fa fa-caret-down padding-right"></i> Link Here</a>
+  </div>
+  <div class="span2">
+    <a href="#">Link Here <i class="fa fa-angle-double-right padding-left"></i></a>
+  </div>
+  <div class="span2">
+    <a href="#">Link Here <i class="fa fa-angle-double-right fa-lg padding-left"></i></a>
+  </div>
+  <div class="span2">
+    <a href="#">Link Here <i class="fa fa-caret-down padding-left"></i></a>
+  </div>
+</div>
+<div class="row-fluid">
+  <div class="span2">
+    <a href="#"><i class="fa fa-building-o padding-right-sm"></i> Link Here</a>
+  </div>
+  <div class="span2">
+    <a href="#"><i class="fa fa-building-o fa-lg padding-right-sm"></i> Link Here</a>
+  </div>
+  <div class="span2">
+    <a href="#"><i class="fa fa-caret-down padding-right-sm"></i> Link Here</a>
+  </div>
+  <div class="span2">
+    <a href="#">Link Here <i class="fa fa-angle-double-right padding-left-sm"></i></a>
+  </div>
+  <div class="span2">
+    <a href="#">Link Here <i class="fa fa-angle-double-right fa-lg padding-left-sm"></i></a>
+  </div>
+  <div class="span2">
+    <a href="#">Link Here <i class="fa fa-caret-down padding-left-sm"></i></a>
+  </div>
+</div>
+
+
+<h3>Navbar  <small>should stay same height </small></h3>
+<div class="navbar navbar-inverse navbar-static-top">
+  <div class="navbar-inner">
+    <div class="container">
+      <a class="brand" href="#"><i class="fa fa-flag"></i> Font Awesome</a>
+      <ul class="nav">
+        <li style="border: solid 1px white;"><a href="#">Nav Item 1</a></li>
+        <li class="dropdown" style="border: solid 1px white;">
+          <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">
+            Nav Item 2
+            <i class="fa fa-caret-down"></i>
+          </a>
+          <ul class="dropdown-menu" role="menu">
+            <li><a href="#"><i class="fa fa-building-o"></i> Menu Item 1</a></li>
+            <li><a href="#"><i class="fa fa-building-o fa fa-lg"></i> Menu Item 2</a></li>
+          </ul>
+        </li>
+        <li style="border: solid 1px white;"><a href="#examples"><i class="fa fa-building-o fa fa-lg"></i> Nav Item 3</a></li>
+        <li style="border: solid 1px white;"><a href="#examples"><i class="fa fa-envelope-o"></i> Nav Item 4</a></li>
+        <li style="border: solid 1px white;"><a href="#examples"><i class="fa fa-circle fa fa-lg"></i> Nav Item 5</a></li>
+        <li style="border: solid 1px white;"><a href="#examples"><i class="fa fa-circle"></i> Nav Item 6</a></li>
+      </ul>
+    </div>
+  </div>
+</div>
+
+
+<h3>Plain buttons next to buttons w/icons <small>should be same height, icons not clipped</small></h3>
+<h4>Buttons</h4>
+<div class="row-fluid">
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3; text-align: center;">
+      <div>
+        <button class="btn btn-default btn-mini">Button</button>
+        <button class="btn btn-default btn-mini"><i class="fa fa-building-o"></i> Button</button>
+        <button class="btn btn-default btn-mini"><i class="fa fa-building-o"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default btn-small">Button</button>
+        <button class="btn btn-default btn-small"><i class="fa fa-building-o"></i> Button</button>
+        <button class="btn btn-default btn-small"><i class="fa fa-building-o"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default">Button</button>
+        <button class="btn btn-default"><i class="fa fa-building-o"></i> Button</button>
+        <button class="btn btn-default"><i class="fa fa-building-o"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default btn-large">Button</button>
+        <button class="btn btn-default btn-large"><i class="fa fa-building-o"></i> Button</button>
+        <button class="btn btn-default btn-large"><i class="fa fa-building-o"></i></button>
+      </div>
+    </div>
+  </div>
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3; text-align: center;">
+      <div>
+        <button class="btn btn-default btn-mini">Button</button>
+        <button class="btn btn-default btn-mini"><i class="fa fa-building-o fa-lg"></i> Button</button>
+        <button class="btn btn-default btn-mini"><i class="fa fa-building-o fa-lg"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default btn-small">Button</button>
+        <button class="btn btn-default btn-small"><i class="fa fa-building-o fa-lg"></i> Button</button>
+        <button class="btn btn-default btn-small"><i class="fa fa-building-o fa-lg"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default">Button</button>
+        <button class="btn btn-default"><i class="fa fa-building-o fa-lg"></i> Button</button>
+        <button class="btn btn-default"><i class="fa fa-building-o fa-lg"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default btn-large">Button</button>
+        <button class="btn btn-default btn-large"><i class="fa fa-building-o fa-lg"></i> Button</button>
+        <button class="btn btn-default btn-large"><i class="fa fa-building-o fa-lg"></i></button>
+      </div>
+    </div>
+  </div>
+</div>
+<div class="row-fluid">
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3; text-align: center;">
+      <div>
+        <button class="btn btn-default btn-mini">Button</button>
+        <button class="btn btn-default btn-mini"><i class="fa fa-circle"></i> Button</button>
+        <button class="btn btn-default btn-mini"><i class="fa fa-circle"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default btn-small">Button</button>
+        <button class="btn btn-default btn-small"><i class="fa fa-circle"></i> Button</button>
+        <button class="btn btn-default btn-small"><i class="fa fa-circle"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default">Button</button>
+        <button class="btn btn-default"><i class="fa fa-circle"></i> Button</button>
+        <button class="btn btn-default"><i class="fa fa-circle"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default btn-large">Button</button>
+        <button class="btn btn-default btn-large"><i class="fa fa-circle"></i> Button</button>
+        <button class="btn btn-default btn-large"><i class="fa fa-circle"></i></button>
+      </div>
+    </div>
+  </div>
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3; text-align: center;">
+      <div>
+        <button class="btn btn-default btn-mini">Button</button>
+        <button class="btn btn-default btn-mini"><i class="fa fa-circle fa-lg"></i> Button</button>
+        <button class="btn btn-default btn-mini"><i class="fa fa-circle fa-lg"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default btn-small">Button</button>
+        <button class="btn btn-default btn-small"><i class="fa fa-circle fa-lg"></i> Button</button>
+        <button class="btn btn-default btn-small"><i class="fa fa-circle fa-lg"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default">Button</button>
+        <button class="btn btn-default"><i class="fa fa-circle fa-lg"></i> Button</button>
+        <button class="btn btn-default"><i class="fa fa-circle fa-lg"></i></button>
+      </div>
+      <div>
+        <button class="btn btn-default btn-large">Button</button>
+        <button class="btn btn-default btn-large"><i class="fa fa-circle fa-lg"></i> Button</button>
+        <button class="btn btn-default btn-large"><i class="fa fa-circle fa-lg"></i></button>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<h4>Anchors</h4>
+<div class="row-fluid">
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3; text-align: center;">
+      <div>
+        <a class="btn btn-default btn-mini">Button</a>
+        <a class="btn btn-default btn-mini"><i class="fa fa-building-o"></i> Button</a>
+        <a class="btn btn-default btn-mini"><i class="fa fa-building-o"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default btn-small">Button</a>
+        <a class="btn btn-default btn-small"><i class="fa fa-building-o"></i> Button</a>
+        <a class="btn btn-default btn-small"><i class="fa fa-building-o"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default">Button</a>
+        <a class="btn btn-default"><i class="fa fa-building-o"></i> Button</a>
+        <a class="btn btn-default"><i class="fa fa-building-o"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default btn-large">Button</a>
+        <a class="btn btn-default btn-large"><i class="fa fa-building-o"></i> Button</a>
+        <a class="btn btn-default btn-large"><i class="fa fa-building-o"></i></a>
+      </div>
+    </div>
+  </div>
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3; text-align: center;">
+      <div>
+        <a class="btn btn-default btn-mini">Button</a>
+        <a class="btn btn-default btn-mini"><i class="fa fa-building-o fa-lg"></i> Button</a>
+        <a class="btn btn-default btn-mini"><i class="fa fa-building-o fa-lg"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default btn-small">Button</a>
+        <a class="btn btn-default btn-small"><i class="fa fa-building-o fa-lg"></i> Button</a>
+        <a class="btn btn-default btn-small"><i class="fa fa-building-o fa-lg"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default">Button</a>
+        <a class="btn btn-default"><i class="fa fa-building-o fa-lg"></i> Button</a>
+        <a class="btn btn-default"><i class="fa fa-building-o fa-lg"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default btn-large">Button</a>
+        <a class="btn btn-default btn-large"><i class="fa fa-building-o fa-lg"></i> Button</a>
+        <a class="btn btn-default btn-large"><i class="fa fa-building-o fa-lg"></i></a>
+      </div>
+    </div>
+  </div>
+</div>
+<div class="row-fluid">
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3; text-align: center;">
+      <div>
+        <a class="btn btn-default btn-mini">Button</a>
+        <a class="btn btn-default btn-mini"><i class="fa fa-circle"></i> Button</a>
+        <a class="btn btn-default btn-mini"><i class="fa fa-circle"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default btn-small">Button</a>
+        <a class="btn btn-default btn-small"><i class="fa fa-circle"></i> Button</a>
+        <a class="btn btn-default btn-small"><i class="fa fa-circle"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default">Button</a>
+        <a class="btn btn-default"><i class="fa fa-circle"></i> Button</a>
+        <a class="btn btn-default"><i class="fa fa-circle"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default btn-large">Button</a>
+        <a class="btn btn-default btn-large"><i class="fa fa-circle"></i> Button</a>
+        <a class="btn btn-default btn-large"><i class="fa fa-circle"></i></a>
+      </div>
+    </div>
+  </div>
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3; text-align: center;">
+      <div>
+        <a class="btn btn-default btn-mini">Button</a>
+        <a class="btn btn-default btn-mini"><i class="fa fa-circle fa-lg"></i> Button</a>
+        <a class="btn btn-default btn-mini"><i class="fa fa-circle fa-lg"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default btn-small">Button</a>
+        <a class="btn btn-default btn-small"><i class="fa fa-circle fa-lg"></i> Button</a>
+        <a class="btn btn-default btn-small"><i class="fa fa-circle fa-lg"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default">Button</a>
+        <a class="btn btn-default"><i class="fa fa-circle fa-lg"></i> Button</a>
+        <a class="btn btn-default"><i class="fa fa-circle fa-lg"></i></a>
+      </div>
+      <div>
+        <a class="btn btn-default btn-large">Button</a>
+        <a class="btn btn-default btn-large"><i class="fa fa-circle fa-lg"></i> Button</a>
+        <a class="btn btn-default btn-large"><i class="fa fa-circle fa-lg"></i></a>
+      </div>
+    </div>
+  </div>
+</div>
+
+<h3>Button groups <small>should be same height</small></h3>
+<div class="row-fluid">
+  <div class="span4">
+    <div style="border: solid 1px #d3d3d3;">
+      <div class="btn-group">
+        <button class="btn btn-default btn-large">
+          <i class="fa fa-adjust"></i>
+        </button>
+        <button class="btn btn-default btn-large">
+          Text
+        </button>
+      </div>
+    </div>
+  </div>
+  <div class="span4">
+    <div style="border: solid 1px #d3d3d3;">
+      <div class="btn-group">
+        <button class="btn btn-default">
+          <i class="fa fa-adjust"></i>
+        </button>
+        <button class="btn btn-default">
+          Text
+        </button>
+      </div>
+    </div>
+  </div>
+  <div class="span4">
+    <div style="border: solid 1px #d3d3d3;">
+      <div class="btn-group">
+        <button class="btn btn-default btn-small">
+          <i class="fa fa-adjust"></i>
+        </button>
+        <button class="btn btn-default btn-small">
+          Text
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
+
+<h3>Buttons with pulled 2x, 3x, 4x <small>should be same height, have correct line height</small></h3>
+<div class="row-fluid">
+  <div class="span4">
+    <div style="border: solid 1px #d3d3d3;">
+      <a class="btn btn-default btn-large" href="#">
+        <i class="fa fa-github fa-2x pull-left"></i>
+        Longer<br>Button</a>
+      <a class="btn btn-default btn-large" href="#">
+        Longer<br>Button</a>
+    </div>
+  </div>
+  <div class="span4">
+    <div style="border: solid 1px #d3d3d3;">
+      <a class="btn btn-default" href="#">
+        <i class="fa fa-github fa-2x pull-left"></i>
+        Longer<br>Button</a>
+      <a class="btn btn-default" href="#">
+        Longer<br>Button</a>
+    </div>
+  </div>
+  <div class="span4">
+    <div style="border: solid 1px #d3d3d3;">
+      <a class="btn btn-default btn-small" href="#">
+        <i class="fa fa-github fa-2x pull-left"></i>
+        Longer<br>Button</a>
+      <a class="btn btn-default btn-small" href="#">
+        Longer<br>Button</a>
+    </div>
+  </div>
+</div>
+
+
+<h3>Nav pills & nav tabs <small>should be same height and properly vertically aligned</small></h3>
+<div class="row-fluid">
+  <div class="span9">
+    <ul class="nav nav-pills" style="border: solid 1px #d3d3d3;">
+      <li class="active"><a href="#">Nav Item 1</a></li>
+      <li class="dropdown active">
+        <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">
+          Nav Item 2
+          <i class="fa fa-caret-down"></i>
+        </a>
+        <ul class="dropdown-menu" role="menu">
+          <li><a href="#"><i class="fa fa-building-o"></i> Menu Item 1</a></li>
+          <li><a href="#"><i class="fa fa-building-o fa-lg"></i> Menu Item 2</a></li>
+        </ul>
+      </li>
+      <li class="dropdown active">
+        <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">
+          Nav Item 3
+          <i class="fa fa-caret-down"></i>
+        </a>
+        <ul class="dropdown-menu" role="menu">
+          <li><a href="#"><i class="fa fa-building-o"></i> Menu Item 1</a></li>
+          <li><a href="#"><i class="fa fa-building-o fa-lg"></i> Menu Item 2</a></li>
+        </ul>
+      </li>
+      <li class="active"><a href="#examples"><i class="fa fa-building-o fa-lg"></i> Nav Item 4</a></li>
+      <li class="active"><a href="#examples"><i class="fa fa-spinner fa-spin"></i> Nav Item 5</a></li>
+      <li class="active"><a href="#examples"><i class="fa fa-circle fa-lg"></i> Nav Item 6</a></li>
+      <li class="active"><a href="#examples"><i class="fa fa-circle"></i> Nav Item 7</a></li>
+    </ul>
+    <ul class="nav nav-tabs">
+      <li class="active"><a href="#">Nav Item 1</a></li>
+      <li class="dropdown active">
+        <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">
+          Nav Item 2
+          <i class="fa fa-caret-down"></i>
+        </a>
+        <ul class="dropdown-menu" role="menu">
+          <li><a href="#"><i class="fa fa-building-o"></i> Menu Item 1</a></li>
+          <li><a href="#"><i class="fa fa-building-o fa-lg"></i> Menu Item 2</a></li>
+        </ul>
+      </li>
+      <li class="dropdown active">
+        <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">
+          Nav Item 3
+          <i class="fa fa-caret-down"></i>
+        </a>
+        <ul class="dropdown-menu" role="menu">
+          <li><a href="#"><i class="fa fa-building-o"></i> Menu Item 1</a></li>
+          <li><a href="#"><i class="fa fa-building-o fa-lg"></i> Menu Item 2</a></li>
+        </ul>
+      </li>
+      <li class="active"><a href="#examples"><i class="fa fa-building-o fa-lg"></i> Nav Item 4</a></li>
+      <li class="active"><a href="#examples"><i class="fa fa-spinner fa-spin"></i> Nav Item 5</a></li>
+      <li class="active"><a href="#examples"><i class="fa fa-circle fa-lg"></i> Nav Item 6</a></li>
+      <li class="active"><a href="#examples"><i class="fa fa-circle"></i> Nav Item 7</a></li>
+    </ul>
+  </div>
+  <div class="span3">
+    <ul class="nav nav-list">
+      <li>
+        <a href="#c1">
+          <i class="fa fa-chevron-right fa fa-fw pull-right"></i> Overview
+        </a>
+      </li>
+      <li>
+        <a href="#c1">
+          Overview
+          <i class="fa fa-chevron-right fa fa-fw pull-right"></i>
+        </a>
+      </li>
+    </ul>
+  </div>
+</div>
+
+<h3>Hide class directly on icons</h3>
+<div class="row-fluid">
+  <div class="span6">
+    <div class="well">
+      <i class="hide fa fa-circle"></i> Icon should be hidden
+    </div>
+  </div>
+  <div class="span6">
+    <i class="hide fa fa-circle"></i> Icon should be hidden
+  </div>
+</div>
+
+
+<h3>2x, 3x, 4x icons in text <small>should have margins next to and below text</small></h3>
+<div class="row-fluid">
+  <div class="span6">
+    <p class="lead">
+      <i class="fa fa-stethoscope fa-3x pull-left fa-border"></i>
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
+    </p>
+  </div>
+  <div class="span6">
+    <p class="lead">
+      <i class="fa fa-ambulance fa-4x pull-right fa-border"></i>
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
+    </p>
+  </div>
+</div>
+<div class="row-fluid">
+  <div class="span4">
+    <i class="fa fa-building-o fa-2x pull-left fa-border"></i>
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
+  </div>
+  <div class="span4">
+    <i class="fa fa-stethoscope fa-3x pull-right fa-border"></i>
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
+  </div>
+  <div class="span4">
+    <i class="fa fa-ambulance fa-4x pull-left"></i>
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
+  </div>
+</div>
+
+
+<h3>Bullets <small>should wrap appropriately, have proper spacing</small></h3>
+<div class="row-fluid">
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3;">
+      <ul class="fa-ul">
+        <li><i class="fa-li fa fa-angle-double-right"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+        <li><i class="fa-li fa fa-arrow-right"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
+        <li><i class="fa-li fa fa-building-o"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+          <i class="fa fa-building-o"></i>
+          <span class="label label-default">foo</span>
+          <a class="btn btn-default btn-mini">foo</a>
+        </li>
+      </ul>
+    </div>
+  </div>
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3;">
+      <ul class="fa-ul">
+        <li><i class="fa-li fa fa-angle-double-right fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+        <li><i class="fa-li fa fa-arrow-right fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
+        <li><i class="fa-li fa fa-building-o fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+          <i class="fa fa-building-o"></i>
+          <span class="label label-default">foo</span>
+          <a class="btn btn-default btn-mini">foo</a>
+        </li>
+      </ul>
+    </div>
+  </div>
+</div>
+<div class="row-fluid">
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3;">
+      <ul class="fa-ul lead">
+        <li><i class="fa-li fa fa-angle-double-right"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+        <li><i class="fa-li fa fa-arrow-right"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
+        <li><i class="fa-li fa fa-building-o"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+      </ul>
+    </div>
+  </div>
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3;">
+      <ul class="fa-ul lead">
+        <li><i class="fa-li fa fa-angle-double-right fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+        <li><i class="fa-li fa fa-arrow-right fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
+        <li><i class="fa-li fa fa-building-o fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+      </ul>
+    </div>
+  </div>
+</div>
+<div class="row-fluid">
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3;">
+      <ul class="fa-ul">
+        <li><a href="#"><i class="fa-li fa fa-angle-double-right"></i></a>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+        <li><a href="#"><i class="fa-li fa fa-arrow-right"></i></a>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
+        <li><a href="#"><i class="fa-li fa fa-building-o"></i></a>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+      </ul>
+    </div>
+  </div>
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3;">
+      <ul class="fa-ul">
+        <li><a href="#"><i class="fa-li fa fa-angle-double-right fa-lg"></i></a>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+        <li><a href="#"><i class="fa-li fa fa-arrow-right fa-lg"></i></a>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
+        <li><a href="#"><i class="fa-li fa fa-building-o fa-lg"></i></a>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+      </ul>
+    </div>
+  </div>
+</div>
+<div class="row-fluid">
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3;">
+      <ul class="fa-ul">
+        <li><i class="fa-li fa fa-refresh fa-spin"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+        <li><i class="fa-li fa fa-spinner fa-spin"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
+        <li><i class="fa-li fa fa-spinner fa-spin"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+          <i class="fa fa-building-o"></i>
+          <span class="label label-default">foo</span>
+          <a class="btn btn-default btn-mini">foo</a>
+        </li>
+      </ul>
+    </div>
+  </div>
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3;">
+      <ul class="fa-ul">
+        <li><i class="fa-li fa fa-refresh fa-spin fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+        <li><i class="fa-li fa fa-spinner fa-spin fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
+        <li><i class="fa-li fa fa-spinner fa-spin fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+          <i class="fa fa-building-o"></i>
+          <span class="label label-default">foo</span>
+          <a class="btn btn-default btn-mini">foo</a>
+        </li>
+      </ul>
+    </div>
+  </div>
+</div>
+
+
+<div class="row-fluid">
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3;">
+      <ul>
+        <li>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+        <li>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
+        <li>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+      </ul>
+    </div>
+  </div>
+  <div class="span6">
+    <div style="border: solid 1px #d3d3d3;">
+      <ul>
+        <li>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+        <li>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
+        <li>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+      </ul>
+    </div>
+  </div>
+</div>
+
+
+<h3>Spinning icons <small>icons should be aligned well and on center, buttons should be same height, won't work in ie7</small></h3>
+<div style="border: solid 1px #d3d3d3;">
+  <i class="fa fa-refresh fa-spin"></i> Loading...
+  <button class="btn btn-default btn-small"><i class="fa fa-refresh fa-spin"></i> Loading...</button>
+  <button class="btn btn-default btn-small">Loading...</button>
+  <i class="fa fa-circle-o fa-spin"></i> Loading...
+  <button class="btn btn-default btn-small"><i class="fa fa-circle-o fa-spin"></i> Loading...</button>
+  <a href="#"><i class="fa fa-refresh fa-spin"></i> Loading...</a>
+</div>
+<div style="border: solid 1px #d3d3d3;">
+  <i class="fa fa-refresh fa-spin"></i> Loading...
+  <button class="btn btn-default"><i class="fa fa-refresh fa-spin"></i> Loading...</button>
+  <button class="btn btn-default">Loading...</button>
+  <i class="fa fa-circle-o fa-spin"></i> Loading...
+  <button class="btn btn-default"><i class="fa fa-circle-o fa-spin"></i> Loading...</button>
+</div>
+<div style="border: solid 1px #d3d3d3;">
+  <i class="fa fa-spinner fa-spin"></i> Loading...
+  <button class="btn btn-default btn-large"><i class="fa fa-spinner fa-spin"></i> Loading...</button>
+  <button class="btn btn-default btn-large">Loading...</button>
+  <i class="fa fa-circle-o fa-spin"></i> Loading...
+  <button class="btn btn-default btn-large"><i class="fa fa-circle-o fa-spin"></i> Loading...</button>
+</div>
+<h4>fa-lg</h4>
+<div style="border: solid 1px #d3d3d3;">
+  <i class="fa fa-refresh fa-lg fa-spin"></i> Loading...
+  <button class="btn btn-default btn-small"><i class="fa fa-refresh fa-lg fa-spin"></i> Loading...</button>
+  <button class="btn btn-default btn-small">Loading...</button>
+  <i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...
+  <button class="btn btn-default btn-small"><i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...</button>
+</div>
+<div style="border: solid 1px #d3d3d3;">
+  <i class="fa fa-refresh fa-lg fa-spin"></i> Loading...
+  <button class="btn btn-default"><i class="fa fa-refresh fa-lg fa-spin"></i> Loading...</button>
+  <button class="btn btn-default">Loading...</button>
+  <i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...
+  <button class="btn btn-default"><i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...</button>
+</div>
+<div style="border: solid 1px #d3d3d3;">
+  <i class="fa fa-spinner fa-lg fa-spin"></i> Loading...
+  <button class="btn btn-default btn-large"><i class="fa fa-spinner fa-lg fa-spin"></i> Loading...</button>
+  <button class="btn btn-default btn-large">Loading...</button>
+  <i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...
+  <button class="btn btn-default btn-large"><i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...</button>
+</div>
+<h4>Bootstrap Prepend and Append</h4>
+<div class="row">
+  <div class="span6">
+    <div class="input-prepend">
+      <span class="add-on"><i class="fa fa-spinner fa fa-spin"></i></span>
+      <input class="span2" id="prependedInput" type="text" placeholder="Username">
+    </div>
+  </div>
+  <div class="span6">
+    <div class="input-append">
+      <input class="span2" id="appendedInput" type="text">
+      <span class="add-on"><i class="fa fa-spinner fa fa-spin"></i></span>
+    </div>
+  </div>
+</div>
+<h3>Stacked icons</h3>
+<div class="well">
+  {% include tests/stacked.html %}
+</div>
+<div class="well lead">
+  {% include tests/stacked.html %}
+</div>
+<h4>Stacked icons inside anchor</h4>
+<div class="well">
+  {% include tests/stacked-inside-anchor.html %}
+</div>
+
+
+<h3>Mirrored and rotated icons</h3>
+<div class="row-fluid">
+  <div class="span6">
+    <div class="well">
+      {% include tests/rotated-flipped.html %}
+    </div>
+  </div>
+  <div class="span6">
+    <div class="well lead">
+      {% include tests/rotated-flipped.html %}
+    </div>
+  </div>
+</div>
+<h4>Mirrored and rotated icons inside anchors and buttons</h4>
+<div class="row-fluid">
+  <div class="span6">
+    <div class="well">
+      {% include tests/rotated-flipped-inside-anchor.html %}
+    </div>
+  </div>
+  <div class="span6">
+    <div class="well">
+      {% include tests/rotated-flipped-inside-btn.html %}
+    </div>
+  </div>
+</div>
+
+</section>
+
+<div class="push"><!-- necessary for sticky footer --></div>
+</div>
+
+<script src="http://code.jquery.com/jquery-1.7.1.min.js"></script>
+<script src="//netdna.bootstrapcdn.com/bootstrap/2.3.2/js/bootstrap.min.js"></script>
+
+</body>
+</html>
+
+
--- a/src/test.html
+++ b/src/test.html
@@ -11,34 +11,34 @@ relative_path: ../
  <div class="row">
    <div class="col-md-3">
      <div class="well">
-        <i class="fa fa-building"></i> Building
+        <i class="fa fa-building-o"></i> Building
      </div>
    </div>
    <div class="col-md-3">
      <div class="well">
-        <i class="fa fa-building fa-lg"></i> Building Large
+        <i class="fa fa-building-o fa-lg"></i> Building Large
      </div>
    </div>
    <div class="col-md-3">
-      <i class="fa fa-building"></i> Building
+      <i class="fa fa-building-o"></i> Building
    </div>
    <div class="col-md-3">
-      <i class="fa fa-building fa-lg"></i> Building Large
+      <i class="fa fa-building-o fa-lg"></i> Building Large
    </div>
  </div>
  <div class="row" style="font-size: 24px; line-height: 1.5em;">
    <div class="col-md-4">
      <div class="well">
-        <i class="fa fa-building"></i> Building
+        <i class="fa fa-building-o"></i> Building
      </div>
    </div>
    <div class="col-md-4">
      <div class="well">
-        <i class="fa fa-building fa-lg"></i> Building Large
+        <i class="fa fa-building-o fa-lg"></i> Building Large
      </div>
    </div>
    <div class="col-md-4">
-      <i class="fa fa-building fa-lg"></i> Building Large
+      <i class="fa fa-building-o fa-lg"></i> Building Large
    </div>
  </div>
  <div class="row">
@@ -79,10 +79,10 @@ relative_path: ../
  <h3>Links with Icons <small>icon should activate link & NOT underline</small></h3>
  <div class="row lead">
    <div class="col-md-2">
-      <a href="#"><i class="fa fa-building padding-right"></i>Link Here</a>
+      <a href="#"><i class="fa fa-building-o padding-right"></i>Link Here</a>
    </div>
    <div class="col-md-2">
-      <a href="#"><i class="fa fa-building fa-lg padding-right"></i>Link Here</a>
+      <a href="#"><i class="fa fa-building-o fa-lg padding-right"></i>Link Here</a>
    </div>
    <div class="col-md-2">
      <a href="#"><i class="fa fa-caret-down padding-right"></i>Link Here</a>
@@ -99,10 +99,10 @@ relative_path: ../
  </div>
  <div class="row">
    <div class="col-md-2">
-      <a href="#"><i class="fa fa-building padding-right-sm"></i>Link Here</a>
+      <a href="#"><i class="fa fa-building-o padding-right-sm"></i>Link Here</a>
    </div>
    <div class="col-md-2">
-      <a href="#"><i class="fa fa-building fa-lg padding-right-sm"></i>Link Here</a>
+      <a href="#"><i class="fa fa-building-o fa-lg padding-right-sm"></i>Link Here</a>
    </div>
    <div class="col-md-2">
      <a href="#"><i class="fa fa-caret-down padding-right-sm"></i>Link Here</a>
@@ -131,11 +131,11 @@ relative_path: ../
            <i class="fa fa-caret-down"></i>
          </a>
          <ul class="dropdown-menu" role="menu">
-            <li><a href="#"><i class="fa fa-building"></i> Menu Item 1</a></li>
-            <li><a href="#"><i class="fa fa-building fa-lg"></i> Menu Item 2</a></li>
+            <li><a href="#"><i class="fa fa-building-o"></i> Menu Item 1</a></li>
+            <li><a href="#"><i class="fa fa-building-o fa-lg"></i> Menu Item 2</a></li>
          </ul>
        </li>
-        <li style="border: solid 1px white;"><a href="#examples"><i class="fa fa-building fa-lg"></i> Nav Item 3</a></li>
+        <li style="border: solid 1px white;"><a href="#examples"><i class="fa fa-building-o fa-lg"></i> Nav Item 3</a></li>
        <li style="border: solid 1px white;"><a href="#examples"><i class="fa fa-envelope"></i> Nav Item 4</a></li>
        <li style="border: solid 1px white;"><a href="#examples"><i class="fa fa-circle fa-lg"></i> Nav Item 5</a></li>
        <li style="border: solid 1px white;"><a href="#examples"><i class="fa fa-circle"></i> Nav Item 6</a></li>
@@ -151,23 +151,23 @@ relative_path: ../
      <div style="border: solid 1px #d3d3d3; text-align: center;">
        <div>
          <button class="btn btn-default btn-xs">Button</button>
-          <button class="btn btn-default btn-xs"><i class="fa fa-building"></i> Button</button>
-          <button class="btn btn-default btn-xs"><i class="fa fa-building"></i></button>
+          <button class="btn btn-default btn-xs"><i class="fa fa-building-o"></i> Button</button>
+          <button class="btn btn-default btn-xs"><i class="fa fa-building-o"></i></button>
        </div>
        <div>
          <button class="btn btn-default btn-sm">Button</button>
-          <button class="btn btn-default btn-sm"><i class="fa fa-building"></i> Button</button>
-          <button class="btn btn-default btn-sm"><i class="fa fa-building"></i></button>
+          <button class="btn btn-default btn-sm"><i class="fa fa-building-o"></i> Button</button>
+          <button class="btn btn-default btn-sm"><i class="fa fa-building-o"></i></button>
        </div>
        <div>
          <button class="btn btn-default">Button</button>
-          <button class="btn btn-default"><i class="fa fa-building"></i> Button</button>
-          <button class="btn btn-default"><i class="fa fa-building"></i></button>
+          <button class="btn btn-default"><i class="fa fa-building-o"></i> Button</button>
+          <button class="btn btn-default"><i class="fa fa-building-o"></i></button>
        </div>
        <div>
          <button class="btn btn-default btn-lg">Button</button>
-          <button class="btn btn-default btn-lg"><i class="fa fa-building"></i> Button</button>
-          <button class="btn btn-default btn-lg"><i class="fa fa-building"></i></button>
+          <button class="btn btn-default btn-lg"><i class="fa fa-building-o"></i> Button</button>
+          <button class="btn btn-default btn-lg"><i class="fa fa-building-o"></i></button>
        </div>
      </div>
    </div>
@@ -175,23 +175,23 @@ relative_path: ../
      <div style="border: solid 1px #d3d3d3; text-align: center;">
        <div>
          <button class="btn btn-default btn-xs">Button</button>
-          <button class="btn btn-default btn-xs"><i class="fa fa-building fa-lg"></i> Button</button>
-          <button class="btn btn-default btn-xs"><i class="fa fa-building fa-lg"></i></button>
+          <button class="btn btn-default btn-xs"><i class="fa fa-building-o fa-lg"></i> Button</button>
+          <button class="btn btn-default btn-xs"><i class="fa fa-building-o fa-lg"></i></button>
        </div>
        <div>
          <button class="btn btn-default btn-sm">Button</button>
-          <button class="btn btn-default btn-sm"><i class="fa fa-building fa-lg"></i> Button</button>
-          <button class="btn btn-default btn-sm"><i class="fa fa-building fa-lg"></i></button>
+          <button class="btn btn-default btn-sm"><i class="fa fa-building-o fa-lg"></i> Button</button>
+          <button class="btn btn-default btn-sm"><i class="fa fa-building-o fa-lg"></i></button>
        </div>
        <div>
          <button class="btn btn-default">Button</button>
-          <button class="btn btn-default"><i class="fa fa-building fa-lg"></i> Button</button>
-          <button class="btn btn-default"><i class="fa fa-building fa-lg"></i></button>
+          <button class="btn btn-default"><i class="fa fa-building-o fa-lg"></i> Button</button>
+          <button class="btn btn-default"><i class="fa fa-building-o fa-lg"></i></button>
        </div>
        <div>
          <button class="btn btn-default btn-lg">Button</button>
-          <button class="btn btn-default btn-lg"><i class="fa fa-building fa-lg"></i> Button</button>
-          <button class="btn btn-default btn-lg"><i class="fa fa-building fa-lg"></i></button>
+          <button class="btn btn-default btn-lg"><i class="fa fa-building-o fa-lg"></i> Button</button>
+          <button class="btn btn-default btn-lg"><i class="fa fa-building-o fa-lg"></i></button>
        </div>
      </div>
    </div>
@@ -254,23 +254,23 @@ relative_path: ../
      <div style="border: solid 1px #d3d3d3; text-align: center;">
        <div>
          <a class="btn btn-default btn-xs">Button</a>
-          <a class="btn btn-default btn-xs"><i class="fa fa-building"></i> Button</a>
-          <a class="btn btn-default btn-xs"><i class="fa fa-building"></i></a>
+          <a class="btn btn-default btn-xs"><i class="fa fa-building-o"></i> Button</a>
+          <a class="btn btn-default btn-xs"><i class="fa fa-building-o"></i></a>
        </div>
        <div>
          <a class="btn btn-default btn-sm">Button</a>
-          <a class="btn btn-default btn-sm"><i class="fa fa-building"></i> Button</a>
-          <a class="btn btn-default btn-sm"><i class="fa fa-building"></i></a>
+          <a class="btn btn-default btn-sm"><i class="fa fa-building-o"></i> Button</a>
+          <a class="btn btn-default btn-sm"><i class="fa fa-building-o"></i></a>
        </div>
        <div>
          <a class="btn btn-default">Button</a>
-          <a class="btn btn-default"><i class="fa fa-building"></i> Button</a>
-          <a class="btn btn-default"><i class="fa fa-building"></i></a>
+          <a class="btn btn-default"><i class="fa fa-building-o"></i> Button</a>
+          <a class="btn btn-default"><i class="fa fa-building-o"></i></a>
        </div>
        <div>
          <a class="btn btn-default btn-lg">Button</a>
-          <a class="btn btn-default btn-lg"><i class="fa fa-building"></i> Button</a>
-          <a class="btn btn-default btn-lg"><i class="fa fa-building"></i></a>
+          <a class="btn btn-default btn-lg"><i class="fa fa-building-o"></i> Button</a>
+          <a class="btn btn-default btn-lg"><i class="fa fa-building-o"></i></a>
        </div>
      </div>
    </div>
@@ -278,23 +278,23 @@ relative_path: ../
      <div style="border: solid 1px #d3d3d3; text-align: center;">
        <div>
          <a class="btn btn-default btn-xs">Button</a>
-          <a class="btn btn-default btn-xs"><i class="fa fa-building fa-lg"></i> Button</a>
-          <a class="btn btn-default btn-xs"><i class="fa fa-building fa-lg"></i></a>
+          <a class="btn btn-default btn-xs"><i class="fa fa-building-o fa-lg"></i> Button</a>
+          <a class="btn btn-default btn-xs"><i class="fa fa-building-o fa-lg"></i></a>
        </div>
        <div>
          <a class="btn btn-default btn-sm">Button</a>
-          <a class="btn btn-default btn-sm"><i class="fa fa-building fa-lg"></i> Button</a>
-          <a class="btn btn-default btn-sm"><i class="fa fa-building fa-lg"></i></a>
+          <a class="btn btn-default btn-sm"><i class="fa fa-building-o fa-lg"></i> Button</a>
+          <a class="btn btn-default btn-sm"><i class="fa fa-building-o fa-lg"></i></a>
        </div>
        <div>
          <a class="btn btn-default">Button</a>
-          <a class="btn btn-default"><i class="fa fa-building fa-lg"></i> Button</a>
-          <a class="btn btn-default"><i class="fa fa-building fa-lg"></i></a>
+          <a class="btn btn-default"><i class="fa fa-building-o fa-lg"></i> Button</a>
+          <a class="btn btn-default"><i class="fa fa-building-o fa-lg"></i></a>
        </div>
        <div>
          <a class="btn btn-default btn-lg">Button</a>
-          <a class="btn btn-default btn-lg"><i class="fa fa-building fa-lg"></i> Button</a>
-          <a class="btn btn-default btn-lg"><i class="fa fa-building fa-lg"></i></a>
+          <a class="btn btn-default btn-lg"><i class="fa fa-building-o fa-lg"></i> Button</a>
+          <a class="btn btn-default btn-lg"><i class="fa fa-building-o fa-lg"></i></a>
        </div>
      </div>
    </div>
@@ -433,8 +433,8 @@ relative_path: ../
            <i class="fa fa-caret-down"></i>
          </a>
          <ul class="dropdown-menu" role="menu">
-            <li><a href="#"><i class="fa fa-building"></i> Menu Item 1</a></li>
-            <li><a href="#"><i class="fa fa-building fa-lg"></i> Menu Item 2</a></li>
+            <li><a href="#"><i class="fa fa-building-o"></i> Menu Item 1</a></li>
+            <li><a href="#"><i class="fa fa-building-o fa-lg"></i> Menu Item 2</a></li>
          </ul>
        </li>
        <li class="dropdown active">
@@ -443,11 +443,11 @@ relative_path: ../
            <i class="fa fa-caret-down"></i>
          </a>
          <ul class="dropdown-menu" role="menu">
-            <li><a href="#"><i class="fa fa-building"></i> Menu Item 1</a></li>
-            <li><a href="#"><i class="fa fa-building fa-lg"></i> Menu Item 2</a></li>
+            <li><a href="#"><i class="fa fa-building-o"></i> Menu Item 1</a></li>
+            <li><a href="#"><i class="fa fa-building-o fa-lg"></i> Menu Item 2</a></li>
          </ul>
        </li>
-        <li class="active"><a href="#examples"><i class="fa fa-building fa-lg"></i> Nav Item 4</a></li>
+        <li class="active"><a href="#examples"><i class="fa fa-building-o fa-lg"></i> Nav Item 4</a></li>
        <li class="active"><a href="#examples"><i class="fa fa-spinner fa-spin"></i> Nav Item 5</a></li>
        <li class="active"><a href="#examples"><i class="fa fa-circle fa-lg"></i> Nav Item 6</a></li>
        <li class="active"><a href="#examples"><i class="fa fa-circle"></i> Nav Item 7</a></li>
@@ -460,8 +460,8 @@ relative_path: ../
            <i class="fa fa-caret-down"></i>
          </a>
          <ul class="dropdown-menu" role="menu">
-            <li><a href="#"><i class="fa fa-building"></i> Menu Item 1</a></li>
-            <li><a href="#"><i class="fa fa-building fa-lg"></i> Menu Item 2</a></li>
+            <li><a href="#"><i class="fa fa-building-o"></i> Menu Item 1</a></li>
+            <li><a href="#"><i class="fa fa-building-o fa-lg"></i> Menu Item 2</a></li>
          </ul>
        </li>
        <li class="dropdown active">
@@ -470,11 +470,11 @@ relative_path: ../
            <i class="fa fa-caret-down"></i>
          </a>
          <ul class="dropdown-menu" role="menu">
-            <li><a href="#"><i class="fa fa-building"></i> Menu Item 1</a></li>
-            <li><a href="#"><i class="fa fa-building fa-lg"></i> Menu Item 2</a></li>
+            <li><a href="#"><i class="fa fa-building-o"></i> Menu Item 1</a></li>
+            <li><a href="#"><i class="fa fa-building-o fa-lg"></i> Menu Item 2</a></li>
          </ul>
        </li>
-        <li class="active"><a href="#examples"><i class="fa fa-building fa-lg"></i> Nav Item 4</a></li>
+        <li class="active"><a href="#examples"><i class="fa fa-building-o fa-lg"></i> Nav Item 4</a></li>
        <li class="active"><a href="#examples"><i class="fa fa-spinner fa-spin"></i> Nav Item 5</a></li>
        <li class="active"><a href="#examples"><i class="fa fa-circle fa-lg"></i> Nav Item 6</a></li>
        <li class="active"><a href="#examples"><i class="fa fa-circle"></i> Nav Item 7</a></li>
@@ -522,7 +522,7 @@ relative_path: ../
  </div>
  <div class="row">
    <div class="col-md-4">
-      <i class="fa fa-building fa-2x pull-left fa-border"></i>
+      <i class="fa fa-building-o fa-2x pull-left fa-border"></i>
      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
    </div>
    <div class="col-md-4">
@@ -543,8 +543,8 @@ relative_path: ../
        <ul class="fa-ul">
          <li><i class="fa-li fa fa-angle-double-right"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
          <li><i class="fa-li fa fa-arrow-right"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
-          <li><i class="fa-li fa fa-building"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-            <i class="fa fa-building"></i>
+          <li><i class="fa-li fa fa-building-o"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+            <i class="fa fa-building-o"></i>
            <span class="label label-default">foo</span>
            <a class="btn btn-default btn-xs">foo</a>
          </li>
@@ -556,8 +556,8 @@ relative_path: ../
        <ul class="fa-ul">
          <li><i class="fa-li fa fa-angle-double-right fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
          <li><i class="fa-li fa fa-arrow-right fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
-          <li><i class="fa-li fa fa-building fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-            <i class="fa fa-building"></i>
+          <li><i class="fa-li fa fa-building-o fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+            <i class="fa fa-building-o"></i>
            <span class="label label-default">foo</span>
            <a class="btn btn-default btn-xs">foo</a>
          </li>
@@ -571,7 +571,7 @@ relative_path: ../
        <ul class="fa-ul lead">
          <li><i class="fa-li fa fa-angle-double-right"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
          <li><i class="fa-li fa fa-arrow-right"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
-          <li><i class="fa-li fa fa-building"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+          <li><i class="fa-li fa fa-building-o"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
        </ul>
      </div>
    </div>
@@ -580,7 +580,7 @@ relative_path: ../
        <ul class="fa-ul lead">
          <li><i class="fa-li fa fa-angle-double-right fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
          <li><i class="fa-li fa fa-arrow-right fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
-          <li><i class="fa-li fa fa-building fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+          <li><i class="fa-li fa fa-building-o fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
        </ul>
      </div>
    </div>
@@ -591,7 +591,7 @@ relative_path: ../
        <ul class="fa-ul">
          <li><a href="#"><i class="fa-li fa fa-angle-double-right"></i></a>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
          <li><a href="#"><i class="fa-li fa fa-arrow-right"></i></a>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
-          <li><a href="#"><i class="fa-li fa fa-building"></i></a>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+          <li><a href="#"><i class="fa-li fa fa-building-o"></i></a>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
        </ul>
      </div>
    </div>
@@ -600,7 +600,7 @@ relative_path: ../
        <ul class="fa-ul">
          <li><a href="#"><i class="fa-li fa fa-angle-double-right fa-lg"></i></a>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
          <li><a href="#"><i class="fa-li fa fa-arrow-right fa-lg"></i></a>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
-          <li><a href="#"><i class="fa-li fa fa-building fa-lg"></i></a>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+          <li><a href="#"><i class="fa-li fa fa-building-o fa-lg"></i></a>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
        </ul>
      </div>
    </div>
@@ -612,7 +612,7 @@ relative_path: ../
          <li><i class="fa-li fa fa-refresh fa-spin"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
          <li><i class="fa-li fa fa-spinner fa-spin"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
          <li><i class="fa-li fa fa-spinner fa-spin"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-            <i class="fa fa-building"></i>
+            <i class="fa fa-building-o"></i>
            <span class="label label-default">foo</span>
            <a class="btn btn-default btn-xs">foo</a>
          </li>
@@ -625,7 +625,7 @@ relative_path: ../
          <li><i class="fa-li fa fa-refresh fa-spin fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
          <li><i class="fa-li fa fa-spinner fa-spin fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
          <li><i class="fa-li fa fa-spinner fa-spin fa-lg"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-            <i class="fa fa-building"></i>
+            <i class="fa fa-building-o"></i>
            <span class="label label-default">foo</span>
            <a class="btn btn-default btn-xs">foo</a>
          </li>
@@ -662,45 +662,45 @@ relative_path: ../
    <i class="fa fa-refresh fa-spin"></i> Loading...
    <button class="btn btn-default btn-sm"><i class="fa fa-refresh fa-spin"></i> Loading...</button>
    <button class="btn btn-default btn-sm">Loading...</button>
-    <i class="fa fa-circle-blank fa-spin"></i> Loading...
-    <button class="btn btn-default btn-sm"><i class="fa fa-circle-blank fa-spin"></i> Loading...</button>
+    <i class="fa fa-circle-o fa-spin"></i> Loading...
+    <button class="btn btn-default btn-sm"><i class="fa fa-circle-o fa-spin"></i> Loading...</button>
    <a href="#"><i class="fa fa-refresh fa-spin"></i> Loading...</a>
  </div>
  <div style="border: solid 1px #d3d3d3;">
    <i class="fa fa-refresh fa-spin"></i> Loading...
    <button class="btn btn-default"><i class="fa fa-refresh fa-spin"></i> Loading...</button>
    <button class="btn btn-default">Loading...</button>
-    <i class="fa fa-circle-blank fa-spin"></i> Loading...
-    <button class="btn btn-default"><i class="fa fa-circle-blank fa-spin"></i> Loading...</button>
+    <i class="fa fa-circle-o fa-spin"></i> Loading...
+    <button class="btn btn-default"><i class="fa fa-circle-o fa-spin"></i> Loading...</button>
  </div>
  <div style="border: solid 1px #d3d3d3;">
    <i class="fa fa-spinner fa-spin"></i> Loading...
    <button class="btn btn-default btn-lg"><i class="fa fa-spinner fa-spin"></i> Loading...</button>
    <button class="btn btn-default btn-lg">Loading...</button>
-    <i class="fa fa-circle-blank fa-spin"></i> Loading...
-    <button class="btn btn-default btn-lg"><i class="fa fa-circle-blank fa-spin"></i> Loading...</button>
+    <i class="fa fa-circle-o fa-spin"></i> Loading...
+    <button class="btn btn-default btn-lg"><i class="fa fa-circle-o fa-spin"></i> Loading...</button>
  </div>
  <h4>fa-lg</h4>
  <div style="border: solid 1px #d3d3d3;">
    <i class="fa fa-refresh fa-lg fa-spin"></i> Loading...
    <button class="btn btn-default btn-sm"><i class="fa fa-refresh fa-lg fa-spin"></i> Loading...</button>
    <button class="btn btn-default btn-sm">Loading...</button>
-    <i class="fa fa-circle-blank fa-lg fa-spin"></i> Loading...
-    <button class="btn btn-default btn-sm"><i class="fa fa-circle-blank fa-lg fa-spin"></i> Loading...</button>
+    <i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...
+    <button class="btn btn-default btn-sm"><i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...</button>
  </div>
  <div style="border: solid 1px #d3d3d3;">
    <i class="fa fa-refresh fa-lg fa-spin"></i> Loading...
    <button class="btn btn-default"><i class="fa fa-refresh fa-lg fa-spin"></i> Loading...</button>
    <button class="btn btn-default">Loading...</button>
-    <i class="fa fa-circle-blank fa-lg fa-spin"></i> Loading...
-    <button class="btn btn-default"><i class="fa fa-circle-blank fa-lg fa-spin"></i> Loading...</button>
+    <i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...
+    <button class="btn btn-default"><i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...</button>
  </div>
  <div style="border: solid 1px #d3d3d3;">
    <i class="fa fa-spinner fa-lg fa-spin"></i> Loading...
    <button class="btn btn-default btn-lg"><i class="fa fa-spinner fa-lg fa-spin"></i> Loading...</button>
    <button class="btn btn-default btn-lg">Loading...</button>
-    <i class="fa fa-circle-blank fa-lg fa-spin"></i> Loading...
-    <button class="btn btn-default btn-lg"><i class="fa fa-circle-blank fa-lg fa-spin"></i> Loading...</button>
+    <i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...
+    <button class="btn btn-default btn-lg"><i class="fa fa-circle-o fa-lg fa-spin"></i> Loading...</button>
  </div>
  <h4>Bootstrap Prepend and Append</h4>
  <div class="row">
--- a/src/whats-new.html
+++ b/src/whats-new.html
@@ -13,5 +13,6 @@ relative_path: ../
 <div class="container">
  {% include new-features.html %}
  {% include new-naming.html %}
+  {% include new-upgrading.html %}
  {% include icons/new.html %}
 </div>
Author	SHA1	Message	Date
davegandy	6fbbefc89f	shortening license to preserve bandwidth (#1594 )	2013-11-04 12:18:27 -05:00
davegandy	247a67b6f1	getting license added back in to minified css (#2337 )	2013-11-04 11:51:18 -05:00
davegandy	76921acf0a	updating version to 4.0.2 in config.yml, adding documentation for FA SASS and LESS ruby gems (#2336 )	2013-11-04 11:38:17 -05:00
davegandy	ce24250707	adding plus square icons to form controls, arrows to directional icons #2338	2013-11-04 11:25:59 -05:00
davegandy	a2ba7c9ebf	finishing off icon renaming, hopefully #2310	2013-11-04 11:17:24 -05:00
davegandy	f5b9423db2	adding jquery uncompressed and .map files for chrome dev tools	2013-11-04 10:27:47 -05:00
davegandy	ce96762157	adding plus-square-o, removing expand-o and collapse-o icons	2013-11-04 10:22:13 -05:00
davegandy	ac002fb250	removing glyphicons from docs #2322	2013-11-04 09:53:12 -05:00
davegandy	e07edeb884	fixing ie8 URL string, addressing #2324	2013-11-04 09:50:36 -05:00
davegandy	632282ae37	addressing #2310	2013-11-04 09:30:45 -05:00
davegandy	04f890fa21	updating readme for new version	2013-11-04 09:25:52 -05:00
davegandy	c84c8ab2df	making 3.2.1 docs more prominent, adding test for FA 4.0 + BS 2.3.2	2013-10-27 15:36:33 -05:00
Geremia Taglialatela	c0a24d9b58	Merge branch '4.0.1-wip' of github.com:FortAwesome/Font-Awesome into 4.0.1-wip * '4.0.1-wip' of github.com:FortAwesome/Font-Awesome: Updated the icon count in the readme adding pointer to rtfm for syntax changes adding upgrade wiki page to documentation	2013-10-26 22:20:51 +02:00
Geremia Taglialatela	e34c44aa10	Proper example for bootstrap input groups Closes #2241	2013-10-26 22:20:26 +02:00
Geremia Taglialatela	cf654e7ffc	Merge pull request #2249 from GrahamCampbell/4.0.1-wip Updated the icon count in the readme	2013-10-25 11:24:23 -07:00
Graham Campbell	4dc738514b	Updated the icon count in the readme	2013-10-25 19:15:31 +01:00
davegandy	84d80956db	adding pointer to rtfm for syntax changes	2013-10-25 10:27:16 -05:00
davegandy	4d9e9c64bf	adding upgrade wiki page to documentation	2013-10-25 10:22:38 -05:00
Geremia Taglialatela	78d2496d97	Added missing !default in scss variables Closes #2231	2013-10-24 23:27:54 +02:00
Geremia Taglialatela	36092f9996	Bumped version number to 4.0.1	2013-10-24 21:03:50 +02:00
Geremia Taglialatela	cd5dd94cbd	Added link to 3.2.1 docs in the footer, just like Bootstrap Closes #2200	2013-10-24 20:58:10 +02:00
Geremia Taglialatela	750843d7f8	Fixes fa-stack alignment Added failing test case Closes #2213	2013-10-24 20:49:23 +02:00
Geremia Taglialatela	0b0e3fa815	Fixed version reference in get started Closes #2218	2013-10-24 20:35:58 +02:00
Geremia Taglialatela	2fe2922aa1	Fixed hdd icon id Closes #2208	2013-10-24 20:25:44 +02:00
Geremia Taglialatela	3ba397f099	Fixes fa-font-path value for netdna bootstrap CDN Closes #2193	2013-10-24 20:21:48 +02:00