diff --git a/website/src/lib/assets/img/home/map.png b/website/src/lib/assets/img/home/map.png
deleted file mode 100644
index e4265584a..000000000
Binary files a/website/src/lib/assets/img/home/map.png and /dev/null differ
diff --git a/website/src/lib/components/ButtonWithTooltip.svelte b/website/src/lib/components/ButtonWithTooltip.svelte
index edd809d80..7d76923cf 100644
--- a/website/src/lib/components/ButtonWithTooltip.svelte
+++ b/website/src/lib/components/ButtonWithTooltip.svelte
@@ -26,7 +26,7 @@
     <Tooltip.Root>
         <Tooltip.Trigger>
             {#snippet child({ props })}
-                <Button {...props} {variant} class={className} {onclick}>
+                <Button {...props} {variant} class="bg-inherit {className}" {onclick}>
                     {@render children()}
                 </Button>
             {/snippet}
diff --git a/website/src/lib/components/Footer.svelte b/website/src/lib/components/Footer.svelte
index 2ecbf8c53..371e87d87 100644
--- a/website/src/lib/components/Footer.svelte
+++ b/website/src/lib/components/Footer.svelte
@@ -9,7 +9,7 @@
 </script>
 
 <footer class="w-full">
-    <div class="mx-6 border-t">
+    <div class="px-6 border-t">
         <div class="mx-12 py-10 flex flex-row flex-wrap justify-between gap-x-10 gap-y-6">
             <div class="grow flex flex-col items-start">
                 <Logo class="h-8" width="153" />
diff --git a/website/src/lib/components/GPXStatistics.svelte b/website/src/lib/components/GPXStatistics.svelte
index 40838010f..75aa5bfc2 100644
--- a/website/src/lib/components/GPXStatistics.svelte
+++ b/website/src/lib/components/GPXStatistics.svelte
@@ -32,7 +32,7 @@
 <Card.Root
     class="h-full {orientation === 'vertical'
         ? 'min-w-40 sm:min-w-44'
-        : 'w-full h-10'} border-none shadow-none p-0 text-sm sm:text-base"
+        : 'w-full h-10'} border-none shadow-none p-0 text-sm sm:text-base bg-inherit"
 >
     <Card.Content
         class="h-full flex {orientation === 'vertical'
diff --git a/website/src/lib/components/Nav.svelte b/website/src/lib/components/Nav.svelte
index 9d2ebc529..e853af7a4 100644
--- a/website/src/lib/components/Nav.svelte
+++ b/website/src/lib/components/Nav.svelte
@@ -7,10 +7,10 @@
 </script>
 
 <nav class="w-full sticky top-0 bg-background z-50">
-    <div class="mx-6 py-2 flex flex-row items-center border-b gap-4 sm:gap-8">
+    <div class="px-12 py-2 flex flex-row items-center border-b gap-4 sm:gap-8">
         <a
             href={getURLForLanguage(i18n.lang, '/')}
-            class="shrink-0 translate-y-0.5 justify-self-start"
+            class="shrink-0 translate-y-0.25 justify-self-start"
         >
             <Logo class="h-8 xs:hidden" iconOnly={true} width="26" />
             <Logo class="h-8 hidden xs:block" width="153" />
diff --git a/website/src/routes/[[language]]/+page.svelte b/website/src/routes/[[language]]/+page.svelte
index fedc63bd8..30c1fb822 100644
--- a/website/src/routes/[[language]]/+page.svelte
+++ b/website/src/routes/[[language]]/+page.svelte
@@ -236,15 +236,6 @@
             </div>
         </div>
     </div>
-    <div class="px-12 w-full">
-        <div class="w-full max-w-7xl mx-auto rounded-2xl shadow-xl overflow-hidden overflow-clip">
-            <enhanced:img
-                src="/src/lib/assets/img/home/map.png"
-                alt="Screenshot of the gpx.studio map in 3D."
-                class="min-w-[800px] ml-[15%] -translate-x-[15%]"
-            />
-        </div>
-    </div>
     <div
         class="px-12 md:px-24 flex flex-row flex-wrap lg:flex-nowrap items-center justify-center -space-y-0.5 lg:-space-x-6"
     >