diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 1cc26cad..10f9e223 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -57,6 +57,7 @@ label {
 }
 
 .header_submit{
+  color:#272727;
   background-color:#aaa;
   background-image: -webkit-gradient(linear, left top, left bottom, from(##D2D2D2), to(#aaa)); 
   background-image: -webkit-linear-gradient(top, #D2D2D2, #aaa); 
@@ -65,9 +66,9 @@ label {
   background-image:      -o-linear-gradient(top, #D2D2D2, #aaa); 
   background-image:         linear-gradient(top, #D2D2D2, #aaa);
   box-shadow:0px 0px 4px #000;
-  color:#272727;
   border-radius:5px 5px 5px 5px;
-  padding:5px 8px;
+  margin:8px;
+  padding:3px 8px;
   text-decoration:none;
   border:medium none;
   font-family:'Carter One',arial,serif;
@@ -89,19 +90,6 @@ label {
   padding-bottom:74px;
 }
 
-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_header_right {
   float:right;
 }
diff --git a/mediagoblin/static/images/icon.png b/mediagoblin/static/images/icon.png
deleted file mode 100644
index 4f4f3e9c..00000000
Binary files a/mediagoblin/static/images/icon.png and /dev/null differ
diff --git a/mediagoblin/static/images/logo.png b/mediagoblin/static/images/logo.png
new file mode 100644
index 00000000..cf28a6d4
Binary files /dev/null and b/mediagoblin/static/images/logo.png differ
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index d6890ac0..40bb085e 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -38,7 +38,7 @@
           <div class="container_16">
             <div class="grid_16">
               {% block mediagoblin_logo %}
-                <a class="mediagoblin_logo" href="{{ request.urlgen('index') }}"></a>
+                <a class="mediagoblin_logo" href="{{ request.urlgen('index') }}"><img src="{{ request.staticdirect('/images/logo.png') }}" alt="Mediagoblin logo" /></a>
               {% endblock %}
               {% if request.user %}
               <a class="header_submit" href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit media</a>