diff --git a/_config.yml b/_config.yml
index 19cb92816..8ba58ff2e 100644
--- a/_config.yml
+++ b/_config.yml
@@ -26,8 +26,8 @@ font_awesome:
     url:          https://github.com/FortAwesome/Font-Awesome
     project:      Font-Awesome
     org:          FortAwesome
-  icon_count:     281
-  new_icon_count: 32
+  icon_count:     295
+  new_icon_count: 47
 
 bootstrap:
   version:        2.3.1
diff --git a/build/_includes/icons/directional.html b/build/_includes/icons/directional.html
index 533e23881..3af395abf 100644
--- a/build/_includes/icons/directional.html
+++ b/build/_includes/icons/directional.html
@@ -28,24 +28,26 @@
   </div>
   <div class="span3">
     <ul class="the-icons">
+      <li><a href="{{ site.baseurl }}icon/chevron-sign-left"><i class="icon-chevron-sign-left"></i> icon-chevron-sign-left</a></li>
+      <li><a href="{{ site.baseurl }}icon/chevron-sign-right"><i class="icon-chevron-sign-right"></i> icon-chevron-sign-right</a></li>
+      <li><a href="{{ site.baseurl }}icon/chevron-sign-up"><i class="icon-chevron-sign-up"></i> icon-chevron-sign-up</a></li>
+      <li><a href="{{ site.baseurl }}icon/chevron-sign-down"><i class="icon-chevron-sign-down"></i> icon-chevron-sign-down</a></li>
       <li><a href="{{ site.baseurl }}icon/circle-arrow-down"><i class="icon-circle-arrow-down"></i> icon-circle-arrow-down</a></li>
       <li><a href="{{ site.baseurl }}icon/circle-arrow-left"><i class="icon-circle-arrow-left"></i> icon-circle-arrow-left</a></li>
       <li><a href="{{ site.baseurl }}icon/circle-arrow-right"><i class="icon-circle-arrow-right"></i> icon-circle-arrow-right</a></li>
       <li><a href="{{ site.baseurl }}icon/circle-arrow-up"><i class="icon-circle-arrow-up"></i> icon-circle-arrow-up</a></li>
-      <li><a href="{{ site.baseurl }}icon/double-angle-left"><i class="icon-double-angle-left"></i> icon-double-angle-left</a></li>
-      <li><a href="{{ site.baseurl }}icon/double-angle-right"><i class="icon-double-angle-right"></i> icon-double-angle-right</a></li>
-      <li><a href="{{ site.baseurl }}icon/double-angle-up"><i class="icon-double-angle-up"></i> icon-double-angle-up</a></li>
-      <li><a href="{{ site.baseurl }}icon/double-angle-down"><i class="icon-double-angle-down"></i> icon-double-angle-down</a></li>
     </ul>
   </div>
   <div class="span3">
     <ul class="the-icons">
+      <li><a href="{{ site.baseurl }}icon/double-angle-left"><i class="icon-double-angle-left"></i> icon-double-angle-left</a></li>
+      <li><a href="{{ site.baseurl }}icon/double-angle-right"><i class="icon-double-angle-right"></i> icon-double-angle-right</a></li>
+      <li><a href="{{ site.baseurl }}icon/double-angle-up"><i class="icon-double-angle-up"></i> icon-double-angle-up</a></li>
+      <li><a href="{{ site.baseurl }}icon/double-angle-down"><i class="icon-double-angle-down"></i> icon-double-angle-down</a></li>
       <li><a href="{{ site.baseurl }}icon/hand-down"><i class="icon-hand-down"></i> icon-hand-down</a></li>
       <li><a href="{{ site.baseurl }}icon/hand-left"><i class="icon-hand-left"></i> icon-hand-left</a></li>
       <li><a href="{{ site.baseurl }}icon/hand-right"><i class="icon-hand-right"></i> icon-hand-right</a></li>
       <li><a href="{{ site.baseurl }}icon/hand-up"><i class="icon-hand-up"></i> icon-hand-up</a></li>
-      <li><a href="{{ site.baseurl }}icon/circle"><i class="icon-circle"></i> icon-circle</a></li>
-      <li><a href="{{ site.baseurl }}icon/circle-blank"><i class="icon-circle-blank"></i> icon-circle-blank</a></li>
     </ul>
   </div>
 </section>
diff --git a/build/_includes/icons/new.html b/build/_includes/icons/new.html
index 2984f7fb6..3779d079a 100644
--- a/build/_includes/icons/new.html
+++ b/build/_includes/icons/new.html
@@ -17,7 +17,7 @@
   </div>
   {% endif %}
 
-  <div class="row">
+  <div class="row margin-top">
     <div class="span3">
       <ul class="the-icons">
         <li><a href="{{ site.baseurl }}icon/expand-alt"><i class="icon-expand-alt"></i> icon-expand-alt</a></li>
@@ -33,6 +33,10 @@
         <li><a href="{{ site.baseurl }}icon/code"><i class="icon-code"></i> icon-code</a></li>
         <li><a href="{{ site.baseurl }}icon/share-alt"><i class="icon-mail-forward"></i> icon-mail-forward <span class="muted">(alias)</span></a></li>
         <li><a href="{{ site.baseurl }}icon/reply"><i class="icon-mail-reply"></i> icon-mail-reply <span class="muted">(alias)</span></a></li>
+      </ul>
+    </div>
+    <div class="span3">
+      <ul class="the-icons">
         <li><a href="{{ site.baseurl }}icon/reply-all"><i class="icon-reply-all"></i> icon-reply-all</a></li>
         <li><a href="{{ site.baseurl }}icon/reply-all"><i class="icon-mail-reply-all"></i> icon-mail-reply-all <span class="muted">(alias)</span></a></li>
         <li><a href="{{ site.baseurl }}icon/star-half-empty"><i class="icon-star-half-empty"></i> icon-star-half-empty</a></li>
