diff --git a/src/components/Group/Group.tsx b/src/components/Group/Group.tsx
index 030ac51..3528ab2 100644
--- a/src/components/Group/Group.tsx
+++ b/src/components/Group/Group.tsx
@@ -1763,7 +1763,7 @@ export const Group = ({
                 sx={{
                   background:
                     direct?.address === selectedDirect?.address &&
-                    theme.palette.background.default,
+                    theme.palette.background.paper,
                   borderRadius: '2px',
                   cursor: 'pointer',
                   display: 'flex',
@@ -1782,7 +1782,7 @@ export const Group = ({
                   <ListItemAvatar>
                     <Avatar
                       sx={{
-                        background: theme.palette.background.default,
+                        background: theme.palette.background.paper,
                         color: theme.palette.text.primary,
                       }}
                       alt={direct?.name || direct?.address}
@@ -1829,6 +1829,7 @@ export const Group = ({
                       fontSize: '16px',
                     }}
                   />
+
                   {direct?.sender !== myAddress &&
                     direct?.timestamp &&
                     ((!timestampEnterData[direct?.address] &&
@@ -1939,7 +1940,7 @@ export const Group = ({
         setInfo={setInfoSnack}
       />
 
-      <div // TODO use Box
+      <Box
         style={{
           alignItems: 'flex-start',
           display: 'flex',
@@ -2007,7 +2008,7 @@ export const Group = ({
             <>
               <Box
                 sx={{
-                  background: theme.palette.background.default,
+                  background: theme.palette.background.paper,
                   bottom: !(desktopViewMode === 'chat') ? 'unset' : '0px',
                   left: !(desktopViewMode === 'chat') ? '-100000px' : '0px',
                   opacity: !(desktopViewMode === 'chat') ? 0 : 1,
@@ -2461,7 +2462,7 @@ export const Group = ({
           }}
         />
         <WalletsAppWrapper />
-      </div>
+      </Box>
     </>
   );
 };
diff --git a/src/components/Minting/Minting.tsx b/src/components/Minting/Minting.tsx
index 43cc4b9..a54a614 100644
--- a/src/components/Minting/Minting.tsx
+++ b/src/components/Minting/Minting.tsx
@@ -13,12 +13,20 @@ import {
   IconButton,
   Paper,
   Snackbar,
+  Tab,
+  Tabs,
   Toolbar,
   Typography,
   useTheme,
 } from '@mui/material';
 import Grid from '@mui/material/Grid';
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import {
+  SyntheticEvent,
+  useCallback,
+  useEffect,
+  useMemo,
+  useState,
+} from 'react';
 import CloseIcon from '@mui/icons-material/Close';
 import { getBaseApiReact } from '../../App';
 import {
@@ -46,6 +54,7 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
   const [openSnack, setOpenSnack] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
   const [adminInfo, setAdminInfo] = useState({});
+  const [valueMintingTab, setValueMintingTab] = useState(0);
   const { isShow: isShowNext, onOk, show: showNext } = useModal();
   const theme = useTheme();
   const { t } = useTranslation([
@@ -110,6 +119,13 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
     }
   };
 
+  function a11yProps(index: number) {
+    return {
+      id: `simple-tab-${index}`,
+      'aria-controls': `simple-tabpanel-${index}`,
+    };
+  }
+
   const getAccountInfo = async (address: string, others?: boolean) => {
     try {
       if (!others) {
@@ -514,6 +530,10 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
     </Grid>
   );
 
+  const handleChange = (event: SyntheticEvent, newValue: number) => {
+    setValueMintingTab(newValue);
+  };
+
   return (
     <Dialog
       open={true}
@@ -551,380 +571,418 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
         </Toolbar>
       </AppBar>
 
-      <DialogContent
-        sx={{
-          position: 'relative',
-        }}
-      >
-        {isLoading && (
-          <Box
+      <Box sx={{ borderBottom: 1, borderColor: 'divider' }}>
+        <Tabs value={setValueMintingTab} onChange={handleChange}>
+          <Tab label="Minting Details" {...a11yProps(0)} />
+          <Tab label="Item Two" {...a11yProps(1)} />
+          <Tab label="Item Three" {...a11yProps(2)} />
+        </Tabs>
+      </Box>
+
+      {valueMintingTab === 0 && (
+        <>
+          <DialogContent
             sx={{
-              alignItems: 'center',
-              bottom: 0,
-              display: 'flex',
-              justifyContent: 'center',
-              left: 0,
-              position: 'absolute',
-              right: 0,
-              top: 0,
+              position: 'relative',
             }}
           >
-            <FidgetSpinner
-              ariaLabel="fidget-spinner-loading"
-              height="80"
-              visible={true}
-              width="80"
-              wrapperClass="fidget-spinner-wrapper"
-              wrapperStyle={{}}
-            />
-          </Box>
-        )}
+            <Container maxWidth="md" sx={{ py: 4 }}>
+              <Paper elevation={3} sx={{ p: 3, mb: 4, borderRadius: '10px' }}>
+                <Typography variant="h6" gutterBottom>
+                  Blockchain Statistics
+                </Typography>
 
-        <Card
-          sx={{
-            backgroundColor: theme.palette.background.default,
-            padding: '10px',
-          }}
-        >
-          <Typography>
-            {t('auth:account.account_one', {
-              postProcess: 'capitalizeFirstChar',
-            })}
-            : {handleNames(accountInfo?.address)}
-          </Typography>
+                <Grid container spacing={2}>
+                  <StatCard
+                    label="Avg. Qortal Blocktime"
+                    value="72.84 Seconds"
+                  />
+                  <StatCard
+                    label="Avg. Blocks Per Day"
+                    value="1186.16 Blocks"
+                  />
+                  <StatCard
+                    label="Avg. Created QORT Per Day"
+                    value="3558.48 QORT"
+                  />
+                </Grid>
+              </Paper>
 
-          <Typography>
-            {t('core:level', {
-              postProcess: 'capitalizeFirstChar',
-            })}
-            : {accountInfo?.level}
-          </Typography>
+              <Paper elevation={3} sx={{ p: 3, mb: 4, borderRadius: '10px' }}>
+                <Typography variant="h6" gutterBottom>
+                  Minting Account Details
+                </Typography>
 
-          <Typography>
-            {t('group:message.generic.next_level', {
-              postProcess: 'capitalizeFirstChar',
-            })}{' '}
-            {_levelUpBlocks()}
-          </Typography>
+                <Grid container spacing={2}>
+                  <StatCard label="Current Status" value="(Minting)" />
+                  <StatCard label="Current Level" value="Level 4" />
+                  <StatCard
+                    label="Blocks To Next Level"
+                    value="139467 Blocks"
+                  />
+                </Grid>
 
-          <Typography>
-            {t('group:message.generic.node_minting', {
-              postProcess: 'capitalizeFirstChar',
-            })}{' '}
-            {nodeInfos?.isMintingPossible?.toString()}
-          </Typography>
-        </Card>
+                <Box mt={2} textAlign="center">
+                  <Typography>
+                    With a 24/7 Minting you will reach level 5 in{' '}
+                    <strong>117.58 days</strong>!
+                  </Typography>
+                </Box>
+              </Paper>
 
-        <Spacer height="10px" />
+              <Paper elevation={3} sx={{ p: 3, borderRadius: '10px' }}>
+                <Typography variant="h6" gutterBottom>
+                  Minting Rewards Info
+                </Typography>
 
-        {isPartOfMintingGroup && !accountIsMinting && (
-          <Box
+                <Grid container spacing={2}>
+                  <StatCard label="Current Tier" value="Tier 2 (Level 3 + 4)" />
+                  <StatCard
+                    label="Total Minters in The Tier"
+                    value="77 Minters"
+                  />
+                  <StatCard label="Tier Share Per Block" value="13%" />
+                  <StatCard
+                    label="Est. Reward Per Block"
+                    value="0.00506494 QORT"
+                  />
+                  <StatCard
+                    label="Est. Reward Per Day"
+                    value="6.00782338 QORT"
+                  />
+                  {/* <StatCard label="AdminInfo" value={adminInfo} /> */}
+                </Grid>
+              </Paper>
+            </Container>
+          </DialogContent>
+        </>
+      )}
+
+      {valueMintingTab === 1 && (
+        <>
+          <DialogContent
             sx={{
-              alignItems: 'center',
-              display: 'flex',
-              flexDirection: 'column',
-              gap: '5px',
-              width: '100%',
+              position: 'relative',
             }}
           >
-            <Button
-              size="small"
-              onClick={() => {
-                startMinting();
-              }}
-              disabled={mintingAccounts?.length > 1}
+            {isLoading && (
+              <Box
+                sx={{
+                  alignItems: 'center',
+                  bottom: 0,
+                  display: 'flex',
+                  justifyContent: 'center',
+                  left: 0,
+                  position: 'absolute',
+                  right: 0,
+                  top: 0,
+                }}
+              >
+                <FidgetSpinner
+                  ariaLabel="fidget-spinner-loading"
+                  height="80"
+                  visible={true}
+                  width="80"
+                  wrapperClass="fidget-spinner-wrapper"
+                  wrapperStyle={{}}
+                />
+              </Box>
+            )}
+
+            <Card
               sx={{
-                backgroundColor: theme.palette.other.positive,
-                color: 'black',
-                fontWeight: 'bold',
-                opacity: 0.7,
-                maxWidth: '90%',
-                width: '200px',
-                '&:hover': {
-                  backgroundColor: theme.palette.other.positive,
-                  color: 'black',
-                  opacity: 1,
-                },
+                backgroundColor: theme.palette.background.default,
+                padding: '10px',
               }}
-              variant="contained"
             >
-              {t('core:action.start_minting', {
-                postProcess: 'capitalizeFirstChar',
-              })}
-            </Button>
-
-            {mintingAccounts?.length > 1 && (
               <Typography>
-                {t('group:message.generic.minting_keys_per_node', {
+                {t('auth:account.account_one', {
+                  postProcess: 'capitalizeFirstChar',
+                })}
+                : {handleNames(accountInfo?.address)}
+              </Typography>
+
+              <Typography>
+                {t('core:level', {
+                  postProcess: 'capitalizeFirstChar',
+                })}
+                : {accountInfo?.level}
+              </Typography>
+
+              <Typography>
+                {t('group:message.generic.next_level', {
+                  postProcess: 'capitalizeFirstChar',
+                })}{' '}
+                {_levelUpBlocks()}
+              </Typography>
+
+              <Typography>
+                {t('group:message.generic.node_minting', {
+                  postProcess: 'capitalizeFirstChar',
+                })}{' '}
+                {nodeInfos?.isMintingPossible?.toString()}
+              </Typography>
+            </Card>
+
+            <Spacer height="10px" />
+
+            {isPartOfMintingGroup && !accountIsMinting && (
+              <Box
+                sx={{
+                  alignItems: 'center',
+                  display: 'flex',
+                  flexDirection: 'column',
+                  gap: '5px',
+                  width: '100%',
+                }}
+              >
+                <Button
+                  size="small"
+                  onClick={() => {
+                    startMinting();
+                  }}
+                  disabled={mintingAccounts?.length > 1}
+                  sx={{
+                    backgroundColor: theme.palette.other.positive,
+                    color: 'black',
+                    fontWeight: 'bold',
+                    opacity: 0.7,
+                    maxWidth: '90%',
+                    width: '200px',
+                    '&:hover': {
+                      backgroundColor: theme.palette.other.positive,
+                      color: 'black',
+                      opacity: 1,
+                    },
+                  }}
+                  variant="contained"
+                >
+                  {t('core:action.start_minting', {
+                    postProcess: 'capitalizeFirstChar',
+                  })}
+                </Button>
+
+                {mintingAccounts?.length > 1 && (
+                  <Typography>
+                    {t('group:message.generic.minting_keys_per_node', {
+                      postProcess: 'capitalizeFirstChar',
+                    })}
+                  </Typography>
+                )}
+              </Box>
+            )}
+
+            <Spacer height="10px" />
+
+            {mintingAccounts?.length > 0 && (
+              <Typography>
+                {t('group:message.generic.node_minting_account', {
                   postProcess: 'capitalizeFirstChar',
                 })}
               </Typography>
             )}
-          </Box>
-        )}
-
-        <Spacer height="10px" />
-
-        {mintingAccounts?.length > 0 && (
-          <Typography>
-            {t('group:message.generic.node_minting_account', {
-              postProcess: 'capitalizeFirstChar',
-            })}
-          </Typography>
-        )}
-        <Card
-          sx={{
-            backgroundColor: theme.palette.background.default,
-            padding: '10px',
-          }}
-        >
-          {accountIsMinting && (
-            <Box
+            <Card
               sx={{
-                display: 'flex',
-                gap: '5px',
-                flexDirection: 'column',
+                backgroundColor: theme.palette.background.default,
+                padding: '10px',
               }}
             >
-              <Typography>
-                {t('group:message.generic.node_minting_key', {
-                  postProcess: 'capitalizeFirstChar',
-                })}
-              </Typography>
-            </Box>
-          )}
+              {accountIsMinting && (
+                <Box
+                  sx={{
+                    display: 'flex',
+                    gap: '5px',
+                    flexDirection: 'column',
+                  }}
+                >
+                  <Typography>
+                    {t('group:message.generic.node_minting_key', {
+                      postProcess: 'capitalizeFirstChar',
+                    })}
+                  </Typography>
+                </Box>
+              )}
 
-          <Spacer height="10px" />
+              <Spacer height="10px" />
 
-          {mintingAccounts?.map((acct) => (
-            <Box
-              key={acct?.mintingAccount}
-              sx={{
-                display: 'flex',
-                gap: '10px',
-                flexDirection: 'column',
-              }}
-            >
-              <Typography>
-                {t('group:message.generic.minting_account', {
-                  postProcess: 'capitalizeFirstChar',
-                })}{' '}
-                {handleNames(acct?.mintingAccount)}
-              </Typography>
+              {mintingAccounts?.map((acct) => (
+                <Box
+                  key={acct?.mintingAccount}
+                  sx={{
+                    display: 'flex',
+                    gap: '10px',
+                    flexDirection: 'column',
+                  }}
+                >
+                  <Typography>
+                    {t('group:message.generic.minting_account', {
+                      postProcess: 'capitalizeFirstChar',
+                    })}{' '}
+                    {handleNames(acct?.mintingAccount)}
+                  </Typography>
 
-              <Button
-                size="small"
+                  <Button
+                    size="small"
+                    sx={{
+                      backgroundColor: theme.palette.other.danger,
+                      color: theme.palette.text.primary,
+                      fontWeight: 'bold',
+                      maxWidth: '90%',
+                      opacity: 0.7,
+                      width: '200px',
+                      '&:hover': {
+                        backgroundColor: theme.palette.other.danger,
+                        color: theme.palette.text.primary,
+                        opacity: 1,
+                      },
+                    }}
+                    onClick={() => {
+                      removeMintingAccount(acct.publicKey, acct);
+                    }}
+                    variant="contained"
+                  >
+                    {t('group:action.remove_minting_account', {
+                      postProcess: 'capitalizeFirstChar',
+                    })}
+                  </Button>
+
+                  <Divider />
+
+                  <Spacer height="10px" />
+                </Box>
+              ))}
+
+              {mintingAccounts?.length > 1 && (
+                <Typography>
+                  {t('group:message.generic.minting_keys_per_node_different', {
+                    postProcess: 'capitalizeFirstChar',
+                  })}
+                </Typography>
+              )}
+            </Card>
+
+            <Spacer height="20px" />
+
+            {!isPartOfMintingGroup && (
+              <Card
                 sx={{
-                  backgroundColor: theme.palette.other.danger,
-                  color: theme.palette.text.primary,
-                  fontWeight: 'bold',
-                  maxWidth: '90%',
-                  opacity: 0.7,
-                  width: '200px',
-                  '&:hover': {
-                    backgroundColor: theme.palette.other.danger,
+                  backgroundColor: theme.palette.background.default,
+                  padding: '10px',
+                }}
+              >
+                <Box
+                  sx={{
+                    display: 'flex',
+                    gap: '5px',
+                    flexDirection: 'column',
+                    width: '100%',
+                    alignItems: 'center',
+                  }}
+                >
+                  <Typography>
+                    {t('group:message.generic.minter_group', {
+                      postProcess: 'capitalizeFirstChar',
+                    })}
+                  </Typography>
+
+                  <Typography>
+                    {t('group:message.generic.mintership_app', {
+                      postProcess: 'capitalizeFirstChar',
+                    })}
+                  </Typography>
+
+                  <Spacer height="10px" />
+
+                  <Button
+                    size="small"
+                    sx={{
+                      backgroundColor: theme.palette.other.positive,
+                      color: theme.palette.text.primary,
+                      fontWeight: 'bold',
+                      opacity: 0.7,
+
+                      '&:hover': {
+                        backgroundColor: theme.palette.other.positive,
+                        color: 'black',
+                        opacity: 1,
+                      },
+                    }}
+                    onClick={() => {
+                      executeEvent('addTab', {
+                        data: { service: 'APP', name: 'q-mintership' },
+                      });
+                      executeEvent('open-apps-mode', {});
+                      setIsOpenMinting(false);
+                    }}
+                    variant="contained"
+                  >
+                    {t('group:action.visit_q_mintership', {
+                      postProcess: 'capitalizeFirstChar',
+                    })}
+                  </Button>
+                </Box>
+              </Card>
+            )}
+
+            {showWaitDialog && (
+              <Dialog
+                open={showWaitDialog}
+                aria-labelledby="alert-dialog-title"
+                aria-describedby="alert-dialog-description"
+              >
+                <DialogTitle
+                  id="alert-dialog-title"
+                  sx={{
+                    textAlign: 'center',
                     color: theme.palette.text.primary,
+                    fontWeight: 'bold',
                     opacity: 1,
-                  },
-                }}
-                onClick={() => {
-                  removeMintingAccount(acct.publicKey, acct);
-                }}
-                variant="contained"
-              >
-                {t('group:action.remove_minting_account', {
-                  postProcess: 'capitalizeFirstChar',
-                })}
-              </Button>
+                  }}
+                >
+                  {isShowNext
+                    ? t('core:message.generic.confirmed', {
+                        postProcess: 'capitalizeFirstChar',
+                      })
+                    : t('core:message.generic.wait', {
+                        postProcess: 'capitalizeFirstChar',
+                      })}
+                </DialogTitle>
 
-              <Divider />
+                <DialogContent>
+                  {!isShowNext && (
+                    <Typography>
+                      {t('group:message.success.rewardshare_creation', {
+                        postProcess: 'capitalizeFirstChar',
+                      })}
+                    </Typography>
+                  )}
 
-              <Spacer height="10px" />
-            </Box>
-          ))}
+                  {isShowNext && (
+                    <Typography>
+                      {t('group:message.success.rewardshare_confirmed', {
+                        postProcess: 'capitalizeFirstChar',
+                      })}
+                    </Typography>
+                  )}
+                </DialogContent>
 
-          {mintingAccounts?.length > 1 && (
-            <Typography>
-              {t('group:message.generic.minting_keys_per_node_different', {
-                postProcess: 'capitalizeFirstChar',
-              })}
-            </Typography>
-          )}
-        </Card>
-
-        <Spacer height="20px" />
-
-        {!isPartOfMintingGroup && (
-          <Card
-            sx={{
-              backgroundColor: theme.palette.background.default,
-              padding: '10px',
-            }}
-          >
-            <Box
-              sx={{
-                display: 'flex',
-                gap: '5px',
-                flexDirection: 'column',
-                width: '100%',
-                alignItems: 'center',
-              }}
-            >
-              <Typography>
-                {t('group:message.generic.minter_group', {
-                  postProcess: 'capitalizeFirstChar',
-                })}
-              </Typography>
-
-              <Typography>
-                {t('group:message.generic.mintership_app', {
-                  postProcess: 'capitalizeFirstChar',
-                })}
-              </Typography>
-
-              <Spacer height="10px" />
-
-              <Button
-                size="small"
-                sx={{
-                  backgroundColor: theme.palette.other.positive,
-                  color: theme.palette.text.primary,
-                  fontWeight: 'bold',
-                  opacity: 0.7,
-
-                  '&:hover': {
-                    backgroundColor: theme.palette.other.positive,
-                    color: 'black',
-                    opacity: 1,
-                  },
-                }}
-                onClick={() => {
-                  executeEvent('addTab', {
-                    data: { service: 'APP', name: 'q-mintership' },
-                  });
-                  executeEvent('open-apps-mode', {});
-                  setIsOpenMinting(false);
-                }}
-                variant="contained"
-              >
-                {t('group:action.visit_q_mintership', {
-                  postProcess: 'capitalizeFirstChar',
-                })}
-              </Button>
-            </Box>
-          </Card>
-        )}
-
-        <Container maxWidth="md" sx={{ py: 4 }}>
-          <Typography variant="h4" fontWeight="bold" gutterBottom>
-            General Minting Details
-          </Typography>
-
-          <Paper elevation={3} sx={{ p: 3, mb: 4, borderRadius: '10px' }}>
-            <Typography variant="h6" gutterBottom>
-              Blockchain Statistics
-            </Typography>
-
-            <Grid container spacing={2}>
-              <StatCard label="Avg. Qortal Blocktime" value="72.84 Seconds" />
-              <StatCard label="Avg. Blocks Per Day" value="1186.16 Blocks" />
-              <StatCard
-                label="Avg. Created QORT Per Day"
-                value="3558.48 QORT"
-              />
-            </Grid>
-          </Paper>
-
-          <Paper elevation={3} sx={{ p: 3, mb: 4, borderRadius: '10px' }}>
-            <Typography variant="h6" gutterBottom>
-              Minting Account Details
-            </Typography>
-
-            <Grid container spacing={2}>
-              <StatCard label="Current Status" value="(Minting)" />
-              <StatCard label="Current Level" value="Level 4" />
-              <StatCard label="Blocks To Next Level" value="139467 Blocks" />
-            </Grid>
-
-            <Box mt={2} textAlign="center">
-              <Typography>
-                With a 24/7 Minting you will reach level 5 in{' '}
-                <strong>117.58 days</strong>!
-              </Typography>
-            </Box>
-          </Paper>
-
-          <Paper elevation={3} sx={{ p: 3, borderRadius: '10px' }}>
-            <Typography variant="h6" gutterBottom>
-              Minting Rewards Info
-            </Typography>
-
-            <Grid container spacing={2}>
-              <StatCard label="Current Tier" value="Tier 2 (Level 3 + 4)" />
-              <StatCard label="Total Minters in The Tier" value="77 Minters" />
-              <StatCard label="Tier Share Per Block" value="13%" />
-              <StatCard label="Est. Reward Per Block" value="0.00506494 QORT" />
-              <StatCard label="Est. Reward Per Day" value="6.00782338 QORT" />
-              {/* <StatCard label="AdminInfo" value={adminInfo} /> */}
-            </Grid>
-          </Paper>
-        </Container>
-
-        {showWaitDialog && (
-          <Dialog
-            open={showWaitDialog}
-            aria-labelledby="alert-dialog-title"
-            aria-describedby="alert-dialog-description"
-          >
-            <DialogTitle
-              id="alert-dialog-title"
-              sx={{
-                textAlign: 'center',
-                color: theme.palette.text.primary,
-                fontWeight: 'bold',
-                opacity: 1,
-              }}
-            >
-              {isShowNext
-                ? t('core:message.generic.confirmed', {
-                    postProcess: 'capitalizeFirstChar',
-                  })
-                : t('core:message.generic.wait', {
-                    postProcess: 'capitalizeFirstChar',
-                  })}
-            </DialogTitle>
-
-            <DialogContent>
-              {!isShowNext && (
-                <Typography>
-                  {t('group:message.success.rewardshare_creation', {
-                    postProcess: 'capitalizeFirstChar',
-                  })}
-                </Typography>
-              )}
-
-              {isShowNext && (
-                <Typography>
-                  {t('group:message.success.rewardshare_confirmed', {
-                    postProcess: 'capitalizeFirstChar',
-                  })}
-                </Typography>
-              )}
-            </DialogContent>
-
-            <DialogActions>
-              <Button
-                disabled={!isShowNext}
-                variant="contained"
-                onClick={onOk}
-                autoFocus
-              >
-                {t('core:page.next', { postProcess: 'capitalizeFirstChar' })}
-              </Button>
-            </DialogActions>
-          </Dialog>
-        )}
-      </DialogContent>
+                <DialogActions>
+                  <Button
+                    disabled={!isShowNext}
+                    variant="contained"
+                    onClick={onOk}
+                    autoFocus
+                  >
+                    {t('core:page.next', {
+                      postProcess: 'capitalizeFirstChar',
+                    })}
+                  </Button>
+                </DialogActions>
+              </Dialog>
+            )}
+          </DialogContent>
+        </>
+      )}
 
       <Snackbar
         anchorOrigin={{ vertical: 'bottom', horizontal: 'center' }}
diff --git a/src/components/Wallets.tsx b/src/components/Wallets.tsx
index aef22b3..568c1cf 100644
--- a/src/components/Wallets.tsx
+++ b/src/components/Wallets.tsx
@@ -207,7 +207,7 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => {
   if (isLoading) return null;
 
   return (
-    <div>
+    <Box>
       {wallets?.length === 0 || !wallets ? (
         <>
           <Typography>
@@ -469,7 +469,7 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => {
           </Typography>
         </DialogActions>
       </Dialog>
-    </div>
+    </Box>
   );
 };