diff --git a/src/app/assets/svg/upload.svg b/src/app/assets/svg/upload.svg
index 4c6020c39e..dda92ba7d5 100644
--- a/src/app/assets/svg/upload.svg
+++ b/src/app/assets/svg/upload.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 14 17"><defs><path id="a" d="M0 0h14v17H0z"/></defs><clipPath id="b"><use xlink:href="#a" overflow="visible"/></clipPath><g clip-path="url(#b)"><path d="M1.5 16c-.3 0-.5-.2-.5-.5v-1c0-.3.2-.5.5-.5h11c.3 0 .5.2.5.5v1c0 .3-.2.5-.5.5h-11zm5-4c-.3 0-.5-.2-.5-.5V4L4.2 5.6c-.2.2-.5.1-.6 0L3 4.9c-.2-.2-.1-.5 0-.6l3.6-3.2c.2-.2.4-.2.6 0l3.6 3.2c.2.2.2.5 0 .6l-.6.7c-.2.2-.4.2-.6 0L7.8 4v7.5c0 .3-.2.5-.5.5h-.8z" fill="#007dff"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 14 17" fill="currentColor"><defs><path id="a" d="M0 0h14v17H0z"/></defs><clipPath id="b"><use xlink:href="#a" overflow="visible"/></clipPath><g clip-path="url(#b)"><path d="M1.5 16c-.3 0-.5-.2-.5-.5v-1c0-.3.2-.5.5-.5h11c.3 0 .5.2.5.5v1c0 .3-.2.5-.5.5h-11zm5-4c-.3 0-.5-.2-.5-.5V4L4.2 5.6c-.2.2-.5.1-.6 0L3 4.9c-.2-.2-.1-.5 0-.6l3.6-3.2c.2-.2.4-.2.6 0l3.6 3.2c.2.2.2.5 0 .6l-.6.7c-.2.2-.4.2-.6 0L7.8 4v7.5c0 .3-.2.5-.5.5h-.8z"/></g></svg>
\ No newline at end of file
diff --git a/src/app/components/SelectProfileImage/SelectProfileImage.tsx b/src/app/components/SelectProfileImage/SelectProfileImage.tsx
old mode 100644
new mode 100755
index c2548b2797..6a4f25e266
--- a/src/app/components/SelectProfileImage/SelectProfileImage.tsx
+++ b/src/app/components/SelectProfileImage/SelectProfileImage.tsx
@@ -1,3 +1,4 @@
+import Tippy from "@tippyjs/react";
 import { Button } from "app/components/Button";
 import { Icon } from "app/components/Icon";
 import React, { useMemo } from "react";
@@ -6,23 +7,34 @@ import tw, { styled } from "twin.macro";
 import { openFile } from "utils/electron-utils";
 
 type SelectProfileImageProps = {
+	className?: string;
 	value?: string;
 	name?: string;
+	showLabel?: boolean;
 	onSelect: (raw: string) => void;
 };
 
 const ProfileImageStyled = styled.div`
 	& {
-		${tw`relative inline-flex items-center justify-center overflow-hidden rounded`};
+		${tw`relative inline-flex items-center justify-center overflow-hidden rounded cursor-pointer`};
 	}
+
 	&:after {
 		content: "";
-		box-shadow: 0px 0px 0px 100px rgba(0, 0, 0, 0.4);
-		${tw`absolute w-22 h-22 left-1 top-1 rounded-full`};
+		box-shadow: 0 0 0 100px rgba(0, 0, 0, 0.4);
+		${tw`absolute rounded-full w-22 h-22 left-1 top-1`};
+	}
+
+	&:hover .upload-button-overlay {
+		${tw`block`};
+
+		div {
+			background-color: rgba(0, 0, 0, 0.7);
+		}
 	}
 `;
 
