diff --git a/src/gui/calendar-management/gcal-calendars-page.ui b/src/gui/calendar-management/gcal-calendars-page.ui
index 7afbe6f7..4c5240c6 100644
--- a/src/gui/calendar-management/gcal-calendars-page.ui
+++ b/src/gui/calendar-management/gcal-calendars-page.ui
@@ -8,20 +8,12 @@
           <object class="AdwToolbarView">
 
             <child type="top">
-              <object class="GtkHeaderBar">
-                <property name="show-title-buttons">True</property>
-                <property name="title-widget">
-                  <object class="AdwWindowTitle">
-                    <property name="title" translatable="yes">Calendars</property>
-                  </object>
-                </property>
-              </object>
+              <object class="AdwHeaderBar" />
             </child>
 
             <property name="content">
               <object class="GtkScrolledWindow">
                 <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
                 <property name="hscrollbar_policy">never</property>
                 <property name="max_content_height">600</property>
                 <property name="propagate_natural_height">True</property>
@@ -37,7 +29,7 @@
                     <signal name="row-activated" handler="on_listbox_row_activated_cb" object="GcalCalendarsPage" swapped="no" />
                     <style>
                       <class name="calendars-list"/>
-                      <class name="content"/>
+                      <class name="boxed-list"/>
                     </style>
 
                     <child>
diff --git a/src/gui/calendar-management/gcal-edit-calendar-page.ui b/src/gui/calendar-management/gcal-edit-calendar-page.ui
index 399e882d..62fc18bb 100644
--- a/src/gui/calendar-management/gcal-edit-calendar-page.ui
+++ b/src/gui/calendar-management/gcal-edit-calendar-page.ui
@@ -8,9 +8,6 @@
           <object class="AdwHeaderBar">
             <property name="show-end-title-buttons">False</property>
             <property name="show-start-title-buttons">False</property>
-            <property name="title-widget">
-              <object class="AdwWindowTitle" />
-            </property>
           </object>
         </child>
 
diff --git a/src/gui/calendar-management/gcal-new-calendar-page.ui b/src/gui/calendar-management/gcal-new-calendar-page.ui
index 0a9f2731..36481c25 100644
--- a/src/gui/calendar-management/gcal-new-calendar-page.ui
+++ b/src/gui/calendar-management/gcal-new-calendar-page.ui
@@ -8,13 +8,6 @@
           <object class="AdwHeaderBar">
             <property name="show-end-title-buttons">False</property>
             <property name="show-start-title-buttons">False</property>
-
-            <property name="title-widget">
-              <object class="AdwWindowTitle">
-                <property name="title" translatable="yes">New Calendar</property>
-              </object>
-            </property>
-
           </object>
         </child>