diff --git a/css/app-navigation.scss b/css/app-navigation.scss
index fe32a59c7..8691f77d1 100644
--- a/css/app-navigation.scss
+++ b/css/app-navigation.scss
@@ -35,7 +35,7 @@
 		// for the rounded corner buttons on the sides, see further below
 		border-radius: 0;
 		font-weight: normal;
-		margin: 3px -1px 3px 0;
+		margin: 0 0 var(--default-grid-baseline) 0;
 		flex-grow: 1;
 	}
 
@@ -95,6 +95,11 @@
 .new-event-today-view-section {
 	display: flex;
 
+	// Fix margins from core
+	.button {
+		margin: 0 var(--default-grid-baseline) 0 0;
+	}
+
 	.new-event {
 		flex-grow: 5;
 		text-overflow: ellipsis;