diff --git a/src/core/client/ui/components/CallOut/CallOut.css b/src/core/client/ui/components/CallOut/CallOut.css
index 5a7872bde..2022383a5 100644
--- a/src/core/client/ui/components/CallOut/CallOut.css
+++ b/src/core/client/ui/components/CallOut/CallOut.css
@@ -4,7 +4,7 @@
   display: inline-flex;
   justify-content: center;
   align-items: center;
-  padding: 12px;
+  padding: var(--spacing-unit);
   box-sizing: border-box;
   border-width: 1px;
   border-style: solid;
diff --git a/src/core/client/ui/components/TextField/TextField.css b/src/core/client/ui/components/TextField/TextField.css
index 1dfd12305..924d6483a 100644
--- a/src/core/client/ui/components/TextField/TextField.css
+++ b/src/core/client/ui/components/TextField/TextField.css
@@ -1,10 +1,10 @@
 .root {
   composes: textField from "talk-ui/shared/typography.css";
   position: relative;
-  display: inline-flex;
-  padding: 7px 10px;
+  display: block;
+  padding: calc(0.5 * var(--spacing-unit));
   box-sizing: border-box;
-  border-radius: 1px;
+  border-radius: var(--round-corners);
 }
 
 .colorRegular {
@@ -20,8 +20,6 @@
 }
 
 .fullWidth {
-  display: block;
   width: 100%;
-  box-sizing: border-box;
 }