diff --git a/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html b/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
index 94e56782d5..9cc435b962 100644
--- a/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
+++ b/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
@@ -16,7 +16,7 @@
             <span role="columnheader" aria-sort="none">{% trans "Price total" %}</span>
         </div>
     </div>
-    <div role="rowgroup">
+    <div role="rowgroup" class="firstchild-in-panel">
     {% for line in cart.positions %}
         <div role="row" class="row cart-row {% if download %}has-downloads{% endif %}{% if editable %}editable{% endif %}">
             <div role="cell" class="product">
diff --git a/src/pretix/static/pretixpresale/scss/_cart.scss b/src/pretix/static/pretixpresale/scss/_cart.scss
index ec7303fcf1..2747e3cdea 100644
--- a/src/pretix/static/pretixpresale/scss/_cart.scss
+++ b/src/pretix/static/pretixpresale/scss/_cart.scss
@@ -1,6 +1,6 @@
 .cart-row {
     /* Cart grid */
-    padding: 10px 0;
+    padding: 0.75*$line-height-computed 0;
 
     .product>*:last-child {
         margin-bottom: 0;
@@ -100,6 +100,9 @@
     }
 }
 
+.cart .firstchild-in-panel .cart-row:first-child {
+    padding-top: 0;
+}
 .cart [role=rowgroup]:last-child {
     border-top: 1px solid $table-border-color;
 }
diff --git a/src/pretix/static/pretixpresale/scss/_event.scss b/src/pretix/static/pretixpresale/scss/_event.scss
index c5786364f4..7f7e50928e 100644
--- a/src/pretix/static/pretixpresale/scss/_event.scss
+++ b/src/pretix/static/pretixpresale/scss/_event.scss
@@ -96,9 +96,9 @@
     }
 
     &.headline, &.simple {
-        border-top: 2px solid transparent;
+        border-top: 1px solid transparent;
         &::before {
-            border-top: 2px solid $table-border-color;
+            border-top: 1px solid $table-border-color;
         }
     }
 }
@@ -110,14 +110,14 @@ article.item-with-variations {
 
 article.item-with-variations:last-child, .product-row:last-child {
     position: relative;
-    border-bottom: 2px solid transparent;
+    border-bottom: 1px solid transparent;
     &::after {
         position: absolute;
         bottom: 0;
         left: 15px;
         width: calc(100% - 30px);
         content: '';
-        border-bottom: 2px solid $table-border-color;
+        border-bottom: 1px solid $table-border-color;
     }
 }
 article.item-with-variations .product-row:last-child:after {
@@ -146,7 +146,7 @@ article.item-with-variations .product-row:last-child:after {
 }
 
 .product-row {
-    padding: 10px 0;
+    padding: 0.75*$line-height-computed 0;
 
     .count form {
         display: inline;
diff --git a/src/pretix/static/pretixpresale/scss/_theme.scss b/src/pretix/static/pretixpresale/scss/_theme.scss
index 29dfd50926..98113723ad 100644
--- a/src/pretix/static/pretixpresale/scss/_theme.scss
+++ b/src/pretix/static/pretixpresale/scss/_theme.scss
@@ -1,5 +1,12 @@
 @import "../../pretixbase/scss/_contrast.scss";
 
+h1, .h1,
+h2, .h2,
+h3, .h3 {
+  margin-top: 2.25 * $line-height-computed;
+  margin-bottom: 0.75 * $line-height-computed;
+}
+
 .page-header {
   position: relative;
   padding-bottom: 9px;
@@ -150,4 +157,4 @@ footer {
     border-top-left-radius: .25em;
     border-bottom-left-radius: .25em;
   }
-}
\ No newline at end of file
+}
diff --git a/src/pretix/static/pretixpresale/scss/main.scss b/src/pretix/static/pretixpresale/scss/main.scss
index 94e29d955f..002842c81d 100644
--- a/src/pretix/static/pretixpresale/scss/main.scss
+++ b/src/pretix/static/pretixpresale/scss/main.scss
@@ -351,8 +351,8 @@ body.loading .container {
 
 .panel-title a[data-toggle="collapse"], details .panel-title {
     display: flex;
-    padding: 10px 15px;
-    margin: -10px -15px;
+    padding: 0.75*$line-height-computed;
+    margin: -0.75*$line-height-computed;
     align-items: center;
     justify-content: space-between;
     outline: 0;