diff --git a/public/css/default.css b/public/css/default.css
index d9cfd7cf..5bee2714 100644
--- a/public/css/default.css
+++ b/public/css/default.css
@@ -7,6 +7,13 @@
 @import url(//fonts.googleapis.com/css?family=Press+Start+2P);
 @import url(//fonts.googleapis.com/css?family=Open+Sans:400,400italic,700,700italic);
 
+@font-face {
+    font-family: 'Invaders';
+    src: url('fonts/invaders.ttf') format('truetype');
+    font-weight: normal;
+    font-style: normal;
+}
+
 body {
 	font: 13px/1.7 "Open Sans", "Helvetica", sans-serif;
 	padding: 0 0 3em;
@@ -44,19 +51,23 @@ h1#logo {
 	padding: 0;
 	text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.6);
 }
-h1#logo a {
+h1#logo:before {
+	color: #fff;
+	content: 'B';
+	float: left;
+	font: 75px 'Invaders';
+	margin: -4px 20px 0 0;
+	padding: 0;
+	text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.6);
+}
+a h1#logo {
 	text-decoration: none;
-	color: inherit;
 }
-h1#logo span.name {
-	padding-right: 7px;
-}
-h1#logo span.area:before {
-	content: '|';
-	font-weight: 400;
-	letter-spacing: 7px;
+a:hover h1#logo, a:hover h1#logo:before {
+	text-shadow: 2px 2px 3px rgba(0, 0, 0, 0.6);
 }
 
+
 /* Navigation
 ---------------*/
 ul#nav {
@@ -79,7 +90,7 @@ ul#nav li a {
 	text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.7);
 }
 ul#nav li a:hover {
-	border-bottom: 3px solid rgba(255, 255, 255, 0.5);
+	text-shadow: 2px 2px 3px rgba(0, 0, 0, 0.6);
 }
 
 
diff --git a/public/css/fonts/invaders.ttf b/public/css/fonts/invaders.ttf
new file mode 100644
index 00000000..b1cb7718
Binary files /dev/null and b/public/css/fonts/invaders.ttf differ
diff --git a/templates/MainTemplate.php b/templates/MainTemplate.php
index 83843e3e..d8ec8c84 100644
--- a/templates/MainTemplate.php
+++ b/templates/MainTemplate.php
@@ -35,7 +35,9 @@ class MainTemplate extends Template
 	</head>
 	<body', !empty($this->classes) ? ' class="' . implode(' ', $this->classes) . '"' : '', '>
 		<header>
-			<h1 id="logo"><a href="', BASEURL, '/">#pics</a></h1>
+			<a href="', BASEURL, '/">
+				<h1 id="logo">#pics</h1>
+			</a>
 			<ul id="nav">
 				<li><a href="', BASEURL, '/">albums</a></li>
 				<li><a href="', BASEURL, '/people/">people</a></li>