@@ -46,6 +50,10 @@
         <li><a href="{{ site.baseurl }}icon/info"><i class="icon-info"></i> icon-info</a></li>
         <li><a href="{{ site.baseurl }}icon/exclamation"><i class="icon-exclamation"></i> icon-exclamation</a></li>
         <li><a href="{{ site.baseurl }}icon/superscript"><i class="icon-superscript"></i> icon-superscript</a></li>
+      </ul>
+    </div>
+    <div class="span3">
+      <ul class="the-icons">
         <li><a href="{{ site.baseurl }}icon/subscript"><i class="icon-subscript"></i> icon-subscript</a></li>
         <li><a href="{{ site.baseurl }}icon/eraser"><i class="icon-eraser"></i> icon-eraser</a></li>
         <li><a href="{{ site.baseurl }}icon/puzzle-piece"><i class="icon-puzzle-piece"></i> icon-puzzle-piece</a></li>
@@ -59,6 +67,10 @@
         <li><a href="{{ site.baseurl }}icon/chevron-sign-left"><i class="icon-chevron-sign-left"></i> icon-chevron-sign-left</a></li>
         <li><a href="{{ site.baseurl }}icon/chevron-sign-right"><i class="icon-chevron-sign-right"></i> icon-chevron-sign-right</a></li>
         <li><a href="{{ site.baseurl }}icon/chevron-sign-up"><i class="icon-chevron-sign-up"></i> icon-chevron-sign-up</a></li>
+      </ul>
+    </div>
+    <div class="span3">
+      <ul class="the-icons">
         <li><a href="{{ site.baseurl }}icon/chevron-sign-down"><i class="icon-chevron-sign-down"></i> icon-chevron-sign-down</a></li>
         <li><a href="{{ site.baseurl }}icon/html5"><i class="icon-html5"></i> icon-html5</a></li>
         <li><a href="{{ site.baseurl }}icon/css3"><i class="icon-css3"></i> icon-css3</a></li>
@@ -75,3 +87,5 @@
     </div>
   </div>
 </section>
+
+
diff --git a/build/_includes/icons/text-editor.html b/build/_includes/icons/text-editor.html
index 33df76889..ecc6db356 100644
--- a/build/_includes/icons/text-editor.html
+++ b/build/_includes/icons/text-editor.html
@@ -12,11 +12,11 @@
       <li><a href="{{ site.baseurl }}icon/save"><i class="icon-save"></i> icon-save</a></li>
       <li><a href="{{ site.baseurl }}icon/undo"><i class="icon-undo"></i> icon-undo</a></li>
       <li><a href="{{ site.baseurl }}icon/repeat"><i class="icon-repeat"></i> icon-repeat</a></li>
+      <li><a href="{{ site.baseurl }}icon/text-height"><i class="icon-text-height"></i> icon-text-height</a></li>
     </ul>
   </div>
   <div class="span3">
     <ul class="the-icons">
-      <li><a href="{{ site.baseurl }}icon/text-height"><i class="icon-text-height"></i> icon-text-height</a></li>
       <li><a href="{{ site.baseurl }}icon/text-width"><i class="icon-text-width"></i> icon-text-width</a></li>
       <li><a href="{{ site.baseurl }}icon/align-left"><i class="icon-align-left"></i> icon-align-left</a></li>
       <li><a href="{{ site.baseurl }}icon/align-center"><i class="icon-align-center"></i> icon-align-center</a></li>
@@ -24,16 +24,19 @@
       <li><a href="{{ site.baseurl }}icon/align-justify"><i class="icon-align-justify"></i> icon-align-justify</a></li>
       <li><a href="{{ site.baseurl }}icon/indent-left"><i class="icon-indent-left"></i> icon-indent-left</a></li>
       <li><a href="{{ site.baseurl }}icon/indent-right"><i class="icon-indent-right"></i> icon-indent-right</a></li>
+      <li><a href="{{ site.baseurl }}icon/font"><i class="icon-font"></i> icon-font</a></li>
+      <li><a href="{{ site.baseurl }}icon/bold"><i class="icon-bold"></i> icon-bold</a></li>
     </ul>
   </div>
   <div class="span3">
     <ul class="the-icons">
-      <li><a href="{{ site.baseurl }}icon/font"><i class="icon-font"></i> icon-font</a></li>
-      <li><a href="{{ site.baseurl }}icon/bold"><i class="icon-bold"></i> icon-bold</a></li>
       <li><a href="{{ site.baseurl }}icon/italic"><i class="icon-italic"></i> icon-italic</a></li>
       <li><a href="{{ site.baseurl }}icon/strikethrough"><i class="icon-strikethrough"></i> icon-strikethrough</a></li>
       <li><a href="{{ site.baseurl }}icon/underline"><i class="icon-underline"></i> icon-underline</a></li>
+      <li><a href="{{ site.baseurl }}icon/superscript"><i class="icon-superscript"></i> icon-superscript</a></li>
+      <li><a href="{{ site.baseurl }}icon/subscript"><i class="icon-subscript"></i> icon-subscript</a></li>
       <li><a href="{{ site.baseurl }}icon/link"><i class="icon-link"></i> icon-link</a></li>
+      <li><a href="{{ site.baseurl }}icon/unlink"><i class="icon-unlink"></i> icon-unlink</a></li>
       <li><a href="{{ site.baseurl }}icon/paper-clip"><i class="icon-paper-clip"></i> icon-paper-clip</a></li>
       <li><a href="{{ site.baseurl }}icon/columns"><i class="icon-columns"></i> icon-columns</a></li>
     </ul>
