diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 55e5a02e..53efd079 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -46,9 +46,17 @@ label {
   margin-bottom:40px;
 }
 
-.icon {
-  vertical-align:middle;
+a.mediagoblin_logo {
+  width:34px;
+  height:25px;
   margin-right:10px;
+  background-image:url('../images/icon.png');
+  background-position:0px 0px;
+  display:inline-block;
+}
+
+a.mediagoblin_logo:hover {
+  background-position:0px -28px;
 }
 
 .mediagoblin_container {
diff --git a/mediagoblin/static/images/icon.png b/mediagoblin/static/images/icon.png
index 47f07b9a..4f4f3e9c 100644
Binary files a/mediagoblin/static/images/icon.png and b/mediagoblin/static/images/icon.png differ
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 0ba09646..704e5aa7 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -30,8 +30,8 @@
       <div class="mediagoblin_header">
       <div class="mediagoblin_container">
               {% block mediagoblin_logo %}
-                <a href="{{ request.urlgen('index') }}"><img src="{{ request.staticdirect('/images/icon.png') }}" class="icon" /></a>
-              {% endblock %}{% block mediagoblin_header_title %}GNU MediaGoblin Home{% endblock %}
+                <a class="mediagoblin_logo" href="{{ request.urlgen('index') }}"></a>
+              {% endblock %}{% block mediagoblin_header_title %}{% endblock %}
         <div class="mediagoblin_header_right">
           {% if request.user %}
                 {{ request.user['username'] }}'s account