diff --git a/lib/components/src/controls/Boolean.tsx b/lib/components/src/controls/Boolean.tsx
index 28b909dab08b..400faa837dee 100644
--- a/lib/components/src/controls/Boolean.tsx
+++ b/lib/components/src/controls/Boolean.tsx
@@ -70,8 +70,8 @@ const Label = styled.label(({ theme }) => ({
     },
   },
 
-  'input:checked ~ span:last-of-type, input:not(:checked) ~ span:first-of-type': {
-    background: theme.background.bar,
+  'input:checked ~ span:first-of-type, input:not(:checked) ~ span:last-of-type': {
+    background: theme.background.app,
     boxShadow: `${opacify(0.1, theme.appBorderColor)} 0 0 2px`,
     color: theme.color.defaultText,
     padding: '7px 15px',
diff --git a/lib/ui/src/components/sidebar/Search.tsx b/lib/ui/src/components/sidebar/Search.tsx
index 63d8d4231465..f4d06282b8b1 100644
--- a/lib/ui/src/components/sidebar/Search.tsx
+++ b/lib/ui/src/components/sidebar/Search.tsx
@@ -87,7 +87,7 @@ const Input = styled.input(({ theme }) => ({
   '&:focus, &:active': {
     outline: 0,
     borderColor: theme.color.secondary,
-    background: theme.input.background,
+    background: theme.background.app,
   },
   '&::placeholder': {
     color: theme.textMutedColor,
diff --git a/lib/ui/src/components/sidebar/Tree.tsx b/lib/ui/src/components/sidebar/Tree.tsx
index 9df82a860634..ec2b0c6b2c51 100644
--- a/lib/ui/src/components/sidebar/Tree.tsx
+++ b/lib/ui/src/components/sidebar/Tree.tsx
@@ -39,10 +39,10 @@ export const Action = styled.button(({ theme }) => ({
       : transparentize(0.6, theme.color.defaultText),
 
   '&:hover': {
-    color: theme.barSelectedColor,
+    color: theme.color.secondary,
   },
   '&:focus': {
-    color: theme.barSelectedColor,
+    color: theme.color.secondary,
     borderColor: theme.color.secondary,
 
     '&:not(:focus-visible)': {