diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index d61292a2..cec236f4 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -98,24 +98,6 @@ a.mediagoblin_logo{
   font-weight: bold;
 }
 
-.header_submit, .header_submit_highlight{
-  color: #c3c3c3;
-  background-color: #2d2d2d;
-  border: 1px solid;
-  border-color: #323232 #232323 #1F1F1F;
-  border-radius: 4px;
-  margin: 8px;
-  padding: 3px 8px;
-  text-decoration: none;
-  font-style: normal;
-  font-weight: bold;
-  font-size: 1em;
-}
-
-.header_submit_highlight{
-background-image: -moz-linear-gradient(center top , rgb(134, 212, 177), rgb(109, 173, 144));
-}
-
 .mediagoblin_footer {
   height: 30px;
   border-top: 1px solid #333;
@@ -135,7 +117,26 @@ background-image: -moz-linear-gradient(center top , rgb(134, 212, 177), rgb(109,
 
 /* common website elements */
 
-.button, .cancel_link {
+.button_action, .button_action_highlight{
+  color: #c3c3c3;
+  background-color: #363636;
+  border: 1px solid;
+  border-color: #464646 #2B2B2B #252525;
+  border-radius: 4px;
+  margin: 8px;
+  padding: 3px 8px;
+  text-decoration: none;
+  font-style: normal;
+  font-weight: bold;
+  font-size: 1em;
+}
+
+.button_action_highlight{
+background-image: -moz-linear-gradient(center top , rgb(134, 212, 177), rgb(109, 173, 144));
+}
+
+
+.button_form, .cancel_link {
   height: 32px;
   min-width: 99px;
   background-color: #86d4b1;
diff --git a/mediagoblin/templates/mediagoblin/auth/change_fp.html b/mediagoblin/templates/mediagoblin/auth/change_fp.html
index 53186cec..fa972085 100644
--- a/mediagoblin/templates/mediagoblin/auth/change_fp.html
+++ b/mediagoblin/templates/mediagoblin/auth/change_fp.html
@@ -30,7 +30,7 @@
 
       {{ wtforms_util.render_divs(cp_form) }}
       <div class="form_submit_buttons">
-        <input type="submit" value="submit" class="button"/>
+        <input type="submit" value="submit" class="button_form"/>
       </div>
 
     </div>
diff --git a/mediagoblin/templates/mediagoblin/auth/forgot_password.html b/mediagoblin/templates/mediagoblin/auth/forgot_password.html
index 9b821426..41940742 100644
--- a/mediagoblin/templates/mediagoblin/auth/forgot_password.html
+++ b/mediagoblin/templates/mediagoblin/auth/forgot_password.html
@@ -27,7 +27,7 @@
       <h1>{% trans %}Recover password{% endtrans %}</h1>
       {{ wtforms_util.render_divs(fp_form) }}
       <div class="form_submit_buttons">
-        <input type="submit" value="{% trans %}Send instructions{% endtrans %}" class="button"/>
+        <input type="submit" value="{% trans %}Send instructions{% endtrans %}" class="button_form"/>
       </div>
     </div>
   </form>
diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html
index 756f67c0..c3807e5f 100644
--- a/mediagoblin/templates/mediagoblin/auth/login.html
+++ b/mediagoblin/templates/mediagoblin/auth/login.html
@@ -42,10 +42,10 @@
           {% trans %}Forgot your password?{% endtrans %}</a>
         </p>
       <div class="form_submit_buttons">
-        <input type="submit" value="{% trans %}Log in{% endtrans %}" class="button"/>
+        <input type="submit" value="{% trans %}Log in{% endtrans %}" class="button_form"/>
       </div>
       {% if next %}
-        <input type="hidden" name="next" value="{{ next }}" class="button"
+        <input type="hidden" name="next" value="{{ next }}" class="button_form"
                style="display: none;"/>
       {% endif %}
     </div>
diff --git a/mediagoblin/templates/mediagoblin/auth/register.html b/mediagoblin/templates/mediagoblin/auth/register.html
index 25b68058..a0d0a277 100644
--- a/mediagoblin/templates/mediagoblin/auth/register.html
+++ b/mediagoblin/templates/mediagoblin/auth/register.html
@@ -29,7 +29,7 @@
       {{ csrf_token }}
       <div class="form_submit_buttons">
         <input type="submit" value="{% trans %}Create{% endtrans %}"
-               class="button" />
+               class="button_form" />
       </div>
     </div>
   </form>
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 64fafb73..ede5f5c6 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -47,7 +47,7 @@
                      alt="{% trans %}MediaGoblin logo{% endtrans %}" /></a>
             {% endblock %}
             {% if request.user and request.user['status'] == 'active' %}
-              <a class="header_submit"
+              <a class="button_action"
                  href="{{ request.urlgen('mediagoblin.submit.start') }}">
                 {% trans %}Submit media{% endtrans %}
               </a>
@@ -59,8 +59,8 @@
                 {% if request.user.status == "needs_email_verification" %}
                   <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
                                               user=request.user['username']) }}"
-                     class="header_submit">
-                    {% trans %}verify your email!{% endtrans %}</a>
+                     class="button_action_highlight">
+                    {% trans %}Verify your email!{% endtrans %}</a>
                 {% endif %}
 
                 <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
diff --git a/mediagoblin/templates/mediagoblin/edit/attachments.html b/mediagoblin/templates/mediagoblin/edit/attachments.html
index d8b55f58..576642cf 100644
--- a/mediagoblin/templates/mediagoblin/edit/attachments.html
+++ b/mediagoblin/templates/mediagoblin/edit/attachments.html
@@ -48,7 +48,7 @@
       {{ wtforms_util.render_divs(form) }}
       <div class="form_submit_buttons">
         <a href="{{ media.url_for_self(request.urlgen) }}">Cancel</a>
-        <input type="submit" value="Save changes" class="button" />
+        <input type="submit" value="Save changes" class="button_form" />
 	{{ csrf_token }}
       </div>
     </div>
diff --git a/mediagoblin/templates/mediagoblin/edit/edit.html b/mediagoblin/templates/mediagoblin/edit/edit.html
index b4b3be85..73c2bada 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit.html
@@ -34,7 +34,7 @@
       {{ wtforms_util.render_divs(form) }}
       <div class="form_submit_buttons">
         <a href="{{ media.url_for_self(request.urlgen) }}">{% trans %}Cancel{% endtrans %}</a>
-        <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button" />
+        <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button_form" />
 	{{ csrf_token }}
       </div>
     </div>
diff --git a/mediagoblin/templates/mediagoblin/edit/edit_profile.html b/mediagoblin/templates/mediagoblin/edit/edit_profile.html
index 93b2a792..bf8fe5c1 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit_profile.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit_profile.html
@@ -32,7 +32,7 @@
       </h1>
       {{ wtforms_util.render_divs(form) }}
       <div class="form_submit_buttons">
-        <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button" />
+        <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button_form" />
 	{{ csrf_token }}
       </div>
     </div>
diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html
index 43d973d1..25ce9e96 100644
--- a/mediagoblin/templates/mediagoblin/root.html
+++ b/mediagoblin/templates/mediagoblin/root.html
@@ -30,9 +30,9 @@
       {% if allow_registration %}
         <p>{% trans %}Don't have one yet? It's easy!{% endtrans %}</p>
         {% trans register_url=request.urlgen('mediagoblin.auth.register') -%}
-          <a class="header_submit_highlight" href="{{ register_url }}">Create an account at this site</a>
+          <a class="button_action_highlight" href="{{ register_url }}">Create an account at this site</a>
           or
-          <a class="header_submit" href="http://wiki.mediagoblin.org/HackingHowto">Set up MediaGoblin on your own server</a>
+          <a class="button_action" href="http://wiki.mediagoblin.org/HackingHowto">Set up MediaGoblin on your own server</a>
         {%- endtrans %}
       {% endif %}
     </div>
diff --git a/mediagoblin/templates/mediagoblin/submit/start.html b/mediagoblin/templates/mediagoblin/submit/start.html
index 29b01181..1a0dd4b7 100644
--- a/mediagoblin/templates/mediagoblin/submit/start.html
+++ b/mediagoblin/templates/mediagoblin/submit/start.html
@@ -27,7 +27,7 @@
       {{ wtforms_util.render_divs(submit_form) }}
       <div class="form_submit_buttons">
         {{ csrf_token }}
-        <input type="submit" value="{% trans %}Submit{% endtrans %}" class="button" />
+        <input type="submit" value="{% trans %}Submit{% endtrans %}" class="button_form" />
       </div>
     </div>
   </form>
diff --git a/mediagoblin/templates/mediagoblin/test_submit.html b/mediagoblin/templates/mediagoblin/test_submit.html
index 190b9ac3..38be8efc 100644
--- a/mediagoblin/templates/mediagoblin/test_submit.html
+++ b/mediagoblin/templates/mediagoblin/test_submit.html
@@ -25,7 +25,7 @@
         {{ wtforms_util.render_table(image_form) }}
         <tr>
           <td></td>
-          <td><input type="submit" value="submit" class="button" /></td>
+          <td><input type="submit" value="submit" class="button_form" /></td>
 	  {{ csrf_token }}
         </tr>
       </table>
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 4b02b684..c8a9650f 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -98,7 +98,7 @@
                                            media=media._id) }}" method="POST">
             {{ wtforms_util.render_divs(comment_form) }}
             <div class="form_submit_buttons">
