diff --git a/aleksis/core/static/public/style.scss b/aleksis/core/static/public/style.scss
index 90a698ef3d401aa4bb78ab1907f576ca3a8f83b4..3fb108dad7c03c66791fb86ebb51e599764bc747 100644
--- a/aleksis/core/static/public/style.scss
+++ b/aleksis/core/static/public/style.scss
@@ -942,13 +942,9 @@ $person-logo-size: 20vh;
 .login-card-action {
   display: grid;
   grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
-  row-gap: 10px;
+  row-gap: 0.7rem;
   & *:last-child {
     grid-column: -2;
     text-align: center;
   }
 }
-
-p.action-margin>a, p.action-margin>button {
-  margin-bottom: 10px;
-}
diff --git a/aleksis/core/templates/socialaccount/snippets/provider_list.html b/aleksis/core/templates/socialaccount/snippets/provider_list.html
index d29e18155b4266620d338bef820e483221c49f91..706e81b877936c946c9498201d8af46e95ffdb2e 100644
--- a/aleksis/core/templates/socialaccount/snippets/provider_list.html
+++ b/aleksis/core/templates/socialaccount/snippets/provider_list.html
@@ -1,5 +1,5 @@
 {% load i18n socialaccount %}
-<p class="action-margin">
+<p>
   {% get_providers as socialaccount_providers %}
   {% if socialaccount_providers %}
     {% for provider in socialaccount_providers %}
@@ -7,7 +7,7 @@
         {% for brand in provider.get_brands %}
             <a title="{{brand.name}}" 
               class="socialaccount_provider {{provider.id}} {{brand.id}}
-              btn-large waves-effect waves-light primary-color" 
+              btn-large waves-effect waves-light primary-color margin-bottom"
               href="{% provider_login_url provider.id openid=brand.openid_url process=process %}">
               {% blocktrans with name=brand.name %}
                 Login with {{ name }}
@@ -16,7 +16,7 @@
         {% endfor %}
       {% endif %}
         <a title="{{provider.name}}" class="socialaccount_provider {{provider.id}}
-        btn hundred-percent waves-effect waves-light primary-color" 
+        btn hundred-percent waves-effect waves-light primary-color margin-bottom"
           href="{% provider_login_url provider.id process=process scope=scope auth_params=auth_params %}">
           {% blocktrans with name=provider.name %}
             Login with {{ name }}
diff --git a/aleksis/core/templates/two_factor/core/login.html b/aleksis/core/templates/two_factor/core/login.html
index 22374642d2c1bac822af09765a28233de412a676..819b209979796b358538d22dcf89cf07abec0cbf 100644
--- a/aleksis/core/templates/two_factor/core/login.html
+++ b/aleksis/core/templates/two_factor/core/login.html
@@ -96,7 +96,7 @@
               <i class="material-icons right">send</i>
             </button>
             {% if request.site.preferences.auth__allow_password_change and wizard.steps.current == "auth" %}
-              <a href="{% url "account_reset_password" %}" class="btn-flat right waves-effect waves-light">
+              <a href="{% url "account_reset_password" %}" class="btn-flat right waves-effect waves-red">
                 {% trans "Reset password" %}
               </a>
             {% endif %}
@@ -109,9 +109,10 @@
               <div class="card-title">{% trans "Device currently not available?" %}</div>
               {% if other_devices %}
                 <p>{% trans "Or, alternatively, use one of your backup phones:" %}</p>
-                <p class="action-margin">
+                <p>
                   {% for other in other_devices %}
-                    <button name="challenge_device" value="{{ other.persistent_id }}" class="btn" type="submit">
+                    <button name="challenge_device" value="{{ other.persistent_id }}" class="btn margin-bottom"
+                            type="submit">
                       {{ other|device_action }}
                     </button>
                   {% endfor %}