diff --git a/apps/calendar-macos/CompassUI/Sources/CompassUI/EventForm/EventFormCard.swift b/apps/calendar-macos/CompassUI/Sources/CompassUI/EventForm/EventFormCard.swift
index e0e0cd3b1..38e9cc470 100644
--- a/apps/calendar-macos/CompassUI/Sources/CompassUI/EventForm/EventFormCard.swift
+++ b/apps/calendar-macos/CompassUI/Sources/CompassUI/EventForm/EventFormCard.swift
@@ -8,7 +8,7 @@ struct EventFormCard<Content: View>: View {
 
     var body: some View {
         content()
-            .padding(10)
+            .padding(8)
             .frame(maxWidth: .infinity, alignment: .leading)
             .background(theme.surfaceOverlayColor)
             .clipShape(RoundedRectangle(cornerRadius: NativeWebLayoutTokens.radiusDefault))
diff --git a/apps/calendar-macos/CompassUI/Sources/CompassUI/EventForm/EventFormCompactDateField.swift b/apps/calendar-macos/CompassUI/Sources/CompassUI/EventForm/EventFormCompactDateField.swift
index a9564b9a6..872e3ce35 100644
--- a/apps/calendar-macos/CompassUI/Sources/CompassUI/EventForm/EventFormCompactDateField.swift
+++ b/apps/calendar-macos/CompassUI/Sources/CompassUI/EventForm/EventFormCompactDateField.swift
@@ -18,14 +18,14 @@ struct EventFormCompactDateField: View {
     var body: some View {
         TextField("Date", text: $text)
             .textFieldStyle(.plain)
-            .font(.rubik(13))
+            .font(.rubik(NativeWebLayoutTokens.fontSizeBody))
             .foregroundStyle(theme.textColor)
             .padding(.horizontal, 8)
-            .padding(.vertical, 6)
-            .background(theme.surfacePanelColor)
-            .clipShape(RoundedRectangle(cornerRadius: 4))
+            .frame(minHeight: 38)
+            .background(theme.surfaceOverlayColor)
+            .clipShape(RoundedRectangle(cornerRadius: NativeWebLayoutTokens.radiusDefault))
             .overlay {
-                RoundedRectangle(cornerRadius: 4)
+                RoundedRectangle(cornerRadius: NativeWebLayoutTokens.radiusDefault)
                     .stroke(isFocused ? theme.accentColor : theme.borderColor, lineWidth: 1)
             }
             .focused($isFocused)
diff --git a/apps/calendar-macos/CompassUI/Sources/CompassUI/EventForm/EventFormScheduleSection.swift b/apps/calendar-macos/CompassUI/Sources/CompassUI/EventForm/EventFormScheduleSection.swift
index 731ce5928..07d292a97 100644
--- a/apps/calendar-macos/CompassUI/Sources/CompassUI/EventForm/EventFormScheduleSection.swift
+++ b/apps/calendar-macos/CompassUI/Sources/CompassUI/EventForm/EventFormScheduleSection.swift
@@ -13,7 +13,7 @@ struct EventFormScheduleSection: View {
     }
 
     var body: some View {
-        VStack(alignment: .leading, spacing: 8) {
+        VStack(alignment: .leading, spacing: 6) {
             Toggle("All day", isOn: Binding(
                 get: { draft.schedule.kind == .allDay },
                 set: { model.setDraftAllDay($0) }
@@ -43,6 +43,8 @@ struct EventFormScheduleSection: View {
                         displayedComponents: [.hourAndMinute]
                     )
                     .labelsHidden()
+                    .controlSize(.small)
+                    .frame(minHeight: 38)
                     .disabled(scheduleLocked)
                     .accessibilityIdentifier("compass-event-form-start")
                 }
@@ -67,6 +69,8 @@ struct EventFormScheduleSection: View {
                         displayedComponents: [.hourAndMinute]
                     )
                     .labelsHidden()
+                    .controlSize(.small)
+                    .frame(minHeight: 38)
                     .disabled(scheduleLocked)
                     .accessibilityIdentifier("compass-event-form-end")
                 }
diff --git a/apps/calendar-macos/CompassUI/Sources/CompassUI/EventForm/EventFormView.swift b/apps/calendar-macos/CompassUI/Sources/CompassUI/EventForm/EventFormView.swift
index 332ac92b9..f61a6fb34 100644
--- a/apps/calendar-macos/CompassUI/Sources/CompassUI/EventForm/EventFormView.swift
+++ b/apps/calendar-macos/CompassUI/Sources/CompassUI/EventForm/EventFormView.swift
@@ -30,7 +30,7 @@ public struct EventFormView: View {
 
     private func formPanel(draft: GridEventDraft) -> some View {
         let isReadOnly = model.isEventFormReadOnly(for: draft)
-        return VStack(alignment: .leading, spacing: 12) {
+        return VStack(alignment: .leading, spacing: 10) {
             EventFormToolbarView(model: model, draft: draft)
             .pageJumpChipAnchor(id: "form-actions")
 
@@ -39,7 +39,7 @@ public struct EventFormView: View {
                 set: { model.updateDraftFromForm(title: $0) }
             ))
             .textFieldStyle(.plain)
-            .font(.rubik(16))
+            .font(.rubik(NativeWebLayoutTokens.fontSizeBody))
             .foregroundStyle(theme.textColor)
             .focused($titleFocused)
             .disabled(isReadOnly)
@@ -48,7 +48,7 @@ public struct EventFormView: View {
 
             ScrollViewReader { proxy in
                 ScrollView {
-                    VStack(alignment: .leading, spacing: 12) {
+                    VStack(alignment: .leading, spacing: 10) {
                         EventFormCard {
                             VStack(alignment: .leading, spacing: 10) {
                                 EventFormScheduleSection(
@@ -171,7 +171,7 @@ public struct EventFormView: View {
                     .font(.rubik(14, weight: .medium))
                     .foregroundStyle(theme.onAccentColor)
                     .padding(.horizontal, 20)
-                    .frame(maxWidth: .infinity, minHeight: 36)
+                    .frame(maxWidth: .infinity, minHeight: 36, maxHeight: 36)
                     .background(theme.accentColor)
                     .clipShape(RoundedRectangle(cornerRadius: NativeWebLayoutTokens.radiusDefault))
                 }