diff --git a/src/App.tsx b/src/App.tsx
index 35dc80f..b215b5e 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1525,7 +1525,7 @@ function App() {
                   tooltip: {
                     sx: {
                       color: theme.palette.text.primary,
-                      backgroundColor: theme.palette.background.default,
+                      backgroundColor: theme.palette.background.paper,
                     },
                   },
                   arrow: {
@@ -1565,7 +1565,7 @@ function App() {
                   tooltip: {
                     sx: {
                       color: theme.palette.text.primary,
-                      backgroundColor: theme.palette.background.default,
+                      backgroundColor: theme.palette.background.paper,
                     },
                   },
                   arrow: {
@@ -1605,7 +1605,7 @@ function App() {
                   tooltip: {
                     sx: {
                       color: theme.palette.text.primary,
-                      backgroundColor: theme.palette.background.default,
+                      backgroundColor: theme.palette.background.paper,
                     },
                   },
                   arrow: {
@@ -1645,7 +1645,7 @@ function App() {
                   tooltip: {
                     sx: {
                       color: theme.palette.text.primary,
-                      backgroundColor: theme.palette.background.default,
+                      backgroundColor: theme.palette.background.paper,
                     },
                   },
                   arrow: {
@@ -1682,7 +1682,7 @@ function App() {
                     tooltip: {
                       sx: {
                         color: theme.palette.text.primary,
-                        backgroundColor: theme.palette.background.default,
+                        backgroundColor: theme.palette.background.paper,
                       },
                     },
                     arrow: {
@@ -1793,7 +1793,7 @@ function App() {
                   tooltip: {
                     sx: {
                       color: theme.palette.text.primary,
-                      backgroundColor: theme.palette.background.default,
+                      backgroundColor: theme.palette.background.paper,
                     },
                   },
                   arrow: {
@@ -1838,7 +1838,7 @@ function App() {
                     tooltip: {
                       sx: {
                         color: theme.palette.text.primary,
-                        backgroundColor: theme.palette.background.default,
+                        backgroundColor: theme.palette.background.paper,
                       },
                     },
                     arrow: {
@@ -1880,7 +1880,7 @@ function App() {
                   tooltip: {
                     sx: {
                       color: theme.palette.text.primary,
-                      backgroundColor: theme.palette.background.default,
+                      backgroundColor: theme.palette.background.paper,
                     },
                   },
                   arrow: {
diff --git a/src/ExtStates/NotAuthenticated.tsx b/src/ExtStates/NotAuthenticated.tsx
index 3c8afd9..bbb2b3d 100644
--- a/src/ExtStates/NotAuthenticated.tsx
+++ b/src/ExtStates/NotAuthenticated.tsx
@@ -641,15 +641,6 @@ export const NotAuthenticated = ({
                 }}
                 control={
                   <Switch
-                    sx={{
-                      '& .MuiSwitch-switchBase.Mui-checked': {
-                        color: '#5EB049',
-                      },
-                      '& .MuiSwitch-switchBase.Mui-checked + .MuiSwitch-track':
-                        {
-                          backgroundColor: theme.palette.background.default,
-                        },
-                    }}
                     checked={useLocalNode}
                     onChange={(event) => {
                       if (event.target.checked) {
diff --git a/src/components/Chat/ChatOptions.tsx b/src/components/Chat/ChatOptions.tsx
index ddb3a3f..ed808f2 100644
--- a/src/components/Chat/ChatOptions.tsx
+++ b/src/components/Chat/ChatOptions.tsx
@@ -358,14 +358,14 @@ export const ChatOptions = ({
     return (
       <Box
         sx={{
-          backgroundColor: theme.palette.background.default,
+          backgroundColor: theme.palette.background.surface,
           borderBottomLeftRadius: '20px',
           borderTopLeftRadius: '20px',
           display: 'flex',
           flexDirection: 'column',
           flexGrow: 0,
           flexShrink: 0,
-          height: '100%',
+          height: '98%',
           overflow: 'auto',
           width: '300px',
         }}
diff --git a/src/components/GeneralNotifications.tsx b/src/components/GeneralNotifications.tsx
index 6335dbf..bdfac09 100644
--- a/src/components/GeneralNotifications.tsx
+++ b/src/components/GeneralNotifications.tsx
@@ -63,7 +63,7 @@ export const GeneralNotifications = ({ address }) => {
             tooltip: {
               sx: {
                 color: theme.palette.text.primary,
-                backgroundColor: theme.palette.background.default,
+                backgroundColor: theme.palette.background.paper,
               },
             },
             arrow: {
diff --git a/src/components/QMailStatus.tsx b/src/components/QMailStatus.tsx
index dd6f9be..b171be2 100644
--- a/src/components/QMailStatus.tsx
+++ b/src/components/QMailStatus.tsx
@@ -76,7 +76,7 @@ export const QMailStatus = () => {
           tooltip: {
             sx: {
               color: theme.palette.text.primary,
-              backgroundColor: theme.palette.background.default,
+              backgroundColor: theme.palette.background.paper,
             },
           },
           arrow: {
diff --git a/src/styles/App-styles.ts b/src/styles/App-styles.ts
index 980657b..8031321 100644
--- a/src/styles/App-styles.ts
+++ b/src/styles/App-styles.ts
@@ -131,9 +131,8 @@ export const CustomButton = styled(Box)(({ theme }) => ({
   width: 'fit-content',
   '&:hover': {
     backgroundColor: theme.palette.background.paper,
-    color: theme.palette.text.secondary,
     'svg path': {
-      fill: theme.palette.background.paper,
+      fill: theme.palette.background.secondary,
     },
   },
 }));