diff --git a/_config.yml b/_config.yml
index 290661c4c..28e334b10 100644
--- a/_config.yml
+++ b/_config.yml
@@ -10,6 +10,7 @@ plugins:          src/_plugins
 pygments:         true
 permalink:        pretty
 
+# ensures SCSS files are compiled
 include:          [_bootstrap.scss, _core.scss, _extras.scss, _icons.scss, _mixins.scss, _path.scss, _variables.scss]
 
 # used in building icon pages
diff --git a/scss/_mixins.scss b/scss/_mixins.scss
index 7aebff320..5987dd7ac 100644
--- a/scss/_mixins.scss
+++ b/scss/_mixins.scss
@@ -1,5 +1,19 @@
 // Mixins
 
+@mixin icon($icon) {
+  @include icon-FontAwesome();
+  content: $icon;
+}
+
+@mixin icon-FontAwesome() {
+  font-family: FontAwesome;
+  font-weight: normal;
+  font-style: normal;
+  text-decoration: inherit;
+  -webkit-font-smoothing: antialiased;
+  *margin-right: .3em; // fixes ie7 issues
+}
+
 @mixin border-radius($radius) {
   -webkit-border-radius: $radius;
   -moz-border-radius: $radius;
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 2c38fe938..efe809560 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -6,3 +6,4 @@ $borderColor: #eeeeee !default;
 $iconMuted: #eeeeee !default;
 $iconLight: white !default;
 $iconDark: #333333 !default;
+$icons-li-width: 30/14em;
diff --git a/scss/font-awesome-ie7.scss b/scss/font-awesome-ie7.scss
index 403139337..e519271e4 100644
--- a/scss/font-awesome-ie7.scss
+++ b/scss/font-awesome-ie7.scss
@@ -1,25 +1,28 @@
-/*!  Font Awesome 3.1.0
+/*!
+ *  Font Awesome 3.2.0
  *  the iconic font designed for Bootstrap
- *  -------------------------------------------------------
- *  The full suite of pictographic icons, examples, and documentation
- *  can be found at: http://fontawesome.io
+ *  ------------------------------------------------------------------------------
+ *  The full suite of pictographic icons, examples, and documentation can be
+ *  found at http://fontawesome.io.  Stay up to date on Twitter at
+ *  http://twitter.com/fontawesome.
  *
  *  License
- *  -------------------------------------------------------
- *  - The Font Awesome font is licensed under the SIL Open Font License v1.1 -
+ *  ------------------------------------------------------------------------------
+ *  - The Font Awesome font is licensed under SIL OFL 1.1 -
  *    http://scripts.sil.org/OFL
- *  - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
+ *  - Font Awesome CSS, LESS, and SASS files are licensed under MIT License -
  *    http://opensource.org/licenses/mit-license.html
- *  - Font Awesome documentation licensed under CC BY 3.0 License -
+ *  - Font Awesome documentation licensed under CC BY 3.0 -
  *    http://creativecommons.org/licenses/by/3.0/
  *  - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
  *    "Font Awesome by Dave Gandy - http://fontawesome.io"
  *
- *  Contact
- *  -------------------------------------------------------
+ *  Author - Dave Gandy
+ *  ------------------------------------------------------------------------------
  *  Email: dave@fontawesome.io
- *  Twitter: http://twitter.com/fortaweso_me
- *  Work: Lead Product Designer @ http://kyruus.com */
+ *  Twitter: http://twitter.com/byscuits
+ *  Work: Lead Product Designer @ Kyruus - http://kyruus.com
+ */
 
 .icon-large {
   font-size: 4 / 3em;
diff --git a/src/assets/font-awesome/scss/_mixins.scss b/src/assets/font-awesome/scss/_mixins.scss
index 7aebff320..5987dd7ac 100644
--- a/src/assets/font-awesome/scss/_mixins.scss
+++ b/src/assets/font-awesome/scss/_mixins.scss
@@ -1,5 +1,19 @@
 // Mixins
 
+@mixin icon($icon) {
+  @include icon-FontAwesome();
+  content: $icon;
+}
+
+@mixin icon-FontAwesome() {
+  font-family: FontAwesome;
+  font-weight: normal;
+  font-style: normal;
+  text-decoration: inherit;
+  -webkit-font-smoothing: antialiased;
+  *margin-right: .3em; // fixes ie7 issues
+}
+
 @mixin border-radius($radius) {
   -webkit-border-radius: $radius;
   -moz-border-radius: $radius;
diff --git a/src/assets/font-awesome/scss/_variables.scss b/src/assets/font-awesome/scss/_variables.scss
index 2c38fe938..6c64bccaf 100644
--- a/src/assets/font-awesome/scss/_variables.scss
+++ b/src/assets/font-awesome/scss/_variables.scss
@@ -1,3 +1,5 @@
+---
+---
 // Variables
 
 $FontAwesomePath: "../font" !default;
@@ -6,3 +8,4 @@ $borderColor: #eeeeee !default;
 $iconMuted: #eeeeee !default;
 $iconLight: white !default;
 $iconDark: #333333 !default;
+$icons-li-width: 30/14em;
diff --git a/src/assets/font-awesome/scss/font-awesome-ie7.scss b/src/assets/font-awesome/scss/font-awesome-ie7.scss
index 403139337..4de22624c 100644
--- a/src/assets/font-awesome/scss/font-awesome-ie7.scss
+++ b/src/assets/font-awesome/scss/font-awesome-ie7.scss
@@ -1,25 +1,6 @@
-/*!  Font Awesome 3.1.0
- *  the iconic font designed for Bootstrap
- *  -------------------------------------------------------
- *  The full suite of pictographic icons, examples, and documentation
- *  can be found at: http://fontawesome.io
- *
- *  License
- *  -------------------------------------------------------
- *  - The Font Awesome font is licensed under the SIL Open Font License v1.1 -
- *    http://scripts.sil.org/OFL
- *  - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
- *    http://opensource.org/licenses/mit-license.html
- *  - Font Awesome documentation licensed under CC BY 3.0 License -
- *    http://creativecommons.org/licenses/by/3.0/
- *  - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
- *    "Font Awesome by Dave Gandy - http://fontawesome.io"
- *
- *  Contact
- *  -------------------------------------------------------
- *  Email: dave@fontawesome.io
- *  Twitter: http://twitter.com/fortaweso_me
- *  Work: Lead Product Designer @ http://kyruus.com */
+---
+---
+{% include license-code.less %}
 
 .icon-large {
   font-size: 4 / 3em;