From 6bcd555b42e7f4c3b9502fb5a9e5597178eb2419 Mon Sep 17 00:00:00 2001
From: davegandy <dave@davegandy.com>
Date: Wed, 16 Oct 2013 12:16:39 -0400
Subject: [PATCH] fixing icon variable names, updating some icon variable names
 for consistency, removing browser specific mixin for border radius to be in
 step with bs3

---
 css/font-awesome.css                          |  32 +-
 css/font-awesome.min.css                      |  30 +-
 less/bootstrap.less                           |  60 --
 less/core.less                                |  35 +-
 less/extras.less                              |  12 +-
 less/icons.less                               | 730 ++++++++---------
 less/mixins.less                              |  35 +-
 less/path.less                                |  12 +-
 less/variables.less                           | 742 +++++++++---------
 scss/_icons.scss                              |  22 +-
 scss/_variables.scss                          |  18 +-
 src/_includes/icons/brand.html                |   2 +-
 src/_includes/icons/currency.html             |   2 +-
 src/_includes/icons/directional.html          |   2 +-
 src/_includes/icons/medical.html              |   2 +-
 src/_includes/icons/new.html                  |   2 +-
 src/_includes/icons/text-editor.html          |   2 +-
 src/_includes/icons/video-player.html         |   2 +-
 src/_includes/icons/web-application.html      |   2 +-
 src/assets/font-awesome/less/core.less        |  35 +-
 src/assets/font-awesome/less/extras.less      |  12 +-
 src/assets/font-awesome/less/icons.less       |   2 +-
 src/assets/font-awesome/less/mixins.less      |  35 +-
 src/assets/font-awesome/less/path.less        |  12 +-
 src/assets/font-awesome/less/variables.less   |  18 +-
 src/assets/less/site/bootstrap/jumbotron.less |   1 +
 src/icons.yml                                 |  43 +-
 27 files changed, 902 insertions(+), 1000 deletions(-)
 delete mode 100644 less/bootstrap.less

