diff --git a/svelte/src/file_viewer/FileViewer.svelte b/svelte/src/file_viewer/FileViewer.svelte
index 8a7405c..b811373 100644
--- a/svelte/src/file_viewer/FileViewer.svelte
+++ b/svelte/src/file_viewer/FileViewer.svelte
@@ -18,8 +18,8 @@ import LoadingIndicator from "../util/LoadingIndicator.svelte";
 import TransferLimit from "./TransferLimit.svelte";
 import ListStats from "./ListStats.svelte";
 import ListUpdater from "./ListUpdater.svelte";
-import HomeButton from "./HomeButton.svelte";
 import CopyButton from "../layout/CopyButton.svelte";
+import Menu from "../filesystem/Menu.svelte"
 
 let loading = true
 let embedded = false
@@ -396,7 +396,7 @@ const keyboard_event = evt => {
 			<i class="icon">menu</i>
 		</button>
 
-		<HomeButton embedded_viewer={embedded}/>
+		<Menu embedded={embedded}/>
 
 		<div class="file_viewer_headerbar_title">
 			{#if list.title !== ""}{list.title}<br/>{/if}
diff --git a/svelte/src/file_viewer/HomeButton.svelte b/svelte/src/file_viewer/HomeButton.svelte
deleted file mode 100644
index 37bb5f3..0000000
--- a/svelte/src/file_viewer/HomeButton.svelte
+++ /dev/null
@@ -1,58 +0,0 @@
-<script>
-import PixeldrainLogo from "../util/PixeldrainLogo.svelte";
-export let embedded_viewer = false
-export let nobg = false
-</script>
-
-{#if window.user.username === ""}
-	<a
-		href="/"
-		class="button button_home round"
-		class:nobg
-		target={embedded_viewer ? "_blank" : ""}
-		title="Go to the pixeldrain home page">
-		<PixeldrainLogo style="height: 1.6em; width: 1.6em; margin: 0;"></PixeldrainLogo>
-		<span class="label"></span>
-	</a>
-{:else}
-	<a
-		href="/user"
-		class="button round"
-		class:nobg
-		target={embedded_viewer ? "_blank" : ""}
-		title="My account">
-		<PixeldrainLogo style="height: 1.6em; width: 1.6em; margin: 0;"></PixeldrainLogo>
-		<span class="username">
-			{window.user.username}
-		</span>
-	</a>
-{/if}
-
-<style>
-.button {
-	flex: 0 0 content;
-}
-.label::after {
-	content: "pixeldrain";
-}
-.label, .username {
-	margin-right: 3px;
-}
-
-.nobg {
-	background: none;
-	margin: 0;
-	color: var(--body_text_color);
-	box-shadow: none;
-}
-
-@media (max-width: 600px) {
-	.label::after {
-		content: "pd";
-	}
-
-	.username {
-		display: none;
-	}
-}
-</style>
diff --git a/svelte/src/filesystem/Menu.svelte b/svelte/src/filesystem/Menu.svelte
index e6d1c3d..9a639dd 100644
--- a/svelte/src/filesystem/Menu.svelte
+++ b/svelte/src/filesystem/Menu.svelte
@@ -13,6 +13,8 @@ export let no_login_label = "Pixeldrain"
 export let hide_name = true
 export let hide_logo = false
 export let style = ""
+export let embedded = false
+$: target = embedded ? "_blank" : "_self"
 
 const open = () => {
 	// Show the window so we can get the location
@@ -46,7 +48,7 @@ const click = e => {
 </script>
 
 <div class="wrapper">
-	<button bind:this={button} on:click={open} href="/user" class="button round" title="Menu" style={style}>
+	<button bind:this={button} on:click={open} class="button round" title="Menu" style={style}>
 		{#if !hide_logo}
 			<PixeldrainLogo style="height: 1.6em; width: 1.6em;"/>
 		{/if}
@@ -62,7 +64,7 @@ const click = e => {
 	<div class="menu">
 		{#if window.user.username !== ""}
 
-			<Button link_href="/user" icon="person" label={window.user.username} />
+			<Button link_href="/user" link_target={target} icon="person" label={window.user.username} />
 			<div class="separator"></div>
 
 			<div class="stats_table">
@@ -82,33 +84,33 @@ const click = e => {
 			<div class="separator"></div>
 
 			{#if window.user.subscription.filesystem_access}
-				<Button link_href="/d/me" icon="folder" label="My Filesystem"/>
+				<Button link_href="/d/me" link_target={target} icon="folder" label="My Filesystem"/>
 			{:else}
-				<Button link_href="/#pro" icon="star" label="Get Premium"/>
+				<Button link_href="/#pro" link_target={target} icon="star" label="Get Premium"/>
 			{/if}
 
-			<Button link_href="/filesystem" icon="description" label="Filesystem Guide"/>
+			<Button link_href="/filesystem" link_target={target} icon="description" label="Filesystem Guide"/>
 
 			<div class="separator"></div>
 
-			<Button link_href="/user/filemanager#files" icon="image" label="My Files"/>
-			<Button link_href="/user/filemanager#lists" icon="photo_library" label="My Albums"/>
+			<Button link_href="/user/filemanager#files" link_target={target} icon="image" label="My Files"/>
+			<Button link_href="/user/filemanager#lists" link_target={target} icon="photo_library" label="My Albums"/>
 
 			<div class="separator"></div>
 
-			<Button link_href="/user/settings" icon="settings" label="Account Settings"/>
-			<Button link_href="/user/subscription" icon="shopping_cart" label="Subscription"/>
-			<Button link_href="/user/prepaid/transactions" icon="receipt" label="Transactions"/>
+			<Button link_href="/user/settings" link_target={target} icon="settings" label="Account Settings"/>
+			<Button link_href="/user/subscription" link_target={target} icon="shopping_cart" label="Subscription"/>
+			<Button link_href="/user/prepaid/transactions" link_target={target} icon="receipt" label="Transactions"/>
 
 			{#if window.user.is_admin}
 				<div class="separator"></div>
-				<Button link_href="/admin" icon="admin_panel_settings" label="Admin Panel"/>
+				<Button link_href="/admin" link_target={target} icon="admin_panel_settings" label="Admin Panel"/>
 			{/if}
 		{:else}
-			<Button link_href="/" icon="home" label="Home"/>
-			<Button link_href="/#pro" icon="star" label="Get Premium"/>
-			<Button link_href="/login" icon="person" label="Log in"/>
-			<Button link_href="/register" icon="person" label="Register"/>
+			<Button link_href="/" link_target={target} icon="home" label="Home"/>
+			<Button link_href="/#pro" link_target={target} icon="star" label="Get Premium"/>
+			<Button link_href="/login" link_target={target} icon="person" label="Log in"/>
+			<Button link_href="/register" link_target={target} icon="person" label="Register"/>
 		{/if}
 	</div>
 </dialog>