diff --git a/webapp/src/lib/components/navbar/ThemeToggle.svelte b/webapp/src/lib/components/navbar/ThemeToggle.svelte
index f0c3c47..0e4bb9b 100644
--- a/webapp/src/lib/components/navbar/ThemeToggle.svelte
+++ b/webapp/src/lib/components/navbar/ThemeToggle.svelte
@@ -14,9 +14,9 @@
 	class="py-4 px-2 md:py-0 md:px-0 self-center w-full h-full text-zinc-600 dark:text-zinc-200 md:dark:text-zinc-400 rounded hover:bg-zinc-100 dark:hover:bg-zinc-800 p-1.5"
 >
 	<span class="flex md:block justify-center items-center gap-2">
-		<span class="text-black dark:text-zinc-200 md:hidden">Toggle dark mode</span>
+		<span class="whitespace-nowrap text-black dark:text-zinc-200 md:hidden">Toggle dark mode</span>
 		<div class="h-full flex flex-col justify-center">
-			<span class="h-6 text-black dark:text-zinc-300">
+			<span class="inline-block w-6 h-6 text-black dark:text-zinc-300">
 				{#if dark}
 					<LightIcon />
 				{:else}
diff --git a/webapp/src/routes/__layout.svelte b/webapp/src/routes/__layout.svelte
index 11bf3aa..df5677e 100644
--- a/webapp/src/routes/__layout.svelte
+++ b/webapp/src/routes/__layout.svelte
@@ -46,9 +46,11 @@
 							><span class="text-[#705dcf] font-bold">Get Obsidian</span></NavBarLink
 						>
 						<NavBarLink href="https://github.com/mcndt/obsidian-note-sharing">
-							<span class="flex justify-center gap-2 items-center">
-								<span class="text-black dark:text-zinc-200 md:hidden">GitHub</span>
-								<span class="h-6 text-black dark:text-zinc-200 md:dark:text-zinc-300"
+							<span class="flex gap-2 items-center justify-center">
+								<span class="text-black dark:text-zinc-200 md:hidden whitespace-nowrap">GitHub</span
+								>
+								<span
+									class="inline-block h-6 w-6 text-black dark:text-zinc-200 md:dark:text-zinc-300"
 									><LogoGithub /></span
 								>
 							</span>