diff --git a/frontend/templates/registration/login.html b/frontend/templates/registration/login.html
index f81aca4e..36009c72 100644
--- a/frontend/templates/registration/login.html
+++ b/frontend/templates/registration/login.html
@@ -2,7 +2,6 @@
 
 {% block title %}Log in to Unglue.it{% endblock %}
 {% block doccontent %}
-<div id="lightbox_content">
 
 {% if form.errors %}
 {% for error in form.non_field_errors %}
@@ -16,7 +15,6 @@ Make sure the username box has your <b>username, not your email</b> -- some brow
         <p>
             We've sent your book to your Kindle.  Happy reading!
         </p>
-        
         <p>
             In the future you can send yourself unglued ebooks with one click.  Log in, or sign up, and we'll add your Kindle email to your profile so you never have to enter it again.
         </p>
@@ -31,14 +29,19 @@ Make sure the username box has your <b>username, not your email</b> -- some brow
 <a href="{% url 'libraryauth_password_reset' %}?next={% if request.GET.next %}{{ request.GET.next|urlencode }}{% else %}{{ request.get_full_path|urlencode}}{% endif %}">Forgot</a> your password?  <a href="{% url 'registration_register' %}?next={% if request.GET.next %}{{ request.GET.next|urlencode }}{% else %}{{ request.get_full_path|urlencode}}{% endif %}">Need an account</a>?  <a href="/faq/basics/account">Other questions</a>?
 
 
-<br /><br />
-
-   <a  class="btn btn-social btn-google-plus" href="{% url 'social:begin' "google-oauth2" %}?next={% if request.GET.next %}{{ request.GET.next|urlencode }}{% else %}{{ request.get_full_path|urlencode}}{% endif %}" ><i class="fa fa-google"></i>Sign in with Google</a>
-   <a  class="btn btn-social btn-yahoo" href="{% url 'social:begin' "yahoo" %}?next={% if request.GET.next %}{{ request.GET.next|urlencode }}{% else %}{{ request.get_full_path|urlencode}}{% endif %}" ><i class="fa fa-yahoo"></i>Sign in with Yahoo!</a>
+<div class="google-signup">
+    <a  class="btn btn-social btn-google-plus" href="{% url 'social:begin' "google-oauth2" %}?next={% if request.GET.next %}{{ request.GET.next|urlencode }}{% else %}{{ request.get_full_path|urlencode}}{% endif %}" >
+        <i class="fa fa-google"></i>
+        Sign in with Google
+    </a>
+    <a  class="btn btn-social btn-yahoo" href="{% url 'social:begin' "yahoo" %}?next={% if request.GET.next %}{{ request.GET.next|urlencode }}{% else %}{{ request.get_full_path|urlencode}}{% endif %}" >
+        <i class="fa fa-yahoo"></i>
+        Sign in with Yahoo!
+    </a>
+</div>
 {% else %}
 <div>
 You are already logged in as <a href="{% url 'supporter' user %}">{{ user.username }}</a>.
 </div>
 {% endif %}
-</div>
 {% endblock %}
diff --git a/frontend/templates/registration/login_form.html b/frontend/templates/registration/login_form.html
index 9c313d48..75765df0 100644
--- a/frontend/templates/registration/login_form.html
+++ b/frontend/templates/registration/login_form.html
@@ -1,11 +1,10 @@
 <!-- login_form.html -->
 <form method="post" action="{% url 'superlogin' %}" class="login">{% csrf_token %}
-    {{ form.username.label_tag }}    
+    {{ form.username.label_tag }}
     {{ form.username }}
     {{ form.password.label_tag }}
     {{ form.password }}
-    <br />
-    <input type="submit" name="submit" value="Sign in with Password" />
+    <input type="submit" name="submit" class="button success float-center" value="Sign in"/>
 
 <input type="hidden" name="next" value="{% if next %}{{ next }}{% else %}/{% endif %}" />
 </form>
diff --git a/frontend/templates/registration/registration_form.html b/frontend/templates/registration/registration_form.html
index 8e24b1f2..dc9a14ca 100644
--- a/frontend/templates/registration/registration_form.html
+++ b/frontend/templates/registration/registration_form.html
@@ -23,7 +23,7 @@
     <div>{{ form.email.label }}: {{ form.email.errors }}<br />{{ form.email }}</div>
     <div>{{ form.password1.label }}: {{ form.password1.errors }}<br />{{ form.password1 }}</div>
     <div>{{ form.password2.label }}: {{ form.password2.errors }}<br />{{ form.password2 }}</div>
-    <input type="submit" class="float-center" value="Send activation email"  onclick="this.disabled=true,this.form.submit();" />
+    <input type="submit" class="button success float-center" value="Send activation email"  onclick="this.disabled=true,this.form.submit();" />
 </form>
 
 
diff --git a/static/scss/registration.scss b/static/scss/registration.scss
index cebb4e20..e7a15420 100644
--- a/static/scss/registration.scss
+++ b/static/scss/registration.scss
@@ -18,6 +18,10 @@
 .google-signup {
     display: flex;
     flex-direction: column;
+
+    & > *{
+        margin: 7px 0px;
+    }
 }
 
 .linetext-outer {
diff --git a/static/scss/sitewide4.scss b/static/scss/sitewide4.scss
index 6c1a2c63..96a4fdd6 100644
--- a/static/scss/sitewide4.scss
+++ b/static/scss/sitewide4.scss
@@ -216,15 +216,6 @@ h3 {
     }
 }
 
-input[type="submit"], a.fakeinput {
-	background: $call-to-action;
-	color: white;
-	font-weight: bold;
-	padding: 0.5em 1em;
-	cursor: pointer;
-}
-
-
 .loader-gif[disabled="disabled"], .loader-gif.show-loading {
     background: url('/static/images/loading.gif') center no-repeat !important;
 }
@@ -449,53 +440,6 @@ input[type="submit"], a.fakeinput {
     line-height: normal;
 }
 
-form.login, #login form {
-    label {
-        display: block;
-        line-height: 20px;
-        font-size: $font-size-larger;
-    }
-
-    input {
-        width: 90%;
-        @include one-border-radius(5px);
-        border: 1px solid $blue-grey;
-        @include height(18px);
-        margin-bottom: 6px;
-
-        &[type=submit] {
-            text-decoration: capitalize;
-            @include actionbuttons;
-        }
-
-        &:focus {
-            border: solid 1px $call-to-action;
-        }
-    }
-
-	input[type="text"], input[type="password"] {
-    	@include height($font-size-default*1.75);
-        margin-bottom: $font-size-default;
-        border-width: 2px;
-	}
-
-	input[type="submit"] {
-	    font-size: $font-size-larger;
-	}
-
-
-    span.helptext {
-        display: block;
-        margin-top: -11px;
-        font-style: italic;
-        font-size: $font-size-default;
-    }
-}
-
-#lightbox_content a.btn {
-    color: #FFF;
-}
-
 .js-search {
     float:left;
     padding-top:25px;