diff --git a/src/components/Tab/Tab.tsx b/src/components/Tab/Tab.tsx
index 595845b1c..5f7e10e3b 100644
--- a/src/components/Tab/Tab.tsx
+++ b/src/components/Tab/Tab.tsx
@@ -4,13 +4,16 @@ import {
   withStyles,
   WithStyles
 } from "@material-ui/core/styles";
+import { fade } from "@material-ui/core/styles/colorManipulator";
 import Typography from "@material-ui/core/Typography";
 import classNames from "classnames";
 import React from "react";
 
 const styles = (theme: Theme) =>
   createStyles({
-    active: {},
+    active: {
+      color: theme.typography.caption.color
+    },
     root: {
       "&$active": {
         borderBottomColor: theme.palette.primary.main,
@@ -23,7 +26,7 @@ const styles = (theme: Theme) =>
         color: theme.palette.primary.main
       },
       borderBottom: "1px solid transparent",
-      color: theme.typography.caption.color,
+      color: fade(theme.typography.caption.color, 0.6),
       cursor: "pointer",
       display: "inline-block",
       fontWeight: theme.typography.fontWeightRegular,
diff --git a/src/components/Theme/ThemeProvider.tsx b/src/components/Theme/ThemeProvider.tsx
index d1f30e2ce..705b91d00 100644
--- a/src/components/Theme/ThemeProvider.tsx
+++ b/src/components/Theme/ThemeProvider.tsx
@@ -20,7 +20,8 @@ const dark: IThemeColors = {
     button: "#202124",
     default: "#FCFCFC",
     gray: "#9E9D9D",
-    textButton: "#FFFFFF"
+    textButton: "#FFFFFF",
+    textDisabled: "#FCFCFC"
   },
   gray: {
     default: "#202124",
@@ -53,7 +54,8 @@ const light: IThemeColors = {
     button: "#FFFFFF",
     default: "#3D3D3D",
     gray: "#616161",
-    textButton: "#06847B"
+    textButton: "#06847B",
+    textDisabled: "#616161"
   },
   gray: {
     default: "#C8C8C8",
diff --git a/src/theme.ts b/src/theme.ts
index fe2100ad5..0e36ea1e3 100644
--- a/src/theme.ts
+++ b/src/theme.ts
@@ -19,7 +19,10 @@ export type IThemeColors = Record<
 } & {
   checkbox: Record<"default" | "disabled", string>;
 } & {
-  font: Record<"default" | "gray" | "button" | "textButton", string>;
+  font: Record<
+    "default" | "gray" | "button" | "textButton" | "textDisabled",
+    string
+  >;
 } & {
   gray: Record<"default" | "disabled", string>;
 } & {
@@ -397,6 +400,7 @@ export default (colors: IThemeColors): Theme =>
       },
       primary: {
         contrastText: "#ffffff",
+        dark: colors.font.textDisabled,
         main: colors.primary
       },
       secondary: {