diff --git a/src/common/BoundedNumericTextField.tsx b/src/common/BoundedNumericTextField.tsx
index 803011e..b3c995e 100644
--- a/src/common/BoundedNumericTextField.tsx
+++ b/src/common/BoundedNumericTextField.tsx
@@ -135,6 +135,10 @@ export const BoundedNumericTextField = ({
             <IconButton
               size="small"
               onClick={() => changeValueWithIncDecButton(1)}
+              sx={{
+                bgcolor: theme.palette.background.default,
+                color: theme.palette.text.primary,
+              }}
             >
               <AddIcon
                 sx={{
@@ -145,6 +149,10 @@ export const BoundedNumericTextField = ({
             <IconButton
               size="small"
               onClick={() => changeValueWithIncDecButton(-1)}
+              sx={{
+                bgcolor: theme.palette.background.default,
+                color: theme.palette.text.primary,
+              }}
             >
               <RemoveIcon
                 sx={{
diff --git a/src/components/Embeds/ImageEmbed.tsx b/src/components/Embeds/ImageEmbed.tsx
index 9438166..f197f5b 100644
--- a/src/components/Embeds/ImageEmbed.tsx
+++ b/src/components/Embeds/ImageEmbed.tsx
@@ -269,11 +269,12 @@ export function ImageViewer({ src = null, alt = '' }) {
           <IconButton
             onClick={handleCloseFullscreen}
             sx={{
-              position: 'absolute',
-              top: 8,
-              right: 8,
-              zIndex: 10,
+              bgcolor: theme.palette.background.default,
               color: theme.palette.text.primary,
+              position: 'absolute',
+              right: 8,
+              top: 8,
+              zIndex: 10,
             }}
           >
             <CloseIcon />
diff --git a/src/components/Group/AddGroup.tsx b/src/components/Group/AddGroup.tsx
index a5318d4..2ada6a4 100644
--- a/src/components/Group/AddGroup.tsx
+++ b/src/components/Group/AddGroup.tsx
@@ -252,6 +252,10 @@ export const AddGroup = ({ address, open, setOpen }) => {
               color="inherit"
               edge="start"
               onClick={handleClose}
+              sx={{
+                bgcolor: theme.palette.background.default,
+                color: theme.palette.text.primary,
+              }}
             >
               <CloseIcon />
             </IconButton>
diff --git a/src/components/Group/BlockedUsersModal.tsx b/src/components/Group/BlockedUsersModal.tsx
index df48de7..628b6ac 100644
--- a/src/components/Group/BlockedUsersModal.tsx
+++ b/src/components/Group/BlockedUsersModal.tsx
@@ -406,10 +406,11 @@ export const BlockedUsersModal = () => {
           })}
           onClick={onCancel}
           sx={{
+            bgcolor: theme.palette.background.default,
+            color: theme.palette.text.primary,
             position: 'absolute',
             right: 8,
             top: 8,
-            color: theme.palette.text.primary,
           }}
         >
           <CloseIcon />
diff --git a/src/components/Group/GroupInvites.tsx b/src/components/Group/GroupInvites.tsx
index 8bad077..902bd73 100644
--- a/src/components/Group/GroupInvites.tsx
+++ b/src/components/Group/GroupInvites.tsx
@@ -173,6 +173,10 @@ export const GroupInvites = ({ myAddress, setOpenAddGroup }) => {
                       aria-label={t('core:comment_other', {
                         postProcess: 'capitalizeFirstChar',
                       })}
+                      sx={{
+                        bgcolor: theme.palette.background.default,
+                        color: theme.palette.text.primary,
+                      }}
                     >
                       <GroupAddIcon
                         sx={{
diff --git a/src/components/Group/GroupJoinRequests.tsx b/src/components/Group/GroupJoinRequests.tsx
index 1310174..ae1f43d 100644
--- a/src/components/Group/GroupJoinRequests.tsx
+++ b/src/components/Group/GroupJoinRequests.tsx
@@ -256,6 +256,10 @@ export const GroupJoinRequests = ({
                       aria-label={t('core:comment_other', {
                         postProcess: 'capitalizeFirstChar',
                       })}
+                      sx={{
+                        bgcolor: theme.palette.background.default,
+                        color: theme.palette.text.primary,
+                      }}
                     >
                       <GroupAddIcon
                         sx={{
diff --git a/src/components/Group/ListOfThreadPostsWatched.tsx b/src/components/Group/ListOfThreadPostsWatched.tsx
index 8a3c3d2..ffb2fbd 100644
--- a/src/components/Group/ListOfThreadPostsWatched.tsx
+++ b/src/components/Group/ListOfThreadPostsWatched.tsx
@@ -5,7 +5,7 @@ import ListItemButton from '@mui/material/ListItemButton';
 import ListItemText from '@mui/material/ListItemText';
 import IconButton from '@mui/material/IconButton';
 import { executeEvent } from '../../utils/events';
-import { Box, Typography } from '@mui/material';
+import { Box, Typography, useTheme } from '@mui/material';
 import { Spacer } from '../../common/Spacer';
 import { CustomLoader } from '../../common/CustomLoader';
 import VisibilityIcon from '@mui/icons-material/Visibility';
@@ -14,6 +14,7 @@ import { useTranslation } from 'react-i18next';
 export const ListOfThreadPostsWatched = () => {
   const [posts, setPosts] = useState([]);
   const [loading, setLoading] = useState(true);
+  const theme = useTheme();
   const { t } = useTranslation([
     'auth',
     'core',
@@ -175,6 +176,10 @@ export const ListOfThreadPostsWatched = () => {
                       aria-label={t('core:comment_other', {
                         postProcess: 'capitalizeFirstChar',
                       })}
+                      sx={{
+                        bgcolor: theme.palette.background.default,
+                        color: theme.palette.text.primary,
+                      }}
                     >
                       <VisibilityIcon
                         sx={{
diff --git a/src/components/Group/ManageMembers.tsx b/src/components/Group/ManageMembers.tsx
index 0425d2f..998e145 100644
--- a/src/components/Group/ManageMembers.tsx
+++ b/src/components/Group/ManageMembers.tsx
@@ -229,6 +229,10 @@ export const ManageMembers = ({
               color="inherit"
               edge="start"
               onClick={handleClose}
+              sx={{
+                bgcolor: theme.palette.background.default,
+                color: theme.palette.text.primary,
+              }}
             >
               <CloseIcon />
             </IconButton>
diff --git a/src/components/Group/Settings.tsx b/src/components/Group/Settings.tsx
index 77b70fa..905dd2d 100644
--- a/src/components/Group/Settings.tsx
+++ b/src/components/Group/Settings.tsx
@@ -181,6 +181,10 @@ export const Settings = ({ open, setOpen, rawWallet }) => {
               aria-label={t('core:action.close', {
                 postProcess: 'capitalizeFirstChar',
               })}
+              sx={{
+                bgcolor: theme.palette.background.default,
+                color: theme.palette.text.primary,
+              }}
             >
               <CloseIcon />
             </IconButton>
diff --git a/src/components/Minting/Minting.tsx b/src/components/Minting/Minting.tsx
index a54a614..687d06b 100644
--- a/src/components/Minting/Minting.tsx
+++ b/src/components/Minting/Minting.tsx
@@ -565,6 +565,10 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
             aria-label={t('core:action.close', {
               postProcess: 'capitalizeFirstChar',
             })}
+            sx={{
+              bgcolor: theme.palette.background.default,
+              color: theme.palette.text.primary,
+            }}
           >
             <CloseIcon />
           </IconButton>
diff --git a/src/components/Theme/ThemeSelector.tsx b/src/components/Theme/ThemeSelector.tsx
index 6b6f880..d7b7c39 100644
--- a/src/components/Theme/ThemeSelector.tsx
+++ b/src/components/Theme/ThemeSelector.tsx
@@ -22,7 +22,8 @@ const ThemeSelector = () => {
       <IconButton
         onClick={toggleTheme}
         sx={{
-          color: theme.palette.text.secondary,
+          bgcolor: theme.palette.background.default,
+          color: theme.palette.text.primary,
         }}
       >
         {themeMode === 'dark' ? <LightModeIcon /> : <DarkModeIcon />}
diff --git a/src/components/Tutorials/Tutorials.tsx b/src/components/Tutorials/Tutorials.tsx
index 416ea3d..a32e57a 100644
--- a/src/components/Tutorials/Tutorials.tsx
+++ b/src/components/Tutorials/Tutorials.tsx
@@ -72,10 +72,11 @@ export const Tutorials = () => {
           })}
           onClick={handleClose}
           sx={{
+            bgcolor: theme.palette.background.default,
+            color: theme.palette.text.primary,
             position: 'absolute',
             right: 8,
             top: 8,
-            color: theme.palette.text.primary,
           }}
         >
           <CloseIcon />
@@ -120,10 +121,11 @@ export const Tutorials = () => {
           })}
           onClick={handleClose}
           sx={{
+            bgcolor: theme.palette.background.default,
+            color: theme.palette.text.primary,
             position: 'absolute',
             right: 8,
             top: 8,
-            color: theme.palette.text.primary,
           }}
         >
           <CloseIcon />
diff --git a/src/components/Wallets.tsx b/src/components/Wallets.tsx
index 568c1cf..c058677 100644
--- a/src/components/Wallets.tsx
+++ b/src/components/Wallets.tsx
@@ -562,6 +562,8 @@ const WalletItem = ({ wallet, updateWalletItem, idx, setSelectedWallet }) => {
         <IconButton
           sx={{
             alignSelf: 'flex-start',
+            bgcolor: theme.palette.background.default,
+            color: theme.palette.text.primary,
           }}
           onClick={(e) => {
             e.stopPropagation();