diff --git a/build/_includes/icons/video-player.html b/build/_includes/icons/video-player.html
index fb3b8f455..70fe8187f 100644
--- a/build/_includes/icons/video-player.html
+++ b/build/_includes/icons/video-player.html
@@ -5,24 +5,25 @@
   <div class="span3">
     <ul class="the-icons">
       <li><a href="{{ site.baseurl }}icon/play-circle"><i class="icon-play-circle"></i> icon-play-circle</a></li>
+      <li><a href="{{ site.baseurl }}icon/play-sign"><i class="icon-play-sign"></i> icon-play-sign</a></li>
       <li><a href="{{ site.baseurl }}icon/play"><i class="icon-play"></i> icon-play</a></li>
       <li><a href="{{ site.baseurl }}icon/pause"><i class="icon-pause"></i> icon-pause</a></li>
-      <li><a href="{{ site.baseurl }}icon/stop"><i class="icon-stop"></i> icon-stop</a></li>
     </ul>
   </div>
   <div class="span3">
     <ul class="the-icons">
-      <li><a href="{{ site.baseurl }}icon/step-backward"><i class="icon-step-backward"></i> icon-step-backward</a></li>
-      <li><a href="{{ site.baseurl }}icon/fast-backward"><i class="icon-fast-backward"></i> icon-fast-backward</a></li>
+      <li><a href="{{ site.baseurl }}icon/stop"><i class="icon-stop"></i> icon-stop</a></li>
+      <li><a href="{{ site.baseurl }}icon/eject"><i class="icon-eject"></i> icon-eject</a></li>
       <li><a href="{{ site.baseurl }}icon/backward"><i class="icon-backward"></i> icon-backward</a></li>
       <li><a href="{{ site.baseurl }}icon/forward"><i class="icon-forward"></i> icon-forward</a></li>
     </ul>
   </div>
   <div class="span3">
     <ul class="the-icons">
+      <li><a href="{{ site.baseurl }}icon/fast-backward"><i class="icon-fast-backward"></i> icon-fast-backward</a></li>
       <li><a href="{{ site.baseurl }}icon/fast-forward"><i class="icon-fast-forward"></i> icon-fast-forward</a></li>
+      <li><a href="{{ site.baseurl }}icon/step-backward"><i class="icon-step-backward"></i> icon-step-backward</a></li>
       <li><a href="{{ site.baseurl }}icon/step-forward"><i class="icon-step-forward"></i> icon-step-forward</a></li>
-      <li><a href="{{ site.baseurl }}icon/eject"><i class="icon-eject"></i> icon-eject</a></li>
     </ul>
   </div>
   <div class="span3">
diff --git a/build/_includes/icons/web-app.html b/build/_includes/icons/web-app.html
index 5ad9129c2..46184e127 100644
--- a/build/_includes/icons/web-app.html
+++ b/build/_includes/icons/web-app.html
@@ -7,52 +7,64 @@
   <div class="span3">
     <ul class="the-icons">
       <li><a href="{{ site.baseurl }}icon/adjust"><i class="icon-adjust"></i> icon-adjust</a></li>
+      <li><a href="{{ site.baseurl }}icon/anchor"><i class="icon-anchor"></i> icon-anchor</a></li>
       <li><a href="{{ site.baseurl }}icon/asterisk"><i class="icon-asterisk"></i> icon-asterisk</a></li>
       <li><a href="{{ site.baseurl }}icon/ban-circle"><i class="icon-ban-circle"></i> icon-ban-circle</a></li>
       <li><a href="{{ site.baseurl }}icon/bar-chart"><i class="icon-bar-chart"></i> icon-bar-chart</a></li>
       <li><a href="{{ site.baseurl }}icon/barcode"><i class="icon-barcode"></i> icon-barcode</a></li>
       <li><a href="{{ site.baseurl }}icon/beaker"><i class="icon-beaker"></i> icon-beaker</a></li>
       <li><a href="{{ site.baseurl }}icon/beer"><i class="icon-beer"></i> icon-beer</a></li>
-      <li><a href="{{ site.baseurl }}icon/bell"><i class="icon-bell"></i> icon-bell</a></li>
       <li><a href="{{ site.baseurl }}icon/bell-alt"><i class="icon-bell-alt"></i> icon-bell-alt</a></li>
+      <li><a href="{{ site.baseurl }}icon/bell"><i class="icon-bell"></i> icon-bell</a></li>
       <li><a href="{{ site.baseurl }}icon/bolt"><i class="icon-bolt"></i> icon-bolt</a></li>
       <li><a href="{{ site.baseurl }}icon/book"><i class="icon-book"></i> icon-book</a></li>
-      <li><a href="{{ site.baseurl }}icon/bookmark"><i class="icon-bookmark"></i> icon-bookmark</a></li>
       <li><a href="{{ site.baseurl }}icon/bookmark-empty"><i class="icon-bookmark-empty"></i> icon-bookmark-empty</a></li>
+      <li><a href="{{ site.baseurl }}icon/bookmark"><i class="icon-bookmark"></i> icon-bookmark</a></li>
       <li><a href="{{ site.baseurl }}icon/briefcase"><i class="icon-briefcase"></i> icon-briefcase</a></li>
       <li><a href="{{ site.baseurl }}icon/bullhorn"><i class="icon-bullhorn"></i> icon-bullhorn</a></li>
+      <li><a href="{{ site.baseurl }}icon/bullseye"><i class="icon-bullseye"></i> icon-bullseye</a></li>
+      <li><a href="{{ site.baseurl }}icon/calendar-empty"><i class="icon-calendar-empty"></i> icon-calendar-empty</a></li>
       <li><a href="{{ site.baseurl }}icon/calendar"><i class="icon-calendar"></i> icon-calendar</a></li>
