diff --git a/public/assets/css/general.css b/public/assets/css/general.css
index 4de74521..2cd04f0f 100644
--- a/public/assets/css/general.css
+++ b/public/assets/css/general.css
@@ -416,20 +416,25 @@ table {
 	z-index: 1;
 }
 
-.nav-bar-logo, .nav-bar-title, .nav-bar-link, .nav-bar-subtitle {
+.nav-bar-title, .nav-bar-link {
 	padding: 2rem 1rem 1.5rem 1rem;
 	display: inline-block;
 	color: black;
 }
 
+.nav-bar-logo {
+	vertical-align: text-bottom;
+	height: 2em;
+}
+
 .nav-bar-title--superscript {
 	font-size: small;
 	vertical-align: top;
 }
 
-.nav-bar-subtitle {
+.nav-bar-title--tagline {
 	font-size: small;
-	padding-left: 4rem;
+	vertical-align: bottom;
 }
 
 .nav-bar-link {
diff --git a/public/assets/css/mediaQueries.css b/public/assets/css/mediaQueries.css
index 34d81206..ab4178c4 100644
--- a/public/assets/css/mediaQueries.css
+++ b/public/assets/css/mediaQueries.css
@@ -1,7 +1,7 @@
 
 @media (max-width: 1050px) {
 
-	.nav-bar-subtitle {
+	.nav-bar-title--tagline {
 		display: none;
 	}
 }
diff --git a/public/assets/img/logo.gif b/public/assets/img/logo.gif
new file mode 100644
index 00000000..259a18e0
Binary files /dev/null and b/public/assets/img/logo.gif differ
diff --git a/views/partials/navBar.handlebars b/views/partials/navBar.handlebars
index 23c0f688..b356b7f8 100644
--- a/views/partials/navBar.handlebars
+++ b/views/partials/navBar.handlebars
@@ -1,7 +1,8 @@
 <div class="row-wide nav-bar">
     <div class="nav-bar-title-section">
-        <a href="/"><span class="nav-bar-title">spee&lt;h</span></a><span class="nav-bar-title nav-bar-title--superscript">(beta)</span>
-        <div class="nav-bar-subtitle">Open-source, decentralized image and video hosting.</div>
+        <a href="/"><img class="nav-bar-logo nav-bar-title" src="/assets/img/logo.gif" alt="spee.ch"/></a>
+        <span class="nav-bar-title nav-bar-title--tagline">Open-source, decentralized image and video hosting.</span>
+        <span class="nav-bar-title nav-bar-title--superscript">(beta)</span>
         <div class="nav-bar-link-section">
             <a class="nav-bar-link" href="/">Upload</a>
             <a class="nav-bar-link" href="/popular">Popular</a>