diff --git a/frontend/playwright/ui/specs/tokens.spec.js b/frontend/playwright/ui/specs/tokens.spec.js
index 440190f26a..e1bbebbacb 100644
--- a/frontend/playwright/ui/specs/tokens.spec.js
+++ b/frontend/playwright/ui/specs/tokens.spec.js
@@ -499,7 +499,7 @@ test.describe("Tokens: Tokens Tab", () => {
     await valueField.fill("");
     // TODO: We need to fix this translation
     await expect(
-      tokensUpdateCreateModal.getByText("Empty field"),
+      tokensUpdateCreateModal.getByText("Token value cannot be empty"),
     ).toBeVisible();
     await valueSaturationSelector.click({ position: { x: 50, y: 50 } });
     await expect(valueField).toHaveValue(/^#[A-Fa-f\d]+$/);
diff --git a/frontend/src/app/main/ui/workspace/tokens/management/create/form_color_input_token.cljs b/frontend/src/app/main/ui/workspace/tokens/management/create/form_color_input_token.cljs
index 1e31503c53..a6c1db54cf 100644
--- a/frontend/src/app/main/ui/workspace/tokens/management/create/form_color_input_token.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/management/create/form_color_input_token.cljs
@@ -205,6 +205,7 @@
                                   ;; TODO: Review this value vs default-value
                                   :value (or value "")
                                   :hint-message (:message hint)
+                                  :variant "comfortable"
                                   :slot-start swatch
                                   :hint-type (:type hint)})
 
diff --git a/frontend/src/app/main/ui/workspace/tokens/management/create/form_input_token.cljs b/frontend/src/app/main/ui/workspace/tokens/management/create/form_input_token.cljs
index 64d0a32124..2147c38f98 100644
--- a/frontend/src/app/main/ui/workspace/tokens/management/create/form_input_token.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/management/create/form_input_token.cljs
@@ -83,6 +83,7 @@
         (mf/spread-props  props  {:on-change on-change
                                   :default-value value
                                   :hint-message (:message hint)
+                                  :variant "comfortable"
                                   :hint-type (:type hint)})
 
         props