-      <li><a href="{{ site.baseurl }}icon/camera"><i class="icon-camera"></i> icon-camera</a></li>
       <li><a href="{{ site.baseurl }}icon/camera-retro"><i class="icon-camera-retro"></i> icon-camera-retro</a></li>
+      <li><a href="{{ site.baseurl }}icon/camera"><i class="icon-camera"></i> icon-camera</a></li>
       <li><a href="{{ site.baseurl }}icon/certificate"><i class="icon-certificate"></i> icon-certificate</a></li>
-      <li><a href="{{ site.baseurl }}icon/check"><i class="icon-check"></i> icon-check</a></li>
       <li><a href="{{ site.baseurl }}icon/check-empty"><i class="icon-check-empty"></i> icon-check-empty</a></li>
-      <li><a href="{{ site.baseurl }}icon/circle"><i class="icon-circle"></i> icon-circle</a></li>
+      <li><a href="{{ site.baseurl }}icon/check"><i class="icon-check"></i> icon-check</a></li>
       <li><a href="{{ site.baseurl }}icon/circle-blank"><i class="icon-circle-blank"></i> icon-circle-blank</a></li>
-      <li><a href="{{ site.baseurl }}icon/cloud"><i class="icon-cloud"></i> icon-cloud</a></li>
+      <li><a href="{{ site.baseurl }}icon/circle"><i class="icon-circle"></i> icon-circle</a></li>
       <li><a href="{{ site.baseurl }}icon/cloud-download"><i class="icon-cloud-download"></i> icon-cloud-download</a></li>
       <li><a href="{{ site.baseurl }}icon/cloud-upload"><i class="icon-cloud-upload"></i> icon-cloud-upload</a></li>
+      <li><a href="{{ site.baseurl }}icon/cloud"><i class="icon-cloud"></i> icon-cloud</a></li>
+      <li><a href="{{ site.baseurl }}icon/code-fork"><i class="icon-code-fork"></i> icon-code-fork</a></li>
+      <li><a href="{{ site.baseurl }}icon/code"><i class="icon-code"></i> icon-code</a></li>
       <li><a href="{{ site.baseurl }}icon/coffee"><i class="icon-coffee"></i> icon-coffee</a></li>
       <li><a href="{{ site.baseurl }}icon/cog"><i class="icon-cog"></i> icon-cog</a></li>
       <li><a href="{{ site.baseurl }}icon/cogs"><i class="icon-cogs"></i> icon-cogs</a></li>
-      <li><a href="{{ site.baseurl }}icon/comment"><i class="icon-comment"></i> icon-comment</a></li>
+      <li><a href="{{ site.baseurl }}icon/collapse-alt"><i class="icon-collapse-alt"></i> icon-collapse-alt</a></li>
       <li><a href="{{ site.baseurl }}icon/comment-alt"><i class="icon-comment-alt"></i> icon-comment-alt</a></li>
-      <li><a href="{{ site.baseurl }}icon/comments"><i class="icon-comments"></i> icon-comments</a></li>
+      <li><a href="{{ site.baseurl }}icon/comment"><i class="icon-comment"></i> icon-comment</a></li>
       <li><a href="{{ site.baseurl }}icon/comments-alt"><i class="icon-comments-alt"></i> icon-comments-alt</a></li>
+      <li><a href="{{ site.baseurl }}icon/comments"><i class="icon-comments"></i> icon-comments</a></li>
       <li><a href="{{ site.baseurl }}icon/credit-card"><i class="icon-credit-card"></i> icon-credit-card</a></li>
+      <li><a href="{{ site.baseurl }}icon/crop"><i class="icon-crop"></i> icon-crop</a></li>
       <li><a href="{{ site.baseurl }}icon/dashboard"><i class="icon-dashboard"></i> icon-dashboard</a></li>
       <li><a href="{{ site.baseurl }}icon/desktop"><i class="icon-desktop"></i> icon-desktop</a></li>
-      <li><a href="{{ site.baseurl }}icon/download"><i class="icon-download"></i> icon-download</a></li>
       <li><a href="{{ site.baseurl }}icon/download-alt"><i class="icon-download-alt"></i> icon-download-alt</a></li>
+      <li><a href="{{ site.baseurl }}icon/download"><i class="icon-download"></i> icon-download</a></li>
+      <li><a href="{{ site.baseurl }}icon/edit"><i class="icon-edit"></i> icon-edit</a></li>
+      <li><a href="{{ site.baseurl }}icon/ellipsis-horizontal"><i class="icon-ellipsis-horizontal"></i> icon-ellipsis-horizontal</a></li>
+      <li><a href="{{ site.baseurl }}icon/ellipsis-vertical"><i class="icon-ellipsis-vertical"></i> icon-ellipsis-vertical</a></li>
+      <li><a href="{{ site.baseurl }}icon/envelope-alt"><i class="icon-envelope-alt"></i> icon-envelope-alt</a></li>
     </ul>
   </div>
   <div class="span3">
     <ul class="the-icons">
-      <li><a href="{{ site.baseurl }}icon/edit"><i class="icon-edit"></i> icon-edit</a></li>
       <li><a href="{{ site.baseurl }}icon/envelope"><i class="icon-envelope"></i> icon-envelope</a></li>
-      <li><a href="{{ site.baseurl }}icon/envelope-alt"><i class="icon-envelope-alt"></i> icon-envelope-alt</a></li>
+      <li><a href="{{ site.baseurl }}icon/eraser"><i class="icon-eraser"></i> icon-eraser</a></li>
       <li><a href="{{ site.baseurl }}icon/exchange"><i class="icon-exchange"></i> icon-exchange</a></li>
       <li><a href="{{ site.baseurl }}icon/exclamation-sign"><i class="icon-exclamation-sign"></i> icon-exclamation-sign</a></li>
