diff --git a/src/gui/gcal-window.ui b/src/gui/gcal-window.ui
index a31a82c0..47c0b634 100644
--- a/src/gui/gcal-window.ui
+++ b/src/gui/gcal-window.ui
@@ -106,6 +106,15 @@
                 <child>
                   <object class="AdwHeaderBar">
                     <property name="show-end-title-buttons">False</property>
+                    <property name="title-widget">
+                      <object class="GcalCalendarButton" id="calendars_button" />
+                    </property>
+                    <child type="end">
+                      <object class="GtkMenuButton" id="menu_button">
+                        <property name="icon-name">open-menu-symbolic</property>
+                        <property name="popover">win_menu</property>
+                      </object>
+                    </child>
                   </object>
                 </child>
                 <child>
@@ -155,13 +164,6 @@
                 </property>
               </object>
             </child>
-            <child>
-              <object class="GtkButton" id="new_event_button">
-                <property name="icon-name">list-add-symbolic</property>
-                <property name="action-name">win.new-event</property>
-                <property name="tooltip_text" translatable="yes" context="tooltip">Add a new event</property>
-              </object>
-            </child>
             <child type="title">
               <object class="AdwViewSwitcher" id="views_switcher">
                 <property name="stack">views_stack</property>
@@ -169,14 +171,12 @@
               </object>
             </child>
             <child type="end">
-              <object class="GtkMenuButton" id="menu_button">
-                <property name="icon-name">open-menu-symbolic</property>
-                <property name="popover">win_menu</property>
+              <object class="GtkButton" id="new_event_button">
+                <property name="icon-name">list-add-symbolic</property>
+                <property name="action-name">win.new-event</property>
+                <property name="tooltip_text" translatable="yes" context="tooltip">Add a new event</property>
               </object>
             </child>
-            <child type="end">
-              <object class="GcalCalendarButton" id="calendars_button" />
-            </child>
             <child type="end">
               <object class="GcalSearchButton" id="search_button">
                 <property name="tooltip_text" translatable="yes" context="tooltip">Search for events</property>
diff --git a/src/theme/Adwaita.css b/src/theme/Adwaita.css
index 5538a31f..19ae6a2b 100644
--- a/src/theme/Adwaita.css
+++ b/src/theme/Adwaita.css
@@ -184,11 +184,6 @@ datechooser .weekday {
   font-size: smaller;
 }
 
-datechooser .weeknum:backdrop,
-datechooser .weekday:backdrop {
-  color: @unfocused_insensitive_color;
-}
-
 /* days */
 datechooser button.day {
   font-size: 10pt;
@@ -395,3 +390,21 @@ searchbutton > popover > arrow {
   background: none;
   border: none;
 }
+
+/*
+ * Month selector
+ */
+
+datechooser {
+  padding: 6px;
+}
+
+datechooser .current-week {
+  background: alpha(@headerbar_bg_color, 0.7);
+  color: @headerbar_fg_color;
+  border-radius: 6px;
+}
+
+menubutton stack > box {
+  border-spacing: 4px;
+}