Merge branch 'TMS-1164' into stage

Author: eebbi

assets/styles/settings/_settings.scss

@@ -7,8 +7,8 @@ $colors: (
 ) !default;
 
 $button-colors: (
-    "primary": ($primary, $color-white, $text, $text),
-    "secondary": ($secondary, $secondary-invert, $color-white, $color-black),
+    "primary": ($primary, $primary, $text, $text),
+    "secondary": ($secondary, $secondary, $color-white, $color-white),
 ) !default;
 
 $navbar-colors: (