+      <li><a href="{{ site.baseurl }}icon/exclamation"><i class="icon-exclamation"></i> icon-exclamation</a></li>
+      <li><a href="{{ site.baseurl }}icon/expand-alt"><i class="icon-expand-alt"></i> icon-expand-alt</a></li>
       <li><a href="{{ site.baseurl }}icon/external-link"><i class="icon-external-link"></i> icon-external-link</a></li>
       <li><a href="{{ site.baseurl }}icon/eye-close"><i class="icon-eye-close"></i> icon-eye-close</a></li>
       <li><a href="{{ site.baseurl }}icon/eye-open"><i class="icon-eye-open"></i> icon-eye-open</a></li>
@@ -60,118 +72,145 @@
       <li><a href="{{ site.baseurl }}icon/fighter-jet"><i class="icon-fighter-jet"></i> icon-fighter-jet</a></li>
       <li><a href="{{ site.baseurl }}icon/film"><i class="icon-film"></i> icon-film</a></li>
       <li><a href="{{ site.baseurl }}icon/filter"><i class="icon-filter"></i> icon-filter</a></li>
+      <li><a href="{{ site.baseurl }}icon/fire-extinguisher"><i class="icon-fire-extinguisher"></i> icon-fire-extinguisher</a></li>
       <li><a href="{{ site.baseurl }}icon/fire"><i class="icon-fire"></i> icon-fire</a></li>
+      <li><a href="{{ site.baseurl }}icon/flag-alt"><i class="icon-flag-alt"></i> icon-flag-alt</a></li>
+      <li><a href="{{ site.baseurl }}icon/flag-checkered"><i class="icon-flag-checkered"></i> icon-flag-checkered</a></li>
       <li><a href="{{ site.baseurl }}icon/flag"><i class="icon-flag"></i> icon-flag</a></li>
-      <li><a href="{{ site.baseurl }}icon/folder-close"><i class="icon-folder-close"></i> icon-folder-close</a></li>
-      <li><a href="{{ site.baseurl }}icon/folder-open"><i class="icon-folder-open"></i> icon-folder-open</a></li>
       <li><a href="{{ site.baseurl }}icon/folder-close-alt"><i class="icon-folder-close-alt"></i> icon-folder-close-alt</a></li>
+      <li><a href="{{ site.baseurl }}icon/folder-close"><i class="icon-folder-close"></i> icon-folder-close</a></li>
       <li><a href="{{ site.baseurl }}icon/folder-open-alt"><i class="icon-folder-open-alt"></i> icon-folder-open-alt</a></li>
+      <li><a href="{{ site.baseurl }}icon/folder-open"><i class="icon-folder-open"></i> icon-folder-open</a></li>
       <li><a href="{{ site.baseurl }}icon/food"><i class="icon-food"></i> icon-food</a></li>
+      <li><a href="{{ site.baseurl }}icon/frown"><i class="icon-frown"></i> icon-frown</a></li>
+      <li><a href="{{ site.baseurl }}icon/gamepad"><i class="icon-gamepad"></i> icon-gamepad</a></li>
       <li><a href="{{ site.baseurl }}icon/gift"><i class="icon-gift"></i> icon-gift</a></li>
       <li><a href="{{ site.baseurl }}icon/glass"><i class="icon-glass"></i> icon-glass</a></li>
       <li><a href="{{ site.baseurl }}icon/globe"><i class="icon-globe"></i> icon-globe</a></li>
       <li><a href="{{ site.baseurl }}icon/group"><i class="icon-group"></i> icon-group</a></li>
       <li><a href="{{ site.baseurl }}icon/hdd"><i class="icon-hdd"></i> icon-hdd</a></li>
       <li><a href="{{ site.baseurl }}icon/headphones"><i class="icon-headphones"></i> icon-headphones</a></li>
-      <li><a href="{{ site.baseurl }}icon/heart"><i class="icon-heart"></i> icon-heart</a></li>
       <li><a href="{{ site.baseurl }}icon/heart-empty"><i class="icon-heart-empty"></i> icon-heart-empty</a></li>
+      <li><a href="{{ site.baseurl }}icon/heart"><i class="icon-heart"></i> icon-heart</a></li>
       <li><a href="{{ site.baseurl }}icon/home"><i class="icon-home"></i> icon-home</a></li>
       <li><a href="{{ site.baseurl }}icon/inbox"><i class="icon-inbox"></i> icon-inbox</a></li>
       <li><a href="{{ site.baseurl }}icon/info-sign"><i class="icon-info-sign"></i> icon-info-sign</a></li>
+      <li><a href="{{ site.baseurl }}icon/info"><i class="icon-info"></i> icon-info</a></li>
       <li><a href="{{ site.baseurl }}icon/key"><i class="icon-key"></i> icon-key</a></li>
-      <li><a href="{{ site.baseurl }}icon/leaf"><i class="icon-leaf"></i> icon-leaf</a></li>
+      <li><a href="{{ site.baseurl }}icon/keyboard"><i class="icon-keyboard"></i> icon-keyboard</a></li>
       <li><a href="{{ site.baseurl }}icon/laptop"><i class="icon-laptop"></i> icon-laptop</a></li>
