diff --git a/src/app/(app)/(layout)/settings/page.tsx b/src/app/(app)/(layout)/settings/page.tsx
new file mode 100644
index 00000000..c96bfe1f
--- /dev/null
+++ b/src/app/(app)/(layout)/settings/page.tsx
@@ -0,0 +1,5 @@
+import { Settings } from '@/views/settings/Settings';
+
+export default function Page() {
+  return <Settings />;
+}
diff --git a/src/components/layout/AppLayout.tsx b/src/components/layout/AppLayout.tsx
index a2c4dd48..d1892ded 100644
--- a/src/components/layout/AppLayout.tsx
+++ b/src/components/layout/AppLayout.tsx
@@ -5,6 +5,7 @@ import {
   Menu,
   MessageCircle,
   Settings,
+  Settings2,
   Vault,
 } from 'lucide-react';
 import Link from 'next/link';
@@ -79,6 +80,24 @@ export const AppLayout: FC<{ children: ReactNode }> = ({ children }) => {
             </Tooltip>
           </nav>
           <nav className="mt-auto grid gap-1 p-2">
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <Button
+                  variant="ghost"
+                  size="icon"
+                  className="mt-auto rounded-lg"
+                  aria-label="Settings"
+                  asChild
+                >
+                  <Link href={ROUTES.settings}>
+                    <Settings2 className="size-5" />
+                  </Link>
+                </Button>
+              </TooltipTrigger>
+              <TooltipContent side="right" sideOffset={5}>
+                Settings
+              </TooltipContent>
+            </Tooltip>
             <Tooltip>
               <TooltipTrigger asChild>
                 <Button
@@ -135,6 +154,18 @@ export const AppLayout: FC<{ children: ReactNode }> = ({ children }) => {
                   </Link>
                 </nav>
                 <div className="mt-auto space-y-2">
+                  <Button
+                    asChild
+                    variant="outline"
+                    className="mt-auto w-full rounded-lg"
+                    aria-label="Settings"
+                    onClick={() => setMobileMenuOpen(false)}
+                  >
+                    <Link href={ROUTES.settings}>
+                      <Settings2 className="mr-2 h-5 w-5" />
+                      Settings
+                    </Link>
+                  </Button>
                   <Button
                     asChild
                     variant="outline"
diff --git a/src/components/ui/dialog.tsx b/src/components/ui/dialog.tsx
index 4a12be92..86416741 100644
--- a/src/components/ui/dialog.tsx
+++ b/src/components/ui/dialog.tsx
@@ -38,7 +38,7 @@ const DialogContent = React.forwardRef<
     <DialogPrimitive.Content
       ref={ref}
       className={cn(
-        'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg',
+        'fixed left-[50%] top-[50%] z-50 grid max-h-dvh w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 overflow-y-auto border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg',
         className
       )}
       {...props}
diff --git a/src/graphql/mutations/__generated__/changePassword.generated.tsx b/src/graphql/mutations/__generated__/changePassword.generated.tsx
new file mode 100644
index 00000000..92bea6d5
--- /dev/null
+++ b/src/graphql/mutations/__generated__/changePassword.generated.tsx
@@ -0,0 +1,67 @@
+/* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT MODIFY. */
+/* eslint-disable no-unused-vars, @typescript-eslint/no-unused-vars */
+import { gql } from '@apollo/client';
+import * as Apollo from '@apollo/client';
+
+import * as Types from '../../types';
+
+const defaultOptions = {} as const;
+export type ChangePasswordMutationVariables = Types.Exact<{
+  input: Types.ChangePasswordInput;
+}>;
+
+export type ChangePasswordMutation = {
+  __typename?: 'Mutation';
+  password: { __typename?: 'PasswordMutations'; change: boolean };
+};
+
+export const ChangePasswordDocument = gql`
+  mutation ChangePassword($input: ChangePasswordInput!) {
+    password {
+      change(input: $input)
+    }
+  }
+`;
+export type ChangePasswordMutationFn = Apollo.MutationFunction<
+  ChangePasswordMutation,
+  ChangePasswordMutationVariables
+>;
+
+/**
+ * __useChangePasswordMutation__
+ *
+ * To run a mutation, you first call `useChangePasswordMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useChangePasswordMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [changePasswordMutation, { data, loading, error }] = useChangePasswordMutation({
+ *   variables: {
+ *      input: // value for 'input'
+ *   },
+ * });
+ */
+export function useChangePasswordMutation(
+  baseOptions?: Apollo.MutationHookOptions<
+    ChangePasswordMutation,
+    ChangePasswordMutationVariables
+  >
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useMutation<
+    ChangePasswordMutation,
+    ChangePasswordMutationVariables
+  >(ChangePasswordDocument, options);
+}
+export type ChangePasswordMutationHookResult = ReturnType<
+  typeof useChangePasswordMutation
+>;
+export type ChangePasswordMutationResult =
+  Apollo.MutationResult<ChangePasswordMutation>;
+export type ChangePasswordMutationOptions = Apollo.BaseMutationOptions<
+  ChangePasswordMutation,
+  ChangePasswordMutationVariables
+>;
diff --git a/src/graphql/mutations/__generated__/checkPassword.generated.tsx b/src/graphql/mutations/__generated__/checkPassword.generated.tsx
index e7d23e1d..808b6910 100644
--- a/src/graphql/mutations/__generated__/checkPassword.generated.tsx
+++ b/src/graphql/mutations/__generated__/checkPassword.generated.tsx
@@ -12,12 +12,14 @@ export type CheckPasswordMutationVariables = Types.Exact<{
 
 export type CheckPasswordMutation = {
   __typename?: 'Mutation';
-  checkPassword: boolean;
+  password: { __typename?: 'PasswordMutations'; check: boolean };
 };
 
 export const CheckPasswordDocument = gql`
   mutation CheckPassword($password: String!) {
-    checkPassword(password: $password)
+    password {
+      check(password: $password)
+    }
   }
 `;
 export type CheckPasswordMutationFn = Apollo.MutationFunction<
diff --git a/src/graphql/mutations/changePassword.ts b/src/graphql/mutations/changePassword.ts
new file mode 100644
index 00000000..7f31777b
--- /dev/null
+++ b/src/graphql/mutations/changePassword.ts
@@ -0,0 +1,9 @@
+import { gql } from '@apollo/client';
+
+export const ChangePassword = gql`
+  mutation ChangePassword($input: ChangePasswordInput!) {
+    password {
+      change(input: $input)
+    }
+  }
+`;
diff --git a/src/graphql/mutations/checkPassword.ts b/src/graphql/mutations/checkPassword.ts
index b91a1c42..78ed2e25 100644
--- a/src/graphql/mutations/checkPassword.ts
+++ b/src/graphql/mutations/checkPassword.ts
@@ -1,7 +1,9 @@
 import { gql } from '@apollo/client';
 
-export const Login = gql`
+export const CheckPassword = gql`
   mutation CheckPassword($password: String!) {
-    checkPassword(password: $password)
+    password {
+      check(password: $password)
+    }
   }
 `;
diff --git a/src/graphql/types.ts b/src/graphql/types.ts
index 605c2910..5b5d461b 100644
--- a/src/graphql/types.ts
+++ b/src/graphql/types.ts
@@ -45,6 +45,13 @@ export type BroadcastLiquidTransactionInput = {
   wallet_account_id: Scalars['String']['input'];
 };
 
+export type ChangePasswordInput = {
+  current_master_password_hash: Scalars['String']['input'];
+  new_master_password_hash: Scalars['String']['input'];
+  new_password_hint?: InputMaybe<Scalars['String']['input']>;
+  new_protected_symmetric_key: Scalars['String']['input'];
+};
+
 export type ContactMessage = {
   __typename?: 'ContactMessage';
   contact_is_sender: Scalars['Boolean']['output'];
@@ -211,20 +218,16 @@ export type MoneyAddress = {
 
 export type Mutation = {
   __typename?: 'Mutation';
-  checkPassword: Scalars['Boolean']['output'];
   contacts: ContactMutations;
   login: NewAccount;
   logout: Scalars['Boolean']['output'];
+  password: PasswordMutations;
   pay: PayMutations;
   refreshToken: RefreshToken;
   signUp: NewAccount;
   wallets: WalletMutations;
 };
 
-export type MutationCheckPasswordArgs = {
-  password: Scalars['String']['input'];
-};
-
 export type MutationLoginArgs = {
   input: LoginInput;
 };
@@ -244,6 +247,20 @@ export type NewAccount = {
   refresh_token: Scalars['String']['output'];
 };
 
+export type PasswordMutations = {
+  __typename?: 'PasswordMutations';
+  change: Scalars['Boolean']['output'];
+  check: Scalars['Boolean']['output'];
+};
+
+export type PasswordMutationsChangeArgs = {
+  input: ChangePasswordInput;
+};
+
+export type PasswordMutationsCheckArgs = {
+  password: Scalars['String']['input'];
+};
+
 export type PayInput = {
   account_id?: InputMaybe<Scalars['String']['input']>;
   wallet_id?: InputMaybe<Scalars['String']['input']>;
diff --git a/src/utils/crypto.ts b/src/utils/crypto.ts
index 32edc19b..86fbe79a 100644
--- a/src/utils/crypto.ts
+++ b/src/utils/crypto.ts
@@ -146,3 +146,18 @@ export const decryptSymmetricKey = (keys: KeysType): string => {
     hexToBytes(keys.masterKey)
   );
 };
+
+export const changeProtectedSymmetricKey = ({
+  symmetricKey,
+  newMasterKey,
+}: {
+  symmetricKey: string;
+  newMasterKey: string;
+}) => {
+  const protectedSymmetricKey = nip44.v2.encrypt(
+    symmetricKey,
+    hexToBytes(newMasterKey)
+  );
+
+  return protectedSymmetricKey;
+};
diff --git a/src/utils/routes.ts b/src/utils/routes.ts
index 3732ab7e..87a76e0f 100644
--- a/src/utils/routes.ts
+++ b/src/utils/routes.ts
@@ -3,6 +3,7 @@ export const ROUTES = {
   signup: '/sign-up',
   login: '/login',
   dashboard: '/dashboard',
+  settings: '/settings',
   wallet: {
     home: '/wallet',
     settings: (id: string) => `/wallet/${id}/settings`,
diff --git a/src/views/settings/ChangePassword.tsx b/src/views/settings/ChangePassword.tsx
new file mode 100644
index 00000000..ba859b32
--- /dev/null
+++ b/src/views/settings/ChangePassword.tsx
@@ -0,0 +1,432 @@
+'use client';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { generateMnemonic } from '@scure/bip39';
+import { wordlist } from '@scure/bip39/wordlists/english';
+import stringEntropy from 'fast-password-entropy';
+import { Copy, CopyCheck, Eye, EyeOff, Loader2 } from 'lucide-react';
+import { useEffect, useRef, useState } from 'react';
+import { useForm } from 'react-hook-form';
+import { useCopyToClipboard } from 'usehooks-ts';
+import { z } from 'zod';
+
+import { Badge } from '@/components/ui/badge';
+import { Button } from '@/components/ui/button';
+import { Checkbox } from '@/components/ui/checkbox';
+import {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@/components/ui/dialog';
+import {
+  Form,
+  FormControl,
+  FormDescription,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@/components/ui/form';
+import { Input } from '@/components/ui/input';
+import { Progress } from '@/components/ui/progress';
+import { useToast } from '@/components/ui/use-toast';
+import { useChangePasswordMutation } from '@/graphql/mutations/__generated__/changePassword.generated';
+import { useLogoutMutation } from '@/graphql/mutations/__generated__/logout.generated';
+import { useUserQuery } from '@/graphql/queries/__generated__/user.generated';
+import { handleApolloError } from '@/utils/error';
+import { ROUTES } from '@/utils/routes';
+import { WorkerMessage, WorkerResponse } from '@/workers/account/types';
+
+import { Section } from './Section';
+
+const FormSchema = z
+  .object({
+    current_password: z
+      .string()
+      .min(8, { message: 'Valid password required.' }),
+    new_password: z.string(),
+    confirm_password: z.string(),
+    password_hint: z.string().optional(),
+    accept_condition_1: z.boolean(),
+  })
+  .refine(data => stringEntropy(data.new_password) >= 90, {
+    message: 'Password is weak.',
+    path: ['new_password'],
+  })
+  .refine(data => data.new_password === data.confirm_password, {
+    message: "Passwords don't match.",
+    path: ['confirm_password'],
+  })
+  .refine(data => !!data.accept_condition_1, {
+    message: 'You must accept to proceed.',
+    path: ['accept_condition_1'],
+  });
+
+export const ChangePassword = () => {
+  const [open, setOpen] = useState(false);
+
+  const workerRef = useRef<Worker>();
+  const { data } = useUserQuery({ errorPolicy: 'ignore' });
+
+  const { toast } = useToast();
+
+  const [loading, setLoading] = useState(false);
+  const [clickedGenerate, setClickedGenerate] = useState(false);
+  const [showPassword, setShowPassword] = useState(false);
+
+  const [copiedPassword, copyPassword] = useCopyToClipboard();
+
+  const form = useForm<z.infer<typeof FormSchema>>({
+    reValidateMode: 'onChange',
+    resolver: zodResolver(FormSchema),
+    defaultValues: {
+      current_password: '',
+      new_password: '',
+      confirm_password: '',
+      password_hint: '',
+      accept_condition_1: false,
+    },
+  });
+
+  const password = form.watch('new_password', '');
+
+  const entropy = stringEntropy(password);
+
+  const handleGenerateClick = () => {
+    const mnemonic = generateMnemonic(wordlist);
+    form.setValue('new_password', mnemonic);
+    form.setValue('confirm_password', mnemonic);
+    setClickedGenerate(true);
+  };
+
+  const [changePassword] = useChangePasswordMutation({
+    onCompleted: () => {
+      toast({
+        title: 'Password changed!',
+        description: `You will now be logged out.`,
+      });
+
+      setTimeout(() => logout(), 2100);
+    },
+    onError: error => {
+      const messages = handleApolloError(error);
+
+      toast({
+        variant: 'destructive',
+        title: 'Could not change password.',
+        description: messages.join(', '),
+      });
+
+      setLoading(false);
+    },
+  });
+
+  const [logout] = useLogoutMutation({
+    onCompleted: () => {
+      window.location.href = ROUTES.login;
+    },
+    onError: error => {
+      const messages = handleApolloError(error);
+
+      toast({
+        variant: 'destructive',
+        title: 'Error logging out.',
+        description: messages.join(', '),
+      });
+
+      window.location.reload();
+    },
+  });
+
+  const onSubmit = async (values: z.infer<typeof FormSchema>) => {
+    setLoading(true);
+
+    if (
+      !data?.user.email ||
+      !data.user.protected_symmetric_key ||
+      !workerRef.current
+    ) {
+      setLoading(false);
+      return;
+    }
+
+    const message: WorkerMessage = {
+      type: 'changePassword',
+      payload: {
+        email: data.user.email,
+        currentPassword: values.current_password,
+        newPassword: values.new_password,
+        newPasswordHint: values.password_hint,
+        currentProtectedSymmetricKey: data.user.protected_symmetric_key,
+      },
+    };
+
+    workerRef.current.postMessage(message);
+  };
+
+  useEffect(() => {
+    workerRef.current = new Worker(
+      new URL('../../workers/account/account.ts', import.meta.url)
+    );
+
+    workerRef.current.onmessage = async event => {
+      const message: WorkerResponse = event.data;
+
+      switch (message.type) {
+        case 'changePassword': {
+          changePassword({
+            variables: {
+              input: {
+                current_master_password_hash:
+                  message.payload.currentMasterKeyHash,
+                new_master_password_hash: message.payload.newMasterKeyHash,
+                new_password_hint: message.payload.newPasswordHint,
+                new_protected_symmetric_key:
+                  message.payload.newProtectedSymmetricKey,
+              },
+            },
+          });
+
+          break;
+        }
+
+        case 'error': {
+          if (message.msg === 'invalid MAC') {
+            toast({
+              variant: 'destructive',
+              title: 'Could not change password.',
+              description: 'Invalid current password.',
+            });
+          } else {
+            toast({
+              variant: 'destructive',
+              title: 'Could not change password.',
+              description: message.msg,
+            });
+          }
+
+          setLoading(false);
+
+          break;
+        }
+      }
+    };
+
+    workerRef.current.onerror = error => {
+      console.error('Worker error:', error);
+      setLoading(false);
+    };
+
+    return () => {
+      if (workerRef.current) workerRef.current.terminate();
+    };
+  }, [changePassword, toast]);
+
+  return (
+    <Section
+      title="Change Password"
+      description="You can change your Master Password used to protect your funds and messages."
+    >
+      <Dialog
+        open={open}
+        onOpenChange={() => {
+          if (loading) return;
+
+          setOpen(o => !o);
+
+          if (!open) {
+            form.reset();
+            setClickedGenerate(false);
+            setShowPassword(false);
+          }
+        }}
+      >
+        <DialogTrigger asChild>
+          <Button className="w-full md:w-fit">Change Password</Button>
+        </DialogTrigger>
+
+        <DialogContent className="sm:max-w-md">
+          <DialogHeader>
+            <DialogTitle>Change your password</DialogTitle>
+            <DialogDescription>
+              This will change the Master Password used to protect your funds
+              and messages.
+            </DialogDescription>
+          </DialogHeader>
+
+          <Form {...form}>
+            <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
+              <FormField
+                control={form.control}
+                name="current_password"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Current Master Password</FormLabel>
+                    <FormControl>
+                      <Input
+                        placeholder="Enter your current password"
+                        type="password"
+                        disabled={loading}
+                        {...field}
+                      />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+
+              <FormField
+                control={form.control}
+                name="new_password"
+                render={({ field }) => (
+                  <FormItem>
+                    <div className="flex w-full items-center justify-between">
+                      <FormLabel>New Master Password</FormLabel>
+                      <button
+                        type="button"
+                        onClick={handleGenerateClick}
+                        disabled={loading}
+                      >
+                        <Badge variant={'secondary'}>
+                          Generate Strong Password
+                        </Badge>
+                      </button>
+                    </div>
+                    <FormControl>
+                      <div className="flex gap-2">
+                        <Input
+                          placeholder="Super secret password"
+                          type={showPassword ? undefined : 'password'}
+                          disabled={loading}
+                          {...field}
+                        />
+                        <Button
+                          type="button"
+                          onClick={() => setShowPassword(p => !p)}
+                          size={'icon'}
+                          className="px-2"
+                          variant={'outline'}
+                        >
+                          {showPassword ? (
+                            <EyeOff className="size-4" />
+                          ) : (
+                            <Eye className="size-4" />
+                          )}
+                        </Button>
+                        {clickedGenerate ? (
+                          <Button
+                            type="button"
+                            onClick={() => copyPassword(password)}
+                            size={'icon'}
+                            className="px-2"
+                            variant={'outline'}
+                          >
+                            {copiedPassword ? (
+                              <CopyCheck color="green" className="size-4" />
+                            ) : (
+                              <Copy className="size-4" />
+                            )}
+                          </Button>
+                        ) : null}
+                      </div>
+                    </FormControl>
+                    <FormMessage />
+                    <Progress value={Math.min(100, (entropy || 0) / 2)} />
+                    <FormDescription>
+                      <strong>Important: </strong>
+                      Your account cannot be recovered if you forget it!
+                    </FormDescription>
+                  </FormItem>
+                )}
+              />
+
+              <FormField
+                control={form.control}
+                name="confirm_password"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Confirm New Master Password</FormLabel>
+                    <FormControl>
+                      <Input
+                        placeholder="Super secret password"
+                        type="password"
+                        disabled={loading}
+                        {...field}
+                      />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+
+              <FormField
+                control={form.control}
+                name="password_hint"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Master Password Hint</FormLabel>
+                    <FormControl>
+                      <Input
+                        placeholder="Hint to remember your password"
+                        autoComplete="off"
+                        disabled={loading}
+                        {...field}
+                      />
+                    </FormControl>
+                    <FormMessage />
+                    <FormDescription>
+                      <strong>Important: </strong>
+                      The password hint will be stored in clear text.
+                    </FormDescription>
+                  </FormItem>
+                )}
+              />
+
+              <FormField
+                control={form.control}
+                name="accept_condition_1"
+                render={({ field }) => (
+                  <FormItem className="flex flex-row items-start space-x-3 space-y-0 pb-4">
+                    <FormControl>
+                      <Checkbox
+                        checked={field.value}
+                        onCheckedChange={field.onChange}
+                        disabled={loading}
+                      />
+                    </FormControl>
+                    <div className="flex flex-col gap-2">
+                      <FormLabel>
+                        I understand that if I forget the password
+                        <strong> my account cannot be recovered.</strong>
+                      </FormLabel>
+                      <FormMessage />
+                    </div>
+                  </FormItem>
+                )}
+              />
+
+              <DialogFooter className="gap-2 sm:justify-center">
+                <Button type="submit" className="w-full" disabled={loading}>
+                  {loading ? (
+                    <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+                  ) : null}
+                  Change
+                </Button>
+                <DialogClose asChild>
+                  <Button type="button" variant="secondary" className="w-full">
+                    Close
+                  </Button>
+                </DialogClose>
+              </DialogFooter>
+            </form>
+          </Form>
+        </DialogContent>
+      </Dialog>
+    </Section>
+  );
+};
diff --git a/src/views/settings/Section.tsx b/src/views/settings/Section.tsx
new file mode 100644
index 00000000..fa52db44
--- /dev/null
+++ b/src/views/settings/Section.tsx
@@ -0,0 +1,20 @@
+import { FC, ReactNode } from 'react';
+
+export const Section: FC<{
+  title: string | ReactNode;
+  description: string | ReactNode;
+  children: ReactNode;
+}> = ({ title, description, children }) => {
+  return (
+    <div className="flex flex-col gap-0 md:grid md:grid-cols-[40%_60%]">
+      <div className="mb-4 md:mb-0 md:mr-4">
+        <h3 className="font-semibold leading-none tracking-tight">{title}</h3>
+        <p className="mt-2 max-w-80 text-sm text-muted-foreground">
+          {description}
+        </p>
+      </div>
+
+      <div className="flex flex-col gap-2">{children}</div>
+    </div>
+  );
+};
diff --git a/src/views/settings/Settings.tsx b/src/views/settings/Settings.tsx
new file mode 100644
index 00000000..88b0a5e1
--- /dev/null
+++ b/src/views/settings/Settings.tsx
@@ -0,0 +1,17 @@
+import { useTranslations } from 'next-intl';
+
+import { ChangePassword } from './ChangePassword';
+
+export const Settings = () => {
+  const t = useTranslations('Index');
+
+  return (
+    <div>
+      <h1 className="my-2 text-xl font-semibold">{t('settings')}</h1>
+
+      <div className="flex max-w-screen-lg flex-col gap-10 pt-4 md:gap-16">
+        <ChangePassword />
+      </div>
+    </div>
+  );
+};
diff --git a/src/views/wallet/Settings.tsx b/src/views/wallet/Settings.tsx
index 48f9d151..5f2f84cb 100644
--- a/src/views/wallet/Settings.tsx
+++ b/src/views/wallet/Settings.tsx
@@ -1,7 +1,7 @@
 'use client';
 
 import { Copy, CopyCheck, Loader2 } from 'lucide-react';
-import { FC, ReactNode, useEffect, useRef, useState } from 'react';
+import { FC, useEffect, useRef, useState } from 'react';
 import { useCopyToClipboard } from 'usehooks-ts';
 
 import { VaultButton } from '@/components/button/VaultButton';
@@ -18,24 +18,7 @@ import {
   CryptoWorkerResponse,
 } from '@/workers/crypto/types';
 
-const Section: FC<{
-  title: string | ReactNode;
-  description: string | ReactNode;
-  children: ReactNode;
-}> = ({ title, description, children }) => {
-  return (
-    <div className="flex flex-col gap-0 md:grid md:grid-cols-[40%_60%]">
-      <div className="mb-4 md:mb-0 md:mr-4">
-        <h3 className="font-semibold leading-none tracking-tight">{title}</h3>
-        <p className="mt-2 max-w-80 text-sm text-muted-foreground">
-          {description}
-        </p>
-      </div>
-
-      <div className="flex flex-col gap-2">{children}</div>
-    </div>
-  );
-};
+import { Section } from '../settings/Section';
 
 const WalletName: FC<{ walletId: string }> = ({ walletId }) => {
   const { toast } = useToast();
diff --git a/src/workers/account/account.ts b/src/workers/account/account.ts
index ba801a54..0613a482 100644
--- a/src/workers/account/account.ts
+++ b/src/workers/account/account.ts
@@ -1,5 +1,7 @@
 import {
+  changeProtectedSymmetricKey,
   createProtectedSymmetricKey,
+  decryptSymmetricKey,
   generateMasterKeyAndHash,
   secp256k1GenerateProtectedKeyPair,
 } from '@/utils/crypto';
@@ -78,7 +80,56 @@ self.onmessage = async e => {
 
         const response: WorkerResponse = {
           type: 'generateMaster',
-          payload: { ...result, protectedSymmetricKey },
+          payload: {
+            ...result,
+            protectedSymmetricKey,
+          },
+        };
+
+        self.postMessage(response);
+
+        break;
+      }
+
+      case 'changePassword': {
+        const {
+          payload: {
+            email,
+            currentPassword,
+            newPassword,
+            newPasswordHint,
+            currentProtectedSymmetricKey,
+          },
+        } = message;
+
+        const current = await generateMasterKeyAndHash({
+          email,
+          password: currentPassword,
+        });
+
+        const symmetricKey = decryptSymmetricKey({
+          protectedSymmetricKey: currentProtectedSymmetricKey,
+          masterKey: current.masterKey,
+        });
+
+        const result = await generateMasterKeyAndHash({
+          email,
+          password: newPassword,
+        });
+
+        const newProtectedSymmetricKey = changeProtectedSymmetricKey({
+          symmetricKey,
+          newMasterKey: result.masterKey,
+        });
+
+        const response: WorkerResponse = {
+          type: 'changePassword',
+          payload: {
+            currentMasterKeyHash: current.masterPasswordHash,
+            newMasterKeyHash: result.masterPasswordHash,
+            newProtectedSymmetricKey,
+            newPasswordHint,
+          },
         };
 
         self.postMessage(response);
diff --git a/src/workers/account/types.ts b/src/workers/account/types.ts
index 9e48ce03..14765a02 100644
--- a/src/workers/account/types.ts
+++ b/src/workers/account/types.ts
@@ -19,6 +19,16 @@ export type WorkerMessage =
         password: string;
         protectedSymmetricKey: string;
       };
+    }
+  | {
+      type: 'changePassword';
+      payload: {
+        email: string;
+        currentPassword: string;
+        newPassword: string;
+        newPasswordHint?: string;
+        currentProtectedSymmetricKey: string;
+      };
     };
 
 export type CreateAccountResult = {
@@ -47,5 +57,14 @@ export type WorkerResponse =
         protectedSymmetricKey: string;
       };
     }
+  | {
+      type: 'changePassword';
+      payload: {
+        currentMasterKeyHash: string;
+        newMasterKeyHash: string;
+        newProtectedSymmetricKey: string;
+        newPasswordHint?: string;
+      };
+    }
   | { type: 'loaded' }
   | { type: 'error'; msg: string };