diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index bcb925e908..0346577d83 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -515,7 +515,7 @@ et2-details.details {width: 100%}
 	top: 0;
 }
 #mail-index_toolbar {
-	height: 35px;
+	height: 2.95em;
 }
 #mail-index_toolbar > button > span {
 	padding: .2em .4em;
diff --git a/pixelegg/css/fancy.css b/pixelegg/css/fancy.css
index 10a6f88e1f..72be757388 100644
--- a/pixelegg/css/fancy.css
+++ b/pixelegg/css/fancy.css
@@ -7256,6 +7256,12 @@ img.et2_button_icon[src*="svg"]:hover {
   padding: 0;
   border-bottom: var(--sl-panel-border-width) solid var(--sl-panel-border-color);
 }
+.et2_nextmatch .nextmatch_header {
+  border-bottom: var(--sl-panel-border-width) solid var(--sl-panel-border-color);
+}
+.et2_nextmatch .nextmatch_header .nextmatch_header_row {
+  padding-bottom: 0.25em;
+}
 div.flatpickr-calendar {
   border-radius: var(--sl-border-radius-medium);
 }
diff --git a/pixelegg/css/fancy.less b/pixelegg/css/fancy.less
index 8f98ec6f08..db7b84e0d4 100644
--- a/pixelegg/css/fancy.less
+++ b/pixelegg/css/fancy.less
@@ -83,6 +83,15 @@
   border-bottom: var(--sl-panel-border-width) solid var(--sl-panel-border-color);
 }
 
+// Nextmatch
+.et2_nextmatch .nextmatch_header {
+  border-bottom: var(--sl-panel-border-width) solid var(--sl-panel-border-color);
+
+  .nextmatch_header_row {
+	padding-bottom: 0.25em;
+  }
+}
+
 //rounded flatpickr
 div.flatpickr-calendar {
     border-radius: var(--sl-border-radius-medium);