-export const SelectProfileImage = ({ value, name, onSelect }: SelectProfileImageProps) => {
+export const SelectProfileImage = ({ className, value, name, showLabel, onSelect }: SelectProfileImageProps) => {
 	const { t } = useTranslation();
 
 	const handleUploadImage = async () => {
@@ -39,52 +51,76 @@ export const SelectProfileImage = ({ value, name, onSelect }: SelectProfileImage
 	const isSvg = useMemo(() => value && value.endsWith("</svg>"), [value]);
 
 	return (
-		<div className="group">
-			<span className="text-sm font-semibold transition-colors duration-100 group-hover:text-theme-primary text-theme-neutral-dark">
-				{t("SETTINGS.GENERAL.PERSONAL.PROFILE_IMAGE")}
-			</span>
+		<div className={`group ${className}`}>
+			{showLabel && (
+				<span className="text-sm font-semibold transition-colors duration-100 group-hover:text-theme-primary text-theme-neutral-dark">
+					{t("SETTINGS.GENERAL.PERSONAL.PROFILE_IMAGE")}
+				</span>
+			)}
 
 			<div className="flex flex-row mt-2">
-				<div className="flex items-center justify-center w-24 h-24 mr-6 border-2 border-dashed rounded border-theme-primary-contrast">
-					<div className="overflow-hidden rounded-full w-22 h-22">
-						<Button
-							className="w-22 h-22"
-							variant="plain"
-							onClick={handleUploadImage}
-							data-testid="SelectProfileImage__upload-button"
-						>
-							<Icon name="Upload" />
-						</Button>
-					</div>
-				</div>
-				{value && (
+				{!value ? (
+					<Tippy content={t("SETTINGS.GENERAL.PERSONAL.UPLOAD_AVATAR")}>
+						<div className="flex items-center justify-center w-24 h-24 border-2 border-dashed rounded border-theme-primary-contrast">
+							<div className="overflow-hidden rounded-full w-22 h-22">
+								<Button
+									className="w-22 h-22"
+									variant="plain"
+									onClick={handleUploadImage}
+									data-testid="SelectProfileImage__upload-button"
+								>
+									<Icon name="Upload" className="text-theme-primary" />
+								</Button>
+							</div>
+						</div>
+					</Tippy>
+				) : (
 					<div className="relative w-24 h-24 rounded bg-theme-neutral-contrast">
-						<ProfileImageStyled>
-							<img
-								src={isSvg ? `data:image/svg+xml;utf8,${value}` : value}
-								className="object-cover w-24 h-24 bg-center bg-no-repeat bg-cover rounded"
-								alt="Profile avatar"
-							/>
-							{isSvg && (
-								<span className="absolute text-2xl font-semibold text-theme-background">
-									{name?.slice(0, 2).toUpperCase()}
-								</span>
-							)}
-						</ProfileImageStyled>
-						<Button
-							data-testid="SelectProfileImage__remove-button"
-							size="icon"
-							color="danger"
-							variant="plain"
-							className="absolute flex items-center justify-center w-6 h-6 p-1 -top-3 -right-3"
-							onClick={() => onSelect("")}
-							disabled={!!isSvg}
-						>
-							<Icon name="Close" width={12} height={12} />
-						</Button>
+						<Tippy content={t("SETTINGS.GENERAL.PERSONAL.UPLOAD_AVATAR")}>
+							<ProfileImageStyled>
+								<img
+									src={isSvg ? `data:image/svg+xml;utf8,${value}` : value}
+									className="object-cover w-24 h-24 bg-center bg-no-repeat bg-cover rounded"
+									alt="Profile avatar"
+								/>
+								{isSvg && (
+									<span className="absolute text-2xl font-semibold text-theme-background">
+										{name?.slice(0, 2).toUpperCase()}
+									</span>
+								)}
+
+								<div
+									className="absolute z-50 hidden overflow-hidden rounded-full upload-button-overlay w-22 h-22"
+									onClick={handleUploadImage}
+									data-testid="SelectProfileImage__upload-button"
+								>
+									<div className="flex items-center justify-center w-22 h-22">
+										<Icon name="Upload" className="text-white" />
+									</div>
+								</div>
+							</ProfileImageStyled>
+						</Tippy>
+						{!isSvg && (
+							<Tippy content={t("SETTINGS.GENERAL.PERSONAL.DELETE_AVATAR")}>
+								<Button
+									size="icon"
+									color="danger"
+									variant="plain"
+									className="absolute flex items-center justify-center w-6 h-6 p-1 -top-3 -right-3"
+									onClick={() => onSelect("")}
+									data-testid="SelectProfileImage__remove-button"
+								>
+									<Icon name="Close" width={12} height={12} />
+								</Button>
+							</Tippy>
+						)}
 					</div>
 				)}
 			</div>
 		</div>
 	);
 };
+
+SelectProfileImage.defaultProps = {
+	showLabel: true,
+};
diff --git a/src/app/components/SelectProfileImage/__snapshots__/SelectProfileImage.test.tsx.snap b/src/app/components/SelectProfileImage/__snapshots__/SelectProfileImage.test.tsx.snap
index 1cb2529f76..9a79d3d36f 100644
--- a/src/app/components/SelectProfileImage/__snapshots__/SelectProfileImage.test.tsx.snap
+++ b/src/app/components/SelectProfileImage/__snapshots__/SelectProfileImage.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`SelectProfileImage should render 1`] = `
 <div>
   <div
-    class="group"
+    class="group undefined"
   >
     <span
       class="text-sm font-semibold transition-colors duration-100 group-hover:text-theme-primary text-theme-neutral-dark"
@@ -14,7 +14,7 @@ exports[`SelectProfileImage should render 1`] = `
       class="flex flex-row mt-2"
     >
       <div
-        class="flex items-center justify-center w-24 h-24 mr-6 border-2 border-dashed rounded border-theme-primary-contrast"
+        class="flex items-center justify-center w-24 h-24 border-2 border-dashed rounded border-theme-primary-contrast"
       >
         <div
           class="overflow-hidden rounded-full w-22 h-22"
@@ -26,7 +26,7 @@ exports[`SelectProfileImage should render 1`] = `
             type="button"
           >
             <div
-              class="sc-AxirZ iQaTP"
+              class="sc-AxirZ iQaTP text-theme-primary"
               height="1em"
               width="1em"
             >
diff --git a/src/domains/profile/e2e/create-profile-action.e2e.ts b/src/domains/profile/e2e/create-profile-action.e2e.ts
index 776600249b..e5bcc0ac16 100644
--- a/src/domains/profile/e2e/create-profile-action.e2e.ts
+++ b/src/domains/profile/e2e/create-profile-action.e2e.ts
@@ -12,7 +12,7 @@ const nameInput = Selector("input[name=name]");
 test("should return an error when submit without required fields", async (t) => {
 	await t.click(Selector("button").withExactText(translations.PROFILE.CREATE_PROFILE));
 
-	await t.click(Selector("button").withExactText(translations.COMMON.COMPLETE));
+	await t.click(Selector("button").withExactText(translations.COMMON.CREATE));
 	await t.click(Selector("fieldset p").withText("'Name' is required"));
 	await t.click(Selector("fieldset p").withText("'Currency' is required"));
 	await t.click(Selector("h1").withExactText(translations.PROFILE.PAGE_CREATE_PROFILE.TITLE));
@@ -24,12 +24,10 @@ test("should create a profile and navigate to welcome screen", async (t) => {
 	await t.expect(getLocation()).contains("/profiles/create");
 
 	await t.typeText(nameInput, "Anne Doe");
-	await t.click(Selector("button").withText("CryptoCompare"));
-	await t.click(Selector("li.select-list-option").withText("CoinGecko"));
 	await t.click(Selector("button").withText("Select Currency"));
 	await t.click(Selector("li.select-list-option").withText("ETH"));
 	await t.click(Selector("input[name=isDarkMode]").parent());
-	await t.click(Selector("button").withExactText(translations.COMMON.COMPLETE));
+	await t.click(Selector("button").withExactText(translations.COMMON.CREATE));
 
 	await t.wait(1000); // TODO: the profile loading is async so we need to give it a moment
 
@@ -46,12 +44,10 @@ test("should create a profile with password and navigate to welcome screen", asy
 
 	await t.typeText(nameInput, "Joe Bloggs");
 	await t.typeText(Selector("input[name=password]"), "password");
-	await t.click(Selector("button").withText("CryptoCompare"));
-	await t.click(Selector("li.select-list-option").withText("CoinGecko"));
 	await t.click(Selector("button").withText("Select Currency"));
 	await t.click(Selector("li.select-list-option").withText("ETH"));
 	await t.click(Selector("input[name=isDarkMode]").parent());
-	await t.click(Selector("button").withExactText(translations.COMMON.COMPLETE));
+	await t.click(Selector("button").withExactText(translations.COMMON.CREATE));
 
 	await t.wait(1000); // TODO: the profile loading is async so we need to give it a moment
 
diff --git a/src/domains/profile/i18n.ts b/src/domains/profile/i18n.ts
index b177e84015..57d2f055b7 100644
--- a/src/domains/profile/i18n.ts
+++ b/src/domains/profile/i18n.ts
@@ -45,6 +45,7 @@ export const translations: { [key: string]: any } = {
 	PAGE_CREATE_PROFILE: {
 		TITLE: "Create Profile",
 		DESCRIPTION: "Sign in via MarketSquare or create a new Profile below.",
+		NEW_PROFILE: "New Profile",
 		VALIDATION: {
 			MAXLENGTH_ERROR: "The Name should have less than {{maxLength}} characters",
 		},
diff --git a/src/domains/profile/pages/CreateProfile/CreateProfile.test.tsx b/src/domains/profile/pages/CreateProfile/CreateProfile.test.tsx
old mode 100644
new mode 100755
index 63413b3f33..0b0b5ed9c4
--- a/src/domains/profile/pages/CreateProfile/CreateProfile.test.tsx
+++ b/src/domains/profile/pages/CreateProfile/CreateProfile.test.tsx
@@ -38,7 +38,7 @@ const baseSettings = {
 	EXCHANGE_CURRENCY: "BTC",
 	LEDGER_UPDATE_METHOD: false,
 	LOCALE: "en-US",
-	MARKET_PROVIDER: "coincap",
+	MARKET_PROVIDER: "cryptocompare",
 	NAME: "test profile",
 	SCREENSHOT_PROTECTION: true,
 	THEME: "light",
@@ -97,8 +97,6 @@ describe("CreateProfile", () => {
 		fireEvent.input(getAllByTestId("Input")[0], { target: { value: "test profile" } });
 		fireEvent.click(getAllByTestId("select-list__toggle-button")[0]);
 		fireEvent.click(getByTestId("select-list__toggle-option-0"));
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[1]);
-		fireEvent.click(getByTestId("select-list__toggle-option-0"));
 
 		await act(async () => {
 			fireEvent.click(getByTestId("CreateProfile__submit-button"));
@@ -135,7 +133,7 @@ describe("CreateProfile", () => {
 	});
 
 	it("should store profile with password", async () => {
-		const { asFragment, container, getAllByTestId, getByTestId } = renderWithRouter(
+		const { asFragment, getAllByTestId, getByTestId } = renderWithRouter(
 			<EnvironmentProvider env={env}>
 				<CreateProfile />
 			</EnvironmentProvider>,
@@ -149,8 +147,6 @@ describe("CreateProfile", () => {
 		fireEvent.input(getAllByTestId("Input")[1], { target: { value: "test password" } });
 		fireEvent.click(getAllByTestId("select-list__toggle-button")[0]);
 		fireEvent.click(getByTestId("select-list__toggle-option-0"));
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[1]);
-		fireEvent.click(getByTestId("select-list__toggle-option-0"));
 
 		await act(async () => {
 			fireEvent.click(getByTestId("CreateProfile__submit-button"));
@@ -186,8 +182,6 @@ describe("CreateProfile", () => {
 		fireEvent.input(getAllByTestId("Input")[0], { target: { value: "test profile" } });
 		fireEvent.click(getAllByTestId("select-list__toggle-button")[0]);
 		fireEvent.click(getByTestId("select-list__toggle-option-0"));
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[1]);
-		fireEvent.click(getByTestId("select-list__toggle-option-0"));
 
 		await act(async () => {
 			fireEvent.click(getByTestId("CreateProfile__submit-button"));
@@ -226,8 +220,6 @@ describe("CreateProfile", () => {
 		fireEvent.input(getAllByTestId("Input")[0], { target: { value: "test profile" } });
 		fireEvent.click(getAllByTestId("select-list__toggle-button")[0]);
 		fireEvent.click(getByTestId("select-list__toggle-option-0"));
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[1]);
-		fireEvent.click(getByTestId("select-list__toggle-option-0"));
 
 		await act(async () => {
 			fireEvent.click(getByTestId("CreateProfile__submit-button"));
diff --git a/src/domains/profile/pages/CreateProfile/CreateProfile.tsx b/src/domains/profile/pages/CreateProfile/CreateProfile.tsx
index 82fc382069..8d00feb112 100755
--- a/src/domains/profile/pages/CreateProfile/CreateProfile.tsx
+++ b/src/domains/profile/pages/CreateProfile/CreateProfile.tsx
@@ -43,18 +43,18 @@ export const CreateProfile = () => {
 		{
 			isFloatingLabel: true,
 			label: t("SETTINGS.GENERAL.OTHER.DARK_THEME.TITLE"),
-			labelClass: "text-lg font-semibold text-theme-neutral-dark",
+			labelClass: "text-xl font-semibold",
 			labelDescription: t("SETTINGS.GENERAL.OTHER.DARK_THEME.DESCRIPTION"),
 			labelAddon: <Toggle ref={register()} name="isDarkMode" />,
 		},
 	];
 
-	const handleSubmit = async ({ name, password, currency, isDarkMode, marketProvider }: any) => {
+	const handleSubmit = async ({ name, password, currency, isDarkMode }: any) => {
 		const formattedName = name.substring(0, nameMaxLength);
 
 		const profile = env.profiles().create(formattedName);
 
-		profile.settings().set(ProfileSetting.MarketProvider, marketProvider);
+		profile.settings().set(ProfileSetting.MarketProvider, "cryptocompare");
 		profile.settings().set(ProfileSetting.ExchangeCurrency, currency);
 		profile.settings().set(ProfileSetting.Theme, isDarkMode ? "dark" : "light");
 
@@ -74,11 +74,11 @@ export const CreateProfile = () => {
 	return (
 		<Page navbarVariant="logo-only" title={t("COMMON.DESKTOP_WALLET")}>
 			<Section className="flex flex-col justify-center flex-1">
-				<div className="max-w-lg mx-auto">
+				<div className="max-w-lg mx-auto -mt-10">
 					<h1 className="mb-0 md:text-4xl">{t("PROFILE.PAGE_CREATE_PROFILE.TITLE")}</h1>
 					<div className="text-theme-neutral-dark">{t("PROFILE.PAGE_CREATE_PROFILE.DESCRIPTION")}</div>
 
-					<div className="pb-4 mt-8">
+					<div className="mt-8">
 						<Tippy content={t("COMMON.COMING_SOON")}>
 							<div>
 								<Button className="w-full" disabled>
@@ -89,33 +89,44 @@ export const CreateProfile = () => {
 						</Tippy>
 					</div>
 
-					<Divider />
-
-					<Form context={form} onSubmit={handleSubmit} data-testid="CreateProfile__form">
-						<div className="mt-8">
-							<h2>{t("SETTINGS.GENERAL.PERSONAL.TITLE")}</h2>
-
-							<SelectProfileImage value={avatarImage} name={name} onSelect={setAvatarImage} />
+					<Form
+						className="px-10 pt-8 pb-10 mt-10 space-y-4 border rounded-lg bg-theme-background border-theme-neutral-200"
+						context={form}
+						onSubmit={handleSubmit}
+						data-testid="CreateProfile__form"
+					>
+						<div className="mt-2">
+							<h3>{t("PROFILE.PAGE_CREATE_PROFILE.NEW_PROFILE")}</h3>
 
 							<div className="relative mt-8 space-y-8">
-								<FormField name="name">
-									<FormLabel label={t("SETTINGS.GENERAL.PERSONAL.NAME")} />
-									<Input
-										ref={register({
-											required: t("COMMON.VALIDATION.FIELD_REQUIRED", {
-												field: t("SETTINGS.GENERAL.PERSONAL.NAME"),
-											}).toString(),
-											maxLength: {
-												value: nameMaxLength,
-												message: t("COMMON.VALIDATION.MAX_LENGTH", {
+								<div className="flex justify-between">
+									<FormField name="name" className="w-full mr-6">
+										<FormLabel label={t("SETTINGS.GENERAL.PERSONAL.NAME")} />
+										<Input
+											ref={register({
+												required: t("COMMON.VALIDATION.FIELD_REQUIRED", {
 													field: t("SETTINGS.GENERAL.PERSONAL.NAME"),
-													maxLength: nameMaxLength,
-												}),
-											},
-										})}
+												}).toString(),
+												maxLength: {
+													value: nameMaxLength,
+													message: t("COMMON.VALIDATION.MAX_LENGTH", {
+														field: t("SETTINGS.GENERAL.PERSONAL.NAME"),
+														maxLength: nameMaxLength,
+													}),
+												},
+											})}
+										/>
+										<FormHelperText />
+									</FormField>
+
+									<SelectProfileImage
+										className="-mt-6"
+										value={avatarImage}
+										name={name}
+										showLabel={false}
+										onSelect={setAvatarImage}
 									/>
-									<FormHelperText />
-								</FormField>
+								</div>
 
 								<FormField name="password">
 									<FormLabel
@@ -137,23 +148,6 @@ export const CreateProfile = () => {
 									<FormHelperText />
 								</FormField>
 
-								<FormField name="marketProvider">
-									<FormLabel label={t("SETTINGS.GENERAL.PERSONAL.MARKET_PROVIDER")} />
-									<Select
-										placeholder={t("COMMON.SELECT_OPTION", {
-											option: t("SETTINGS.GENERAL.PERSONAL.MARKET_PROVIDER"),
-										})}
-										ref={register({
-											required: t("COMMON.VALIDATION.FIELD_REQUIRED", {
-												field: t("SETTINGS.GENERAL.PERSONAL.MARKET_PROVIDER"),
-											}).toString(),
-										})}
-										options={PlatformSdkChoices.marketProviders}
-										defaultValue="cryptocompare"
-									/>
-									<FormHelperText />
-								</FormField>
-
 								<FormField name="currency">
 									<FormLabel label={t("SETTINGS.GENERAL.PERSONAL.CURRENCY")} />
 									<Select
@@ -176,21 +170,20 @@ export const CreateProfile = () => {
 								</FormField>
 							</div>
 
-							<div className="mt-8">
-								<h2>{t("SETTINGS.GENERAL.OTHER.TITLE")}</h2>
+							<div className="pb-4 mt-8">
 								<ListDivided items={otherItems} />
 							</div>
 
 							<Divider />
 						</div>
 
-						<div className="flex justify-end mt-8 space-x-3">
+						<div className="flex justify-end pt-4 space-x-3">
 							<Button variant="plain" onClick={() => history.go(-1)}>
 								{t("COMMON.BACK")}
 							</Button>
 
 							<Button type="submit" data-testid="CreateProfile__submit-button">
-								{t("COMMON.COMPLETE")}
+								{t("COMMON.CREATE")}
 							</Button>
 						</div>
 					</Form>
diff --git a/src/domains/profile/pages/CreateProfile/__snapshots__/CreateProfile.test.tsx.snap b/src/domains/profile/pages/CreateProfile/__snapshots__/CreateProfile.test.tsx.snap
index 52a34fe835..36353d0bca 100644
--- a/src/domains/profile/pages/CreateProfile/__snapshots__/CreateProfile.test.tsx.snap
+++ b/src/domains/profile/pages/CreateProfile/__snapshots__/CreateProfile.test.tsx.snap
@@ -46,7 +46,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
           class="container py-16 mx-auto px-14"
         >
           <div
-            class="max-w-lg mx-auto"
+            class="max-w-lg mx-auto -mt-10"
           >
             <h1
               class="mb-0 md:text-4xl"
@@ -59,7 +59,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
               Sign in via MarketSquare or create a new Profile below.
             </div>
             <div
-              class="pb-4 mt-8"
+              class="mt-8"
             >
               <div>
                 <button
@@ -85,115 +85,87 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                 </button>
               </div>
             </div>
-            <div
-              class="sc-AxirZ jjvtQn border-theme-neutral-300"
-              type="horizontal"
-            />
             <form
-              class="space-y-8"
+              class="px-10 pt-8 pb-10 mt-10 space-y-4 border rounded-lg bg-theme-background border-theme-neutral-200"
               data-testid="CreateProfile__form"
             >
               <div
-                class="mt-8"
+                class="mt-2"
               >
-                <h2>
-                  Personal Details
-                </h2>
+                <h3>
+                  New Profile
+                </h3>
                 <div
-                  class="group"
+                  class="relative mt-8 space-y-8"
                 >
-                  <span
-                    class="text-sm font-semibold transition-colors duration-100 group-hover:text-theme-primary text-theme-neutral-dark"
-                  >
-                    Profile Image
-                  </span>
                   <div
-                    class="flex flex-row mt-2"
+                    class="flex justify-between"
                   >
-                    <div
-                      class="flex items-center justify-center w-24 h-24 mr-6 border-2 border-dashed rounded border-theme-primary-contrast"
+                    <fieldset
+                      class="sc-AxiKw iQzisX w-full mr-6"
                     >
-                      <div
-                        class="overflow-hidden rounded-full w-22 h-22"
+                      <label
+                        class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
+                        data-testid="FormLabel"
+                        for="name"
                       >
-                        <button
-                          class="sc-AxjAm fPpool w-22 h-22"
-                          color="primary"
-                          data-testid="SelectProfileImage__upload-button"
-                          type="button"
-                        >
-                          <div
-                            class="sc-AxhCb fxrKLH"
-                            height="1em"
-                            width="1em"
-                          >
-                            <svg>
-                              upload.svg
-                            </svg>
-                          </div>
-                        </button>
-                      </div>
-                    </div>
+                        Name
+                        <div
+                          class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
+                          data-testid="FormLabel__required"
+                        />
+                      </label>
+                      <input
+                        class="sc-AxhUy jqmzti overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 "
+                        data-testid="Input"
+                        name="name"
+                      />
+                    </fieldset>
                     <div
-                      class="relative w-24 h-24 rounded bg-theme-neutral-contrast"
+                      class="group -mt-6"
                     >
                       <div
-                        class="sc-fzoyTs cudiZK"
-                      >
-                        <img
-                          alt="Profile avatar"
-                          class="object-cover w-24 h-24 bg-center bg-no-repeat bg-cover rounded"
-                          src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(139, 195, 74)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"45\\" cx=\\"100\\" cy=\\"50\\" fill=\\"rgb(33, 150, 243)\\"/><circle r=\\"40\\" cx=\\"10\\" cy=\\"70\\" fill=\\"rgb(3, 169, 244)\\"/><circle r=\\"60\\" cx=\\"50\\" cy=\\"60\\" fill=\\"rgb(0, 150, 136)\\"/></svg>"
-                        />
-                        <span
-                          class="absolute text-2xl font-semibold text-theme-background"
-                        >
-                          TE
-                        </span>
-                      </div>
-                      <button
-                        class="sc-AxjAm cUmKa-D absolute flex items-center justify-center w-6 h-6 p-1 -top-3 -right-3"
-                        color="danger"
-                        data-testid="SelectProfileImage__remove-button"
-                        disabled=""
-                        type="button"
+                        class="flex flex-row mt-2"
                       >
                         <div
-                          class="sc-AxhCb koOqYD"
-                          height="12"
-                          width="12"
+                          class="relative w-24 h-24 rounded bg-theme-neutral-contrast"
                         >
-                          <svg>
-                            close.svg
-                          </svg>
+                          <div
+                            class="sc-fzoyTs gznaRo"
+                          >
+                            <img
+                              alt="Profile avatar"
+                              class="object-cover w-24 h-24 bg-center bg-no-repeat bg-cover rounded"
+                              src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(139, 195, 74)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"45\\" cx=\\"100\\" cy=\\"50\\" fill=\\"rgb(33, 150, 243)\\"/><circle r=\\"40\\" cx=\\"10\\" cy=\\"70\\" fill=\\"rgb(3, 169, 244)\\"/><circle r=\\"60\\" cx=\\"50\\" cy=\\"60\\" fill=\\"rgb(0, 150, 136)\\"/></svg>"
+                            />
+                            <span
+                              class="absolute text-2xl font-semibold text-theme-background"
+                            >
+                              TE
+                            </span>
+                            <div
+                              class="absolute z-50 hidden overflow-hidden rounded-full upload-button-overlay w-22 h-22"
+                              data-testid="SelectProfileImage__upload-button"
+                            >
+                              <div
+                                class="flex items-center justify-center w-22 h-22"
+                              >
+                                <div
+                                  class="sc-AxhCb fxrKLH text-white"
+                                  height="1em"
+                                  width="1em"
+                                >
+                                  <svg>
+                                    upload.svg
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
                         </div>
-                      </button>
+                      </div>
                     </div>
                   </div>
-                </div>
-                <div
-                  class="relative mt-8 space-y-8"
-                >
-                  <fieldset
-                    class="sc-AxiKw iQzisX flex flex-col space-y-2"
-                  >
-                    <label
-                      class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
-                      data-testid="FormLabel"
-                      for="name"
-                    >
-                      Name
-                      <div
-                        class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
-                        data-testid="FormLabel__required"
-                      />
-                    </label>
-                    <input
-                      class="sc-AxhUy jqmzti overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 "
-                      data-testid="Input"
-                      name="name"
-                    />
-                  </fieldset>
                   <fieldset
                     class="sc-AxiKw iQzisX flex flex-col space-y-2"
                   >
@@ -241,70 +213,6 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                       </div>
                     </div>
                   </fieldset>
-                  <fieldset
-                    class="sc-AxiKw iQzisX flex flex-col space-y-2"
-                  >
-                    <label
-                      class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
-                      data-testid="FormLabel"
-                      for="marketProvider"
-                    >
-                      Market Provider
-                      <div
-                        class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
-                        data-testid="FormLabel__required"
-                      />
-                    </label>
-                    <div
-                      class="relative w-full"
-                    >
-                      <input
-                        class="sc-AxhUy jqmzti overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 sr-only"
-                        data-testid="select-list__input"
-                        name="marketProvider"
-                        readonly=""
-                        type="text"
-                        value="coincap"
-                      />
-                      <div
-                        class="relative w-full cursor-pointer"
-                      >
-                        <div>
-                          <button
-                            aria-expanded="false"
-                            aria-haspopup="listbox"
-                            aria-labelledby="downshift-77-label downshift-77-toggle-button"
-                            class="sc-fzqARJ jnMeHK  is-selected "
-                            data-testid="select-list__toggle-button"
-                            id="downshift-77-toggle-button"
-                            type="button"
-                          >
-                            CoinCap
-                          </button>
-                          <ul
-                            aria-labelledby="downshift-77-label"
-                            class="sc-fzqNqU izoylg"
-                            id="downshift-77-menu"
-                            role="listbox"
-                            tabindex="-1"
-                          />
-                        </div>
-                        <div
-                          class="sc-AxgMl sc-Axmtr hWILTO w-10 pointer-events-none text-theme-neutral"
-                        >
-                          <div
-                            class="sc-AxhCb jfKWih"
-                            height="5"
-                            width="7"
-                          >
-                            <svg>
-                              caret-down.svg
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </fieldset>
                   <fieldset
                     class="sc-AxiKw iQzisX flex flex-col space-y-2"
                   >
@@ -337,18 +245,18 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                           <button
                             aria-expanded="false"
                             aria-haspopup="listbox"
-                            aria-labelledby="downshift-78-label downshift-78-toggle-button"
+                            aria-labelledby="downshift-36-label downshift-36-toggle-button"
                             class="sc-fzqARJ jnMeHK  is-selected "
                             data-testid="select-list__toggle-button"
-                            id="downshift-78-toggle-button"
+                            id="downshift-36-toggle-button"
                             type="button"
                           >
                             BTC (Ƀ)
                           </button>
                           <ul
-                            aria-labelledby="downshift-78-label"
+                            aria-labelledby="downshift-36-label"
                             class="sc-fzqNqU izoylg"
-                            id="downshift-78-menu"
+                            id="downshift-36-menu"
                             role="listbox"
                             tabindex="-1"
                           />
@@ -371,11 +279,8 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                   </fieldset>
                 </div>
                 <div
-                  class="mt-8"
+                  class="pb-4 mt-8"
                 >
-                  <h2>
-                    Other
-                  </h2>
                   <ul
                     class="sc-fzoiQi fjoJEQ"
                     data-testid="list-divided__items"
@@ -395,7 +300,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                             class="flex items-center justify-between space-x-5"
                           >
                             <span
-                              class="text-lg font-semibold text-theme-neutral-dark"
+                              class="text-xl font-semibold"
                               data-testid="list-divided-item__label"
                             >
                               Dark Theme
@@ -436,7 +341,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                 />
               </div>
               <div
-                class="flex justify-end mt-8 space-x-3"
+                class="flex justify-end pt-4 space-x-3"
               >
                 <button
                   class="sc-AxjAm fPpool"
@@ -451,7 +356,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                   data-testid="CreateProfile__submit-button"
                   type="submit"
                 >
-                  Complete
+                  Create
                 </button>
               </div>
             </form>
@@ -509,7 +414,7 @@ exports[`CreateProfile should render 1`] = `
           class="container py-16 mx-auto px-14"
         >
           <div
-            class="max-w-lg mx-auto"
+            class="max-w-lg mx-auto -mt-10"
           >
             <h1
               class="mb-0 md:text-4xl"
@@ -522,7 +427,7 @@ exports[`CreateProfile should render 1`] = `
               Sign in via MarketSquare or create a new Profile below.
             </div>
             <div
-              class="pb-4 mt-8"
+              class="mt-8"
             >
               <div>
                 <button
@@ -548,80 +453,75 @@ exports[`CreateProfile should render 1`] = `
                 </button>
               </div>
             </div>
-            <div
-              class="sc-AxirZ jjvtQn border-theme-neutral-300"
-              type="horizontal"
-            />
             <form
-              class="space-y-8"
+              class="px-10 pt-8 pb-10 mt-10 space-y-4 border rounded-lg bg-theme-background border-theme-neutral-200"
               data-testid="CreateProfile__form"
             >
               <div
-                class="mt-8"
+                class="mt-2"
               >
-                <h2>
-                  Personal Details
-                </h2>
+                <h3>
+                  New Profile
+                </h3>
                 <div
-                  class="group"
+                  class="relative mt-8 space-y-8"
                 >
-                  <span
-                    class="text-sm font-semibold transition-colors duration-100 group-hover:text-theme-primary text-theme-neutral-dark"
-                  >
-                    Profile Image
-                  </span>
                   <div
-                    class="flex flex-row mt-2"
+                    class="flex justify-between"
                   >
+                    <fieldset
+                      class="sc-AxiKw iQzisX w-full mr-6"
+                    >
+                      <label
+                        class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
+                        data-testid="FormLabel"
+                        for="name"
+                      >
+                        Name
+                        <div
+                          class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
+                          data-testid="FormLabel__required"
+                        />
+                      </label>
+                      <input
+                        class="sc-AxhUy jqmzti overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 "
+                        data-testid="Input"
+                        name="name"
+                      />
+                    </fieldset>
                     <div
-                      class="flex items-center justify-center w-24 h-24 mr-6 border-2 border-dashed rounded border-theme-primary-contrast"
+                      class="group -mt-6"
                     >
                       <div
-                        class="overflow-hidden rounded-full w-22 h-22"
+                        class="flex flex-row mt-2"
                       >
-                        <button
-                          class="sc-AxjAm fPpool w-22 h-22"
-                          color="primary"
-                          data-testid="SelectProfileImage__upload-button"
-                          type="button"
+                        <div
+                          class="flex items-center justify-center w-24 h-24 border-2 border-dashed rounded border-theme-primary-contrast"
                         >
                           <div
-                            class="sc-AxhCb fxrKLH"
-                            height="1em"
-                            width="1em"
+                            class="overflow-hidden rounded-full w-22 h-22"
                           >
-                            <svg>
-                              upload.svg
-                            </svg>
+                            <button
+                              class="sc-AxjAm fPpool w-22 h-22"
+                              color="primary"
+                              data-testid="SelectProfileImage__upload-button"
+                              type="button"
+                            >
+                              <div
+                                class="sc-AxhCb fxrKLH text-theme-primary"
+                                height="1em"
+                                width="1em"
+                              >
+                                <svg>
+                                  upload.svg
+                                </svg>
+                              </div>
+                            </button>
                           </div>
-                        </button>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-                <div
-                  class="relative mt-8 space-y-8"
-                >
-                  <fieldset
-                    class="sc-AxiKw iQzisX flex flex-col space-y-2"
-                  >
-                    <label
-                      class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
-                      data-testid="FormLabel"
-                      for="name"
-                    >
-                      Name
-                      <div
-                        class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
-                        data-testid="FormLabel__required"
-                      />
-                    </label>
-                    <input
-                      class="sc-AxhUy jqmzti overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 "
-                      data-testid="Input"
-                      name="name"
-                    />
-                  </fieldset>
                   <fieldset
                     class="sc-AxiKw iQzisX flex flex-col space-y-2"
                   >
@@ -669,70 +569,6 @@ exports[`CreateProfile should render 1`] = `
                       </div>
                     </div>
                   </fieldset>
-                  <fieldset
-                    class="sc-AxiKw iQzisX flex flex-col space-y-2"
-                  >
-                    <label
-                      class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
-                      data-testid="FormLabel"
-                      for="marketProvider"
-                    >
-                      Market Provider
-                      <div
-                        class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
-                        data-testid="FormLabel__required"
-                      />
-                    </label>
-                    <div
-                      class="relative w-full"
-                    >
-                      <input
-                        class="sc-AxhUy jqmzti overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 sr-only"
-                        data-testid="select-list__input"
-                        name="marketProvider"
-                        readonly=""
-                        type="text"
-                        value="cryptocompare"
-                      />
-                      <div
-                        class="relative w-full cursor-pointer"
-                      >
-                        <div>
-                          <button
-                            aria-expanded="false"
-                            aria-haspopup="listbox"
-                            aria-labelledby="downshift-0-label downshift-0-toggle-button"
-                            class="sc-fzqARJ jnMeHK  is-selected "
-                            data-testid="select-list__toggle-button"
-                            id="downshift-0-toggle-button"
-                            type="button"
-                          >
-                            CryptoCompare
-                          </button>
-                          <ul
-                            aria-labelledby="downshift-0-label"
-                            class="sc-fzqNqU izoylg"
-                            id="downshift-0-menu"
-                            role="listbox"
-                            tabindex="-1"
-                          />
-                        </div>
-                        <div
-                          class="sc-AxgMl sc-Axmtr hWILTO w-10 pointer-events-none text-theme-neutral"
-                        >
-                          <div
-                            class="sc-AxhCb jfKWih"
-                            height="5"
-                            width="7"
-                          >
-                            <svg>
-                              caret-down.svg
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </fieldset>
                   <fieldset
                     class="sc-AxiKw iQzisX flex flex-col space-y-2"
                   >
@@ -765,18 +601,18 @@ exports[`CreateProfile should render 1`] = `
                           <button
                             aria-expanded="false"
                             aria-haspopup="listbox"
-                            aria-labelledby="downshift-1-label downshift-1-toggle-button"
+                            aria-labelledby="downshift-0-label downshift-0-toggle-button"
                             class="sc-fzqARJ jnMeHK   "
                             data-testid="select-list__toggle-button"
-                            id="downshift-1-toggle-button"
+                            id="downshift-0-toggle-button"
                             type="button"
                           >
                             Select Currency
                           </button>
                           <ul
-                            aria-labelledby="downshift-1-label"
+                            aria-labelledby="downshift-0-label"
                             class="sc-fzqNqU izoylg"
-                            id="downshift-1-menu"
+                            id="downshift-0-menu"
                             role="listbox"
                             tabindex="-1"
                           />
@@ -799,11 +635,8 @@ exports[`CreateProfile should render 1`] = `
                   </fieldset>
                 </div>
                 <div
-                  class="mt-8"
+                  class="pb-4 mt-8"
                 >
-                  <h2>
-                    Other
-                  </h2>
                   <ul
                     class="sc-fzoiQi fjoJEQ"
                     data-testid="list-divided__items"
@@ -823,7 +656,7 @@ exports[`CreateProfile should render 1`] = `
                             class="flex items-center justify-between space-x-5"
                           >
                             <span
-                              class="text-lg font-semibold text-theme-neutral-dark"
+                              class="text-xl font-semibold"
                               data-testid="list-divided-item__label"
                             >
                               Dark Theme
@@ -864,7 +697,7 @@ exports[`CreateProfile should render 1`] = `
                 />
               </div>
               <div
-                class="flex justify-end mt-8 space-x-3"
+                class="flex justify-end pt-4 space-x-3"
               >
                 <button
                   class="sc-AxjAm fPpool"
@@ -879,7 +712,7 @@ exports[`CreateProfile should render 1`] = `
                   data-testid="CreateProfile__submit-button"
                   type="submit"
                 >
-                  Complete
+                  Create
                 </button>
               </div>
             </form>
@@ -937,7 +770,7 @@ exports[`CreateProfile should store profile 1`] = `
           class="container py-16 mx-auto px-14"
         >
           <div
-            class="max-w-lg mx-auto"
+            class="max-w-lg mx-auto -mt-10"
           >
             <h1
               class="mb-0 md:text-4xl"
@@ -950,7 +783,7 @@ exports[`CreateProfile should store profile 1`] = `
               Sign in via MarketSquare or create a new Profile below.
             </div>
             <div
-              class="pb-4 mt-8"
+              class="mt-8"
             >
               <div>
                 <button
@@ -976,109 +809,98 @@ exports[`CreateProfile should store profile 1`] = `
                 </button>
               </div>
             </div>
-            <div
-              class="sc-AxirZ jjvtQn border-theme-neutral-300"
-              type="horizontal"
-            />
             <form
-              class="space-y-8"
+              class="px-10 pt-8 pb-10 mt-10 space-y-4 border rounded-lg bg-theme-background border-theme-neutral-200"
               data-testid="CreateProfile__form"
             >
               <div
-                class="mt-8"
+                class="mt-2"
               >
-                <h2>
-                  Personal Details
-                </h2>
+                <h3>
+                  New Profile
+                </h3>
                 <div
-                  class="group"
+                  class="relative mt-8 space-y-8"
                 >
-                  <span
-                    class="text-sm font-semibold transition-colors duration-100 group-hover:text-theme-primary text-theme-neutral-dark"
-                  >
-                    Profile Image
-                  </span>
                   <div
-                    class="flex flex-row mt-2"
+                    class="flex justify-between"
                   >
-                    <div
-                      class="flex items-center justify-center w-24 h-24 mr-6 border-2 border-dashed rounded border-theme-primary-contrast"
+                    <fieldset
+                      class="sc-AxiKw iQzisX w-full mr-6"
                     >
-                      <div
-                        class="overflow-hidden rounded-full w-22 h-22"
+                      <label
+                        class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
+                        data-testid="FormLabel"
+                        for="name"
                       >
-                        <button
-                          class="sc-AxjAm fPpool w-22 h-22"
-                          color="primary"
-                          data-testid="SelectProfileImage__upload-button"
-                          type="button"
-                        >
-                          <div
-                            class="sc-AxhCb fxrKLH"
-                            height="1em"
-                            width="1em"
-                          >
-                            <svg>
-                              upload.svg
-                            </svg>
-                          </div>
-                        </button>
-                      </div>
-                    </div>
+                        Name
+                        <div
+                          class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
+                          data-testid="FormLabel__required"
+                        />
+                      </label>
+                      <input
+                        class="sc-AxhUy jqmzti overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 "
+                        data-testid="Input"
+                        name="name"
+                      />
+                    </fieldset>
                     <div
-                      class="relative w-24 h-24 rounded bg-theme-neutral-contrast"
+                      class="group -mt-6"
                     >
                       <div
-                        class="sc-fzoyTs cudiZK"
-                      >
-                        <img
-                          alt="Profile avatar"
-                          class="object-cover w-24 h-24 bg-center bg-no-repeat bg-cover rounded"
-                          src="data:image/png;base64,avatarImage"
-                        />
-                      </div>
-                      <button
-                        class="sc-AxjAm cUmKa-D absolute flex items-center justify-center w-6 h-6 p-1 -top-3 -right-3"
-                        color="danger"
-                        data-testid="SelectProfileImage__remove-button"
-                        type="button"
+                        class="flex flex-row mt-2"
                       >
                         <div
-                          class="sc-AxhCb koOqYD"
-                          height="12"
-                          width="12"
+                          class="relative w-24 h-24 rounded bg-theme-neutral-contrast"
                         >
-                          <svg>
-                            close.svg
-                          </svg>
-                        </div>
-                      </button>
+                          <div
+                            class="sc-fzoyTs gznaRo"
+                          >
+                            <img
+                              alt="Profile avatar"
+                              class="object-cover w-24 h-24 bg-center bg-no-repeat bg-cover rounded"
+                              src="data:image/png;base64,avatarImage"
+                            />
+                            <div
+                              class="absolute z-50 hidden overflow-hidden rounded-full upload-button-overlay w-22 h-22"
+                              data-testid="SelectProfileImage__upload-button"
+                            >
+                              <div
+                                class="flex items-center justify-center w-22 h-22"
+                              >
+                                <div
+                                  class="sc-AxhCb fxrKLH text-white"
+                                  height="1em"
+                                  width="1em"
+                                >
+                                  <svg>
+                                    upload.svg
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="sc-AxjAm cUmKa-D absolute flex items-center justify-center w-6 h-6 p-1 -top-3 -right-3"
+                            color="danger"
+                            data-testid="SelectProfileImage__remove-button"
+                            type="button"
+                          >
+                            <div
+                              class="sc-AxhCb koOqYD"
+                              height="12"
+                              width="12"
+                            >
+                              <svg>
+                                close.svg
+                              </svg>
+                            </div>
+                          </button>
+                        </div>
+                      </div>
                     </div>
                   </div>
-                </div>
-                <div
-                  class="relative mt-8 space-y-8"
-                >
-                  <fieldset
-                    class="sc-AxiKw iQzisX flex flex-col space-y-2"
-                  >
-                    <label
-                      class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
-                      data-testid="FormLabel"
-                      for="name"
-                    >
-                      Name
-                      <div
-                        class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
-                        data-testid="FormLabel__required"
-                      />
-                    </label>
-                    <input
-                      class="sc-AxhUy jqmzti overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 "
-                      data-testid="Input"
-                      name="name"
-                    />
-                  </fieldset>
                   <fieldset
                     class="sc-AxiKw iQzisX flex flex-col space-y-2"
                   >
@@ -1126,70 +948,6 @@ exports[`CreateProfile should store profile 1`] = `
                       </div>
                     </div>
                   </fieldset>
-                  <fieldset
-                    class="sc-AxiKw iQzisX flex flex-col space-y-2"
-                  >
-                    <label
-                      class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
-                      data-testid="FormLabel"
-                      for="marketProvider"
-                    >
-                      Market Provider
-                      <div
-                        class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
-                        data-testid="FormLabel__required"
-                      />
-                    </label>
-                    <div
-                      class="relative w-full"
-                    >
-                      <input
-                        class="sc-AxhUy jqmzti overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 sr-only"
-                        data-testid="select-list__input"
-                        name="marketProvider"
-                        readonly=""
-                        type="text"
-                        value="coincap"
-                      />
-                      <div
-                        class="relative w-full cursor-pointer"
-                      >
-                        <div>
-                          <button
-                            aria-expanded="false"
-                            aria-haspopup="listbox"
-                            aria-labelledby="downshift-3-label downshift-3-toggle-button"
-                            class="sc-fzqARJ jnMeHK  is-selected "
-                            data-testid="select-list__toggle-button"
-                            id="downshift-3-toggle-button"
-                            type="button"
-                          >
-                            CoinCap
-                          </button>
-                          <ul
-                            aria-labelledby="downshift-3-label"
-                            class="sc-fzqNqU izoylg"
-                            id="downshift-3-menu"
-                            role="listbox"
-                            tabindex="-1"
-                          />
-                        </div>
-                        <div
-                          class="sc-AxgMl sc-Axmtr hWILTO w-10 pointer-events-none text-theme-neutral"
-                        >
-                          <div
-                            class="sc-AxhCb jfKWih"
-                            height="5"
-                            width="7"
-                          >
-                            <svg>
-                              caret-down.svg
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </fieldset>
                   <fieldset
                     class="sc-AxiKw iQzisX flex flex-col space-y-2"
                   >
@@ -1222,18 +980,18 @@ exports[`CreateProfile should store profile 1`] = `
                           <button
                             aria-expanded="false"
                             aria-haspopup="listbox"
-                            aria-labelledby="downshift-4-label downshift-4-toggle-button"
+                            aria-labelledby="downshift-1-label downshift-1-toggle-button"
                             class="sc-fzqARJ jnMeHK  is-selected "
                             data-testid="select-list__toggle-button"
-                            id="downshift-4-toggle-button"
+                            id="downshift-1-toggle-button"
                             type="button"
                           >
                             BTC (Ƀ)
                           </button>
                           <ul
-                            aria-labelledby="downshift-4-label"
+                            aria-labelledby="downshift-1-label"
                             class="sc-fzqNqU izoylg"
-                            id="downshift-4-menu"
+                            id="downshift-1-menu"
                             role="listbox"
                             tabindex="-1"
                           />
@@ -1256,11 +1014,8 @@ exports[`CreateProfile should store profile 1`] = `
                   </fieldset>
                 </div>
                 <div
-                  class="mt-8"
+                  class="pb-4 mt-8"
                 >
-                  <h2>
-                    Other
-                  </h2>
                   <ul
                     class="sc-fzoiQi fjoJEQ"
                     data-testid="list-divided__items"
@@ -1280,7 +1035,7 @@ exports[`CreateProfile should store profile 1`] = `
                             class="flex items-center justify-between space-x-5"
                           >
                             <span
-                              class="text-lg font-semibold text-theme-neutral-dark"
+                              class="text-xl font-semibold"
                               data-testid="list-divided-item__label"
                             >
                               Dark Theme
@@ -1321,7 +1076,7 @@ exports[`CreateProfile should store profile 1`] = `
                 />
               </div>
               <div
-                class="flex justify-end mt-8 space-x-3"
+                class="flex justify-end pt-4 space-x-3"
               >
                 <button
                   class="sc-AxjAm fPpool"
@@ -1336,7 +1091,7 @@ exports[`CreateProfile should store profile 1`] = `
                   data-testid="CreateProfile__submit-button"
                   type="submit"
                 >
-                  Complete
+                  Create
                 </button>
               </div>
             </form>
@@ -1394,7 +1149,7 @@ exports[`CreateProfile should store profile with password 1`] = `
           class="container py-16 mx-auto px-14"
         >
           <div
-            class="max-w-lg mx-auto"
+            class="max-w-lg mx-auto -mt-10"
           >
             <h1
               class="mb-0 md:text-4xl"
@@ -1407,7 +1162,7 @@ exports[`CreateProfile should store profile with password 1`] = `
               Sign in via MarketSquare or create a new Profile below.
             </div>
             <div
-              class="pb-4 mt-8"
+              class="mt-8"
             >
               <div>
                 <button
@@ -1433,115 +1188,87 @@ exports[`CreateProfile should store profile with password 1`] = `
                 </button>
               </div>
             </div>
-            <div
-              class="sc-AxirZ jjvtQn border-theme-neutral-300"
-              type="horizontal"
-            />
             <form
-              class="space-y-8"
+              class="px-10 pt-8 pb-10 mt-10 space-y-4 border rounded-lg bg-theme-background border-theme-neutral-200"
               data-testid="CreateProfile__form"
             >
               <div
-                class="mt-8"
+                class="mt-2"
               >
-                <h2>
-                  Personal Details
-                </h2>
+                <h3>
+                  New Profile
+                </h3>
                 <div
-                  class="group"
+                  class="relative mt-8 space-y-8"
                 >
-                  <span
-                    class="text-sm font-semibold transition-colors duration-100 group-hover:text-theme-primary text-theme-neutral-dark"
-                  >
-                    Profile Image
-                  </span>
                   <div
-                    class="flex flex-row mt-2"
+                    class="flex justify-between"
                   >
-                    <div
-                      class="flex items-center justify-center w-24 h-24 mr-6 border-2 border-dashed rounded border-theme-primary-contrast"
+                    <fieldset
+                      class="sc-AxiKw iQzisX w-full mr-6"
                     >
-                      <div
-                        class="overflow-hidden rounded-full w-22 h-22"
+                      <label
+                        class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
+                        data-testid="FormLabel"
+                        for="name"
                       >
-                        <button
-                          class="sc-AxjAm fPpool w-22 h-22"
-                          color="primary"
-                          data-testid="SelectProfileImage__upload-button"
-                          type="button"
-                        >
-                          <div
-                            class="sc-AxhCb fxrKLH"
-                            height="1em"
-                            width="1em"
-                          >
-                            <svg>
-                              upload.svg
-                            </svg>
-                          </div>
-                        </button>
-                      </div>
-                    </div>
+                        Name
+                        <div
+                          class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
+                          data-testid="FormLabel__required"
+                        />
+                      </label>
+                      <input
+                        class="sc-AxhUy jqmzti overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 "
+                        data-testid="Input"
+                        name="name"
+                      />
+                    </fieldset>
                     <div
-                      class="relative w-24 h-24 rounded bg-theme-neutral-contrast"
+                      class="group -mt-6"
                     >
                       <div
-                        class="sc-fzoyTs cudiZK"
-                      >
-                        <img
-                          alt="Profile avatar"
-                          class="object-cover w-24 h-24 bg-center bg-no-repeat bg-cover rounded"
-                          src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(139, 195, 74)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"45\\" cx=\\"100\\" cy=\\"50\\" fill=\\"rgb(33, 150, 243)\\"/><circle r=\\"40\\" cx=\\"10\\" cy=\\"70\\" fill=\\"rgb(3, 169, 244)\\"/><circle r=\\"60\\" cx=\\"50\\" cy=\\"60\\" fill=\\"rgb(0, 150, 136)\\"/></svg>"
-                        />
-                        <span
-                          class="absolute text-2xl font-semibold text-theme-background"
-                        >
-                          TE
-                        </span>
-                      </div>
-                      <button
-                        class="sc-AxjAm cUmKa-D absolute flex items-center justify-center w-6 h-6 p-1 -top-3 -right-3"
-                        color="danger"
-                        data-testid="SelectProfileImage__remove-button"
-                        disabled=""
-                        type="button"
+                        class="flex flex-row mt-2"
                       >
                         <div
-                          class="sc-AxhCb koOqYD"
-                          height="12"
-                          width="12"
+                          class="relative w-24 h-24 rounded bg-theme-neutral-contrast"
                         >
-                          <svg>
-                            close.svg
-                          </svg>
+                          <div
+                            class="sc-fzoyTs gznaRo"
+                          >
+                            <img
+                              alt="Profile avatar"
+                              class="object-cover w-24 h-24 bg-center bg-no-repeat bg-cover rounded"
+                              src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(139, 195, 74)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"45\\" cx=\\"100\\" cy=\\"50\\" fill=\\"rgb(33, 150, 243)\\"/><circle r=\\"40\\" cx=\\"10\\" cy=\\"70\\" fill=\\"rgb(3, 169, 244)\\"/><circle r=\\"60\\" cx=\\"50\\" cy=\\"60\\" fill=\\"rgb(0, 150, 136)\\"/></svg>"
+                            />
+                            <span
+                              class="absolute text-2xl font-semibold text-theme-background"
+                            >
+                              TE
+                            </span>
+                            <div
+                              class="absolute z-50 hidden overflow-hidden rounded-full upload-button-overlay w-22 h-22"
+                              data-testid="SelectProfileImage__upload-button"
+                            >
+                              <div
+                                class="flex items-center justify-center w-22 h-22"
+                              >
+                                <div
+                                  class="sc-AxhCb fxrKLH text-white"
+                                  height="1em"
+                                  width="1em"
+                                >
+                                  <svg>
+                                    upload.svg
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
                         </div>
-                      </button>
+                      </div>
                     </div>
                   </div>
-                </div>
-                <div
-                  class="relative mt-8 space-y-8"
-                >
-                  <fieldset
-                    class="sc-AxiKw iQzisX flex flex-col space-y-2"
-                  >
-                    <label
-                      class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
-                      data-testid="FormLabel"
-                      for="name"
-                    >
-                      Name
-                      <div
-                        class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
-                        data-testid="FormLabel__required"
-                      />
-                    </label>
-                    <input
-                      class="sc-AxhUy jqmzti overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 "
-                      data-testid="Input"
-                      name="name"
-                    />
-                  </fieldset>
                   <fieldset
                     class="sc-AxiKw iQzisX flex flex-col space-y-2"
                   >
@@ -1589,70 +1316,6 @@ exports[`CreateProfile should store profile with password 1`] = `
                       </div>
                     </div>
                   </fieldset>
-                  <fieldset
-                    class="sc-AxiKw iQzisX flex flex-col space-y-2"
-                  >
-                    <label
-                      class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
-                      data-testid="FormLabel"
-                      for="marketProvider"
-                    >
-                      Market Provider
-                      <div
-                        class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
-                        data-testid="FormLabel__required"
-                      />
-                    </label>
-                    <div
-                      class="relative w-full"
-                    >
-                      <input
-                        class="sc-AxhUy jqmzti overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 sr-only"
-                        data-testid="select-list__input"
-                        name="marketProvider"
-                        readonly=""
-                        type="text"
-                        value="coincap"
-                      />
-                      <div
-                        class="relative w-full cursor-pointer"
-                      >
-                        <div>
-                          <button
-                            aria-expanded="false"
-                            aria-haspopup="listbox"
-                            aria-labelledby="downshift-35-label downshift-35-toggle-button"
-                            class="sc-fzqARJ jnMeHK  is-selected "
-                            data-testid="select-list__toggle-button"
-                            id="downshift-35-toggle-button"
-                            type="button"
-                          >
-                            CoinCap
-                          </button>
-                          <ul
-                            aria-labelledby="downshift-35-label"
-                            class="sc-fzqNqU izoylg"
-                            id="downshift-35-menu"
-                            role="listbox"
-                            tabindex="-1"
-                          />
-                        </div>
-                        <div
-                          class="sc-AxgMl sc-Axmtr hWILTO w-10 pointer-events-none text-theme-neutral"
-                        >
-                          <div
-                            class="sc-AxhCb jfKWih"
-                            height="5"
-                            width="7"
-                          >
-                            <svg>
-                              caret-down.svg
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </fieldset>
                   <fieldset
                     class="sc-AxiKw iQzisX flex flex-col space-y-2"
                   >
@@ -1685,18 +1348,18 @@ exports[`CreateProfile should store profile with password 1`] = `
                           <button
                             aria-expanded="false"
                             aria-haspopup="listbox"
-                            aria-labelledby="downshift-36-label downshift-36-toggle-button"
+                            aria-labelledby="downshift-16-label downshift-16-toggle-button"
                             class="sc-fzqARJ jnMeHK  is-selected "
                             data-testid="select-list__toggle-button"
-                            id="downshift-36-toggle-button"
+                            id="downshift-16-toggle-button"
                             type="button"
                           >
                             BTC (Ƀ)
                           </button>
                           <ul
-                            aria-labelledby="downshift-36-label"
+                            aria-labelledby="downshift-16-label"
                             class="sc-fzqNqU izoylg"
-                            id="downshift-36-menu"
+                            id="downshift-16-menu"
                             role="listbox"
                             tabindex="-1"
                           />
@@ -1719,11 +1382,8 @@ exports[`CreateProfile should store profile with password 1`] = `
                   </fieldset>
                 </div>
                 <div
-                  class="mt-8"
+                  class="pb-4 mt-8"
                 >
-                  <h2>
-                    Other
-                  </h2>
                   <ul
                     class="sc-fzoiQi fjoJEQ"
                     data-testid="list-divided__items"
@@ -1743,7 +1403,7 @@ exports[`CreateProfile should store profile with password 1`] = `
                             class="flex items-center justify-between space-x-5"
                           >
                             <span
-                              class="text-lg font-semibold text-theme-neutral-dark"
+                              class="text-xl font-semibold"
                               data-testid="list-divided-item__label"
                             >
                               Dark Theme
@@ -1784,7 +1444,7 @@ exports[`CreateProfile should store profile with password 1`] = `
                 />
               </div>
               <div
-                class="flex justify-end mt-8 space-x-3"
+                class="flex justify-end pt-4 space-x-3"
               >
                 <button
                   class="sc-AxjAm fPpool"
@@ -1799,7 +1459,7 @@ exports[`CreateProfile should store profile with password 1`] = `
                   data-testid="CreateProfile__submit-button"
                   type="submit"
                 >
-                  Complete
+                  Create
                 </button>
               </div>
             </form>
@@ -1857,7 +1517,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
           class="container py-16 mx-auto px-14"
         >
           <div
-            class="max-w-lg mx-auto"
+            class="max-w-lg mx-auto -mt-10"
           >
             <h1
               class="mb-0 md:text-4xl"
@@ -1870,7 +1530,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
               Sign in via MarketSquare or create a new Profile below.
             </div>
             <div
-              class="pb-4 mt-8"
+              class="mt-8"
             >
               <div>
                 <button
@@ -1896,115 +1556,87 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                 </button>
               </div>
             </div>
-            <div
-              class="sc-AxirZ jjvtQn border-theme-neutral-300"
-              type="horizontal"
-            />
             <form
-              class="space-y-8"
+              class="px-10 pt-8 pb-10 mt-10 space-y-4 border rounded-lg bg-theme-background border-theme-neutral-200"
               data-testid="CreateProfile__form"
             >
               <div
-                class="mt-8"
+                class="mt-2"
               >
-                <h2>
-                  Personal Details
-                </h2>
+                <h3>
+                  New Profile
+                </h3>
                 <div
-                  class="group"
+                  class="relative mt-8 space-y-8"
                 >
-                  <span
-                    class="text-sm font-semibold transition-colors duration-100 group-hover:text-theme-primary text-theme-neutral-dark"
-                  >
-                    Profile Image
-                  </span>
                   <div
-                    class="flex flex-row mt-2"
+                    class="flex justify-between"
                   >
-                    <div
-                      class="flex items-center justify-center w-24 h-24 mr-6 border-2 border-dashed rounded border-theme-primary-contrast"
+                    <fieldset
+                      class="sc-AxiKw iQzisX w-full mr-6"
                     >
-                      <div
-                        class="overflow-hidden rounded-full w-22 h-22"
+                      <label
+                        class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
+                        data-testid="FormLabel"
+                        for="name"
                       >
-                        <button
-                          class="sc-AxjAm fPpool w-22 h-22"
-                          color="primary"
-                          data-testid="SelectProfileImage__upload-button"
-                          type="button"
-                        >
-                          <div
-                            class="sc-AxhCb fxrKLH"
-                            height="1em"
-                            width="1em"
-                          >
-                            <svg>
-                              upload.svg
-                            </svg>
-                          </div>
-                        </button>
-                      </div>
-                    </div>
+                        Name
+                        <div
+                          class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
+                          data-testid="FormLabel__required"
+                        />
+                      </label>
+                      <input
+                        class="sc-AxhUy jqmzti overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 "
+                        data-testid="Input"
+                        name="name"
+                      />
+                    </fieldset>
                     <div
-                      class="relative w-24 h-24 rounded bg-theme-neutral-contrast"
+                      class="group -mt-6"
                     >
                       <div
-                        class="sc-fzoyTs cudiZK"
-                      >
-                        <img
-                          alt="Profile avatar"
-                          class="object-cover w-24 h-24 bg-center bg-no-repeat bg-cover rounded"
-                          src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(139, 195, 74)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"45\\" cx=\\"100\\" cy=\\"50\\" fill=\\"rgb(33, 150, 243)\\"/><circle r=\\"40\\" cx=\\"10\\" cy=\\"70\\" fill=\\"rgb(3, 169, 244)\\"/><circle r=\\"60\\" cx=\\"50\\" cy=\\"60\\" fill=\\"rgb(0, 150, 136)\\"/></svg>"
-                        />
-                        <span
-                          class="absolute text-2xl font-semibold text-theme-background"
-                        >
-                          TE
-                        </span>
-                      </div>
-                      <button
-                        class="sc-AxjAm cUmKa-D absolute flex items-center justify-center w-6 h-6 p-1 -top-3 -right-3"
-                        color="danger"
-                        data-testid="SelectProfileImage__remove-button"
-                        disabled=""
-                        type="button"
+                        class="flex flex-row mt-2"
                       >
                         <div
-                          class="sc-AxhCb koOqYD"
-                          height="12"
-                          width="12"
+                          class="relative w-24 h-24 rounded bg-theme-neutral-contrast"
                         >
-                          <svg>
-                            close.svg
-                          </svg>
+                          <div
+                            class="sc-fzoyTs gznaRo"
+                          >
+                            <img
+                              alt="Profile avatar"
+                              class="object-cover w-24 h-24 bg-center bg-no-repeat bg-cover rounded"
+                              src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(139, 195, 74)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"45\\" cx=\\"100\\" cy=\\"50\\" fill=\\"rgb(33, 150, 243)\\"/><circle r=\\"40\\" cx=\\"10\\" cy=\\"70\\" fill=\\"rgb(3, 169, 244)\\"/><circle r=\\"60\\" cx=\\"50\\" cy=\\"60\\" fill=\\"rgb(0, 150, 136)\\"/></svg>"
+                            />
+                            <span
+                              class="absolute text-2xl font-semibold text-theme-background"
+                            >
+                              TE
+                            </span>
+                            <div
+                              class="absolute z-50 hidden overflow-hidden rounded-full upload-button-overlay w-22 h-22"
+                              data-testid="SelectProfileImage__upload-button"
+                            >
+                              <div
+                                class="flex items-center justify-center w-22 h-22"
+                              >
+                                <div
+                                  class="sc-AxhCb fxrKLH text-white"
+                                  height="1em"
+                                  width="1em"
+                                >
+                                  <svg>
+                                    upload.svg
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
                         </div>
-                      </button>
+                      </div>
                     </div>
                   </div>
-                </div>
-                <div
-                  class="relative mt-8 space-y-8"
-                >
-                  <fieldset
-                    class="sc-AxiKw iQzisX flex flex-col space-y-2"
-                  >
-                    <label
-                      class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
-                      data-testid="FormLabel"
-                      for="name"
-                    >
-                      Name
-                      <div
-                        class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
-                        data-testid="FormLabel__required"
-                      />
-                    </label>
-                    <input
-                      class="sc-AxhUy jqmzti overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 "
-                      data-testid="Input"
-                      name="name"
-                    />
-                  </fieldset>
                   <fieldset
                     class="sc-AxiKw iQzisX flex flex-col space-y-2"
                   >
@@ -2052,70 +1684,6 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                       </div>
                     </div>
                   </fieldset>
-                  <fieldset
-                    class="sc-AxiKw iQzisX flex flex-col space-y-2"
-                  >
-                    <label
-                      class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
-                      data-testid="FormLabel"
-                      for="marketProvider"
-                    >
-                      Market Provider
-                      <div
-                        class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
-                        data-testid="FormLabel__required"
-                      />
-                    </label>
-                    <div
-                      class="relative w-full"
-                    >
-                      <input
-                        class="sc-AxhUy jqmzti overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 sr-only"
-                        data-testid="select-list__input"
-                        name="marketProvider"
-                        readonly=""
-                        type="text"
-                        value="coincap"
-                      />
-                      <div
-                        class="relative w-full cursor-pointer"
-                      >
-                        <div>
-                          <button
-                            aria-expanded="false"
-                            aria-haspopup="listbox"
-                            aria-labelledby="downshift-54-label downshift-54-toggle-button"
-                            class="sc-fzqARJ jnMeHK  is-selected "
-                            data-testid="select-list__toggle-button"
-                            id="downshift-54-toggle-button"
-                            type="button"
-                          >
-                            CoinCap
-                          </button>
-                          <ul
-                            aria-labelledby="downshift-54-label"
-                            class="sc-fzqNqU izoylg"
-                            id="downshift-54-menu"
-                            role="listbox"
-                            tabindex="-1"
-                          />
-                        </div>
-                        <div
-                          class="sc-AxgMl sc-Axmtr hWILTO w-10 pointer-events-none text-theme-neutral"
-                        >
-                          <div
-                            class="sc-AxhCb jfKWih"
-                            height="5"
-                            width="7"
-                          >
-                            <svg>
-                              caret-down.svg
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </fieldset>
                   <fieldset
                     class="sc-AxiKw iQzisX flex flex-col space-y-2"
                   >
@@ -2148,18 +1716,18 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                           <button
                             aria-expanded="false"
                             aria-haspopup="listbox"
-                            aria-labelledby="downshift-55-label downshift-55-toggle-button"
+                            aria-labelledby="downshift-25-label downshift-25-toggle-button"
                             class="sc-fzqARJ jnMeHK  is-selected "
                             data-testid="select-list__toggle-button"
-                            id="downshift-55-toggle-button"
+                            id="downshift-25-toggle-button"
                             type="button"
                           >
                             BTC (Ƀ)
                           </button>
                           <ul
-                            aria-labelledby="downshift-55-label"
+                            aria-labelledby="downshift-25-label"
                             class="sc-fzqNqU izoylg"
-                            id="downshift-55-menu"
+                            id="downshift-25-menu"
                             role="listbox"
                             tabindex="-1"
                           />
@@ -2182,11 +1750,8 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                   </fieldset>
                 </div>
                 <div
-                  class="mt-8"
+                  class="pb-4 mt-8"
                 >
-                  <h2>
-                    Other
-                  </h2>
                   <ul
                     class="sc-fzoiQi fjoJEQ"
                     data-testid="list-divided__items"
@@ -2206,7 +1771,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                             class="flex items-center justify-between space-x-5"
                           >
                             <span
-                              class="text-lg font-semibold text-theme-neutral-dark"
+                              class="text-xl font-semibold"
                               data-testid="list-divided-item__label"
                             >
                               Dark Theme
@@ -2247,7 +1812,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                 />
               </div>
               <div
-                class="flex justify-end mt-8 space-x-3"
+                class="flex justify-end pt-4 space-x-3"
               >
                 <button
                   class="sc-AxjAm fPpool"
@@ -2262,7 +1827,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                   data-testid="CreateProfile__submit-button"
                   type="submit"
                 >
-                  Complete
+                  Create
                 </button>
               </div>
             </form>
diff --git a/src/domains/setting/i18n.ts b/src/domains/setting/i18n.ts
index 64ae7dde26..7da0e2151a 100644
--- a/src/domains/setting/i18n.ts
+++ b/src/domains/setting/i18n.ts
@@ -6,6 +6,8 @@ export const translations: { [key: string]: any } = {
 		PERSONAL: {
 			TITLE: "Personal Details",
 			PROFILE_IMAGE: "Profile Image",
+			DELETE_AVATAR: "Delete Avatar",
+			UPLOAD_AVATAR: "Upload Avatar",
 			NAME: "Name",
 			PASSWORD: "Password",
 			PASSPHRASE_LANGUAGE: "Passphrase Language",
diff --git a/src/domains/setting/pages/Settings/__snapshots__/Settings.test.tsx.snap b/src/domains/setting/pages/Settings/__snapshots__/Settings.test.tsx.snap
index 8b2c5aec44..ad68ae1858 100644
--- a/src/domains/setting/pages/Settings/__snapshots__/Settings.test.tsx.snap
+++ b/src/domains/setting/pages/Settings/__snapshots__/Settings.test.tsx.snap
@@ -1671,7 +1671,7 @@ exports[`Settings should render 1`] = `
                       Personal Details
                     </h2>
                     <div
-                      class="group"
+                      class="group undefined"
                     >
                       <span
                         class="text-sm font-semibold transition-colors duration-100 group-hover:text-theme-primary text-theme-neutral-dark"
@@ -1681,35 +1681,11 @@ exports[`Settings should render 1`] = `
                       <div
                         class="flex flex-row mt-2"
                       >
-                        <div
-                          class="flex items-center justify-center w-24 h-24 mr-6 border-2 border-dashed rounded border-theme-primary-contrast"
-                        >
-                          <div
-                            class="overflow-hidden rounded-full w-22 h-22"
-                          >
-                            <button
-                              class="sc-AxhCb hPLjLy w-22 h-22"
-                              color="primary"
-                              data-testid="SelectProfileImage__upload-button"
-                              type="button"
-                            >
-                              <div
-                                class="sc-AxirZ iQaTP"
-                                height="1em"
-                                width="1em"
-                              >
-                                <svg>
-                                  upload.svg
-                                </svg>
-                              </div>
-                            </button>
-                          </div>
-                        </div>
                         <div
                           class="relative w-24 h-24 rounded bg-theme-neutral-contrast"
                         >
                           <div
-                            class="sc-fzoXWK idrRUY"
+                            class="sc-fzoXWK JKhnC"
                           >
                             <img
                               alt="Profile avatar"
@@ -1721,24 +1697,25 @@ exports[`Settings should render 1`] = `
                             >
                               JO
                             </span>
-                          </div>
-                          <button
-                            class="sc-AxhCb gmYZoQ absolute flex items-center justify-center w-6 h-6 p-1 -top-3 -right-3"
-                            color="danger"
-                            data-testid="SelectProfileImage__remove-button"
-                            disabled=""
-                            type="button"
-                          >
                             <div
-                              class="sc-AxirZ hDwaov"
-                              height="12"
-                              width="12"
+                              class="absolute z-50 hidden overflow-hidden rounded-full upload-button-overlay w-22 h-22"
+                              data-testid="SelectProfileImage__upload-button"
                             >
-                              <svg>
-                                close.svg
-                              </svg>
+                              <div
+                                class="flex items-center justify-center w-22 h-22"
+                              >
+                                <div
+                                  class="sc-AxirZ iQaTP text-white"
+                                  height="1em"
+                                  width="1em"
+                                >
+                                  <svg>
+                                    upload.svg
+                                  </svg>
+                                </div>
+                              </div>
                             </div>
-                          </button>
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -6152,7 +6129,7 @@ exports[`Settings should submit using default props 1`] = `
                       Personal Details
                     </h2>
                     <div
-                      class="group"
+                      class="group undefined"
                     >
                       <span
                         class="text-sm font-semibold transition-colors duration-100 group-hover:text-theme-primary text-theme-neutral-dark"
@@ -6162,35 +6139,11 @@ exports[`Settings should submit using default props 1`] = `
                       <div
                         class="flex flex-row mt-2"
                       >
-                        <div
-                          class="flex items-center justify-center w-24 h-24 mr-6 border-2 border-dashed rounded border-theme-primary-contrast"
-                        >
-                          <div
-                            class="overflow-hidden rounded-full w-22 h-22"
-                          >
-                            <button
-                              class="sc-AxhCb hPLjLy w-22 h-22"
-                              color="primary"
-                              data-testid="SelectProfileImage__upload-button"
-                              type="button"
-                            >
-                              <div
-                                class="sc-AxirZ iQaTP"
-                                height="1em"
-                                width="1em"
-                              >
-                                <svg>
-                                  upload.svg
-                                </svg>
-                              </div>
-                            </button>
-                          </div>
-                        </div>
                         <div
                           class="relative w-24 h-24 rounded bg-theme-neutral-contrast"
                         >
                           <div
-                            class="sc-fzoXWK idrRUY"
+                            class="sc-fzoXWK JKhnC"
                           >
                             <img
                               alt="Profile avatar"
@@ -6202,24 +6155,25 @@ exports[`Settings should submit using default props 1`] = `
                             >
                               TE
                             </span>
-                          </div>
-                          <button
-                            class="sc-AxhCb gmYZoQ absolute flex items-center justify-center w-6 h-6 p-1 -top-3 -right-3"
-                            color="danger"
-                            data-testid="SelectProfileImage__remove-button"
-                            disabled=""
-                            type="button"
-                          >
                             <div
-                              class="sc-AxirZ hDwaov"
-                              height="12"
-                              width="12"
+                              class="absolute z-50 hidden overflow-hidden rounded-full upload-button-overlay w-22 h-22"
+                              data-testid="SelectProfileImage__upload-button"
                             >
-                              <svg>
-                                close.svg
-                              </svg>
+                              <div
+                                class="flex items-center justify-center w-22 h-22"
+                              >
+                                <div
+                                  class="sc-AxirZ iQaTP text-white"
+                                  height="1em"
+                                  width="1em"
+                                >
+                                  <svg>
+                                    upload.svg
+                                  </svg>
+                                </div>
+                              </div>
                             </div>
-                          </button>
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -7444,7 +7398,7 @@ exports[`Settings should update profile 1`] = `
                       Personal Details
                     </h2>
                     <div
-                      class="group"
+                      class="group undefined"
                     >
                       <span
                         class="text-sm font-semibold transition-colors duration-100 group-hover:text-theme-primary text-theme-neutral-dark"
@@ -7454,35 +7408,11 @@ exports[`Settings should update profile 1`] = `
                       <div
                         class="flex flex-row mt-2"
                       >
-                        <div
-                          class="flex items-center justify-center w-24 h-24 mr-6 border-2 border-dashed rounded border-theme-primary-contrast"
-                        >
-                          <div
-                            class="overflow-hidden rounded-full w-22 h-22"
-                          >
-                            <button
-                              class="sc-AxhCb hPLjLy w-22 h-22"
-                              color="primary"
-                              data-testid="SelectProfileImage__upload-button"
-                              type="button"
-                            >
-                              <div
-                                class="sc-AxirZ iQaTP"
-                                height="1em"
-                                width="1em"
-                              >
-                                <svg>
-                                  upload.svg
-                                </svg>
-                              </div>
-                            </button>
-                          </div>
-                        </div>
                         <div
                           class="relative w-24 h-24 rounded bg-theme-neutral-contrast"
                         >
                           <div
-                            class="sc-fzoXWK idrRUY"
+                            class="sc-fzoXWK JKhnC"
                           >
                             <img
                               alt="Profile avatar"
@@ -7494,24 +7424,25 @@ exports[`Settings should update profile 1`] = `
                             >
                               TE
                             </span>
-                          </div>
-                          <button
-                            class="sc-AxhCb gmYZoQ absolute flex items-center justify-center w-6 h-6 p-1 -top-3 -right-3"
-                            color="danger"
-                            data-testid="SelectProfileImage__remove-button"
-                            disabled=""
-                            type="button"
-                          >
                             <div
-                              class="sc-AxirZ hDwaov"
-                              height="12"
-                              width="12"
+                              class="absolute z-50 hidden overflow-hidden rounded-full upload-button-overlay w-22 h-22"
+                              data-testid="SelectProfileImage__upload-button"
                             >
-                              <svg>
-                                close.svg
-                              </svg>
+                              <div
+                                class="flex items-center justify-center w-22 h-22"
+                              >
+                                <div
+                                  class="sc-AxirZ iQaTP text-white"
+                                  height="1em"
+                                  width="1em"
+                                >
+                                  <svg>
+                                    upload.svg
+                                  </svg>
+                                </div>
+                              </div>
                             </div>
-                          </button>
+                          </div>
                         </div>
                       </div>
                     </div>