diff --git a/ionic/components.core.scss b/ionic/components.core.scss
index e3a102a431..36bcaceaf8 100644
--- a/ionic/components.core.scss
+++ b/ionic/components.core.scss
@@ -30,8 +30,5 @@
   "components/virtual-scroll/virtual-scroll";
 
 
-// Ionicons (to be replaced with SVGs)
-$ionicons: true !default;
-@if ($ionicons) {
-  @import "fonts/ionicons";
-}
+// Ionicons
+@import "fonts/ionicons";
diff --git a/ionic/components/tabs/tabs.scss b/ionic/components/tabs/tabs.scss
index 660def066c..05fea8ffde 100644
--- a/ionic/components/tabs/tabs.scss
+++ b/ionic/components/tabs/tabs.scss
@@ -90,7 +90,7 @@ tabbar {
   ion-badge,
   ion-icon,
   span {
-    opacity: .4;
+    opacity: 0.4;
   }
 }
 
diff --git a/ionic/components/tabs/tabs.wp.scss b/ionic/components/tabs/tabs.wp.scss
index dfe4e3e103..3a8e9385db 100644
--- a/ionic/components/tabs/tabs.wp.scss
+++ b/ionic/components/tabs/tabs.wp.scss
@@ -81,7 +81,7 @@ tabbar {
 // Windows Tabbar Color Mixin
 // --------------------------------------------------
 
-@mixin tabbar-wp($color-name, $color-base) {
+@mixin tabbar-wp($color-name, $color-base, $color-contrast) {
 
   ion-tabs[#{$color-name}] tabbar {
     background-color: $color-base;
@@ -104,5 +104,5 @@ tabbar {
 // --------------------------------------------------
 
 @each $color-name, $color-base, $color-contrast in get-colors($colors-wp) {
-  @include tabbar-wp($color-name, $color-base);
+  @include tabbar-wp($color-name, $color-base, $color-contrast);
 }
diff --git a/ionic/components/toggle/toggle.wp.scss b/ionic/components/toggle/toggle.wp.scss
index df3d3e5aab..20aaac1bf5 100644
--- a/ionic/components/toggle/toggle.wp.scss
+++ b/ionic/components/toggle/toggle.wp.scss
@@ -128,7 +128,7 @@ ion-toggle {
 // Windows Color Mixin
 // --------------------------------------------------
 
-@mixin toggle-theme-wp($color-name, $color-base) {
+@mixin toggle-theme-wp($color-name, $color-base, $color-contrast) {
 
   ion-toggle[#{$color-name}] {
 
@@ -151,6 +151,6 @@ ion-toggle {
 
 @each $color-name, $color-base, $color-contrast in get-colors($colors-wp) {
 
-  @include toggle-theme-wp($color-name, $color-base);
+  @include toggle-theme-wp($color-name, $color-base, $color-contrast);
 
 }