diff --git a/frontend/src/lib/components/IconButton.svelte b/frontend/src/lib/components/IconButton.svelte
index 2c1d72e..580e63d 100644
--- a/frontend/src/lib/components/IconButton.svelte
+++ b/frontend/src/lib/components/IconButton.svelte
@@ -5,12 +5,15 @@
   export let color: "primary" | "secondary" | "success" | "danger";
   export let tooltip: string;
   export let active: boolean = false;
-  export let click: (e: MouseEvent) => void;
+  export let disabled: boolean = false;
+
+  export let click: ((e: MouseEvent) => void) | undefined = undefined;
+  export let href: string | undefined = undefined;
 
   let button: HTMLElement;
 </script>
 
 <Tooltip target={button} placement="top">{tooltip}</Tooltip>
-<Button {color} {active} on:click={click} bind:inner={button}>
+<Button {color} {active} {disabled} {href} on:click={click} bind:inner={button}>
   <Icon name={icon} />
 </Button>
diff --git a/frontend/src/routes/@[username]/[memberName]/+page.svelte b/frontend/src/routes/@[username]/[memberName]/+page.svelte
index 28494e6..e139f3e 100644
--- a/frontend/src/routes/@[username]/[memberName]/+page.svelte
+++ b/frontend/src/routes/@[username]/[memberName]/+page.svelte
@@ -30,7 +30,7 @@
       <br /><a href="/edit/member/{data.id}">Edit profile</a>
     </Alert>
   {/if}
-  <div>
+  <div class="m-3">
     <Button color="secondary" href="/@{data.user.name}">
       <Icon name="arrow-left" /> Back to {data.user.display_name ?? data.user.name}
     </Button>
diff --git a/frontend/src/routes/edit/member/[id]/+page.svelte b/frontend/src/routes/edit/member/[id]/+page.svelte
index 498171d..4dedb84 100644
--- a/frontend/src/routes/edit/member/[id]/+page.svelte
+++ b/frontend/src/routes/edit/member/[id]/+page.svelte
@@ -17,6 +17,7 @@
     Button,
     ButtonGroup,
     FormGroup,
+    Icon,
     Input,
     Modal,
     ModalBody,
@@ -258,6 +259,12 @@
 <h1>
   Edit member profile
   <ButtonGroup>
+    <IconButton
+      color="secondary"
+      icon="chevron-left"
+      href="/@{data.member.user.name}/{data.member.name}"
+      tooltip="Back to member"
+    />
     {#if modified}
       <Button color="success" on:click={() => updateMember()}>Save changes</Button>
     {/if}