-              <input type="submit" value="{% trans %}Post comment!{% endtrans %}" class="button" />
+              <input type="submit" value="{% trans %}Post comment!{% endtrans %}" class="button_form" />
                 {{ csrf_token }}
             </div>
           </form>
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
index 8da90f79..c3a9d622 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
@@ -47,7 +47,7 @@
       <div class="form_submit_buttons">
         {# TODO: This isn't a button really... might do unexpected things :) #}
 	<a class="cancel_link" href="{{ media.url_for_self(request.urlgen) }}">{% trans %}Cancel{% endtrans %}</a>
-        <input type="submit" value="{% trans %}Delete Permanently{% endtrans %}" class="button" />
+        <input type="submit" value="{% trans %}Delete Permanently{% endtrans %}" class="button_form" />
 	{{ csrf_token }}
       </div>
     </div>
diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index d6a9fe1f..91dd2369 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -62,7 +62,7 @@
         <p>{% trans %}In case it doesn't:{% endtrans %}</p>
   
         <a href="{{ request.urlgen('mediagoblin.auth.resend_verification') }}"
-           class="button">{% trans %}Resend verification email{% endtrans %}</a>
+           class="button_form">{% trans %}Resend verification email{% endtrans %}</a>
       </div>
     {% else %}
       {# if the user is not you, but still needs to verify their email #}
@@ -97,7 +97,7 @@
           </p>
           <a href="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{
                             user.username }}"
-             class="header_submit">
+             class="button_action">
             {%- trans %}Edit profile{% endtrans -%}
           </a>
         </div>
@@ -147,7 +147,7 @@
             This is where your media will appear, but you don't seem to have added anything yet.
             {%- endtrans %}
           </p>
-          <a class="header_submit"
+          <a class="button_action"
              href="{{ request.urlgen('mediagoblin.submit.start') }}">
             {%- trans %}Add media{% endtrans -%}
           </a>