diff --git a/css/font-awesome-ie7.css b/css/font-awesome-ie7.css
index 507ebeb3d..0c9b619cd 100644
--- a/css/font-awesome-ie7.css
+++ b/css/font-awesome-ie7.css
@@ -24,20 +24,20 @@
  *  Work: Lead Product Designer @ Kyruus - http://kyruus.com
  */
 .icon-large {
-  font-size: 1.3333333333333333em;
-  margin-top: -4px;
   padding-top: 3px;
-  margin-bottom: -4px;
   padding-bottom: 3px;
+  margin-top: -4px;
+  margin-bottom: -4px;
+  font-size: 1.3333333333333333em;
   vertical-align: middle;
 }
 .nav [class^="icon-"],
 .nav [class*=" icon-"] {
-  vertical-align: inherit;
-  margin-top: -4px;
   padding-top: 3px;
-  margin-bottom: -4px;
   padding-bottom: 3px;
+  margin-top: -4px;
+  margin-bottom: -4px;
+  vertical-align: inherit;
 }
 .nav [class^="icon-"].icon-large,
 .nav [class*=" icon-"].icon-large {
@@ -47,11 +47,11 @@
 .nav-tabs [class^="icon-"].icon-large,
 .nav-pills [class*=" icon-"].icon-large,
 .nav-tabs [class*=" icon-"].icon-large {
-  line-height: .75em;
-  margin-top: -7px;
   padding-top: 5px;
-  margin-bottom: -5px;
   padding-bottom: 4px;
+  margin-top: -7px;
+  margin-bottom: -5px;
+  line-height: .75em;
 }
 .btn [class^="icon-"].pull-left,
 .btn [class*=" icon-"].pull-left,
@@ -475,7 +475,7 @@ a [class*=" icon-"] {
 .icon-heart-empty {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
-.icon-signout {
+.icon-log-out {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
 .icon-linkedin-sign {
@@ -487,7 +487,7 @@ a [class*=" icon-"] {
 .icon-external-link {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
-.icon-signin {
+.icon-log-in {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
 .icon-trophy {
@@ -502,12 +502,9 @@ a [class*=" icon-"] {
 .icon-lemon {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
-.icon-phone {
+.icon-earphone {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
-.icon-check-empty {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
-}
 .icon-unchecked {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
@@ -542,7 +539,7 @@ a [class*=" icon-"] {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
 .icon-bell {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
 .icon-certificate {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
@@ -607,13 +604,10 @@ a [class*=" icon-"] {
 .icon-copy {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
-.icon-paper-clip {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
-}
 .icon-paperclip {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
-.icon-save {
+.icon-floppy-disk {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
 .icon-sign-blank {
@@ -706,7 +700,7 @@ a [class*=" icon-"] {
 .icon-comments-alt {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
-.icon-bolt {
+.icon-flash {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
 .icon-sitemap {
@@ -740,12 +734,12 @@ a [class*=" icon-"] {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
 .icon-bell-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
+  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
 .icon-coffee {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
-.icon-food {
+.icon-cutlery {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
 .icon-file-text-alt {
@@ -808,7 +802,7 @@ a [class*=" icon-"] {
 .icon-tablet {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
-.icon-mobile-phone {
+.icon-phone {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
 .icon-circle-blank {
@@ -1009,10 +1003,10 @@ a [class*=" icon-"] {
 .icon-compass {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
-.icon-collapse {
+.icon-collapse-down {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
-.icon-collapse-top {
+.icon-collapse-up {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
 .icon-expand {
@@ -1111,7 +1105,7 @@ a [class*=" icon-"] {
 .icon-dropbox {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
-.icon-stackexchange {
+.icon-stackoverflow {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
 }
 .icon-instagram {
diff --git a/css/font-awesome-ie7.min.css b/css/font-awesome-ie7.min.css
index cffe088ec..389e317f7 100644
--- a/css/font-awesome-ie7.min.css
+++ b/css/font-awesome-ie7.min.css
@@ -1,6 +1,6 @@
-.icon-large{font-size:1.3333333333333333em;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px;vertical-align:middle}
-.nav [class^="icon-"],.nav [class*=" icon-"]{vertical-align:inherit;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px}.nav [class^="icon-"].icon-large,.nav [class*=" icon-"].icon-large{vertical-align:-25%}
-.nav-pills [class^="icon-"].icon-large,.nav-tabs [class^="icon-"].icon-large,.nav-pills [class*=" icon-"].icon-large,.nav-tabs [class*=" icon-"].icon-large{line-height:.75em;margin-top:-7px;padding-top:5px;margin-bottom:-5px;padding-bottom:4px}
+.icon-large{padding-top:3px;padding-bottom:3px;margin-top:-4px;margin-bottom:-4px;font-size:1.3333333333333333em;vertical-align:middle}
+.nav [class^="icon-"],.nav [class*=" icon-"]{padding-top:3px;padding-bottom:3px;margin-top:-4px;margin-bottom:-4px;vertical-align:inherit}.nav [class^="icon-"].icon-large,.nav [class*=" icon-"].icon-large{vertical-align:-25%}
+.nav-pills [class^="icon-"].icon-large,.nav-tabs [class^="icon-"].icon-large,.nav-pills [class*=" icon-"].icon-large,.nav-tabs [class*=" icon-"].icon-large{padding-top:5px;padding-bottom:4px;margin-top:-7px;margin-bottom:-5px;line-height:.75em}
 .btn [class^="icon-"].pull-left,.btn [class*=" icon-"].pull-left,.btn [class^="icon-"].pull-right,.btn [class*=" icon-"].pull-right{vertical-align:inherit}
 .btn [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large{margin-top:-0.5em}
 a [class^="icon-"],a [class*=" icon-"]{cursor:pointer}
@@ -140,17 +140,16 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer}
 .icon-thumbs-down-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-star-half{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-heart-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
-.icon-signout{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
+.icon-log-out{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-linkedin-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-pushpin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-external-link{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
-.icon-signin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
+.icon-log-in{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-trophy{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-github-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-upload-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-lemon{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
-.icon-phone{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
-.icon-check-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
+.icon-earphone{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-unchecked{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-bookmark-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-phone-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
@@ -162,7 +161,7 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer}
 .icon-rss{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-hdd{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-bullhorn{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
-.icon-bell{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
+.icon-bell{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-certificate{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-hand-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-hand-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
@@ -184,9 +183,8 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer}
 .icon-beaker{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-cut{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-copy{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
-.icon-paper-clip{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-paperclip{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
-.icon-save{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
+.icon-floppy-disk{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-sign-blank{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-reorder{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-list-ul{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
@@ -217,7 +215,7 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer}
 .icon-dashboard{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-comment-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-comments-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
-.icon-bolt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
+.icon-flash{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-sitemap{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-umbrella{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-paste{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
@@ -228,9 +226,9 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer}
 .icon-user-md{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-stethoscope{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-suitcase{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
-.icon-bell-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
+.icon-bell-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-coffee{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
-.icon-food{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
+.icon-cutlery{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-file-text-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-building{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-hospital{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
@@ -251,7 +249,7 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer}
 .icon-desktop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-laptop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-tablet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
-.icon-mobile-phone{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
+.icon-phone{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-circle-blank{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-quote-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-quote-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
@@ -318,8 +316,8 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer}
 .icon-external-link-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-share-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-compass{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
-.icon-collapse{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
-.icon-collapse-top{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
+.icon-collapse-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
+.icon-collapse-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-expand{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-eur{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-euro{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
@@ -352,7 +350,7 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer}
 .icon-xing-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-youtube-play{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-dropbox{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
-.icon-stackexchange{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
+.icon-stackoverflow{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-instagram{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-flickr{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
 .icon-adn{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '')}
diff --git a/css/font-awesome.css b/css/font-awesome.css
index 66b543de9..003f36b16 100644
--- a/css/font-awesome.css
+++ b/css/font-awesome.css
@@ -777,7 +777,7 @@ a .icon-flip-vertical:before {
 .icon-heart-empty:before {
   content: "\f08a";
 }
-.icon-signout:before {
+.icon-log-out:before {
   content: "\f08b";
 }
 .icon-linkedin-sign:before {
@@ -789,7 +789,7 @@ a .icon-flip-vertical:before {
 .icon-external-link:before {
   content: "\f08e";
 }
-.icon-signin:before {
+.icon-log-in:before {
   content: "\f090";
 }
 .icon-trophy:before {
@@ -804,11 +804,10 @@ a .icon-flip-vertical:before {
 .icon-lemon:before {
   content: "\f094";
 }
-.icon-phone:before {
+.icon-earphone:before {
   content: "\f095";
 }
-.icon-unchecked:before,
-.icon-check-empty:before {
+.icon-unchecked:before {
   content: "\f096";
 }
 .icon-bookmark-empty:before {
@@ -842,7 +841,7 @@ a .icon-flip-vertical:before {
   content: "\f0a1";
 }
 .icon-bell:before {
-  content: "\f0a2";
+  content: "\f0f3";
 }
 .icon-certificate:before {
   content: "\f0a3";
@@ -907,11 +906,10 @@ a .icon-flip-vertical:before {
 .icon-copy:before {
   content: "\f0c5";
 }
-.icon-paperclip:before,
-.icon-paper-clip:before {
+.icon-paperclip:before {
   content: "\f0c6";
 }
-.icon-save:before {
+.icon-floppy-disk:before {
   content: "\f0c7";
 }
 .icon-sign-blank:before {
@@ -1002,7 +1000,7 @@ a .icon-flip-vertical:before {
 .icon-comments-alt:before {
   content: "\f0e6";
 }
-.icon-bolt:before {
+.icon-flash:before {
   content: "\f0e7";
 }
 .icon-sitemap:before {
@@ -1036,12 +1034,12 @@ a .icon-flip-vertical:before {
   content: "\f0f2";
 }
 .icon-bell-alt:before {
-  content: "\f0f3";
+  content: "\f0a2";
 }
 .icon-coffee:before {
   content: "\f0f4";
 }
-.icon-food:before {
+.icon-cutlery:before {
   content: "\f0f5";
 }
 .icon-file-text-alt:before {
@@ -1104,7 +1102,7 @@ a .icon-flip-vertical:before {
 .icon-tablet:before {
   content: "\f10a";
 }
-.icon-mobile-phone:before {
+.icon-phone:before {
   content: "\f10b";
 }
 .icon-circle-blank:before {
@@ -1301,10 +1299,10 @@ a .icon-flip-vertical:before {
 .icon-compass:before {
   content: "\f14e";
 }
-.icon-collapse:before {
+.icon-collapse-down:before {
   content: "\f150";
 }
-.icon-collapse-top:before {
+.icon-collapse-up:before {
   content: "\f151";
 }
 .icon-expand:before {
@@ -1389,7 +1387,7 @@ a .icon-flip-vertical:before {
 .icon-dropbox:before {
   content: "\f16b";
 }
-.icon-stackexchange:before {
+.icon-stackoverflow:before {
   content: "\f16c";
 }
 .icon-instagram:before {
diff --git a/css/font-awesome.min.css b/css/font-awesome.min.css
index 8b45ca154..2cd55ed6c 100644
--- a/css/font-awesome.min.css
+++ b/css/font-awesome.min.css
@@ -171,17 +171,17 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .
 .icon-thumbs-down-alt:before{content:"\f088"}
 .icon-star-half:before{content:"\f089"}
 .icon-heart-empty:before{content:"\f08a"}
-.icon-signout:before{content:"\f08b"}
+.icon-log-out:before{content:"\f08b"}
 .icon-linkedin-sign:before{content:"\f08c"}
 .icon-pushpin:before{content:"\f08d"}
 .icon-external-link:before{content:"\f08e"}
-.icon-signin:before{content:"\f090"}
+.icon-log-in:before{content:"\f090"}
 .icon-trophy:before{content:"\f091"}
 .icon-github-sign:before{content:"\f092"}
 .icon-upload-alt:before{content:"\f093"}
 .icon-lemon:before{content:"\f094"}
-.icon-phone:before{content:"\f095"}
-.icon-unchecked:before,.icon-check-empty:before{content:"\f096"}
+.icon-earphone:before{content:"\f095"}
+.icon-unchecked:before{content:"\f096"}
 .icon-bookmark-empty:before{content:"\f097"}
 .icon-phone-sign:before{content:"\f098"}
 .icon-twitter:before{content:"\f099"}
@@ -192,7 +192,7 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .
 .icon-rss:before{content:"\f09e"}
 .icon-hdd:before{content:"\f0a0"}
 .icon-bullhorn:before{content:"\f0a1"}
-.icon-bell:before{content:"\f0a2"}
+.icon-bell:before{content:"\f0f3"}
 .icon-certificate:before{content:"\f0a3"}
 .icon-hand-right:before{content:"\f0a4"}
 .icon-hand-left:before{content:"\f0a5"}
@@ -214,8 +214,8 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .
 .icon-beaker:before{content:"\f0c3"}
 .icon-cut:before{content:"\f0c4"}
 .icon-copy:before{content:"\f0c5"}
-.icon-paperclip:before,.icon-paper-clip:before{content:"\f0c6"}
-.icon-save:before{content:"\f0c7"}
+.icon-paperclip:before{content:"\f0c6"}
+.icon-floppy-disk:before{content:"\f0c7"}
 .icon-sign-blank:before{content:"\f0c8"}
 .icon-reorder:before{content:"\f0c9"}
 .icon-list-ul:before{content:"\f0ca"}
@@ -245,7 +245,7 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .
 .icon-dashboard:before{content:"\f0e4"}
 .icon-comment-alt:before{content:"\f0e5"}
 .icon-comments-alt:before{content:"\f0e6"}
-.icon-bolt:before{content:"\f0e7"}
+.icon-flash:before{content:"\f0e7"}
 .icon-sitemap:before{content:"\f0e8"}
 .icon-umbrella:before{content:"\f0e9"}
 .icon-paste:before{content:"\f0ea"}
@@ -256,9 +256,9 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .
 .icon-user-md:before{content:"\f0f0"}
 .icon-stethoscope:before{content:"\f0f1"}
 .icon-suitcase:before{content:"\f0f2"}
-.icon-bell-alt:before{content:"\f0f3"}
+.icon-bell-alt:before{content:"\f0a2"}
 .icon-coffee:before{content:"\f0f4"}
-.icon-food:before{content:"\f0f5"}
+.icon-cutlery:before{content:"\f0f5"}
 .icon-file-text-alt:before{content:"\f0f6"}
 .icon-building:before{content:"\f0f7"}
 .icon-hospital:before{content:"\f0f8"}
@@ -279,7 +279,7 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .
 .icon-desktop:before{content:"\f108"}
 .icon-laptop:before{content:"\f109"}
 .icon-tablet:before{content:"\f10a"}
-.icon-mobile-phone:before{content:"\f10b"}
+.icon-phone:before{content:"\f10b"}
 .icon-circle-blank:before{content:"\f10c"}
 .icon-quote-left:before{content:"\f10d"}
 .icon-quote-right:before{content:"\f10e"}
@@ -344,8 +344,8 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .
 .icon-external-link-sign:before{content:"\f14c"}
 .icon-share-sign:before{content:"\f14d"}
 .icon-compass:before{content:"\f14e"}
-.icon-collapse:before{content:"\f150"}
-.icon-collapse-top:before{content:"\f151"}
+.icon-collapse-down:before{content:"\f150"}
+.icon-collapse-up:before{content:"\f151"}
 .icon-expand:before{content:"\f152"}
 .icon-euro:before,.icon-eur:before{content:"\f153"}
 .icon-gbp:before{content:"\f154"}
@@ -371,7 +371,7 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .
 .icon-xing-sign:before{content:"\f169"}
 .icon-youtube-play:before{content:"\f16a"}
 .icon-dropbox:before{content:"\f16b"}
-.icon-stackexchange:before{content:"\f16c"}
+.icon-stackoverflow:before{content:"\f16c"}
 .icon-instagram:before{content:"\f16d"}
 .icon-flickr:before{content:"\f16e"}
 .icon-adn:before{content:"\f170"}
diff --git a/less/font-awesome-ie7.less b/less/font-awesome-ie7.less
index b4edd8ae7..4cfeb0ae9 100644
--- a/less/font-awesome-ie7.less
+++ b/less/font-awesome-ie7.less
@@ -25,22 +25,22 @@
  */
 
 .icon-large {
-  font-size: (4em / 3);
-  margin-top: -4px;
   padding-top: 3px;
-  margin-bottom: -4px;
   padding-bottom: 3px;
+  margin-top: -4px;
+  margin-bottom: -4px;
+  font-size: (4em / 3);
   vertical-align: middle;
 }
 
 .nav {
   [class^="icon-"],
   [class*=" icon-"] {
-    vertical-align: inherit;
-    margin-top: -4px;
     padding-top: 3px;
-    margin-bottom: -4px;
     padding-bottom: 3px;
+    margin-top: -4px;
+    margin-bottom: -4px;
+    vertical-align: inherit;
     &.icon-large {
       vertical-align: -25%;
     }
@@ -51,11 +51,11 @@
   [class^="icon-"],
   [class*=" icon-"] {
     &.icon-large {
-      line-height: .75em;
-      margin-top: -7px;
       padding-top: 5px;
-      margin-bottom: -5px;
       padding-bottom: 4px;
+      margin-top: -7px;
+      margin-bottom: -5px;
+      line-height: .75em;
     }
   }
 }
@@ -753,7 +753,7 @@ a [class*=" icon-"] {
 }
 
 
-.icon-signout {
+.icon-log-out {
   .ie7icon('');
 }
 
@@ -773,7 +773,7 @@ a [class*=" icon-"] {
 }
 
 
-.icon-signin {
+.icon-log-in {
   .ie7icon('');
 }
 
@@ -798,15 +798,11 @@ a [class*=" icon-"] {
 }
 
 
-.icon-phone {
+.icon-earphone {
   .ie7icon('');
 }
 
 
-.icon-check-empty {
-  .ie7icon('');
-}
-
 .icon-unchecked {
   .ie7icon('');
 }
@@ -863,7 +859,7 @@ a [class*=" icon-"] {
 
 
 .icon-bell {
-  .ie7icon('');
+  .ie7icon('');
 }
 
 
@@ -972,16 +968,12 @@ a [class*=" icon-"] {
 }
 
 
-.icon-paper-clip {
-  .ie7icon('');
-}
-
 .icon-paperclip {
   .ie7icon('');
 }
 
 
-.icon-save {
+.icon-floppy-disk {
   .ie7icon('');
 }
 
@@ -1135,7 +1127,7 @@ a [class*=" icon-"] {
 }
 
 
-.icon-bolt {
+.icon-flash {
   .ie7icon('');
 }
 
@@ -1191,7 +1183,7 @@ a [class*=" icon-"] {
 
 
 .icon-bell-alt {
-  .ie7icon('');
+  .ie7icon('');
 }
 
 
@@ -1200,7 +1192,7 @@ a [class*=" icon-"] {
 }
 
 
-.icon-food {
+.icon-cutlery {
   .ie7icon('');
 }
 
@@ -1305,7 +1297,7 @@ a [class*=" icon-"] {
 }
 
 
-.icon-mobile-phone {
+.icon-phone {
   .ie7icon('');
 }
 
@@ -1638,12 +1630,12 @@ a [class*=" icon-"] {
 }
 
 
-.icon-collapse {
+.icon-collapse-down {
   .ie7icon('');
 }
 
 
-.icon-collapse-top {
+.icon-collapse-up {
   .ie7icon('');
 }
 
@@ -1801,7 +1793,7 @@ a [class*=" icon-"] {
 }
 
 
-.icon-stackexchange {
+.icon-stackoverflow {
   .ie7icon('');
 }
 
diff --git a/less/icons.less b/less/icons.less
index 476d201ec..809e0608c 100644
--- a/less/icons.less
+++ b/less/icons.less
@@ -137,18 +137,17 @@
 .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-log-out:before { content: @log-out; }
 .icon-linkedin-sign:before { content: @linkedin-sign; }
 .icon-pushpin:before { content: @pushpin; }
 .icon-external-link:before { content: @external-link; }
-.icon-signin:before { content: @signin; }
+.icon-log-in:before { content: @log-in; }
 .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-unchecked:before,
-.icon-check-empty:before { content: @check-empty; }
+.icon-earphone:before { content: @earphone; }
+.icon-unchecked:before { content: @unchecked; }
 .icon-bookmark-empty:before { content: @bookmark-empty; }
 .icon-phone-sign:before { content: @phone-sign; }
 .icon-twitter:before { content: @twitter; }
@@ -181,9 +180,8 @@
 .icon-beaker:before { content: @beaker; }
 .icon-cut:before { content: @cut; }
 .icon-copy:before { content: @copy; }
-.icon-paperclip:before,
-.icon-paper-clip:before { content: @paper-clip; }
-.icon-save:before { content: @save; }
+.icon-paperclip:before { content: @paperclip; }
+.icon-floppy-disk:before { content: @floppy-disk; }
 .icon-sign-blank:before { content: @sign-blank; }
 .icon-reorder:before { content: @reorder; }
 .icon-list-ul:before { content: @list-ul; }
@@ -214,7 +212,7 @@
 .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-flash:before { content: @flash; }
 .icon-sitemap:before { content: @sitemap; }
 .icon-umbrella:before { content: @umbrella; }
 .icon-paste:before { content: @paste; }
@@ -227,7 +225,7 @@
 .icon-suitcase:before { content: @suitcase; }
 .icon-bell-alt:before { content: @bell-alt; }
 .icon-coffee:before { content: @coffee; }
-.icon-food:before { content: @food; }
+.icon-cutlery:before { content: @cutlery; }
 .icon-file-text-alt:before { content: @file-text-alt; }
 .icon-building:before { content: @building; }
 .icon-hospital:before { content: @hospital; }
@@ -248,7 +246,7 @@
 .icon-desktop:before { content: @desktop; }
 .icon-laptop:before { content: @laptop; }
 .icon-tablet:before { content: @tablet; }
-.icon-mobile-phone:before { content: @mobile-phone; }
+.icon-phone:before { content: @phone; }
 .icon-circle-blank:before { content: @circle-blank; }
 .icon-quote-left:before { content: @quote-left; }
 .icon-quote-right:before { content: @quote-right; }
@@ -315,8 +313,8 @@
 .icon-external-link-sign:before { content: @external-link-sign; }
 .icon-share-sign:before { content: @share-sign; }
 .icon-compass:before { content: @compass; }
-.icon-collapse:before { content: @collapse; }
-.icon-collapse-top:before { content: @collapse-top; }
+.icon-collapse-down:before { content: @collapse-down; }
+.icon-collapse-up:before { content: @collapse-up; }
 .icon-expand:before { content: @expand; }
 .icon-euro:before,
 .icon-eur:before { content: @eur; }
@@ -349,7 +347,7 @@
 .icon-xing-sign:before { content: @xing-sign; }
 .icon-youtube-play:before { content: @youtube-play; }
 .icon-dropbox:before { content: @dropbox; }
-.icon-stackexchange:before { content: @stackexchange; }
+.icon-stackoverflow:before { content: @stackoverflow; }
 .icon-instagram:before { content: @instagram; }
 .icon-flickr:before { content: @flickr; }
 .icon-adn:before { content: @adn; }
diff --git a/less/variables.less b/less/variables.less
index 305894138..8690fffb3 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -273,7 +273,7 @@
 
   @heart-empty: "\f08a";
 
-  @signout: "\f08b";
+  @log-out: "\f08b";
 
   @linkedin-sign: "\f08c";
 
@@ -281,7 +281,7 @@
 
   @external-link: "\f08e";
 
-  @signin: "\f090";
+  @log-in: "\f090";
 
   @trophy: "\f091";
 
@@ -291,9 +291,9 @@
 
   @lemon: "\f094";
 
-  @phone: "\f095";
+  @earphone: "\f095";
 
-  @check-empty: "\f096";
+  @unchecked: "\f096";
 
   @bookmark-empty: "\f097";
 
@@ -315,7 +315,7 @@
 
   @bullhorn: "\f0a1";
 
-  @bell: "\f0a2";
+  @bell: "\f0f3";
 
   @certificate: "\f0a3";
 
@@ -359,9 +359,9 @@
 
   @copy: "\f0c5";
 
-  @paper-clip: "\f0c6";
+  @paperclip: "\f0c6";
 
-  @save: "\f0c7";
+  @floppy-disk: "\f0c7";
 
   @sign-blank: "\f0c8";
 
@@ -421,7 +421,7 @@
 
   @comments-alt: "\f0e6";
 
-  @bolt: "\f0e7";
+  @flash: "\f0e7";
 
   @sitemap: "\f0e8";
 
@@ -443,11 +443,11 @@
 
   @suitcase: "\f0f2";
 
-  @bell-alt: "\f0f3";
+  @bell-alt: "\f0a2";
 
   @coffee: "\f0f4";
 
-  @food: "\f0f5";
+  @cutlery: "\f0f5";
 
   @file-text-alt: "\f0f6";
 
@@ -489,7 +489,7 @@
 
   @tablet: "\f10a";
 
-  @mobile-phone: "\f10b";
+  @phone: "\f10b";
 
   @circle-blank: "\f10c";
 
@@ -619,9 +619,9 @@
 
   @compass: "\f14e";
 
-  @collapse: "\f150";
+  @collapse-down: "\f150";
 
-  @collapse-top: "\f151";
+  @collapse-up: "\f151";
 
   @expand: "\f152";
 
@@ -673,7 +673,7 @@
 
   @dropbox: "\f16b";
 
-  @stackexchange: "\f16c";
+  @stackoverflow: "\f16c";
 
   @instagram: "\f16d";
 
diff --git a/scss/_icons.scss b/scss/_icons.scss
index eefda0c9e..3a53919d5 100644
--- a/scss/_icons.scss
+++ b/scss/_icons.scss
@@ -137,18 +137,17 @@
 .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-log-out:before { content: $log-out; }
 .icon-linkedin-sign:before { content: $linkedin-sign; }
 .icon-pushpin:before { content: $pushpin; }
 .icon-external-link:before { content: $external-link; }
-.icon-signin:before { content: $signin; }
+.icon-log-in:before { content: $log-in; }
 .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-unchecked:before,
-.icon-check-empty:before { content: $check-empty; }
+.icon-earphone:before { content: $earphone; }
+.icon-unchecked:before { content: $unchecked; }
 .icon-bookmark-empty:before { content: $bookmark-empty; }
 .icon-phone-sign:before { content: $phone-sign; }
 .icon-twitter:before { content: $twitter; }
@@ -181,9 +180,8 @@
 .icon-beaker:before { content: $beaker; }
 .icon-cut:before { content: $cut; }
 .icon-copy:before { content: $copy; }
-.icon-paperclip:before,
-.icon-paper-clip:before { content: $paper-clip; }
-.icon-save:before { content: $save; }
+.icon-paperclip:before { content: $paperclip; }
+.icon-floppy-disk:before { content: $floppy-disk; }
 .icon-sign-blank:before { content: $sign-blank; }
 .icon-reorder:before { content: $reorder; }
 .icon-list-ul:before { content: $list-ul; }
@@ -214,7 +212,7 @@
 .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-flash:before { content: $flash; }
 .icon-sitemap:before { content: $sitemap; }
 .icon-umbrella:before { content: $umbrella; }
 .icon-paste:before { content: $paste; }
@@ -227,7 +225,7 @@
 .icon-suitcase:before { content: $suitcase; }
 .icon-bell-alt:before { content: $bell-alt; }
 .icon-coffee:before { content: $coffee; }
-.icon-food:before { content: $food; }
+.icon-cutlery:before { content: $cutlery; }
 .icon-file-text-alt:before { content: $file-text-alt; }
 .icon-building:before { content: $building; }
 .icon-hospital:before { content: $hospital; }
@@ -248,7 +246,7 @@
 .icon-desktop:before { content: $desktop; }
 .icon-laptop:before { content: $laptop; }
 .icon-tablet:before { content: $tablet; }
-.icon-mobile-phone:before { content: $mobile-phone; }
+.icon-phone:before { content: $phone; }
 .icon-circle-blank:before { content: $circle-blank; }
 .icon-quote-left:before { content: $quote-left; }
 .icon-quote-right:before { content: $quote-right; }
@@ -315,8 +313,8 @@
 .icon-external-link-sign:before { content: $external-link-sign; }
 .icon-share-sign:before { content: $share-sign; }
 .icon-compass:before { content: $compass; }
-.icon-collapse:before { content: $collapse; }
-.icon-collapse-top:before { content: $collapse-top; }
+.icon-collapse-down:before { content: $collapse-down; }
+.icon-collapse-up:before { content: $collapse-up; }
 .icon-expand:before { content: $expand; }
 .icon-euro:before,
 .icon-eur:before { content: $eur; }
@@ -349,7 +347,7 @@
 .icon-xing-sign:before { content: $xing-sign; }
 .icon-youtube-play:before { content: $youtube-play; }
 .icon-dropbox:before { content: $dropbox; }
-.icon-stackexchange:before { content: $stackexchange; }
+.icon-stackoverflow:before { content: $stackoverflow; }
 .icon-instagram:before { content: $instagram; }
 .icon-flickr:before { content: $flickr; }
 .icon-adn:before { content: $adn; }
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 7d6bbc5b1..a7e91da1a 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -272,7 +272,7 @@ $star-half: "\f089";
 
 $heart-empty: "\f08a";
 
-$signout: "\f08b";
+$log-out: "\f08b";
 
 $linkedin-sign: "\f08c";
 
@@ -280,7 +280,7 @@ $pushpin: "\f08d";
 
 $external-link: "\f08e";
 
-$signin: "\f090";
+$log-in: "\f090";
 
 $trophy: "\f091";
 
@@ -290,9 +290,9 @@ $upload-alt: "\f093";
 
 $lemon: "\f094";
 
-$phone: "\f095";
+$earphone: "\f095";
 
-$check-empty: "\f096";
+$unchecked: "\f096";
 
 $bookmark-empty: "\f097";
 
@@ -314,7 +314,7 @@ $hdd: "\f0a0";
 
 $bullhorn: "\f0a1";
 
-$bell: "\f0a2";
+$bell: "\f0f3";
 
 $certificate: "\f0a3";
 
@@ -358,9 +358,9 @@ $cut: "\f0c4";
 
 $copy: "\f0c5";
 
-$paper-clip: "\f0c6";
+$paperclip: "\f0c6";
 
-$save: "\f0c7";
+$floppy-disk: "\f0c7";
 
 $sign-blank: "\f0c8";
 
@@ -420,7 +420,7 @@ $comment-alt: "\f0e5";
 
 $comments-alt: "\f0e6";
 
-$bolt: "\f0e7";
+$flash: "\f0e7";
 
 $sitemap: "\f0e8";
 
@@ -442,11 +442,11 @@ $stethoscope: "\f0f1";
 
 $suitcase: "\f0f2";
 
-$bell-alt: "\f0f3";
+$bell-alt: "\f0a2";
 
 $coffee: "\f0f4";
 
-$food: "\f0f5";
+$cutlery: "\f0f5";
 
 $file-text-alt: "\f0f6";
 
@@ -488,7 +488,7 @@ $laptop: "\f109";
 
 $tablet: "\f10a";
 
-$mobile-phone: "\f10b";
+$phone: "\f10b";
 
 $circle-blank: "\f10c";
 
@@ -618,9 +618,9 @@ $share-sign: "\f14d";
 
 $compass: "\f14e";
 
-$collapse: "\f150";
+$collapse-down: "\f150";
 
-$collapse-top: "\f151";
+$collapse-up: "\f151";
 
 $expand: "\f152";
 
@@ -672,7 +672,7 @@ $youtube-play: "\f16a";
 
 $dropbox: "\f16b";
 
-$stackexchange: "\f16c";
+$stackoverflow: "\f16c";
 
 $instagram: "\f16d";
 
diff --git a/scss/font-awesome-ie7.scss b/scss/font-awesome-ie7.scss
index 223e5f4b8..9faf52229 100644
--- a/scss/font-awesome-ie7.scss
+++ b/scss/font-awesome-ie7.scss
@@ -25,22 +25,22 @@
  */
 
 .icon-large {
-  font-size: (4em/3);
-  margin-top: -4px;
   padding-top: 3px;
-  margin-bottom: -4px;
   padding-bottom: 3px;
+  margin-top: -4px;
+  margin-bottom: -4px;
+  font-size: (4em/3);
   vertical-align: middle;
 }
 
 .nav {
   [class^="icon-"],
   [class*=" icon-"] {
-    vertical-align: inherit;
-    margin-top: -4px;
     padding-top: 3px;
-    margin-bottom: -4px;
     padding-bottom: 3px;
+    margin-top: -4px;
+    margin-bottom: -4px;
+    vertical-align: inherit;
     &.icon-large {
       vertical-align: -25%;
     }
@@ -51,11 +51,11 @@
   [class^="icon-"],
   [class*=" icon-"] {
     &.icon-large {
-      line-height: .75em;
-      margin-top: -7px;
       padding-top: 5px;
-      margin-bottom: -5px;
       padding-bottom: 4px;
+      margin-top: -7px;
+      margin-bottom: -5px;
+      line-height: .75em;
     }
   }
 }
@@ -753,7 +753,7 @@ a [class*=" icon-"] {
 }
 
 
-.icon-signout {
+.icon-log-out {
   @include ie7icon('');
 }
 
@@ -773,7 +773,7 @@ a [class*=" icon-"] {
 }
 
 
-.icon-signin {
+.icon-log-in {
   @include ie7icon('');
 }
 
@@ -798,15 +798,11 @@ a [class*=" icon-"] {
 }
 
 
-.icon-phone {
+.icon-earphone {
   @include ie7icon('');
 }
 
 
-.icon-check-empty {
-  @include ie7icon('');
-}
-
 .icon-unchecked {
   @include ie7icon('');
 }
@@ -863,7 +859,7 @@ a [class*=" icon-"] {
 
 
 .icon-bell {
-  @include ie7icon('');
+  @include ie7icon('');
 }
 
 
@@ -972,16 +968,12 @@ a [class*=" icon-"] {
 }
 
 
-.icon-paper-clip {
-  @include ie7icon('');
-}
-
 .icon-paperclip {
   @include ie7icon('');
 }
 
 
-.icon-save {
+.icon-floppy-disk {
   @include ie7icon('');
 }
 
@@ -1135,7 +1127,7 @@ a [class*=" icon-"] {
 }
 
 
-.icon-bolt {
+.icon-flash {
   @include ie7icon('');
 }
 
@@ -1191,7 +1183,7 @@ a [class*=" icon-"] {
 
 
 .icon-bell-alt {
-  @include ie7icon('');
+  @include ie7icon('');
 }
 
 
@@ -1200,7 +1192,7 @@ a [class*=" icon-"] {
 }
 
 
-.icon-food {
+.icon-cutlery {
   @include ie7icon('');
 }
 
@@ -1305,7 +1297,7 @@ a [class*=" icon-"] {
 }
 
 
-.icon-mobile-phone {
+.icon-phone {
   @include ie7icon('');
 }
 
@@ -1638,12 +1630,12 @@ a [class*=" icon-"] {
 }
 
 
-.icon-collapse {
+.icon-collapse-down {
   @include ie7icon('');
 }
 
 
-.icon-collapse-top {
+.icon-collapse-up {
   @include ie7icon('');
 }
 
@@ -1801,7 +1793,7 @@ a [class*=" icon-"] {
 }
 
 
-.icon-stackexchange {
+.icon-stackoverflow {
   @include ie7icon('');
 }
 
diff --git a/src/icons.yml b/src/icons.yml
index c3c8f531a..006c5d473 100644
--- a/src/icons.yml
+++ b/src/icons.yml
@@ -934,8 +934,8 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       signout
-    id:         signout
+  - name:       Log out
+    id:         log-out
     unicode:    f08b
     created:    1.0
     categories:
@@ -963,8 +963,8 @@ icons:
       - Web Application Icons
 
 
-  - name:       signin
-    id:         signin
+  - name:       Log in
+    id:         log-in
     unicode:    f090
     created:    1.0
     categories:
@@ -998,19 +998,17 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       phone
-    id:         phone
+  - name:       earphone
+    id:         earphone
     unicode:    f095
     created:    2.0
     categories:
       - Web Application Icons
 
-  - name:       check-empty
-    id:         check-empty
+  - name:       unchecked
+    id:         unchecked
     unicode:    f096
     created:    2.0
-    aliases:
-      - unchecked
     categories:
       - Web Application Icons
 
@@ -1087,7 +1085,7 @@ icons:
 
   - name:       bell
     id:         bell
-    unicode:    f0a2
+    unicode:    f0f3
     created:    2.0
     categories:
       - Web Application Icons
@@ -1241,17 +1239,15 @@ icons:
     categories:
       - Text Editor Icons
 
-  - name:       paper-clip
-    id:         paper-clip
+  - name:       paperclip
+    id:         paperclip
     unicode:    f0c6
     created:    2.0
-    aliases:
-      - paperclip
     categories:
       - Text Editor Icons
 
-  - name:       save
-    id:         save
+  - name:       Floppy Disk
+    id:         floppy-disk
     unicode:    f0c7
     created:    2.0
     categories:
@@ -1465,8 +1461,8 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       bolt
-    id:         bolt
+  - name:       flash
+    id:         flash
     unicode:    f0e7
     created:    2.0
     categories:
@@ -1545,7 +1541,7 @@ icons:
 
   - name:       bell-alt
     id:         bell-alt
-    unicode:    f0f3
+    unicode:    f0a2
     created:    3.0
     categories:
       - Web Application Icons
@@ -1557,8 +1553,8 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       food
-    id:         food
+  - name:       cutlery
+    id:         cutlery
     unicode:    f0f5
     created:    3.0
     categories:
@@ -1706,8 +1702,8 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       mobile-phone
-    id:         mobile-phone
+  - name:       phone
+    id:         phone
     unicode:    f10b
     created:    3.0
     categories:
@@ -2171,15 +2167,15 @@ icons:
       - Web Application Icons
 
 
-  - name:       Collapse
-    id:         collapse
+  - name:       Collapse Down
+    id:         collapse-down
     unicode:    f150
     created:    3.2
     categories:
       - Web Application Icons
 
-  - name:       Collapse Top
-    id:         collapse-top
+  - name:       Collapse Up
+    id:         collapse-up
     unicode:    f151
     created:    3.2
     categories:
@@ -2378,8 +2374,8 @@ icons:
     categories:
       - Brand Icons
 
-  - name:       Stack Exchange
-    id:         stackexchange
+  - name:       Stack Overflow
+    id:         stackoverflow
     unicode:    f16c
     created:    3.2
     categories: