diff --git a/nym-wallet/src/components/Accounts/AccountsModal.tsx b/nym-wallet/src/components/Accounts/AccountsModal.tsx
deleted file mode 100644
index 8210b3c562..0000000000
--- a/nym-wallet/src/components/Accounts/AccountsModal.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import React, { useContext } from 'react';
-import { Box, Button, Dialog, DialogActions, DialogContent, DialogTitle, IconButton, Typography } from '@mui/material';
-import { Add, ArrowDownwardSharp, Close } from '@mui/icons-material';
-import { AccountsContext } from 'src/context';
-import { AccountItem } from './AccountItem';
-
-export const AccountsModal = ({ onClose }: { onClose?: () => void }) => {
-  const { accounts, dialogToDisplay, setDialogToDisplay } = useContext(AccountsContext);
-
-  const handleClose = () => {
-    setDialogToDisplay(undefined);
-    onClose?.();
-  };
-
-  return (
-    <Dialog open={dialogToDisplay === 'Accounts'} onClose={handleClose} fullWidth hideBackdrop>
-      <DialogTitle>
-        <Box display="flex" justifyContent="space-between" alignItems="center">
-          <Typography variant="h6">Accounts</Typography>
-          <IconButton onClick={handleClose}>
-            <Close />
-          </IconButton>
-        </Box>
-        <Typography variant="body1" sx={{ color: 'grey.600' }}>
-          Switch between accounts
-        </Typography>
-      </DialogTitle>
-      <DialogContent sx={{ padding: 0 }}>
-        {accounts?.map(({ id, address }) => (
-          <AccountItem name={id} address={address} key={address} />
-        ))}
-      </DialogContent>
-      <DialogActions sx={{ p: 3 }}>
-        <Button startIcon={<ArrowDownwardSharp />} onClick={() => setDialogToDisplay('Import')}>
-          Import account
-        </Button>
-        <Button
-          disableElevation
-          variant="contained"
-          startIcon={<Add fontSize="small" />}
-          onClick={() => setDialogToDisplay('Add')}
-        >
-          Add new account
-        </Button>
-      </DialogActions>
-    </Dialog>
-  );
-};
diff --git a/nym-wallet/src/components/Accounts/AddAccountModal.tsx b/nym-wallet/src/components/Accounts/modals/AddAccountModal.tsx
similarity index 74%
rename from nym-wallet/src/components/Accounts/AddAccountModal.tsx
rename to nym-wallet/src/components/Accounts/modals/AddAccountModal.tsx
index 3f3aec7b62..b7079d906e 100644
--- a/nym-wallet/src/components/Accounts/AddAccountModal.tsx
+++ b/nym-wallet/src/components/Accounts/modals/AddAccountModal.tsx
@@ -2,24 +2,21 @@ import React, { useContext, useEffect, useState } from 'react';
 import {
   Box,
   Button,
-  CircularProgress,
   Dialog,
   DialogActions,
   DialogContent,
   DialogTitle,
   IconButton,
-  Stack,
   TextField,
   Typography,
 } from '@mui/material';
 import { ArrowBackSharp } from '@mui/icons-material';
 import { useClipboard } from 'use-clipboard-copy';
 import { createMnemonic, validateMnemonic } from 'src/requests';
-import { AccountsContext } from 'src/context';
-import { PasswordInput } from 'src/components';
-import { Mnemonic } from '../Mnemonic';
 import { Console } from 'src/utils/console';
-import { match } from 'assert';
+import { AccountsContext } from 'src/context';
+import { ConfirmPassword, Mnemonic } from 'src/components';
+import { MnemonicInput } from 'src/components/textfields';
 
 const createAccountSteps = [
   'Copy and save mnemonic for your new account',
@@ -66,27 +63,18 @@ const ImportMnemonic = ({
   };
 
   return (
-    <Box sx={{ mt: 1 }}>
+    <>
       <DialogContent>
-        <Stack spacing={2} alignItems="center">
-          {error && (
-            <Typography variant="body1" sx={{ color: 'error.main', mb: 2 }}>
-              {error}
-            </Typography>
-          )}
-          <TextField
-            multiline
-            placeholder="Mnemonic to import"
-            rows={3}
-            value={value}
-            onChange={(e) => {
-              onChange(e.target.value);
-              setError(undefined);
-            }}
-            fullWidth
-            type="password"
-          />
-        </Stack>
+        <Typography variant="body1" sx={{ color: 'error.main', my: 2 }}>
+          {error}
+        </Typography>
+        <MnemonicInput
+          mnemonic={value}
+          onUpdateMnemonic={(mnemon) => {
+            onChange(mnemon);
+            setError(undefined);
+          }}
+        />
       </DialogContent>
       <DialogActions sx={{ p: 3, pt: 0 }}>
         <Button
@@ -100,7 +88,7 @@ const ImportMnemonic = ({
           Next
         </Button>
       </DialogActions>
-    </Box>
+    </>
   );
 };
 
@@ -110,16 +98,16 @@ const NameAccount = ({ onNext }: { onNext: (value: string) => void }) => {
 
   const nameValidation = /^([a-zA-Z0-9\s]){1,20}$/;
 
-  const handleNext = (value: string) => {
-    if (!nameValidation.test(value))
-      [setError('Account name must  contain only letters and numbers and be between 1 and 20 characters')];
-    else onNext(value);
+  const handleNext = (accountName: string) => {
+    if (!nameValidation.test(accountName)) {
+      setError('Account name must  contain only letters and numbers and be between 1 and 20 characters');
+    } else onNext(value);
   };
 
   return (
-    <Box sx={{ mt: 1 }}>
+    <>
       <DialogContent>
-        <Typography variant="body1" sx={{ color: 'error.main', mb: 2 }}>
+        <Typography variant="body1" sx={{ color: 'error.main', my: 2 }}>
           {error}
         </Typography>
         <TextField
@@ -144,43 +132,7 @@ const NameAccount = ({ onNext }: { onNext: (value: string) => void }) => {
           Next
         </Button>
       </DialogActions>
-    </Box>
-  );
-};
-
-const ConfirmPassword = ({ onConfirm }: { onConfirm: (password: string) => void }) => {
-  const [value, setValue] = useState('');
-  const { isLoading, error } = useContext(AccountsContext);
-
-  return (
-    <Box sx={{ mt: 1 }}>
-      <DialogContent>
-        {error && (
-          <Typography variant="body1" sx={{ color: 'error.main', mb: 2 }}>
-            {error}
-          </Typography>
-        )}
-        <PasswordInput
-          password={value}
-          onUpdatePassword={(pswrd) => setValue(pswrd)}
-          label="Confirm password"
-          autoFocus
-        />
-      </DialogContent>
-      <DialogActions sx={{ p: 3, pt: 0 }}>
-        <Button
-          disabled={!value.length || isLoading}
-          fullWidth
-          disableElevation
-          variant="contained"
-          size="large"
-          onClick={() => onConfirm(value)}
-          endIcon={isLoading && <CircularProgress size={20} />}
-        >
-          Add account
-        </Button>
-      </DialogActions>
-    </Box>
+    </>
   );
 };
 
@@ -191,24 +143,25 @@ export const AddAccountModal = () => {
     accountName: '',
   });
 
-  const { dialogToDisplay, setDialogToDisplay, handleAddAccount, setError } = useContext(AccountsContext);
+  const { dialogToDisplay, setDialogToDisplay, handleAddAccount, setError, isLoading, error } =
+    useContext(AccountsContext);
 
   const generateMnemonic = async () => {
     const mnemon = await createMnemonic();
     setData((d) => ({ ...d, mnemonic: mnemon }));
   };
 
-  const handleClose = () => {
-    setDialogToDisplay('Accounts');
-    resetState();
-  };
-
   const resetState = () => {
     setData({ mnemonic: '', accountName: '' });
     setStep(0);
     setError(undefined);
   };
 
+  const handleClose = () => {
+    setDialogToDisplay('Accounts');
+    resetState();
+  };
+
   useEffect(() => {
     if (dialogToDisplay === 'Add') generateMnemonic();
     if (dialogToDisplay === 'Accounts') resetState();
@@ -260,6 +213,7 @@ export const AddAccountModal = () => {
           case 2:
             return (
               <ConfirmPassword
+                buttonTitle="Add account"
                 onConfirm={async (password) => {
                   if (data.accountName && data.mnemonic) {
                     try {
@@ -271,6 +225,8 @@ export const AddAccountModal = () => {
                     }
                   }
                 }}
+                isLoading={isLoading}
+                error={error}
               />
             );
           default:
diff --git a/nym-wallet/src/components/Accounts/EditAccountModal.tsx b/nym-wallet/src/components/Accounts/modals/EditAccountModal.tsx
similarity index 100%
rename from nym-wallet/src/components/Accounts/EditAccountModal.tsx
rename to nym-wallet/src/components/Accounts/modals/EditAccountModal.tsx
diff --git a/nym-wallet/src/components/Accounts/ImportAccountModal.tsx b/nym-wallet/src/components/Accounts/modals/ImportAccountModal.tsx
similarity index 100%
rename from nym-wallet/src/components/Accounts/ImportAccountModal.tsx
rename to nym-wallet/src/components/Accounts/modals/ImportAccountModal.tsx
diff --git a/nym-wallet/src/components/Accounts/MnemonicModal.tsx b/nym-wallet/src/components/Accounts/modals/MnemonicModal.tsx
similarity index 92%
rename from nym-wallet/src/components/Accounts/MnemonicModal.tsx
rename to nym-wallet/src/components/Accounts/modals/MnemonicModal.tsx
index cecc572a73..461e93b51b 100644
--- a/nym-wallet/src/components/Accounts/MnemonicModal.tsx
+++ b/nym-wallet/src/components/Accounts/modals/MnemonicModal.tsx
@@ -13,8 +13,7 @@ import {
 import { ArrowBackSharp } from '@mui/icons-material';
 import { AccountsContext } from 'src/context';
 import { useClipboard } from 'use-clipboard-copy';
-import { Mnemonic } from '../Mnemonic';
-import { PasswordInput } from '../textfields';
+import { PasswordInput, Mnemonic } from 'src/components';
 
 export const MnemonicModal = () => {
   const [password, setPassword] = useState('');
@@ -26,7 +25,7 @@ export const MnemonicModal = () => {
     setDialogToDisplay,
     accountMnemonic,
     setAccountMnemonic,
-    handleGetAcccountMnemonic,
+    handleGetAccountMnemonic,
     error,
     setError,
     isLoading,
@@ -86,7 +85,7 @@ export const MnemonicModal = () => {
             onClick={async () => {
               if (accountMnemonic?.accountName) {
                 setError(undefined);
-                await handleGetAcccountMnemonic({ password, accountName: accountMnemonic?.accountName });
+                await handleGetAccountMnemonic({ password, accountName: accountMnemonic?.accountName });
               }
             }}
             endIcon={isLoading && <CircularProgress size={20} />}