diff --git a/webapp/src/components/root/root.jsx b/webapp/src/components/root/root.jsx
index 87a63756..8ba8819d 100644
--- a/webapp/src/components/root/root.jsx
+++ b/webapp/src/components/root/root.jsx
@@ -146,21 +146,21 @@ export default class Root extends React.Component {
 const getStyle = makeStyleFromTheme((theme) => {
     return {
         modal: {
-            color: changeOpacity(theme.centerChannelColor, 0.9),
+            color: changeOpacity(theme.centerChannelColor, 0.88),
         },
         textarea: {
             backgroundColor: theme.centerChannelBg,
         },
         helpText: {
-            color: changeOpacity(theme.centerChannelColor, 0.6),
+            color: changeOpacity(theme.centerChannelColor, 0.64),
         },
         button: {
             color: theme.buttonColor,
             backgroundColor: theme.buttonBg,
         },
         inactiveButton: {
-            color: '#000000',
-            backgroundColor: changeOpacity(theme.buttonBg, 0.1),
+            color: changeOpacity(theme.buttonColor, 0.88),
+            backgroundColor: changeOpacity(theme.buttonBg, 0.32),
         },
     };
-});
\ No newline at end of file
+});
diff --git a/webapp/src/components/root/root.scss b/webapp/src/components/root/root.scss
index 7571d8c3..e81a8274 100644
--- a/webapp/src/components/root/root.scss
+++ b/webapp/src/components/root/root.scss
@@ -44,7 +44,7 @@
         margin-bottom: 28px;
         .todoplugin-input {
             height: 144px;
-            border: 1px solid rgba(0, 0, 0, .3);
+            border: 1px solid var(--center-channel-color-16);
             border-radius: 4px;
             padding: 12px 14px;
             width: 100%;
@@ -54,6 +54,9 @@
             &.todoplugin-one-line {
                 height: 48px;
             }
+            &:focus {
+                border-color: var(--center-channel-color-32);
+            }
         }
         .todoplugin-help-text {
             margin-top: 8px;
@@ -75,7 +78,7 @@
     }
 
     .todoplugin-divider {
-        border-bottom: 1px solid rgba(0, 0, 0, .3);
+        border-bottom: 1px solid var(--center-channel-color-32);
         height: 1px;
         width: 65%;
         margin-top: 28px;
@@ -101,4 +104,4 @@
         max-width: 720px;
         margin-bottom: 10px;
     }
-}
\ No newline at end of file
+}
diff --git a/webapp/src/components/sidebar_right/sidebar_right.scss b/webapp/src/components/sidebar_right/sidebar_right.scss
index 7da17f22..7ac9de62 100644
--- a/webapp/src/components/sidebar_right/sidebar_right.scss
+++ b/webapp/src/components/sidebar_right/sidebar_right.scss
@@ -4,10 +4,13 @@
         text-align: center;
         cursor: pointer;
         &:hover {
-            background-color: var(--button-bg-10);
+            background-color: var(--center-channel-color-04);
+        }
+        &:active {
+            background-color: var(--center-channel-color-08);
         }
         i {
-            color: var(--center-channel-color-90);
+            color: var(--center-channel-color);
         }
     }
     .header-menu {
@@ -20,14 +23,21 @@
             height: 100%;
             margin-left: 5px;
             margin-right: 5px;
-            background-color: var(--button-bg-10);
-            color: #000000;
+            color: var(--center-channel-color-56);
+            background-color: unset;
+            box-shadow: unset;
+            border: 3px solid transparent;
             &:hover {
-                color: var(--button-color);
+                background-color: var(--center-channel-color-04);
+            }
+            &:active {
+                background-color: var(--center-channel-color-08);
+                color: var(--center-channel-color);
             }
             &.selected {
-                background-color: var(--button-bg);
-                color: var(--button-color);
+                background-color: var(--center-channel-color-08);
+                border-bottom: 3px solid var(--button-bg);
+                color: var(--center-channel-color);
             }
         }
     }
@@ -137,4 +147,4 @@
             margin-right: 5px;
         }
     }
-}
\ No newline at end of file
+}