diff --git a/src/core/client/stream/components/PermalinkButton/PermalinkButton.tsx b/src/core/client/stream/components/PermalinkButton/PermalinkButton.tsx
index b7f722b11..e8669dad9 100644
--- a/src/core/client/stream/components/PermalinkButton/PermalinkButton.tsx
+++ b/src/core/client/stream/components/PermalinkButton/PermalinkButton.tsx
@@ -12,8 +12,8 @@ interface PermalinkProps {
 }
 
 class Permalink extends React.Component<PermalinkProps> {
-  // Helpers that prevents calling toggleVisibility more then once per frame.
-  // In essence this means we'll only process an event only once.
+  // Helper that prevents calling toggleVisibility more then once per frame.
+  // In essence this means we'll process an event only once.
   // This might happen, when clicking on the button which will
   // cause its onClick to happen as well as onClickOutside.
   private toggleVisibilityOncePerFrame = oncePerFrame(
diff --git a/src/core/client/ui/components/Popover/Popover.css b/src/core/client/ui/components/Popover/Popover.css
index 559b6efbc..843b98c9f 100644
--- a/src/core/client/ui/components/Popover/Popover.css
+++ b/src/core/client/ui/components/Popover/Popover.css
@@ -1,6 +1,6 @@
 .root {
   background: var(--palette-common-white);
-  border: 1px solid var(--palette-grey-light);
+  border: 1px solid var(--palette-grey-lighter);
   box-sizing: border-box;
   box-shadow: var(--elevation-main);
   border-radius: var(--round-corners);
diff --git a/src/core/client/ui/components/TextField/TextField.css b/src/core/client/ui/components/TextField/TextField.css
index 8fbf2c7db..7cbfed982 100644
--- a/src/core/client/ui/components/TextField/TextField.css
+++ b/src/core/client/ui/components/TextField/TextField.css
@@ -1,8 +1,8 @@
 .root {
   composes: textField from "talk-ui/shared/typography.css";
-  background: #ffffff;
-  border: 1px solid #979797;
+  background: var(--palette-common-white);
+  border: 1px solid var(--palette-grey-lighter);
   box-sizing: border-box;
-  border-radius: 1px;
+  border-radius: var(--round-corners);
   padding: calc(0.5 * var(--spacing-unit));
 }