diff --git a/src/components/Theme/ThemeProvider.tsx b/src/components/Theme/ThemeProvider.tsx
index 793fbb574..cc45447e2 100644
--- a/src/components/Theme/ThemeProvider.tsx
+++ b/src/components/Theme/ThemeProvider.tsx
@@ -34,6 +34,7 @@ const dark: IThemeColors = {
     disabled: "#393939",
     disabledBackground: "#292A2D",
     disabledText: "#9D9D9D",
+    error: "#8C2054",
     text: "#FCFCFC",
     textHover: "#616161"
   },
@@ -69,6 +70,7 @@ const light: IThemeColors = {
     disabled: "#EAEAEA",
     disabledBackground: "#F4F4F4",
     disabledText: "#9D9D9D",
+    error: "#8C2054",
     text: "#3D3D3D",
     textHover: "#616161"
   },
diff --git a/src/theme.ts b/src/theme.ts
index 07d12fcf1..6e9698d6e 100644
--- a/src/theme.ts
+++ b/src/theme.ts
@@ -34,6 +34,7 @@ export type IThemeColors = Record<
     | "disabled"
     | "disabledBackground"
     | "disabledText"
+    | "error"
     | "text"
     | "textHover",
     string
@@ -110,7 +111,14 @@ export default (colors: IThemeColors): Theme =>
       },
       MuiFormLabel: {
         filled: {
-          color: [[colors.primary], "!important"] as any
+          "&&:not($error)": {
+            color: colors.primary
+          }
+        },
+        root: {
+          "&&$focused:not($error)": {
+            color: colors.font.gray
+          }
         }
       },
       MuiIconButton: {
@@ -171,8 +179,13 @@ export default (colors: IThemeColors): Theme =>
           "&$disabled": {
             color: `${fade(colors.primary, 0.4)} !important` as any
           },
-          "&$focused": {
-            color: colors.primary
+          "&&$focused": {
+            "&$error": {
+              color: colors.error
+            },
+            "&:not($error)": {
+              color: colors.primary
+            }
           },
           color: colors.input.text
         },
@@ -266,8 +279,10 @@ export default (colors: IThemeColors): Theme =>
         },
         root: {
           "& fieldset": {
-            background: colors.background.paper,
-            borderColor: colors.input.border
+            "&&:not($error)": {
+              borderColor: colors.input.border
+            },
+            background: colors.background.paper
           },
           "& legend": {
             display: "none"
@@ -283,24 +298,34 @@ export default (colors: IThemeColors): Theme =>
             }
           },
           "&$focused": {
-            "& fieldset": {
-              borderColor: colors.primary
-            },
             "& input": {
               "&::placeholder": {
                 opacity: [[1], "!important"] as any
               },
               color: colors.font.default,
               zIndex: 2
+            },
+            "&&&": {
+              "& fieldset": {
+                borderColor: colors.primary
+              },
+              "&$error fieldset": {
+                borderColor: colors.error
+              }
             }
           },
           "&:hover": {
-            "& fieldset": {
-              borderColor: colors.primary
-            },
             "& input": {
               color: colors.font.default,
               zIndex: 2
+            },
+            "&&&": {
+              "& fieldset": {
+                borderColor: colors.primary
+              },
+              "&$error fieldset": {
+                borderColor: colors.input.error
+              }
             }
           },
           borderColor: colors.input.border