From 2d43eb3bc90d72fad6f04ef4f20deaeabc5d9e6a Mon Sep 17 00:00:00 2001
From: jlukic <jacklukic@gmail.com>
Date: Tue, 24 Sep 2013 19:54:13 -0400
Subject: [PATCH] iterating on icon font work

Former-commit-id: 41c2e551c238d81b7dd0779e74f1f57641f11f5d
Former-commit-id: 1d8efd92f3b81237248f2e26b5c47df052162509
---
 build/less/elements/icon.less                 | 203 ++++++----
 build/uncompressed/elements/icon.css          | 349 +++++++++++-------
 node/src/documents/collections/table.html.eco |  14 +-
 node/src/documents/elements/button.html.eco   |   8 +-
 node/src/documents/elements/header.html.eco   |   2 +-
 .../elements/icon.html.eco.REMOVED.git-id     |   2 +-
 node/src/documents/elements/input.html.eco    |   2 +-
 node/src/documents/modules/modal.html.eco     |   2 +-
 node/src/files/build/less/elements/icon.less  | 203 ++++++----
 .../build/uncompressed/elements/icon.css      | 349 +++++++++++-------
 node/src/files/stylesheets/semantic.css       |   6 +
 node/src/layouts/default.html.eco             |   4 +-
 src/elements/icon.less                        | 203 ++++++----
 13 files changed, 855 insertions(+), 492 deletions(-)

diff --git a/build/less/elements/icon.less b/build/less/elements/icon.less
index 7deff3d31..4c441dde3 100644
--- a/build/less/elements/icon.less
+++ b/build/less/elements/icon.less
@@ -87,19 +87,19 @@ i.icon.angle.right:before { content: "\f105"; }
 i.icon.angle.up:before { content: "\f106"; }
 i.icon.apple:before { content: "\f179"; }
 i.icon.archive:before { content: "\f187"; }
-i.icon.arrow.down:before { content: "\f063"; }
-i.icon.arrow.left:before { content: "\f060"; }
-i.icon.arrow.right:before { content: "\f061"; }
-i.icon.arrow.up:before { content: "\f062"; }
+i.icon.down:before { content: "\f063"; }
+i.icon.left:before { content: "\f060"; }
+i.icon.right:before { content: "\f061"; }
+i.icon.up:before { content: "\f062"; }
 i.icon.asterisk:before { content: "\f069"; }
+i.icon.attachment:before { content: "\f0c6"; }
 i.icon.backward:before { content: "\f04a"; }
 i.icon.ban.circle:before { content: "\f05e"; }
 i.icon.bar.chart:before { content: "\f080"; }
 i.icon.barcode:before { content: "\f02a"; }
-i.icon.beaker:before { content: "\f0c3"; }
 i.icon.beer:before { content: "\f0fc"; }
-i.icon.bell:before { content: "\f0f3"; }
 i.icon.bell.outline:before { content: "\f0a2"; }
+i.icon.bell:before { content: "\f0f3"; }
 i.icon.bitbucket.sign:before { content: "\f172"; }
 i.icon.bitbucket:before { content: "\f171"; }
 i.icon.bitcoin:before { content: "\f15a"; }
@@ -108,7 +108,11 @@ i.icon.bolt:before { content: "\f0e7"; }
 i.icon.book:before { content: "\f02d"; }
 i.icon.bookmark.empty:before { content: "\f097"; }
 i.icon.bookmark:before { content: "\f02e"; }
+i.icon.box.arrow.down:before { content: "\f150"; }
+i.icon.box.arrow.right:before { content: "\f152"; }
+i.icon.box.arrow.up:before { content: "\f151"; }
 i.icon.briefcase:before { content: "\f0b1"; }
+i.icon.browser:before { content: "\f022"; }
 i.icon.bug:before { content: "\f188"; }
 i.icon.building:before { content: "\f0f7"; }
 i.icon.bullhorn:before { content: "\f0a1"; }
@@ -121,23 +125,25 @@ i.icon.caret.down:before { content: "\f0d7"; }
 i.icon.caret.left:before { content: "\f0d9"; }
 i.icon.caret.right:before { content: "\f0da"; }
 i.icon.caret.up:before { content: "\f0d8"; }
+i.icon.cart:before { content: "\f07a"; }
 i.icon.certificate:before { content: "\f0a3"; }
-i.icon.check.minus:before { content: "\f147"; }
-i.icon.check.sign:before { content: "\f14a"; }
-i.icon.check:before { content: "\f046"; }
-i.icon.chevron.down:before { content: "\f078"; }
-i.icon.chevron.left:before { content: "\f053"; }
-i.icon.chevron.right:before { content: "\f054"; }
-i.icon.chevron.sign.down:before { content: "\f13a"; }
-i.icon.chevron.sign.left:before { content: "\f137"; }
-i.icon.chevron.sign.right:before { content: "\f138"; }
-i.icon.chevron.sign.up:before { content: "\f139"; }
-i.icon.chevron.up:before { content: "\f077"; }
-i.icon.circle.down.arrow:before { content: "\f0ab"; }
-i.icon.circle.arrow.left:before { content: "\f0a8"; }
-i.icon.circle.arrow.right:before { content: "\f0a9"; }
-i.icon.circle.arrow.up:before { content: "\f0aa"; }
+i.icon.checkbox.empty:before { content: "\f096"; }
+i.icon.checkbox.minus:before { content: "\f147"; }
+i.icon.checkmark.sign:before { content: "\f14a"; }
+i.icon.checked.checkbox:before { content: "\f046"; }
+i.icon.arrow.down:before { content: "\f078"; }
+i.icon.arrow.left:before { content: "\f053"; }
+i.icon.arrow.right:before { content: "\f054"; }
+i.icon.arrow.up:before { content: "\f077"; }
+i.icon.arrow.sign.down:before { content: "\f13a"; }
+i.icon.arrow.sign.left:before { content: "\f137"; }
+i.icon.arrow.sign.right:before { content: "\f138"; }
+i.icon.arrow.sign.up:before { content: "\f139"; }
+i.icon.circle.left:before { content: "\f0a8"; }
+i.icon.circle.right:before { content: "\f0a9"; }
+i.icon.circle.up:before { content: "\f0aa"; }
 i.icon.circle.blank:before { content: "\f10c"; }
+i.icon.circle.down:before { content: "\f0ab"; }
 i.icon.circle:before { content: "\f111"; }
 i.icon.cloud.download:before { content: "\f0ed"; }
 i.icon.cloud.upload:before { content: "\f0ee"; }
@@ -146,22 +152,18 @@ i.icon.code.fork:before { content: "\f126"; }
 i.icon.code:before { content: "\f121"; }
 i.icon.coffee:before { content: "\f0f4"; }
 i.icon.collapse:before { content: "\f117"; }
-i.icon.box.arrow.up:before { content: "\f151"; }
-i.icon.box.arrow.down:before { content: "\f150"; }
-i.icon.box.arrow.right:before { content: "\f152"; }
-i.icon.layout.column:before { content: "\f0db"; }
 i.icon.comment.outline:before { content: "\f0e5"; }
 i.icon.comment:before { content: "\f075"; }
-i.icon.discussion.outline:before { content: "\f0e6"; }
-i.icon.discussion:before { content: "\f086"; }
 i.icon.compass:before { content: "\f14e"; }
 i.icon.copy:before { content: "\f0c5"; }
-i.icon.payment:before { content: "\f09d"; }
 i.icon.crop:before { content: "\f125"; }
 i.icon.css3:before { content: "\f13c"; }
 i.icon.cut:before { content: "\f0c4"; }
 i.icon.dashboard:before { content: "\f0e4"; }
 i.icon.desktop:before { content: "\f108"; }
+i.icon.chat.outline:before { content: "\f0e6"; }
+i.icon.chat:before { content: "\f086"; }
+i.icon.doctor:before { content: "\f0f0"; }
 i.icon.dollar:before { content: "\f155"; }
 i.icon.double.angle.down:before { content: "\f103"; }
 i.icon.double.angle.left:before { content: "\f100"; }
@@ -181,13 +183,11 @@ i.icon.envelope:before { content: "\f0e0"; }
 i.icon.eraser:before { content: "\f12d"; }
 i.icon.euro:before { content: "\f153"; }
 i.icon.exchange:before { content: "\f0ec"; }
-i.icon.exclamation.sign:before { content: "\f06a"; }
+i.icon.attention:before { content: "\f06a"; }
 i.icon.exclamation:before { content: "\f12a"; }
 i.icon.expand:before { content: "\f116"; }
 i.icon.external.link.sign:before { content: "\f14c"; }
 i.icon.external.link:before { content: "\f08e"; }
-i.icon.hide:before { content: "\f070"; }
-i.icon.unhide:before { content: "\f06e"; }
 i.icon.facebook.sign:before { content: "\f082"; }
 i.icon.facebook:before { content: "\f09a"; }
 i.icon.facetime.video:before { content: "\f03d"; }
@@ -203,34 +203,31 @@ i.icon.film:before { content: "\f008"; }
 i.icon.filter:before { content: "\f0b0"; }
 i.icon.fire.extinguisher:before { content: "\f134"; }
 i.icon.fire:before { content: "\f06d"; }
-i.icon.flag.empty:before { content: "\f11d"; }
 i.icon.flag.checkered:before { content: "\f11e"; }
+i.icon.flag.empty:before { content: "\f11d"; }
 i.icon.flag:before { content: "\f024"; }
 i.icon.flickr:before { content: "\f16e"; }
-i.icon.folder.close.outline:before { content: "\f114"; }
-i.icon.folder.close:before { content: "\f07b"; }
+i.icon.folder.outline:before { content: "\f114"; }
+i.icon.folder:before { content: "\f07b"; }
 i.icon.folder.open.outline:before { content: "\f115"; }
 i.icon.folder.open:before { content: "\f07c"; }
 i.icon.font:before { content: "\f031"; }
 i.icon.food:before { content: "\f0f5"; }
+i.icon.forward.mail:before { content: "\f064"; }
 i.icon.forward:before { content: "\f04e"; }
 i.icon.foursquare:before { content: "\f180"; }
 i.icon.frown:before { content: "\f119"; }
 i.icon.fullscreen:before { content: "\f0b2"; }
 i.icon.gamepad:before { content: "\f11b"; }
-i.icon.pound:before { content: "\f154"; }
-i.icon.setting:before { content: "\f013"; }
-i.icon.settings:before { content: "\f085"; }
 i.icon.gift:before { content: "\f06b"; }
-i.icon.github:before { content: "\f113"; }
 i.icon.github.alternate:before { content: "\f09b"; }
 i.icon.github.sign:before { content: "\f092"; }
+i.icon.github:before { content: "\f113"; }
 i.icon.gittip:before { content: "\f184"; }
 i.icon.glass:before { content: "\f000"; }
 i.icon.globe:before { content: "\f0ac"; }
 i.icon.google.plus.sign:before { content: "\f0d4"; }
 i.icon.google.plus:before { content: "\f0d5"; }
-i.icon.users:before { content: "\f0c0"; }
 i.icon.h.sign:before { content: "\f0fd"; }
 i.icon.hand.down:before { content: "\f0a7"; }
 i.icon.hand.left:before { content: "\f0a5"; }
@@ -240,19 +237,25 @@ i.icon.hdd:before { content: "\f0a0"; }
 i.icon.headphones:before { content: "\f025"; }
 i.icon.heart.empty:before { content: "\f08a"; }
 i.icon.heart:before { content: "\f004"; }
+i.icon.hide:before { content: "\f070"; }
 i.icon.home:before { content: "\f015"; }
 i.icon.hospital:before { content: "\f0f8"; }
 i.icon.html5:before { content: "\f13b"; }
 i.icon.inbox:before { content: "\f01c"; }
 i.icon.indent.left:before { content: "\f03b"; }
 i.icon.indent.right:before { content: "\f03c"; }
-i.icon.info:before { content: "\f05a"; }
 i.icon.info.letter:before { content: "\f129"; }
+i.icon.info:before { content: "\f05a"; }
 i.icon.instagram:before { content: "\f16d"; }
 i.icon.italic:before { content: "\f033"; }
 i.icon.key:before { content: "\f084"; }
 i.icon.keyboard:before { content: "\f11c"; }
+i.icon.lab:before { content: "\f0c3"; }
 i.icon.laptop:before { content: "\f109"; }
+i.icon.layout.block:before { content: "\f009"; }
+i.icon.layout.column:before { content: "\f0db"; }
+i.icon.layout.grid:before { content: "\f00a"; }
+i.icon.layout.list:before { content: "\f00b"; }
 i.icon.leaf:before { content: "\f06c"; }
 i.icon.legal:before { content: "\f0e3"; }
 i.icon.lemon:before { content: "\f094"; }
@@ -263,9 +266,8 @@ i.icon.link:before { content: "\f0c1"; }
 i.icon.linkedin.sign:before { content: "\f08c"; }
 i.icon.linkedin:before { content: "\f0e1"; }
 i.icon.linux:before { content: "\f17c"; }
-i.icon.browser:before { content: "\f022"; }
 i.icon.list.ordered:before { content: "\f0cb"; }
-i.icon.list.unuordered:before { content: "\f0ca"; }
+i.icon.list.unordered:before { content: "\f0ca"; }
 i.icon.list:before { content: "\f03a"; }
 i.icon.location:before { content: "\f124"; }
 i.icon.lock:before { content: "\f023"; }
@@ -275,15 +277,12 @@ i.icon.long.arrow.right:before { content: "\f178"; }
 i.icon.long.arrow.up:before { content: "\f176"; }
 i.icon.magic:before { content: "\f0d0"; }
 i.icon.magnet:before { content: "\f076"; }
-i.icon.forward.mail:before { content: "\f064"; }
 i.icon.mail.reply:before { content: "\f112"; }
 i.icon.male:before { content: "\f183"; }
 i.icon.map.marker:before { content: "\f041"; }
 i.icon.maxcdn:before { content: "\f136"; }
 i.icon.medkit:before { content: "\f0fa"; }
 i.icon.meh:before { content: "\f11a"; }
-i.icon.mute:before { content: "\f131"; }
-i.icon.unmute:before { content: "\f130"; }
 i.icon.minus.sign.alternate:before { content: "\f146"; }
 i.icon.minus.sign:before { content: "\f056"; }
 i.icon.minus:before { content: "\f068"; }
@@ -292,16 +291,18 @@ i.icon.money:before { content: "\f0d6"; }
 i.icon.moon:before { content: "\f186"; }
 i.icon.move:before { content: "\f047"; }
 i.icon.music:before { content: "\f001"; }
+i.icon.mute:before { content: "\f131"; }
 i.icon.ok.circle:before { content: "\f05d"; }
 i.icon.ok.sign:before { content: "\f058"; }
-i.icon.ok:before { content: "\f00c"; }
-i.icon.attachment:before { content: "\f0c6"; }
+i.icon.checkmark:before { content: "\f00c"; }
 i.icon.paste:before { content: "\f0ea"; }
 i.icon.pause:before { content: "\f04c"; }
+i.icon.payment:before { content: "\f09d"; }
 i.icon.pencil:before { content: "\f040"; }
 i.icon.phone.sign:before { content: "\f098"; }
 i.icon.phone:before { content: "\f095"; }
 i.icon.picture:before { content: "\f03e"; }
+i.icon.pin:before { content: "\f08d"; }
 i.icon.pinterest.sign:before { content: "\f0d3"; }
 i.icon.pinterest:before { content: "\f0d2"; }
 i.icon.plane:before { content: "\f072"; }
@@ -311,13 +312,13 @@ i.icon.play:before { content: "\f04b"; }
 i.icon.plus.sign.alternate:before { content: "\f0fe"; }
 i.icon.plus.sign:before { content: "\f055"; }
 i.icon.plus:before { content: "\f067"; }
+i.icon.pound:before { content: "\f154"; }
 i.icon.power.off:before, i.icon.off:before { content: "\f011"; }
 i.icon.print:before { content: "\f02f"; }
-i.icon.pin:before { content: "\f08d"; }
 i.icon.puzzle.piece:before { content: "\f12e"; }
 i.icon.qr.code:before { content: "\f029"; }
+i.icon.question.mark:before { content: "\f128"; }
 i.icon.question:before { content: "\f059"; }
-i.icon.question.letter:before { content: "\f128"; }
 i.icon.quote.left:before { content: "\f10d"; }
 i.icon.quote.right:before { content: "\f10e"; }
 i.icon.random:before { content: "\f074"; }
@@ -325,7 +326,6 @@ i.icon.refresh:before { content: "\f021"; }
 i.icon.remove.circle:before { content: "\f05c"; }
 i.icon.remove.sign:before { content: "\f057"; }
 i.icon.remove:before { content: "\f00d"; }
-i.icon.yuan:before { content: "\f158"; }
 i.icon.renren:before { content: "\f18b"; }
 i.icon.reorder:before { content: "\f0c9"; }
 i.icon.reply.all.mail:before { content: "\f122"; }
@@ -344,31 +344,32 @@ i.icon.rupee:before { content: "\f156"; }
 i.icon.save:before { content: "\f0c7"; }
 i.icon.screenshot:before { content: "\f05b"; }
 i.icon.search:before { content: "\f002"; }
+i.icon.setting:before { content: "\f013"; }
+i.icon.settings:before { content: "\f085"; }
 i.icon.share.sign:before { content: "\f14d"; }
 i.icon.share:before { content: "\f045"; }
 i.icon.shield:before { content: "\f132"; }
-i.icon.cart:before { content: "\f07a"; }
-i.icon.sign:before { content: "\f0c8"; }
-i.icon.signal:before { content: "\f012"; }
 i.icon.sign.in:before { content: "\f090"; }
 i.icon.sign.out:before { content: "\f08b"; }
+i.icon.sign:before { content: "\f0c8"; }
+i.icon.signal:before { content: "\f012"; }
 i.icon.sitemap:before { content: "\f0e8"; }
 i.icon.skype:before { content: "\f17e"; }
 i.icon.smile:before { content: "\f118"; }
 i.icon.sort.alphabet.descending:before { content: "\f15e"; }
 i.icon.sort.alphabet:before { content: "\f15d"; }
+i.icon.sort.ascending:before { content: "\f0de"; }
 i.icon.sort.attributes.descending:before { content: "\f161"; }
 i.icon.sort.attributes:before { content: "\f160"; }
+i.icon.sort.descending:before { content: "\f0dd"; }
 i.icon.sort.order.descending:before { content: "\f163"; }
 i.icon.sort.order:before { content: "\f162"; }
-i.icon.sort.descending:before { content: "\f0dd"; }
-i.icon.sort.ascending:before { content: "\f0de"; }
 i.icon.sort:before { content: "\f0dc"; }
-i.icon.spinner:before { content: "\f110"; }
+i.icon.loading:before { content: "\f110"; }
 i.icon.stackexchange:before { content: "\f16c"; }
 i.icon.star.empty:before { content: "\f006"; }
-i.icon.star.half.full:before,
 i.icon.star.half.empty:before { content: "\f123"; }
+i.icon.star.half.full:before,
 i.icon.star.half:before { content: "\f089"; }
 i.icon.star:before { content: "\f005"; }
 i.icon.step.backward:before { content: "\f048"; }
@@ -388,9 +389,6 @@ i.icon.tasks:before { content: "\f0ae"; }
 i.icon.terminal:before { content: "\f120"; }
 i.icon.text.height:before { content: "\f034"; }
 i.icon.text.width:before { content: "\f035"; }
-i.icon.layout.block:before { content: "\f009"; }
-i.icon.layout.list:before { content: "\f00b"; }
-i.icon.layout.grid:before { content: "\f00a"; }
 i.icon.thumbs.down.outline:before { content: "\f088"; }
 i.icon.thumbs.down:before { content: "\f165"; }
 i.icon.thumbs.up.outline:before { content: "\f087"; }
@@ -407,15 +405,16 @@ i.icon.tumblr:before { content: "\f173"; }
 i.icon.twitter.sign:before { content: "\f081"; }
 i.icon.twitter:before { content: "\f099"; }
 i.icon.umbrella:before { content: "\f0e9"; }
-i.icon.check.empty:before { content: "\f096"; }
 i.icon.underline:before { content: "\f0cd"; }
+i.icon.unhide:before { content: "\f06e"; }
 i.icon.unlink:before { content: "\f127"; }
 i.icon.unlock.alternate:before { content: "\f13e"; }
 i.icon.unlock:before { content: "\f09c"; }
+i.icon.unmute:before { content: "\f130"; }
 i.icon.upload.disk:before { content: "\f093"; }
 i.icon.upload:before { content: "\f01b"; }
-i.icon.doctor:before { content: "\f0f0"; }
 i.icon.user:before { content: "\f007"; }
+i.icon.users:before { content: "\f0c0"; }
 i.icon.vk:before { content: "\f189"; }
 i.icon.volume.down:before { content: "\f027"; }
 i.icon.volume.off:before { content: "\f026"; }
@@ -431,6 +430,7 @@ i.icon.yen:before { content: "\f157"; }
 i.icon.youtube.play:before { content: "\f16a"; }
 i.icon.youtube.sign:before { content: "\f166"; }
 i.icon.youtube:before { content: "\f167"; }
+i.icon.yuan:before { content: "\f158"; }
 i.icon.zoom.in:before { content: "\f00e"; }
 i.icon.zoom.out:before { content: "\f010"; }
 
@@ -439,6 +439,7 @@ i.icon.zoom.out:before { content: "\f010"; }
     Aliases
 ---------------*/
 
+i.icon.check:before { content: "\f00c"; }
 i.icon.close:before { content: "\f00d"; }
 i.icon.delete:before { content: "\f00d"; }
 
@@ -476,6 +477,80 @@ i.icon.right {
 }
 
 
+/*******************************
+             Types
+*******************************/
+
+/*--------------
+    Loading
+---------------*/
+
+i.icon.loading {
+  -webkit-animation: icon-loading 2s linear infinite;
+  -moz-animation: icon-loading 2s linear infinite;
+  -ms-animation: icon-loading 2s linear infinite;
+  -o-animation: icon-loading 2s linear infinite;
+  animation: icon-loading 2s linear infinite;
+}
+@keyframes "icon-loading" {
+ from {
+    -webkit-transform: rotate(0deg);
+    -moz-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    -ms-transform: rotate(0deg);
+    transform: rotate(0deg);
+ }
+ to {
+    -webkit-transform: rotate(360deg);
+    -moz-transform: rotate(360deg);
+    -o-transform: rotate(360deg);
+    -ms-transform: rotate(360deg);
+    transform: rotate(360deg);
+ }
+}
+@-moz-keyframes icon-loading {
+ from {
+   -moz-transform: rotate(0deg);
+   transform: rotate(0deg);
+ }
+ to {
+   -moz-transform: rotate(360deg);
+   transform: rotate(360deg);
+ }
+}
+@-webkit-keyframes "icon-loading" {
+ from {
+   -webkit-transform: rotate(0deg);
+   transform: rotate(0deg);
+ }
+ to {
+   -webkit-transform: rotate(360deg);
+   transform: rotate(360deg);
+ }
+}
+@-ms-keyframes "icon-loading" {
+ from {
+   -ms-transform: rotate(0deg);
+   transform: rotate(0deg);
+ }
+ to {
+   -ms-transform: rotate(360deg);
+   transform: rotate(360deg);
+ }
+}
+@-o-keyframes "icon-loading" {
+ from {
+   -o-transform: rotate(0deg);
+   transform: rotate(0deg);
+ }
+ to {
+   -o-transform: rotate(360deg);
+   transform: rotate(360deg);
+ }
+}
+
+
+
 /*******************************
              States
 *******************************/
@@ -501,6 +576,7 @@ i.icon.disabled {
            Variations
 *******************************/
 
+
 /*-------------------
          Link
 --------------------*/
@@ -537,9 +613,6 @@ i.circular.icon {
   width: 2em !important;
   height: 2em !important;
 }
-i.circular.icon:before {
-  vertical-align: middle;
-}
 i.circular.inverted.icon {
   border: none;
   -webkit-box-shadow: none;
diff --git a/build/uncompressed/elements/icon.css b/build/uncompressed/elements/icon.css
index 10b7ac09b..cddd2af63 100644
--- a/build/uncompressed/elements/icon.css
+++ b/build/uncompressed/elements/icon.css
@@ -101,21 +101,24 @@ i.icon.apple:before {
 i.icon.archive:before {
   content: "\f187";
 }
-i.icon.arrow.down:before {
+i.icon.down:before {
   content: "\f063";
 }
-i.icon.arrow.left:before {
+i.icon.left:before {
   content: "\f060";
 }
-i.icon.arrow.right:before {
+i.icon.right:before {
   content: "\f061";
 }
-i.icon.arrow.up:before {
+i.icon.up:before {
   content: "\f062";
 }
 i.icon.asterisk:before {
   content: "\f069";
 }
+i.icon.attachment:before {
+  content: "\f0c6";
+}
 i.icon.backward:before {
   content: "\f04a";
 }
@@ -128,18 +131,15 @@ i.icon.bar.chart:before {
 i.icon.barcode:before {
   content: "\f02a";
 }
-i.icon.beaker:before {
-  content: "\f0c3";
-}
 i.icon.beer:before {
   content: "\f0fc";
 }
-i.icon.bell:before {
-  content: "\f0f3";
-}
 i.icon.bell.outline:before {
   content: "\f0a2";
 }
+i.icon.bell:before {
+  content: "\f0f3";
+}
 i.icon.bitbucket.sign:before {
   content: "\f172";
 }
@@ -164,9 +164,21 @@ i.icon.bookmark.empty:before {
 i.icon.bookmark:before {
   content: "\f02e";
 }
+i.icon.box.arrow.down:before {
+  content: "\f150";
+}
+i.icon.box.arrow.right:before {
+  content: "\f152";
+}
+i.icon.box.arrow.up:before {
+  content: "\f151";
+}
 i.icon.briefcase:before {
   content: "\f0b1";
 }
+i.icon.browser:before {
+  content: "\f022";
+}
 i.icon.bug:before {
   content: "\f188";
 }
@@ -203,57 +215,63 @@ i.icon.caret.right:before {
 i.icon.caret.up:before {
   content: "\f0d8";
 }
+i.icon.cart:before {
+  content: "\f07a";
+}
 i.icon.certificate:before {
   content: "\f0a3";
 }
-i.icon.check.minus:before {
+i.icon.checkbox.empty:before {
+  content: "\f096";
+}
+i.icon.checkbox.minus:before {
   content: "\f147";
 }
-i.icon.check.sign:before {
+i.icon.checkmark.sign:before {
   content: "\f14a";
 }
-i.icon.check:before {
+i.icon.checked.checkbox:before {
   content: "\f046";
 }
-i.icon.chevron.down:before {
+i.icon.arrow.down:before {
   content: "\f078";
 }
-i.icon.chevron.left:before {
+i.icon.arrow.left:before {
   content: "\f053";
 }
-i.icon.chevron.right:before {
+i.icon.arrow.right:before {
   content: "\f054";
 }
-i.icon.chevron.sign.down:before {
+i.icon.arrow.up:before {
+  content: "\f077";
+}
+i.icon.arrow.sign.down:before {
   content: "\f13a";
 }
-i.icon.chevron.sign.left:before {
+i.icon.arrow.sign.left:before {
   content: "\f137";
 }
-i.icon.chevron.sign.right:before {
+i.icon.arrow.sign.right:before {
   content: "\f138";
 }
-i.icon.chevron.sign.up:before {
+i.icon.arrow.sign.up:before {
   content: "\f139";
 }
-i.icon.chevron.up:before {
-  content: "\f077";
-}
-i.icon.circle.down.arrow:before {
-  content: "\f0ab";
-}
-i.icon.circle.arrow.left:before {
+i.icon.circle.left:before {
   content: "\f0a8";
 }
-i.icon.circle.arrow.right:before {
+i.icon.circle.right:before {
   content: "\f0a9";
 }
-i.icon.circle.arrow.up:before {
+i.icon.circle.up:before {
   content: "\f0aa";
 }
 i.icon.circle.blank:before {
   content: "\f10c";
 }
+i.icon.circle.down:before {
+  content: "\f0ab";
+}
 i.icon.circle:before {
   content: "\f111";
 }
@@ -278,39 +296,18 @@ i.icon.coffee:before {
 i.icon.collapse:before {
   content: "\f117";
 }
-i.icon.box.arrow.up:before {
-  content: "\f151";
-}
-i.icon.box.arrow.down:before {
-  content: "\f150";
-}
-i.icon.box.arrow.right:before {
-  content: "\f152";
-}
-i.icon.layout.column:before {
-  content: "\f0db";
-}
 i.icon.comment.outline:before {
   content: "\f0e5";
 }
 i.icon.comment:before {
   content: "\f075";
 }
-i.icon.discussion.outline:before {
-  content: "\f0e6";
-}
-i.icon.discussion:before {
-  content: "\f086";
-}
 i.icon.compass:before {
   content: "\f14e";
 }
 i.icon.copy:before {
   content: "\f0c5";
 }
-i.icon.payment:before {
-  content: "\f09d";
-}
 i.icon.crop:before {
   content: "\f125";
 }
@@ -326,6 +323,15 @@ i.icon.dashboard:before {
 i.icon.desktop:before {
   content: "\f108";
 }
+i.icon.chat.outline:before {
+  content: "\f0e6";
+}
+i.icon.chat:before {
+  content: "\f086";
+}
+i.icon.doctor:before {
+  content: "\f0f0";
+}
 i.icon.dollar:before {
   content: "\f155";
 }
@@ -383,7 +389,7 @@ i.icon.euro:before {
 i.icon.exchange:before {
   content: "\f0ec";
 }
-i.icon.exclamation.sign:before {
+i.icon.attention:before {
   content: "\f06a";
 }
 i.icon.exclamation:before {
@@ -398,12 +404,6 @@ i.icon.external.link.sign:before {
 i.icon.external.link:before {
   content: "\f08e";
 }
-i.icon.hide:before {
-  content: "\f070";
-}
-i.icon.unhide:before {
-  content: "\f06e";
-}
 i.icon.facebook.sign:before {
   content: "\f082";
 }
@@ -449,22 +449,22 @@ i.icon.fire.extinguisher:before {
 i.icon.fire:before {
   content: "\f06d";
 }
-i.icon.flag.empty:before {
-  content: "\f11d";
-}
 i.icon.flag.checkered:before {
   content: "\f11e";
 }
+i.icon.flag.empty:before {
+  content: "\f11d";
+}
 i.icon.flag:before {
   content: "\f024";
 }
 i.icon.flickr:before {
   content: "\f16e";
 }
-i.icon.folder.close.outline:before {
+i.icon.folder.outline:before {
   content: "\f114";
 }
-i.icon.folder.close:before {
+i.icon.folder:before {
   content: "\f07b";
 }
 i.icon.folder.open.outline:before {
@@ -479,6 +479,9 @@ i.icon.font:before {
 i.icon.food:before {
   content: "\f0f5";
 }
+i.icon.forward.mail:before {
+  content: "\f064";
+}
 i.icon.forward:before {
   content: "\f04e";
 }
@@ -494,27 +497,18 @@ i.icon.fullscreen:before {
 i.icon.gamepad:before {
   content: "\f11b";
 }
-i.icon.pound:before {
-  content: "\f154";
-}
-i.icon.setting:before {
-  content: "\f013";
-}
-i.icon.settings:before {
-  content: "\f085";
-}
 i.icon.gift:before {
   content: "\f06b";
 }
-i.icon.github:before {
-  content: "\f113";
-}
 i.icon.github.alternate:before {
   content: "\f09b";
 }
 i.icon.github.sign:before {
   content: "\f092";
 }
+i.icon.github:before {
+  content: "\f113";
+}
 i.icon.gittip:before {
   content: "\f184";
 }
@@ -530,9 +524,6 @@ i.icon.google.plus.sign:before {
 i.icon.google.plus:before {
   content: "\f0d5";
 }
-i.icon.users:before {
-  content: "\f0c0";
-}
 i.icon.h.sign:before {
   content: "\f0fd";
 }
@@ -560,6 +551,9 @@ i.icon.heart.empty:before {
 i.icon.heart:before {
   content: "\f004";
 }
+i.icon.hide:before {
+  content: "\f070";
+}
 i.icon.home:before {
   content: "\f015";
 }
@@ -578,12 +572,12 @@ i.icon.indent.left:before {
 i.icon.indent.right:before {
   content: "\f03c";
 }
-i.icon.info:before {
-  content: "\f05a";
-}
 i.icon.info.letter:before {
   content: "\f129";
 }
+i.icon.info:before {
+  content: "\f05a";
+}
 i.icon.instagram:before {
   content: "\f16d";
 }
@@ -596,9 +590,24 @@ i.icon.key:before {
 i.icon.keyboard:before {
   content: "\f11c";
 }
+i.icon.lab:before {
+  content: "\f0c3";
+}
 i.icon.laptop:before {
   content: "\f109";
 }
+i.icon.layout.block:before {
+  content: "\f009";
+}
+i.icon.layout.column:before {
+  content: "\f0db";
+}
+i.icon.layout.grid:before {
+  content: "\f00a";
+}
+i.icon.layout.list:before {
+  content: "\f00b";
+}
 i.icon.leaf:before {
   content: "\f06c";
 }
@@ -629,13 +638,10 @@ i.icon.linkedin:before {
 i.icon.linux:before {
   content: "\f17c";
 }
-i.icon.browser:before {
-  content: "\f022";
-}
 i.icon.list.ordered:before {
   content: "\f0cb";
 }
-i.icon.list.unuordered:before {
+i.icon.list.unordered:before {
   content: "\f0ca";
 }
 i.icon.list:before {
@@ -665,9 +671,6 @@ i.icon.magic:before {
 i.icon.magnet:before {
   content: "\f076";
 }
-i.icon.forward.mail:before {
-  content: "\f064";
-}
 i.icon.mail.reply:before {
   content: "\f112";
 }
@@ -686,12 +689,6 @@ i.icon.medkit:before {
 i.icon.meh:before {
   content: "\f11a";
 }
-i.icon.mute:before {
-  content: "\f131";
-}
-i.icon.unmute:before {
-  content: "\f130";
-}
 i.icon.minus.sign.alternate:before {
   content: "\f146";
 }
@@ -716,24 +713,27 @@ i.icon.move:before {
 i.icon.music:before {
   content: "\f001";
 }
+i.icon.mute:before {
+  content: "\f131";
+}
 i.icon.ok.circle:before {
   content: "\f05d";
 }
 i.icon.ok.sign:before {
   content: "\f058";
 }
-i.icon.ok:before {
+i.icon.checkmark:before {
   content: "\f00c";
 }
-i.icon.attachment:before {
-  content: "\f0c6";
-}
 i.icon.paste:before {
   content: "\f0ea";
 }
 i.icon.pause:before {
   content: "\f04c";
 }
+i.icon.payment:before {
+  content: "\f09d";
+}
 i.icon.pencil:before {
   content: "\f040";
 }
@@ -746,6 +746,9 @@ i.icon.phone:before {
 i.icon.picture:before {
   content: "\f03e";
 }
+i.icon.pin:before {
+  content: "\f08d";
+}
 i.icon.pinterest.sign:before {
   content: "\f0d3";
 }
@@ -773,6 +776,9 @@ i.icon.plus.sign:before {
 i.icon.plus:before {
   content: "\f067";
 }
+i.icon.pound:before {
+  content: "\f154";
+}
 i.icon.power.off:before,
 i.icon.off:before {
   content: "\f011";
@@ -780,21 +786,18 @@ i.icon.off:before {
 i.icon.print:before {
   content: "\f02f";
 }
-i.icon.pin:before {
-  content: "\f08d";
-}
 i.icon.puzzle.piece:before {
   content: "\f12e";
 }
 i.icon.qr.code:before {
   content: "\f029";
 }
+i.icon.question.mark:before {
+  content: "\f128";
+}
 i.icon.question:before {
   content: "\f059";
 }
-i.icon.question.letter:before {
-  content: "\f128";
-}
 i.icon.quote.left:before {
   content: "\f10d";
 }
@@ -816,9 +819,6 @@ i.icon.remove.sign:before {
 i.icon.remove:before {
   content: "\f00d";
 }
-i.icon.yuan:before {
-  content: "\f158";
-}
 i.icon.renren:before {
   content: "\f18b";
 }
@@ -875,6 +875,12 @@ i.icon.screenshot:before {
 i.icon.search:before {
   content: "\f002";
 }
+i.icon.setting:before {
+  content: "\f013";
+}
+i.icon.settings:before {
+  content: "\f085";
+}
 i.icon.share.sign:before {
   content: "\f14d";
 }
@@ -884,8 +890,11 @@ i.icon.share:before {
 i.icon.shield:before {
   content: "\f132";
 }
-i.icon.cart:before {
-  content: "\f07a";
+i.icon.sign.in:before {
+  content: "\f090";
+}
+i.icon.sign.out:before {
+  content: "\f08b";
 }
 i.icon.sign:before {
   content: "\f0c8";
@@ -893,12 +902,6 @@ i.icon.sign:before {
 i.icon.signal:before {
   content: "\f012";
 }
-i.icon.sign.in:before {
-  content: "\f090";
-}
-i.icon.sign.out:before {
-  content: "\f08b";
-}
 i.icon.sitemap:before {
   content: "\f0e8";
 }
@@ -914,28 +917,28 @@ i.icon.sort.alphabet.descending:before {
 i.icon.sort.alphabet:before {
   content: "\f15d";
 }
+i.icon.sort.ascending:before {
+  content: "\f0de";
+}
 i.icon.sort.attributes.descending:before {
   content: "\f161";
 }
 i.icon.sort.attributes:before {
   content: "\f160";
 }
+i.icon.sort.descending:before {
+  content: "\f0dd";
+}
 i.icon.sort.order.descending:before {
   content: "\f163";
 }
 i.icon.sort.order:before {
   content: "\f162";
 }
-i.icon.sort.descending:before {
-  content: "\f0dd";
-}
-i.icon.sort.ascending:before {
-  content: "\f0de";
-}
 i.icon.sort:before {
   content: "\f0dc";
 }
-i.icon.spinner:before {
+i.icon.loading:before {
   content: "\f110";
 }
 i.icon.stackexchange:before {
@@ -944,10 +947,10 @@ i.icon.stackexchange:before {
 i.icon.star.empty:before {
   content: "\f006";
 }
-i.icon.star.half.full:before,
 i.icon.star.half.empty:before {
   content: "\f123";
 }
+i.icon.star.half.full:before,
 i.icon.star.half:before {
   content: "\f089";
 }
@@ -1005,15 +1008,6 @@ i.icon.text.height:before {
 i.icon.text.width:before {
   content: "\f035";
 }
-i.icon.layout.block:before {
-  content: "\f009";
-}
-i.icon.layout.list:before {
-  content: "\f00b";
-}
-i.icon.layout.grid:before {
-  content: "\f00a";
-}
 i.icon.thumbs.down.outline:before {
   content: "\f088";
 }
@@ -1062,12 +1056,12 @@ i.icon.twitter:before {
 i.icon.umbrella:before {
   content: "\f0e9";
 }
-i.icon.check.empty:before {
-  content: "\f096";
-}
 i.icon.underline:before {
   content: "\f0cd";
 }
+i.icon.unhide:before {
+  content: "\f06e";
+}
 i.icon.unlink:before {
   content: "\f127";
 }
@@ -1077,18 +1071,21 @@ i.icon.unlock.alternate:before {
 i.icon.unlock:before {
   content: "\f09c";
 }
+i.icon.unmute:before {
+  content: "\f130";
+}
 i.icon.upload.disk:before {
   content: "\f093";
 }
 i.icon.upload:before {
   content: "\f01b";
 }
-i.icon.doctor:before {
-  content: "\f0f0";
-}
 i.icon.user:before {
   content: "\f007";
 }
+i.icon.users:before {
+  content: "\f0c0";
+}
 i.icon.vk:before {
   content: "\f189";
 }
@@ -1134,6 +1131,9 @@ i.icon.youtube.sign:before {
 i.icon.youtube:before {
   content: "\f167";
 }
+i.icon.yuan:before {
+  content: "\f158";
+}
 i.icon.zoom.in:before {
   content: "\f00e";
 }
@@ -1143,6 +1143,9 @@ i.icon.zoom.out:before {
 /*--------------
     Aliases
 ---------------*/
+i.icon.check:before {
+  content: "\f00c";
+}
 i.icon.close:before {
   content: "\f00d";
 }
@@ -1176,6 +1179,75 @@ i.icon.right {
   width: auto;
   margin: 0em 0em 0em 0.5em;
 }
+/*******************************
+             Types
+*******************************/
+/*--------------
+    Loading
+---------------*/
+i.icon.loading {
+  -webkit-animation: icon-loading 2s linear infinite;
+  -moz-animation: icon-loading 2s linear infinite;
+  -ms-animation: icon-loading 2s linear infinite;
+  -o-animation: icon-loading 2s linear infinite;
+  animation: icon-loading 2s linear infinite;
+}
+@keyframes "icon-loading" {
+  from {
+    -webkit-transform: rotate(0deg);
+    -moz-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    -ms-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  to {
+    -webkit-transform: rotate(360deg);
+    -moz-transform: rotate(360deg);
+    -o-transform: rotate(360deg);
+    -ms-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+@-moz-keyframes icon-loading {
+  from {
+    -moz-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  to {
+    -moz-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+@-webkit-keyframes "icon-loading" {
+  from {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  to {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+@-ms-keyframes "icon-loading" {
+  from {
+    -ms-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  to {
+    -ms-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+@-o-keyframes "icon-loading" {
+  from {
+    -o-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  to {
+    -o-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
 /*******************************
              States
 *******************************/
@@ -1224,9 +1296,6 @@ i.circular.icon {
   width: 2em !important;
   height: 2em !important;
 }
-i.circular.icon:before {
-  vertical-align: middle;
-}
 i.circular.inverted.icon {
   border: none;
   -webkit-box-shadow: none;
diff --git a/node/src/documents/collections/table.html.eco b/node/src/documents/collections/table.html.eco
index 316638dfc..4e54a36a2 100755
--- a/node/src/documents/collections/table.html.eco
+++ b/node/src/documents/collections/table.html.eco
@@ -25,7 +25,7 @@ type        : 'UI Collection'
   <div class="example">
     <h4 class="ui header">Table</h4>
     <p>A standard table</p>
-    <div class="ui ignorede info message">
+    <div class="ui ignored info message">
       <p>This example uses a <a href="/elements/segment.html">segment</a> to add padding and a background color.</p>
     </div>
     <table class="ui sortable table segment">
@@ -53,7 +53,7 @@ type        : 'UI Collection'
       </tbody>
       <tfoot>
         <th colspan="3">
-          <div class="ui small blue labeled icon button"><i class="icon add user"></i> Add User</div>
+          <div class="ui small blue labeled icon button"><i class="user icon"></i> Add User</div>
         </th>
       </tfoot>
     </table>
@@ -78,7 +78,7 @@ type        : 'UI Collection'
         </tr>
         <tr class="positive">
           <td>Jimmy</td>
-          <td><i class="icon sketchy checkmark"></i> Approved</td>
+          <td><i class="icon checkmark"></i> Approved</td>
           <td>None</td>
         </tr>
         <tr>
@@ -98,7 +98,7 @@ type        : 'UI Collection'
   <h3 class="ui header">Cells</h3>
   <div class="example">
     <h4 class="ui header">Error</h4>
-    <p>A cell or row may alert the user to an error or a negative value:</p>
+    <p>A cell or row may attention the user to an error or a negative value:</p>
     <table class="ui table segment">
       <thead>
         <th>Name</th>
@@ -119,7 +119,7 @@ type        : 'UI Collection'
         <tr>
           <td>Jamie</td>
           <td>Approved</td>
-          <td class="error"><i class="sketchy alert icon"></i> Classified</td>
+          <td class="error"><i class="attention icon"></i> Classified</td>
         </tr>
         <tr>
           <td>Jill</td>
@@ -147,13 +147,13 @@ type        : 'UI Collection'
         </tr>
         <tr class="warning">
           <td>Jimmy</td>
-          <td><i class="sketchy alert icon"></i> Requires Action</td>
+          <td><i class="attention icon"></i> Requires Action</td>
           <td>None</td>
         </tr>
         <tr>
           <td>Jamie</td>
           <td>Unknown</td>
-          <td class="warning"><i class="sketchy alert icon"></i> Hostile</td>
+          <td class="warning"><i class="attention icon"></i> Hostile</td>
         </tr>
         <tr>
           <td>Jill</td>
diff --git a/node/src/documents/elements/button.html.eco b/node/src/documents/elements/button.html.eco
index 0b1536839..71fb3d676 100755
--- a/node/src/documents/elements/button.html.eco
+++ b/node/src/documents/elements/button.html.eco
@@ -99,7 +99,7 @@ type        : 'UI Element'
     <h4 class="ui header">Down</h4>
     <p>A button can change when pressed using touch or mouse events</p>
     <div class="ui down button">
-      <i class="add user icon"></i>
+      <i class="user icon"></i>
       Follow
     </div>
   </div>
@@ -108,7 +108,7 @@ type        : 'UI Element'
     <h4 class="ui header">Active</h4>
     <p>A button can show it is currently the active user selection</p>
     <div class="ui active button">
-      <i class="add user icon"></i>
+      <i class="user icon"></i>
       Follow
     </div>
   </div>
@@ -117,7 +117,7 @@ type        : 'UI Element'
     <h4 class="ui header">Disabled</h4>
     <p>A button can show it is currently unable to be interacted with</p>
     <div class="ui disabled button">
-      <i class="add user icon"></i>
+      <i class="user icon"></i>
       Followed
     </div>
   </div>
@@ -178,7 +178,7 @@ type        : 'UI Element'
       Add Friend
     </div>
     <div class="ui basic button">
-      <i class="icon desk globe"></i>
+      <i class="icon globe"></i>
       Change Language
     </div>
   </div>
diff --git a/node/src/documents/elements/header.html.eco b/node/src/documents/elements/header.html.eco
index de175fc5e..c67df954e 100755
--- a/node/src/documents/elements/header.html.eco
+++ b/node/src/documents/elements/header.html.eco
@@ -49,7 +49,7 @@ type        : 'UI Element'
     <h4 class="ui header">Icon</h4>
     <p>A header can be formatted to emphasize an icon</p>
     <div class="ui icon header">
-      <i class="icon sketchy question circle"></i>Questions
+      <i class="icon question circle"></i>Questions
       <div class="sub header">Have any questions? Contact Us</div>
     </div>
   </div>
diff --git a/node/src/documents/elements/icon.html.eco.REMOVED.git-id b/node/src/documents/elements/icon.html.eco.REMOVED.git-id
index 21cfbd3f0..93320bd28 100644
--- a/node/src/documents/elements/icon.html.eco.REMOVED.git-id
+++ b/node/src/documents/elements/icon.html.eco.REMOVED.git-id
@@ -1 +1 @@
-913772013d4e32df8e5d23734e4433a036ba562b
\ No newline at end of file
+20df4dcee17d5b7ff5db26966da6180ec15b38b5
\ No newline at end of file
diff --git a/node/src/documents/elements/input.html.eco b/node/src/documents/elements/input.html.eco
index 1efc23163..5df1605d4 100755
--- a/node/src/documents/elements/input.html.eco
+++ b/node/src/documents/elements/input.html.eco
@@ -113,7 +113,7 @@ type        : 'UI Element'
   <div class="another example">
     <div class="ui action input">
       <input type="text" placeholder="Username">
-      <div class="ui teal button"><i class="add user icon"></i> Add users</div>
+      <div class="ui teal button"><i class="user icon"></i> Add users</div>
     </div>
   </div>
   <div class="another example">
diff --git a/node/src/documents/modules/modal.html.eco b/node/src/documents/modules/modal.html.eco
index 705d58234..5fbdae1ff 100755
--- a/node/src/documents/modules/modal.html.eco
+++ b/node/src/documents/modules/modal.html.eco
@@ -31,7 +31,7 @@ type        : 'UI Module'
       <div class="ui black button">Cancel</div>
       <div class="ui green labeled black icon button">
         Add Photo
-        <i class="sketchy checkmark icon"></i>
+        <i class="checkmark icon"></i>
       </div>
     </div>
   </div>
diff --git a/node/src/files/build/less/elements/icon.less b/node/src/files/build/less/elements/icon.less
index 7deff3d31..4c441dde3 100644
--- a/node/src/files/build/less/elements/icon.less
+++ b/node/src/files/build/less/elements/icon.less
@@ -87,19 +87,19 @@ i.icon.angle.right:before { content: "\f105"; }
 i.icon.angle.up:before { content: "\f106"; }
 i.icon.apple:before { content: "\f179"; }
 i.icon.archive:before { content: "\f187"; }
-i.icon.arrow.down:before { content: "\f063"; }
-i.icon.arrow.left:before { content: "\f060"; }
-i.icon.arrow.right:before { content: "\f061"; }
-i.icon.arrow.up:before { content: "\f062"; }
+i.icon.down:before { content: "\f063"; }
+i.icon.left:before { content: "\f060"; }
+i.icon.right:before { content: "\f061"; }
+i.icon.up:before { content: "\f062"; }
 i.icon.asterisk:before { content: "\f069"; }
+i.icon.attachment:before { content: "\f0c6"; }
 i.icon.backward:before { content: "\f04a"; }
 i.icon.ban.circle:before { content: "\f05e"; }
 i.icon.bar.chart:before { content: "\f080"; }
 i.icon.barcode:before { content: "\f02a"; }
-i.icon.beaker:before { content: "\f0c3"; }
 i.icon.beer:before { content: "\f0fc"; }
-i.icon.bell:before { content: "\f0f3"; }
 i.icon.bell.outline:before { content: "\f0a2"; }
+i.icon.bell:before { content: "\f0f3"; }
 i.icon.bitbucket.sign:before { content: "\f172"; }
 i.icon.bitbucket:before { content: "\f171"; }
 i.icon.bitcoin:before { content: "\f15a"; }
@@ -108,7 +108,11 @@ i.icon.bolt:before { content: "\f0e7"; }
 i.icon.book:before { content: "\f02d"; }
 i.icon.bookmark.empty:before { content: "\f097"; }
 i.icon.bookmark:before { content: "\f02e"; }
+i.icon.box.arrow.down:before { content: "\f150"; }
+i.icon.box.arrow.right:before { content: "\f152"; }
+i.icon.box.arrow.up:before { content: "\f151"; }
 i.icon.briefcase:before { content: "\f0b1"; }
+i.icon.browser:before { content: "\f022"; }
 i.icon.bug:before { content: "\f188"; }
 i.icon.building:before { content: "\f0f7"; }
 i.icon.bullhorn:before { content: "\f0a1"; }
@@ -121,23 +125,25 @@ i.icon.caret.down:before { content: "\f0d7"; }
 i.icon.caret.left:before { content: "\f0d9"; }
 i.icon.caret.right:before { content: "\f0da"; }
 i.icon.caret.up:before { content: "\f0d8"; }
+i.icon.cart:before { content: "\f07a"; }
 i.icon.certificate:before { content: "\f0a3"; }
-i.icon.check.minus:before { content: "\f147"; }
-i.icon.check.sign:before { content: "\f14a"; }
-i.icon.check:before { content: "\f046"; }
-i.icon.chevron.down:before { content: "\f078"; }
-i.icon.chevron.left:before { content: "\f053"; }
-i.icon.chevron.right:before { content: "\f054"; }
-i.icon.chevron.sign.down:before { content: "\f13a"; }
-i.icon.chevron.sign.left:before { content: "\f137"; }
-i.icon.chevron.sign.right:before { content: "\f138"; }
-i.icon.chevron.sign.up:before { content: "\f139"; }
-i.icon.chevron.up:before { content: "\f077"; }
-i.icon.circle.down.arrow:before { content: "\f0ab"; }
-i.icon.circle.arrow.left:before { content: "\f0a8"; }
-i.icon.circle.arrow.right:before { content: "\f0a9"; }
-i.icon.circle.arrow.up:before { content: "\f0aa"; }
+i.icon.checkbox.empty:before { content: "\f096"; }
+i.icon.checkbox.minus:before { content: "\f147"; }
+i.icon.checkmark.sign:before { content: "\f14a"; }
+i.icon.checked.checkbox:before { content: "\f046"; }
+i.icon.arrow.down:before { content: "\f078"; }
+i.icon.arrow.left:before { content: "\f053"; }
+i.icon.arrow.right:before { content: "\f054"; }
+i.icon.arrow.up:before { content: "\f077"; }
+i.icon.arrow.sign.down:before { content: "\f13a"; }
+i.icon.arrow.sign.left:before { content: "\f137"; }
+i.icon.arrow.sign.right:before { content: "\f138"; }
+i.icon.arrow.sign.up:before { content: "\f139"; }
+i.icon.circle.left:before { content: "\f0a8"; }
+i.icon.circle.right:before { content: "\f0a9"; }
+i.icon.circle.up:before { content: "\f0aa"; }
 i.icon.circle.blank:before { content: "\f10c"; }
+i.icon.circle.down:before { content: "\f0ab"; }
 i.icon.circle:before { content: "\f111"; }
 i.icon.cloud.download:before { content: "\f0ed"; }
 i.icon.cloud.upload:before { content: "\f0ee"; }
@@ -146,22 +152,18 @@ i.icon.code.fork:before { content: "\f126"; }
 i.icon.code:before { content: "\f121"; }
 i.icon.coffee:before { content: "\f0f4"; }
 i.icon.collapse:before { content: "\f117"; }
-i.icon.box.arrow.up:before { content: "\f151"; }
-i.icon.box.arrow.down:before { content: "\f150"; }
-i.icon.box.arrow.right:before { content: "\f152"; }
-i.icon.layout.column:before { content: "\f0db"; }
 i.icon.comment.outline:before { content: "\f0e5"; }
 i.icon.comment:before { content: "\f075"; }
-i.icon.discussion.outline:before { content: "\f0e6"; }
-i.icon.discussion:before { content: "\f086"; }
 i.icon.compass:before { content: "\f14e"; }
 i.icon.copy:before { content: "\f0c5"; }
-i.icon.payment:before { content: "\f09d"; }
 i.icon.crop:before { content: "\f125"; }
 i.icon.css3:before { content: "\f13c"; }
 i.icon.cut:before { content: "\f0c4"; }
 i.icon.dashboard:before { content: "\f0e4"; }
 i.icon.desktop:before { content: "\f108"; }
+i.icon.chat.outline:before { content: "\f0e6"; }
+i.icon.chat:before { content: "\f086"; }
+i.icon.doctor:before { content: "\f0f0"; }
 i.icon.dollar:before { content: "\f155"; }
 i.icon.double.angle.down:before { content: "\f103"; }
 i.icon.double.angle.left:before { content: "\f100"; }
@@ -181,13 +183,11 @@ i.icon.envelope:before { content: "\f0e0"; }
 i.icon.eraser:before { content: "\f12d"; }
 i.icon.euro:before { content: "\f153"; }
 i.icon.exchange:before { content: "\f0ec"; }
-i.icon.exclamation.sign:before { content: "\f06a"; }
+i.icon.attention:before { content: "\f06a"; }
 i.icon.exclamation:before { content: "\f12a"; }
 i.icon.expand:before { content: "\f116"; }
 i.icon.external.link.sign:before { content: "\f14c"; }
 i.icon.external.link:before { content: "\f08e"; }
-i.icon.hide:before { content: "\f070"; }
-i.icon.unhide:before { content: "\f06e"; }
 i.icon.facebook.sign:before { content: "\f082"; }
 i.icon.facebook:before { content: "\f09a"; }
 i.icon.facetime.video:before { content: "\f03d"; }
@@ -203,34 +203,31 @@ i.icon.film:before { content: "\f008"; }
 i.icon.filter:before { content: "\f0b0"; }
 i.icon.fire.extinguisher:before { content: "\f134"; }
 i.icon.fire:before { content: "\f06d"; }
-i.icon.flag.empty:before { content: "\f11d"; }
 i.icon.flag.checkered:before { content: "\f11e"; }
+i.icon.flag.empty:before { content: "\f11d"; }
 i.icon.flag:before { content: "\f024"; }
 i.icon.flickr:before { content: "\f16e"; }
-i.icon.folder.close.outline:before { content: "\f114"; }
-i.icon.folder.close:before { content: "\f07b"; }
+i.icon.folder.outline:before { content: "\f114"; }
+i.icon.folder:before { content: "\f07b"; }
 i.icon.folder.open.outline:before { content: "\f115"; }
 i.icon.folder.open:before { content: "\f07c"; }
 i.icon.font:before { content: "\f031"; }
 i.icon.food:before { content: "\f0f5"; }
+i.icon.forward.mail:before { content: "\f064"; }
 i.icon.forward:before { content: "\f04e"; }
 i.icon.foursquare:before { content: "\f180"; }
 i.icon.frown:before { content: "\f119"; }
 i.icon.fullscreen:before { content: "\f0b2"; }
 i.icon.gamepad:before { content: "\f11b"; }
-i.icon.pound:before { content: "\f154"; }
-i.icon.setting:before { content: "\f013"; }
-i.icon.settings:before { content: "\f085"; }
 i.icon.gift:before { content: "\f06b"; }
-i.icon.github:before { content: "\f113"; }
 i.icon.github.alternate:before { content: "\f09b"; }
 i.icon.github.sign:before { content: "\f092"; }
+i.icon.github:before { content: "\f113"; }
 i.icon.gittip:before { content: "\f184"; }
 i.icon.glass:before { content: "\f000"; }
 i.icon.globe:before { content: "\f0ac"; }
 i.icon.google.plus.sign:before { content: "\f0d4"; }
 i.icon.google.plus:before { content: "\f0d5"; }
-i.icon.users:before { content: "\f0c0"; }
 i.icon.h.sign:before { content: "\f0fd"; }
 i.icon.hand.down:before { content: "\f0a7"; }
 i.icon.hand.left:before { content: "\f0a5"; }
@@ -240,19 +237,25 @@ i.icon.hdd:before { content: "\f0a0"; }
 i.icon.headphones:before { content: "\f025"; }
 i.icon.heart.empty:before { content: "\f08a"; }
 i.icon.heart:before { content: "\f004"; }
+i.icon.hide:before { content: "\f070"; }
 i.icon.home:before { content: "\f015"; }
 i.icon.hospital:before { content: "\f0f8"; }
 i.icon.html5:before { content: "\f13b"; }
 i.icon.inbox:before { content: "\f01c"; }
 i.icon.indent.left:before { content: "\f03b"; }
 i.icon.indent.right:before { content: "\f03c"; }
-i.icon.info:before { content: "\f05a"; }
 i.icon.info.letter:before { content: "\f129"; }
+i.icon.info:before { content: "\f05a"; }
 i.icon.instagram:before { content: "\f16d"; }
 i.icon.italic:before { content: "\f033"; }
 i.icon.key:before { content: "\f084"; }
 i.icon.keyboard:before { content: "\f11c"; }
+i.icon.lab:before { content: "\f0c3"; }
 i.icon.laptop:before { content: "\f109"; }
+i.icon.layout.block:before { content: "\f009"; }
+i.icon.layout.column:before { content: "\f0db"; }
+i.icon.layout.grid:before { content: "\f00a"; }
+i.icon.layout.list:before { content: "\f00b"; }
 i.icon.leaf:before { content: "\f06c"; }
 i.icon.legal:before { content: "\f0e3"; }
 i.icon.lemon:before { content: "\f094"; }
@@ -263,9 +266,8 @@ i.icon.link:before { content: "\f0c1"; }
 i.icon.linkedin.sign:before { content: "\f08c"; }
 i.icon.linkedin:before { content: "\f0e1"; }
 i.icon.linux:before { content: "\f17c"; }
-i.icon.browser:before { content: "\f022"; }
 i.icon.list.ordered:before { content: "\f0cb"; }
-i.icon.list.unuordered:before { content: "\f0ca"; }
+i.icon.list.unordered:before { content: "\f0ca"; }
 i.icon.list:before { content: "\f03a"; }
 i.icon.location:before { content: "\f124"; }
 i.icon.lock:before { content: "\f023"; }
@@ -275,15 +277,12 @@ i.icon.long.arrow.right:before { content: "\f178"; }
 i.icon.long.arrow.up:before { content: "\f176"; }
 i.icon.magic:before { content: "\f0d0"; }
 i.icon.magnet:before { content: "\f076"; }
-i.icon.forward.mail:before { content: "\f064"; }
 i.icon.mail.reply:before { content: "\f112"; }
 i.icon.male:before { content: "\f183"; }
 i.icon.map.marker:before { content: "\f041"; }
 i.icon.maxcdn:before { content: "\f136"; }
 i.icon.medkit:before { content: "\f0fa"; }
 i.icon.meh:before { content: "\f11a"; }
-i.icon.mute:before { content: "\f131"; }
-i.icon.unmute:before { content: "\f130"; }
 i.icon.minus.sign.alternate:before { content: "\f146"; }
 i.icon.minus.sign:before { content: "\f056"; }
 i.icon.minus:before { content: "\f068"; }
@@ -292,16 +291,18 @@ i.icon.money:before { content: "\f0d6"; }
 i.icon.moon:before { content: "\f186"; }
 i.icon.move:before { content: "\f047"; }
 i.icon.music:before { content: "\f001"; }
+i.icon.mute:before { content: "\f131"; }
 i.icon.ok.circle:before { content: "\f05d"; }
 i.icon.ok.sign:before { content: "\f058"; }
-i.icon.ok:before { content: "\f00c"; }
-i.icon.attachment:before { content: "\f0c6"; }
+i.icon.checkmark:before { content: "\f00c"; }
 i.icon.paste:before { content: "\f0ea"; }
 i.icon.pause:before { content: "\f04c"; }
+i.icon.payment:before { content: "\f09d"; }
 i.icon.pencil:before { content: "\f040"; }
 i.icon.phone.sign:before { content: "\f098"; }
 i.icon.phone:before { content: "\f095"; }
 i.icon.picture:before { content: "\f03e"; }
+i.icon.pin:before { content: "\f08d"; }
 i.icon.pinterest.sign:before { content: "\f0d3"; }
 i.icon.pinterest:before { content: "\f0d2"; }
 i.icon.plane:before { content: "\f072"; }
@@ -311,13 +312,13 @@ i.icon.play:before { content: "\f04b"; }
 i.icon.plus.sign.alternate:before { content: "\f0fe"; }
 i.icon.plus.sign:before { content: "\f055"; }
 i.icon.plus:before { content: "\f067"; }
+i.icon.pound:before { content: "\f154"; }
 i.icon.power.off:before, i.icon.off:before { content: "\f011"; }
 i.icon.print:before { content: "\f02f"; }
-i.icon.pin:before { content: "\f08d"; }
 i.icon.puzzle.piece:before { content: "\f12e"; }
 i.icon.qr.code:before { content: "\f029"; }
+i.icon.question.mark:before { content: "\f128"; }
 i.icon.question:before { content: "\f059"; }
-i.icon.question.letter:before { content: "\f128"; }
 i.icon.quote.left:before { content: "\f10d"; }
 i.icon.quote.right:before { content: "\f10e"; }
 i.icon.random:before { content: "\f074"; }
@@ -325,7 +326,6 @@ i.icon.refresh:before { content: "\f021"; }
 i.icon.remove.circle:before { content: "\f05c"; }
 i.icon.remove.sign:before { content: "\f057"; }
 i.icon.remove:before { content: "\f00d"; }
-i.icon.yuan:before { content: "\f158"; }
 i.icon.renren:before { content: "\f18b"; }
 i.icon.reorder:before { content: "\f0c9"; }
 i.icon.reply.all.mail:before { content: "\f122"; }
@@ -344,31 +344,32 @@ i.icon.rupee:before { content: "\f156"; }
 i.icon.save:before { content: "\f0c7"; }
 i.icon.screenshot:before { content: "\f05b"; }
 i.icon.search:before { content: "\f002"; }
+i.icon.setting:before { content: "\f013"; }
+i.icon.settings:before { content: "\f085"; }
 i.icon.share.sign:before { content: "\f14d"; }
 i.icon.share:before { content: "\f045"; }
 i.icon.shield:before { content: "\f132"; }
-i.icon.cart:before { content: "\f07a"; }
-i.icon.sign:before { content: "\f0c8"; }
-i.icon.signal:before { content: "\f012"; }
 i.icon.sign.in:before { content: "\f090"; }
 i.icon.sign.out:before { content: "\f08b"; }
+i.icon.sign:before { content: "\f0c8"; }
+i.icon.signal:before { content: "\f012"; }
 i.icon.sitemap:before { content: "\f0e8"; }
 i.icon.skype:before { content: "\f17e"; }
 i.icon.smile:before { content: "\f118"; }
 i.icon.sort.alphabet.descending:before { content: "\f15e"; }
 i.icon.sort.alphabet:before { content: "\f15d"; }
+i.icon.sort.ascending:before { content: "\f0de"; }
 i.icon.sort.attributes.descending:before { content: "\f161"; }
 i.icon.sort.attributes:before { content: "\f160"; }
+i.icon.sort.descending:before { content: "\f0dd"; }
 i.icon.sort.order.descending:before { content: "\f163"; }
 i.icon.sort.order:before { content: "\f162"; }
-i.icon.sort.descending:before { content: "\f0dd"; }
-i.icon.sort.ascending:before { content: "\f0de"; }
 i.icon.sort:before { content: "\f0dc"; }
-i.icon.spinner:before { content: "\f110"; }
+i.icon.loading:before { content: "\f110"; }
 i.icon.stackexchange:before { content: "\f16c"; }
 i.icon.star.empty:before { content: "\f006"; }
-i.icon.star.half.full:before,
 i.icon.star.half.empty:before { content: "\f123"; }
+i.icon.star.half.full:before,
 i.icon.star.half:before { content: "\f089"; }
 i.icon.star:before { content: "\f005"; }
 i.icon.step.backward:before { content: "\f048"; }
@@ -388,9 +389,6 @@ i.icon.tasks:before { content: "\f0ae"; }
 i.icon.terminal:before { content: "\f120"; }
 i.icon.text.height:before { content: "\f034"; }
 i.icon.text.width:before { content: "\f035"; }
-i.icon.layout.block:before { content: "\f009"; }
-i.icon.layout.list:before { content: "\f00b"; }
-i.icon.layout.grid:before { content: "\f00a"; }
 i.icon.thumbs.down.outline:before { content: "\f088"; }
 i.icon.thumbs.down:before { content: "\f165"; }
 i.icon.thumbs.up.outline:before { content: "\f087"; }
@@ -407,15 +405,16 @@ i.icon.tumblr:before { content: "\f173"; }
 i.icon.twitter.sign:before { content: "\f081"; }
 i.icon.twitter:before { content: "\f099"; }
 i.icon.umbrella:before { content: "\f0e9"; }
-i.icon.check.empty:before { content: "\f096"; }
 i.icon.underline:before { content: "\f0cd"; }
+i.icon.unhide:before { content: "\f06e"; }
 i.icon.unlink:before { content: "\f127"; }
 i.icon.unlock.alternate:before { content: "\f13e"; }
 i.icon.unlock:before { content: "\f09c"; }
+i.icon.unmute:before { content: "\f130"; }
 i.icon.upload.disk:before { content: "\f093"; }
 i.icon.upload:before { content: "\f01b"; }
-i.icon.doctor:before { content: "\f0f0"; }
 i.icon.user:before { content: "\f007"; }
+i.icon.users:before { content: "\f0c0"; }
 i.icon.vk:before { content: "\f189"; }
 i.icon.volume.down:before { content: "\f027"; }
 i.icon.volume.off:before { content: "\f026"; }
@@ -431,6 +430,7 @@ i.icon.yen:before { content: "\f157"; }
 i.icon.youtube.play:before { content: "\f16a"; }
 i.icon.youtube.sign:before { content: "\f166"; }
 i.icon.youtube:before { content: "\f167"; }
+i.icon.yuan:before { content: "\f158"; }
 i.icon.zoom.in:before { content: "\f00e"; }
 i.icon.zoom.out:before { content: "\f010"; }
 
@@ -439,6 +439,7 @@ i.icon.zoom.out:before { content: "\f010"; }
     Aliases
 ---------------*/
 
+i.icon.check:before { content: "\f00c"; }
 i.icon.close:before { content: "\f00d"; }
 i.icon.delete:before { content: "\f00d"; }
 
@@ -476,6 +477,80 @@ i.icon.right {
 }
 
 
+/*******************************
+             Types
+*******************************/
+
+/*--------------
+    Loading
+---------------*/
+
+i.icon.loading {
+  -webkit-animation: icon-loading 2s linear infinite;
+  -moz-animation: icon-loading 2s linear infinite;
+  -ms-animation: icon-loading 2s linear infinite;
+  -o-animation: icon-loading 2s linear infinite;
+  animation: icon-loading 2s linear infinite;
+}
+@keyframes "icon-loading" {
+ from {
+    -webkit-transform: rotate(0deg);
+    -moz-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    -ms-transform: rotate(0deg);
+    transform: rotate(0deg);
+ }
+ to {
+    -webkit-transform: rotate(360deg);
+    -moz-transform: rotate(360deg);
+    -o-transform: rotate(360deg);
+    -ms-transform: rotate(360deg);
+    transform: rotate(360deg);
+ }
+}
+@-moz-keyframes icon-loading {
+ from {
+   -moz-transform: rotate(0deg);
+   transform: rotate(0deg);
+ }
+ to {
+   -moz-transform: rotate(360deg);
+   transform: rotate(360deg);
+ }
+}
+@-webkit-keyframes "icon-loading" {
+ from {
+   -webkit-transform: rotate(0deg);
+   transform: rotate(0deg);
+ }
+ to {
+   -webkit-transform: rotate(360deg);
+   transform: rotate(360deg);
+ }
+}
+@-ms-keyframes "icon-loading" {
+ from {
+   -ms-transform: rotate(0deg);
+   transform: rotate(0deg);
+ }
+ to {
+   -ms-transform: rotate(360deg);
+   transform: rotate(360deg);
+ }
+}
+@-o-keyframes "icon-loading" {
+ from {
+   -o-transform: rotate(0deg);
+   transform: rotate(0deg);
+ }
+ to {
+   -o-transform: rotate(360deg);
+   transform: rotate(360deg);
+ }
+}
+
+
+
 /*******************************
              States
 *******************************/
@@ -501,6 +576,7 @@ i.icon.disabled {
            Variations
 *******************************/
 
+
 /*-------------------
          Link
 --------------------*/
@@ -537,9 +613,6 @@ i.circular.icon {
   width: 2em !important;
   height: 2em !important;
 }
-i.circular.icon:before {
-  vertical-align: middle;
-}
 i.circular.inverted.icon {
   border: none;
   -webkit-box-shadow: none;
diff --git a/node/src/files/build/uncompressed/elements/icon.css b/node/src/files/build/uncompressed/elements/icon.css
index 10b7ac09b..cddd2af63 100644
--- a/node/src/files/build/uncompressed/elements/icon.css
+++ b/node/src/files/build/uncompressed/elements/icon.css
@@ -101,21 +101,24 @@ i.icon.apple:before {
 i.icon.archive:before {
   content: "\f187";
 }
-i.icon.arrow.down:before {
+i.icon.down:before {
   content: "\f063";
 }
-i.icon.arrow.left:before {
+i.icon.left:before {
   content: "\f060";
 }
-i.icon.arrow.right:before {
+i.icon.right:before {
   content: "\f061";
 }
-i.icon.arrow.up:before {
+i.icon.up:before {
   content: "\f062";
 }
 i.icon.asterisk:before {
   content: "\f069";
 }
+i.icon.attachment:before {
+  content: "\f0c6";
+}
 i.icon.backward:before {
   content: "\f04a";
 }
@@ -128,18 +131,15 @@ i.icon.bar.chart:before {
 i.icon.barcode:before {
   content: "\f02a";
 }
-i.icon.beaker:before {
-  content: "\f0c3";
-}
 i.icon.beer:before {
   content: "\f0fc";
 }
-i.icon.bell:before {
-  content: "\f0f3";
-}
 i.icon.bell.outline:before {
   content: "\f0a2";
 }
+i.icon.bell:before {
+  content: "\f0f3";
+}
 i.icon.bitbucket.sign:before {
   content: "\f172";
 }
@@ -164,9 +164,21 @@ i.icon.bookmark.empty:before {
 i.icon.bookmark:before {
   content: "\f02e";
 }
+i.icon.box.arrow.down:before {
+  content: "\f150";
+}
+i.icon.box.arrow.right:before {
+  content: "\f152";
+}
+i.icon.box.arrow.up:before {
+  content: "\f151";
+}
 i.icon.briefcase:before {
   content: "\f0b1";
 }
+i.icon.browser:before {
+  content: "\f022";
+}
 i.icon.bug:before {
   content: "\f188";
 }
@@ -203,57 +215,63 @@ i.icon.caret.right:before {
 i.icon.caret.up:before {
   content: "\f0d8";
 }
+i.icon.cart:before {
+  content: "\f07a";
+}
 i.icon.certificate:before {
   content: "\f0a3";
 }
-i.icon.check.minus:before {
+i.icon.checkbox.empty:before {
+  content: "\f096";
+}
+i.icon.checkbox.minus:before {
   content: "\f147";
 }
-i.icon.check.sign:before {
+i.icon.checkmark.sign:before {
   content: "\f14a";
 }
-i.icon.check:before {
+i.icon.checked.checkbox:before {
   content: "\f046";
 }
-i.icon.chevron.down:before {
+i.icon.arrow.down:before {
   content: "\f078";
 }
-i.icon.chevron.left:before {
+i.icon.arrow.left:before {
   content: "\f053";
 }
-i.icon.chevron.right:before {
+i.icon.arrow.right:before {
   content: "\f054";
 }
-i.icon.chevron.sign.down:before {
+i.icon.arrow.up:before {
+  content: "\f077";
+}
+i.icon.arrow.sign.down:before {
   content: "\f13a";
 }
-i.icon.chevron.sign.left:before {
+i.icon.arrow.sign.left:before {
   content: "\f137";
 }
-i.icon.chevron.sign.right:before {
+i.icon.arrow.sign.right:before {
   content: "\f138";
 }
-i.icon.chevron.sign.up:before {
+i.icon.arrow.sign.up:before {
   content: "\f139";
 }
-i.icon.chevron.up:before {
-  content: "\f077";
-}
-i.icon.circle.down.arrow:before {
-  content: "\f0ab";
-}
-i.icon.circle.arrow.left:before {
+i.icon.circle.left:before {
   content: "\f0a8";
 }
-i.icon.circle.arrow.right:before {
+i.icon.circle.right:before {
   content: "\f0a9";
 }
-i.icon.circle.arrow.up:before {
+i.icon.circle.up:before {
   content: "\f0aa";
 }
 i.icon.circle.blank:before {
   content: "\f10c";
 }
+i.icon.circle.down:before {
+  content: "\f0ab";
+}
 i.icon.circle:before {
   content: "\f111";
 }
@@ -278,39 +296,18 @@ i.icon.coffee:before {
 i.icon.collapse:before {
   content: "\f117";
 }
-i.icon.box.arrow.up:before {
-  content: "\f151";
-}
-i.icon.box.arrow.down:before {
-  content: "\f150";
-}
-i.icon.box.arrow.right:before {
-  content: "\f152";
-}
-i.icon.layout.column:before {
-  content: "\f0db";
-}
 i.icon.comment.outline:before {
   content: "\f0e5";
 }
 i.icon.comment:before {
   content: "\f075";
 }
-i.icon.discussion.outline:before {
-  content: "\f0e6";
-}
-i.icon.discussion:before {
-  content: "\f086";
-}
 i.icon.compass:before {
   content: "\f14e";
 }
 i.icon.copy:before {
   content: "\f0c5";
 }
-i.icon.payment:before {
-  content: "\f09d";
-}
 i.icon.crop:before {
   content: "\f125";
 }
@@ -326,6 +323,15 @@ i.icon.dashboard:before {
 i.icon.desktop:before {
   content: "\f108";
 }
+i.icon.chat.outline:before {
+  content: "\f0e6";
+}
+i.icon.chat:before {
+  content: "\f086";
+}
+i.icon.doctor:before {
+  content: "\f0f0";
+}
 i.icon.dollar:before {
   content: "\f155";
 }
@@ -383,7 +389,7 @@ i.icon.euro:before {
 i.icon.exchange:before {
   content: "\f0ec";
 }
-i.icon.exclamation.sign:before {
+i.icon.attention:before {
   content: "\f06a";
 }
 i.icon.exclamation:before {
@@ -398,12 +404,6 @@ i.icon.external.link.sign:before {
 i.icon.external.link:before {
   content: "\f08e";
 }
-i.icon.hide:before {
-  content: "\f070";
-}
-i.icon.unhide:before {
-  content: "\f06e";
-}
 i.icon.facebook.sign:before {
   content: "\f082";
 }
@@ -449,22 +449,22 @@ i.icon.fire.extinguisher:before {
 i.icon.fire:before {
   content: "\f06d";
 }
-i.icon.flag.empty:before {
-  content: "\f11d";
-}
 i.icon.flag.checkered:before {
   content: "\f11e";
 }
+i.icon.flag.empty:before {
+  content: "\f11d";
+}
 i.icon.flag:before {
   content: "\f024";
 }
 i.icon.flickr:before {
   content: "\f16e";
 }
-i.icon.folder.close.outline:before {
+i.icon.folder.outline:before {
   content: "\f114";
 }
-i.icon.folder.close:before {
+i.icon.folder:before {
   content: "\f07b";
 }
 i.icon.folder.open.outline:before {
@@ -479,6 +479,9 @@ i.icon.font:before {
 i.icon.food:before {
   content: "\f0f5";
 }
+i.icon.forward.mail:before {
+  content: "\f064";
+}
 i.icon.forward:before {
   content: "\f04e";
 }
@@ -494,27 +497,18 @@ i.icon.fullscreen:before {
 i.icon.gamepad:before {
   content: "\f11b";
 }
-i.icon.pound:before {
-  content: "\f154";
-}
-i.icon.setting:before {
-  content: "\f013";
-}
-i.icon.settings:before {
-  content: "\f085";
-}
 i.icon.gift:before {
   content: "\f06b";
 }
-i.icon.github:before {
-  content: "\f113";
-}
 i.icon.github.alternate:before {
   content: "\f09b";
 }
 i.icon.github.sign:before {
   content: "\f092";
 }
+i.icon.github:before {
+  content: "\f113";
+}
 i.icon.gittip:before {
   content: "\f184";
 }
@@ -530,9 +524,6 @@ i.icon.google.plus.sign:before {
 i.icon.google.plus:before {
   content: "\f0d5";
 }
-i.icon.users:before {
-  content: "\f0c0";
-}
 i.icon.h.sign:before {
   content: "\f0fd";
 }
@@ -560,6 +551,9 @@ i.icon.heart.empty:before {
 i.icon.heart:before {
   content: "\f004";
 }
+i.icon.hide:before {
+  content: "\f070";
+}
 i.icon.home:before {
   content: "\f015";
 }
@@ -578,12 +572,12 @@ i.icon.indent.left:before {
 i.icon.indent.right:before {
   content: "\f03c";
 }
-i.icon.info:before {
-  content: "\f05a";
-}
 i.icon.info.letter:before {
   content: "\f129";
 }
+i.icon.info:before {
+  content: "\f05a";
+}
 i.icon.instagram:before {
   content: "\f16d";
 }
@@ -596,9 +590,24 @@ i.icon.key:before {
 i.icon.keyboard:before {
   content: "\f11c";
 }
+i.icon.lab:before {
+  content: "\f0c3";
+}
 i.icon.laptop:before {
   content: "\f109";
 }
+i.icon.layout.block:before {
+  content: "\f009";
+}
+i.icon.layout.column:before {
+  content: "\f0db";
+}
+i.icon.layout.grid:before {
+  content: "\f00a";
+}
+i.icon.layout.list:before {
+  content: "\f00b";
+}
 i.icon.leaf:before {
   content: "\f06c";
 }
@@ -629,13 +638,10 @@ i.icon.linkedin:before {
 i.icon.linux:before {
   content: "\f17c";
 }
-i.icon.browser:before {
-  content: "\f022";
-}
 i.icon.list.ordered:before {
   content: "\f0cb";
 }
-i.icon.list.unuordered:before {
+i.icon.list.unordered:before {
   content: "\f0ca";
 }
 i.icon.list:before {
@@ -665,9 +671,6 @@ i.icon.magic:before {
 i.icon.magnet:before {
   content: "\f076";
 }
-i.icon.forward.mail:before {
-  content: "\f064";
-}
 i.icon.mail.reply:before {
   content: "\f112";
 }
@@ -686,12 +689,6 @@ i.icon.medkit:before {
 i.icon.meh:before {
   content: "\f11a";
 }
-i.icon.mute:before {
-  content: "\f131";
-}
-i.icon.unmute:before {
-  content: "\f130";
-}
 i.icon.minus.sign.alternate:before {
   content: "\f146";
 }
@@ -716,24 +713,27 @@ i.icon.move:before {
 i.icon.music:before {
   content: "\f001";
 }
+i.icon.mute:before {
+  content: "\f131";
+}
 i.icon.ok.circle:before {
   content: "\f05d";
 }
 i.icon.ok.sign:before {
   content: "\f058";
 }
-i.icon.ok:before {
+i.icon.checkmark:before {
   content: "\f00c";
 }
-i.icon.attachment:before {
-  content: "\f0c6";
-}
 i.icon.paste:before {
   content: "\f0ea";
 }
 i.icon.pause:before {
   content: "\f04c";
 }
+i.icon.payment:before {
+  content: "\f09d";
+}
 i.icon.pencil:before {
   content: "\f040";
 }
@@ -746,6 +746,9 @@ i.icon.phone:before {
 i.icon.picture:before {
   content: "\f03e";
 }
+i.icon.pin:before {
+  content: "\f08d";
+}
 i.icon.pinterest.sign:before {
   content: "\f0d3";
 }
@@ -773,6 +776,9 @@ i.icon.plus.sign:before {
 i.icon.plus:before {
   content: "\f067";
 }
+i.icon.pound:before {
+  content: "\f154";
+}
 i.icon.power.off:before,
 i.icon.off:before {
   content: "\f011";
@@ -780,21 +786,18 @@ i.icon.off:before {
 i.icon.print:before {
   content: "\f02f";
 }
-i.icon.pin:before {
-  content: "\f08d";
-}
 i.icon.puzzle.piece:before {
   content: "\f12e";
 }
 i.icon.qr.code:before {
   content: "\f029";
 }
+i.icon.question.mark:before {
+  content: "\f128";
+}
 i.icon.question:before {
   content: "\f059";
 }
-i.icon.question.letter:before {
-  content: "\f128";
-}
 i.icon.quote.left:before {
   content: "\f10d";
 }
@@ -816,9 +819,6 @@ i.icon.remove.sign:before {
 i.icon.remove:before {
   content: "\f00d";
 }
-i.icon.yuan:before {
-  content: "\f158";
-}
 i.icon.renren:before {
   content: "\f18b";
 }
@@ -875,6 +875,12 @@ i.icon.screenshot:before {
 i.icon.search:before {
   content: "\f002";
 }
+i.icon.setting:before {
+  content: "\f013";
+}
+i.icon.settings:before {
+  content: "\f085";
+}
 i.icon.share.sign:before {
   content: "\f14d";
 }
@@ -884,8 +890,11 @@ i.icon.share:before {
 i.icon.shield:before {
   content: "\f132";
 }
-i.icon.cart:before {
-  content: "\f07a";
+i.icon.sign.in:before {
+  content: "\f090";
+}
+i.icon.sign.out:before {
+  content: "\f08b";
 }
 i.icon.sign:before {
   content: "\f0c8";
@@ -893,12 +902,6 @@ i.icon.sign:before {
 i.icon.signal:before {
   content: "\f012";
 }
-i.icon.sign.in:before {
-  content: "\f090";
-}
-i.icon.sign.out:before {
-  content: "\f08b";
-}
 i.icon.sitemap:before {
   content: "\f0e8";
 }
@@ -914,28 +917,28 @@ i.icon.sort.alphabet.descending:before {
 i.icon.sort.alphabet:before {
   content: "\f15d";
 }
+i.icon.sort.ascending:before {
+  content: "\f0de";
+}
 i.icon.sort.attributes.descending:before {
   content: "\f161";
 }
 i.icon.sort.attributes:before {
   content: "\f160";
 }
+i.icon.sort.descending:before {
+  content: "\f0dd";
+}
 i.icon.sort.order.descending:before {
   content: "\f163";
 }
 i.icon.sort.order:before {
   content: "\f162";
 }
-i.icon.sort.descending:before {
-  content: "\f0dd";
-}
-i.icon.sort.ascending:before {
-  content: "\f0de";
-}
 i.icon.sort:before {
   content: "\f0dc";
 }
-i.icon.spinner:before {
+i.icon.loading:before {
   content: "\f110";
 }
 i.icon.stackexchange:before {
@@ -944,10 +947,10 @@ i.icon.stackexchange:before {
 i.icon.star.empty:before {
   content: "\f006";
 }
-i.icon.star.half.full:before,
 i.icon.star.half.empty:before {
   content: "\f123";
 }
+i.icon.star.half.full:before,
 i.icon.star.half:before {
   content: "\f089";
 }
@@ -1005,15 +1008,6 @@ i.icon.text.height:before {
 i.icon.text.width:before {
   content: "\f035";
 }
-i.icon.layout.block:before {
-  content: "\f009";
-}
-i.icon.layout.list:before {
-  content: "\f00b";
-}
-i.icon.layout.grid:before {
-  content: "\f00a";
-}
 i.icon.thumbs.down.outline:before {
   content: "\f088";
 }
@@ -1062,12 +1056,12 @@ i.icon.twitter:before {
 i.icon.umbrella:before {
   content: "\f0e9";
 }
-i.icon.check.empty:before {
-  content: "\f096";
-}
 i.icon.underline:before {
   content: "\f0cd";
 }
+i.icon.unhide:before {
+  content: "\f06e";
+}
 i.icon.unlink:before {
   content: "\f127";
 }
@@ -1077,18 +1071,21 @@ i.icon.unlock.alternate:before {
 i.icon.unlock:before {
   content: "\f09c";
 }
+i.icon.unmute:before {
+  content: "\f130";
+}
 i.icon.upload.disk:before {
   content: "\f093";
 }
 i.icon.upload:before {
   content: "\f01b";
 }
-i.icon.doctor:before {
-  content: "\f0f0";
-}
 i.icon.user:before {
   content: "\f007";
 }
+i.icon.users:before {
+  content: "\f0c0";
+}
 i.icon.vk:before {
   content: "\f189";
 }
@@ -1134,6 +1131,9 @@ i.icon.youtube.sign:before {
 i.icon.youtube:before {
   content: "\f167";
 }
+i.icon.yuan:before {
+  content: "\f158";
+}
 i.icon.zoom.in:before {
   content: "\f00e";
 }
@@ -1143,6 +1143,9 @@ i.icon.zoom.out:before {
 /*--------------
     Aliases
 ---------------*/
+i.icon.check:before {
+  content: "\f00c";
+}
 i.icon.close:before {
   content: "\f00d";
 }
@@ -1176,6 +1179,75 @@ i.icon.right {
   width: auto;
   margin: 0em 0em 0em 0.5em;
 }
+/*******************************
+             Types
+*******************************/
+/*--------------
+    Loading
+---------------*/
+i.icon.loading {
+  -webkit-animation: icon-loading 2s linear infinite;
+  -moz-animation: icon-loading 2s linear infinite;
+  -ms-animation: icon-loading 2s linear infinite;
+  -o-animation: icon-loading 2s linear infinite;
+  animation: icon-loading 2s linear infinite;
+}
+@keyframes "icon-loading" {
+  from {
+    -webkit-transform: rotate(0deg);
+    -moz-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    -ms-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  to {
+    -webkit-transform: rotate(360deg);
+    -moz-transform: rotate(360deg);
+    -o-transform: rotate(360deg);
+    -ms-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+@-moz-keyframes icon-loading {
+  from {
+    -moz-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  to {
+    -moz-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+@-webkit-keyframes "icon-loading" {
+  from {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  to {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+@-ms-keyframes "icon-loading" {
+  from {
+    -ms-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  to {
+    -ms-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+@-o-keyframes "icon-loading" {
+  from {
+    -o-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  to {
+    -o-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
 /*******************************
              States
 *******************************/
@@ -1224,9 +1296,6 @@ i.circular.icon {
   width: 2em !important;
   height: 2em !important;
 }
-i.circular.icon:before {
-  vertical-align: middle;
-}
 i.circular.inverted.icon {
   border: none;
   -webkit-box-shadow: none;
diff --git a/node/src/files/stylesheets/semantic.css b/node/src/files/stylesheets/semantic.css
index dda5d97c7..2db013139 100755
--- a/node/src/files/stylesheets/semantic.css
+++ b/node/src/files/stylesheets/semantic.css
@@ -975,6 +975,11 @@ a:hover {
   -ms-transition: opacity 0.3s ease-out;
   transition: opacity 0.3s ease-out;
 }
+
+#example .example i.code:before {
+  font-family: 'Basic Icons';
+  content: '\e714';
+}
 #example .example:hover i.code {
   opacity: 0.7;
 }
@@ -1132,6 +1137,7 @@ body.progress .ui.progress .bar {
   font-family: 'Basic Icons';
 }
 
+
 #example .fixed.column,
 #example .fixed.segment {
   position: fixed;
diff --git a/node/src/layouts/default.html.eco b/node/src/layouts/default.html.eco
index 479ff69c1..243e22e9b 100755
--- a/node/src/layouts/default.html.eco
+++ b/node/src/layouts/default.html.eco
@@ -190,7 +190,7 @@
       <% if pageNumber > 1 and currentCollection[pageNumber - 2]?: %>
       <a class="icon item" href="<%= currentCollection[pageNumber - 2].url %>"><i class="left arrow icon"></i></a>
       <% else: %>
-      <div class="disabled item"><i class="left arrow icon"></i></div>
+      <div class="disabled icon item"><i class="left arrow icon"></i></div>
       <% end %>
       <div class="section ui dropdown link item">
         <span class="count"><%= "#{pageNumber} of #{pageCount}" %></span>
@@ -205,7 +205,7 @@
       <% if pageNumber isnt pageCount and currentCollection[pageNumber]?: %>
       <a class="icon item" href="<%= currentCollection[pageNumber].url %>"><i class="right arrow icon"></i></a>
       <% else: %>
-      <div class="disabled item"><i class="right arrow icon"></i></div>
+      <div class="disabled icon item"><i class="right arrow icon"></i></div>
       <% end %>
       <div class="right menu">
         <div class="vertically fitted borderless item">
diff --git a/src/elements/icon.less b/src/elements/icon.less
index 7deff3d31..4c441dde3 100755
--- a/src/elements/icon.less
+++ b/src/elements/icon.less
@@ -87,19 +87,19 @@ i.icon.angle.right:before { content: "\f105"; }
 i.icon.angle.up:before { content: "\f106"; }
 i.icon.apple:before { content: "\f179"; }
 i.icon.archive:before { content: "\f187"; }
-i.icon.arrow.down:before { content: "\f063"; }
-i.icon.arrow.left:before { content: "\f060"; }
-i.icon.arrow.right:before { content: "\f061"; }
-i.icon.arrow.up:before { content: "\f062"; }
+i.icon.down:before { content: "\f063"; }
+i.icon.left:before { content: "\f060"; }
+i.icon.right:before { content: "\f061"; }
+i.icon.up:before { content: "\f062"; }
 i.icon.asterisk:before { content: "\f069"; }
+i.icon.attachment:before { content: "\f0c6"; }
 i.icon.backward:before { content: "\f04a"; }
 i.icon.ban.circle:before { content: "\f05e"; }
 i.icon.bar.chart:before { content: "\f080"; }
 i.icon.barcode:before { content: "\f02a"; }
-i.icon.beaker:before { content: "\f0c3"; }
 i.icon.beer:before { content: "\f0fc"; }
-i.icon.bell:before { content: "\f0f3"; }
 i.icon.bell.outline:before { content: "\f0a2"; }
+i.icon.bell:before { content: "\f0f3"; }
 i.icon.bitbucket.sign:before { content: "\f172"; }
 i.icon.bitbucket:before { content: "\f171"; }
 i.icon.bitcoin:before { content: "\f15a"; }
@@ -108,7 +108,11 @@ i.icon.bolt:before { content: "\f0e7"; }
 i.icon.book:before { content: "\f02d"; }
 i.icon.bookmark.empty:before { content: "\f097"; }
 i.icon.bookmark:before { content: "\f02e"; }
+i.icon.box.arrow.down:before { content: "\f150"; }
+i.icon.box.arrow.right:before { content: "\f152"; }
+i.icon.box.arrow.up:before { content: "\f151"; }
 i.icon.briefcase:before { content: "\f0b1"; }
+i.icon.browser:before { content: "\f022"; }
 i.icon.bug:before { content: "\f188"; }
 i.icon.building:before { content: "\f0f7"; }
 i.icon.bullhorn:before { content: "\f0a1"; }
@@ -121,23 +125,25 @@ i.icon.caret.down:before { content: "\f0d7"; }
 i.icon.caret.left:before { content: "\f0d9"; }
 i.icon.caret.right:before { content: "\f0da"; }
 i.icon.caret.up:before { content: "\f0d8"; }
+i.icon.cart:before { content: "\f07a"; }
 i.icon.certificate:before { content: "\f0a3"; }
-i.icon.check.minus:before { content: "\f147"; }
-i.icon.check.sign:before { content: "\f14a"; }
-i.icon.check:before { content: "\f046"; }
-i.icon.chevron.down:before { content: "\f078"; }
-i.icon.chevron.left:before { content: "\f053"; }
-i.icon.chevron.right:before { content: "\f054"; }
-i.icon.chevron.sign.down:before { content: "\f13a"; }
-i.icon.chevron.sign.left:before { content: "\f137"; }
-i.icon.chevron.sign.right:before { content: "\f138"; }
-i.icon.chevron.sign.up:before { content: "\f139"; }
-i.icon.chevron.up:before { content: "\f077"; }
-i.icon.circle.down.arrow:before { content: "\f0ab"; }
-i.icon.circle.arrow.left:before { content: "\f0a8"; }
-i.icon.circle.arrow.right:before { content: "\f0a9"; }
-i.icon.circle.arrow.up:before { content: "\f0aa"; }
+i.icon.checkbox.empty:before { content: "\f096"; }
+i.icon.checkbox.minus:before { content: "\f147"; }
+i.icon.checkmark.sign:before { content: "\f14a"; }
+i.icon.checked.checkbox:before { content: "\f046"; }
+i.icon.arrow.down:before { content: "\f078"; }
+i.icon.arrow.left:before { content: "\f053"; }
+i.icon.arrow.right:before { content: "\f054"; }
+i.icon.arrow.up:before { content: "\f077"; }
+i.icon.arrow.sign.down:before { content: "\f13a"; }
+i.icon.arrow.sign.left:before { content: "\f137"; }
+i.icon.arrow.sign.right:before { content: "\f138"; }
+i.icon.arrow.sign.up:before { content: "\f139"; }
+i.icon.circle.left:before { content: "\f0a8"; }
+i.icon.circle.right:before { content: "\f0a9"; }
+i.icon.circle.up:before { content: "\f0aa"; }
 i.icon.circle.blank:before { content: "\f10c"; }
+i.icon.circle.down:before { content: "\f0ab"; }
 i.icon.circle:before { content: "\f111"; }
 i.icon.cloud.download:before { content: "\f0ed"; }
 i.icon.cloud.upload:before { content: "\f0ee"; }
@@ -146,22 +152,18 @@ i.icon.code.fork:before { content: "\f126"; }
 i.icon.code:before { content: "\f121"; }
 i.icon.coffee:before { content: "\f0f4"; }
 i.icon.collapse:before { content: "\f117"; }
-i.icon.box.arrow.up:before { content: "\f151"; }
-i.icon.box.arrow.down:before { content: "\f150"; }
-i.icon.box.arrow.right:before { content: "\f152"; }
-i.icon.layout.column:before { content: "\f0db"; }
 i.icon.comment.outline:before { content: "\f0e5"; }
 i.icon.comment:before { content: "\f075"; }
-i.icon.discussion.outline:before { content: "\f0e6"; }
-i.icon.discussion:before { content: "\f086"; }
 i.icon.compass:before { content: "\f14e"; }
 i.icon.copy:before { content: "\f0c5"; }
-i.icon.payment:before { content: "\f09d"; }
 i.icon.crop:before { content: "\f125"; }
 i.icon.css3:before { content: "\f13c"; }
 i.icon.cut:before { content: "\f0c4"; }
 i.icon.dashboard:before { content: "\f0e4"; }
 i.icon.desktop:before { content: "\f108"; }
+i.icon.chat.outline:before { content: "\f0e6"; }
+i.icon.chat:before { content: "\f086"; }
+i.icon.doctor:before { content: "\f0f0"; }
 i.icon.dollar:before { content: "\f155"; }
 i.icon.double.angle.down:before { content: "\f103"; }
 i.icon.double.angle.left:before { content: "\f100"; }
@@ -181,13 +183,11 @@ i.icon.envelope:before { content: "\f0e0"; }
 i.icon.eraser:before { content: "\f12d"; }
 i.icon.euro:before { content: "\f153"; }
 i.icon.exchange:before { content: "\f0ec"; }
-i.icon.exclamation.sign:before { content: "\f06a"; }
+i.icon.attention:before { content: "\f06a"; }
 i.icon.exclamation:before { content: "\f12a"; }
 i.icon.expand:before { content: "\f116"; }
 i.icon.external.link.sign:before { content: "\f14c"; }
 i.icon.external.link:before { content: "\f08e"; }
-i.icon.hide:before { content: "\f070"; }
-i.icon.unhide:before { content: "\f06e"; }
 i.icon.facebook.sign:before { content: "\f082"; }
 i.icon.facebook:before { content: "\f09a"; }
 i.icon.facetime.video:before { content: "\f03d"; }
@@ -203,34 +203,31 @@ i.icon.film:before { content: "\f008"; }
 i.icon.filter:before { content: "\f0b0"; }
 i.icon.fire.extinguisher:before { content: "\f134"; }
 i.icon.fire:before { content: "\f06d"; }
-i.icon.flag.empty:before { content: "\f11d"; }
 i.icon.flag.checkered:before { content: "\f11e"; }
+i.icon.flag.empty:before { content: "\f11d"; }
 i.icon.flag:before { content: "\f024"; }
 i.icon.flickr:before { content: "\f16e"; }
-i.icon.folder.close.outline:before { content: "\f114"; }
-i.icon.folder.close:before { content: "\f07b"; }
+i.icon.folder.outline:before { content: "\f114"; }
+i.icon.folder:before { content: "\f07b"; }
 i.icon.folder.open.outline:before { content: "\f115"; }
 i.icon.folder.open:before { content: "\f07c"; }
 i.icon.font:before { content: "\f031"; }
 i.icon.food:before { content: "\f0f5"; }
+i.icon.forward.mail:before { content: "\f064"; }
 i.icon.forward:before { content: "\f04e"; }
 i.icon.foursquare:before { content: "\f180"; }
 i.icon.frown:before { content: "\f119"; }
 i.icon.fullscreen:before { content: "\f0b2"; }
 i.icon.gamepad:before { content: "\f11b"; }
-i.icon.pound:before { content: "\f154"; }
-i.icon.setting:before { content: "\f013"; }
-i.icon.settings:before { content: "\f085"; }
 i.icon.gift:before { content: "\f06b"; }
-i.icon.github:before { content: "\f113"; }
 i.icon.github.alternate:before { content: "\f09b"; }
 i.icon.github.sign:before { content: "\f092"; }
+i.icon.github:before { content: "\f113"; }
 i.icon.gittip:before { content: "\f184"; }
 i.icon.glass:before { content: "\f000"; }
 i.icon.globe:before { content: "\f0ac"; }
 i.icon.google.plus.sign:before { content: "\f0d4"; }
 i.icon.google.plus:before { content: "\f0d5"; }
-i.icon.users:before { content: "\f0c0"; }
 i.icon.h.sign:before { content: "\f0fd"; }
 i.icon.hand.down:before { content: "\f0a7"; }
 i.icon.hand.left:before { content: "\f0a5"; }
@@ -240,19 +237,25 @@ i.icon.hdd:before { content: "\f0a0"; }
 i.icon.headphones:before { content: "\f025"; }
 i.icon.heart.empty:before { content: "\f08a"; }
 i.icon.heart:before { content: "\f004"; }
+i.icon.hide:before { content: "\f070"; }
 i.icon.home:before { content: "\f015"; }
 i.icon.hospital:before { content: "\f0f8"; }
 i.icon.html5:before { content: "\f13b"; }
 i.icon.inbox:before { content: "\f01c"; }
 i.icon.indent.left:before { content: "\f03b"; }
 i.icon.indent.right:before { content: "\f03c"; }
-i.icon.info:before { content: "\f05a"; }
 i.icon.info.letter:before { content: "\f129"; }
+i.icon.info:before { content: "\f05a"; }
 i.icon.instagram:before { content: "\f16d"; }
 i.icon.italic:before { content: "\f033"; }
 i.icon.key:before { content: "\f084"; }
 i.icon.keyboard:before { content: "\f11c"; }
+i.icon.lab:before { content: "\f0c3"; }
 i.icon.laptop:before { content: "\f109"; }
+i.icon.layout.block:before { content: "\f009"; }
+i.icon.layout.column:before { content: "\f0db"; }
+i.icon.layout.grid:before { content: "\f00a"; }
+i.icon.layout.list:before { content: "\f00b"; }
 i.icon.leaf:before { content: "\f06c"; }
 i.icon.legal:before { content: "\f0e3"; }
 i.icon.lemon:before { content: "\f094"; }
@@ -263,9 +266,8 @@ i.icon.link:before { content: "\f0c1"; }
 i.icon.linkedin.sign:before { content: "\f08c"; }
 i.icon.linkedin:before { content: "\f0e1"; }
 i.icon.linux:before { content: "\f17c"; }
-i.icon.browser:before { content: "\f022"; }
 i.icon.list.ordered:before { content: "\f0cb"; }
-i.icon.list.unuordered:before { content: "\f0ca"; }
+i.icon.list.unordered:before { content: "\f0ca"; }
 i.icon.list:before { content: "\f03a"; }
 i.icon.location:before { content: "\f124"; }
 i.icon.lock:before { content: "\f023"; }
@@ -275,15 +277,12 @@ i.icon.long.arrow.right:before { content: "\f178"; }
 i.icon.long.arrow.up:before { content: "\f176"; }
 i.icon.magic:before { content: "\f0d0"; }
 i.icon.magnet:before { content: "\f076"; }
-i.icon.forward.mail:before { content: "\f064"; }
 i.icon.mail.reply:before { content: "\f112"; }
 i.icon.male:before { content: "\f183"; }
 i.icon.map.marker:before { content: "\f041"; }
 i.icon.maxcdn:before { content: "\f136"; }
 i.icon.medkit:before { content: "\f0fa"; }
 i.icon.meh:before { content: "\f11a"; }
-i.icon.mute:before { content: "\f131"; }
-i.icon.unmute:before { content: "\f130"; }
 i.icon.minus.sign.alternate:before { content: "\f146"; }
 i.icon.minus.sign:before { content: "\f056"; }
 i.icon.minus:before { content: "\f068"; }
@@ -292,16 +291,18 @@ i.icon.money:before { content: "\f0d6"; }
 i.icon.moon:before { content: "\f186"; }
 i.icon.move:before { content: "\f047"; }
 i.icon.music:before { content: "\f001"; }
+i.icon.mute:before { content: "\f131"; }
 i.icon.ok.circle:before { content: "\f05d"; }
 i.icon.ok.sign:before { content: "\f058"; }
-i.icon.ok:before { content: "\f00c"; }
-i.icon.attachment:before { content: "\f0c6"; }
+i.icon.checkmark:before { content: "\f00c"; }
 i.icon.paste:before { content: "\f0ea"; }
 i.icon.pause:before { content: "\f04c"; }
+i.icon.payment:before { content: "\f09d"; }
 i.icon.pencil:before { content: "\f040"; }
 i.icon.phone.sign:before { content: "\f098"; }
 i.icon.phone:before { content: "\f095"; }
 i.icon.picture:before { content: "\f03e"; }
+i.icon.pin:before { content: "\f08d"; }
 i.icon.pinterest.sign:before { content: "\f0d3"; }
 i.icon.pinterest:before { content: "\f0d2"; }
 i.icon.plane:before { content: "\f072"; }
@@ -311,13 +312,13 @@ i.icon.play:before { content: "\f04b"; }
 i.icon.plus.sign.alternate:before { content: "\f0fe"; }
 i.icon.plus.sign:before { content: "\f055"; }
 i.icon.plus:before { content: "\f067"; }
+i.icon.pound:before { content: "\f154"; }
 i.icon.power.off:before, i.icon.off:before { content: "\f011"; }
 i.icon.print:before { content: "\f02f"; }
-i.icon.pin:before { content: "\f08d"; }
 i.icon.puzzle.piece:before { content: "\f12e"; }
 i.icon.qr.code:before { content: "\f029"; }
+i.icon.question.mark:before { content: "\f128"; }
 i.icon.question:before { content: "\f059"; }
-i.icon.question.letter:before { content: "\f128"; }
 i.icon.quote.left:before { content: "\f10d"; }
 i.icon.quote.right:before { content: "\f10e"; }
 i.icon.random:before { content: "\f074"; }
@@ -325,7 +326,6 @@ i.icon.refresh:before { content: "\f021"; }
 i.icon.remove.circle:before { content: "\f05c"; }
 i.icon.remove.sign:before { content: "\f057"; }
 i.icon.remove:before { content: "\f00d"; }
-i.icon.yuan:before { content: "\f158"; }
 i.icon.renren:before { content: "\f18b"; }
 i.icon.reorder:before { content: "\f0c9"; }
 i.icon.reply.all.mail:before { content: "\f122"; }
@@ -344,31 +344,32 @@ i.icon.rupee:before { content: "\f156"; }
 i.icon.save:before { content: "\f0c7"; }
 i.icon.screenshot:before { content: "\f05b"; }
 i.icon.search:before { content: "\f002"; }
+i.icon.setting:before { content: "\f013"; }
+i.icon.settings:before { content: "\f085"; }
 i.icon.share.sign:before { content: "\f14d"; }
 i.icon.share:before { content: "\f045"; }
 i.icon.shield:before { content: "\f132"; }
-i.icon.cart:before { content: "\f07a"; }
-i.icon.sign:before { content: "\f0c8"; }
-i.icon.signal:before { content: "\f012"; }
 i.icon.sign.in:before { content: "\f090"; }
 i.icon.sign.out:before { content: "\f08b"; }
+i.icon.sign:before { content: "\f0c8"; }
+i.icon.signal:before { content: "\f012"; }
 i.icon.sitemap:before { content: "\f0e8"; }
 i.icon.skype:before { content: "\f17e"; }
 i.icon.smile:before { content: "\f118"; }
 i.icon.sort.alphabet.descending:before { content: "\f15e"; }
 i.icon.sort.alphabet:before { content: "\f15d"; }
+i.icon.sort.ascending:before { content: "\f0de"; }
 i.icon.sort.attributes.descending:before { content: "\f161"; }
 i.icon.sort.attributes:before { content: "\f160"; }
+i.icon.sort.descending:before { content: "\f0dd"; }
 i.icon.sort.order.descending:before { content: "\f163"; }
 i.icon.sort.order:before { content: "\f162"; }
-i.icon.sort.descending:before { content: "\f0dd"; }
-i.icon.sort.ascending:before { content: "\f0de"; }
 i.icon.sort:before { content: "\f0dc"; }
-i.icon.spinner:before { content: "\f110"; }
+i.icon.loading:before { content: "\f110"; }
 i.icon.stackexchange:before { content: "\f16c"; }
 i.icon.star.empty:before { content: "\f006"; }
-i.icon.star.half.full:before,
 i.icon.star.half.empty:before { content: "\f123"; }
+i.icon.star.half.full:before,
 i.icon.star.half:before { content: "\f089"; }
 i.icon.star:before { content: "\f005"; }
 i.icon.step.backward:before { content: "\f048"; }
@@ -388,9 +389,6 @@ i.icon.tasks:before { content: "\f0ae"; }
 i.icon.terminal:before { content: "\f120"; }
 i.icon.text.height:before { content: "\f034"; }
 i.icon.text.width:before { content: "\f035"; }
-i.icon.layout.block:before { content: "\f009"; }
-i.icon.layout.list:before { content: "\f00b"; }
-i.icon.layout.grid:before { content: "\f00a"; }
 i.icon.thumbs.down.outline:before { content: "\f088"; }
 i.icon.thumbs.down:before { content: "\f165"; }
 i.icon.thumbs.up.outline:before { content: "\f087"; }
@@ -407,15 +405,16 @@ i.icon.tumblr:before { content: "\f173"; }
 i.icon.twitter.sign:before { content: "\f081"; }
 i.icon.twitter:before { content: "\f099"; }
 i.icon.umbrella:before { content: "\f0e9"; }
-i.icon.check.empty:before { content: "\f096"; }
 i.icon.underline:before { content: "\f0cd"; }
+i.icon.unhide:before { content: "\f06e"; }
 i.icon.unlink:before { content: "\f127"; }
 i.icon.unlock.alternate:before { content: "\f13e"; }
 i.icon.unlock:before { content: "\f09c"; }
+i.icon.unmute:before { content: "\f130"; }
 i.icon.upload.disk:before { content: "\f093"; }
 i.icon.upload:before { content: "\f01b"; }
-i.icon.doctor:before { content: "\f0f0"; }
 i.icon.user:before { content: "\f007"; }
+i.icon.users:before { content: "\f0c0"; }
 i.icon.vk:before { content: "\f189"; }
 i.icon.volume.down:before { content: "\f027"; }
 i.icon.volume.off:before { content: "\f026"; }
@@ -431,6 +430,7 @@ i.icon.yen:before { content: "\f157"; }
 i.icon.youtube.play:before { content: "\f16a"; }
 i.icon.youtube.sign:before { content: "\f166"; }
 i.icon.youtube:before { content: "\f167"; }
+i.icon.yuan:before { content: "\f158"; }
 i.icon.zoom.in:before { content: "\f00e"; }
 i.icon.zoom.out:before { content: "\f010"; }
 
@@ -439,6 +439,7 @@ i.icon.zoom.out:before { content: "\f010"; }
     Aliases
 ---------------*/
 
+i.icon.check:before { content: "\f00c"; }
 i.icon.close:before { content: "\f00d"; }
 i.icon.delete:before { content: "\f00d"; }
 
@@ -476,6 +477,80 @@ i.icon.right {
 }
 
 
+/*******************************
+             Types
+*******************************/
+
+/*--------------
+    Loading
+---------------*/
+
+i.icon.loading {
+  -webkit-animation: icon-loading 2s linear infinite;
+  -moz-animation: icon-loading 2s linear infinite;
+  -ms-animation: icon-loading 2s linear infinite;
+  -o-animation: icon-loading 2s linear infinite;
+  animation: icon-loading 2s linear infinite;
+}
+@keyframes "icon-loading" {
+ from {
+    -webkit-transform: rotate(0deg);
+    -moz-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    -ms-transform: rotate(0deg);
+    transform: rotate(0deg);
+ }
+ to {
+    -webkit-transform: rotate(360deg);
+    -moz-transform: rotate(360deg);
+    -o-transform: rotate(360deg);
+    -ms-transform: rotate(360deg);
+    transform: rotate(360deg);
+ }
+}
+@-moz-keyframes icon-loading {
+ from {
+   -moz-transform: rotate(0deg);
+   transform: rotate(0deg);
+ }
+ to {
+   -moz-transform: rotate(360deg);
+   transform: rotate(360deg);
+ }
+}
+@-webkit-keyframes "icon-loading" {
+ from {
+   -webkit-transform: rotate(0deg);
+   transform: rotate(0deg);
+ }
+ to {
+   -webkit-transform: rotate(360deg);
+   transform: rotate(360deg);
+ }
+}
+@-ms-keyframes "icon-loading" {
+ from {
+   -ms-transform: rotate(0deg);
+   transform: rotate(0deg);
+ }
+ to {
+   -ms-transform: rotate(360deg);
+   transform: rotate(360deg);
+ }
+}
+@-o-keyframes "icon-loading" {
+ from {
+   -o-transform: rotate(0deg);
+   transform: rotate(0deg);
+ }
+ to {
+   -o-transform: rotate(360deg);
+   transform: rotate(360deg);
+ }
+}
+
+
+
 /*******************************
              States
 *******************************/
@@ -501,6 +576,7 @@ i.icon.disabled {
            Variations
 *******************************/
 
+
 /*-------------------
          Link
 --------------------*/
@@ -537,9 +613,6 @@ i.circular.icon {
   width: 2em !important;
   height: 2em !important;
 }
-i.circular.icon:before {
-  vertical-align: middle;
-}
 i.circular.inverted.icon {
   border: none;
   -webkit-box-shadow: none;