diff --git a/src/gui/calendar-management/calendar-row.ui b/src/gui/calendar-management/calendar-row.ui
index 26628473..4427f6de 100644
--- a/src/gui/calendar-management/calendar-row.ui
+++ b/src/gui/calendar-management/calendar-row.ui
@@ -6,6 +6,7 @@
     <child type="prefix">
       <object class="GtkImage" id="icon">
         <property name="pixel-size">24</property>
+        <property name="accessible-role">presentation</property>
         <style>
           <class name="calendar-color-image"/>
         </style>
@@ -15,6 +16,7 @@
     <child type="suffix">
       <object class="GtkSwitch" id="switch">
         <property name="valign">center</property>
+        <property name="tooltip-text">Display Calendar</property>
       </object>
     </child>
 
@@ -23,6 +25,9 @@
         <property name="halign">end</property>
         <property name="valign">center</property>
         <property name="icon-name">go-next-symbolic</property>
+        <accessibility>
+          <property name="label" translatable="yes">Edit calendar</property>
+        </accessibility>
       </object>
     </child>
   </object>
diff --git a/src/gui/calendar-management/gcal-edit-calendar-page.ui b/src/gui/calendar-management/gcal-edit-calendar-page.ui
index 845e78be..b4c74be4 100644
--- a/src/gui/calendar-management/gcal-edit-calendar-page.ui
+++ b/src/gui/calendar-management/gcal-edit-calendar-page.ui
@@ -20,7 +20,7 @@
                 <child>
                   <object class="AdwActionRow" id="account_row">
                     <property name="title" translatable="yes">Account</property>
-                    <property name="activatable-widget">settings_button</property>
+                    <property name="subtitle-selectable">True</property>
                     <style>
                       <class name="property"/>
                     </style>
@@ -38,6 +38,7 @@
                         <child>
                           <object class="GtkImage">
                             <property name="icon-name">settings-symbolic</property>
+                            <property name="accessible-role">presentation</property>
                           </object>
                         </child>