diff --git a/css/font-awesome.css b/css/font-awesome.css
index 239c02371..950b588c3 100644
--- a/css/font-awesome.css
+++ b/css/font-awesome.css
@@ -90,8 +90,6 @@
 .fa-icon-border {
   padding: .2em .25em .15em;
   border: solid 1px #eeeeee;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
   border-radius: 3px;
 }
 .fa-icon-2x {
@@ -99,8 +97,6 @@
 }
 .fa-icon-2x.fa-icon-border {
   border-width: 2px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
   border-radius: 4px;
 }
 .fa-icon-3x {
@@ -108,8 +104,6 @@
 }
 .fa-icon-3x.fa-icon-border {
   border-width: 3px;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
   border-radius: 5px;
 }
 .fa-icon-4x {
@@ -117,8 +111,6 @@
 }
 .fa-icon-4x.fa-icon-border {
   border-width: 4px;
-  -webkit-border-radius: 6px;
-  -moz-border-radius: 6px;
   border-radius: 6px;
 }
 .fa-icon-5x {
@@ -126,8 +118,6 @@
 }
 .fa-icon-5x.fa-icon-border {
   border-width: 5px;
-  -webkit-border-radius: 7px;
-  -moz-border-radius: 7px;
   border-radius: 7px;
 }
 .pull-right {
@@ -851,13 +841,16 @@
 .fa-icon-columns:before {
   content: "\f0db";
 }
+.fa-icon-unsorted:before,
 .fa-icon-sort:before {
   content: "\f0dc";
 }
-.fa-icon-sort-down:before {
+.fa-icon-sort-down:before,
+.fa-icon-sort-asc:before {
   content: "\f0dd";
 }
-.fa-icon-sort-up:before {
+.fa-icon-sort-up:before,
+.fa-icon-sort-desc:before {
   content: "\f0de";
 }
 .fa-icon-envelope:before {
@@ -1059,8 +1052,9 @@
 .fa-icon-mail-reply-all:before {
   content: "\f122";
 }
+.fa-icon-star-half-empty:before,
 .fa-icon-star-half-full:before,
-.fa-icon-star-half-empty:before {
+.fa-icon-star-half-alt:before {
   content: "\f123";
 }
 .fa-icon-location-arrow:before {
@@ -1236,22 +1230,22 @@
 .fa-icon-file-text:before {
   content: "\f15c";
 }
-.fa-icon-sort-by-alphabet:before {
+.fa-icon-sort-alpha-asc:before {
   content: "\f15d";
 }
-.fa-icon-sort-by-alphabet-alt:before {
+.fa-icon-sort-alpha-desc:before {
   content: "\f15e";
 }
-.fa-icon-sort-by-attributes:before {
+.fa-icon-sort-amount-asc:before {
   content: "\f160";
 }
-.fa-icon-sort-by-attributes-alt:before {
+.fa-icon-sort-amount-desc:before {
   content: "\f161";
 }
-.fa-icon-sort-by-order:before {
+.fa-icon-sort-numeric-asc:before {
   content: "\f162";
 }
-.fa-icon-sort-by-order-alt:before {
+.fa-icon-sort-numeric-desc:before {
   content: "\f163";
 }
 .fa-icon-thumbs-up:before {
diff --git a/css/font-awesome.min.css b/css/font-awesome.min.css
index b5a58f8ae..e3e6fcdb9 100644
--- a/css/font-awesome.min.css
+++ b/css/font-awesome.min.css
@@ -7,11 +7,11 @@
 .fa-icon-muted{color:#eeeeee;}
 .fa-icon-light{color:#ffffff;}
 .fa-icon-dark{color:#333333;}
-.fa-icon-border{padding:.2em .25em .15em;border:solid 1px #eeeeee;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
-.fa-icon-2x{font-size:2em;}.fa-icon-2x.fa-icon-border{border-width:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.fa-icon-3x{font-size:3em;}.fa-icon-3x.fa-icon-border{border-width:3px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
-.fa-icon-4x{font-size:4em;}.fa-icon-4x.fa-icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
-.fa-icon-5x{font-size:5em;}.fa-icon-5x.fa-icon-border{border-width:5px;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px;}
+.fa-icon-border{padding:.2em .25em .15em;border:solid 1px #eeeeee;border-radius:3px;}
+.fa-icon-2x{font-size:2em;}.fa-icon-2x.fa-icon-border{border-width:2px;border-radius:4px;}
+.fa-icon-3x{font-size:3em;}.fa-icon-3x.fa-icon-border{border-width:3px;border-radius:5px;}
+.fa-icon-4x{font-size:4em;}.fa-icon-4x.fa-icon-border{border-width:4px;border-radius:6px;}
+.fa-icon-5x{font-size:5em;}.fa-icon-5x.fa-icon-border{border-width:5px;border-radius:7px;}
 .pull-right{float:right;}
 .pull-left{float:left;}
 .fa-icon.pull-left{margin-right:.3em;}
@@ -219,9 +219,9 @@
 .fa-icon-caret-left:before{content:"\f0d9";}
 .fa-icon-caret-right:before{content:"\f0da";}
 .fa-icon-columns:before{content:"\f0db";}
-.fa-icon-sort:before{content:"\f0dc";}
-.fa-icon-sort-down:before{content:"\f0dd";}
-.fa-icon-sort-up:before{content:"\f0de";}
+.fa-icon-unsorted:before,.fa-icon-sort:before{content:"\f0dc";}
+.fa-icon-sort-down:before,.fa-icon-sort-asc:before{content:"\f0dd";}
+.fa-icon-sort-up:before,.fa-icon-sort-desc:before{content:"\f0de";}
 .fa-icon-envelope:before{content:"\f0e0";}
 .fa-icon-linkedin:before{content:"\f0e1";}
 .fa-icon-rotate-left:before,.fa-icon-undo:before{content:"\f0e2";}
@@ -286,7 +286,7 @@
 .fa-icon-code:before{content:"\f121";}
 .fa-icon-reply-all:before{content:"\f122";}
 .fa-icon-mail-reply-all:before{content:"\f122";}
-.fa-icon-star-half-full:before,.fa-icon-star-half-empty:before{content:"\f123";}
+.fa-icon-star-half-empty:before,.fa-icon-star-half-full:before,.fa-icon-star-half-alt:before{content:"\f123";}
 .fa-icon-location-arrow:before{content:"\f124";}
 .fa-icon-crop:before{content:"\f125";}
 .fa-icon-code-fork:before{content:"\f126";}
@@ -341,12 +341,12 @@
 .fa-icon-bitcoin:before,.fa-icon-btc:before{content:"\f15a";}
 .fa-icon-file:before{content:"\f15b";}
 .fa-icon-file-text:before{content:"\f15c";}
-.fa-icon-sort-by-alphabet:before{content:"\f15d";}
-.fa-icon-sort-by-alphabet-alt:before{content:"\f15e";}
-.fa-icon-sort-by-attributes:before{content:"\f160";}
-.fa-icon-sort-by-attributes-alt:before{content:"\f161";}
-.fa-icon-sort-by-order:before{content:"\f162";}
-.fa-icon-sort-by-order-alt:before{content:"\f163";}
+.fa-icon-sort-alpha-asc:before{content:"\f15d";}
+.fa-icon-sort-alpha-desc:before{content:"\f15e";}
+.fa-icon-sort-amount-asc:before{content:"\f160";}
+.fa-icon-sort-amount-desc:before{content:"\f161";}
+.fa-icon-sort-numeric-asc:before{content:"\f162";}
+.fa-icon-sort-numeric-desc:before{content:"\f163";}
 .fa-icon-thumbs-up:before{content:"\f164";}
 .fa-icon-thumbs-down:before{content:"\f165";}
 .fa-icon-youtube-sign:before{content:"\f166";}
diff --git a/less/bootstrap.less b/less/bootstrap.less
deleted file mode 100644
index 6fb65bf8e..000000000
--- a/less/bootstrap.less
+++ /dev/null
@@ -1,60 +0,0 @@
-/* BOOTSTRAP SPECIFIC CLASSES
- * -------------------------- */
-
-/* Bootstrap 2.0 sprites.less reset */
-//.fa {
-//  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;
-//}
-
-
-/* keeps Bootstrap styles with and without icons the same */
-.btn, .nav {
-  .fa {
-//    display: inline;
-    &.fa-lg { line-height: .9em; }
-    &.fa-spin { display: inline-block; }
-  }
-}
-.nav-tabs, .nav-pills {
-  .fa {
-    &, &.fa-lg { line-height: .9em; }
-  }
-}
-.btn {
-  .fa {
-    &.pull-left, &.pull-right {
-      &.fa-2x { margin-top: .18em; }
-    }
-    &.fa-spin.fa-lg { line-height: .8em; }
-  }
-}
-.btn.btn-small {
-  .fa {
-    &.pull-left, &.pull-right {
-      &.fa-2x { margin-top: .25em; }
-    }
-  }
-}
-.btn.btn-large {
-  .fa {
-    margin-top: 0; // overrides bootstrap default
-    &.pull-left, &.pull-right {
-      &.fa-2x { margin-top: .05em; }
-    }
-    &.pull-left.fa-2x { margin-right: .2em; }
-    &.pull-right.fa-2x { margin-left: .2em; }
-  }
-}
-
-/* Fixes alignment in nav lists */
-.nav-list .fa {
-  line-height: inherit;
-}
diff --git a/less/core.less b/less/core.less
index d967c205c..34a5f8f33 100644
--- a/less/core.less
+++ b/less/core.less
@@ -2,10 +2,15 @@
  * -------------------------- */
 
 .fa-icon {
-  .icon-FontAwesome();
+  display: inline-block;
+  font-family: FontAwesome;
+  font-style: normal;
+  font-weight: normal;
+  line-height: 1;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
 }
 
-
 /* makes the font 33% larger relative to the icon container */
 .fa-icon-lg {
   font-size: (4em / 3);
@@ -28,28 +33,28 @@
 
 .fa-icon-ul {
   padding-left: 0;
-  margin-left: @icons-li-width;
+  margin-left: @fa-icon-li-width;
   list-style-type: none;
 
   > li { position: relative; }
 }
 .fa-icon-li {
   position: absolute;
-  left: -@icons-li-width;
-  width: @icons-li-width;
+  left: -@fa-icon-li-width;
+  width: @fa-icon-li-width;
   top: (2em / 14);
   text-align: center;
   &.fa-icon-lg {
-    left: -@icons-li-width + (4em / 14);
+    left: -@fa-icon-li-width + (4em / 14);
   }
 }
 
 // allows usage of the hide class directly on font awesome icons
 .fa-icon.hide { display: none; }
 
-.fa-icon-muted { color: @iconMuted; }
-.fa-icon-light { color: @iconLight; }
-.fa-icon-dark { color: @iconDark; }
+.fa-icon-muted { color: @fa-icon-muted; }
+.fa-icon-light { color: @fa-icon-light; }
+.fa-icon-dark { color: @fa-icon-dark; }
 
 
 // Icon Borders
@@ -57,8 +62,8 @@
 
 .fa-icon-border {
   padding: .2em .25em .15em;
-  border: solid 1px @borderColor;
-  .border-radius(3px);
+  border: solid 1px @fa-border-color;
+  border-radius: 3px;
 }
 
 // Icon Sizes
@@ -68,21 +73,21 @@
   font-size: 2em;
   &.fa-icon-border {
     border-width: 2px;
-    .border-radius(4px);
+    border-radius: 4px;
   }
 }
 .fa-icon-3x {
   font-size: 3em;
   &.fa-icon-border {
     border-width: 3px;
-    .border-radius(5px);
+    border-radius: 5px;
   }
 }
 .fa-icon-4x {
   font-size: 4em;
   &.fa-icon-border {
     border-width: 4px;
-    .border-radius(6px);
+    border-radius: 6px;
   }
 }
 
@@ -90,7 +95,7 @@
   font-size: 5em;
   &.fa-icon-border {
     border-width: 5px;
-    .border-radius(7px);
+    border-radius: 7px;
   }
 }
 
diff --git a/less/extras.less b/less/extras.less
index 5f6a2e1a2..9c9aa829e 100644
--- a/less/extras.less
+++ b/less/extras.less
@@ -2,7 +2,7 @@
  * -------------------------- */
 
 /* Stacked and layered icon */
-.icon-stack();
+.fa-icon-stack();
 
 /* Animated rotating icon */
 .fa-icon-spin {
@@ -37,9 +37,9 @@
 // Icon rotations & flipping
 // -------------------------
 
-.fa-icon-rotate-90  { .rotate(90deg, 1);  }
-.fa-icon-rotate-180 { .rotate(180deg, 2); }
-.fa-icon-rotate-270 { .rotate(270deg, 3); }
+.fa-icon-rotate-90  { .fa-icon-rotate(90deg, 1);  }
+.fa-icon-rotate-180 { .fa-icon-rotate(180deg, 2); }
+.fa-icon-rotate-270 { .fa-icon-rotate(270deg, 3); }
 
-.fa-icon-flip-horizontal { .flip(-1, 1); }
-.fa-icon-flip-vertical   { .flip(1, -1); }
+.fa-icon-flip-horizontal { .fa-icon-flip(-1, 1); }
+.fa-icon-flip-vertical   { .fa-icon-flip(1, -1); }
diff --git a/less/icons.less b/less/icons.less
index f38a80b07..e22e09fcb 100644
--- a/less/icons.less
+++ b/less/icons.less
@@ -1,397 +1,401 @@
 /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
    readers do not read off random characters that represent icons */
 
-.fa-icon-glass:before { content: @glass; }
-.fa-icon-music:before { content: @music; }
-.fa-icon-search:before { content: @search; }
-.fa-icon-envelope-alt:before { content: @envelope-alt; }
-.fa-icon-heart:before { content: @heart; }
-.fa-icon-star:before { content: @star; }
-.fa-icon-star-alt:before { content: @star-alt; }
-.fa-icon-user:before { content: @user; }
-.fa-icon-film:before { content: @film; }
-.fa-icon-th-large:before { content: @th-large; }
-.fa-icon-th:before { content: @th; }
-.fa-icon-th-list:before { content: @th-list; }
-.fa-icon-check:before { content: @check; }
-.fa-icon-times:before { content: @times; }
-.fa-icon-zoom-in:before { content: @zoom-in; }
-.fa-icon-zoom-out:before { content: @zoom-out; }
-.fa-icon-power-off:before { content: @power-off; }
-.fa-icon-signal:before { content: @signal; }
+.fa-icon-glass:before { content: @fa-icon-glass; }
+.fa-icon-music:before { content: @fa-icon-music; }
+.fa-icon-search:before { content: @fa-icon-search; }
+.fa-icon-envelope-alt:before { content: @fa-icon-envelope-alt; }
+.fa-icon-heart:before { content: @fa-icon-heart; }
+.fa-icon-star:before { content: @fa-icon-star; }
+.fa-icon-star-alt:before { content: @fa-icon-star-alt; }
+.fa-icon-user:before { content: @fa-icon-user; }
+.fa-icon-film:before { content: @fa-icon-film; }
+.fa-icon-th-large:before { content: @fa-icon-th-large; }
+.fa-icon-th:before { content: @fa-icon-th; }
+.fa-icon-th-list:before { content: @fa-icon-th-list; }
+.fa-icon-check:before { content: @fa-icon-check; }
+.fa-icon-times:before { content: @fa-icon-times; }
+.fa-icon-zoom-in:before { content: @fa-icon-zoom-in; }
+.fa-icon-zoom-out:before { content: @fa-icon-zoom-out; }
+.fa-icon-power-off:before { content: @fa-icon-power-off; }
+.fa-icon-signal:before { content: @fa-icon-signal; }
 .fa-icon-gear:before,
-.fa-icon-cog:before { content: @cog; }
-.fa-icon-trash:before { content: @trash; }
-.fa-icon-home:before { content: @home; }
-.fa-icon-file-alt:before { content: @file-alt; }
-.fa-icon-time:before { content: @time; }
-.fa-icon-road:before { content: @road; }
-.fa-icon-download:before { content: @download; }
-.fa-icon-arrow-circle-alt-down:before { content: @arrow-circle-alt-down; }
-.fa-icon-arrow-circle-alt-up:before { content: @arrow-circle-alt-up; }
-.fa-icon-inbox:before { content: @inbox; }
-.fa-icon-play-circle-alt:before { content: @play-circle-alt; }
+.fa-icon-cog:before { content: @fa-icon-cog; }
+.fa-icon-trash:before { content: @fa-icon-trash; }
+.fa-icon-home:before { content: @fa-icon-home; }
+.fa-icon-file-alt:before { content: @fa-icon-file-alt; }
+.fa-icon-time:before { content: @fa-icon-time; }
+.fa-icon-road:before { content: @fa-icon-road; }
+.fa-icon-download:before { content: @fa-icon-download; }
+.fa-icon-arrow-circle-alt-down:before { content: @fa-icon-arrow-circle-alt-down; }
+.fa-icon-arrow-circle-alt-up:before { content: @fa-icon-arrow-circle-alt-up; }
+.fa-icon-inbox:before { content: @fa-icon-inbox; }
+.fa-icon-play-circle-alt:before { content: @fa-icon-play-circle-alt; }
 .fa-icon-rotate-right:before,
-.fa-icon-repeat:before { content: @repeat; }
-.fa-icon-refresh:before { content: @refresh; }
-.fa-icon-list-alt:before { content: @list-alt; }
-.fa-icon-lock:before { content: @lock; }
-.fa-icon-flag:before { content: @flag; }
-.fa-icon-headphones:before { content: @headphones; }
-.fa-icon-volume-off:before { content: @volume-off; }
-.fa-icon-volume-down:before { content: @volume-down; }
-.fa-icon-volume-up:before { content: @volume-up; }
-.fa-icon-qrcode:before { content: @qrcode; }
-.fa-icon-barcode:before { content: @barcode; }
-.fa-icon-tag:before { content: @tag; }
-.fa-icon-tags:before { content: @tags; }
-.fa-icon-book:before { content: @book; }
-.fa-icon-bookmark:before { content: @bookmark; }
-.fa-icon-print:before { content: @print; }
-.fa-icon-camera:before { content: @camera; }
-.fa-icon-font:before { content: @font; }
-.fa-icon-bold:before { content: @bold; }
-.fa-icon-italic:before { content: @italic; }
-.fa-icon-text-height:before { content: @text-height; }
-.fa-icon-text-width:before { content: @text-width; }
-.fa-icon-align-left:before { content: @align-left; }
-.fa-icon-align-center:before { content: @align-center; }
-.fa-icon-align-right:before { content: @align-right; }
-.fa-icon-align-justify:before { content: @align-justify; }
-.fa-icon-list:before { content: @list; }
+.fa-icon-repeat:before { content: @fa-icon-repeat; }
+.fa-icon-refresh:before { content: @fa-icon-refresh; }
+.fa-icon-list-alt:before { content: @fa-icon-list-alt; }
+.fa-icon-lock:before { content: @fa-icon-lock; }
+.fa-icon-flag:before { content: @fa-icon-flag; }
+.fa-icon-headphones:before { content: @fa-icon-headphones; }
+.fa-icon-volume-off:before { content: @fa-icon-volume-off; }
+.fa-icon-volume-down:before { content: @fa-icon-volume-down; }
+.fa-icon-volume-up:before { content: @fa-icon-volume-up; }
+.fa-icon-qrcode:before { content: @fa-icon-qrcode; }
+.fa-icon-barcode:before { content: @fa-icon-barcode; }
+.fa-icon-tag:before { content: @fa-icon-tag; }
+.fa-icon-tags:before { content: @fa-icon-tags; }
+.fa-icon-book:before { content: @fa-icon-book; }
+.fa-icon-bookmark:before { content: @fa-icon-bookmark; }
+.fa-icon-print:before { content: @fa-icon-print; }
+.fa-icon-camera:before { content: @fa-icon-camera; }
+.fa-icon-font:before { content: @fa-icon-font; }
+.fa-icon-bold:before { content: @fa-icon-bold; }
+.fa-icon-italic:before { content: @fa-icon-italic; }
+.fa-icon-text-height:before { content: @fa-icon-text-height; }
+.fa-icon-text-width:before { content: @fa-icon-text-width; }
+.fa-icon-align-left:before { content: @fa-icon-align-left; }
+.fa-icon-align-center:before { content: @fa-icon-align-center; }
+.fa-icon-align-right:before { content: @fa-icon-align-right; }
+.fa-icon-align-justify:before { content: @fa-icon-align-justify; }
+.fa-icon-list:before { content: @fa-icon-list; }
 .fa-icon-dedent:before,
-.fa-icon-outdent:before { content: @outdent; }
-.fa-icon-indent:before { content: @indent; }
-.fa-icon-video-camera:before { content: @video-camera; }
-.fa-icon-picture:before { content: @picture; }
-.fa-icon-pencil:before { content: @pencil; }
-.fa-icon-map-marker:before { content: @map-marker; }
-.fa-icon-adjust:before { content: @adjust; }
-.fa-icon-tint:before { content: @tint; }
+.fa-icon-outdent:before { content: @fa-icon-outdent; }
+.fa-icon-indent:before { content: @fa-icon-indent; }
+.fa-icon-video-camera:before { content: @fa-icon-video-camera; }
+.fa-icon-picture:before { content: @fa-icon-picture; }
+.fa-icon-pencil:before { content: @fa-icon-pencil; }
+.fa-icon-map-marker:before { content: @fa-icon-map-marker; }
+.fa-icon-adjust:before { content: @fa-icon-adjust; }
+.fa-icon-tint:before { content: @fa-icon-tint; }
 .fa-icon-edit:before,
-.fa-icon-pencil-square-alt:before { content: @pencil-square-alt; }
-.fa-icon-share-square-alt:before { content: @share-square-alt; }
-.fa-icon-check-square-alt:before { content: @check-square-alt; }
-.fa-icon-move:before { content: @move; }
-.fa-icon-step-backward:before { content: @step-backward; }
-.fa-icon-fast-backward:before { content: @fast-backward; }
-.fa-icon-backward:before { content: @backward; }
-.fa-icon-play:before { content: @play; }
-.fa-icon-pause:before { content: @pause; }
-.fa-icon-stop:before { content: @stop; }
-.fa-icon-forward:before { content: @forward; }
-.fa-icon-fast-forward:before { content: @fast-forward; }
-.fa-icon-step-forward:before { content: @step-forward; }
-.fa-icon-eject:before { content: @eject; }
-.fa-icon-chevron-left:before { content: @chevron-left; }
-.fa-icon-chevron-right:before { content: @chevron-right; }
-.fa-icon-plus-circle:before { content: @plus-circle; }
-.fa-icon-minus-circle:before { content: @minus-circle; }
-.fa-icon-times-circle:before { content: @times-circle; }
-.fa-icon-check-circle:before { content: @check-circle; }
-.fa-icon-question-circle:before { content: @question-circle; }
-.fa-icon-info-circle:before { content: @info-circle; }
-.fa-icon-screenshot:before { content: @screenshot; }
-.fa-icon-times-circle-alt:before { content: @times-circle-alt; }
-.fa-icon-check-circle-alt:before { content: @check-circle-alt; }
-.fa-icon-ban:before { content: @ban; }
-.fa-icon-arrow-left:before { content: @arrow-left; }
-.fa-icon-arrow-right:before { content: @arrow-right; }
-.fa-icon-arrow-up:before { content: @arrow-up; }
-.fa-icon-arrow-down:before { content: @arrow-down; }
+.fa-icon-pencil-square-alt:before { content: @fa-icon-pencil-square-alt; }
+.fa-icon-share-square-alt:before { content: @fa-icon-share-square-alt; }
+.fa-icon-check-square-alt:before { content: @fa-icon-check-square-alt; }
+.fa-icon-move:before { content: @fa-icon-move; }
+.fa-icon-step-backward:before { content: @fa-icon-step-backward; }
+.fa-icon-fast-backward:before { content: @fa-icon-fast-backward; }
+.fa-icon-backward:before { content: @fa-icon-backward; }
+.fa-icon-play:before { content: @fa-icon-play; }
+.fa-icon-pause:before { content: @fa-icon-pause; }
+.fa-icon-stop:before { content: @fa-icon-stop; }
+.fa-icon-forward:before { content: @fa-icon-forward; }
+.fa-icon-fast-forward:before { content: @fa-icon-fast-forward; }
+.fa-icon-step-forward:before { content: @fa-icon-step-forward; }
+.fa-icon-eject:before { content: @fa-icon-eject; }
+.fa-icon-chevron-left:before { content: @fa-icon-chevron-left; }
+.fa-icon-chevron-right:before { content: @fa-icon-chevron-right; }
+.fa-icon-plus-circle:before { content: @fa-icon-plus-circle; }
+.fa-icon-minus-circle:before { content: @fa-icon-minus-circle; }
+.fa-icon-times-circle:before { content: @fa-icon-times-circle; }
+.fa-icon-check-circle:before { content: @fa-icon-check-circle; }
+.fa-icon-question-circle:before { content: @fa-icon-question-circle; }
+.fa-icon-info-circle:before { content: @fa-icon-info-circle; }
+.fa-icon-screenshot:before { content: @fa-icon-screenshot; }
+.fa-icon-times-circle-alt:before { content: @fa-icon-times-circle-alt; }
+.fa-icon-check-circle-alt:before { content: @fa-icon-check-circle-alt; }
+.fa-icon-ban:before { content: @fa-icon-ban; }
+.fa-icon-arrow-left:before { content: @fa-icon-arrow-left; }
+.fa-icon-arrow-right:before { content: @fa-icon-arrow-right; }
+.fa-icon-arrow-up:before { content: @fa-icon-arrow-up; }
+.fa-icon-arrow-down:before { content: @fa-icon-arrow-down; }
 .fa-icon-mail-forward:before,
-.fa-icon-share:before { content: @share; }
-.fa-icon-resize-full:before { content: @resize-full; }
-.fa-icon-resize-small:before { content: @resize-small; }
-.fa-icon-plus:before { content: @plus; }
-.fa-icon-minus:before { content: @minus; }
-.fa-icon-asterisk:before { content: @asterisk; }
-.fa-icon-exclamation-circle:before { content: @exclamation-circle; }
-.fa-icon-gift:before { content: @gift; }
-.fa-icon-leaf:before { content: @leaf; }
-.fa-icon-fire:before { content: @fire; }
-.fa-icon-eye:before { content: @eye; }
-.fa-icon-eye-closed:before { content: @eye-closed; }
+.fa-icon-share:before { content: @fa-icon-share; }
+.fa-icon-resize-full:before { content: @fa-icon-resize-full; }
+.fa-icon-resize-small:before { content: @fa-icon-resize-small; }
+.fa-icon-plus:before { content: @fa-icon-plus; }
+.fa-icon-minus:before { content: @fa-icon-minus; }
+.fa-icon-asterisk:before { content: @fa-icon-asterisk; }
+.fa-icon-exclamation-circle:before { content: @fa-icon-exclamation-circle; }
+.fa-icon-gift:before { content: @fa-icon-gift; }
+.fa-icon-leaf:before { content: @fa-icon-leaf; }
+.fa-icon-fire:before { content: @fa-icon-fire; }
+.fa-icon-eye:before { content: @fa-icon-eye; }
+.fa-icon-eye-closed:before { content: @fa-icon-eye-closed; }
 .fa-icon-warning:before,
-.fa-icon-exclamation-triangle:before { content: @exclamation-triangle; }
-.fa-icon-plane:before { content: @plane; }
-.fa-icon-calendar:before { content: @calendar; }
-.fa-icon-random:before { content: @random; }
-.fa-icon-comment:before { content: @comment; }
-.fa-icon-magnet:before { content: @magnet; }
-.fa-icon-chevron-up:before { content: @chevron-up; }
-.fa-icon-chevron-down:before { content: @chevron-down; }
-.fa-icon-retweet:before { content: @retweet; }
-.fa-icon-shopping-cart:before { content: @shopping-cart; }
-.fa-icon-folder:before { content: @folder; }
-.fa-icon-folder-open:before { content: @folder-open; }
-.fa-icon-resize-vertical:before { content: @resize-vertical; }
-.fa-icon-resize-horizontal:before { content: @resize-horizontal; }
-.fa-icon-bar-chart:before { content: @bar-chart; }
-.fa-icon-twitter-square:before { content: @twitter-square; }
-.fa-icon-facebook-square:before { content: @facebook-square; }
-.fa-icon-camera-retro:before { content: @camera-retro; }
-.fa-icon-key:before { content: @key; }
+.fa-icon-exclamation-triangle:before { content: @fa-icon-exclamation-triangle; }
+.fa-icon-plane:before { content: @fa-icon-plane; }
+.fa-icon-calendar:before { content: @fa-icon-calendar; }
+.fa-icon-random:before { content: @fa-icon-random; }
+.fa-icon-comment:before { content: @fa-icon-comment; }
+.fa-icon-magnet:before { content: @fa-icon-magnet; }
+.fa-icon-chevron-up:before { content: @fa-icon-chevron-up; }
+.fa-icon-chevron-down:before { content: @fa-icon-chevron-down; }
+.fa-icon-retweet:before { content: @fa-icon-retweet; }
+.fa-icon-shopping-cart:before { content: @fa-icon-shopping-cart; }
+.fa-icon-folder:before { content: @fa-icon-folder; }
+.fa-icon-folder-open:before { content: @fa-icon-folder-open; }
+.fa-icon-resize-vertical:before { content: @fa-icon-resize-vertical; }
+.fa-icon-resize-horizontal:before { content: @fa-icon-resize-horizontal; }
+.fa-icon-bar-chart:before { content: @fa-icon-bar-chart; }
+.fa-icon-twitter-square:before { content: @fa-icon-twitter-square; }
+.fa-icon-facebook-square:before { content: @fa-icon-facebook-square; }
+.fa-icon-camera-retro:before { content: @fa-icon-camera-retro; }
+.fa-icon-key:before { content: @fa-icon-key; }
 .fa-icon-gears:before,
-.fa-icon-cogs:before { content: @cogs; }
-.fa-icon-comments:before { content: @comments; }
-.fa-icon-thumbs-up-alt:before { content: @thumbs-up-alt; }
-.fa-icon-thumbs-down-alt:before { content: @thumbs-down-alt; }
-.fa-icon-star-half:before { content: @star-half; }
-.fa-icon-heart-alt:before { content: @heart-alt; }
-.fa-icon-sign-out:before { content: @sign-out; }
-.fa-icon-linkedin-square:before { content: @linkedin-square; }
-.fa-icon-thumb-tack:before { content: @thumb-tack; }
-.fa-icon-external-link:before { content: @external-link; }
-.fa-icon-sign-in:before { content: @sign-in; }
-.fa-icon-trophy:before { content: @trophy; }
-.fa-icon-github-square:before { content: @github-square; }
-.fa-icon-upload:before { content: @upload; }
-.fa-icon-lemon-alt:before { content: @lemon-alt; }
-.fa-icon-phone:before { content: @phone; }
+.fa-icon-cogs:before { content: @fa-icon-cogs; }
+.fa-icon-comments:before { content: @fa-icon-comments; }
+.fa-icon-thumbs-up-alt:before { content: @fa-icon-thumbs-up-alt; }
+.fa-icon-thumbs-down-alt:before { content: @fa-icon-thumbs-down-alt; }
+.fa-icon-star-half:before { content: @fa-icon-star-half; }
+.fa-icon-heart-alt:before { content: @fa-icon-heart-alt; }
+.fa-icon-sign-out:before { content: @fa-icon-sign-out; }
+.fa-icon-linkedin-square:before { content: @fa-icon-linkedin-square; }
+.fa-icon-thumb-tack:before { content: @fa-icon-thumb-tack; }
+.fa-icon-external-link:before { content: @fa-icon-external-link; }
+.fa-icon-sign-in:before { content: @fa-icon-sign-in; }
+.fa-icon-trophy:before { content: @fa-icon-trophy; }
+.fa-icon-github-square:before { content: @fa-icon-github-square; }
+.fa-icon-upload:before { content: @fa-icon-upload; }
+.fa-icon-lemon-alt:before { content: @fa-icon-lemon-alt; }
+.fa-icon-phone:before { content: @fa-icon-phone; }
 .fa-icon-unchecked:before,
-.fa-icon-square-alt:before { content: @square-alt; }
-.fa-icon-bookmark-alt:before { content: @bookmark-alt; }
-.fa-icon-phone-square:before { content: @phone-square; }
-.fa-icon-twitter:before { content: @twitter; }
-.fa-icon-facebook:before { content: @facebook; }
-.fa-icon-github:before { content: @github; }
-.fa-icon-unlock:before { content: @unlock; }
-.fa-icon-credit-card:before { content: @credit-card; }
-.fa-icon-rss:before { content: @rss; }
-.fa-icon-hdd:before { content: @hdd; }
-.fa-icon-bullhorn:before { content: @bullhorn; }
-.fa-icon-bell:before { content: @bell; }
-.fa-icon-certificate:before { content: @certificate; }
-.fa-icon-hand-right:before { content: @hand-right; }
-.fa-icon-hand-left:before { content: @hand-left; }
-.fa-icon-hand-up:before { content: @hand-up; }
-.fa-icon-hand-down:before { content: @hand-down; }
-.fa-icon-arrow-circle-left:before { content: @arrow-circle-left; }
-.fa-icon-arrow-circle-right:before { content: @arrow-circle-right; }
-.fa-icon-arrow-circle-up:before { content: @arrow-circle-up; }
-.fa-icon-arrow-circle-down:before { content: @arrow-circle-down; }
-.fa-icon-globe:before { content: @globe; }
-.fa-icon-wrench:before { content: @wrench; }
-.fa-icon-tasks:before { content: @tasks; }
-.fa-icon-filter:before { content: @filter; }
-.fa-icon-briefcase:before { content: @briefcase; }
-.fa-icon-fullscreen:before { content: @fullscreen; }
-.fa-icon-group:before { content: @group; }
+.fa-icon-square-alt:before { content: @fa-icon-square-alt; }
+.fa-icon-bookmark-alt:before { content: @fa-icon-bookmark-alt; }
+.fa-icon-phone-square:before { content: @fa-icon-phone-square; }
+.fa-icon-twitter:before { content: @fa-icon-twitter; }
+.fa-icon-facebook:before { content: @fa-icon-facebook; }
+.fa-icon-github:before { content: @fa-icon-github; }
+.fa-icon-unlock:before { content: @fa-icon-unlock; }
+.fa-icon-credit-card:before { content: @fa-icon-credit-card; }
+.fa-icon-rss:before { content: @fa-icon-rss; }
+.fa-icon-hdd:before { content: @fa-icon-hdd; }
+.fa-icon-bullhorn:before { content: @fa-icon-bullhorn; }
+.fa-icon-bell:before { content: @fa-icon-bell; }
+.fa-icon-certificate:before { content: @fa-icon-certificate; }
+.fa-icon-hand-right:before { content: @fa-icon-hand-right; }
+.fa-icon-hand-left:before { content: @fa-icon-hand-left; }
+.fa-icon-hand-up:before { content: @fa-icon-hand-up; }
+.fa-icon-hand-down:before { content: @fa-icon-hand-down; }
+.fa-icon-arrow-circle-left:before { content: @fa-icon-arrow-circle-left; }
+.fa-icon-arrow-circle-right:before { content: @fa-icon-arrow-circle-right; }
+.fa-icon-arrow-circle-up:before { content: @fa-icon-arrow-circle-up; }
+.fa-icon-arrow-circle-down:before { content: @fa-icon-arrow-circle-down; }
+.fa-icon-globe:before { content: @fa-icon-globe; }
+.fa-icon-wrench:before { content: @fa-icon-wrench; }
+.fa-icon-tasks:before { content: @fa-icon-tasks; }
+.fa-icon-filter:before { content: @fa-icon-filter; }
+.fa-icon-briefcase:before { content: @fa-icon-briefcase; }
+.fa-icon-fullscreen:before { content: @fa-icon-fullscreen; }
+.fa-icon-group:before { content: @fa-icon-group; }
 .fa-icon-chain:before,
-.fa-icon-link:before { content: @link; }
-.fa-icon-cloud:before { content: @cloud; }
-.fa-icon-flask:before { content: @flask; }
+.fa-icon-link:before { content: @fa-icon-link; }
+.fa-icon-cloud:before { content: @fa-icon-cloud; }
+.fa-icon-flask:before { content: @fa-icon-flask; }
 .fa-icon-cut:before,
-.fa-icon-scissors:before { content: @scissors; }
+.fa-icon-scissors:before { content: @fa-icon-scissors; }
 .fa-icon-copy:before,
-.fa-icon-files:before { content: @files; }
-.fa-icon-paperclip:before { content: @paperclip; }
+.fa-icon-files:before { content: @fa-icon-files; }
+.fa-icon-paperclip:before { content: @fa-icon-paperclip; }
 .fa-icon-save:before,
-.fa-icon-floppy:before { content: @floppy; }
-.fa-icon-square:before { content: @square; }
-.fa-icon-reorder:before { content: @reorder; }
-.fa-icon-list-ul:before { content: @list-ul; }
-.fa-icon-list-ol:before { content: @list-ol; }
-.fa-icon-strikethrough:before { content: @strikethrough; }
-.fa-icon-underline:before { content: @underline; }
-.fa-icon-table:before { content: @table; }
-.fa-icon-magic:before { content: @magic; }
-.fa-icon-truck:before { content: @truck; }
-.fa-icon-pinterest:before { content: @pinterest; }
-.fa-icon-pinterest-square:before { content: @pinterest-square; }
-.fa-icon-google-plus-square:before { content: @google-plus-square; }
-.fa-icon-google-plus:before { content: @google-plus; }
-.fa-icon-money:before { content: @money; }
-.fa-icon-caret-down:before { content: @caret-down; }
-.fa-icon-caret-up:before { content: @caret-up; }
-.fa-icon-caret-left:before { content: @caret-left; }
-.fa-icon-caret-right:before { content: @caret-right; }
-.fa-icon-columns:before { content: @columns; }
-.fa-icon-sort:before { content: @sort; }
-.fa-icon-sort-down:before { content: @sort-down; }
-.fa-icon-sort-up:before { content: @sort-up; }
-.fa-icon-envelope:before { content: @envelope; }
-.fa-icon-linkedin:before { content: @linkedin; }
+.fa-icon-floppy:before { content: @fa-icon-floppy; }
+.fa-icon-square:before { content: @fa-icon-square; }
+.fa-icon-reorder:before { content: @fa-icon-reorder; }
+.fa-icon-list-ul:before { content: @fa-icon-list-ul; }
+.fa-icon-list-ol:before { content: @fa-icon-list-ol; }
+.fa-icon-strikethrough:before { content: @fa-icon-strikethrough; }
+.fa-icon-underline:before { content: @fa-icon-underline; }
+.fa-icon-table:before { content: @fa-icon-table; }
+.fa-icon-magic:before { content: @fa-icon-magic; }
+.fa-icon-truck:before { content: @fa-icon-truck; }
+.fa-icon-pinterest:before { content: @fa-icon-pinterest; }
+.fa-icon-pinterest-square:before { content: @fa-icon-pinterest-square; }
+.fa-icon-google-plus-square:before { content: @fa-icon-google-plus-square; }
+.fa-icon-google-plus:before { content: @fa-icon-google-plus; }
+.fa-icon-money:before { content: @fa-icon-money; }
+.fa-icon-caret-down:before { content: @fa-icon-caret-down; }
+.fa-icon-caret-up:before { content: @fa-icon-caret-up; }
+.fa-icon-caret-left:before { content: @fa-icon-caret-left; }
+.fa-icon-caret-right:before { content: @fa-icon-caret-right; }
+.fa-icon-columns:before { content: @fa-icon-columns; }
+.fa-icon-unsorted:before,
+.fa-icon-sort:before { content: @fa-icon-sort; }
+.fa-icon-sort-down:before,
+.fa-icon-sort-asc:before { content: @fa-icon-sort-asc; }
+.fa-icon-sort-up:before,
+.fa-icon-sort-desc:before { content: @fa-icon-sort-desc; }
+.fa-icon-envelope:before { content: @fa-icon-envelope; }
+.fa-icon-linkedin:before { content: @fa-icon-linkedin; }
 .fa-icon-rotate-left:before,
-.fa-icon-undo:before { content: @undo; }
+.fa-icon-undo:before { content: @fa-icon-undo; }
 .fa-icon-legal:before,
-.fa-icon-gavel:before { content: @gavel; }
+.fa-icon-gavel:before { content: @fa-icon-gavel; }
 .fa-icon-dashboard:before,
-.fa-icon-tachometer:before { content: @tachometer; }
-.fa-icon-comment-alt:before { content: @comment-alt; }
-.fa-icon-comments-alt:before { content: @comments-alt; }
+.fa-icon-tachometer:before { content: @fa-icon-tachometer; }
+.fa-icon-comment-alt:before { content: @fa-icon-comment-alt; }
+.fa-icon-comments-alt:before { content: @fa-icon-comments-alt; }
 .fa-icon-flash:before,
-.fa-icon-bolt:before { content: @bolt; }
-.fa-icon-sitemap:before { content: @sitemap; }
-.fa-icon-umbrella:before { content: @umbrella; }
+.fa-icon-bolt:before { content: @fa-icon-bolt; }
+.fa-icon-sitemap:before { content: @fa-icon-sitemap; }
+.fa-icon-umbrella:before { content: @fa-icon-umbrella; }
 .fa-icon-paste:before,
-.fa-icon-clipboard:before { content: @clipboard; }
-.fa-icon-lightbulb:before { content: @lightbulb; }
-.fa-icon-exchange:before { content: @exchange; }
-.fa-icon-cloud-download:before { content: @cloud-download; }
-.fa-icon-cloud-upload:before { content: @cloud-upload; }
-.fa-icon-user-md:before { content: @user-md; }
-.fa-icon-stethoscope:before { content: @stethoscope; }
-.fa-icon-suitcase:before { content: @suitcase; }
-.fa-icon-bell-alt:before { content: @bell-alt; }
-.fa-icon-coffee:before { content: @coffee; }
-.fa-icon-cutlery:before { content: @cutlery; }
-.fa-icon-file-text-alt:before { content: @file-text-alt; }
-.fa-icon-building:before { content: @building; }
-.fa-icon-hospital:before { content: @hospital; }
-.fa-icon-ambulance:before { content: @ambulance; }
-.fa-icon-medkit:before { content: @medkit; }
-.fa-icon-fighter-jet:before { content: @fighter-jet; }
-.fa-icon-beer:before { content: @beer; }
-.fa-icon-h-square:before { content: @h-square; }
-.fa-icon-plus-square:before { content: @plus-square; }
-.fa-icon-double-angle-left:before { content: @double-angle-left; }
-.fa-icon-double-angle-right:before { content: @double-angle-right; }
-.fa-icon-double-angle-up:before { content: @double-angle-up; }
-.fa-icon-double-angle-down:before { content: @double-angle-down; }
-.fa-icon-angle-left:before { content: @angle-left; }
-.fa-icon-angle-right:before { content: @angle-right; }
-.fa-icon-angle-up:before { content: @angle-up; }
-.fa-icon-angle-down:before { content: @angle-down; }
-.fa-icon-desktop:before { content: @desktop; }
-.fa-icon-laptop:before { content: @laptop; }
-.fa-icon-tablet:before { content: @tablet; }
+.fa-icon-clipboard:before { content: @fa-icon-clipboard; }
+.fa-icon-lightbulb:before { content: @fa-icon-lightbulb; }
+.fa-icon-exchange:before { content: @fa-icon-exchange; }
+.fa-icon-cloud-download:before { content: @fa-icon-cloud-download; }
+.fa-icon-cloud-upload:before { content: @fa-icon-cloud-upload; }
+.fa-icon-user-md:before { content: @fa-icon-user-md; }
+.fa-icon-stethoscope:before { content: @fa-icon-stethoscope; }
+.fa-icon-suitcase:before { content: @fa-icon-suitcase; }
+.fa-icon-bell-alt:before { content: @fa-icon-bell-alt; }
+.fa-icon-coffee:before { content: @fa-icon-coffee; }
+.fa-icon-cutlery:before { content: @fa-icon-cutlery; }
+.fa-icon-file-text-alt:before { content: @fa-icon-file-text-alt; }
+.fa-icon-building:before { content: @fa-icon-building; }
+.fa-icon-hospital:before { content: @fa-icon-hospital; }
+.fa-icon-ambulance:before { content: @fa-icon-ambulance; }
+.fa-icon-medkit:before { content: @fa-icon-medkit; }
+.fa-icon-fighter-jet:before { content: @fa-icon-fighter-jet; }
+.fa-icon-beer:before { content: @fa-icon-beer; }
+.fa-icon-h-square:before { content: @fa-icon-h-square; }
+.fa-icon-plus-square:before { content: @fa-icon-plus-square; }
+.fa-icon-double-angle-left:before { content: @fa-icon-double-angle-left; }
+.fa-icon-double-angle-right:before { content: @fa-icon-double-angle-right; }
+.fa-icon-double-angle-up:before { content: @fa-icon-double-angle-up; }
+.fa-icon-double-angle-down:before { content: @fa-icon-double-angle-down; }
+.fa-icon-angle-left:before { content: @fa-icon-angle-left; }
+.fa-icon-angle-right:before { content: @fa-icon-angle-right; }
+.fa-icon-angle-up:before { content: @fa-icon-angle-up; }
+.fa-icon-angle-down:before { content: @fa-icon-angle-down; }
+.fa-icon-desktop:before { content: @fa-icon-desktop; }
+.fa-icon-laptop:before { content: @fa-icon-laptop; }
+.fa-icon-tablet:before { content: @fa-icon-tablet; }
 .fa-icon-mobile-phone:before,
-.fa-icon-mobile:before { content: @mobile; }
-.fa-icon-circle-alt:before { content: @circle-alt; }
-.fa-icon-quote-left:before { content: @quote-left; }
-.fa-icon-quote-right:before { content: @quote-right; }
-.fa-icon-spinner:before { content: @spinner; }
-.fa-icon-circle:before { content: @circle; }
+.fa-icon-mobile:before { content: @fa-icon-mobile; }
+.fa-icon-circle-alt:before { content: @fa-icon-circle-alt; }
+.fa-icon-quote-left:before { content: @fa-icon-quote-left; }
+.fa-icon-quote-right:before { content: @fa-icon-quote-right; }
+.fa-icon-spinner:before { content: @fa-icon-spinner; }
+.fa-icon-circle:before { content: @fa-icon-circle; }
 .fa-icon-mail-reply:before,
-.fa-icon-reply:before { content: @reply; }
-.fa-icon-github-alt:before { content: @github-alt; }
-.fa-icon-folder-alt:before { content: @folder-alt; }
-.fa-icon-folder-open-alt:before { content: @folder-open-alt; }
-.fa-icon-expand-alt:before { content: @expand-alt; }
-.fa-icon-collapse-alt:before { content: @collapse-alt; }
-.fa-icon-smile:before { content: @smile; }
-.fa-icon-frown:before { content: @frown; }
-.fa-icon-meh:before { content: @meh; }
-.fa-icon-gamepad:before { content: @gamepad; }
-.fa-icon-keyboard:before { content: @keyboard; }
-.fa-icon-flag-alt:before { content: @flag-alt; }
-.fa-icon-flag-checkered:before { content: @flag-checkered; }
-.fa-icon-terminal:before { content: @terminal; }
-.fa-icon-code:before { content: @code; }
-.fa-icon-reply-all:before { content: @reply-all; }
-.fa-icon-mail-reply-all:before { content: @mail-reply-all; }
+.fa-icon-reply:before { content: @fa-icon-reply; }
+.fa-icon-github-alt:before { content: @fa-icon-github-alt; }
+.fa-icon-folder-alt:before { content: @fa-icon-folder-alt; }
+.fa-icon-folder-open-alt:before { content: @fa-icon-folder-open-alt; }
+.fa-icon-expand-alt:before { content: @fa-icon-expand-alt; }
+.fa-icon-collapse-alt:before { content: @fa-icon-collapse-alt; }
+.fa-icon-smile:before { content: @fa-icon-smile; }
+.fa-icon-frown:before { content: @fa-icon-frown; }
+.fa-icon-meh:before { content: @fa-icon-meh; }
+.fa-icon-gamepad:before { content: @fa-icon-gamepad; }
+.fa-icon-keyboard:before { content: @fa-icon-keyboard; }
+.fa-icon-flag-alt:before { content: @fa-icon-flag-alt; }
+.fa-icon-flag-checkered:before { content: @fa-icon-flag-checkered; }
+.fa-icon-terminal:before { content: @fa-icon-terminal; }
+.fa-icon-code:before { content: @fa-icon-code; }
+.fa-icon-reply-all:before { content: @fa-icon-reply-all; }
+.fa-icon-mail-reply-all:before { content: @fa-icon-mail-reply-all; }
+.fa-icon-star-half-empty:before,
 .fa-icon-star-half-full:before,
-.fa-icon-star-half-empty:before { content: @star-half-empty; }
-.fa-icon-location-arrow:before { content: @location-arrow; }
-.fa-icon-crop:before { content: @crop; }
-.fa-icon-code-fork:before { content: @code-fork; }
+.fa-icon-star-half-alt:before { content: @fa-icon-star-half-alt; }
+.fa-icon-location-arrow:before { content: @fa-icon-location-arrow; }
+.fa-icon-crop:before { content: @fa-icon-crop; }
+.fa-icon-code-fork:before { content: @fa-icon-code-fork; }
 .fa-icon-unlink:before,
-.fa-icon-chain-broken:before { content: @chain-broken; }
-.fa-icon-question:before { content: @question; }
-.fa-icon-info:before { content: @info; }
-.fa-icon-exclamation:before { content: @exclamation; }
-.fa-icon-superscript:before { content: @superscript; }
-.fa-icon-subscript:before { content: @subscript; }
-.fa-icon-eraser:before { content: @eraser; }
-.fa-icon-puzzle-piece:before { content: @puzzle-piece; }
-.fa-icon-microphone:before { content: @microphone; }
-.fa-icon-microphone-off:before { content: @microphone-off; }
-.fa-icon-shield:before { content: @shield; }
-.fa-icon-calendar-alt:before { content: @calendar-alt; }
-.fa-icon-fire-extinguisher:before { content: @fire-extinguisher; }
-.fa-icon-rocket:before { content: @rocket; }
-.fa-icon-maxcdn:before { content: @maxcdn; }
-.fa-icon-chevron-circle-left:before { content: @chevron-circle-left; }
-.fa-icon-chevron-circle-right:before { content: @chevron-circle-right; }
-.fa-icon-chevron-circle-up:before { content: @chevron-circle-up; }
-.fa-icon-chevron-circle-down:before { content: @chevron-circle-down; }
-.fa-icon-html5:before { content: @html5; }
-.fa-icon-css3:before { content: @css3; }
-.fa-icon-anchor:before { content: @anchor; }
-.fa-icon-unlock-alt:before { content: @unlock-alt; }
-.fa-icon-bullseye:before { content: @bullseye; }
-.fa-icon-ellipsis-horizontal:before { content: @ellipsis-horizontal; }
-.fa-icon-ellipsis-vertical:before { content: @ellipsis-vertical; }
-.fa-icon-rss-square:before { content: @rss-square; }
-.fa-icon-play-circle:before { content: @play-circle; }
-.fa-icon-ticket:before { content: @ticket; }
-.fa-icon-minus-square:before { content: @minus-square; }
-.fa-icon-minus-square-alt:before { content: @minus-square-alt; }
-.fa-icon-level-up:before { content: @level-up; }
-.fa-icon-level-down:before { content: @level-down; }
-.fa-icon-check-square:before { content: @check-square; }
-.fa-icon-pencil-square:before { content: @pencil-square; }
-.fa-icon-external-link-square:before { content: @external-link-square; }
-.fa-icon-share-square:before { content: @share-square; }
-.fa-icon-compass:before { content: @compass; }
-.fa-icon-collapse-down:before { content: @collapse-down; }
-.fa-icon-collapse-up:before { content: @collapse-up; }
-.fa-icon-expand:before { content: @expand; }
+.fa-icon-chain-broken:before { content: @fa-icon-chain-broken; }
+.fa-icon-question:before { content: @fa-icon-question; }
+.fa-icon-info:before { content: @fa-icon-info; }
+.fa-icon-exclamation:before { content: @fa-icon-exclamation; }
+.fa-icon-superscript:before { content: @fa-icon-superscript; }
+.fa-icon-subscript:before { content: @fa-icon-subscript; }
+.fa-icon-eraser:before { content: @fa-icon-eraser; }
+.fa-icon-puzzle-piece:before { content: @fa-icon-puzzle-piece; }
+.fa-icon-microphone:before { content: @fa-icon-microphone; }
+.fa-icon-microphone-off:before { content: @fa-icon-microphone-off; }
+.fa-icon-shield:before { content: @fa-icon-shield; }
+.fa-icon-calendar-alt:before { content: @fa-icon-calendar-alt; }
+.fa-icon-fire-extinguisher:before { content: @fa-icon-fire-extinguisher; }
+.fa-icon-rocket:before { content: @fa-icon-rocket; }
+.fa-icon-maxcdn:before { content: @fa-icon-maxcdn; }
+.fa-icon-chevron-circle-left:before { content: @fa-icon-chevron-circle-left; }
+.fa-icon-chevron-circle-right:before { content: @fa-icon-chevron-circle-right; }
+.fa-icon-chevron-circle-up:before { content: @fa-icon-chevron-circle-up; }
+.fa-icon-chevron-circle-down:before { content: @fa-icon-chevron-circle-down; }
+.fa-icon-html5:before { content: @fa-icon-html5; }
+.fa-icon-css3:before { content: @fa-icon-css3; }
+.fa-icon-anchor:before { content: @fa-icon-anchor; }
+.fa-icon-unlock-alt:before { content: @fa-icon-unlock-alt; }
+.fa-icon-bullseye:before { content: @fa-icon-bullseye; }
+.fa-icon-ellipsis-horizontal:before { content: @fa-icon-ellipsis-horizontal; }
+.fa-icon-ellipsis-vertical:before { content: @fa-icon-ellipsis-vertical; }
+.fa-icon-rss-square:before { content: @fa-icon-rss-square; }
+.fa-icon-play-circle:before { content: @fa-icon-play-circle; }
+.fa-icon-ticket:before { content: @fa-icon-ticket; }
+.fa-icon-minus-square:before { content: @fa-icon-minus-square; }
+.fa-icon-minus-square-alt:before { content: @fa-icon-minus-square-alt; }
+.fa-icon-level-up:before { content: @fa-icon-level-up; }
+.fa-icon-level-down:before { content: @fa-icon-level-down; }
+.fa-icon-check-square:before { content: @fa-icon-check-square; }
+.fa-icon-pencil-square:before { content: @fa-icon-pencil-square; }
+.fa-icon-external-link-square:before { content: @fa-icon-external-link-square; }
+.fa-icon-share-square:before { content: @fa-icon-share-square; }
+.fa-icon-compass:before { content: @fa-icon-compass; }
+.fa-icon-collapse-down:before { content: @fa-icon-collapse-down; }
+.fa-icon-collapse-up:before { content: @fa-icon-collapse-up; }
+.fa-icon-expand:before { content: @fa-icon-expand; }
 .fa-icon-euro:before,
-.fa-icon-eur:before { content: @eur; }
-.fa-icon-gbp:before { content: @gbp; }
+.fa-icon-eur:before { content: @fa-icon-eur; }
+.fa-icon-gbp:before { content: @fa-icon-gbp; }
 .fa-icon-dollar:before,
-.fa-icon-usd:before { content: @usd; }
+.fa-icon-usd:before { content: @fa-icon-usd; }
 .fa-icon-rupee:before,
-.fa-icon-inr:before { content: @inr; }
+.fa-icon-inr:before { content: @fa-icon-inr; }
 .fa-icon-cny:before,
 .fa-icon-rmb:before,
 .fa-icon-yen:before,
-.fa-icon-jpy:before { content: @jpy; }
+.fa-icon-jpy:before { content: @fa-icon-jpy; }
 .fa-icon-ruble:before,
 .fa-icon-rouble:before,
-.fa-icon-rub:before { content: @rub; }
+.fa-icon-rub:before { content: @fa-icon-rub; }
 .fa-icon-won:before,
-.fa-icon-krw:before { content: @krw; }
+.fa-icon-krw:before { content: @fa-icon-krw; }
 .fa-icon-bitcoin:before,
-.fa-icon-btc:before { content: @btc; }
-.fa-icon-file:before { content: @file; }
-.fa-icon-file-text:before { content: @file-text; }
-.fa-icon-sort-by-alphabet:before { content: @sort-by-alphabet; }
-.fa-icon-sort-by-alphabet-alt:before { content: @sort-by-alphabet-alt; }
-.fa-icon-sort-by-attributes:before { content: @sort-by-attributes; }
-.fa-icon-sort-by-attributes-alt:before { content: @sort-by-attributes-alt; }
-.fa-icon-sort-by-order:before { content: @sort-by-order; }
-.fa-icon-sort-by-order-alt:before { content: @sort-by-order-alt; }
-.fa-icon-thumbs-up:before { content: @thumbs-up; }
-.fa-icon-thumbs-down:before { content: @thumbs-down; }
-.fa-icon-youtube-sign:before { content: @youtube-sign; }
-.fa-icon-youtube:before { content: @youtube; }
-.fa-icon-xing:before { content: @xing; }
-.fa-icon-xing-sign:before { content: @xing-sign; }
-.fa-icon-youtube-play:before { content: @youtube-play; }
-.fa-icon-dropbox:before { content: @dropbox; }
-.fa-icon-stack-overflow:before { content: @stack-overflow; }
-.fa-icon-instagram:before { content: @instagram; }
-.fa-icon-flickr:before { content: @flickr; }
-.fa-icon-adn:before { content: @adn; }
-.fa-icon-bitbucket:before { content: @bitbucket; }
-.fa-icon-bitbucket-square:before { content: @bitbucket-square; }
-.fa-icon-tumblr:before { content: @tumblr; }
-.fa-icon-tumblr-square:before { content: @tumblr-square; }
-.fa-icon-long-arrow-down:before { content: @long-arrow-down; }
-.fa-icon-long-arrow-up:before { content: @long-arrow-up; }
-.fa-icon-long-arrow-left:before { content: @long-arrow-left; }
-.fa-icon-long-arrow-right:before { content: @long-arrow-right; }
-.fa-icon-apple:before { content: @apple; }
-.fa-icon-windows:before { content: @windows; }
-.fa-icon-android:before { content: @android; }
-.fa-icon-linux:before { content: @linux; }
-.fa-icon-dribbble:before { content: @dribbble; }
-.fa-icon-skype:before { content: @skype; }
-.fa-icon-foursquare:before { content: @foursquare; }
-.fa-icon-trello:before { content: @trello; }
-.fa-icon-female:before { content: @female; }
-.fa-icon-male:before { content: @male; }
-.fa-icon-gittip:before { content: @gittip; }
-.fa-icon-sun:before { content: @sun; }
-.fa-icon-moon:before { content: @moon; }
-.fa-icon-archive:before { content: @archive; }
-.fa-icon-bug:before { content: @bug; }
-.fa-icon-vk:before { content: @vk; }
-.fa-icon-weibo:before { content: @weibo; }
-.fa-icon-renren:before { content: @renren; }
-.fa-icon-pagelines:before { content: @pagelines; }
-.fa-icon-stack-exchange:before { content: @stack-exchange; }
+.fa-icon-btc:before { content: @fa-icon-btc; }
+.fa-icon-file:before { content: @fa-icon-file; }
+.fa-icon-file-text:before { content: @fa-icon-file-text; }
+.fa-icon-sort-alpha-asc:before { content: @fa-icon-sort-alpha-asc; }
+.fa-icon-sort-alpha-desc:before { content: @fa-icon-sort-alpha-desc; }
+.fa-icon-sort-amount-asc:before { content: @fa-icon-sort-amount-asc; }
+.fa-icon-sort-amount-desc:before { content: @fa-icon-sort-amount-desc; }
+.fa-icon-sort-numeric-asc:before { content: @fa-icon-sort-numeric-asc; }
+.fa-icon-sort-numeric-desc:before { content: @fa-icon-sort-numeric-desc; }
+.fa-icon-thumbs-up:before { content: @fa-icon-thumbs-up; }
+.fa-icon-thumbs-down:before { content: @fa-icon-thumbs-down; }
+.fa-icon-youtube-sign:before { content: @fa-icon-youtube-sign; }
+.fa-icon-youtube:before { content: @fa-icon-youtube; }
+.fa-icon-xing:before { content: @fa-icon-xing; }
+.fa-icon-xing-sign:before { content: @fa-icon-xing-sign; }
+.fa-icon-youtube-play:before { content: @fa-icon-youtube-play; }
+.fa-icon-dropbox:before { content: @fa-icon-dropbox; }
+.fa-icon-stack-overflow:before { content: @fa-icon-stack-overflow; }
+.fa-icon-instagram:before { content: @fa-icon-instagram; }
+.fa-icon-flickr:before { content: @fa-icon-flickr; }
+.fa-icon-adn:before { content: @fa-icon-adn; }
+.fa-icon-bitbucket:before { content: @fa-icon-bitbucket; }
+.fa-icon-bitbucket-square:before { content: @fa-icon-bitbucket-square; }
+.fa-icon-tumblr:before { content: @fa-icon-tumblr; }
+.fa-icon-tumblr-square:before { content: @fa-icon-tumblr-square; }
+.fa-icon-long-arrow-down:before { content: @fa-icon-long-arrow-down; }
+.fa-icon-long-arrow-up:before { content: @fa-icon-long-arrow-up; }
+.fa-icon-long-arrow-left:before { content: @fa-icon-long-arrow-left; }
+.fa-icon-long-arrow-right:before { content: @fa-icon-long-arrow-right; }
+.fa-icon-apple:before { content: @fa-icon-apple; }
+.fa-icon-windows:before { content: @fa-icon-windows; }
+.fa-icon-android:before { content: @fa-icon-android; }
+.fa-icon-linux:before { content: @fa-icon-linux; }
+.fa-icon-dribbble:before { content: @fa-icon-dribbble; }
+.fa-icon-skype:before { content: @fa-icon-skype; }
+.fa-icon-foursquare:before { content: @fa-icon-foursquare; }
+.fa-icon-trello:before { content: @fa-icon-trello; }
+.fa-icon-female:before { content: @fa-icon-female; }
+.fa-icon-male:before { content: @fa-icon-male; }
+.fa-icon-gittip:before { content: @fa-icon-gittip; }
+.fa-icon-sun:before { content: @fa-icon-sun; }
+.fa-icon-moon:before { content: @fa-icon-moon; }
+.fa-icon-archive:before { content: @fa-icon-archive; }
+.fa-icon-bug:before { content: @fa-icon-bug; }
+.fa-icon-vk:before { content: @fa-icon-vk; }
+.fa-icon-weibo:before { content: @fa-icon-weibo; }
+.fa-icon-renren:before { content: @fa-icon-renren; }
+.fa-icon-pagelines:before { content: @fa-icon-pagelines; }
+.fa-icon-stack-exchange:before { content: @fa-icon-stack-exchange; }
diff --git a/less/mixins.less b/less/mixins.less
index 136eafe6e..7287909ca 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -1,36 +1,7 @@
 // Mixins
 // --------------------------
 
-.icon(@icon) {
-  .icon-FontAwesome();
-  content: @icon;
-}
-
-.icon-FontAwesome() {
-//  position: relative;
-//  top: 0;
-  display: inline-block;
-  font-family: FontAwesome;
-  font-style: normal;
-  font-weight: normal;
-  line-height: 1;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-
-  // from bootstrap, throws off rendering
-//  &:empty { width: 1em; }
-
-//  text-decoration: inherit;
-//  text-rendering: auto;
-}
-
-.border-radius(@radius) {
-  -webkit-border-radius: @radius;
-  -moz-border-radius: @radius;
-  border-radius: @radius;
-}
-
-.rotate(@degrees, @rotation) {
+.fa-icon-rotate(@degrees, @rotation) {
   filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation);
   -webkit-transform: rotate(@degrees);
      -moz-transform: rotate(@degrees);
@@ -39,7 +10,7 @@
           transform: rotate(@degrees);
 }
 
-.flip(@horiz, @vert) {
+.fa-icon-flip(@horiz, @vert) {
   -webkit-transform: scale(@horiz, @vert);
      -moz-transform: scale(@horiz, @vert);
       -ms-transform: scale(@horiz, @vert);
@@ -47,7 +18,7 @@
           transform: scale(@horiz, @vert);
 }
 
-.icon-stack(@width: 2em, @height: 2em, @top-font-size: 1em, @base-font-size: 2em) {
+.fa-icon-stack(@width: 2em, @height: 2em, @top-font-size: 1em, @base-font-size: 2em) {
   .fa-icon-stack {
     position: relative;
     display: inline-block;
diff --git a/less/path.less b/less/path.less
index 7377767f6..5b0b476cf 100644
--- a/less/path.less
+++ b/less/path.less
@@ -3,12 +3,12 @@
 
 @font-face {
   font-family: 'FontAwesome';
-//  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=@{FontAwesomeVersion}');
-//  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'),
-//    url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'),
-//    url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'),
-//    url('@{FontAwesomePath}/fontawesome-webfont.svg?v=@{FontAwesomeVersion}#fontawesomeregular') format('svg');
-  src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts
+//  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'),
+//    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');
+  src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
   font-weight: normal;
   font-style: normal;
 }
diff --git a/less/variables.less b/less/variables.less
index c7cfca8f7..cd7c1a791 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -1,376 +1,376 @@
 // Variables
 // --------------------------
 
-@FontAwesomePath:    "../fonts";
-//@FontAwesomePath:    "//netdna.bootstrapcdn.com/font-awesome/4.0.0/font"; // for referencing Bootstrap CDN font files directly
-@FontAwesomeVersion: "4.0.0";
-@borderColor:        #eee;
-@iconMuted:          #eee;
-@iconLight:          #fff;
-@iconDark:           #333;
-@icons-li-width:     (30em / 14);
+@fa-font-path:       "../fonts";
+//@fa-font-path:       "//netdna.bootstrapcdn.com/font-awesome/4.0.0/font"; // for referencing Bootstrap CDN font files directly
+@fa-version:         "4.0.0";
+@fa-border-color:    #eee;
+@fa-icon-muted:      #eee;
+@fa-icon-light:      #fff;
+@fa-icon-dark:       #333;
+@fa-icon-li-width:   (30em / 14);
 
-@glass: "\f000";
-@music: "\f001";
-@search: "\f002";
-@envelope-alt: "\f003";
-@heart: "\f004";
-@star: "\f005";
-@star-alt: "\f006";
-@user: "\f007";
-@film: "\f008";
-@th-large: "\f009";
-@th: "\f00a";
-@th-list: "\f00b";
-@check: "\f00c";
-@times: "\f00d";
-@zoom-in: "\f00e";
-@zoom-out: "\f010";
-@power-off: "\f011";
-@signal: "\f012";
-@cog: "\f013";
-@trash: "\f014";
-@home: "\f015";
-@file-alt: "\f016";
-@time: "\f017";
-@road: "\f018";
-@download: "\f019";
-@arrow-circle-alt-down: "\f01a";
-@arrow-circle-alt-up: "\f01b";
-@inbox: "\f01c";
-@play-circle-alt: "\f01d";
-@repeat: "\f01e";
-@refresh: "\f021";
-@list-alt: "\f022";
-@lock: "\f023";
-@flag: "\f024";
-@headphones: "\f025";
-@volume-off: "\f026";
-@volume-down: "\f027";
-@volume-up: "\f028";
-@qrcode: "\f029";
-@barcode: "\f02a";
-@tag: "\f02b";
-@tags: "\f02c";
-@book: "\f02d";
-@bookmark: "\f02e";
-@print: "\f02f";
-@camera: "\f030";
-@font: "\f031";
-@bold: "\f032";
-@italic: "\f033";
-@text-height: "\f034";
-@text-width: "\f035";
-@align-left: "\f036";
-@align-center: "\f037";
-@align-right: "\f038";
-@align-justify: "\f039";
-@list: "\f03a";
-@outdent: "\f03b";
-@indent: "\f03c";
-@video-camera: "\f03d";
-@picture: "\f03e";
-@pencil: "\f040";
-@map-marker: "\f041";
-@adjust: "\f042";
-@tint: "\f043";
-@pencil-square-alt: "\f044";
-@share-square-alt: "\f045";
-@check-square-alt: "\f046";
-@move: "\f047";
-@step-backward: "\f048";
-@fast-backward: "\f049";
-@backward: "\f04a";
-@play: "\f04b";
-@pause: "\f04c";
-@stop: "\f04d";
-@forward: "\f04e";
-@fast-forward: "\f050";
-@step-forward: "\f051";
-@eject: "\f052";
-@chevron-left: "\f053";
-@chevron-right: "\f054";
-@plus-circle: "\f055";
-@minus-circle: "\f056";
-@times-circle: "\f057";
-@check-circle: "\f058";
-@question-circle: "\f059";
-@info-circle: "\f05a";
-@screenshot: "\f05b";
-@times-circle-alt: "\f05c";
-@check-circle-alt: "\f05d";
-@ban: "\f05e";
-@arrow-left: "\f060";
-@arrow-right: "\f061";
-@arrow-up: "\f062";
-@arrow-down: "\f063";
-@share: "\f064";
-@resize-full: "\f065";
-@resize-small: "\f066";
-@plus: "\f067";
-@minus: "\f068";
-@asterisk: "\f069";
-@exclamation-circle: "\f06a";
-@gift: "\f06b";
-@leaf: "\f06c";
-@fire: "\f06d";
-@eye: "\f06e";
-@eye-closed: "\f070";
-@exclamation-triangle: "\f071";
-@plane: "\f072";
-@calendar: "\f073";
-@random: "\f074";
-@comment: "\f075";
-@magnet: "\f076";
-@chevron-up: "\f077";
-@chevron-down: "\f078";
-@retweet: "\f079";
-@shopping-cart: "\f07a";
-@folder: "\f07b";
-@folder-open: "\f07c";
-@resize-vertical: "\f07d";
-@resize-horizontal: "\f07e";
-@bar-chart: "\f080";
-@twitter-square: "\f081";
-@facebook-square: "\f082";
-@camera-retro: "\f083";
-@key: "\f084";
-@cogs: "\f085";
-@comments: "\f086";
-@thumbs-up-alt: "\f087";
-@thumbs-down-alt: "\f088";
-@star-half: "\f089";
-@heart-alt: "\f08a";
-@sign-out: "\f08b";
-@linkedin-square: "\f08c";
-@thumb-tack: "\f08d";
-@external-link: "\f08e";
-@sign-in: "\f090";
-@trophy: "\f091";
-@github-square: "\f092";
-@upload: "\f093";
-@lemon-alt: "\f094";
-@phone: "\f095";
-@square-alt: "\f096";
-@bookmark-alt: "\f097";
-@phone-square: "\f098";
-@twitter: "\f099";
-@facebook: "\f09a";
-@github: "\f09b";
-@unlock: "\f09c";
-@credit-card: "\f09d";
-@rss: "\f09e";
-@hdd: "\f0a0";
-@bullhorn: "\f0a1";
-@bell: "\f0f3";
-@certificate: "\f0a3";
-@hand-right: "\f0a4";
-@hand-left: "\f0a5";
-@hand-up: "\f0a6";
-@hand-down: "\f0a7";
-@arrow-circle-left: "\f0a8";
-@arrow-circle-right: "\f0a9";
-@arrow-circle-up: "\f0aa";
-@arrow-circle-down: "\f0ab";
-@globe: "\f0ac";
-@wrench: "\f0ad";
-@tasks: "\f0ae";
-@filter: "\f0b0";
-@briefcase: "\f0b1";
-@fullscreen: "\f0b2";
-@group: "\f0c0";
-@link: "\f0c1";
-@cloud: "\f0c2";
-@flask: "\f0c3";
-@scissors: "\f0c4";
-@files: "\f0c5";
-@paperclip: "\f0c6";
-@floppy: "\f0c7";
-@square: "\f0c8";
-@reorder: "\f0c9";
-@list-ul: "\f0ca";
-@list-ol: "\f0cb";
-@strikethrough: "\f0cc";
-@underline: "\f0cd";
-@table: "\f0ce";
-@magic: "\f0d0";
-@truck: "\f0d1";
-@pinterest: "\f0d2";
-@pinterest-square: "\f0d3";
-@google-plus-square: "\f0d4";
-@google-plus: "\f0d5";
-@money: "\f0d6";
-@caret-down: "\f0d7";
-@caret-up: "\f0d8";
-@caret-left: "\f0d9";
-@caret-right: "\f0da";
-@columns: "\f0db";
-@sort: "\f0dc";
-@sort-down: "\f0dd";
-@sort-up: "\f0de";
-@envelope: "\f0e0";
-@linkedin: "\f0e1";
-@undo: "\f0e2";
-@gavel: "\f0e3";
-@tachometer: "\f0e4";
-@comment-alt: "\f0e5";
-@comments-alt: "\f0e6";
-@bolt: "\f0e7";
-@sitemap: "\f0e8";
-@umbrella: "\f0e9";
-@clipboard: "\f0ea";
-@lightbulb: "\f0eb";
-@exchange: "\f0ec";
-@cloud-download: "\f0ed";
-@cloud-upload: "\f0ee";
-@user-md: "\f0f0";
-@stethoscope: "\f0f1";
-@suitcase: "\f0f2";
-@bell-alt: "\f0a2";
-@coffee: "\f0f4";
-@cutlery: "\f0f5";
-@file-text-alt: "\f0f6";
-@building: "\f0f7";
-@hospital: "\f0f8";
-@ambulance: "\f0f9";
-@medkit: "\f0fa";
-@fighter-jet: "\f0fb";
-@beer: "\f0fc";
-@h-square: "\f0fd";
-@plus-square: "\f0fe";
-@double-angle-left: "\f100";
-@double-angle-right: "\f101";
-@double-angle-up: "\f102";
-@double-angle-down: "\f103";
-@angle-left: "\f104";
-@angle-right: "\f105";
-@angle-up: "\f106";
-@angle-down: "\f107";
-@desktop: "\f108";
-@laptop: "\f109";
-@tablet: "\f10a";
-@mobile: "\f10b";
-@circle-alt: "\f10c";
-@quote-left: "\f10d";
-@quote-right: "\f10e";
-@spinner: "\f110";
-@circle: "\f111";
-@reply: "\f112";
-@github-alt: "\f113";
-@folder-alt: "\f114";
-@folder-open-alt: "\f115";
-@expand-alt: "\f116";
-@collapse-alt: "\f117";
-@smile: "\f118";
-@frown: "\f119";
-@meh: "\f11a";
-@gamepad: "\f11b";
-@keyboard: "\f11c";
-@flag-alt: "\f11d";
-@flag-checkered: "\f11e";
-@terminal: "\f120";
-@code: "\f121";
-@reply-all: "\f122";
-@mail-reply-all: "\f122";
-@star-half-empty: "\f123";
-@location-arrow: "\f124";
-@crop: "\f125";
-@code-fork: "\f126";
-@chain-broken: "\f127";
-@question: "\f128";
-@info: "\f129";
-@exclamation: "\f12a";
-@superscript: "\f12b";
-@subscript: "\f12c";
-@eraser: "\f12d";
-@puzzle-piece: "\f12e";
-@microphone: "\f130";
-@microphone-off: "\f131";
-@shield: "\f132";
-@calendar-alt: "\f133";
-@fire-extinguisher: "\f134";
-@rocket: "\f135";
-@maxcdn: "\f136";
-@chevron-circle-left: "\f137";
-@chevron-circle-right: "\f138";
-@chevron-circle-up: "\f139";
-@chevron-circle-down: "\f13a";
-@html5: "\f13b";
-@css3: "\f13c";
-@anchor: "\f13d";
-@unlock-alt: "\f13e";
-@bullseye: "\f140";
-@ellipsis-horizontal: "\f141";
-@ellipsis-vertical: "\f142";
-@rss-square: "\f143";
-@play-circle: "\f144";
-@ticket: "\f145";
-@minus-square: "\f146";
-@minus-square-alt: "\f147";
-@level-up: "\f148";
-@level-down: "\f149";
-@check-square: "\f14a";
-@pencil-square: "\f14b";
-@external-link-square: "\f14c";
-@share-square: "\f14d";
-@compass: "\f14e";
-@collapse-down: "\f150";
-@collapse-up: "\f151";
-@expand: "\f152";
-@eur: "\f153";
-@gbp: "\f154";
-@usd: "\f155";
-@inr: "\f156";
-@jpy: "\f157";
-@rub: "\f158";
-@krw: "\f159";
-@btc: "\f15a";
-@file: "\f15b";
-@file-text: "\f15c";
-@sort-by-alphabet: "\f15d";
-@sort-by-alphabet-alt: "\f15e";
-@sort-by-attributes: "\f160";
-@sort-by-attributes-alt: "\f161";
-@sort-by-order: "\f162";
-@sort-by-order-alt: "\f163";
-@thumbs-up: "\f164";
-@thumbs-down: "\f165";
-@youtube-sign: "\f166";
-@youtube: "\f167";
-@xing: "\f168";
-@xing-sign: "\f169";
-@youtube-play: "\f16a";
-@dropbox: "\f16b";
-@stack-overflow: "\f16c";
-@instagram: "\f16d";
-@flickr: "\f16e";
-@adn: "\f170";
-@bitbucket: "\f171";
-@bitbucket-square: "\f172";
-@tumblr: "\f173";
-@tumblr-square: "\f174";
-@long-arrow-down: "\f175";
-@long-arrow-up: "\f176";
-@long-arrow-left: "\f177";
-@long-arrow-right: "\f178";
-@apple: "\f179";
-@windows: "\f17a";
-@android: "\f17b";
-@linux: "\f17c";
-@dribbble: "\f17d";
-@skype: "\f17e";
-@foursquare: "\f180";
-@trello: "\f181";
-@female: "\f182";
-@male: "\f183";
-@gittip: "\f184";
-@sun: "\f185";
-@moon: "\f186";
-@archive: "\f187";
-@bug: "\f188";
-@vk: "\f189";
-@weibo: "\f18a";
-@renren: "\f18b";
-@pagelines: "\f18c";
-@stack-exchange: "\f18d";
+@fa-icon-glass: "\f000";
+@fa-icon-music: "\f001";
+@fa-icon-search: "\f002";
+@fa-icon-envelope-alt: "\f003";
+@fa-icon-heart: "\f004";
+@fa-icon-star: "\f005";
+@fa-icon-star-alt: "\f006";
+@fa-icon-user: "\f007";
+@fa-icon-film: "\f008";
+@fa-icon-th-large: "\f009";
+@fa-icon-th: "\f00a";
+@fa-icon-th-list: "\f00b";
+@fa-icon-check: "\f00c";
+@fa-icon-times: "\f00d";
+@fa-icon-zoom-in: "\f00e";
+@fa-icon-zoom-out: "\f010";
+@fa-icon-power-off: "\f011";
+@fa-icon-signal: "\f012";
+@fa-icon-cog: "\f013";
+@fa-icon-trash: "\f014";
+@fa-icon-home: "\f015";
+@fa-icon-file-alt: "\f016";
+@fa-icon-time: "\f017";
+@fa-icon-road: "\f018";
+@fa-icon-download: "\f019";
+@fa-icon-arrow-circle-alt-down: "\f01a";
+@fa-icon-arrow-circle-alt-up: "\f01b";
+@fa-icon-inbox: "\f01c";
+@fa-icon-play-circle-alt: "\f01d";
+@fa-icon-repeat: "\f01e";
+@fa-icon-refresh: "\f021";
+@fa-icon-list-alt: "\f022";
+@fa-icon-lock: "\f023";
+@fa-icon-flag: "\f024";
+@fa-icon-headphones: "\f025";
+@fa-icon-volume-off: "\f026";
+@fa-icon-volume-down: "\f027";
+@fa-icon-volume-up: "\f028";
+@fa-icon-qrcode: "\f029";
+@fa-icon-barcode: "\f02a";
+@fa-icon-tag: "\f02b";
+@fa-icon-tags: "\f02c";
+@fa-icon-book: "\f02d";
+@fa-icon-bookmark: "\f02e";
+@fa-icon-print: "\f02f";
+@fa-icon-camera: "\f030";
+@fa-icon-font: "\f031";
+@fa-icon-bold: "\f032";
+@fa-icon-italic: "\f033";
+@fa-icon-text-height: "\f034";
+@fa-icon-text-width: "\f035";
+@fa-icon-align-left: "\f036";
+@fa-icon-align-center: "\f037";
+@fa-icon-align-right: "\f038";
+@fa-icon-align-justify: "\f039";
+@fa-icon-list: "\f03a";
+@fa-icon-outdent: "\f03b";
+@fa-icon-indent: "\f03c";
+@fa-icon-video-camera: "\f03d";
+@fa-icon-picture: "\f03e";
+@fa-icon-pencil: "\f040";
+@fa-icon-map-marker: "\f041";
+@fa-icon-adjust: "\f042";
+@fa-icon-tint: "\f043";
+@fa-icon-pencil-square-alt: "\f044";
+@fa-icon-share-square-alt: "\f045";
+@fa-icon-check-square-alt: "\f046";
+@fa-icon-move: "\f047";
+@fa-icon-step-backward: "\f048";
+@fa-icon-fast-backward: "\f049";
+@fa-icon-backward: "\f04a";
+@fa-icon-play: "\f04b";
+@fa-icon-pause: "\f04c";
+@fa-icon-stop: "\f04d";
+@fa-icon-forward: "\f04e";
+@fa-icon-fast-forward: "\f050";
+@fa-icon-step-forward: "\f051";
+@fa-icon-eject: "\f052";
+@fa-icon-chevron-left: "\f053";
+@fa-icon-chevron-right: "\f054";
+@fa-icon-plus-circle: "\f055";
+@fa-icon-minus-circle: "\f056";
+@fa-icon-times-circle: "\f057";
+@fa-icon-check-circle: "\f058";
+@fa-icon-question-circle: "\f059";
+@fa-icon-info-circle: "\f05a";
+@fa-icon-screenshot: "\f05b";
+@fa-icon-times-circle-alt: "\f05c";
+@fa-icon-check-circle-alt: "\f05d";
+@fa-icon-ban: "\f05e";
+@fa-icon-arrow-left: "\f060";
+@fa-icon-arrow-right: "\f061";
+@fa-icon-arrow-up: "\f062";
+@fa-icon-arrow-down: "\f063";
+@fa-icon-share: "\f064";
+@fa-icon-resize-full: "\f065";
+@fa-icon-resize-small: "\f066";
+@fa-icon-plus: "\f067";
+@fa-icon-minus: "\f068";
+@fa-icon-asterisk: "\f069";
+@fa-icon-exclamation-circle: "\f06a";
+@fa-icon-gift: "\f06b";
+@fa-icon-leaf: "\f06c";
+@fa-icon-fire: "\f06d";
+@fa-icon-eye: "\f06e";
+@fa-icon-eye-closed: "\f070";
+@fa-icon-exclamation-triangle: "\f071";
+@fa-icon-plane: "\f072";
+@fa-icon-calendar: "\f073";
+@fa-icon-random: "\f074";
+@fa-icon-comment: "\f075";
+@fa-icon-magnet: "\f076";
+@fa-icon-chevron-up: "\f077";
+@fa-icon-chevron-down: "\f078";
+@fa-icon-retweet: "\f079";
+@fa-icon-shopping-cart: "\f07a";
+@fa-icon-folder: "\f07b";
+@fa-icon-folder-open: "\f07c";
+@fa-icon-resize-vertical: "\f07d";
+@fa-icon-resize-horizontal: "\f07e";
+@fa-icon-bar-chart: "\f080";
+@fa-icon-twitter-square: "\f081";
+@fa-icon-facebook-square: "\f082";
+@fa-icon-camera-retro: "\f083";
+@fa-icon-key: "\f084";
+@fa-icon-cogs: "\f085";
+@fa-icon-comments: "\f086";
+@fa-icon-thumbs-up-alt: "\f087";
+@fa-icon-thumbs-down-alt: "\f088";
+@fa-icon-star-half: "\f089";
+@fa-icon-heart-alt: "\f08a";
+@fa-icon-sign-out: "\f08b";
+@fa-icon-linkedin-square: "\f08c";
+@fa-icon-thumb-tack: "\f08d";
+@fa-icon-external-link: "\f08e";
+@fa-icon-sign-in: "\f090";
+@fa-icon-trophy: "\f091";
+@fa-icon-github-square: "\f092";
+@fa-icon-upload: "\f093";
+@fa-icon-lemon-alt: "\f094";
+@fa-icon-phone: "\f095";
+@fa-icon-square-alt: "\f096";
+@fa-icon-bookmark-alt: "\f097";
+@fa-icon-phone-square: "\f098";
+@fa-icon-twitter: "\f099";
+@fa-icon-facebook: "\f09a";
+@fa-icon-github: "\f09b";
+@fa-icon-unlock: "\f09c";
+@fa-icon-credit-card: "\f09d";
+@fa-icon-rss: "\f09e";
+@fa-icon-hdd: "\f0a0";
+@fa-icon-bullhorn: "\f0a1";
+@fa-icon-bell: "\f0f3";
+@fa-icon-certificate: "\f0a3";
+@fa-icon-hand-right: "\f0a4";
+@fa-icon-hand-left: "\f0a5";
+@fa-icon-hand-up: "\f0a6";
+@fa-icon-hand-down: "\f0a7";
+@fa-icon-arrow-circle-left: "\f0a8";
+@fa-icon-arrow-circle-right: "\f0a9";
+@fa-icon-arrow-circle-up: "\f0aa";
+@fa-icon-arrow-circle-down: "\f0ab";
+@fa-icon-globe: "\f0ac";
+@fa-icon-wrench: "\f0ad";
+@fa-icon-tasks: "\f0ae";
+@fa-icon-filter: "\f0b0";
+@fa-icon-briefcase: "\f0b1";
+@fa-icon-fullscreen: "\f0b2";
+@fa-icon-group: "\f0c0";
+@fa-icon-link: "\f0c1";
+@fa-icon-cloud: "\f0c2";
+@fa-icon-flask: "\f0c3";
+@fa-icon-scissors: "\f0c4";
+@fa-icon-files: "\f0c5";
+@fa-icon-paperclip: "\f0c6";
+@fa-icon-floppy: "\f0c7";
+@fa-icon-square: "\f0c8";
+@fa-icon-reorder: "\f0c9";
+@fa-icon-list-ul: "\f0ca";
+@fa-icon-list-ol: "\f0cb";
+@fa-icon-strikethrough: "\f0cc";
+@fa-icon-underline: "\f0cd";
+@fa-icon-table: "\f0ce";
+@fa-icon-magic: "\f0d0";
+@fa-icon-truck: "\f0d1";
+@fa-icon-pinterest: "\f0d2";
+@fa-icon-pinterest-square: "\f0d3";
+@fa-icon-google-plus-square: "\f0d4";
+@fa-icon-google-plus: "\f0d5";
+@fa-icon-money: "\f0d6";
+@fa-icon-caret-down: "\f0d7";
+@fa-icon-caret-up: "\f0d8";
+@fa-icon-caret-left: "\f0d9";
+@fa-icon-caret-right: "\f0da";
+@fa-icon-columns: "\f0db";
+@fa-icon-sort: "\f0dc";
+@fa-icon-sort-asc: "\f0dd";
+@fa-icon-sort-desc: "\f0de";
+@fa-icon-envelope: "\f0e0";
+@fa-icon-linkedin: "\f0e1";
+@fa-icon-undo: "\f0e2";
+@fa-icon-gavel: "\f0e3";
+@fa-icon-tachometer: "\f0e4";
+@fa-icon-comment-alt: "\f0e5";
+@fa-icon-comments-alt: "\f0e6";
+@fa-icon-bolt: "\f0e7";
+@fa-icon-sitemap: "\f0e8";
+@fa-icon-umbrella: "\f0e9";
+@fa-icon-clipboard: "\f0ea";
+@fa-icon-lightbulb: "\f0eb";
+@fa-icon-exchange: "\f0ec";
+@fa-icon-cloud-download: "\f0ed";
+@fa-icon-cloud-upload: "\f0ee";
+@fa-icon-user-md: "\f0f0";
+@fa-icon-stethoscope: "\f0f1";
+@fa-icon-suitcase: "\f0f2";
+@fa-icon-bell-alt: "\f0a2";
+@fa-icon-coffee: "\f0f4";
+@fa-icon-cutlery: "\f0f5";
+@fa-icon-file-text-alt: "\f0f6";
+@fa-icon-building: "\f0f7";
+@fa-icon-hospital: "\f0f8";
+@fa-icon-ambulance: "\f0f9";
+@fa-icon-medkit: "\f0fa";
+@fa-icon-fighter-jet: "\f0fb";
+@fa-icon-beer: "\f0fc";
+@fa-icon-h-square: "\f0fd";
+@fa-icon-plus-square: "\f0fe";
+@fa-icon-double-angle-left: "\f100";
+@fa-icon-double-angle-right: "\f101";
+@fa-icon-double-angle-up: "\f102";
+@fa-icon-double-angle-down: "\f103";
+@fa-icon-angle-left: "\f104";
+@fa-icon-angle-right: "\f105";
+@fa-icon-angle-up: "\f106";
+@fa-icon-angle-down: "\f107";
+@fa-icon-desktop: "\f108";
+@fa-icon-laptop: "\f109";
+@fa-icon-tablet: "\f10a";
+@fa-icon-mobile: "\f10b";
+@fa-icon-circle-alt: "\f10c";
+@fa-icon-quote-left: "\f10d";
+@fa-icon-quote-right: "\f10e";
+@fa-icon-spinner: "\f110";
+@fa-icon-circle: "\f111";
+@fa-icon-reply: "\f112";
+@fa-icon-github-alt: "\f113";
+@fa-icon-folder-alt: "\f114";
+@fa-icon-folder-open-alt: "\f115";
+@fa-icon-expand-alt: "\f116";
+@fa-icon-collapse-alt: "\f117";
+@fa-icon-smile: "\f118";
+@fa-icon-frown: "\f119";
+@fa-icon-meh: "\f11a";
+@fa-icon-gamepad: "\f11b";
+@fa-icon-keyboard: "\f11c";
+@fa-icon-flag-alt: "\f11d";
+@fa-icon-flag-checkered: "\f11e";
+@fa-icon-terminal: "\f120";
+@fa-icon-code: "\f121";
+@fa-icon-reply-all: "\f122";
+@fa-icon-mail-reply-all: "\f122";
+@fa-icon-star-half-alt: "\f123";
+@fa-icon-location-arrow: "\f124";
+@fa-icon-crop: "\f125";
+@fa-icon-code-fork: "\f126";
+@fa-icon-chain-broken: "\f127";
+@fa-icon-question: "\f128";
+@fa-icon-info: "\f129";
+@fa-icon-exclamation: "\f12a";
+@fa-icon-superscript: "\f12b";
+@fa-icon-subscript: "\f12c";
+@fa-icon-eraser: "\f12d";
+@fa-icon-puzzle-piece: "\f12e";
+@fa-icon-microphone: "\f130";
+@fa-icon-microphone-off: "\f131";
+@fa-icon-shield: "\f132";
+@fa-icon-calendar-alt: "\f133";
+@fa-icon-fire-extinguisher: "\f134";
+@fa-icon-rocket: "\f135";
+@fa-icon-maxcdn: "\f136";
+@fa-icon-chevron-circle-left: "\f137";
+@fa-icon-chevron-circle-right: "\f138";
+@fa-icon-chevron-circle-up: "\f139";
+@fa-icon-chevron-circle-down: "\f13a";
+@fa-icon-html5: "\f13b";
+@fa-icon-css3: "\f13c";
+@fa-icon-anchor: "\f13d";
+@fa-icon-unlock-alt: "\f13e";
+@fa-icon-bullseye: "\f140";
+@fa-icon-ellipsis-horizontal: "\f141";
+@fa-icon-ellipsis-vertical: "\f142";
+@fa-icon-rss-square: "\f143";
+@fa-icon-play-circle: "\f144";
+@fa-icon-ticket: "\f145";
+@fa-icon-minus-square: "\f146";
+@fa-icon-minus-square-alt: "\f147";
+@fa-icon-level-up: "\f148";
+@fa-icon-level-down: "\f149";
+@fa-icon-check-square: "\f14a";
+@fa-icon-pencil-square: "\f14b";
+@fa-icon-external-link-square: "\f14c";
+@fa-icon-share-square: "\f14d";
+@fa-icon-compass: "\f14e";
+@fa-icon-collapse-down: "\f150";
+@fa-icon-collapse-up: "\f151";
+@fa-icon-expand: "\f152";
+@fa-icon-eur: "\f153";
+@fa-icon-gbp: "\f154";
+@fa-icon-usd: "\f155";
+@fa-icon-inr: "\f156";
+@fa-icon-jpy: "\f157";
+@fa-icon-rub: "\f158";
+@fa-icon-krw: "\f159";
+@fa-icon-btc: "\f15a";
+@fa-icon-file: "\f15b";
+@fa-icon-file-text: "\f15c";
+@fa-icon-sort-alpha-asc: "\f15d";
+@fa-icon-sort-alpha-desc: "\f15e";
+@fa-icon-sort-amount-asc: "\f160";
+@fa-icon-sort-amount-desc: "\f161";
+@fa-icon-sort-numeric-asc: "\f162";
+@fa-icon-sort-numeric-desc: "\f163";
+@fa-icon-thumbs-up: "\f164";
+@fa-icon-thumbs-down: "\f165";
+@fa-icon-youtube-sign: "\f166";
+@fa-icon-youtube: "\f167";
+@fa-icon-xing: "\f168";
+@fa-icon-xing-sign: "\f169";
+@fa-icon-youtube-play: "\f16a";
+@fa-icon-dropbox: "\f16b";
+@fa-icon-stack-overflow: "\f16c";
+@fa-icon-instagram: "\f16d";
+@fa-icon-flickr: "\f16e";
+@fa-icon-adn: "\f170";
+@fa-icon-bitbucket: "\f171";
+@fa-icon-bitbucket-square: "\f172";
+@fa-icon-tumblr: "\f173";
+@fa-icon-tumblr-square: "\f174";
+@fa-icon-long-arrow-down: "\f175";
+@fa-icon-long-arrow-up: "\f176";
+@fa-icon-long-arrow-left: "\f177";
+@fa-icon-long-arrow-right: "\f178";
+@fa-icon-apple: "\f179";
+@fa-icon-windows: "\f17a";
+@fa-icon-android: "\f17b";
+@fa-icon-linux: "\f17c";
+@fa-icon-dribbble: "\f17d";
+@fa-icon-skype: "\f17e";
+@fa-icon-foursquare: "\f180";
+@fa-icon-trello: "\f181";
+@fa-icon-female: "\f182";
+@fa-icon-male: "\f183";
+@fa-icon-gittip: "\f184";
+@fa-icon-sun: "\f185";
+@fa-icon-moon: "\f186";
+@fa-icon-archive: "\f187";
+@fa-icon-bug: "\f188";
+@fa-icon-vk: "\f189";
+@fa-icon-weibo: "\f18a";
+@fa-icon-renren: "\f18b";
+@fa-icon-pagelines: "\f18c";
+@fa-icon-stack-exchange: "\f18d";
 
diff --git a/scss/_icons.scss b/scss/_icons.scss
index b7ebd4df0..2a88fd573 100644
--- a/scss/_icons.scss
+++ b/scss/_icons.scss
@@ -208,9 +208,12 @@
 .icon-caret-left:before { content: $caret-left; }
 .icon-caret-right:before { content: $caret-right; }
 .icon-columns:before { content: $columns; }
+.icon-unsorted:before,
 .icon-sort:before { content: $sort; }
-.icon-sort-down:before { content: $sort-down; }
-.icon-sort-up:before { content: $sort-up; }
+.icon-sort-down:before,
+.icon-sort-asc:before { content: $sort-asc; }
+.icon-sort-up:before,
+.icon-sort-desc:before { content: $sort-desc; }
 .icon-envelope:before { content: $envelope; }
 .icon-linkedin:before { content: $linkedin; }
 .icon-rotate-left:before,
@@ -282,8 +285,9 @@
 .icon-code:before { content: $code; }
 .icon-reply-all:before { content: $reply-all; }
 .icon-mail-reply-all:before { content: $mail-reply-all; }
+.icon-star-half-empty:before,
 .icon-star-half-full:before,
-.icon-star-half-empty:before { content: $star-half-empty; }
+.icon-star-half-alt:before { content: $star-half-alt; }
 .icon-location-arrow:before { content: $location-arrow; }
 .icon-crop:before { content: $crop; }
 .icon-code-fork:before { content: $code-fork; }
@@ -349,12 +353,12 @@
 .icon-btc:before { content: $btc; }
 .icon-file:before { content: $file; }
 .icon-file-text:before { content: $file-text; }
-.icon-sort-by-alphabet:before { content: $sort-by-alphabet; }
-.icon-sort-by-alphabet-alt:before { content: $sort-by-alphabet-alt; }
-.icon-sort-by-attributes:before { content: $sort-by-attributes; }
-.icon-sort-by-attributes-alt:before { content: $sort-by-attributes-alt; }
-.icon-sort-by-order:before { content: $sort-by-order; }
-.icon-sort-by-order-alt:before { content: $sort-by-order-alt; }
+.icon-sort-alpha-asc:before { content: $sort-alpha-asc; }
+.icon-sort-alpha-desc:before { content: $sort-alpha-desc; }
+.icon-sort-amount-asc:before { content: $sort-amount-asc; }
+.icon-sort-amount-desc:before { content: $sort-amount-desc; }
+.icon-sort-numeric-asc:before { content: $sort-numeric-asc; }
+.icon-sort-numeric-desc:before { content: $sort-numeric-desc; }
 .icon-thumbs-up:before { content: $thumbs-up; }
 .icon-thumbs-down:before { content: $thumbs-down; }
 .icon-youtube-sign:before { content: $youtube-sign; }
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 85e795edf..4706f3f3f 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -402,9 +402,9 @@ $columns: "\f0db";
 
 $sort: "\f0dc";
 
-$sort-down: "\f0dd";
+$sort-asc: "\f0dd";
 
-$sort-up: "\f0de";
+$sort-desc: "\f0de";
 
 $envelope: "\f0e0";
 
@@ -534,7 +534,7 @@ $reply-all: "\f122";
 
 $mail-reply-all: "\f122";
 
-$star-half-empty: "\f123";
+$star-half-alt: "\f123";
 
 $location-arrow: "\f124";
 
@@ -644,17 +644,17 @@ $file: "\f15b";
 
 $file-text: "\f15c";
 
-$sort-by-alphabet: "\f15d";
+$sort-alpha-asc: "\f15d";
 
-$sort-by-alphabet-alt: "\f15e";
+$sort-alpha-desc: "\f15e";
 
-$sort-by-attributes: "\f160";
+$sort-amount-asc: "\f160";
 
-$sort-by-attributes-alt: "\f161";
+$sort-amount-desc: "\f161";
 
-$sort-by-order: "\f162";
+$sort-numeric-asc: "\f162";
 
-$sort-by-order-alt: "\f163";
+$sort-numeric-desc: "\f163";
 
 $thumbs-up: "\f164";
 
diff --git a/src/_includes/icons/brand.html b/src/_includes/icons/brand.html
index 66b1a2e75..d64c5d53e 100644
--- a/src/_includes/icons/brand.html
+++ b/src/_includes/icons/brand.html
@@ -9,7 +9,7 @@
     {% assign icons_brand = icons | expand_aliases | category:"Brand Icons" | sort_by:'class' %}
 
     {% for icon in icons_brand %}
-      <div class="col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa-icon fa-icon-{{ icon.class }}"></i> {{ icon.class }}{% if icon.alias_of %} <span class="muted">(alias)</span>{% endif %}</a></div>
+      <div class="col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa-icon fa-icon-{{ icon.class }}"></i> {{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
     {% endfor %}
   </div>
 </section>
diff --git a/src/_includes/icons/currency.html b/src/_includes/icons/currency.html
index 13154be88..8ad3c0f6e 100644
--- a/src/_includes/icons/currency.html
+++ b/src/_includes/icons/currency.html
@@ -5,7 +5,7 @@
     {% assign icons_currency = icons | expand_aliases | category:"Currency Icons" | sort_by:'class' %}
 
     {% for icon in icons_currency %}
-      <div class="col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa-icon fa-icon-{{ icon.class }}"></i> {{ icon.class }}{% if icon.alias_of %} <span class="muted">(alias)</span>{% endif %}</a></div>
+      <div class="col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa-icon fa-icon-{{ icon.class }}"></i> {{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
     {% endfor %}
   </div>
 
diff --git a/src/_includes/icons/directional.html b/src/_includes/icons/directional.html
index fb84d3d24..585e22438 100644
--- a/src/_includes/icons/directional.html
+++ b/src/_includes/icons/directional.html
@@ -5,7 +5,7 @@
     {% assign icons_directional = icons | expand_aliases | category:"Directional Icons" | sort_by:'class' %}
 
     {% for icon in icons_directional %}
-      <div class="col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa-icon fa-icon-{{ icon.class }}"></i> {{ icon.class }}{% if icon.alias_of %} <span class="muted">(alias)</span>{% endif %}</a></div>
+      <div class="col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa-icon fa-icon-{{ icon.class }}"></i> {{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
     {% endfor %}
   </div>
 
diff --git a/src/_includes/icons/medical.html b/src/_includes/icons/medical.html
index 3830a3357..ae7d97f16 100644
--- a/src/_includes/icons/medical.html
+++ b/src/_includes/icons/medical.html
@@ -5,7 +5,7 @@
     {% assign icons_medical = icons | expand_aliases | category:"Medical Icons" | sort_by:'class' %}
 
     {% for icon in icons_medical %}
-      <div class="col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa-icon fa-icon-{{ icon.class }}"></i> {{ icon.class }}{% if icon.alias_of %} <span class="muted">(alias)</span>{% endif %}</a></div>
+      <div class="col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa-icon fa-icon-{{ icon.class }}"></i> {{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
     {% endfor %}
   </div>
 
diff --git a/src/_includes/icons/new.html b/src/_includes/icons/new.html
index d76dacd8c..12370162c 100644
--- a/src/_includes/icons/new.html
+++ b/src/_includes/icons/new.html
@@ -11,7 +11,7 @@
     {% assign icons_new = icons | expand_aliases | version:site.fontawesome.minor_version %}
 
     {% for icon in icons_new %}
-      <div class="col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa-icon fa-icon-{{ icon.class }}"></i> {{ icon.class }}{% if icon.alias_of %} <span class="muted">(alias)</span>{% endif %}</a></div>
+      <div class="col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa-icon fa-icon-{{ icon.class }}"></i> {{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
     {% endfor %}
   </div>
 
diff --git a/src/_includes/icons/text-editor.html b/src/_includes/icons/text-editor.html
index 6c1b73513..51737db2a 100644
--- a/src/_includes/icons/text-editor.html
+++ b/src/_includes/icons/text-editor.html
@@ -5,7 +5,7 @@
     {% assign icons_text_editor = icons | expand_aliases | category:"Text Editor Icons" | sort_by:'class' %}
 
     {% for icon in icons_text_editor %}
-      <div class="col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa-icon fa-icon-{{ icon.class }}"></i> {{ icon.class }}{% if icon.alias_of %} <span class="muted">(alias)</span>{% endif %}</a></div>
+      <div class="col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa-icon fa-icon-{{ icon.class }}"></i> {{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
     {% endfor %}
   </div>
 
diff --git a/src/_includes/icons/video-player.html b/src/_includes/icons/video-player.html
index e994a5e9b..6cb3343ff 100644
--- a/src/_includes/icons/video-player.html
+++ b/src/_includes/icons/video-player.html
@@ -5,7 +5,7 @@
     {% assign icons_video_player = icons | expand_aliases | category:"Video Player Icons" | sort_by:'class' %}
 
     {% for icon in icons_video_player %}
-      <div class="col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa-icon fa-icon-{{ icon.class }}"></i> {{ icon.class }}{% if icon.alias_of %} <span class="muted">(alias)</span>{% endif %}</a></div>
+      <div class="col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa-icon fa-icon-{{ icon.class }}"></i> {{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
     {% endfor %}
   </div>
 
diff --git a/src/_includes/icons/web-application.html b/src/_includes/icons/web-application.html
index 1a42811cd..964ab9f4d 100644
--- a/src/_includes/icons/web-application.html
+++ b/src/_includes/icons/web-application.html
@@ -5,7 +5,7 @@
     {% assign icons_web_application = icons | expand_aliases | category:"Web Application Icons" | sort_by:'class' %}
 
     {% for icon in icons_web_application %}
-      <div class="col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa-icon fa-icon-{{ icon.class }}"></i> {{ icon.class }}{% if icon.alias_of %} <span class="muted">(alias)</span>{% endif %}</a></div>
+      <div class="col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa-icon fa-icon-{{ icon.class }}"></i> {{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
     {% endfor %}
   </div>
 
diff --git a/src/assets/font-awesome/less/core.less b/src/assets/font-awesome/less/core.less
index 2c0409de0..8fdb31ad9 100644
--- a/src/assets/font-awesome/less/core.less
+++ b/src/assets/font-awesome/less/core.less
@@ -4,10 +4,15 @@
  * -------------------------- */
 
 .{{ site.fontawesome.css_prefix }} {
-  .icon-FontAwesome();
+  display: inline-block;
+  font-family: FontAwesome;
+  font-style: normal;
+  font-weight: normal;
+  line-height: 1;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
 }
 
-
 /* makes the font 33% larger relative to the icon container */
 .{{ site.fontawesome.css_prefix }}-lg {
   font-size: (4em / 3);
@@ -30,28 +35,28 @@
 
 .{{ site.fontawesome.css_prefix }}-ul {
   padding-left: 0;
-  margin-left: @icons-li-width;
+  margin-left: @fa-icon-li-width;
   list-style-type: none;
 
   > li { position: relative; }
 }
 .{{ site.fontawesome.css_prefix }}-li {
   position: absolute;
-  left: -@icons-li-width;
-  width: @icons-li-width;
+  left: -@fa-icon-li-width;
+  width: @fa-icon-li-width;
   top: (2em / 14);
   text-align: center;
   &.{{ site.fontawesome.css_prefix }}-lg {
-    left: -@icons-li-width + (4em / 14);
+    left: -@fa-icon-li-width + (4em / 14);
   }
 }
 
 // allows usage of the hide class directly on font awesome icons
 .{{ site.fontawesome.css_prefix }}.hide { display: none; }
 
-.{{ site.fontawesome.css_prefix }}-muted { color: @iconMuted; }
-.{{ site.fontawesome.css_prefix }}-light { color: @iconLight; }
-.{{ site.fontawesome.css_prefix }}-dark { color: @iconDark; }
+.{{ site.fontawesome.css_prefix }}-muted { color: @fa-icon-muted; }
+.{{ site.fontawesome.css_prefix }}-light { color: @fa-icon-light; }
+.{{ site.fontawesome.css_prefix }}-dark { color: @fa-icon-dark; }
 
 
 // Icon Borders
@@ -59,8 +64,8 @@
 
 .{{ site.fontawesome.css_prefix }}-border {
   padding: .2em .25em .15em;
-  border: solid 1px @borderColor;
-  .border-radius(3px);
+  border: solid 1px @fa-border-color;
+  border-radius: 3px;
 }
 
 // Icon Sizes
@@ -70,21 +75,21 @@
   font-size: 2em;
   &.{{ site.fontawesome.css_prefix }}-border {
     border-width: 2px;
-    .border-radius(4px);
+    border-radius: 4px;
   }
 }
 .{{ site.fontawesome.css_prefix }}-3x {
   font-size: 3em;
   &.{{ site.fontawesome.css_prefix }}-border {
     border-width: 3px;
-    .border-radius(5px);
+    border-radius: 5px;
   }
 }
 .{{ site.fontawesome.css_prefix }}-4x {
   font-size: 4em;
   &.{{ site.fontawesome.css_prefix }}-border {
     border-width: 4px;
-    .border-radius(6px);
+    border-radius: 6px;
   }
 }
 
@@ -92,7 +97,7 @@
   font-size: 5em;
   &.{{ site.fontawesome.css_prefix }}-border {
     border-width: 5px;
-    .border-radius(7px);
+    border-radius: 7px;
   }
 }
 
diff --git a/src/assets/font-awesome/less/extras.less b/src/assets/font-awesome/less/extras.less
index bcba0d677..d0eebcc00 100644
--- a/src/assets/font-awesome/less/extras.less
+++ b/src/assets/font-awesome/less/extras.less
@@ -4,7 +4,7 @@
  * -------------------------- */
 
 /* Stacked and layered icon */
-.icon-stack();
+.{{ site.fontawesome.css_prefix }}-stack();
 
 /* Animated rotating icon */
 .{{ site.fontawesome.css_prefix }}-spin {
@@ -39,9 +39,9 @@
 // Icon rotations & flipping
 // -------------------------
 
-.{{ site.fontawesome.css_prefix }}-rotate-90  { .rotate(90deg, 1);  }
-.{{ site.fontawesome.css_prefix }}-rotate-180 { .rotate(180deg, 2); }
-.{{ site.fontawesome.css_prefix }}-rotate-270 { .rotate(270deg, 3); }
+.{{ site.fontawesome.css_prefix }}-rotate-90  { .{{ site.fontawesome.css_prefix }}-rotate(90deg, 1);  }
+.{{ site.fontawesome.css_prefix }}-rotate-180 { .{{ site.fontawesome.css_prefix }}-rotate(180deg, 2); }
+.{{ site.fontawesome.css_prefix }}-rotate-270 { .{{ site.fontawesome.css_prefix }}-rotate(270deg, 3); }
 
-.{{ site.fontawesome.css_prefix }}-flip-horizontal { .flip(-1, 1); }
-.{{ site.fontawesome.css_prefix }}-flip-vertical   { .flip(1, -1); }
+.{{ site.fontawesome.css_prefix }}-flip-horizontal { .{{ site.fontawesome.css_prefix }}-flip(-1, 1); }
+.{{ site.fontawesome.css_prefix }}-flip-vertical   { .{{ site.fontawesome.css_prefix }}-flip(1, -1); }
diff --git a/src/assets/font-awesome/less/icons.less b/src/assets/font-awesome/less/icons.less
index 6c859d497..173bce19a 100644
--- a/src/assets/font-awesome/less/icons.less
+++ b/src/assets/font-awesome/less/icons.less
@@ -4,4 +4,4 @@
    readers do not read off random characters that represent icons */
 {% for icon in icons %}{% for alias in icon.aliases %}
 .{{ site.fontawesome.css_prefix }}-{{ alias }}:before,{% endfor %}
-.{{ site.fontawesome.css_prefix }}-{{ icon.id }}:before { content: @{{ icon.id }}; }{% endfor %}
+.{{ site.fontawesome.css_prefix }}-{{ icon.id }}:before { content: @{{ site.fontawesome.css_prefix }}-{{ icon.id }}; }{% endfor %}
diff --git a/src/assets/font-awesome/less/mixins.less b/src/assets/font-awesome/less/mixins.less
index bc33a15f1..86497a939 100644
--- a/src/assets/font-awesome/less/mixins.less
+++ b/src/assets/font-awesome/less/mixins.less
@@ -3,36 +3,7 @@
 // Mixins
 // --------------------------
 
-.icon(@icon) {
-  .icon-FontAwesome();
-  content: @icon;
-}
-
-.icon-FontAwesome() {
-//  position: relative;
-//  top: 0;
-  display: inline-block;
-  font-family: FontAwesome;
-  font-style: normal;
-  font-weight: normal;
-  line-height: 1;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-
-  // from bootstrap, throws off rendering
-//  &:empty { width: 1em; }
-
-//  text-decoration: inherit;
-//  text-rendering: auto;
-}
-
-.border-radius(@radius) {
-  -webkit-border-radius: @radius;
-  -moz-border-radius: @radius;
-  border-radius: @radius;
-}
-
-.rotate(@degrees, @rotation) {
+.{{ site.fontawesome.css_prefix }}-rotate(@degrees, @rotation) {
   filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation);
   -webkit-transform: rotate(@degrees);
      -moz-transform: rotate(@degrees);
@@ -41,7 +12,7 @@
           transform: rotate(@degrees);
 }
 
-.flip(@horiz, @vert) {
+.{{ site.fontawesome.css_prefix }}-flip(@horiz, @vert) {
   -webkit-transform: scale(@horiz, @vert);
      -moz-transform: scale(@horiz, @vert);
       -ms-transform: scale(@horiz, @vert);
@@ -49,7 +20,7 @@
           transform: scale(@horiz, @vert);
 }
 
-.icon-stack(@width: 2em, @height: 2em, @top-font-size: 1em, @base-font-size: 2em) {
+.{{ site.fontawesome.css_prefix }}-stack(@width: 2em, @height: 2em, @top-font-size: 1em, @base-font-size: 2em) {
   .{{ site.fontawesome.css_prefix }}-stack {
     position: relative;
     display: inline-block;
diff --git a/src/assets/font-awesome/less/path.less b/src/assets/font-awesome/less/path.less
index 7377767f6..5b0b476cf 100644
--- a/src/assets/font-awesome/less/path.less
+++ b/src/assets/font-awesome/less/path.less
@@ -3,12 +3,12 @@
 
 @font-face {
   font-family: 'FontAwesome';
-//  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=@{FontAwesomeVersion}');
-//  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'),
-//    url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'),
-//    url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'),
-//    url('@{FontAwesomePath}/fontawesome-webfont.svg?v=@{FontAwesomeVersion}#fontawesomeregular') format('svg');
-  src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts
+//  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'),
+//    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');
+  src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
   font-weight: normal;
   font-style: normal;
 }
diff --git a/src/assets/font-awesome/less/variables.less b/src/assets/font-awesome/less/variables.less
index cae23b7ca..d1a8ab7c0 100644
--- a/src/assets/font-awesome/less/variables.less
+++ b/src/assets/font-awesome/less/variables.less
@@ -3,14 +3,14 @@
 // Variables
 // --------------------------
 
-@FontAwesomePath:    "../fonts";
-//@FontAwesomePath:    "//netdna.bootstrapcdn.com/font-awesome/{{ site.fontawesome.version}}/font"; // for referencing Bootstrap CDN font files directly
-@FontAwesomeVersion: "{{ site.fontawesome.version }}";
-@borderColor:        #eee;
-@iconMuted:          #eee;
-@iconLight:          #fff;
-@iconDark:           #333;
-@icons-li-width:     (30em / 14);
+@fa-font-path:       "../fonts";
+//@fa-font-path:       "//netdna.bootstrapcdn.com/font-awesome/{{ site.fontawesome.version}}/font"; // for referencing Bootstrap CDN font files directly
+@fa-version:         "{{ site.fontawesome.version }}";
+@fa-border-color:    #eee;
+@fa-icon-muted:      #eee;
+@fa-icon-light:      #fff;
+@fa-icon-dark:       #333;
+@fa-icon-li-width:   (30em / 14);
 
-{% for icon in icons %}@{{ icon.id }}: "\{{ icon.unicode }}";
+{% for icon in icons %}@{{ site.fontawesome.css_prefix }}-{{ icon.id }}: "\{{ icon.unicode }}";
 {% endfor %}
diff --git a/src/assets/less/site/bootstrap/jumbotron.less b/src/assets/less/site/bootstrap/jumbotron.less
index c558763ca..dfd221c0d 100644
--- a/src/assets/less/site/bootstrap/jumbotron.less
+++ b/src/assets/less/site/bootstrap/jumbotron.less
@@ -35,6 +35,7 @@
   h1 {
     color: @gray-darker;
     font-size: 30px;
+    margin-top: @buffer-lg;
     small {
       letter-spacing: normal;
       font-family: @font-family-sans-serif;
diff --git a/src/icons.yml b/src/icons.yml
index 355dfa32a..36f3b5c47 100644
--- a/src/icons.yml
+++ b/src/icons.yml
@@ -1406,20 +1406,26 @@ icons:
     id:         sort
     unicode:    f0dc
     created:    2.0
+    aliases:
+      - unsorted
     categories:
       - Web Application Icons
 
-  - name:       Sort Down
-    id:         sort-down
+  - name:       Sort Ascending
+    id:         sort-asc
     unicode:    f0dd
     created:    2.0
+    aliases:
+      - sort-down
     categories:
       - Web Application Icons
 
-  - name:       Sort Up
-    id:         sort-up
+  - name:       Sort Descending
+    id:         sort-desc
     unicode:    f0de
     created:    2.0
+    aliases:
+      - sort-up
     categories:
       - Web Application Icons
 
@@ -1892,11 +1898,12 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       star-half-empty
-    id:         star-half-empty
+  - name:       Star Half Alt
+    id:         star-half-alt
     unicode:    f123
     created:    3.1
     aliases:
+      - star-half-empty
       - star-half-full
     categories:
       - Web Application Icons
@@ -2303,44 +2310,44 @@ icons:
     categories:
       - Text Editor Icons
 
-  - name:       Sort By Alphabet
-    id:         sort-by-alphabet
+  - name:       Sort Alpha Ascending
+    id:         sort-alpha-asc
     unicode:    f15d
     created:    3.2
     categories:
       - Web Application Icons
 
-  - name:       Sort By Alphabet Alt
-    id:         sort-by-alphabet-alt
+  - name:       Sort Alpha Descending
+    id:         sort-alpha-desc
     unicode:    f15e
     created:    3.2
     categories:
       - Web Application Icons
 
 
-  - name:       Sort By Attributes
-    id:         sort-by-attributes
+  - name:       Sort Amount Ascending
+    id:         sort-amount-asc
     unicode:    f160
     created:    3.2
     categories:
       - Web Application Icons
 
-  - name:       Sort By Attributes Alt
-    id:         sort-by-attributes-alt
+  - name:       Sort Amount Descending
+    id:         sort-amount-desc
     unicode:    f161
     created:    3.2
     categories:
       - Web Application Icons
 
-  - name:       Sort By Order
-    id:         sort-by-order
+  - name:       Sort Numeric Ascending
+    id:         sort-numeric-asc
     unicode:    f162
     created:    3.2
     categories:
       - Web Application Icons
 
-  - name:       Sort By Order Alt
-    id:         sort-by-order-alt
+  - name:       Sort Numeric Descending
+    id:         sort-numeric-desc
     unicode:    f163
     created:    3.2
     categories: