addressing all of @gtagliala's issues with font awesome naming conventions

5 files changed, 752 insertions, 653 deletions

diff --git a/build/assets/font-awesome/css/font-awesome.css b/build/assets/font-awesome/css/font-awesome.css
index 1d25b8776..96f080317 100644
--- a/build/assets/font-awesome/css/font-awesome.css
+++ b/build/assets/font-awesome/css/font-awesome.css
@@ -735,10 +735,10 @@ ul.icons-ul > li .icon-li {
 .icon-comments:before {
   content: "\f086";
 }
-.icon-thumbs-up:before {
+.icon-thumbs-up-alt:before {
   content: "\f087";
 }
-.icon-thumbs-down:before {
+.icon-thumbs-down-alt:before {
   content: "\f088";
 }
 .icon-star-half:before {
@@ -1302,6 +1302,30 @@ ul.icons-ul > li .icon-li {
 .icon-file-text:before {
   content: "\f15c";
 }
+.icon-sort-by-alphabet:before {
+  content: "\f15d";
+}
+.icon-sort-by-alphabet-alt:before {
+  content: "\f15e";
+}
+.icon-sort-by-attributes:before {
+  content: "\f160";
+}
+.icon-sort-by-attributes-alt:before {
+  content: "\f161";
+}
+.icon-sort-by-order:before {
+  content: "\f162";
+}
+.icon-sort-by-order-alt:before {
+  content: "\f163";
+}
+.icon-thumbs-up:before {
+  content: "\f164";
+}
+.icon-thumbs-down:before {
+  content: "\f165";
+}
 .icon-power-off:before {
   content: "\f011";
 }
diff --git a/build/assets/font-awesome/font/FontAwesome.otf b/build/assets/font-awesome/font/FontAwesome.otf
index 4bce1878e..4978a6170 100644
--- a/build/assets/font-awesome/font/FontAwesome.otf
+++ b/build/assets/font-awesome/font/FontAwesome.otf
diff --git a/build/assets/font-awesome/less/icons.less b/build/assets/font-awesome/less/icons.less
index 802b3baa5..bbdfedc3c 100644
--- a/build/assets/font-awesome/less/icons.less
+++ b/build/assets/font-awesome/less/icons.less
@@ -1,360 +1,368 @@
 /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
    readers do not read off random characters that represent icons */
-.icon-glass:before                { content: @icon-glass; }
-.icon-music:before                { content: @icon-music; }
-.icon-search:before               { content: @icon-search; }
-.icon-envelope-alt:before         { content: @icon-envelope-alt; }
-.icon-heart:before                { content: @icon-heart; }
-.icon-star:before                 { content: @icon-star; }
-.icon-star-empty:before           { content: @icon-star-empty; }
-.icon-user:before                 { content: @icon-user; }
-.icon-film:before                 { content: @icon-film; }
-.icon-th-large:before             { content: @icon-th-large; }
-.icon-th:before                   { content: @icon-th; }
-.icon-th-list:before              { content: @icon-th-list; }
-.icon-ok:before                   { content: @icon-ok; }
-.icon-remove:before               { content: @icon-remove; }
-.icon-zoom-in:before              { content: @icon-zoom-in; }
+.icon-glass:before                { content: @glass; }
+.icon-music:before                { content: @music; }
+.icon-search:before               { content: @search; }
+.icon-envelope-alt:before         { content: @envelope-alt; }
+.icon-heart:before                { content: @heart; }
+.icon-star:before                 { content: @star; }
+.icon-star-empty:before           { content: @star-empty; }
+.icon-user:before                 { content: @user; }
+.icon-film:before                 { content: @film; }
+.icon-th-large:before             { content: @th-large; }
+.icon-th:before                   { content: @th; }
+.icon-th-list:before              { content: @th-list; }
+.icon-ok:before                   { content: @ok; }
+.icon-remove:before               { content: @remove; }
+.icon-zoom-in:before              { content: @zoom-in; }
 
-.icon-zoom-out:before             { content: @icon-zoom-out; }
-.icon-off:before                  { content: @icon-off; }
-.icon-signal:before               { content: @icon-signal; }
-.icon-cog:before                  { content: @icon-cog; }
-.icon-trash:before                { content: @icon-trash; }
-.icon-home:before                 { content: @icon-home; }
-.icon-file-alt:before             { content: @icon-file-alt; }
-.icon-time:before                 { content: @icon-time; }
-.icon-road:before                 { content: @icon-road; }
-.icon-download-alt:before         { content: @icon-download-alt; }
-.icon-download:before             { content: @icon-download; }
-.icon-upload:before               { content: @icon-upload; }
-.icon-inbox:before                { content: @icon-inbox; }
-.icon-play-circle:before          { content: @icon-play-circle; }
-.icon-repeat:before               { content: @icon-repeat; }
+.icon-zoom-out:before             { content: @zoom-out; }
+.icon-off:before                  { content: @off; }
+.icon-signal:before               { content: @signal; }
+.icon-cog:before                  { content: @cog; }
+.icon-trash:before                { content: @trash; }
+.icon-home:before                 { content: @home; }
+.icon-file-alt:before             { content: @file-alt; }
+.icon-time:before                 { content: @time; }
+.icon-road:before                 { content: @road; }
+.icon-download-alt:before         { content: @download-alt; }
+.icon-download:before             { content: @download; }
+.icon-upload:before               { content: @upload; }
+.icon-inbox:before                { content: @inbox; }
+.icon-play-circle:before          { content: @play-circle; }
+.icon-repeat:before               { content: @repeat; }
 
 
 /* F020 doesn't work in Safari. all shifted one down */
-.icon-refresh:before              { content: @icon-refresh; }
-.icon-list-alt:before             { content: @icon-list-alt; }
-.icon-lock:before                 { content: @icon-lock; }
-.icon-flag:before                 { content: @icon-flag; }
-.icon-headphones:before           { content: @icon-headphones; }
-.icon-volume-off:before           { content: @icon-volume-off; }
-.icon-volume-down:before          { content: @icon-volume-down; }
-.icon-volume-up:before            { content: @icon-volume-up; }
-.icon-qrcode:before               { content: @icon-qrcode; }
-.icon-barcode:before              { content: @icon-barcode; }
-.icon-tag:before                  { content: @icon-tag; }
-.icon-tags:before                 { content: @icon-tags; }
-.icon-book:before                 { content: @icon-book; }
-.icon-bookmark:before             { content: @icon-bookmark; }
-.icon-print:before                { content: @icon-print; }
+.icon-refresh:before              { content: @refresh; }
+.icon-list-alt:before             { content: @list-alt; }
+.icon-lock:before                 { content: @lock; }
+.icon-flag:before                 { content: @flag; }
+.icon-headphones:before           { content: @headphones; }
+.icon-volume-off:before           { content: @volume-off; }
+.icon-volume-down:before          { content: @volume-down; }
+.icon-volume-up:before            { content: @volume-up; }
+.icon-qrcode:before               { content: @qrcode; }
+.icon-barcode:before              { content: @barcode; }
+.icon-tag:before                  { content: @tag; }
+.icon-tags:before                 { content: @tags; }
+.icon-book:before                 { content: @book; }
+.icon-bookmark:before             { content: @bookmark; }
+.icon-print:before                { content: @print; }
 
-.icon-camera:before               { content: @icon-camera; }
-.icon-font:before                 { content: @icon-font; }
-.icon-bold:before                 { content: @icon-bold; }
-.icon-italic:before               { content: @icon-italic; }
-.icon-text-height:before          { content: @icon-text-height; }
-.icon-text-width:before           { content: @icon-text-width; }
-.icon-align-left:before           { content: @icon-align-left; }
-.icon-align-center:before         { content: @icon-align-center; }
-.icon-align-right:before          { content: @icon-align-right; }
-.icon-align-justify:before        { content: @icon-align-justify; }
-.icon-list:before                 { content: @icon-list; }
-.icon-indent-left:before          { content: @icon-indent-left; }
-.icon-indent-right:before         { content: @icon-indent-right; }
-.icon-facetime-video:before       { content: @icon-facetime-video; }
-.icon-picture:before              { content: @icon-picture; }
+.icon-camera:before               { content: @camera; }
+.icon-font:before                 { content: @font; }
+.icon-bold:before                 { content: @bold; }
+.icon-italic:before               { content: @italic; }
+.icon-text-height:before          { content: @text-height; }
+.icon-text-width:before           { content: @text-width; }
+.icon-align-left:before           { content: @align-left; }
+.icon-align-center:before         { content: @align-center; }
+.icon-align-right:before          { content: @align-right; }
+.icon-align-justify:before        { content: @align-justify; }
+.icon-list:before                 { content: @list; }
+.icon-indent-left:before          { content: @indent-left; }
+.icon-indent-right:before         { content: @indent-right; }
+.icon-facetime-video:before       { content: @facetime-video; }
+.icon-picture:before              { content: @picture; }
 
-.icon-pencil:before               { content: @icon-pencil; }
-.icon-map-marker:before           { content: @icon-map-marker; }
-.icon-adjust:before               { content: @icon-adjust; }
-.icon-tint:before                 { content: @icon-tint; }
-.icon-edit:before                 { content: @icon-edit; }
-.icon-share:before                { content: @icon-share; }
-.icon-check:before                { content: @icon-check; }
-.icon-move:before                 { content: @icon-move; }
-.icon-step-backward:before        { content: @icon-step-backward; }
-.icon-fast-backward:before        { content: @icon-fast-backward; }
-.icon-backward:before             { content: @icon-backward; }
-.icon-play:before                 { content: @icon-play; }
-.icon-pause:before                { content: @icon-pause; }
-.icon-stop:before                 { content: @icon-stop; }
-.icon-forward:before              { content: @icon-forward; }
+.icon-pencil:before               { content: @pencil; }
+.icon-map-marker:before           { content: @map-marker; }
+.icon-adjust:before               { content: @adjust; }
+.icon-tint:before                 { content: @tint; }
+.icon-edit:before                 { content: @edit; }
+.icon-share:before                { content: @share; }
+.icon-check:before                { content: @check; }
+.icon-move:before                 { content: @move; }
+.icon-step-backward:before        { content: @step-backward; }
+.icon-fast-backward:before        { content: @fast-backward; }
+.icon-backward:before             { content: @backward; }
+.icon-play:before                 { content: @play; }
+.icon-pause:before                { content: @pause; }
+.icon-stop:before                 { content: @stop; }
+.icon-forward:before              { content: @forward; }
 
-.icon-fast-forward:before         { content: @icon-fast-forward; }
-.icon-step-forward:before         { content: @icon-step-forward; }
-.icon-eject:before                { content: @icon-eject; }
-.icon-chevron-left:before         { content: @icon-chevron-left; }
-.icon-chevron-right:before        { content: @icon-chevron-right; }
-.icon-plus-sign:before            { content: @icon-plus-sign; }
-.icon-minus-sign:before           { content: @icon-minus-sign; }
-.icon-remove-sign:before          { content: @icon-remove-sign; }
-.icon-ok-sign:before              { content: @icon-ok-sign; }
-.icon-question-sign:before        { content: @icon-question-sign; }
-.icon-info-sign:before            { content: @icon-info-sign; }
-.icon-screenshot:before           { content: @icon-screenshot; }
-.icon-remove-circle:before        { content: @icon-remove-circle; }
-.icon-ok-circle:before            { content: @icon-ok-circle; }
-.icon-ban-circle:before           { content: @icon-ban-circle; }
+.icon-fast-forward:before         { content: @fast-forward; }
+.icon-step-forward:before         { content: @step-forward; }
+.icon-eject:before                { content: @eject; }
+.icon-chevron-left:before         { content: @chevron-left; }
+.icon-chevron-right:before        { content: @chevron-right; }
+.icon-plus-sign:before            { content: @plus-sign; }
+.icon-minus-sign:before           { content: @minus-sign; }
+.icon-remove-sign:before          { content: @remove-sign; }
+.icon-ok-sign:before              { content: @ok-sign; }
+.icon-question-sign:before        { content: @question-sign; }
+.icon-info-sign:before            { content: @info-sign; }
+.icon-screenshot:before           { content: @screenshot; }
+.icon-remove-circle:before        { content: @remove-circle; }
+.icon-ok-circle:before            { content: @ok-circle; }
+.icon-ban-circle:before           { content: @ban-circle; }
 
-.icon-arrow-left:before           { content: @icon-arrow-left; }
-.icon-arrow-right:before          { content: @icon-arrow-right; }
-.icon-arrow-up:before             { content: @icon-arrow-up; }
-.icon-arrow-down:before           { content: @icon-arrow-down; }
-.icon-share-alt:before            { content: @icon-share-alt; }
-.icon-resize-full:before          { content: @icon-resize-full; }
-.icon-resize-small:before         { content: @icon-resize-small; }
-.icon-plus:before                 { content: @icon-plus; }
-.icon-minus:before                { content: @icon-minus; }
-.icon-asterisk:before             { content: @icon-asterisk; }
-.icon-exclamation-sign:before     { content: @icon-exclamation-sign; }
-.icon-gift:before                 { content: @icon-gift; }
-.icon-leaf:before                 { content: @icon-leaf; }
-.icon-fire:before                 { content: @icon-fire; }
-.icon-eye-open:before             { content: @icon-eye-open; }
+.icon-arrow-left:before           { content: @arrow-left; }
+.icon-arrow-right:before          { content: @arrow-right; }
+.icon-arrow-up:before             { content: @arrow-up; }
+.icon-arrow-down:before           { content: @arrow-down; }
+.icon-share-alt:before            { content: @share-alt; }
+.icon-resize-full:before          { content: @resize-full; }
+.icon-resize-small:before         { content: @resize-small; }
+.icon-plus:before                 { content: @plus; }
+.icon-minus:before                { content: @minus; }
+.icon-asterisk:before             { content: @asterisk; }
+.icon-exclamation-sign:before     { content: @exclamation-sign; }
+.icon-gift:before                 { content: @gift; }
+.icon-leaf:before                 { content: @leaf; }
+.icon-fire:before                 { content: @fire; }
+.icon-eye-open:before             { content: @eye-open; }
 
-.icon-eye-close:before            { content: @icon-eye-close; }
-.icon-warning-sign:before         { content: @icon-warning-sign; }
-.icon-plane:before                { content: @icon-plane; }
-.icon-calendar:before             { content: @icon-calendar; }
-.icon-random:before               { content: @icon-random; }
-.icon-comment:before              { content: @icon-comment; }
-.icon-magnet:before               { content: @icon-magnet; }
-.icon-chevron-up:before           { content: @icon-chevron-up; }
-.icon-chevron-down:before         { content: @icon-chevron-down; }
-.icon-retweet:before              { content: @icon-retweet; }
-.icon-shopping-cart:before        { content: @icon-shopping-cart; }
-.icon-folder-close:before         { content: @icon-folder-close; }
-.icon-folder-open:before          { content: @icon-folder-open; }
-.icon-resize-vertical:before      { content: @icon-resize-vertical; }
-.icon-resize-horizontal:before    { content: @icon-resize-horizontal; }
+.icon-eye-close:before            { content: @eye-close; }
+.icon-warning-sign:before         { content: @warning-sign; }
+.icon-plane:before                { content: @plane; }
+.icon-calendar:before             { content: @calendar; }
+.icon-random:before               { content: @random; }
+.icon-comment:before              { content: @comment; }
+.icon-magnet:before               { content: @magnet; }
+.icon-chevron-up:before           { content: @chevron-up; }
+.icon-chevron-down:before         { content: @chevron-down; }
+.icon-retweet:before              { content: @retweet; }
+.icon-shopping-cart:before        { content: @shopping-cart; }
+.icon-folder-close:before         { content: @folder-close; }
+.icon-folder-open:before          { content: @folder-open; }
+.icon-resize-vertical:before      { content: @resize-vertical; }
+.icon-resize-horizontal:before    { content: @resize-horizontal; }
 
-.icon-bar-chart:before            { content: @icon-bar-chart; }
-.icon-twitter-sign:before         { content: @icon-twitter-sign; }
-.icon-facebook-sign:before        { content: @icon-facebook-sign; }
-.icon-camera-retro:before         { content: @icon-camera-retro; }
-.icon-key:before                  { content: @icon-key; }
-.icon-cogs:before                 { content: @icon-cogs; }
-.icon-comments:before             { content: @icon-comments; }
-.icon-thumbs-up:before            { content: @icon-thumbs-up; }
-.icon-thumbs-down:before          { content: @icon-thumbs-down; }
-.icon-star-half:before            { content: @icon-star-half; }
-.icon-heart-empty:before          { content: @icon-heart-empty; }
-.icon-signout:before              { content: @icon-signout; }
-.icon-linkedin-sign:before        { content: @icon-linkedin-sign; }
-.icon-pushpin:before              { content: @icon-pushpin; }
-.icon-external-link:before        { content: @icon-external-link; }
+.icon-bar-chart:before            { content: @bar-chart; }
+.icon-twitter-sign:before         { content: @twitter-sign; }
+.icon-facebook-sign:before        { content: @facebook-sign; }
+.icon-camera-retro:before         { content: @camera-retro; }
+.icon-key:before                  { content: @key; }
+.icon-cogs:before                 { content: @cogs; }
+.icon-comments:before             { content: @comments; }
+.icon-thumbs-up-alt:before        { content: @thumbs-up-alt; }
+.icon-thumbs-down-alt:before      { content: @thumbs-down-alt; }
+.icon-star-half:before            { content: @star-half; }
+.icon-heart-empty:before          { content: @heart-empty; }
+.icon-signout:before              { content: @signout; }
+.icon-linkedin-sign:before        { content: @linkedin-sign; }
+.icon-pushpin:before              { content: @pushpin; }
+.icon-external-link:before        { content: @external-link; }
 
-.icon-signin:before               { content: @icon-signin; }
-.icon-trophy:before               { content: @icon-trophy; }
-.icon-github-sign:before          { content: @icon-github-sign; }
-.icon-upload-alt:before           { content: @icon-upload-alt; }
-.icon-lemon:before                { content: @icon-lemon; }
-.icon-phone:before                { content: @icon-phone; }
-.icon-check-empty:before          { content: @icon-check-empty; }
-.icon-bookmark-empty:before       { content: @icon-bookmark-empty; }
-.icon-phone-sign:before           { content: @icon-phone-sign; }
-.icon-twitter:before              { content: @icon-twitter; }
-.icon-facebook:before             { content: @icon-facebook; }
-.icon-github:before               { content: @icon-github; }
-.icon-unlock:before               { content: @icon-unlock; }
-.icon-credit-card:before          { content: @icon-credit-card; }
-.icon-rss:before                  { content: @icon-rss; }
+.icon-signin:before               { content: @signin; }
+.icon-trophy:before               { content: @trophy; }
+.icon-github-sign:before          { content: @github-sign; }
+.icon-upload-alt:before           { content: @upload-alt; }
+.icon-lemon:before                { content: @lemon; }
+.icon-phone:before                { content: @phone; }
+.icon-check-empty:before          { content: @check-empty; }
+.icon-bookmark-empty:before       { content: @bookmark-empty; }
+.icon-phone-sign:before           { content: @phone-sign; }
+.icon-twitter:before              { content: @twitter; }
+.icon-facebook:before             { content: @facebook; }
+.icon-github:before               { content: @github; }
+.icon-unlock:before               { content: @unlock; }
+.icon-credit-card:before          { content: @credit-card; }
+.icon-rss:before                  { content: @rss; }
 
-.icon-hdd:before                  { content: @icon-hdd; }
-.icon-bullhorn:before             { content: @icon-bullhorn; }
-.icon-bell:before                 { content: @icon-bell; }
-.icon-certificate:before          { content: @icon-certificate; }
-.icon-hand-right:before           { content: @icon-hand-right; }
-.icon-hand-left:before            { content: @icon-hand-left; }
-.icon-hand-up:before              { content: @icon-hand-up; }
-.icon-hand-down:before            { content: @icon-hand-down; }
-.icon-circle-arrow-left:before    { content: @icon-circle-arrow-left; }
-.icon-circle-arrow-right:before   { content: @icon-circle-arrow-right; }
-.icon-circle-arrow-up:before      { content: @icon-circle-arrow-up; }
-.icon-circle-arrow-down:before    { content: @icon-circle-arrow-down; }
-.icon-globe:before                { content: @icon-globe; }
-.icon-wrench:before               { content: @icon-wrench; }
-.icon-tasks:before                { content: @icon-tasks; }
+.icon-hdd:before                  { content: @hdd; }
+.icon-bullhorn:before             { content: @bullhorn; }
+.icon-bell:before                 { content: @bell; }
+.icon-certificate:before          { content: @certificate; }
+.icon-hand-right:before           { content: @hand-right; }
+.icon-hand-left:before            { content: @hand-left; }
+.icon-hand-up:before              { content: @hand-up; }
+.icon-hand-down:before            { content: @hand-down; }
+.icon-circle-arrow-left:before    { content: @circle-arrow-left; }
+.icon-circle-arrow-right:before   { content: @circle-arrow-right; }
+.icon-circle-arrow-up:before      { content: @circle-arrow-up; }
+.icon-circle-arrow-down:before    { content: @circle-arrow-down; }
+.icon-globe:before                { content: @globe; }
+.icon-wrench:before               { content: @wrench; }
+.icon-tasks:before                { content: @tasks; }
 
-.icon-filter:before               { content: @icon-filter; }
-.icon-briefcase:before            { content: @icon-briefcase; }
-.icon-fullscreen:before           { content: @icon-fullscreen; }
+.icon-filter:before               { content: @filter; }
+.icon-briefcase:before            { content: @briefcase; }
+.icon-fullscreen:before           { content: @fullscreen; }
 
-.icon-group:before                { content: @icon-group; }
-.icon-link:before                 { content: @icon-link; }
-.icon-cloud:before                { content: @icon-cloud; }
-.icon-beaker:before               { content: @icon-beaker; }
-.icon-cut:before                  { content: @icon-cut; }
-.icon-copy:before                 { content: @icon-copy; }
-.icon-paper-clip:before           { content: @icon-paper-clip; }
-.icon-save:before                 { content: @icon-save; }
-.icon-sign-blank:before           { content: @icon-sign-blank; }
-.icon-reorder:before              { content: @icon-reorder; }
-.icon-list-ul:before              { content: @icon-list-ul; }
-.icon-list-ol:before              { content: @icon-list-ol; }
-.icon-strikethrough:before        { content: @icon-strikethrough; }
-.icon-underline:before            { content: @icon-underline; }
-.icon-table:before                { content: @icon-table; }
+.icon-group:before                { content: @group; }
+.icon-link:before                 { content: @link; }
+.icon-cloud:before                { content: @cloud; }
+.icon-beaker:before               { content: @beaker; }
+.icon-cut:before                  { content: @cut; }
+.icon-copy:before                 { content: @copy; }
+.icon-paper-clip:before           { content: @paper-clip; }
+.icon-save:before                 { content: @save; }
+.icon-sign-blank:before           { content: @sign-blank; }
+.icon-reorder:before              { content: @reorder; }
+.icon-list-ul:before              { content: @list-ul; }
+.icon-list-ol:before              { content: @list-ol; }
+.icon-strikethrough:before        { content: @strikethrough; }
+.icon-underline:before            { content: @underline; }
+.icon-table:before                { content: @table; }
 
-.icon-magic:before                { content: @icon-magic; }
-.icon-truck:before                { content: @icon-truck; }
-.icon-pinterest:before            { content: @icon-pinterest; }
-.icon-pinterest-sign:before       { content: @icon-pinterest-sign; }
-.icon-google-plus-sign:before     { content: @icon-google-plus-sign; }
-.icon-google-plus:before          { content: @icon-google-plus; }
-.icon-money:before                { content: @icon-money; }
-.icon-caret-down:before           { content: @icon-caret-down; }
-.icon-caret-up:before             { content: @icon-caret-up; }
-.icon-caret-left:before           { content: @icon-caret-left; }
-.icon-caret-right:before          { content: @icon-caret-right; }
-.icon-columns:before              { content: @icon-columns; }
-.icon-sort:before                 { content: @icon-sort; }
-.icon-sort-down:before            { content: @icon-sort-down; }
-.icon-sort-up:before              { content: @icon-sort-up; }
+.icon-magic:before                { content: @magic; }
+.icon-truck:before                { content: @truck; }
+.icon-pinterest:before            { content: @pinterest; }
+.icon-pinterest-sign:before       { content: @pinterest-sign; }
+.icon-google-plus-sign:before     { content: @google-plus-sign; }
+.icon-google-plus:before          { content: @google-plus; }
+.icon-money:before                { content: @money; }
+.icon-caret-down:before           { content: @caret-down; }
+.icon-caret-up:before             { content: @caret-up; }
+.icon-caret-left:before           { content: @caret-left; }
+.icon-caret-right:before          { content: @caret-right; }
+.icon-columns:before              { content: @columns; }
+.icon-sort:before                 { content: @sort; }
+.icon-sort-down:before            { content: @sort-down; }
+.icon-sort-up:before              { content: @sort-up; }
 
-.icon-envelope:before             { content: @icon-envelope; }
-.icon-linkedin:before             { content: @icon-linkedin; }
-.icon-undo:before                 { content: @icon-undo; }
-.icon-legal:before                { content: @icon-legal; }
-.icon-dashboard:before            { content: @icon-dashboard; }
-.icon-comment-alt:before          { content: @icon-comment-alt; }
-.icon-comments-alt:before         { content: @icon-comments-alt; }
-.icon-bolt:before                 { content: @icon-bolt; }
-.icon-sitemap:before              { content: @icon-sitemap; }
-.icon-umbrella:before             { content: @icon-umbrella; }
-.icon-paste:before                { content: @icon-paste; }
-.icon-lightbulb:before            { content: @icon-lightbulb; }
-.icon-exchange:before             { content: @icon-exchange; }
-.icon-cloud-download:before       { content: @icon-cloud-download; }
-.icon-cloud-upload:before         { content: @icon-cloud-upload; }
+.icon-envelope:before             { content: @envelope; }
+.icon-linkedin:before             { content: @linkedin; }
+.icon-undo:before                 { content: @undo; }
+.icon-legal:before                { content: @legal; }
+.icon-dashboard:before            { content: @dashboard; }
+.icon-comment-alt:before          { content: @comment-alt; }
+.icon-comments-alt:before         { content: @comments-alt; }
+.icon-bolt:before                 { content: @bolt; }
+.icon-sitemap:before              { content: @sitemap; }
+.icon-umbrella:before             { content: @umbrella; }
+.icon-paste:before                { content: @paste; }
+.icon-lightbulb:before            { content: @lightbulb; }
+.icon-exchange:before             { content: @exchange; }
+.icon-cloud-download:before       { content: @cloud-download; }
+.icon-cloud-upload:before         { content: @cloud-upload; }
 
-.icon-user-md:before              { content: @icon-user-md; }
-.icon-stethoscope:before          { content: @icon-stethoscope; }
-.icon-suitcase:before             { content: @icon-suitcase; }
-.icon-bell-alt:before             { content: @icon-bell-alt; }
-.icon-coffee:before               { content: @icon-coffee; }
-.icon-food:before                 { content: @icon-food; }
-.icon-file-text-alt:before        { content: @icon-file-text-alt; }
-.icon-building:before             { content: @icon-building; }
-.icon-hospital:before             { content: @icon-hospital; }
-.icon-ambulance:before            { content: @icon-ambulance; }
-.icon-medkit:before               { content: @icon-medkit; }
-.icon-fighter-jet:before          { content: @icon-fighter-jet; }
-.icon-beer:before                 { content: @icon-beer; }
-.icon-h-sign:before               { content: @icon-h-sign; }
-.icon-plus-sign-alt:before        { content: @icon-plus-sign-alt; }
+.icon-user-md:before              { content: @user-md; }
+.icon-stethoscope:before          { content: @stethoscope; }
+.icon-suitcase:before             { content: @suitcase; }
+.icon-bell-alt:before             { content: @bell-alt; }
+.icon-coffee:before               { content: @coffee; }
+.icon-food:before                 { content: @food; }
+.icon-file-text-alt:before        { content: @file-text-alt; }
+.icon-building:before             { content: @building; }
+.icon-hospital:before             { content: @hospital; }
+.icon-ambulance:before            { content: @ambulance; }
+.icon-medkit:before               { content: @medkit; }
+.icon-fighter-jet:before          { content: @fighter-jet; }
+.icon-beer:before                 { content: @beer; }
+.icon-h-sign:before               { content: @h-sign; }
+.icon-plus-sign-alt:before        { content: @plus-sign-alt; }
 
-.icon-double-angle-left:before    { content: @icon-double-angle-left; }
-.icon-double-angle-right:before   { content: @icon-double-angle-right; }
-.icon-double-angle-up:before      { content: @icon-double-angle-up; }
-.icon-double-angle-down:before    { content: @icon-double-angle-down; }
-.icon-angle-left:before           { content: @icon-angle-left; }
-.icon-angle-right:before          { content: @icon-angle-right; }
-.icon-angle-up:before             { content: @icon-angle-up; }
-.icon-angle-down:before           { content: @icon-angle-down; }
-.icon-desktop:before              { content: @icon-desktop; }
-.icon-laptop:before               { content: @icon-laptop; }
-.icon-tablet:before               { content: @icon-tablet; }
-.icon-mobile-phone:before         { content: @icon-mobile-phone; }
-.icon-circle-blank:before         { content: @icon-circle-blank; }
-.icon-quote-left:before           { content: @icon-quote-left; }
-.icon-quote-right:before          { content: @icon-quote-right; }
+.icon-double-angle-left:before    { content: @double-angle-left; }
+.icon-double-angle-right:before   { content: @double-angle-right; }
+.icon-double-angle-up:before      { content: @double-angle-up; }
+.icon-double-angle-down:before    { content: @double-angle-down; }
+.icon-angle-left:before           { content: @angle-left; }
+.icon-angle-right:before          { content: @angle-right; }
+.icon-angle-up:before             { content: @angle-up; }
+.icon-angle-down:before           { content: @angle-down; }
+.icon-desktop:before              { content: @desktop; }
+.icon-laptop:before               { content: @laptop; }
+.icon-tablet:before               { content: @tablet; }
+.icon-mobile-phone:before         { content: @mobile-phone; }
+.icon-circle-blank:before         { content: @circle-blank; }
+.icon-quote-left:before           { content: @quote-left; }
+.icon-quote-right:before          { content: @quote-right; }
 
-.icon-spinner:before              { content: @icon-spinner; }
-.icon-circle:before               { content: @icon-circle; }
-.icon-reply:before                { content: @icon-reply; }
-.icon-github-alt:before           { content: @icon-github-alt; }
-.icon-folder-close-alt:before     { content: @icon-folder-close-alt; }
-.icon-folder-open-alt:before      { content: @icon-folder-open-alt; }
-.icon-expand-alt:before           { content: @icon-expand-alt; }
-.icon-collapse-alt:before         { content: @icon-collapse-alt; }
-.icon-smile:before                { content: @icon-smile; }
-.icon-frown:before                { content: @icon-frown; }
-.icon-meh:before                  { content: @icon-meh; }
-.icon-gamepad:before              { content: @icon-gamepad; }
-.icon-keyboard:before             { content: @icon-keyboard; }
-.icon-flag-alt:before             { content: @icon-flag-alt; }
-.icon-flag-checkered:before       { content: @icon-flag-checkered; }
+.icon-spinner:before              { content: @spinner; }
+.icon-circle:before               { content: @circle; }
+.icon-reply:before                { content: @reply; }
+.icon-github-alt:before           { content: @github-alt; }
+.icon-folder-close-alt:before     { content: @folder-close-alt; }
+.icon-folder-open-alt:before      { content: @folder-open-alt; }
+.icon-expand-alt:before           { content: @expand-alt; }
+.icon-collapse-alt:before         { content: @collapse-alt; }
+.icon-smile:before                { content: @smile; }
+.icon-frown:before                { content: @frown; }
+.icon-meh:before                  { content: @meh; }
+.icon-gamepad:before              { content: @gamepad; }
+.icon-keyboard:before             { content: @keyboard; }
+.icon-flag-alt:before             { content: @flag-alt; }
+.icon-flag-checkered:before       { content: @flag-checkered; }
 
-.icon-terminal:before             { content: @icon-terminal; }
-.icon-code:before                 { content: @icon-code; }
-.icon-reply-all:before,           { content: @icon-reply-all; }
-.icon-mail-reply-all:before       { content: @icon-mail-reply-all; }
-.icon-star-half-empty:before      { content: @icon-star-half-empty; }
-.icon-location-arrow:before       { content: @icon-location-arrow; }
-.icon-crop:before                 { content: @icon-crop; }
-.icon-code-fork:before            { content: @icon-code-fork; }
-.icon-unlink:before               { content: @icon-unlink; }
-.icon-question:before             { content: @icon-question; }
-.icon-info:before                 { content: @icon-info; }
-.icon-exclamation:before          { content: @icon-exclamation; }
-.icon-superscript:before          { content: @icon-superscript; }
-.icon-subscript:before            { content: @icon-subscript; }
-.icon-eraser:before               { content: @icon-eraser; }
-.icon-puzzle-piece:before         { content: @icon-puzzle-piece; }
+.icon-terminal:before             { content: @terminal; }
+.icon-code:before                 { content: @code; }
+.icon-reply-all:before,           { content: @reply-all; }
+.icon-mail-reply-all:before       { content: @mail-reply-all; }
+.icon-star-half-empty:before      { content: @star-half-empty; }
+.icon-location-arrow:before       { content: @location-arrow; }
+.icon-crop:before                 { content: @crop; }
+.icon-code-fork:before            { content: @code-fork; }
+.icon-unlink:before               { content: @unlink; }
+.icon-question:before             { content: @question; }
+.icon-info:before                 { content: @info; }
+.icon-exclamation:before          { content: @exclamation; }
+.icon-superscript:before          { content: @superscript; }
+.icon-subscript:before            { content: @subscript; }
+.icon-eraser:before               { content: @eraser; }
+.icon-puzzle-piece:before         { content: @puzzle-piece; }
 
-.icon-microphone:before           { content: @icon-microphone; }
-.icon-microphone-off:before       { content: @icon-microphone-off; }
-.icon-shield:before               { content: @icon-shield; }
-.icon-calendar-empty:before       { content: @icon-calendar-empty; }
-.icon-fire-extinguisher:before    { content: @icon-fire-extinguisher; }
-.icon-rocket:before               { content: @icon-rocket; }
-.icon-maxcdn:before               { content: @icon-maxcdn; }
-.icon-chevron-sign-left:before    { content: @icon-chevron-sign-left; }
-.icon-chevron-sign-right:before   { content: @icon-chevron-sign-right; }
-.icon-chevron-sign-up:before      { content: @icon-chevron-sign-up; }
-.icon-chevron-sign-down:before    { content: @icon-chevron-sign-down; }
-.icon-html5:before                { content: @icon-html5; }
-.icon-css3:before                 { content: @icon-css3; }
-.icon-anchor:before               { content: @icon-anchor; }
-.icon-unlock-alt:before           { content: @icon-unlock-alt; }
+.icon-microphone:before           { content: @microphone; }
+.icon-microphone-off:before       { content: @microphone-off; }
+.icon-shield:before               { content: @shield; }
+.icon-calendar-empty:before       { content: @calendar-empty; }
+.icon-fire-extinguisher:before    { content: @fire-extinguisher; }
+.icon-rocket:before               { content: @rocket; }
+.icon-maxcdn:before               { content: @maxcdn; }
+.icon-chevron-sign-left:before    { content: @chevron-sign-left; }
+.icon-chevron-sign-right:before   { content: @chevron-sign-right; }
+.icon-chevron-sign-up:before      { content: @chevron-sign-up; }
+.icon-chevron-sign-down:before    { content: @chevron-sign-down; }
+.icon-html5:before                { content: @html5; }
+.icon-css3:before                 { content: @css3; }
+.icon-anchor:before               { content: @anchor; }
+.icon-unlock-alt:before           { content: @unlock-alt; }
 
-.icon-bullseye:before             { content: @icon-bullseye; }
-.icon-ellipsis-horizontal:before  { content: @icon-ellipsis-horizontal; }
-.icon-ellipsis-vertical:before    { content: @icon-ellipsis-vertical; }
-.icon-rss-sign:before             { content: @icon-rss-sign; }
-.icon-play-sign:before            { content: @icon-play-sign; }
-.icon-ticket:before               { content: @icon-ticket; }
-.icon-minus-sign-alt:before       { content: @icon-minus-sign-alt; }
-.icon-check-minus:before          { content: @icon-check-minus; }
-.icon-level-up:before             { content: @icon-level-up; }
-.icon-level-down:before           { content: @icon-level-down; }
-.icon-check-sign:before           { content: @icon-check-sign; }
-.icon-edit-sign:before            { content: @icon-edit-sign; }
-.icon-external-link-sign:before   { content: @icon-external-link-sign; }
-.icon-share-sign:before           { content: @icon-share-sign; }
+.icon-bullseye:before             { content: @bullseye; }
+.icon-ellipsis-horizontal:before  { content: @ellipsis-horizontal; }
+.icon-ellipsis-vertical:before    { content: @ellipsis-vertical; }
+.icon-rss-sign:before             { content: @rss-sign; }
+.icon-play-sign:before            { content: @play-sign; }
+.icon-ticket:before               { content: @ticket; }
+.icon-minus-sign-alt:before       { content: @minus-sign-alt; }
+.icon-check-minus:before          { content: @check-minus; }
+.icon-level-up:before             { content: @level-up; }
+.icon-level-down:before           { content: @level-down; }
+.icon-check-sign:before           { content: @check-sign; }
+.icon-edit-sign:before            { content: @edit-sign; }
+.icon-external-link-sign:before   { content: @external-link-sign; }
+.icon-share-sign:before           { content: @share-sign; }
 
-.icon-collapse:before             { content: @icon-collapse; }
-.icon-collapse-top:before         { content: @icon-collapse-top; }
-.icon-expand:before               { content: @icon-expand; }
-.icon-eur:before                  { content: @icon-eur; }
-.icon-gbp:before                  { content: @icon-gbp; }
-.icon-usd:before                  { content: @icon-usd; }
-.icon-inr:before                  { content: @icon-inr; }
-.icon-jpy:before                  { content: @icon-jpy; }
-.icon-cny:before                  { content: @icon-cny; }
-.icon-krw:before                  { content: @icon-krw; }
-.icon-btc:before                  { content: @icon-btc; }
-.icon-file:before                 { content: @icon-file; }
-.icon-file-text:before            { content: @icon-file-text; }
+.icon-collapse:before             { content: @collapse; }
+.icon-collapse-top:before         { content: @collapse-top; }
+.icon-expand:before               { content: @expand; }
+.icon-eur:before                  { content: @eur; }
+.icon-gbp:before                  { content: @gbp; }
+.icon-usd:before                  { content: @usd; }
+.icon-inr:before                  { content: @inr; }
+.icon-jpy:before                  { content: @jpy; }
+.icon-cny:before                  { content: @cny; }
+.icon-krw:before                  { content: @krw; }
+.icon-btc:before                  { content: @btc; }
+.icon-file:before                 { content: @file; }
+.icon-file-text:before            { content: @file-text; }
+.icon-sort-by-alphabet:before     { content: @sort-by-alphabet; }
+.icon-sort-by-alphabet-alt:before { content: @sort-by-alphabet-alt; }
 
+.icon-sort-by-attributes:before     { content: @sort-by-attributes; }
+.icon-sort-by-attributes-alt:before { content: @sort-by-attributes-alt; }
+.icon-sort-by-order:before          { content: @sort-by-order; }
+.icon-sort-by-order-alt:before      { content: @sort-by-order-alt; }
+.icon-thumbs-up:before              { content: @thumbs-up; }
+.icon-thumbs-down:before            { content: @thumbs-down; }
 
 
 // aliases
-.icon-power-off:before            { content: @icon-off; }
-.icon-rotate-right:before         { content: @icon-repeat; }
-.icon-mail-forward:before         { content: @icon-share-alt; }
-.icon-rotate-left:before          { content: @icon-undo; }
-.icon-mail-reply:before           { content: @icon-reply; }
-.icon-star-half-full:before       { content: @icon-star-half-empty; }
-.icon-unchecked:before            { content: @icon-check-empty; }
-.icon-paperclip:before            { content: @icon-paper-clip; }
-.icon-euro:before                 { content: @icon-eur; }
-.icon-dollar:before               { content: @icon-usd; }
-.icon-rupee:before                { content: @icon-inr; }
-.icon-yen:before                  { content: @icon-jpy; }
-.icon-renminbi:before             { content: @icon-cny; }
-.icon-won:before                  { content: @icon-krw; }
-.icon-bitcoin:before              { content: @icon-btc; }
+.icon-power-off:before            { content: @off; }
+.icon-rotate-right:before         { content: @repeat; }
+.icon-mail-forward:before         { content: @share-alt; }
+.icon-rotate-left:before          { content: @undo; }
+.icon-mail-reply:before           { content: @reply; }
+.icon-star-half-full:before       { content: @star-half-empty; }
+.icon-unchecked:before            { content: @check-empty; }
+.icon-paperclip:before            { content: @paper-clip; }
+.icon-euro:before                 { content: @eur; }
+.icon-dollar:before               { content: @usd; }
+.icon-rupee:before                { content: @inr; }
+.icon-yen:before                  { content: @jpy; }
+.icon-renminbi:before             { content: @cny; }
+.icon-won:before                  { content: @krw; }
+.icon-bitcoin:before              { content: @btc; }
diff --git a/build/assets/font-awesome/less/variables.less b/build/assets/font-awesome/less/variables.less
index 981ffc8be..530dd2185 100644
--- a/build/assets/font-awesome/less/variables.less
+++ b/build/assets/font-awesome/less/variables.less
@@ -11,340 +11,349 @@
 
 
 // icon variables
-@icon-glass: "\f000";
-@icon-music: "\f001";
-@icon-search: "\f002";
-@icon-envelope-alt: "\f003";
-@icon-heart: "\f004";
-@icon-star: "\f005";
-@icon-star-empty: "\f006";
-@icon-user: "\f007";
-@icon-film: "\f008";
-@icon-th-large: "\f009";
-@icon-th: "\f00a";
-@icon-th-list: "\f00b";
-@icon-ok: "\f00c";
-@icon-remove: "\f00d";
-@icon-zoom-in: "\f00e";
+@glass: "\f000";
+@music: "\f001";
+@search: "\f002";
+@envelope-alt: "\f003";
+@heart: "\f004";
+@star: "\f005";
+@star-empty: "\f006";
+@user: "\f007";
+@film: "\f008";
+@th-large: "\f009";
+@th: "\f00a";
+@th-list: "\f00b";
+@ok: "\f00c";
+@remove: "\f00d";
+@zoom-in: "\f00e";
 
-@icon-zoom-out: "\f010";
-@icon-off: "\f011";
-@icon-signal: "\f012";
-@icon-cog: "\f013";
-@icon-trash: "\f014";
-@icon-home: "\f015";
-@icon-file-alt: "\f016";
-@icon-time: "\f017";
-@icon-road: "\f018";
-@icon-download-alt: "\f019";
-@icon-download: "\f01a";
-@icon-upload: "\f01b";
-@icon-inbox: "\f01c";
-@icon-play-circle: "\f01d";
-@icon-repeat: "\f01e";
+@zoom-out: "\f010";
+@off: "\f011";
+@signal: "\f012";
+@cog: "\f013";
+@trash: "\f014";
+@home: "\f015";
+@file-alt: "\f016";
+@time: "\f017";
+@road: "\f018";
+@download-alt: "\f019";
+@download: "\f01a";
+@upload: "\f01b";
+@inbox: "\f01c";
+@play-circle: "\f01d";
+@repeat: "\f01e";
 
-@icon-refresh: "\f021";
-@icon-list-alt: "\f022";
-@icon-lock: "\f023";
-@icon-flag: "\f024";
-@icon-headphones: "\f025";
-@icon-volume-off: "\f026";
-@icon-volume-down: "\f027";
-@icon-volume-up: "\f028";
-@icon-qrcode: "\f029";
-@icon-barcode: "\f02a";
-@icon-tag: "\f02b";
-@icon-tags: "\f02c";
-@icon-book: "\f02d";
-@icon-bookmark: "\f02e";
-@icon-print: "\f02f";
+@refresh: "\f021";
+@list-alt: "\f022";
+@lock: "\f023";
+@flag: "\f024";
+@headphones: "\f025";
+@volume-off: "\f026";
+@volume-down: "\f027";
+@volume-up: "\f028";
+@qrcode: "\f029";
+@barcode: "\f02a";
+@tag: "\f02b";
+@tags: "\f02c";
+@book: "\f02d";
+@bookmark: "\f02e";
+@print: "\f02f";
 
-@icon-camera: "\f030";
-@icon-font: "\f031";
-@icon-bold: "\f032";
-@icon-italic: "\f033";
-@icon-text-height: "\f034";
-@icon-text-width: "\f035";
-@icon-align-left: "\f036";
-@icon-align-center: "\f037";
-@icon-align-right: "\f038";
-@icon-align-justify: "\f039";
-@icon-list: "\f03a";
-@icon-indent-left: "\f03b";
-@icon-indent-right: "\f03c";
-@icon-facetime-video: "\f03d";
-@icon-picture: "\f03e";
+@camera: "\f030";
+@font: "\f031";
+@bold: "\f032";
+@italic: "\f033";
+@text-height: "\f034";
+@text-width: "\f035";
+@align-left: "\f036";
+@align-center: "\f037";
+@align-right: "\f038";
+@align-justify: "\f039";
+@list: "\f03a";
+@indent-left: "\f03b";
+@indent-right: "\f03c";
+@facetime-video: "\f03d";
+@picture: "\f03e";
 
-@icon-pencil: "\f040";
-@icon-map-marker: "\f041";
-@icon-adjust: "\f042";
-@icon-tint: "\f043";
-@icon-edit: "\f044";
-@icon-share: "\f045";
-@icon-check: "\f046";
-@icon-move: "\f047";
-@icon-step-backward: "\f048";
-@icon-fast-backward: "\f049";
-@icon-backward: "\f04a";
-@icon-play: "\f04b";
-@icon-pause: "\f04c";
-@icon-stop: "\f04d";
-@icon-forward: "\f04e";
+@pencil: "\f040";
+@map-marker: "\f041";
+@adjust: "\f042";
+@tint: "\f043";
+@edit: "\f044";
+@share: "\f045";
+@check: "\f046";
+@move: "\f047";
+@step-backward: "\f048";
+@fast-backward: "\f049";
+@backward: "\f04a";
+@play: "\f04b";
+@pause: "\f04c";
+@stop: "\f04d";
+@forward: "\f04e";
 
-@icon-fast-forward: "\f050";
-@icon-step-forward: "\f051";
-@icon-eject: "\f052";
-@icon-chevron-left: "\f053";
-@icon-chevron-right: "\f054";
-@icon-plus-sign: "\f055";
-@icon-minus-sign: "\f056";
-@icon-remove-sign: "\f057";
-@icon-ok-sign: "\f058";
-@icon-question-sign: "\f059";
-@icon-info-sign: "\f05a";
-@icon-screenshot: "\f05b";
-@icon-remove-circle: "\f05c";
-@icon-ok-circle: "\f05d";
-@icon-ban-circle: "\f05e";
+@fast-forward: "\f050";
+@step-forward: "\f051";
+@eject: "\f052";
+@chevron-left: "\f053";
+@chevron-right: "\f054";
+@plus-sign: "\f055";
+@minus-sign: "\f056";
+@remove-sign: "\f057";
+@ok-sign: "\f058";
+@question-sign: "\f059";
+@info-sign: "\f05a";
+@screenshot: "\f05b";
+@remove-circle: "\f05c";
+@ok-circle: "\f05d";
+@ban-circle: "\f05e";
 
-@icon-arrow-left: "\f060";
-@icon-arrow-right: "\f061";
-@icon-arrow-up: "\f062";
-@icon-arrow-down: "\f063";
-@icon-share-alt: "\f064";
-@icon-resize-full: "\f065";
-@icon-resize-small: "\f066";
-@icon-plus: "\f067";
-@icon-minus: "\f068";
-@icon-asterisk: "\f069";
-@icon-exclamation-sign: "\f06a";
-@icon-gift: "\f06b";
-@icon-leaf: "\f06c";
-@icon-fire: "\f06d";
-@icon-eye-open: "\f06e";
+@arrow-left: "\f060";
+@arrow-right: "\f061";
+@arrow-up: "\f062";
+@arrow-down: "\f063";
+@share-alt: "\f064";
+@resize-full: "\f065";
+@resize-small: "\f066";
+@plus: "\f067";
+@minus: "\f068";
+@asterisk: "\f069";
+@exclamation-sign: "\f06a";
+@gift: "\f06b";
+@leaf: "\f06c";
+@fire: "\f06d";
+@eye-open: "\f06e";
 
-@icon-eye-close: "\f070";
-@icon-warning-sign: "\f071";
-@icon-plane: "\f072";
-@icon-calendar: "\f073";
-@icon-random: "\f074";
-@icon-comment: "\f075";
-@icon-magnet: "\f076";
-@icon-chevron-up: "\f077";
-@icon-chevron-down: "\f078";
-@icon-retweet: "\f079";
-@icon-shopping-cart: "\f07a";
-@icon-folder-close: "\f07b";
-@icon-folder-open: "\f07c";
-@icon-resize-vertical: "\f07d";
-@icon-resize-horizontal: "\f07e";
+@eye-close: "\f070";
+@warning-sign: "\f071";
+@plane: "\f072";
+@calendar: "\f073";
+@random: "\f074";
+@comment: "\f075";
+@magnet: "\f076";
+@chevron-up: "\f077";
+@chevron-down: "\f078";
+@retweet: "\f079";
+@shopping-cart: "\f07a";
+@folder-close: "\f07b";
+@folder-open: "\f07c";
+@resize-vertical: "\f07d";
+@resize-horizontal: "\f07e";
 
-@icon-bar-chart: "\f080";
-@icon-twitter-sign: "\f081";
-@icon-facebook-sign: "\f082";
-@icon-camera-retro: "\f083";
-@icon-key: "\f084";
-@icon-cogs: "\f085";
-@icon-comments: "\f086";
-@icon-thumbs-up: "\f087";
-@icon-thumbs-down: "\f088";
-@icon-star-half: "\f089";
-@icon-heart-empty: "\f08a";
-@icon-signout: "\f08b";
-@icon-linkedin-sign: "\f08c";
-@icon-pushpin: "\f08d";
-@icon-external-link: "\f08e";
+@bar-chart: "\f080";
+@twitter-sign: "\f081";
+@facebook-sign: "\f082";
+@camera-retro: "\f083";
+@key: "\f084";
+@cogs: "\f085";
+@comments: "\f086";
+@thumbs-up-alt: "\f087";
+@thumbs-down-alt: "\f088";
+@star-half: "\f089";
+@heart-empty: "\f08a";
+@signout: "\f08b";
+@linkedin-sign: "\f08c";
+@pushpin: "\f08d";
+@external-link: "\f08e";
 
-@icon-signin: "\f090";
-@icon-trophy: "\f091";
-@icon-github-sign: "\f092";
-@icon-upload-alt: "\f093";
-@icon-lemon: "\f094";
-@icon-phone: "\f095";
-@icon-check-empty: "\f096";
-@icon-bookmark-empty: "\f097";
-@icon-phone-sign: "\f098";
-@icon-twitter: "\f099";
-@icon-facebook: "\f09a";
-@icon-github: "\f09b";
-@icon-unlock: "\f09c";
-@icon-credit-card: "\f09d";
-@icon-rss: "\f09e";
+@signin: "\f090";
+@trophy: "\f091";
+@github-sign: "\f092";
+@upload-alt: "\f093";
+@lemon: "\f094";
+@phone: "\f095";
+@check-empty: "\f096";
+@bookmark-empty: "\f097";
+@phone-sign: "\f098";
+@twitter: "\f099";
+@facebook: "\f09a";
+@github: "\f09b";
+@unlock: "\f09c";
+@credit-card: "\f09d";
+@rss: "\f09e";
 
-@icon-hdd: "\f0a0";
-@icon-bullhorn: "\f0a1";
-@icon-bell: "\f0a2";
-@icon-certificate: "\f0a3";
-@icon-hand-right: "\f0a4";
-@icon-hand-left: "\f0a5";
-@icon-hand-up: "\f0a6";
-@icon-hand-down: "\f0a7";
-@icon-circle-arrow-left: "\f0a8";
-@icon-circle-arrow-right: "\f0a9";
-@icon-circle-arrow-up: "\f0aa";
-@icon-circle-arrow-down: "\f0ab";
-@icon-globe: "\f0ac";
-@icon-wrench: "\f0ad";
-@icon-tasks: "\f0ae";
+@hdd: "\f0a0";
+@bullhorn: "\f0a1";
+@bell: "\f0a2";
+@certificate: "\f0a3";
+@hand-right: "\f0a4";
+@hand-left: "\f0a5";
+@hand-up: "\f0a6";
+@hand-down: "\f0a7";
+@circle-arrow-left: "\f0a8";
+@circle-arrow-right: "\f0a9";
+@circle-arrow-up: "\f0aa";
+@circle-arrow-down: "\f0ab";
+@globe: "\f0ac";
+@wrench: "\f0ad";
+@tasks: "\f0ae";
 
-@icon-filter: "\f0b0";
-@icon-briefcase: "\f0b1";
-@icon-fullscreen: "\f0b2";
+@filter: "\f0b0";
+@briefcase: "\f0b1";
+@fullscreen: "\f0b2";
 
-@icon-group: "\f0c0";
-@icon-link: "\f0c1";
-@icon-cloud: "\f0c2";
-@icon-beaker: "\f0c3";
-@icon-cut: "\f0c4";
-@icon-copy: "\f0c5";
-@icon-paper-clip: "\f0c6";
-@icon-save: "\f0c7";
-@icon-sign-blank: "\f0c8";
-@icon-reorder: "\f0c9";
-@icon-list-ul: "\f0ca";
-@icon-list-ol: "\f0cb";
-@icon-strikethrough: "\f0cc";
-@icon-underline: "\f0cd";
-@icon-table: "\f0ce";
+@group: "\f0c0";
+@link: "\f0c1";
+@cloud: "\f0c2";
+@beaker: "\f0c3";
+@cut: "\f0c4";
+@copy: "\f0c5";
+@paper-clip: "\f0c6";
+@save: "\f0c7";
+@sign-blank: "\f0c8";
+@reorder: "\f0c9";
+@list-ul: "\f0ca";
+@list-ol: "\f0cb";
+@strikethrough: "\f0cc";
+@underline: "\f0cd";
+@table: "\f0ce";
 
-@icon-magic: "\f0d0";
-@icon-truck: "\f0d1";
-@icon-pinterest: "\f0d2";
-@icon-pinterest-sign: "\f0d3";
-@icon-google-plus-sign: "\f0d4";
-@icon-google-plus: "\f0d5";
-@icon-money: "\f0d6";
-@icon-caret-down: "\f0d7";
-@icon-caret-up: "\f0d8";
-@icon-caret-left: "\f0d9";
-@icon-caret-right: "\f0da";
-@icon-columns: "\f0db";
-@icon-sort: "\f0dc";
-@icon-sort-down: "\f0dd";
-@icon-sort-up: "\f0de";
+@magic: "\f0d0";
+@truck: "\f0d1";
+@pinterest: "\f0d2";
+@pinterest-sign: "\f0d3";
+@google-plus-sign: "\f0d4";
+@google-plus: "\f0d5";
+@money: "\f0d6";
+@caret-down: "\f0d7";
+@caret-up: "\f0d8";
+@caret-left: "\f0d9";
+@caret-right: "\f0da";
+@columns: "\f0db";
+@sort: "\f0dc";
+@sort-down: "\f0dd";
+@sort-up: "\f0de";
 
-@icon-envelope: "\f0e0";
-@icon-linkedin: "\f0e1";
-@icon-undo: "\f0e2";
-@icon-legal: "\f0e3";
-@icon-dashboard: "\f0e4";
-@icon-comment-alt: "\f0e5";
-@icon-comments-alt: "\f0e6";
-@icon-bolt: "\f0e7";
-@icon-sitemap: "\f0e8";
-@icon-umbrella: "\f0e9";
-@icon-paste: "\f0ea";
-@icon-lightbulb: "\f0eb";
-@icon-exchange: "\f0ec";
-@icon-cloud-download: "\f0ed";
-@icon-cloud-upload: "\f0ee";
+@envelope: "\f0e0";
+@linkedin: "\f0e1";
+@undo: "\f0e2";
+@legal: "\f0e3";
+@dashboard: "\f0e4";
+@comment-alt: "\f0e5";
+@comments-alt: "\f0e6";
+@bolt: "\f0e7";
+@sitemap: "\f0e8";
+@umbrella: "\f0e9";
+@paste: "\f0ea";
+@lightbulb: "\f0eb";
+@exchange: "\f0ec";
+@cloud-download: "\f0ed";
+@cloud-upload: "\f0ee";
 
-@icon-user-md: "\f0f0";
-@icon-stethoscope: "\f0f1";
-@icon-suitcase: "\f0f2";
-@icon-bell-alt: "\f0f3";
-@icon-coffee: "\f0f4";
-@icon-food: "\f0f5";
-@icon-file-text-alt: "\f0f6";
-@icon-building: "\f0f7";
-@icon-hospital: "\f0f8";
-@icon-ambulance: "\f0f9";
-@icon-medkit: "\f0fa";
-@icon-fighter-jet: "\f0fb";
-@icon-beer: "\f0fc";
-@icon-h-sign: "\f0fd";
-@icon-plus-sign-alt: "\f0fe";
+@user-md: "\f0f0";
+@stethoscope: "\f0f1";
+@suitcase: "\f0f2";
+@bell-alt: "\f0f3";
+@coffee: "\f0f4";
+@food: "\f0f5";
+@file-text-alt: "\f0f6";
+@building: "\f0f7";
+@hospital: "\f0f8";
+@ambulance: "\f0f9";
+@medkit: "\f0fa";
+@fighter-jet: "\f0fb";
+@beer: "\f0fc";
+@h-sign: "\f0fd";
+@plus-sign-alt: "\f0fe";
 
-@icon-double-angle-left: "\f100";
-@icon-double-angle-right: "\f101";
-@icon-double-angle-up: "\f102";
-@icon-double-angle-down: "\f103";
-@icon-angle-left: "\f104";
-@icon-angle-right: "\f105";
-@icon-angle-up: "\f106";
-@icon-angle-down: "\f107";
-@icon-desktop: "\f108";
-@icon-laptop: "\f109";
-@icon-tablet: "\f10a";
-@icon-mobile-phone: "\f10b";
-@icon-circle-blank: "\f10c";
-@icon-quote-left: "\f10d";
-@icon-quote-right: "\f10e";
+@double-angle-left: "\f100";
+@double-angle-right: "\f101";
+@double-angle-up: "\f102";
+@double-angle-down: "\f103";
+@angle-left: "\f104";
+@angle-right: "\f105";
+@angle-up: "\f106";
+@angle-down: "\f107";
+@desktop: "\f108";
+@laptop: "\f109";
+@tablet: "\f10a";
+@mobile-phone: "\f10b";
+@circle-blank: "\f10c";
+@quote-left: "\f10d";
+@quote-right: "\f10e";
 
-@icon-spinner: "\f110";
-@icon-circle: "\f111";
-@icon-reply: "\f112";
-@icon-github-alt: "\f113";
-@icon-folder-close-alt: "\f114";
-@icon-folder-open-alt: "\f115";
-@icon-expand-alt: "\f116";
-@icon-collapse-alt: "\f117";
-@icon-smile: "\f118";
-@icon-frown: "\f119";
-@icon-meh: "\f11a";
-@icon-gamepad: "\f11b";
-@icon-keyboard: "\f11c";
-@icon-flag-alt: "\f11d";
-@icon-flag-checkered: "\f11e";
+@spinner: "\f110";
+@circle: "\f111";
+@reply: "\f112";
+@github-alt: "\f113";
+@folder-close-alt: "\f114";
+@folder-open-alt: "\f115";
+@expand-alt: "\f116";
+@collapse-alt: "\f117";
+@smile: "\f118";
+@frown: "\f119";
+@meh: "\f11a";
+@gamepad: "\f11b";
+@keyboard: "\f11c";
+@flag-alt: "\f11d";
+@flag-checkered: "\f11e";
 
-@icon-terminal: "\f120";
-@icon-code: "\f121";
-@icon-reply-all: "\f122";
-@icon-mail-reply-all: "\f122";
-@icon-star-half-empty: "\f123";
-@icon-location-arrow: "\f124";
-@icon-crop: "\f125";
-@icon-code-fork: "\f126";
-@icon-unlink: "\f127";
-@icon-question: "\f128";
-@icon-info: "\f129";
-@icon-exclamation: "\f12a";
-@icon-superscript: "\f12b";
-@icon-subscript: "\f12c";
-@icon-eraser: "\f12d";
-@icon-puzzle-piece: "\f12e";
+@terminal: "\f120";
+@code: "\f121";
+@reply-all: "\f122";
+@mail-reply-all: "\f122";
+@star-half-empty: "\f123";
+@location-arrow: "\f124";
+@crop: "\f125";
+@code-fork: "\f126";
+@unlink: "\f127";
+@question: "\f128";
+@info: "\f129";
+@exclamation: "\f12a";
+@superscript: "\f12b";
+@subscript: "\f12c";
+@eraser: "\f12d";
+@puzzle-piece: "\f12e";
 
-@icon-microphone: "\f130";
-@icon-microphone-off: "\f131";
-@icon-shield: "\f132";
-@icon-calendar-empty: "\f133";
-@icon-fire-extinguisher: "\f134";
-@icon-rocket: "\f135";
-@icon-maxcdn: "\f136";
-@icon-chevron-sign-left: "\f137";
-@icon-chevron-sign-right: "\f138";
-@icon-chevron-sign-up: "\f139";
-@icon-chevron-sign-down: "\f13a";
-@icon-html5: "\f13b";
-@icon-css3: "\f13c";
-@icon-anchor: "\f13d";
-@icon-unlock-alt: "\f13e";
+@microphone: "\f130";
+@microphone-off: "\f131";
+@shield: "\f132";
+@calendar-empty: "\f133";
+@fire-extinguisher: "\f134";
+@rocket: "\f135";
+@maxcdn: "\f136";
+@chevron-sign-left: "\f137";
+@chevron-sign-right: "\f138";
+@chevron-sign-up: "\f139";
+@chevron-sign-down: "\f13a";
+@html5: "\f13b";
+@css3: "\f13c";
+@anchor: "\f13d";
+@unlock-alt: "\f13e";
 
-@icon-bullseye: "\f140";
-@icon-ellipsis-horizontal: "\f141";
-@icon-ellipsis-vertical: "\f142";
-@icon-rss-sign: "\f143";
-@icon-play-sign: "\f144";
-@icon-ticket: "\f145";
-@icon-minus-sign-alt: "\f146";
-@icon-check-minus: "\f147";
-@icon-level-up: "\f148";
-@icon-level-down: "\f149";
-@icon-check-sign: "\f14a";
-@icon-edit-sign: "\f14b";
-@icon-external-link-sign: "\f14c";
-@icon-share-sign: "\f14d";
+@bullseye: "\f140";
+@ellipsis-horizontal: "\f141";
+@ellipsis-vertical: "\f142";
+@rss-sign: "\f143";
+@play-sign: "\f144";
+@ticket: "\f145";
+@minus-sign-alt: "\f146";
+@check-minus: "\f147";
+@level-up: "\f148";
+@level-down: "\f149";
+@check-sign: "\f14a";
+@edit-sign: "\f14b";
+@external-link-sign: "\f14c";
+@share-sign: "\f14d";
 
-@icon-collapse: "\f150";
-@icon-collapse-top: "\f151";
-@icon-expand: "\f152";
-@icon-eur: "\f153";
-@icon-gbp: "\f154";
-@icon-usd: "\f155";
-@icon-inr: "\f156";
-@icon-jpy: "\f157";
-@icon-cny: "\f158";
-@icon-krw: "\f159";
-@icon-btc: "\f15a";
-@icon-file: "\f15b";
-@icon-file-text: "\f15c";
+@collapse: "\f150";
+@collapse-top: "\f151";
+@expand: "\f152";
+@eur: "\f153";
+@gbp: "\f154";
+@usd: "\f155";
+@inr: "\f156";
+@jpy: "\f157";
+@cny: "\f158";
+@krw: "\f159";
+@btc: "\f15a";
+@file: "\f15b";
+@file-text: "\f15c";
+@sort-by-alphabet: "\f15d";
+@sort-by-alphabet-alt: "\f15e";
+
+@sort-by-attributes: "\f160";
+@sort-by-attributes-alt: "\f161";
+@sort-by-order: "\f162";
+@sort-by-order-alt: "\f163";
+@thumbs-up: "\f164";
+@thumbs-down: "\f165";
diff --git a/build/icons.yml b/build/icons.yml
index 2740c9c33..019f9bf44 100755
--- a/build/icons.yml
+++ b/build/icons.yml
@@ -902,15 +902,15 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       thumbs-up
-    id:         thumbs-up
+  - name:       thumbs-up-alt
+    id:         thumbs-up-alt
     unicode:    f087
     created:    1.0.0
     categories:
       - Web Application Icons
 
-  - name:       thumbs-down
-    id:         thumbs-down
+  - name:       thumbs-down-alt
+    id:         thumbs-down-alt
     unicode:    f088
     created:    1.0.0
     categories:
@@ -2264,3 +2264,61 @@ icons:
     created:    3.2.0
     categories:
       - Text Editor Icons
+
+  - name:       Sort By Alphabet
+    id:         sort-by-alphabet
+    unicode:    f15d
+    created:    3.2.0
+    categories:
+      - Web Application Icons
+
+  - name:       Sort By Alphabet Alt
+    id:         sort-by-alphabet-alt
+    unicode:    f15e
+    created:    3.2.0
+    categories:
+      - Web Application Icons
+
+
+  - name:       Sort By Attributes
+    id:         sort-by-attributes
+    unicode:    f160
+    created:    3.2.0
+    categories:
+      - Web Application Icons
+
+  - name:       Sort By Attributes Alt
+    id:         sort-by-attributes-alt
+    unicode:    f161
+    created:    3.2.0
+    categories:
+      - Web Application Icons
+
+  - name:       Sort By Order
+    id:         sort-by-order
+    unicode:    f162
+    created:    3.2.0
+    categories:
+      - Web Application Icons
+
+  - name:       Sort By Order Alt
+    id:         sort-by-order-alt
+    unicode:    f163
+    created:    3.2.0
+    categories:
+      - Web Application Icons
+
+
+  - name:       thumbs-up
+    id:         thumbs-up
+    unicode:    f164
+    created:    3.2.0
+    categories:
+      - Web Application Icons
+
+  - name:       thumbs-down
+    id:         thumbs-down
+    unicode:    f165
+    created:    3.2.0
+    categories:
+      - Web Application Icons