diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 1914b6e..c789019 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,47 +1,57 @@
-<footer class="footer">
-	<div class="container">
-		<div class="has-text-centered">
-			<p>
-				Copyright &copy; {{ now.Year }}
-				<a href="{{ .Site.Params.website }}">{{ .Site.Params.author }}</a>.
-				All rights reserved. Made with ♥️ and <a href="https://gohugo.io">Hugo</a>.
-				{{/* The site urls are hard coded because both sites are located at the same path but the base website
-				url is different on the docs page */}}
+<footer class="mt-12 border-t-2 border-gray-200 py-8 md:flex text-left text-sm text-gray-800 mx-auto max-w-screen-xl">
+
+
+
+		<div class="w-full md:w-1/5 flex flex-col">
+			<img src="{{ .Site.BaseURL }}images/vikunja-logo.svg" alt="{{ .Site.Title }}" class="h-8" width="109" height="32"/>
+			<p class="py-4 text-gray-600">
+				&copy; {{ now.Year }}<br/>
+				Made with ♥️ and <a href="https://gohugo.io">Hugo</a>.
 			</p>
-			<p class="mt-2">
-				<a href="https://vikunja.io/contact/">Contact</a> |
-				<a href="https://vikunja.io/privacy/">Privacy Policy</a> |
-				<a href="https://vikunja.cloud/?utm_source=io&utm_medium=io&utm_campaign=footer">Get a hosted Vikunja Account</a> |
-				<a href="https://vikunja.cloud/stickers?utm_source=io&utm_medium=io&utm_campaign=footer">Buy Stickers</a>
-			</p>
-			<p class="footer-buttons">
-				<a href="https://matrix.to/#/#vikunja:matrix.org">
-					<img src="https://img.shields.io/badge/chat-on%20matrix.org-brightgreen" alt="Chat on matrix.org"/>
-				</a>
-				<a target="_blank" href="https://www.buymeacoffee.com/kolaente" class="button coffee is-primary">
-					<span class="icon is-small">
-						<img src="https://cdn.buymeacoffee.com/buttons/bmc-new-btn-logo.svg" alt="Buy me a coffee">
-					</span>
-					<span>Buy Me A Coffe</span>
-				</a>
-				<iframe src="https://github.com/sponsors/kolaente/button" title="Sponsor kolaente" height="35" width="116" style="border: 0;"></iframe>
-				<a target="_blank" href="https://opencollective.com/vikunja">
-					Support on Opencollective
-				</a>
-				<a target="_blank" href="https://twitter.com/vikunjaio">
-					Twitter
-				</a>
-			</p>
-			{{/*
-			Commented out until we actually have a multi-language website.
-			<p>
-				{{ $lang := .Lang }}{{ $base := .Site.BaseURL }}{{ range .Site.Languages }}
-				<a class="nav-link" href="{{ $base }}{{ .Lang }}">{{ .LanguageName }}</a>
-				{{ end }}
-			</p>
-			*/}}
+			<a href="https://twitter.com/vikunjaio" target="_blank" rel="noopener" class="hover:underline pb-2">Twitter</a>
+			<a href="https://matrix.to/#/#vikunja:matrix.org">
+				<img src="https://img.shields.io/badge/chat-on%20matrix.org-brightgreen" alt="Chat on matrix.org"/>
+			</a>
+		</div>
+		<div class="md:w-1/5"></div>
+		<div class="w-full md:w-1/5 mt-4 md:mt-0 flex flex-col">
+			<h3 class="font-title font-bold text-base mb-4 md:mb-6">Support Us</h3>
+			<a href="https://www.buymeacoffee.com/kolaente" class="hover:underline pb-2 flex align-middle" target="_blank">
+				<img src="https://cdn.buymeacoffee.com/buttons/bmc-new-btn-logo.svg" alt="Buy me a coffee" class="w-3 mr-1"/>
+				<span>
+					Buy Me a Coffee
+				</span>
+			</a>
+			<a href="https://github.com/sponsors/kolaente/button" class="hover:underline pb-2 flex align-middle" target="_blank">
+				<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 mr-1" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+					<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4.318 6.318a4.5 4.5 0 000 6.364L12 20.364l7.682-7.682a4.5 4.5 0 00-6.364-6.364L12 7.636l-1.318-1.318a4.5 4.5 0 00-6.364 0z" />
+				</svg>
+				<span>
+					Sponsor on Github
+				</span>
+			</a>
+			<a href="https://opencollective.com/vikunja" class="hover:underline pb-2" target="_blank">Sponsor on Opencollective</a>
+			<a href="https://vikunja.cloud/stickers?utm_source=io&utm_medium=io&utm_campaign=footer" class="hover:underline pb-2">Buy Stickers</a>
+		</div>
+		<div class="w-full md:w-1/5 mt-4 md:mt-0 flex flex-col">
+			<h3 class="font-title font-bold text-base mb-4 md:mb-6">Product</h3>
+			<a href="https://vikunja.cloud/features" class="hover:underline pb-2">Features</a>
+			<a href="https://vikunja.cloud/managed-service" class="hover:underline pb-2">Managed Service</a>
+			<a href="https://vikunja.cloud/?utm_source=io&utm_medium=io&utm_campaign=footer" class="hover:underline pb-2">Get it Hosted</a>
+			<a href="https://vikunja.cloud/stickers" class="hover:underline pb-2">Stickers</a>
+		</div>
+		<div class="w-full md:w-1/5 mt-4 md:mt-0 flex flex-col">
+			<h3 class="font-title font-bold text-base mb-4 md:mb-6">About</h3>
+			<a href="/" class="hover:underline pb-2">Home</a>
+			<a href="/docs" class="hover:underline pb-2">Docs</a>
+			<a href="/contact/" class="hover:underline pb-2">Contact</a>
+			<a href="/survey" class="hover:underline pb-2">Feedback Survey</a>
+		</div>
+		<div class="w-full md:w-1/5 mt-4 md:mt-0 flex flex-col">
+			<h3 class="font-title font-bold text-base mb-4 md:mb-6">Legal</h3>
+			<a href="/privacy" class="hover:underline pb-2">Privacy Policy</a>
+			<a href="/imprint" class="hover:underline pb-2">Imprint</a>
 		</div>
-	</div>
 </footer>
 
 <script>