diff --git a/fonts/FontAwesome.otf b/fonts/FontAwesome.otf
index a767862a8..152e250b9 100644
Binary files a/fonts/FontAwesome.otf and b/fonts/FontAwesome.otf differ
diff --git a/less/core.less b/less/core.less
index 34a5f8f33..37e9a73fd 100644
--- a/less/core.less
+++ b/less/core.less
@@ -49,6 +49,7 @@
   }
 }
 
+
 // allows usage of the hide class directly on font awesome icons
 .fa-icon.hide { display: none; }
 
@@ -66,6 +67,7 @@
   border-radius: 3px;
 }
 
+
 // Icon Sizes
 // -------------------------
 
@@ -90,7 +92,6 @@
     border-radius: 6px;
   }
 }
-
 .fa-icon-5x {
   font-size: 5em;
   &.fa-icon-border {
diff --git a/scss/_core.scss b/scss/_core.scss
index c77213fb6..21da7a9f3 100644
--- a/scss/_core.scss
+++ b/scss/_core.scss
@@ -1,113 +1,102 @@
 /* FONT AWESOME CORE
  * -------------------------- */
 
-[class^="icon-"],
-[class*=" icon-"] {
-  @include icon-FontAwesome();
-}
-
-[class^="icon-"]:before,
-[class*=" icon-"]:before {
+.fa-icon {
   display: inline-block;
-  text-decoration: inherit;
-  speak: none;
+  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 */
-.icon-large:before {
-  font-size: (4em/3);
-  vertical-align: -10%;
+.fa-icon-lg {
+  font-size: (4em / 3);
+  line-height: (3em / 4);
+  vertical-align: -15%;
 }
-
-/* makes sure icons active on rollover in links */
-a {
-  [class^="icon-"],
-  [class*=" icon-"] {
-    display: inline;
+/* increased font size for icon-lg */
+.fa-icon-fixed-width {
+  width: (16em / 14);
+  padding-right: (4em / 14);
+  text-align: right;
+  &.fa-icon-lg {
+    width: (20em / 14);
   }
 }
 
-/* increased font size for icon-large */
-[class^="icon-"],
-[class*=" icon-"] {
-  &.icon-fixed-width {
-    display: inline-block;
-    width: (16em/14);
-    padding-right: (4em/14);
-    text-align: right;
-    &.icon-large {
-      width: (20em/14);
-    }
-  }
-}
 
-.icons-ul {
+// Icon UL & LI
+// -------------------------
+
+.fa-icon-ul {
   padding-left: 0;
-  margin-left: $icons-li-width;
+  margin-left: $fa-icon-li-width;
   list-style-type: none;
 
   > li { position: relative; }
-
-  .icon-li {
-    position: absolute;
-    left: -$icons-li-width;
-    width: $icons-li-width;
-    line-height: inherit;
-    text-align: center;
+}
+.fa-icon-li {
+  position: absolute;
+  left: -$fa-icon-li-width;
+  width: $fa-icon-li-width;
+  top: (2em / 14);
+  text-align: center;
+  &.fa-icon-lg {
+    left: -$fa-icon-li-width + (4em / 14);
   }
 }
 
+
 // allows usage of the hide class directly on font awesome icons
-[class^="icon-"],
-[class*=" icon-"] {
-  &.hide {
-    display: none;
-  }
-}
+.fa-icon.hide { display: none; }
+
+.fa-icon-muted { color: $fa-icon-muted; }
+.fa-icon-light { color: $fa-icon-light; }
+.fa-icon-dark { color: $fa-icon-dark; }
 
-.icon-muted { color: $iconMuted; }
-.icon-light { color: $iconLight; }
-.icon-dark { color: $iconDark; }
 
 // Icon Borders
 // -------------------------
 
-.icon-border {
+.fa-icon-border {
   padding: .2em .25em .15em;
-  border: solid 1px $borderColor;
-  @include border-radius(3px);
+  border: solid 1px $fa-border-color;
+  border-radius: 3px;
 }
 
+
 // Icon Sizes
 // -------------------------
 
-.icon-2x {
+.fa-icon-2x {
   font-size: 2em;
-  &.icon-border {
+  &.fa-icon-border {
     border-width: 2px;
-    @include border-radius(4px);
+    border-radius: 4px;
   }
 }
-.icon-3x {
+.fa-icon-3x {
   font-size: 3em;
-  &.icon-border {
+  &.fa-icon-border {
     border-width: 3px;
-    @include border-radius(5px);
+    border-radius: 5px;
   }
 }
-.icon-4x {
+.fa-icon-4x {
   font-size: 4em;
-  &.icon-border {
+  &.fa-icon-border {
     border-width: 4px;
-    @include border-radius(6px);
+    border-radius: 6px;
   }
 }
-
-.icon-5x {
+.fa-icon-5x {
   font-size: 5em;
-  &.icon-border {
+  &.fa-icon-border {
     border-width: 5px;
-    @include border-radius(7px);
+    border-radius: 7px;
   }
 }
 
@@ -119,12 +108,7 @@ a {
 .pull-right { float: right; }
 .pull-left { float: left; }
 
-[class^="icon-"],
-[class*=" icon-"] {
-  &.pull-left {
-    margin-right: .3em;
-  }
-  &.pull-right {
-    margin-left: .3em;
-  }
+.fa-icon {
+  &.pull-left { margin-right: .3em; }
+  &.pull-right { margin-left: .3em; }
 }
diff --git a/scss/_extras.scss b/scss/_extras.scss
index 86e46e987..d56df78d2 100644
--- a/scss/_extras.scss
+++ b/scss/_extras.scss
@@ -2,24 +2,16 @@
  * -------------------------- */
 
 /* Stacked and layered icon */
-@include icon-stack();
+@include fa-icon-stack();
 
 /* Animated rotating icon */
-.icon-spin {
-  display: inline-block;
+.fa-icon-spin {
   -webkit-animation: spin 2s infinite linear;
   -moz-animation: spin 2s infinite linear;
   -o-animation: spin 2s infinite linear;
   animation: spin 2s infinite linear;
 }
 
-/* Prevent stack and spinners from being taken inline when inside a link */
-a .icon-stack,
-a .icon-spin {
-  display: inline-block;
-  text-decoration: none;
-}
-
 @-moz-keyframes spin {
   0% { -moz-transform: rotate(0deg); }
   100% { -moz-transform: rotate(359deg); }
@@ -41,53 +33,13 @@ a .icon-spin {
   100% { transform: rotate(359deg); }
 }
 
-/* Icon rotations and mirroring */
-.icon-rotate-90:before {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
-  -webkit-transform: rotate(90deg);
-  -moz-transform: rotate(90deg);
-  -ms-transform: rotate(90deg);
-  -o-transform: rotate(90deg);
-  transform: rotate(90deg);
-}
 
-.icon-rotate-180:before {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
-  -webkit-transform: rotate(180deg);
-  -moz-transform: rotate(180deg);
-  -ms-transform: rotate(180deg);
-  -o-transform: rotate(180deg);
-  transform: rotate(180deg);
-}
+// Icon rotations & flipping
+// -------------------------
 
-.icon-rotate-270:before {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
-  -webkit-transform: rotate(270deg);
-  -moz-transform: rotate(270deg);
-  -ms-transform: rotate(270deg);
-  -o-transform: rotate(270deg);
-  transform: rotate(270deg);
-}
+.fa-icon-rotate-90  { @include fa-icon-rotate(90deg, 1);  }
+.fa-icon-rotate-180 { @include fa-icon-rotate(180deg, 2); }
+.fa-icon-rotate-270 { @include fa-icon-rotate(270deg, 3); }
 
-.icon-flip-horizontal:before {
-  -webkit-transform: scale(-1, 1);
-  -moz-transform: scale(-1, 1);
-  -ms-transform: scale(-1, 1);
-  -o-transform: scale(-1, 1);
-  transform: scale(-1, 1);
-}
-
-.icon-flip-vertical:before {
-  -webkit-transform: scale(1, -1);
-  -moz-transform: scale(1, -1);
-  -ms-transform: scale(1, -1);
-  -o-transform: scale(1, -1);
-  transform: scale(1, -1);
-}
-
-/* ensure rotation occurs inside anchor tags */
-a {
-  .icon-rotate-90, .icon-rotate-180, .icon-rotate-270, .icon-flip-horizontal, .icon-flip-vertical {
-    &:before { display: inline-block; }
-  }
-}
+.fa-icon-flip-horizontal { @include fa-icon-flip(-1, 1); }
+.fa-icon-flip-vertical   { @include fa-icon-flip(1, -1); }
diff --git a/scss/_icons.scss b/scss/_icons.scss
index 2a88fd573..acbd867ad 100644
--- a/scss/_icons.scss
+++ b/scss/_icons.scss
@@ -1,401 +1,401 @@
 /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
- * readers do not read off random characters that represent icons */
+   readers do not read off random characters that represent icons */
 
-.icon-glass:before { content: $glass; }
-.icon-music:before { content: $music; }
-.icon-search:before { content: $search; }
-.icon-envelope-alt:before { content: $envelope-alt; }
-.icon-heart:before { content: $heart; }
-.icon-star:before { content: $star; }
-.icon-star-alt:before { content: $star-alt; }
-.icon-user:before { content: $user; }
-.icon-film:before { content: $film; }
-.icon-th-large:before { content: $th-large; }
-.icon-th:before { content: $th; }
-.icon-th-list:before { content: $th-list; }
-.icon-check:before { content: $check; }
-.icon-times:before { content: $times; }
-.icon-zoom-in:before { content: $zoom-in; }
-.icon-zoom-out:before { content: $zoom-out; }
-.icon-power-off:before { content: $power-off; }
-.icon-signal:before { content: $signal; }
-.icon-gear:before,
-.icon-cog:before { content: $cog; }
-.icon-trash:before { content: $trash; }
-.icon-home:before { content: $home; }
-.icon-file-alt:before { content: $file-alt; }
-.icon-time:before { content: $time; }
-.icon-road:before { content: $road; }
-.icon-download:before { content: $download; }
-.icon-arrow-circle-alt-down:before { content: $arrow-circle-alt-down; }
-.icon-arrow-circle-alt-up:before { content: $arrow-circle-alt-up; }
-.icon-inbox:before { content: $inbox; }
-.icon-play-circle-alt:before { content: $play-circle-alt; }
-.icon-rotate-right:before,
-.icon-repeat:before { content: $repeat; }
-.icon-refresh:before { content: $refresh; }
-.icon-list-alt:before { content: $list-alt; }
-.icon-lock:before { content: $lock; }
-.icon-flag:before { content: $flag; }
-.icon-headphones:before { content: $headphones; }
-.icon-volume-off:before { content: $volume-off; }
-.icon-volume-down:before { content: $volume-down; }
-.icon-volume-up:before { content: $volume-up; }
-.icon-qrcode:before { content: $qrcode; }
-.icon-barcode:before { content: $barcode; }
-.icon-tag:before { content: $tag; }
-.icon-tags:before { content: $tags; }
-.icon-book:before { content: $book; }
-.icon-bookmark:before { content: $bookmark; }
-.icon-print:before { content: $print; }
-.icon-camera:before { content: $camera; }
-.icon-font:before { content: $font; }
-.icon-bold:before { content: $bold; }
-.icon-italic:before { content: $italic; }
-.icon-text-height:before { content: $text-height; }
-.icon-text-width:before { content: $text-width; }
-.icon-align-left:before { content: $align-left; }
-.icon-align-center:before { content: $align-center; }
-.icon-align-right:before { content: $align-right; }
-.icon-align-justify:before { content: $align-justify; }
-.icon-list:before { content: $list; }
-.icon-dedent:before,
-.icon-outdent:before { content: $outdent; }
-.icon-indent:before { content: $indent; }
-.icon-video-camera:before { content: $video-camera; }
-.icon-picture:before { content: $picture; }
-.icon-pencil:before { content: $pencil; }
-.icon-map-marker:before { content: $map-marker; }
-.icon-adjust:before { content: $adjust; }
-.icon-tint:before { content: $tint; }
-.icon-edit:before,
-.icon-pencil-square-alt:before { content: $pencil-square-alt; }
-.icon-share-square-alt:before { content: $share-square-alt; }
-.icon-check-square-alt:before { content: $check-square-alt; }
-.icon-move:before { content: $move; }
-.icon-step-backward:before { content: $step-backward; }
-.icon-fast-backward:before { content: $fast-backward; }
-.icon-backward:before { content: $backward; }
-.icon-play:before { content: $play; }
-.icon-pause:before { content: $pause; }
-.icon-stop:before { content: $stop; }
-.icon-forward:before { content: $forward; }
-.icon-fast-forward:before { content: $fast-forward; }
-.icon-step-forward:before { content: $step-forward; }
-.icon-eject:before { content: $eject; }
-.icon-chevron-left:before { content: $chevron-left; }
-.icon-chevron-right:before { content: $chevron-right; }
-.icon-plus-circle:before { content: $plus-circle; }
-.icon-minus-circle:before { content: $minus-circle; }
-.icon-times-circle:before { content: $times-circle; }
-.icon-check-circle:before { content: $check-circle; }
-.icon-question-circle:before { content: $question-circle; }
-.icon-info-circle:before { content: $info-circle; }
-.icon-screenshot:before { content: $screenshot; }
-.icon-times-circle-alt:before { content: $times-circle-alt; }
-.icon-check-circle-alt:before { content: $check-circle-alt; }
-.icon-ban:before { content: $ban; }
-.icon-arrow-left:before { content: $arrow-left; }
-.icon-arrow-right:before { content: $arrow-right; }
-.icon-arrow-up:before { content: $arrow-up; }
-.icon-arrow-down:before { content: $arrow-down; }
-.icon-mail-forward:before,
-.icon-share:before { content: $share; }
-.icon-resize-full:before { content: $resize-full; }
-.icon-resize-small:before { content: $resize-small; }
-.icon-plus:before { content: $plus; }
-.icon-minus:before { content: $minus; }
-.icon-asterisk:before { content: $asterisk; }
-.icon-exclamation-circle:before { content: $exclamation-circle; }
-.icon-gift:before { content: $gift; }
-.icon-leaf:before { content: $leaf; }
-.icon-fire:before { content: $fire; }
-.icon-eye:before { content: $eye; }
-.icon-eye-closed:before { content: $eye-closed; }
-.icon-warning:before,
-.icon-exclamation-triangle:before { content: $exclamation-triangle; }
-.icon-plane:before { content: $plane; }
-.icon-calendar:before { content: $calendar; }
-.icon-random:before { content: $random; }
-.icon-comment:before { content: $comment; }
-.icon-magnet:before { content: $magnet; }
-.icon-chevron-up:before { content: $chevron-up; }
-.icon-chevron-down:before { content: $chevron-down; }
-.icon-retweet:before { content: $retweet; }
-.icon-shopping-cart:before { content: $shopping-cart; }
-.icon-folder:before { content: $folder; }
-.icon-folder-open:before { content: $folder-open; }
-.icon-resize-vertical:before { content: $resize-vertical; }
-.icon-resize-horizontal:before { content: $resize-horizontal; }
-.icon-bar-chart:before { content: $bar-chart; }
-.icon-twitter-square:before { content: $twitter-square; }
-.icon-facebook-square:before { content: $facebook-square; }
-.icon-camera-retro:before { content: $camera-retro; }
-.icon-key:before { content: $key; }
-.icon-gears:before,
-.icon-cogs:before { content: $cogs; }
-.icon-comments:before { content: $comments; }
-.icon-thumbs-up-alt:before { content: $thumbs-up-alt; }
-.icon-thumbs-down-alt:before { content: $thumbs-down-alt; }
-.icon-star-half:before { content: $star-half; }
-.icon-heart-alt:before { content: $heart-alt; }
-.icon-sign-out:before { content: $sign-out; }
-.icon-linkedin-square:before { content: $linkedin-square; }
-.icon-thumb-tack:before { content: $thumb-tack; }
-.icon-external-link:before { content: $external-link; }
-.icon-sign-in:before { content: $sign-in; }
-.icon-trophy:before { content: $trophy; }
-.icon-github-square:before { content: $github-square; }
-.icon-upload:before { content: $upload; }
-.icon-lemon-alt:before { content: $lemon-alt; }
-.icon-phone:before { content: $phone; }
-.icon-unchecked:before,
-.icon-square-alt:before { content: $square-alt; }
-.icon-bookmark-alt:before { content: $bookmark-alt; }
-.icon-phone-square:before { content: $phone-square; }
-.icon-twitter:before { content: $twitter; }
-.icon-facebook:before { content: $facebook; }
-.icon-github:before { content: $github; }
-.icon-unlock:before { content: $unlock; }
-.icon-credit-card:before { content: $credit-card; }
-.icon-rss:before { content: $rss; }
-.icon-hdd:before { content: $hdd; }
-.icon-bullhorn:before { content: $bullhorn; }
-.icon-bell:before { content: $bell; }
-.icon-certificate:before { content: $certificate; }
-.icon-hand-right:before { content: $hand-right; }
-.icon-hand-left:before { content: $hand-left; }
-.icon-hand-up:before { content: $hand-up; }
-.icon-hand-down:before { content: $hand-down; }
-.icon-arrow-circle-left:before { content: $arrow-circle-left; }
-.icon-arrow-circle-right:before { content: $arrow-circle-right; }
-.icon-arrow-circle-up:before { content: $arrow-circle-up; }
-.icon-arrow-circle-down:before { content: $arrow-circle-down; }
-.icon-globe:before { content: $globe; }
-.icon-wrench:before { content: $wrench; }
-.icon-tasks:before { content: $tasks; }
-.icon-filter:before { content: $filter; }
-.icon-briefcase:before { content: $briefcase; }
-.icon-fullscreen:before { content: $fullscreen; }
-.icon-group:before { content: $group; }
-.icon-chain:before,
-.icon-link:before { content: $link; }
-.icon-cloud:before { content: $cloud; }
-.icon-flask:before { content: $flask; }
-.icon-cut:before,
-.icon-scissors:before { content: $scissors; }
-.icon-copy:before,
-.icon-files:before { content: $files; }
-.icon-paperclip:before { content: $paperclip; }
-.icon-save:before,
-.icon-floppy:before { content: $floppy; }
-.icon-square:before { content: $square; }
-.icon-reorder:before { content: $reorder; }
-.icon-list-ul:before { content: $list-ul; }
-.icon-list-ol:before { content: $list-ol; }
-.icon-strikethrough:before { content: $strikethrough; }
-.icon-underline:before { content: $underline; }
-.icon-table:before { content: $table; }
-.icon-magic:before { content: $magic; }
-.icon-truck:before { content: $truck; }
-.icon-pinterest:before { content: $pinterest; }
-.icon-pinterest-square:before { content: $pinterest-square; }
-.icon-google-plus-square:before { content: $google-plus-square; }
-.icon-google-plus:before { content: $google-plus; }
-.icon-money:before { content: $money; }
-.icon-caret-down:before { content: $caret-down; }
-.icon-caret-up:before { content: $caret-up; }
-.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,
-.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,
-.icon-undo:before { content: $undo; }
-.icon-legal:before,
-.icon-gavel:before { content: $gavel; }
-.icon-dashboard:before,
-.icon-tachometer:before { content: $tachometer; }
-.icon-comment-alt:before { content: $comment-alt; }
-.icon-comments-alt:before { content: $comments-alt; }
-.icon-flash:before,
-.icon-bolt:before { content: $bolt; }
-.icon-sitemap:before { content: $sitemap; }
-.icon-umbrella:before { content: $umbrella; }
-.icon-paste:before,
-.icon-clipboard:before { content: $clipboard; }
-.icon-lightbulb:before { content: $lightbulb; }
-.icon-exchange:before { content: $exchange; }
-.icon-cloud-download:before { content: $cloud-download; }
-.icon-cloud-upload:before { content: $cloud-upload; }
-.icon-user-md:before { content: $user-md; }
-.icon-stethoscope:before { content: $stethoscope; }
-.icon-suitcase:before { content: $suitcase; }
-.icon-bell-alt:before { content: $bell-alt; }
-.icon-coffee:before { content: $coffee; }
-.icon-cutlery:before { content: $cutlery; }
-.icon-file-text-alt:before { content: $file-text-alt; }
-.icon-building:before { content: $building; }
-.icon-hospital:before { content: $hospital; }
-.icon-ambulance:before { content: $ambulance; }
-.icon-medkit:before { content: $medkit; }
-.icon-fighter-jet:before { content: $fighter-jet; }
-.icon-beer:before { content: $beer; }
-.icon-h-square:before { content: $h-square; }
-.icon-plus-square:before { content: $plus-square; }
-.icon-double-angle-left:before { content: $double-angle-left; }
-.icon-double-angle-right:before { content: $double-angle-right; }
-.icon-double-angle-up:before { content: $double-angle-up; }
-.icon-double-angle-down:before { content: $double-angle-down; }
-.icon-angle-left:before { content: $angle-left; }
-.icon-angle-right:before { content: $angle-right; }
-.icon-angle-up:before { content: $angle-up; }
-.icon-angle-down:before { content: $angle-down; }
-.icon-desktop:before { content: $desktop; }
-.icon-laptop:before { content: $laptop; }
-.icon-tablet:before { content: $tablet; }
-.icon-mobile-phone:before,
-.icon-mobile:before { content: $mobile; }
-.icon-circle-alt:before { content: $circle-alt; }
-.icon-quote-left:before { content: $quote-left; }
-.icon-quote-right:before { content: $quote-right; }
-.icon-spinner:before { content: $spinner; }
-.icon-circle:before { content: $circle; }
-.icon-mail-reply:before,
-.icon-reply:before { content: $reply; }
-.icon-github-alt:before { content: $github-alt; }
-.icon-folder-alt:before { content: $folder-alt; }
-.icon-folder-open-alt:before { content: $folder-open-alt; }
-.icon-expand-alt:before { content: $expand-alt; }
-.icon-collapse-alt:before { content: $collapse-alt; }
-.icon-smile:before { content: $smile; }
-.icon-frown:before { content: $frown; }
-.icon-meh:before { content: $meh; }
-.icon-gamepad:before { content: $gamepad; }
-.icon-keyboard:before { content: $keyboard; }
-.icon-flag-alt:before { content: $flag-alt; }
-.icon-flag-checkered:before { content: $flag-checkered; }
-.icon-terminal:before { content: $terminal; }
-.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-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; }
-.icon-unlink:before,
-.icon-chain-broken:before { content: $chain-broken; }
-.icon-question:before { content: $question; }
-.icon-info:before { content: $info; }
-.icon-exclamation:before { content: $exclamation; }
-.icon-superscript:before { content: $superscript; }
-.icon-subscript:before { content: $subscript; }
-.icon-eraser:before { content: $eraser; }
-.icon-puzzle-piece:before { content: $puzzle-piece; }
-.icon-microphone:before { content: $microphone; }
-.icon-microphone-off:before { content: $microphone-off; }
-.icon-shield:before { content: $shield; }
-.icon-calendar-alt:before { content: $calendar-alt; }
-.icon-fire-extinguisher:before { content: $fire-extinguisher; }
-.icon-rocket:before { content: $rocket; }
-.icon-maxcdn:before { content: $maxcdn; }
-.icon-chevron-circle-left:before { content: $chevron-circle-left; }
-.icon-chevron-circle-right:before { content: $chevron-circle-right; }
-.icon-chevron-circle-up:before { content: $chevron-circle-up; }
-.icon-chevron-circle-down:before { content: $chevron-circle-down; }
-.icon-html5:before { content: $html5; }
-.icon-css3:before { content: $css3; }
-.icon-anchor:before { content: $anchor; }
-.icon-unlock-alt:before { content: $unlock-alt; }
-.icon-bullseye:before { content: $bullseye; }
-.icon-ellipsis-horizontal:before { content: $ellipsis-horizontal; }
-.icon-ellipsis-vertical:before { content: $ellipsis-vertical; }
-.icon-rss-square:before { content: $rss-square; }
-.icon-play-circle:before { content: $play-circle; }
-.icon-ticket:before { content: $ticket; }
-.icon-minus-square:before { content: $minus-square; }
-.icon-minus-square-alt:before { content: $minus-square-alt; }
-.icon-level-up:before { content: $level-up; }
-.icon-level-down:before { content: $level-down; }
-.icon-check-square:before { content: $check-square; }
-.icon-pencil-square:before { content: $pencil-square; }
-.icon-external-link-square:before { content: $external-link-square; }
-.icon-share-square:before { content: $share-square; }
-.icon-compass:before { content: $compass; }
-.icon-collapse-down:before { content: $collapse-down; }
-.icon-collapse-up:before { content: $collapse-up; }
-.icon-expand:before { content: $expand; }
-.icon-euro:before,
-.icon-eur:before { content: $eur; }
-.icon-gbp:before { content: $gbp; }
-.icon-dollar:before,
-.icon-usd:before { content: $usd; }
-.icon-rupee:before,
-.icon-inr:before { content: $inr; }
-.icon-cny:before,
-.icon-rmb:before,
-.icon-yen:before,
-.icon-jpy:before { content: $jpy; }
-.icon-ruble:before,
-.icon-rouble:before,
-.icon-rub:before { content: $rub; }
-.icon-won:before,
-.icon-krw:before { content: $krw; }
-.icon-bitcoin:before,
-.icon-btc:before { content: $btc; }
-.icon-file:before { content: $file; }
-.icon-file-text:before { content: $file-text; }
-.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; }
-.icon-youtube:before { content: $youtube; }
-.icon-xing:before { content: $xing; }
-.icon-xing-sign:before { content: $xing-sign; }
-.icon-youtube-play:before { content: $youtube-play; }
-.icon-dropbox:before { content: $dropbox; }
-.icon-stack-overflow:before { content: $stack-overflow; }
-.icon-instagram:before { content: $instagram; }
-.icon-flickr:before { content: $flickr; }
-.icon-adn:before { content: $adn; }
-.icon-bitbucket:before { content: $bitbucket; }
-.icon-bitbucket-square:before { content: $bitbucket-square; }
-.icon-tumblr:before { content: $tumblr; }
-.icon-tumblr-square:before { content: $tumblr-square; }
-.icon-long-arrow-down:before { content: $long-arrow-down; }
-.icon-long-arrow-up:before { content: $long-arrow-up; }
-.icon-long-arrow-left:before { content: $long-arrow-left; }
-.icon-long-arrow-right:before { content: $long-arrow-right; }
-.icon-apple:before { content: $apple; }
-.icon-windows:before { content: $windows; }
-.icon-android:before { content: $android; }
-.icon-linux:before { content: $linux; }
-.icon-dribbble:before { content: $dribbble; }
-.icon-skype:before { content: $skype; }
-.icon-foursquare:before { content: $foursquare; }
-.icon-trello:before { content: $trello; }
-.icon-female:before { content: $female; }
-.icon-male:before { content: $male; }
-.icon-gittip:before { content: $gittip; }
-.icon-sun:before { content: $sun; }
-.icon-moon:before { content: $moon; }
-.icon-archive:before { content: $archive; }
-.icon-bug:before { content: $bug; }
-.icon-vk:before { content: $vk; }
-.icon-weibo:before { content: $weibo; }
-.icon-renren:before { content: $renren; }
-.icon-pagelines:before { content: $pagelines; }
-.icon-stack-exchange:before { content: $stack-exchange; }
+.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: $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: $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: $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: $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: $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: $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: $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: $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: $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: $fa-icon-scissors; }
+.fa-icon-copy:before,
+.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: $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: $fa-icon-undo; }
+.fa-icon-legal:before,
+.fa-icon-gavel:before { content: $fa-icon-gavel; }
+.fa-icon-dashboard:before,
+.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: $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: $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: $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: $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-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: $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: $fa-icon-eur; }
+.fa-icon-gbp:before { content: $fa-icon-gbp; }
+.fa-icon-dollar:before,
+.fa-icon-usd:before { content: $fa-icon-usd; }
+.fa-icon-rupee:before,
+.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: $fa-icon-jpy; }
+.fa-icon-ruble:before,
+.fa-icon-rouble:before,
+.fa-icon-rub:before { content: $fa-icon-rub; }
+.fa-icon-won:before,
+.fa-icon-krw:before { content: $fa-icon-krw; }
+.fa-icon-bitcoin:before,
+.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/scss/_mixins.scss b/scss/_mixins.scss
index 7c7db2db3..4aae05ddc 100644
--- a/scss/_mixins.scss
+++ b/scss/_mixins.scss
@@ -1,38 +1,32 @@
 // Mixins
 // --------------------------
 
-@mixin icon($icon) {
-  @include icon-FontAwesome();
-  content: $icon;
+@mixin fa-icon-rotate($degrees, $rotation) {
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=$rotation);
+  -webkit-transform: rotate($degrees);
+     -moz-transform: rotate($degrees);
+      -ms-transform: rotate($degrees);
+       -o-transform: rotate($degrees);
+          transform: rotate($degrees);
 }
 
-@mixin icon-FontAwesome() {
-  *margin-right: .3em; // fixes ie7 issues
-  font-family: FontAwesome;
-  -webkit-font-smoothing: antialiased;
-  font-style: normal;
-  font-weight: normal;
-  text-decoration: inherit;
-  text-rendering: auto;
-  -moz-osx-font-smoothing: grayscale;
+@mixin fa-icon-flip($horiz, $vert) {
+  -webkit-transform: scale($horiz, $vert);
+     -moz-transform: scale($horiz, $vert);
+      -ms-transform: scale($horiz, $vert);
+       -o-transform: scale($horiz, $vert);
+          transform: scale($horiz, $vert);
 }
 
-@mixin border-radius($radius) {
-  -webkit-border-radius: $radius;
-  -moz-border-radius: $radius;
-  border-radius: $radius;
-}
-
-@mixin icon-stack($width: 2em, $height: 2em, $top-font-size: 1em, $base-font-size: 2em) {
-  .icon-stack {
+@mixin fa-icon-stack($width: 2em, $height: 2em, $top-font-size: 1em, $base-font-size: 2em) {
+  .fa-icon-stack {
     position: relative;
     display: inline-block;
     width: $width;
     height: $height;
     line-height: $width;
     vertical-align: -35%;
-    [class^="icon-"],
-    [class*=" icon-"] {
+    .fa-icon {
       position: absolute;
       display: block;
       width: 100%;
@@ -42,9 +36,9 @@
       *line-height: $height;
       text-align: center;
     }
-    .icon-stack-base {
+    .fa-icon-stack-base {
       font-size: $base-font-size;
-      *line-height: #{$height / $base-font-size}em;
+      *line-height: ($height / $base-font-size);
     }
   }
 }
diff --git a/scss/_path.scss b/scss/_path.scss
index 2976c4604..fd21c3515 100644
--- a/scss/_path.scss
+++ b/scss/_path.scss
@@ -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/scss/_variables.scss b/scss/_variables.scss
index 4706f3f3f..bfe4a66a1 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -1,738 +1,376 @@
 // Variables
 // --------------------------
 
-$FontAwesomePath: "../font" !default;
-$FontAwesomeVersion: "4.0.0" !default;
-$borderColor: #eeeeee !default;
-$iconMuted: #eeeeee !default;
-$iconLight: white !default;
-$iconDark: #333333 !default;
-$icons-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-asc: "\f0dd";
-
-$sort-desc: "\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-alt: "\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-alpha-asc: "\f15d";
-
-$sort-alpha-desc: "\f15e";
-
-$sort-amount-asc: "\f160";
-
-$sort-amount-desc: "\f161";
-
-$sort-numeric-asc: "\f162";
-
-$sort-numeric-desc: "\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-font-path:       "../fonts" !default;
+//$fa-font-path:       "//netdna.bootstrapcdn.com/font-awesome/4.0.0/font" !default; // for referencing Bootstrap CDN font files directly
+$fa-version:         "4.0.0" !default;
+$fa-border-color:    #eee !default;
+$fa-icon-muted:      #eee !default;
+$fa-icon-light:      #fff !default;
+$fa-icon-dark:       #333 !default;
+$fa-icon-li-width:   (30em / 14);
+
+$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/font-awesome.scss b/scss/font-awesome.scss
index 28c7d4dc6..82bc75bf8 100644
--- a/scss/font-awesome.scss
+++ b/scss/font-awesome.scss
@@ -28,6 +28,5 @@
 @import "mixins";
 @import "path";
 @import "core";
-@import "bootstrap";
 @import "extras";
 @import "icons";
diff --git a/src/Makefile b/src/Makefile
index 77c129335..6aef840ed 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,9 +4,11 @@ PATH := ../node_modules/.bin:$(PATH)
 
 FA_ROOT_DIRECTORY = assets/font-awesome
 FA_LESS_DIRECTORY = assets/font-awesome/less
+FA_SCSS_DIRECTORY = assets/font-awesome/scss
 FA_CSS_DIRECTORY = assets/font-awesome/css
 
 FA_LESS_MODERN = ${FA_LESS_DIRECTORY}/font-awesome.less
+FA_SCSS_MODERN = ${FA_SCSS_DIRECTORY}/font-awesome.scss
 
 FA_CSS_MODERN = ${FA_CSS_DIRECTORY}/font-awesome.css
 FA_CSS_MODERN_MIN = ${FA_CSS_DIRECTORY}/font-awesome.min.css
@@ -20,8 +22,11 @@ SITE_CSS_MIN = ${SITE_CSS_DIRECTORY}/site.css
 build:
 	@echo "Compiling Less files"
 	@mkdir -p ${FA_CSS_DIRECTORY}
+
 	lessc ${FA_LESS_MODERN} > ${FA_CSS_MODERN}
 	lessc --compress ${FA_LESS_MODERN} > ${FA_CSS_MODERN_MIN}
+#	sass ${FA_SCSS_MODERN} ${FA_CSS_MODERN}
+
 	lessc --compress ${SITE_LESS} > ${SITE_CSS_MIN}
 	cp -r ${FA_ROOT_DIRECTORY}/* ../
 	cd assets && zip -r9 font-awesome.zip font-awesome
diff --git a/src/assets/font-awesome/fonts/FontAwesome.otf b/src/assets/font-awesome/fonts/FontAwesome.otf
index a767862a8..152e250b9 100644
Binary files a/src/assets/font-awesome/fonts/FontAwesome.otf and b/src/assets/font-awesome/fonts/FontAwesome.otf differ
diff --git a/src/assets/font-awesome/less/core.less b/src/assets/font-awesome/less/core.less
index 8fdb31ad9..cf0ee677d 100644
--- a/src/assets/font-awesome/less/core.less
+++ b/src/assets/font-awesome/less/core.less
@@ -51,6 +51,7 @@
   }
 }
 
+
 // allows usage of the hide class directly on font awesome icons
 .{{ site.fontawesome.css_prefix }}.hide { display: none; }
 
@@ -68,6 +69,7 @@
   border-radius: 3px;
 }
 
+
 // Icon Sizes
 // -------------------------
 
@@ -92,7 +94,6 @@
     border-radius: 6px;
   }
 }
-
 .{{ site.fontawesome.css_prefix }}-5x {
   font-size: 5em;
   &.{{ site.fontawesome.css_prefix }}-border {
diff --git a/src/assets/font-awesome/scss/_bootstrap.scss b/src/assets/font-awesome/scss/_bootstrap.scss
deleted file mode 100644
index d04665529..000000000
--- a/src/assets/font-awesome/scss/_bootstrap.scss
+++ /dev/null
@@ -1,84 +0,0 @@
-/* BOOTSTRAP SPECIFIC CLASSES
- * -------------------------- */
-
-/* Bootstrap 2.0 sprites.less reset */
-[class^="icon-"],
-[class*=" icon-"] {
-  display: inline;
-  width: auto;
-  height: auto;
-  margin-top: 0;
-  line-height: normal;
-  vertical-align: baseline;
-  background-image: none;
-  background-position: 0 0;
-  background-repeat: repeat;
-}
-
-/* more sprites.less reset */
-.icon-white,
-.nav-pills > .active > a > [class^="icon-"],
-.nav-pills > .active > a > [class*=" icon-"],
-.nav-list > .active > a > [class^="icon-"],
-.nav-list > .active > a > [class*=" icon-"],
-.navbar-inverse .nav > .active > a > [class^="icon-"],
-.navbar-inverse .nav > .active > a > [class*=" icon-"],
-.dropdown-menu > li > a:hover > [class^="icon-"],
-.dropdown-menu > li > a:hover > [class*=" icon-"],
-.dropdown-menu > .active > a > [class^="icon-"],
-.dropdown-menu > .active > a > [class*=" icon-"],
-.dropdown-submenu:hover > a > [class^="icon-"],
-.dropdown-submenu:hover > a > [class*=" icon-"] {
-  background-image: none;
-}
-
-
-/* keeps Bootstrap styles with and without icons the same */
-.btn, .nav {
-  [class^="icon-"],
-  [class*=" icon-"] {
-    //    display: inline;
-    &.icon-large { line-height: .9em; }
-    &.icon-spin { display: inline-block; }
-  }
-}
-.nav-tabs, .nav-pills {
-  [class^="icon-"],
-  [class*=" icon-"] {
-    &, &.icon-large { line-height: .9em; }
-  }
-}
-.btn {
-  [class^="icon-"],
-  [class*=" icon-"] {
-    &.pull-left, &.pull-right {
-      &.icon-2x { margin-top: .18em; }
-    }
-    &.icon-spin.icon-large { line-height: .8em; }
-  }
-}
-.btn.btn-small {
-  [class^="icon-"],
-  [class*=" icon-"] {
-    &.pull-left, &.pull-right {
-      &.icon-2x { margin-top: .25em; }
-    }
-  }
-}
-.btn.btn-large {
-  [class^="icon-"],
-  [class*=" icon-"] {
-    margin-top: 0; // overrides bootstrap default
-    &.pull-left, &.pull-right {
-      &.icon-2x { margin-top: .05em; }
-    }
-    &.pull-left.icon-2x { margin-right: .2em; }
-    &.pull-right.icon-2x { margin-left: .2em; }
-  }
-}
-
-/* Fixes alignment in nav lists */
-.nav-list [class^="icon-"],
-.nav-list [class*=" icon-"] {
-  line-height: inherit;
-}
diff --git a/src/assets/font-awesome/scss/_core.scss b/src/assets/font-awesome/scss/_core.scss
index c77213fb6..81e93fff2 100644
--- a/src/assets/font-awesome/scss/_core.scss
+++ b/src/assets/font-awesome/scss/_core.scss
@@ -1,113 +1,104 @@
+---
+---
 /* FONT AWESOME CORE
  * -------------------------- */
 
-[class^="icon-"],
-[class*=" icon-"] {
-  @include icon-FontAwesome();
-}
-
-[class^="icon-"]:before,
-[class*=" icon-"]:before {
+.{{ site.fontawesome.css_prefix }} {
   display: inline-block;
-  text-decoration: inherit;
-  speak: none;
+  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 */
-.icon-large:before {
-  font-size: (4em/3);
-  vertical-align: -10%;
+.{{ site.fontawesome.css_prefix }}-lg {
+  font-size: (4em / 3);
+  line-height: (3em / 4);
+  vertical-align: -15%;
 }
-
-/* makes sure icons active on rollover in links */
-a {
-  [class^="icon-"],
-  [class*=" icon-"] {
-    display: inline;
+/* increased font size for icon-lg */
+.{{ site.fontawesome.css_prefix }}-fixed-width {
+  width: (16em / 14);
+  padding-right: (4em / 14);
+  text-align: right;
+  &.{{ site.fontawesome.css_prefix }}-lg {
+    width: (20em / 14);
   }
 }
 
-/* increased font size for icon-large */
-[class^="icon-"],
-[class*=" icon-"] {
-  &.icon-fixed-width {
-    display: inline-block;
-    width: (16em/14);
-    padding-right: (4em/14);
-    text-align: right;
-    &.icon-large {
-      width: (20em/14);
-    }
-  }
-}
 
-.icons-ul {
+// Icon UL & LI
+// -------------------------
+
+.{{ 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; }
-
-  .icon-li {
-    position: absolute;
-    left: -$icons-li-width;
-    width: $icons-li-width;
-    line-height: inherit;
-    text-align: center;
+}
+.{{ site.fontawesome.css_prefix }}-li {
+  position: absolute;
+  left: -$fa-icon-li-width;
+  width: $fa-icon-li-width;
+  top: (2em / 14);
+  text-align: center;
+  &.{{ site.fontawesome.css_prefix }}-lg {
+    left: -$fa-icon-li-width + (4em / 14);
   }
 }
 
+
 // allows usage of the hide class directly on font awesome icons
-[class^="icon-"],
-[class*=" icon-"] {
-  &.hide {
-    display: none;
-  }
-}
+.{{ site.fontawesome.css_prefix }}.hide { display: none; }
+
+.{{ 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-muted { color: $iconMuted; }
-.icon-light { color: $iconLight; }
-.icon-dark { color: $iconDark; }
 
 // Icon Borders
 // -------------------------
 
-.icon-border {
+.{{ site.fontawesome.css_prefix }}-border {
   padding: .2em .25em .15em;
-  border: solid 1px $borderColor;
-  @include border-radius(3px);
+  border: solid 1px $fa-border-color;
+  border-radius: 3px;
 }
 
+
 // Icon Sizes
 // -------------------------
 
-.icon-2x {
+.{{ site.fontawesome.css_prefix }}-2x {
   font-size: 2em;
-  &.icon-border {
+  &.{{ site.fontawesome.css_prefix }}-border {
     border-width: 2px;
-    @include border-radius(4px);
+    border-radius: 4px;
   }
 }
-.icon-3x {
+.{{ site.fontawesome.css_prefix }}-3x {
   font-size: 3em;
-  &.icon-border {
+  &.{{ site.fontawesome.css_prefix }}-border {
     border-width: 3px;
-    @include border-radius(5px);
+    border-radius: 5px;
   }
 }
-.icon-4x {
+.{{ site.fontawesome.css_prefix }}-4x {
   font-size: 4em;
-  &.icon-border {
+  &.{{ site.fontawesome.css_prefix }}-border {
     border-width: 4px;
-    @include border-radius(6px);
+    border-radius: 6px;
   }
 }
-
-.icon-5x {
+.{{ site.fontawesome.css_prefix }}-5x {
   font-size: 5em;
-  &.icon-border {
+  &.{{ site.fontawesome.css_prefix }}-border {
     border-width: 5px;
-    @include border-radius(7px);
+    border-radius: 7px;
   }
 }
 
@@ -119,12 +110,7 @@ a {
 .pull-right { float: right; }
 .pull-left { float: left; }
 
-[class^="icon-"],
-[class*=" icon-"] {
-  &.pull-left {
-    margin-right: .3em;
-  }
-  &.pull-right {
-    margin-left: .3em;
-  }
+.{{ site.fontawesome.css_prefix }} {
+  &.pull-left { margin-right: .3em; }
+  &.pull-right { margin-left: .3em; }
 }
diff --git a/src/assets/font-awesome/scss/_extras.scss b/src/assets/font-awesome/scss/_extras.scss
index 86e46e987..40cfbdf7b 100644
--- a/src/assets/font-awesome/scss/_extras.scss
+++ b/src/assets/font-awesome/scss/_extras.scss
@@ -1,25 +1,19 @@
+---
+---
 /* EXTRAS
  * -------------------------- */
 
 /* Stacked and layered icon */
-@include icon-stack();
+@include {{ site.fontawesome.css_prefix }}-stack();
 
 /* Animated rotating icon */
-.icon-spin {
-  display: inline-block;
+.{{ site.fontawesome.css_prefix }}-spin {
   -webkit-animation: spin 2s infinite linear;
   -moz-animation: spin 2s infinite linear;
   -o-animation: spin 2s infinite linear;
   animation: spin 2s infinite linear;
 }
 
-/* Prevent stack and spinners from being taken inline when inside a link */
-a .icon-stack,
-a .icon-spin {
-  display: inline-block;
-  text-decoration: none;
-}
-
 @-moz-keyframes spin {
   0% { -moz-transform: rotate(0deg); }
   100% { -moz-transform: rotate(359deg); }
@@ -41,53 +35,13 @@ a .icon-spin {
   100% { transform: rotate(359deg); }
 }
 
-/* Icon rotations and mirroring */
-.icon-rotate-90:before {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
-  -webkit-transform: rotate(90deg);
-  -moz-transform: rotate(90deg);
-  -ms-transform: rotate(90deg);
-  -o-transform: rotate(90deg);
-  transform: rotate(90deg);
-}
 
-.icon-rotate-180:before {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
-  -webkit-transform: rotate(180deg);
-  -moz-transform: rotate(180deg);
-  -ms-transform: rotate(180deg);
-  -o-transform: rotate(180deg);
-  transform: rotate(180deg);
-}
+// Icon rotations & flipping
+// -------------------------
 
-.icon-rotate-270:before {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
-  -webkit-transform: rotate(270deg);
-  -moz-transform: rotate(270deg);
-  -ms-transform: rotate(270deg);
-  -o-transform: rotate(270deg);
-  transform: rotate(270deg);
-}
+.{{ site.fontawesome.css_prefix }}-rotate-90  { @include {{ site.fontawesome.css_prefix }}-rotate(90deg, 1);  }
+.{{ site.fontawesome.css_prefix }}-rotate-180 { @include {{ site.fontawesome.css_prefix }}-rotate(180deg, 2); }
+.{{ site.fontawesome.css_prefix }}-rotate-270 { @include {{ site.fontawesome.css_prefix }}-rotate(270deg, 3); }
 
-.icon-flip-horizontal:before {
-  -webkit-transform: scale(-1, 1);
-  -moz-transform: scale(-1, 1);
-  -ms-transform: scale(-1, 1);
-  -o-transform: scale(-1, 1);
-  transform: scale(-1, 1);
-}
-
-.icon-flip-vertical:before {
-  -webkit-transform: scale(1, -1);
-  -moz-transform: scale(1, -1);
-  -ms-transform: scale(1, -1);
-  -o-transform: scale(1, -1);
-  transform: scale(1, -1);
-}
-
-/* ensure rotation occurs inside anchor tags */
-a {
-  .icon-rotate-90, .icon-rotate-180, .icon-rotate-270, .icon-flip-horizontal, .icon-flip-vertical {
-    &:before { display: inline-block; }
-  }
-}
+.{{ site.fontawesome.css_prefix }}-flip-horizontal { @include {{ site.fontawesome.css_prefix }}-flip(-1, 1); }
+.{{ site.fontawesome.css_prefix }}-flip-vertical   { @include {{ site.fontawesome.css_prefix }}-flip(1, -1); }
diff --git a/src/assets/font-awesome/scss/_icons.scss b/src/assets/font-awesome/scss/_icons.scss
index 5febd993f..468bfd561 100644
--- a/src/assets/font-awesome/scss/_icons.scss
+++ b/src/assets/font-awesome/scss/_icons.scss
@@ -1,7 +1,7 @@
 ---
 ---
 /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
- * readers do not read off random characters that represent icons */
+   readers do not read off random characters that represent icons */
 {% for icon in icons %}{% for alias in icon.aliases %}
-.icon-{{ alias }}:before,{% endfor %}
-.icon-{{ icon.id }}:before { content: ${{ icon.id }}; }{% endfor %}
+.{{ site.fontawesome.css_prefix }}-{{ alias }}:before,{% endfor %}
+.{{ site.fontawesome.css_prefix }}-{{ icon.id }}:before { content: ${{ site.fontawesome.css_prefix }}-{{ icon.id }}; }{% endfor %}
diff --git a/src/assets/font-awesome/scss/_mixins.scss b/src/assets/font-awesome/scss/_mixins.scss
index 7c7db2db3..102354546 100644
--- a/src/assets/font-awesome/scss/_mixins.scss
+++ b/src/assets/font-awesome/scss/_mixins.scss
@@ -1,38 +1,34 @@
+---
+---
 // Mixins
 // --------------------------
 
-@mixin icon($icon) {
-  @include icon-FontAwesome();
-  content: $icon;
+@mixin {{ site.fontawesome.css_prefix }}-rotate($degrees, $rotation) {
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=$rotation);
+  -webkit-transform: rotate($degrees);
+     -moz-transform: rotate($degrees);
+      -ms-transform: rotate($degrees);
+       -o-transform: rotate($degrees);
+          transform: rotate($degrees);
 }
 
-@mixin icon-FontAwesome() {
-  *margin-right: .3em; // fixes ie7 issues
-  font-family: FontAwesome;
-  -webkit-font-smoothing: antialiased;
-  font-style: normal;
-  font-weight: normal;
-  text-decoration: inherit;
-  text-rendering: auto;
-  -moz-osx-font-smoothing: grayscale;
+@mixin {{ site.fontawesome.css_prefix }}-flip($horiz, $vert) {
+  -webkit-transform: scale($horiz, $vert);
+     -moz-transform: scale($horiz, $vert);
+      -ms-transform: scale($horiz, $vert);
+       -o-transform: scale($horiz, $vert);
+          transform: scale($horiz, $vert);
 }
 
-@mixin border-radius($radius) {
-  -webkit-border-radius: $radius;
-  -moz-border-radius: $radius;
-  border-radius: $radius;
-}
-
-@mixin icon-stack($width: 2em, $height: 2em, $top-font-size: 1em, $base-font-size: 2em) {
-  .icon-stack {
+@mixin {{ 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;
     width: $width;
     height: $height;
     line-height: $width;
     vertical-align: -35%;
-    [class^="icon-"],
-    [class*=" icon-"] {
+    .{{ site.fontawesome.css_prefix }} {
       position: absolute;
       display: block;
       width: 100%;
@@ -42,9 +38,9 @@
       *line-height: $height;
       text-align: center;
     }
-    .icon-stack-base {
+    .{{ site.fontawesome.css_prefix }}-stack-base {
       font-size: $base-font-size;
-      *line-height: #{$height / $base-font-size}em;
+      *line-height: ($height / $base-font-size);
     }
   }
 }
diff --git a/src/assets/font-awesome/scss/_path.scss b/src/assets/font-awesome/scss/_path.scss
index 2976c4604..fd21c3515 100644
--- a/src/assets/font-awesome/scss/_path.scss
+++ b/src/assets/font-awesome/scss/_path.scss
@@ -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/scss/_variables.scss b/src/assets/font-awesome/scss/_variables.scss
index 30bab220a..25d0ea1e2 100644
--- a/src/assets/font-awesome/scss/_variables.scss
+++ b/src/assets/font-awesome/scss/_variables.scss
@@ -3,14 +3,14 @@
 // Variables
 // --------------------------
 
-$FontAwesomePath: "../font" !default;
-$FontAwesomeVersion: "{{ site.fontawesome.version }}" !default;
-$borderColor: #eeeeee !default;
-$iconMuted: #eeeeee !default;
-$iconLight: white !default;
-$iconDark: #333333 !default;
-$icons-li-width: (30em/14);
+$fa-font-path:       "../fonts" !default;
+//$fa-font-path:       "//netdna.bootstrapcdn.com/font-awesome/{{ site.fontawesome.version}}/font" !default; // for referencing Bootstrap CDN font files directly
+$fa-version:         "{{ site.fontawesome.version }}" !default;
+$fa-border-color:    #eee !default;
+$fa-icon-muted:      #eee !default;
+$fa-icon-light:      #fff !default;
+$fa-icon-dark:       #333 !default;
+$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/font-awesome/scss/font-awesome.scss b/src/assets/font-awesome/scss/font-awesome.scss
index c7507de06..fa202c72d 100644
--- a/src/assets/font-awesome/scss/font-awesome.scss
+++ b/src/assets/font-awesome/scss/font-awesome.scss
@@ -6,6 +6,5 @@
 @import "mixins";
 @import "path";
 @import "core";
-@import "bootstrap";
 @import "extras";
 @import "icons";