diff --git a/css/font-awesome.css b/css/font-awesome.css
index b884ecd4d..3d0d1777c 100644
--- a/css/font-awesome.css
+++ b/css/font-awesome.css
@@ -415,7 +415,7 @@
 .fa-check-square-o:before {
   content: "\f046";
 }
-.fa-move:before {
+.fa-arrows:before {
   content: "\f047";
 }
 .fa-step-backward:before {
@@ -500,10 +500,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 {
@@ -570,10 +570,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 {
@@ -718,10 +718,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,
@@ -752,7 +753,7 @@
 .fa-square:before {
   content: "\f0c8";
 }
-.fa-reorder:before {
+.fa-bars:before {
   content: "\f0c9";
 }
 .fa-list-ul:before {
@@ -889,10 +890,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 {
@@ -1092,16 +1093,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 {
diff --git a/css/font-awesome.min.css b/css/font-awesome.min.css
index 9b280e77a..500e2736e 100644
--- a/css/font-awesome.min.css
+++ b/css/font-awesome.min.css
@@ -90,7 +90,7 @@
 .fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}
 .fa-share-square-o:before{content:"\f045"}
 .fa-check-square-o:before{content:"\f046"}
-.fa-move:before{content:"\f047"}
+.fa-arrows:before{content:"\f047"}
 .fa-step-backward:before{content:"\f048"}
 .fa-fast-backward:before{content:"\f049"}
 .fa-backward:before{content:"\f04a"}
@@ -118,8 +118,8 @@
 .fa-arrow-up:before{content:"\f062"}
 .fa-arrow-down:before{content:"\f063"}
 .fa-mail-forward:before,.fa-share:before{content:"\f064"}
-.fa-resize-full:before{content:"\f065"}
-.fa-resize-small:before{content:"\f066"}
+.fa-expand:before{content:"\f065"}
+.fa-compress:before{content:"\f066"}
 .fa-plus:before{content:"\f067"}
 .fa-minus:before{content:"\f068"}
 .fa-asterisk:before{content:"\f069"}
@@ -141,8 +141,8 @@
 .fa-shopping-cart:before{content:"\f07a"}
 .fa-folder:before{content:"\f07b"}
 .fa-folder-open:before{content:"\f07c"}
-.fa-resize-vertical:before{content:"\f07d"}
-.fa-resize-horizontal:before{content:"\f07e"}
+.fa-arrows-v:before{content:"\f07d"}
+.fa-arrows-h:before{content:"\f07e"}
 .fa-bar-chart-o:before{content:"\f080"}
 .fa-twitter-square:before{content:"\f081"}
 .fa-facebook-square:before{content:"\f082"}
@@ -190,8 +190,8 @@
 .fa-tasks:before{content:"\f0ae"}
 .fa-filter:before{content:"\f0b0"}
 .fa-briefcase:before{content:"\f0b1"}
-.fa-fullscreen:before{content:"\f0b2"}
-.fa-group:before{content:"\f0c0"}
+.fa-arrows-alt:before{content:"\f0b2"}
+.fa-group:before,.fa-users:before{content:"\f0c0"}
 .fa-chain:before,.fa-link:before{content:"\f0c1"}
 .fa-cloud:before{content:"\f0c2"}
 .fa-flask:before{content:"\f0c3"}
@@ -200,7 +200,7 @@
 .fa-paperclip:before{content:"\f0c6"}
 .fa-save:before,.fa-floppy-o:before{content:"\f0c7"}
 .fa-square:before{content:"\f0c8"}
-.fa-reorder:before{content:"\f0c9"}
+.fa-bars:before{content:"\f0c9"}
 .fa-list-ul:before{content:"\f0ca"}
 .fa-list-ol:before{content:"\f0cb"}
 .fa-strikethrough:before{content:"\f0cc"}
@@ -243,8 +243,8 @@
 .fa-coffee:before{content:"\f0f4"}
 .fa-cutlery:before{content:"\f0f5"}
 .fa-file-text-o:before{content:"\f0f6"}
-.fa-building:before{content:"\f0f7"}
-.fa-hospital:before{content:"\f0f8"}
+.fa-building-o:before{content:"\f0f7"}
+.fa-hospital-o:before{content:"\f0f8"}
 .fa-ambulance:before{content:"\f0f9"}
 .fa-medkit:before{content:"\f0fa"}
 .fa-fighter-jet:before{content:"\f0fb"}
@@ -309,10 +309,10 @@
 .fa-html5:before{content:"\f13b"}
 .fa-css3:before{content:"\f13c"}
 .fa-anchor:before{content:"\f13d"}
-.fa-unlock-o:before{content:"\f13e"}
+.fa-unlock-alt:before{content:"\f13e"}
 .fa-bullseye:before{content:"\f140"}
-.fa-ellipsis-horizontal:before{content:"\f141"}
-.fa-ellipsis-vertical:before{content:"\f142"}
+.fa-ellipsis-h:before{content:"\f141"}
+.fa-ellipsis-v:before{content:"\f142"}
 .fa-rss-square:before{content:"\f143"}
 .fa-play-circle:before{content:"\f144"}
 .fa-ticket:before{content:"\f145"}
diff --git a/less/icons.less b/less/icons.less
index 2e13602bb..bf0f856fc 100644
--- 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; }
@@ -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; }
@@ -311,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; }
diff --git a/less/variables.less b/less/variables.less
index e899a59d6..db875b462 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -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";
@@ -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";
@@ -295,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";
diff --git a/scss/_icons.scss b/scss/_icons.scss
index 38ed7e17c..7490cf361 100644
--- 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; }
@@ -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; }
@@ -311,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; }
diff --git a/scss/_variables.scss b/scss/_variables.scss
index b0abeb66e..cd8014009 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -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";
@@ -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";
@@ -295,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";
diff --git a/src/_includes/navbar.html b/src/_includes/navbar.html
index cc149f341..ae5696f2f 100644
--- 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>
diff --git a/src/_includes/new-naming.html b/src/_includes/new-naming.html
index 06317915e..a1d574dbf 100644
--- 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">
diff --git a/src/icons.yml b/src/icons.yml
index 2ca514c93..45bae0302 100644
--- a/src/icons.yml
+++ b/src/icons.yml
@@ -481,8 +481,8 @@ icons:
       - Web Application Icons
       - Form Control Icons
 
-  - name:       move
-    id:         move
+  - name:       Arrows
+    id:         arrows
     unicode:    f047
     created:    1.0
     categories:
@@ -681,15 +681,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,15 +845,15 @@ 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
 
-  - name:       resize-horizontal
-    id:         resize-horizontal
+  - name:       Arrows Horizontal
+    id:         arrows-h
     unicode:    f07e
     created:    1.0
     categories:
@@ -1196,18 +1196,20 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       fullscreen
-    id:         fullscreen
+  - name:       Arrows Alt
+    id:         arrows-alt
     unicode:    f0b2
     created:    2.0
     categories:
       - Video Player Icons
 
 
-  - name:       Group
-    id:         group
+  - name:       Users
+    id:         users
     unicode:    f0c0
     created:    2.0
+    aliases:
+      - group
     categories:
       - Web Application Icons
 
@@ -1276,8 +1278,8 @@ icons:
       - Web Application Icons
       - Form Control Icons
 
-  - name:       Reorder
-    id:         reorder
+  - name:       Bars
+    id:         bars
     unicode:    f0c9
     created:    2.0
     categories:
@@ -1598,15 +1600,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:
@@ -2077,8 +2079,8 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       Unlock Outlined
-    id:         unlock-o
+  - name:       Unlock Alt
+    id:         unlock-alt
     unicode:    f13e
     created:    3.1
     categories:
@@ -2092,15 +2094,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:
diff --git a/src/test-2.3.2.html b/src/test-2.3.2.html
index 764f99cc7..ea75a5d0b 100644
--- a/src/test-2.3.2.html
+++ b/src/test-2.3.2.html
@@ -57,34 +57,34 @@ relative_path: ../
 <div class="row-fluid">
   <div class="span3">
     <div class="well">
-      <i class="fa fa-building"></i> Building
+      <i class="fa fa-building-o"></i> Building
     </div>
   </div>
   <div class="span3">
     <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="span3">
-    <i class="fa fa-building"></i> Building
+    <i class="fa fa-building-o"></i> Building
   </div>
   <div class="span3">
-    <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-fluid" style="font-size: 24px; line-height: 1.5em;">
   <div class="span4">
     <div class="well">
-      <i class="fa fa-building"></i> Building
+      <i class="fa fa-building-o"></i> Building
     </div>
   </div>
   <div class="span4">
     <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="span4">
-    <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-fluid">
@@ -125,10 +125,10 @@ relative_path: ../
 <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 padding-right"></i> Link Here</a>
+    <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 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="span2">
     <a href="#"><i class="fa fa-caret-down padding-right"></i> Link Here</a>
@@ -145,10 +145,10 @@ relative_path: ../
 </div>
 <div class="row-fluid">
   <div class="span2">
-    <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="span2">
-    <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="span2">
     <a href="#"><i class="fa fa-caret-down padding-right-sm"></i> Link Here</a>
@@ -178,11 +178,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 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 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 fa-lg"></i> Nav Item 3</a></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>
@@ -199,23 +199,23 @@ relative_path: ../
     <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"></i> Button</button>
-        <button class="btn btn-default btn-mini"><i class="fa fa-building"></i></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"></i> Button</button>
-        <button class="btn btn-default btn-small"><i class="fa fa-building"></i></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"></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-large">Button</button>
-        <button class="btn btn-default btn-large"><i class="fa fa-building"></i> Button</button>
-        <button class="btn btn-default btn-large"><i class="fa fa-building"></i></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>
@@ -223,23 +223,23 @@ relative_path: ../
     <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 fa-lg"></i> Button</button>
-        <button class="btn btn-default btn-mini"><i class="fa fa-building fa-lg"></i></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 fa-lg"></i> Button</button>
-        <button class="btn btn-default btn-small"><i class="fa fa-building fa-lg"></i></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 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-large">Button</button>
-        <button class="btn btn-default btn-large"><i class="fa fa-building fa-lg"></i> Button</button>
-        <button class="btn btn-default btn-large"><i class="fa fa-building fa-lg"></i></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>
@@ -302,23 +302,23 @@ relative_path: ../
     <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"></i> Button</a>
-        <a class="btn btn-default btn-mini"><i class="fa fa-building"></i></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"></i> Button</a>
-        <a class="btn btn-default btn-small"><i class="fa fa-building"></i></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"></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-large">Button</a>
-        <a class="btn btn-default btn-large"><i class="fa fa-building"></i> Button</a>
-        <a class="btn btn-default btn-large"><i class="fa fa-building"></i></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>
@@ -326,23 +326,23 @@ relative_path: ../
     <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 fa-lg"></i> Button</a>
-        <a class="btn btn-default btn-mini"><i class="fa fa-building fa-lg"></i></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 fa-lg"></i> Button</a>
-        <a class="btn btn-default btn-small"><i class="fa fa-building fa-lg"></i></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 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-large">Button</a>
-        <a class="btn btn-default btn-large"><i class="fa fa-building fa-lg"></i> Button</a>
-        <a class="btn btn-default btn-large"><i class="fa fa-building fa-lg"></i></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>
@@ -481,8 +481,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">
@@ -491,11 +491,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>
@@ -508,8 +508,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">
@@ -518,11 +518,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>
@@ -575,7 +575,7 @@ relative_path: ../
 </div>
 <div class="row-fluid">
   <div class="span4">
-    <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="span4">
@@ -596,8 +596,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-mini">foo</a>
         </li>
@@ -609,8 +609,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-mini">foo</a>
         </li>
@@ -624,7 +624,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>
@@ -633,7 +633,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>
@@ -644,7 +644,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>
@@ -653,7 +653,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>
@@ -665,7 +665,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-mini">foo</a>
         </li>
@@ -678,7 +678,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-mini">foo</a>
         </li>
diff --git a/src/test.html b/src/test.html
index 836bd1c03..0384f8a77 100644
--- 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>