diff --git a/App/UI/MainWindow/MainWindow.xml b/App/UI/MainWindow/MainWindow.xml
index 7c06d32..7ab0623 100644
--- a/App/UI/MainWindow/MainWindow.xml
+++ b/App/UI/MainWindow/MainWindow.xml
@@ -17,11 +17,11 @@
         <property name="min-sidebar-width">300</property>  
         <property name="max-sidebar-width">300</property>  
         <property name="show-sidebar"    
-              bind-source="show_sidebar_button"    
-              bind-property="active"    
-              bind-flags="sync-create|bidirectional"/>  
+          bind-source="show_sidebar_button"    
+          bind-property="active"    
+          bind-flags="sync-create|bidirectional"/>  
         <property name="sidebar">  
-          <object class="AdwNavigationPage">  
+          <object class="AdwNavigationPage">
             <property name="title" translatable="yes" context="label" comments="Noun. Marks a list of password collections.">Stores</property>  
             <property name="child">  
               <object class="AdwToolbarView">  
@@ -29,11 +29,15 @@
                   <object class="AdwHeaderBar">  
                     <child type="start">
                       <object class="GtkButton" id="add_shortcut_button">
-                        <property name="icon-name">list-add-symbolic</property>
                         <property name="valign">center</property>
                         <style>
                           <class name="flat" />
                         </style>
+                        <child>
+                          <object class="AdwButtonContent">
+                            <property name="icon-name">list-add-symbolic</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
@@ -87,13 +91,17 @@
                         <property name="description">/home/typo/.password-store</property>
                         <property name="header-suffix">
                           <object class="GtkButton">
-                            <property name="icon-name">list-add-symbolic</property>
                             <property name="valign">center</property>
                             <style>
                               <class name="flat" />
-                            </style>
-                          </object>
-                        </property>
+                            </style>  
+                            <child>
+                              <object class="AdwButtonContent">
+                                <property name="icon-name">list-add-symbolic</property>
+                              </object>
+                            </child>
+                          </object>   
+                        </property>   
                         <child>
                           <object class="AdwActionRow">
                             <property name="title">Sample password</property>