diff --git a/dist/fonts/fc-icons.eot b/dist/fonts/fc-icons.eot
index 6906d51..c519c68 100644
Binary files a/dist/fonts/fc-icons.eot and b/dist/fonts/fc-icons.eot differ
diff --git a/dist/fonts/fc-icons.ttf b/dist/fonts/fc-icons.ttf
index bf01c8c..afc79c1 100644
Binary files a/dist/fonts/fc-icons.ttf and b/dist/fonts/fc-icons.ttf differ
diff --git a/dist/fonts/fc-icons.woff b/dist/fonts/fc-icons.woff
index 021a94a..b457aa4 100644
Binary files a/dist/fonts/fc-icons.woff and b/dist/fonts/fc-icons.woff differ
diff --git a/dist/sass/_mixins/css-properties.scss b/dist/sass/_mixins/css-properties.scss
index 60ec564..b3858a3 100644
--- a/dist/sass/_mixins/css-properties.scss
+++ b/dist/sass/_mixins/css-properties.scss
@@ -5,6 +5,8 @@
 
 @mixin borderRadius($val, $unit:false) {
 
+    $cVal: rem($val);
+
     @if $unit {
       $val: stripUnit($val);
 
@@ -24,10 +26,6 @@
         $cVal: $val;
       }
 
-    } @else {
-
-      $cVal: rem($val);
-
     }
 
     @include prefix(border-radius, $cVal, webkit)
@@ -40,10 +38,9 @@
 
 @mixin boxShadow($horizontalLength, $verticalLength, $blurRadius:false, $spread:false, $color:false, $inset:false) {
 
+  $insetVal: null;
   @if $inset {
     $insetVal: inset;
-  } @else {
-    $insetVal: null;
   }
 
   $boxShadow: $insetVal rem($horizontalLength) rem($verticalLength) rem($blurRadius) rem($spread) $color;
diff --git a/dist/sass/_mixins/fonts.scss b/dist/sass/_mixins/fonts.scss
index a82069b..d6e6ce8 100644
--- a/dist/sass/_mixins/fonts.scss
+++ b/dist/sass/_mixins/fonts.scss
@@ -21,27 +21,24 @@
 
   // step 1
   // if negative parameter, we need to use 1 / $ratio
+  $calcRatio: $ratio;
+  $calcSqrtRatio: $sqrtRatio;
   @if $fontSize < 0 {
     $calcRatio: 1 / $ratio;
     $calcSqrtRatio: 1 / $sqrtRatio;
     $fontSize: negative($fontSize);
-  } @else {
-    $calcRatio: $ratio;
-    $calcSqrtRatio: $sqrtRatio;
   }
 
   // step 2
   // calculate the multiplier for each value
+  $multiplier: pow($calcSqrtRatio, $fontSize);
   @if $fontSize == 0 {
     $multiplier: 1;
   } @else if $fontSize % 2 == 0 {
     $multiplier: pow($calcRatio, $fontSize / 2);
-  } @else {
-    $multiplier: pow($calcSqrtRatio, $fontSize);
   }
 
 
-
   // step 3
   // calculate the font size (this needs to be unitless)
   $fontSizeCalc: round($fontSizeBase * $multiplier);
diff --git a/dist/sass/_mixins/hero.scss b/dist/sass/_mixins/hero.scss
index 1a562d6..7ae2ad8 100644
--- a/dist/sass/_mixins/hero.scss
+++ b/dist/sass/_mixins/hero.scss
@@ -153,9 +153,8 @@
       // we don't need to apply a min breakpoint for the first value, so we set it to false
       // for any other values, it's the previous value in the iteration
       // eg: for large screens, the min value is medium
-      @if $i == 1 {
-        $bpHeroMin: false;
-      } @else {
+      $bpHeroMin: false;
+      @if $i > 1 {
         $bpHeroMin: nth($bpHeroList, $i - 1);
       }
 
@@ -164,9 +163,8 @@
       //   - if this is the last iteration (so the max val is inf)
       //   - $i == 1 -> the first interval is the default rule so we don't have a breakpoint (false false)
       //   - if $heroFreeBreakPoints is false, we don't set a max breakpoint so that styling is overlapping
-      @if $i == (length($bpHeroList) + 1) or $i == 1 or $heroFreeBreakPoints {
-        $bpHeroMax: false;
-      } @else {
+      $bpHeroMax: false;
+      @if $i != (length($bpHeroList) + 1) and $i > 1 and $heroFreeBreakPoints == false {
         $bpHeroMax: nth($bpHeroList, $i);
       }
 
diff --git a/dist/sass/_mixins/misc.scss b/dist/sass/_mixins/misc.scss
index 6603a90..f7b69ce 100644
--- a/dist/sass/_mixins/misc.scss
+++ b/dist/sass/_mixins/misc.scss
@@ -44,7 +44,8 @@
   // read width and height
   $width: if(first($direction) == last($direction), first($size)/2, first($size));
   $height: last($size);
-
+  $solid: top;
+  $transparent: left, right;
 
   @if first($direction) == up {
 
@@ -82,11 +83,6 @@
     $solid: right;
     $transparent: top, bottom;
 
-  } @else {
-
-    $solid: top;
-    $transparent: left, right;
-
   }
 
   border-#{$solid}: $height solid $color;
diff --git a/dist/sass/_mixins/structure.scss b/dist/sass/_mixins/structure.scss
index bf89cc7..d493d17 100644
--- a/dist/sass/_mixins/structure.scss
+++ b/dist/sass/_mixins/structure.scss
@@ -271,6 +271,21 @@ $colRatio: 1;
                         | vertical-align: top
 \* ---------------------------------------------------------------------- */
 
+@mixin dtStyle($row, $verticalAlign, $cols, $padding) {
+ display: table;
+
+ @if $row {
+   & > * { display: table-row; }
+   & > * > * {
+     @include tableCellV2($verticalAlign, $cols, $padding);
+   }
+ } @else {
+   & > * {
+    @include tableCellV2($verticalAlign, $cols, $padding);
+   }
+ }
+}
+
 @mixin table($verticalAlign:top, $reset: false, $hide: false, $cols: false, $row:false, $padding: $defaultColsPadding) {
 
   // table general stuff
@@ -304,26 +319,12 @@ $colRatio: 1;
     $minPoint: last($reset);
   }
 
-  @mixin dtStyle {
-   display: table;
-
-   @if $row {
-     & > * { display: table-row; }
-     & > * > * {
-       @include tableCellV2($verticalAlign, $cols, $padding);
-     }
-   } @else {
-     & > * {
-      @include tableCellV2($verticalAlign, $cols, $padding);
-     }
-   }
-  }
-
   @if $ie {
-    @include dtStyle;
-  } @else {
+    @include dtStyle($row, $verticalAlign, $cols, $padding);
+  }
+  @else {
     @include breakPoints($minPoint, false) {
-      @include dtStyle;
+      @include dtStyle($row, $verticalAlign, $cols, $padding);
     }
   }
 
diff --git a/dist/sass/general/forms-v2.scss b/dist/sass/general/forms-v2.scss
index da714a2..aecaec5 100644
--- a/dist/sass/general/forms-v2.scss
+++ b/dist/sass/general/forms-v2.scss
@@ -750,7 +750,6 @@
       }
 
       &:after {
-        @extend %insetElement;
         content: '';
         background: rgb(255,255,255);
         border: 1px solid $formInputBorderMain;