+      <li><a href="{{ site.baseurl }}icon/leaf"><i class="icon-leaf"></i> icon-leaf</a></li>
       <li><a href="{{ site.baseurl }}icon/legal"><i class="icon-legal"></i> icon-legal</a></li>
       <li><a href="{{ site.baseurl }}icon/lemon"><i class="icon-lemon"></i> icon-lemon</a></li>
       <li><a href="{{ site.baseurl }}icon/lightbulb"><i class="icon-lightbulb"></i> icon-lightbulb</a></li>
+      <li><a href="{{ site.baseurl }}icon/location-arrow"><i class="icon-location-arrow"></i> icon-location-arrow</a></li>
       <li><a href="{{ site.baseurl }}icon/lock"><i class="icon-lock"></i> icon-lock</a></li>
-      <li><a href="{{ site.baseurl }}icon/unlock"><i class="icon-unlock"></i> icon-unlock</a></li>
+      <li><a href="{{ site.baseurl }}icon/magic"><i class="icon-magic"></i> icon-magic</a></li>
+      <li><a href="{{ site.baseurl }}icon/magnet"><i class="icon-magnet"></i> icon-magnet</a></li>
+      <li><a href="{{ site.baseurl }}icon/share-alt"><i class="icon-mail-forward"></i> icon-mail-forward <span class="muted">(alias)</span></a></li>
     </ul>
   </div>
   <div class="span3">
     <ul class="the-icons">
-      <li><a href="{{ site.baseurl }}icon/magic"><i class="icon-magic"></i> icon-magic</a></li>
-      <li><a href="{{ site.baseurl }}icon/magnet"><i class="icon-magnet"></i> icon-magnet</a></li>
+      <li><a href="{{ site.baseurl }}icon/reply"><i class="icon-mail-reply"></i> icon-mail-reply <span class="muted">(alias)</span></a></li>
+      <li><a href="{{ site.baseurl }}icon/reply-all"><i class="icon-mail-reply-all"></i> icon-mail-reply-all <span class="muted">(alias)</span></a></li>
       <li><a href="{{ site.baseurl }}icon/map-marker"><i class="icon-map-marker"></i> icon-map-marker</a></li>
-      <li><a href="{{ site.baseurl }}icon/minus"><i class="icon-minus"></i> icon-minus</a></li>
+      <li><a href="{{ site.baseurl }}icon/meh"><i class="icon-meh"></i> icon-meh</a></li>
+      <li><a href="{{ site.baseurl }}icon/microphone-off"><i class="icon-microphone-off"></i> icon-microphone-off</a></li>
+      <li><a href="{{ site.baseurl }}icon/microphone"><i class="icon-microphone"></i> icon-microphone</a></li>
+      <li><a href="{{ site.baseurl }}icon/minus-sign-alt"><i class="icon-minus-sign-alt"></i> icon-minus-sign-alt</a></li>
       <li><a href="{{ site.baseurl }}icon/minus-sign"><i class="icon-minus-sign"></i> icon-minus-sign</a></li>
+      <li><a href="{{ site.baseurl }}icon/minus"><i class="icon-minus"></i> icon-minus</a></li>
       <li><a href="{{ site.baseurl }}icon/mobile-phone"><i class="icon-mobile-phone"></i> icon-mobile-phone</a></li>
       <li><a href="{{ site.baseurl }}icon/money"><i class="icon-money"></i> icon-money</a></li>
       <li><a href="{{ site.baseurl }}icon/move"><i class="icon-move"></i> icon-move</a></li>
       <li><a href="{{ site.baseurl }}icon/music"><i class="icon-music"></i> icon-music</a></li>
       <li><a href="{{ site.baseurl }}icon/off"><i class="icon-off"></i> icon-off</a></li>
-      <li><a href="{{ site.baseurl }}icon/ok"><i class="icon-ok"></i> icon-ok</a></li>
       <li><a href="{{ site.baseurl }}icon/ok-circle"><i class="icon-ok-circle"></i> icon-ok-circle</a></li>
       <li><a href="{{ site.baseurl }}icon/ok-sign"><i class="icon-ok-sign"></i> icon-ok-sign</a></li>
+      <li><a href="{{ site.baseurl }}icon/ok"><i class="icon-ok"></i> icon-ok</a></li>
       <li><a href="{{ site.baseurl }}icon/pencil"><i class="icon-pencil"></i> icon-pencil</a></li>
-      <li><a href="{{ site.baseurl }}icon/phone"><i class="icon-phone"></i> icon-phone</a></li>
       <li><a href="{{ site.baseurl }}icon/phone-sign"><i class="icon-phone-sign"></i> icon-phone-sign</a></li>
+      <li><a href="{{ site.baseurl }}icon/phone"><i class="icon-phone"></i> icon-phone</a></li>
       <li><a href="{{ site.baseurl }}icon/picture"><i class="icon-picture"></i> icon-picture</a></li>
       <li><a href="{{ site.baseurl }}icon/plane"><i class="icon-plane"></i> icon-plane</a></li>
-      <li><a href="{{ site.baseurl }}icon/plus"><i class="icon-plus"></i> icon-plus</a></li>
       <li><a href="{{ site.baseurl }}icon/plus-sign"><i class="icon-plus-sign"></i> icon-plus-sign</a></li>
+      <li><a href="{{ site.baseurl }}icon/plus"><i class="icon-plus"></i> icon-plus</a></li>
       <li><a href="{{ site.baseurl }}icon/print"><i class="icon-print"></i> icon-print</a></li>
       <li><a href="{{ site.baseurl }}icon/pushpin"><i class="icon-pushpin"></i> icon-pushpin</a></li>
+      <li><a href="{{ site.baseurl }}icon/puzzle-piece"><i class="icon-puzzle-piece"></i> icon-puzzle-piece</a></li>
       <li><a href="{{ site.baseurl }}icon/qrcode"><i class="icon-qrcode"></i> icon-qrcode</a></li>
       <li><a href="{{ site.baseurl }}icon/question-sign"><i class="icon-question-sign"></i> icon-question-sign</a></li>
+      <li><a href="{{ site.baseurl }}icon/question"><i class="icon-question"></i> icon-question</a></li>
       <li><a href="{{ site.baseurl }}icon/quote-left"><i class="icon-quote-left"></i> icon-quote-left</a></li>
       <li><a href="{{ site.baseurl }}icon/quote-right"><i class="icon-quote-right"></i> icon-quote-right</a></li>
       <li><a href="{{ site.baseurl }}icon/random"><i class="icon-random"></i> icon-random</a></li>
       <li><a href="{{ site.baseurl }}icon/refresh"><i class="icon-refresh"></i> icon-refresh</a></li>
-      <li><a href="{{ site.baseurl }}icon/remove"><i class="icon-remove"></i> icon-remove</a></li>
       <li><a href="{{ site.baseurl }}icon/remove-circle"><i class="icon-remove-circle"></i> icon-remove-circle</a></li>
       <li><a href="{{ site.baseurl }}icon/remove-sign"><i class="icon-remove-sign"></i> icon-remove-sign</a></li>
+      <li><a href="{{ site.baseurl }}icon/remove"><i class="icon-remove"></i> icon-remove</a></li>
       <li><a href="{{ site.baseurl }}icon/reorder"><i class="icon-reorder"></i> icon-reorder</a></li>
+      <li><a href="{{ site.baseurl }}icon/reply-all"><i class="icon-reply-all"></i> icon-reply-all</a></li>
       <li><a href="{{ site.baseurl }}icon/reply"><i class="icon-reply"></i> icon-reply</a></li>
       <li><a href="{{ site.baseurl }}icon/resize-horizontal"><i class="icon-resize-horizontal"></i> icon-resize-horizontal</a></li>
       <li><a href="{{ site.baseurl }}icon/resize-vertical"><i class="icon-resize-vertical"></i> icon-resize-vertical</a></li>
       <li><a href="{{ site.baseurl }}icon/retweet"><i class="icon-retweet"></i> icon-retweet</a></li>
       <li><a href="{{ site.baseurl }}icon/road"><i class="icon-road"></i> icon-road</a></li>
-      <li><a href="{{ site.baseurl }}icon/rss"><i class="icon-rss"></i> icon-rss</a></li>
-      <li><a href="{{ site.baseurl }}icon/screenshot"><i class="icon-screenshot"></i> icon-screenshot</a></li>
-      <li><a href="{{ site.baseurl }}icon/search"><i class="icon-search"></i> icon-search</a></li>
+      <li><a href="{{ site.baseurl }}icon/rocket"><i class="icon-rocket"></i> icon-rocket</a></li>
+      <li><a href="{{ site.baseurl }}icon/undo"><i class="icon-rotate-left"></i> icon-rotate-left <span class="muted">(alias)</span></a></li>
+      <li><a href="{{ site.baseurl }}icon/repeat"><i class="icon-rotate-right"></i> icon-rotate-right <span class="muted">(alias)</span></a></li>
+      <li><a href="{{ site.baseurl }}icon/rss-sign"><i class="icon-rss-sign"></i> icon-rss-sign</a></li>
     </ul>
   </div>
   <div class="span3">
     <ul class="the-icons">
-      <li><a href="{{ site.baseurl }}icon/share"><i class="icon-share"></i> icon-share</a></li>
+      <li><a href="{{ site.baseurl }}icon/rss"><i class="icon-rss"></i> icon-rss</a></li>
+      <li><a href="{{ site.baseurl }}icon/screenshot"><i class="icon-screenshot"></i> icon-screenshot</a></li>
+      <li><a href="{{ site.baseurl }}icon/search"><i class="icon-search"></i> icon-search</a></li>
       <li><a href="{{ site.baseurl }}icon/share-alt"><i class="icon-share-alt"></i> icon-share-alt</a></li>
+      <li><a href="{{ site.baseurl }}icon/share"><i class="icon-share"></i> icon-share</a></li>
+      <li><a href="{{ site.baseurl }}icon/shield"><i class="icon-shield"></i> icon-shield</a></li>
       <li><a href="{{ site.baseurl }}icon/shopping-cart"><i class="icon-shopping-cart"></i> icon-shopping-cart</a></li>
       <li><a href="{{ site.baseurl }}icon/sign-blank"><i class="icon-sign-blank"></i> icon-sign-blank</a></li>
       <li><a href="{{ site.baseurl }}icon/signal"><i class="icon-signal"></i> icon-signal</a></li>
       <li><a href="{{ site.baseurl }}icon/signin"><i class="icon-signin"></i> icon-signin</a></li>
       <li><a href="{{ site.baseurl }}icon/signout"><i class="icon-signout"></i> icon-signout</a></li>
       <li><a href="{{ site.baseurl }}icon/sitemap"><i class="icon-sitemap"></i> icon-sitemap</a></li>
-      <li><a href="{{ site.baseurl }}icon/sort"><i class="icon-sort"></i> icon-sort</a></li>
+      <li><a href="{{ site.baseurl }}icon/smile"><i class="icon-smile"></i> icon-smile</a></li>
       <li><a href="{{ site.baseurl }}icon/sort-down"><i class="icon-sort-down"></i> icon-sort-down</a></li>
       <li><a href="{{ site.baseurl }}icon/sort-up"><i class="icon-sort-up"></i> icon-sort-up</a></li>
+      <li><a href="{{ site.baseurl }}icon/sort"><i class="icon-sort"></i> icon-sort</a></li>
       <li><a href="{{ site.baseurl }}icon/spinner"><i class="icon-spinner"></i> icon-spinner</a></li>
-      <li><a href="{{ site.baseurl }}icon/star"><i class="icon-star"></i> icon-star</a></li>
       <li><a href="{{ site.baseurl }}icon/star-empty"><i class="icon-star-empty"></i> icon-star-empty</a></li>
+      <li><a href="{{ site.baseurl }}icon/star-half-empty"><i class="icon-star-half-empty"></i> icon-star-half-empty</a></li>
       <li><a href="{{ site.baseurl }}icon/star-half"><i class="icon-star-half"></i> icon-star-half</a></li>
+      <li><a href="{{ site.baseurl }}icon/star"><i class="icon-star"></i> icon-star</a></li>
       <li><a href="{{ site.baseurl }}icon/tablet"><i class="icon-tablet"></i> icon-tablet</a></li>
       <li><a href="{{ site.baseurl }}icon/tag"><i class="icon-tag"></i> icon-tag</a></li>
       <li><a href="{{ site.baseurl }}icon/tags"><i class="icon-tags"></i> icon-tags</a></li>
       <li><a href="{{ site.baseurl }}icon/tasks"><i class="icon-tasks"></i> icon-tasks</a></li>
+      <li><a href="{{ site.baseurl }}icon/terminal"><i class="icon-terminal"></i> icon-terminal</a></li>
       <li><a href="{{ site.baseurl }}icon/thumbs-down"><i class="icon-thumbs-down"></i> icon-thumbs-down</a></li>
       <li><a href="{{ site.baseurl }}icon/thumbs-up"><i class="icon-thumbs-up"></i> icon-thumbs-up</a></li>
+      <li><a href="{{ site.baseurl }}icon/ticket"><i class="icon-ticket"></i> icon-ticket</a></li>
       <li><a href="{{ site.baseurl }}icon/time"><i class="icon-time"></i> icon-time</a></li>
       <li><a href="{{ site.baseurl }}icon/tint"><i class="icon-tint"></i> icon-tint</a></li>
       <li><a href="{{ site.baseurl }}icon/trash"><i class="icon-trash"></i> icon-trash</a></li>
       <li><a href="{{ site.baseurl }}icon/trophy"><i class="icon-trophy"></i> icon-trophy</a></li>
       <li><a href="{{ site.baseurl }}icon/truck"><i class="icon-truck"></i> icon-truck</a></li>
       <li><a href="{{ site.baseurl }}icon/umbrella"><i class="icon-umbrella"></i> icon-umbrella</a></li>
-      <li><a href="{{ site.baseurl }}icon/upload"><i class="icon-upload"></i> icon-upload</a></li>
+      <li><a href="{{ site.baseurl }}icon/unlock-alt"><i class="icon-unlock-alt"></i> icon-unlock-alt</a></li>
+      <li><a href="{{ site.baseurl }}icon/unlock"><i class="icon-unlock"></i> icon-unlock</a></li>
       <li><a href="{{ site.baseurl }}icon/upload-alt"><i class="icon-upload-alt"></i> icon-upload-alt</a></li>
-      <li><a href="{{ site.baseurl }}icon/user"><i class="icon-user"></i> icon-user</a></li>
+      <li><a href="{{ site.baseurl }}icon/upload"><i class="icon-upload"></i> icon-upload</a></li>
       <li><a href="{{ site.baseurl }}icon/user-md"><i class="icon-user-md"></i> icon-user-md</a></li>
-      <li><a href="{{ site.baseurl }}icon/volume-off"><i class="icon-volume-off"></i> icon-volume-off</a></li>
+      <li><a href="{{ site.baseurl }}icon/user"><i class="icon-user"></i> icon-user</a></li>
       <li><a href="{{ site.baseurl }}icon/volume-down"><i class="icon-volume-down"></i> icon-volume-down</a></li>
+      <li><a href="{{ site.baseurl }}icon/volume-off"><i class="icon-volume-off"></i> icon-volume-off</a></li>
       <li><a href="{{ site.baseurl }}icon/volume-up"><i class="icon-volume-up"></i> icon-volume-up</a></li>
       <li><a href="{{ site.baseurl }}icon/warning-sign"><i class="icon-warning-sign"></i> icon-warning-sign</a></li>
       <li><a href="{{ site.baseurl }}icon/wrench"><i class="icon-wrench"></i> icon-wrench</a></li>
       <li><a href="{{ site.baseurl }}icon/zoom-in"><i class="icon-zoom-in"></i> icon-zoom-in</a></li>
-      <li><a href="{{ site.baseurl }}icon/zoom-out"><i class="icon-zoom-out"></i> icon-zoom-out</a></li>
-    </ul>
+      <li><a href="{{ site.baseurl }}icon/zoom-out"><i class="icon-zoom-out"></i> icon-zoom-out</a></li>    </ul>
   </div>
 </section>
diff --git a/build/assets/font-awesome/font/FontAwesome.otf b/build/assets/font-awesome/font/FontAwesome.otf
index 359005d4d..cd0465fe2 100644
Binary files a/build/assets/font-awesome/font/FontAwesome.otf and b/build/assets/font-awesome/font/FontAwesome.otf differ
diff --git a/build/icons.yml b/build/icons.yml
index cfd8ec35f..de4b0c6b5 100755
--- a/build/icons.yml
+++ b/build/icons.yml
@@ -1709,7 +1709,6 @@ icons:
     unicode:    f10c
     created:    3.0.0
     categories:
-      - Directional Icons
       - Web Application Icons
 
   - name:       quote-left
@@ -1739,7 +1738,6 @@ icons:
     unicode:    f111
     created:    3.0.0
     categories:
-      - Directional Icons
       - Web Application Icons
 
   - name:       reply