diff --git a/app/templates/legal/cookies.html b/app/templates/legal/cookies.html
index d9bcf9a3..dfd93f80 100644
--- a/app/templates/legal/cookies.html
+++ b/app/templates/legal/cookies.html
@@ -41,13 +41,13 @@ <h1 class="tna-hgroup__title">Cookies</h1>
         </div>
       </div>
     </div>
-    <div class="tna-container tna-section tna-!--no-margin-top">
+    <div class="tna-container tna-section tna-!--no-padding-top">
       <section class="tna-column tna-column--width-2-3 tna-column--full-small tna-column--full-tiny tna-!--margin-top-l">
         <form method="post" action="{{ url_for('legal.cookies') }}" id="cookie-settings">
           <div class="tna-aside tna-accent-green tna-background-accent" role="alert" id="cookie-settings-success"{% if request.args.saved == 'true' %} tabindex="-1" autofocus{% else %} hidden{% endif %}>
             <h2 class="tna-heading-l">Success</h2>
             <p>Your cookie settings were saved.</p>
-            {% if request.args.referrer %}
+            {% if request.args.referrer and request.args.referrer != request.base_url %}
             <p>
               <a href="{{ request.args.referrer }}">Go back to the page you were looking at</a>
             </p>
diff --git a/src/styles/modules/_generics.scss b/src/styles/modules/_generics.scss
index 349080eb..2892ee11 100644
--- a/src/styles/modules/_generics.scss
+++ b/src/styles/modules/_generics.scss
@@ -42,3 +42,17 @@ p.etna-small-paragraph {
     }
   }
 }
+
+:first-child[hidden] {
+  + .tna-hgroup-xl,
+  + .tna-hgroup-l,
+  + .tna-hgroup-m,
+  + .tna-hgroup-s,
+  + .tna-heading-s,
+  + .tna-heading-m,
+  + .tna-heading-l,
+  + .tna-heading-xl {
+    margin-top: 0;
+    padding-top: 0;
+  }
+}