diff --git a/src/App.tsx b/src/App.tsx
index 3ad6fe2..7d3a7c7 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -29,13 +29,12 @@ import { decryptStoredWallet } from './utils/decryptWallet';
 import { CountdownCircleTimer } from 'react-countdown-circle-timer';
 import Logo1Dark from './assets/svgs/Logo1Dark.svg';
 import RefreshIcon from '@mui/icons-material/Refresh';
+import DownloadIcon from '@mui/icons-material/Download';
 import Copy from './assets/svgs/Copy.svg';
 import ltcLogo from './assets/ltc.png';
 import PersonSearchIcon from '@mui/icons-material/PersonSearch';
 import qortLogo from './assets/qort.png';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import { Download } from './assets/Icons/Download.tsx';
-import { Logout } from './assets/Icons/Logout.tsx';
 import { Return } from './assets/Icons/Return.tsx';
 import WarningIcon from '@mui/icons-material/Warning';
 import Success from './assets/svgs/Success.svg';
@@ -73,6 +72,7 @@ import { TaskManager } from './components/TaskManager/TaskManager.tsx';
 import { useModal } from './common/useModal';
 import { CustomizedSnackbars } from './components/Snackbar/Snackbar';
 import SettingsIcon from '@mui/icons-material/Settings';
+import LogoutIcon from '@mui/icons-material/Logout';
 import HelpIcon from '@mui/icons-material/Help';
 import {
   cleanUrl,
@@ -1538,46 +1538,43 @@ function App() {
           >
             <Spacer height="20px" />
 
-            <Tooltip
-              title={
-                <span
-                  style={{
-                    fontSize: '14px',
-                    fontWeight: 700,
-                  }}
-                >
-                  LOG OUT
-                </span>
-              }
-              placement="left"
-              arrow
-              sx={{ fontSize: '24' }}
-              slotProps={{
-                tooltip: {
-                  sx: {
-                    color: theme.palette.text.primary,
-                    backgroundColor: theme.palette.background.default,
-                  },
-                },
-                arrow: {
-                  sx: {
-                    color: theme.palette.text.primary,
-                  },
-                },
+            <ButtonBase
+              onClick={() => {
+                logoutFunc();
+                setIsOpenDrawerProfile(false);
               }}
             >
-              <Logout
-                style={{
-                  cursor: 'pointer',
-                  width: '20px',
-                  height: 'auto',
+              <Tooltip
+                title={
+                  <span
+                    style={{
+                      fontSize: '14px',
+                      fontWeight: 700,
+                    }}
+                  >
+                    LOGOUT
+                  </span>
+                }
+                placement="left"
+                arrow
+                sx={{ fontSize: '24' }}
+                slotProps={{
+                  tooltip: {
+                    sx: {
+                      color: theme.palette.text.primary,
+                      backgroundColor: theme.palette.background.default,
+                    },
+                  },
+                  arrow: {
+                    sx: {
+                      color: theme.palette.text.primary,
+                    },
+                  },
                 }}
-                onClick={() => {
-                  logoutFunc();
-                  setIsOpenDrawerProfile(false);
-                }}
-              />
-            </Tooltip>
+              >
+                <LogoutIcon />
+              </Tooltip>
+            </ButtonBase>
 
             <Spacer height="20px" />
 
@@ -1888,41 +1885,39 @@ function App() {
             )}
 
             <Spacer height="20px" />
-            <Tooltip
-              title={
-                <span style={{ fontSize: '14px', fontWeight: 700 }}>
-                  BACKUP WALLET
-                </span>
-              }
-              placement="left"
-              arrow
-              sx={{ fontSize: '24' }}
-              slotProps={{
-                tooltip: {
-                  sx: {
-                    color: theme.palette.text.primary,
-                    backgroundColor: theme.palette.background.default,
-                  },
-                },
-                arrow: {
-                  sx: {
-                    color: theme.palette.text.primary,
-                  },
-                },
+
+            <ButtonBase
+              onClick={() => {
+                setExtstate('download-wallet');
+                setIsOpenDrawerProfile(false);
               }}
             >
-              <Download
-                style={{
-                  cursor: 'pointer',
-                  width: '20px',
-                  height: 'auto',
+              <Tooltip
+                title={
+                  <span style={{ fontSize: '14px', fontWeight: 700 }}>
+                    BACKUP WALLET
+                  </span>
+                }
+                placement="left"
+                arrow
+                sx={{ fontSize: '24' }}
+                slotProps={{
+                  tooltip: {
+                    sx: {
+                      color: theme.palette.text.primary,
+                      backgroundColor: theme.palette.background.default,
+                    },
+                  },
+                  arrow: {
+                    sx: {
+                      color: theme.palette.text.primary,
+                    },
+                  },
                 }}
-                onClick={() => {
-                  setExtstate('download-wallet');
-                  setIsOpenDrawerProfile(false);
-                }}
-              />
-            </Tooltip>
+              >
+                <DownloadIcon />
+              </Tooltip>
+            </ButtonBase>
             <Spacer height="40px" />
           </Box>
         </AuthenticatedContainerInnerRight>
diff --git a/src/assets/Icons/Download.tsx b/src/assets/Icons/Download.tsx
deleted file mode 100644
index a8498db..0000000
--- a/src/assets/Icons/Download.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { useTheme } from '@mui/material';
-import { SVGProps } from './interfaces';
-
-export const Download: React.FC<SVGProps> = ({
-  color,
-  opacity,
-  ...children
-}) => {
-  const theme = useTheme();
-
-  const setColor = color ? color : theme.palette.text.primary;
-  const setOpacity = opacity ? opacity : 1;
-
-  return (
-    <svg
-      {...children}
-      width="20"
-      height="20"
-      viewBox="0 0 20 20"
-      fill={setColor}
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M12.8047 0.393196V7.21185H16.3036L10.0003 13.5139L3.69697 7.21185H7.19584V0H12.8045L12.8047 0.393196ZM2.7047 16.8587V13.9861H0V18.6179C0 19.3774 0.622589 20 1.38213 20H18.6179C19.3774 20 20 19.3774 20 18.6179V13.9861H17.2962V17.2963L2.70461 17.2954L2.7047 16.8587Z"
-        fill={setColor}
-        fillOpacity={setOpacity}
-      />
-    </svg>
-  );
-};
diff --git a/src/assets/Icons/Logout.tsx b/src/assets/Icons/Logout.tsx
deleted file mode 100644
index b15d0f4..0000000
--- a/src/assets/Icons/Logout.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { useTheme } from '@mui/material';
-import { SVGProps } from './interfaces';
-
-export const Logout: React.FC<SVGProps> = ({ color, opacity, ...children }) => {
-  const theme = useTheme();
-
-  const setColor = color ? color : theme.palette.text.primary;
-  const setOpacity = opacity ? opacity : 1;
-
-  return (
-    <svg
-      {...children}
-      width="18"
-      height="20"
-      viewBox="0 0 18 20"
-      fill={setColor}
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M7.56485 0H16.3611C17.2662 0 18 0.727797 18 1.62558V18.3744C18 19.2722 17.2662 20 16.3611 20H7.56485C6.65969 20 5.92593 19.2722 5.92593 18.3744V12.6013H10.6168C11.4569 12.6013 12.1404 11.9039 12.1404 11.0467V8.87329C12.1404 8.01613 11.4569 7.31875 10.6168 7.31875H5.92593V1.62558C5.92593 0.727797 6.65969 0 7.56485 0ZM11.1667 11.0467C11.1667 11.3719 10.9205 11.6354 10.6168 11.6354H4.8144C4.74521 11.6354 4.68911 11.6955 4.68911 11.7696V12.8632C4.68911 13.3492 4.17007 13.6259 3.8078 13.3329L0.218431 10.4298C-0.0728102 10.1942 -0.0728102 9.72579 0.218431 9.49024L3.8078 6.58709C4.17005 6.29409 4.68911 6.57077 4.68911 7.05684V8.1504C4.68911 8.2245 4.74521 8.28454 4.8144 8.28454H10.6168C10.9205 8.28454 11.1667 8.54813 11.1667 8.87329V11.0467Z"
-        fill={setColor}
-        fillOpacity={setOpacity}
-      />
-    </svg>
-  );
-};
diff --git a/src/assets/Icons/LogoutIcon.tsx b/src/assets/Icons/LogoutIcon.tsx
deleted file mode 100644
index d1a4408..0000000
--- a/src/assets/Icons/LogoutIcon.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-export const LogoutIcon = ({ color, height = 20, width = 18 }) => {
-  return (
-    <svg
-      width={width}
-      height={height}
-      viewBox="0 0 18 20"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M10.4351 0H1.63891C0.733765 0 0 0.727797 0 1.62558V18.3744C0 19.2722 0.733765 20 1.63891 20H10.4351C11.3403 20 12.0741 19.2722 12.0741 18.3744V12.6013H7.38321C6.54312 12.6013 5.85964 11.9039 5.85964 11.0467V8.87329C5.85964 8.01613 6.54312 7.31875 7.38323 7.31875H12.0741V1.62558C12.0741 0.727797 11.3403 0 10.4351 0ZM6.83334 11.0467C6.83334 11.3719 7.07952 11.6354 7.38321 11.6354H13.1856C13.2548 11.6354 13.3109 11.6955 13.3109 11.7696V12.8632C13.3109 13.3492 13.8299 13.6259 14.1922 13.3329L17.7816 10.4298C18.0728 10.1942 18.0728 9.72579 17.7816 9.49024L14.1922 6.58709C13.8299 6.29409 13.3109 6.57077 13.3109 7.05684V8.1504C13.3109 8.2245 13.2548 8.28454 13.1856 8.28454H7.38322C7.07952 8.28454 6.83334 8.54813 6.83334 8.87329V11.0467Z"
-        fill={color}
-      />
-    </svg>
-  );
-};