diff --git a/opentech/public/mailchimp/templates/mailchimp/newsletter_signup.html b/opentech/public/mailchimp/templates/mailchimp/newsletter_signup.html
index 1ce04c2bab5b8bec09b2688f2bb602de89da6f7a..1bd9984c700dee25081225c9309e896eb011efed 100644
--- a/opentech/public/mailchimp/templates/mailchimp/newsletter_signup.html
+++ b/opentech/public/mailchimp/templates/mailchimp/newsletter_signup.html
@@ -11,7 +11,7 @@
         {{ field }}
         {% endfor %}
         <div class="form-actions form-wrapper">
-            <input type="submit" value="Sign up" class="form-submit link link--button-transparent link--footer-signup">
+            <input type="submit" value="Sign up" class="form-submit button button--transparent--wide link--footer-signup">
         </div>
     </div>
 </form>
diff --git a/opentech/public/standardpages/templates/standardpages/index_page.html b/opentech/public/standardpages/templates/standardpages/index_page.html
index 9c1c40797c754f65688b3e566da2959d4cd1a6cd..7192711179980febd5eb50b562fc0a15d219922d 100644
--- a/opentech/public/standardpages/templates/standardpages/index_page.html
+++ b/opentech/public/standardpages/templates/standardpages/index_page.html
@@ -14,7 +14,7 @@
                         <a class="card-slim" href="{% pageurl subpage %}">
                             <div class="card-slim__contents">
                                 <div>
-                                    <h3 class="heading heading--no-margin">{{ subpage.listing_title|default:subpage.title }}</h3>
+                                    <h3 class="heading heading--small-margin">{{ subpage.listing_title|default:subpage.title }}</h3>
                                     {% if subpage.listing_summary or subpage.introduction %}
                                         <p class="card-slim__summary">{{ subpage.listing_summary|default:subpage.introduction }}</p>
                                     {% endif %}
diff --git a/opentech/static_src/src/sass/public/components/_button.scss b/opentech/static_src/src/sass/public/components/_button.scss
index 649ad922eee248f686cae05b7db4fea33d949365..a2962ae269586c7b310d19808157261ce7189a9a 100644
--- a/opentech/static_src/src/sass/public/components/_button.scss
+++ b/opentech/static_src/src/sass/public/components/_button.scss
@@ -22,9 +22,9 @@
         }
     }
 
-    &--transparent {
+    &--transparent,
+    &--transparent--wide {
         @include button(transparent, $color--white);
-        @include button--narrow;
 
         .header--light-bg & {
             @include button(transparent, $color--black);
@@ -42,6 +42,10 @@
         }
     }
 
+    &--transparent {
+        @include button--narrow;
+    }
+
     // cannot conform to BEM here in order to be able to override google button styles
     &--google-translate {
         width: 160px;
diff --git a/opentech/static_src/src/sass/public/components/_heading.scss b/opentech/static_src/src/sass/public/components/_heading.scss
index ca3df6619ab4aae49b3a8d781a373811c118a8f4..605edf4827d83bc8712949bbe5549d5609275a8a 100644
--- a/opentech/static_src/src/sass/public/components/_heading.scss
+++ b/opentech/static_src/src/sass/public/components/_heading.scss
@@ -15,6 +15,11 @@
         line-height: 1;
     }
 
+    &--small-margin {
+        margin: 0;
+        line-height: 1.2;
+    }
+
     &--regular {
         font-weight: $weight--normal;
     }
diff --git a/opentech/static_src/src/sass/public/components/_listing.scss b/opentech/static_src/src/sass/public/components/_listing.scss
index 159d6e7366aca380028c2227a162faf2e4909899..fd6d2dc3c48e1ca09732f6617dde4743b27cb36c 100644
--- a/opentech/static_src/src/sass/public/components/_listing.scss
+++ b/opentech/static_src/src/sass/public/components/_listing.scss
@@ -54,7 +54,7 @@
 
     &__title {
         margin-bottom: 5px;
-        line-height: 1;
+        line-height: 1.2;
         transition: color $transition;
 
         #{$root}:hover & {
diff --git a/opentech/templates/base.html b/opentech/templates/base.html
index 460aab49274b45e20e8652735a59f33937545934..eb4d38d8d350ef48c0a30b869839cf2631a7222a 100644
--- a/opentech/templates/base.html
+++ b/opentech/templates/base.html
@@ -182,7 +182,7 @@
 
                         <p>Test the OTF website for censorship</p>
 
-                        <a class="link link--button link--button-transparent" href="https://run.ooni.io/nettest?tn=web_connectivity&ta=%7B%22urls%22%3A%5B%22https%3A%2F%2Fwww.opentech.fund%2F%22%5D%7D&mv=1.2.0">Run OONI!</a>
+                        <a class="button button--transparent--wide" href="https://run.ooni.io/nettest?tn=web_connectivity&ta=%7B%22urls%22%3A%5B%22https%3A%2F%2Fwww.opentech.fund%2F%22%5D%7D&mv=1.2.0">Run OONI!</a>
 
                         <div class="footer__credits">
                             <a href="https://www.bbg.gov/" aria-label="Link to the Broadcasting Board of Governors website">