diff --git a/plugins/provider/sip/sip-account-widget.ui b/plugins/provider/sip/sip-account-widget.ui
index 62489b2..439a7dc 100644
--- a/plugins/provider/sip/sip-account-widget.ui
+++ b/plugins/provider/sip/sip-account-widget.ui
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.24"/>
+  <requires lib="gtk" version="4.0"/>
   <requires lib="libadwaita" version="1.0"/>
   <template class="CallsSipAccountWidget" parent="GtkWidget">
-    <property name="visible">True</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="orientation">vertical</property>
-
         <child>
           <object class="AdwHeaderBar" id="header_add">
             <property name="title" translatable="yes">Add Account</property>
             <property name="show-close-button">True</property>
             <child>
               <object class="GtkButton" id="login_btn">
-                <property name="visible">True</property>
                 <property name="use-underline">True</property>
                 <property name="label" translatable="yes">_Log In</property>
                 <signal name="clicked" handler="on_login_clicked" swapped="yes"/>
@@ -28,16 +24,13 @@
               </packing>
             </child>
             <child>
-              <object class="GtkSpinner" id="spinner_add">
-                <property name="visible">True</property>
-              </object>
+              <object class="GtkSpinner" id="spinner_add"/>
               <packing>
                 <property name="pack_type">end</property>
               </packing>
             </child>
           </object>
         </child>
-
         <child>
           <object class="AdwHeaderBar" id="header_edit">
             <property name="visible">True</property>
@@ -45,7 +38,6 @@
             <property name="title" translatable="yes">Manage Account</property>
             <child>
               <object class="GtkButton" id="apply_btn">
-                <property name="visible">True</property>
                 <property name="use-underline">True</property>
                 <property name="label" translatable="yes">_Apply</property>
                 <signal name="clicked" handler="on_apply_clicked" swapped="yes"/>
@@ -59,7 +51,6 @@
             </child>
             <child>
               <object class="GtkButton" id="delete_btn">
-                <property name="visible">True</property>
                 <property name="use-underline">True</property>
                 <property name="label" translatable="yes">_Delete</property>
                 <signal name="clicked" handler="on_delete_clicked" swapped="yes"/>
@@ -72,16 +63,13 @@
               </packing>
             </child>
             <child>
-              <object class="GtkSpinner" id="spinner_edit">
-                <property name="visible">True</property>
-              </object>
+              <object class="GtkSpinner" id="spinner_edit"/>
               <packing>
                 <property name="pack_type">end</property>
               </packing>
             </child>
           </object>
         </child>
-
         <child>
           <object class="AdwPreferencesPage">
             <property name="visible">True</property>
@@ -94,7 +82,6 @@
                     <property name="title" translatable="yes">Server</property>
                     <child>
                       <object class="GtkEntry" id="host">
-                        <property name="visible">True</property>
                         <property name="valign">center</property>
                         <signal name="changed" handler="on_user_changed" swapped="yes"/>
                       </object>
@@ -113,7 +100,6 @@
                     <property name="subtitle" translatable="yes">Optional</property>
                     <child>
                       <object class="GtkEntry" id="display_name">
-                        <property name="visible">True</property>
                         <property name="valign">center</property>
                         <signal name="changed" handler="on_user_changed" swapped="yes"/>
                       </object>
@@ -131,7 +117,6 @@
                     <property name="title" translatable="yes">User ID</property>
                     <child>
                       <object class="GtkEntry" id="user">
-                        <property name="visible">True</property>
                         <property name="valign">center</property>
                         <signal name="changed" handler="on_user_changed" swapped="yes"/>
                       </object>
@@ -144,14 +129,11 @@
                     <property name="title" translatable="yes">Password</property>
                     <child>
                       <object class="GtkEntry" id="password">
-                        <property name="visible">True</property>
                         <property name="valign">center</property>
                         <property name="input-purpose">password</property>
                         <property name="visibility">False</property>
                         <property name="primary_icon_sensitive">False</property>
-                        <property name="secondary_icon_activatable">True</property>
                         <property name="secondary_icon_name">view-reveal-symbolic</property>
-                        <property name="secondary_icon_sensitive">True</property>
                         <signal name="changed" handler="on_user_changed" swapped="yes"/>
                         <signal name="icon-press" handler="on_password_visibility_changed" swapped="yes"/>
                       </object>
@@ -169,7 +151,6 @@
                     <property name="title" translatable="yes">Port</property>
                     <child>
                       <object class="GtkEntry" id="port">
-                        <property name="visible">True</property>
                         <property name="valign">center</property>
                         <property name="input-purpose">digits</property>
                         <signal name="changed" handler="on_user_changed" swapped="yes"/>
@@ -204,7 +185,6 @@
                     <property name="title" translatable="yes">Use for Phone Calls</property>
                     <child>
                       <object class="GtkSwitch" id="tel_switch">
-                        <property name="visible">True</property>
                         <property name="valign">center</property>
                         <signal name="notify::active" handler="on_user_changed" swapped="yes"/>
                       </object>
@@ -217,7 +197,6 @@
                     <property name="title" translatable="yes">Automatically Connect</property>
                     <child>
                       <object class="GtkSwitch" id="auto_connect_switch">
-                        <property name="visible">True</property>
                         <property name="valign">center</property>
                         <signal name="notify::active" handler="on_user_changed" swapped="yes"/>
                       </object>
@@ -241,4 +220,3 @@
     </child>
   </template>
 </interface>
-
diff --git a/src/ui/account-overview.ui b/src/ui/account-overview.ui
index dddbe4c..fb66b96 100644
--- a/src/ui/account-overview.ui
+++ b/src/ui/account-overview.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.24"/>
+  <requires lib="gtk" version="4.0"/>
   <requires lib="libadwaita" version="1.0"/>
   <template class="CallsAccountOverview" parent="AdwWindow">
     <property name="visible">True</property>
@@ -9,7 +9,6 @@
     <signal name="delete-event" handler="gtk_widget_hide_on_delete"/>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="AdwHeaderBar">
@@ -17,109 +16,93 @@
             <property name="show-close-button">True</property>
             <property name="visible">True</property>
             <child>
-              <object class="GtkSpinner" id="spinner">
-                <property name="visible">True</property>
-              </object>
+              <object class="GtkSpinner" id="spinner"/>
               <packing>
                 <property name="pack_type">end</property>
               </packing>
             </child>
-
           </object>
         </child>
-
         <child>
           <object class="GtkOverlay">
-            <property name="visible">True</property>
             <child type="overlay">
               <object class="CallsInAppNotification" id="in_app_notification">
+                <property name="can-target">False</property>
                 <property name="visible">True</property>
               </object>
-              <packing>
-                <property name="pass-through">True</property>
-              </packing>
             </child>
-            <child>
+            <property name="child">
               <object class="GtkStack" id="stack">
-                <property name="visible">True</property>
                 <property name="vexpand">True</property>
                 <property name="transition-type">crossfade</property>
-
-                <!-- First child type: No accounts present: Show a blurb and a Add button -->
                 <child>
-                  <object class="AdwStatusPage" id="intro">
-                    <property name="visible">True</property>
-                    <property name="title" translatable="yes">Add VoIP Accounts</property>
-                    <property name="icon-name">system-users-symbolic</property>
-                    <property name="description" translatable="yes">You can add VoIP account here. It will allow you to place and receive VoIP calls using the SIP protocol. This feature is still relatively new and not yet feature complete (i.e. no encrypted media).</property>
-                    <child>
-                      <object class="GtkButton" id="add_btn">
+                  <object class="GtkStackPage">
+                    <property name="name">intro-page</property>
+                    <property name="child">
+                      <object class="AdwStatusPage" id="intro">
                         <property name="visible">True</property>
-                        <property name="margin">6</property>
-                        <property name="halign">center</property>
-                        <property name="use-underline">True</property>
-                        <property name="label" translatable="yes">_Add Account</property>
-                        <signal name="clicked" handler="on_add_account_clicked" swapped="yes"/>
+                        <property name="title" translatable="yes">Add VoIP Accounts</property>
+                        <property name="icon-name">system-users-symbolic</property>
+                        <property name="description" translatable="yes">You can add VoIP account here. It will allow you to place and receive VoIP calls using the SIP protocol. This feature is still relatively new and not yet feature complete (i.e. no encrypted media).</property>
+                        <child>
+                          <object class="GtkButton" id="add_btn">
+                            <property name="margin-start">6</property>
+                            <property name="margin-end">6</property>
+                            <property name="margin-top">6</property>
+                            <property name="margin-bottom">6</property>
+                            <property name="halign">center</property>
+                            <property name="use-underline">True</property>
+                            <property name="label" translatable="yes">_Add Account</property>
+                            <signal name="clicked" handler="on_add_account_clicked" swapped="yes"/>
+                            <style>
+                              <class name="suggested-action"/>
+                            </style>
+                          </object>
+                        </child>
+                      </object>
+                    </property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkStackPage">
+                    <property name="name">overview-page</property>
+                    <property name="child">
+                      <object class="GtkListBox" id="overview">
+                        <property name="selection-mode">none</property>
+                        <property name="margin-top">18</property>
+                        <property name="margin-bottom">18</property>
+                        <property name="margin-start">12</property>
+                        <property name="margin-end">12</property>
+                        <signal name="row-activated" handler="on_account_row_activated" swapped="no"/>
+                        <child type="placeholder"/>
                         <style>
-                          <class name="suggested-action"/>
+                          <class name="content"/>
                         </style>
                       </object>
-                    </child>
+                    </property>
                   </object>
-                  <packing>
-                    <property name="name">intro-page</property>
-                  </packing>
                 </child>
-
-                <!-- Second child type: Some accounts present: Show a Listbox to manage accounts -->
-                <child>
-                  <object class="GtkListBox" id="overview">
-                    <property name="visible">True</property>
-                    <property name="selection-mode">none</property>
-                    <property name="margin-top">18</property>
-                    <property name="margin-bottom">18</property>
-                    <property name="margin-start">12</property>
-                    <property name="margin-end">12</property>
-                    <signal name="row-activated" handler="on_account_row_activated" swapped="no"/>
-                    <!-- placeholder -->
-                    <child type="placeholder"/>
-                    <style>
-                      <class name="content"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="name">overview-page</property>
-                  </packing>
-                </child>
-
               </object>
-            </child>
-
+            </property>
           </object>
         </child>
       </object>
     </child>
   </template>
-
   <object class="GtkListBoxRow" id="add_row">
-    <property name="visible">True</property>
-    <child>
+    <property name="child">
       <object class="GtkLabel">
-        <property name="visible">True</property>
         <property name="label" translatable="yes">_Add Account</property>
         <property name="use-underline">True</property>
         <property name="margin-top">9</property>
         <property name="margin-bottom">9</property>
       </object>
-    </child>
+    </property>
   </object>
-
-
   <object class="AdwWindow" id="account_window">
     <property name="visible">False</property>
     <property name="default-width">380</property>
     <property name="default-height">660</property>
     <signal name="delete-event" handler="gtk_widget_hide_on_delete"/>
   </object>
-
-  </interface>
+</interface>
diff --git a/src/ui/account-row.ui b/src/ui/account-row.ui
index 407f6f0..29ec1bf 100644
--- a/src/ui/account-row.ui
+++ b/src/ui/account-row.ui
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="4.0"/>
   <requires lib="libadwaita" version="1.0"/>
   <template class="CallsAccountRow" parent="AdwActionRow">
     <property name="visible">True</property>
     <property name="title">Title</property>
     <property name="subtitle">Subtitle</property>
     <property name="activatable">True</property>
-
     <child type="prefix">
       <object class="AdwAvatar" id="avatar">
         <property name="visible">True</property>
@@ -15,19 +14,14 @@
         <property name="size">48</property>
       </object>
     </child>
-
     <child>
       <object class="GtkSwitch" id="online_switch">
         <property name="valign">center</property>
-        <property name="visible">True</property>
-        <property name="active">False</property>
         <signal name="state-set" handler="on_online_switched" swapped="no"/>
       </object>
     </child>
-
     <child>
       <object class="GtkImage">
-        <property name="visible">True</property>
         <property name="icon_name">go-next-symbolic</property>
       </object>
     </child>
diff --git a/src/ui/call-record-row.ui b/src/ui/call-record-row.ui
index 0ac8233..984650b 100644
--- a/src/ui/call-record-row.ui
+++ b/src/ui/call-record-row.ui
@@ -1,55 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="4.0"/>
   <template class="CallsCallRecordRow" parent="GtkListBoxRow">
-    <property name="visible">True</property>
     <property name="activatable">False</property>
     <property name="selectable">False</property>
-    <child>
+    <property name="child">
       <object class="GtkBox" id="event_box">
-        <property name="visible">True</property>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
             <child>
               <object class="AdwAvatar" id="avatar">
                 <property name="visible">True</property>
-                <property name="margin_left">8</property>
+                <property name="margin-start">8</property>
                 <property name="margin_top">8</property>
                 <property name="margin_bottom">8</property>
                 <property name="size">48</property>
-                <property name="text" bind-source="target" bind-property="label" bind-flags="sync-create"></property>
+                <property name="text" bind-source="target" bind-property="label" bind-flags="sync-create"/>
                 <property name="show-initials">True</property>
               </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkImage" id="type">
-                <property name="visible">True</property>
-                <property name="margin_left">8</property>
+                <property name="margin-start">8</property>
               </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="target">
-                <property name="visible">True</property>
-                <property name="margin_left">10</property>
+                <property name="margin-start">10</property>
                 <property name="ellipsize">middle</property>
               </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="button">
-                <property name="visible">True</property>
-                <property name="margin_left">12</property>
-                <property name="margin_right">8</property>
+                <property name="margin-start">12</property>
+                <property name="margin-end">8</property>
                 <property name="margin_top">8</property>
                 <property name="margin_bottom">8</property>
                 <property name="halign">center</property>
@@ -64,37 +48,27 @@
                 </child>
                 <child>
                   <object class="GtkImage">
-                    <property name="visible">True</property>
                     <property name="icon-name">call-start-symbolic</property>
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="pack_type">end</property>
-                <property name="position">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="time">
-                <property name="visible">True</property>
-                <property name="margin_left">8</property>
+                <property name="margin-start">8</property>
                 <property name="justify">right</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
                 <attributes>
-                  <attribute name="scale" value="0.7"/>
+                  <attribute name="scale" value="0.7"></attribute>
                 </attributes>
               </object>
-              <packing>
-                <property name="pack_type">end</property>
-                <property name="position">4</property>
-              </packing>
             </child>
           </object>
         </child>
       </object>
-    </child>
+    </property>
   </template>
   <menu id="context_menu">
     <section>
@@ -103,7 +77,6 @@
         <attribute name="action">delete-call</attribute>
       </item>
       <item>
-        <!-- Translators: This is a phone number -->
         <attribute name="label" translatable="yes">_Copy number</attribute>
         <attribute name="action">copy-number</attribute>
         <attribute name="hidden-when">action-disabled</attribute>
diff --git a/src/ui/call-selector-item.ui b/src/ui/call-selector-item.ui
index 2ad5ed3..7c2dc5b 100644
--- a/src/ui/call-selector-item.ui
+++ b/src/ui/call-selector-item.ui
@@ -1,61 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="4.0"/>
   <template class="CallsCallSelectorItem" parent="GtkBox">
-    <property name="visible">True</property>
     <property name="visible_window">False</property>
     <property name="above_child">True</property>
     <child>
       <object class="GtkFrame">
-        <property name="visible">True</property>
-        <property name="label_xalign">0</property>
         <property name="label_yalign">0</property>
         <property name="shadow_type">out</property>
-        <child>
+        <property name="child">
           <object class="GtkBox" id="main_box">
-            <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkBox">
-                <property name="visible">True</property>
                 <child>
                   <object class="GtkLabel" id="name">
-                    <property name="visible">True</property>
-                    <property name="margin_left">3</property>
+                    <property name="hexpand">True</property>
+                    <property name="margin-start">3</property>
                     <property name="label">+441234567890</property>
                   </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="status">
-                    <property name="visible">True</property>
-                    <property name="margin_right">3</property>
+                    <property name="halign">center</property>
+                    <property name="margin-end">3</property>
                     <property name="label" translatable="yes">On hold</property>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="pack_type">end</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <placeholder/>
             </child>
           </object>
-        </child>
+        </property>
         <child type="label_item">
           <placeholder/>
         </child>
diff --git a/src/ui/call-window.ui b/src/ui/call-window.ui
index bd537bc..05ad790 100644
--- a/src/ui/call-window.ui
+++ b/src/ui/call-window.ui
@@ -1,100 +1,92 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="4.0"/>
   <template class="CallsCallWindow" parent="GtkApplicationWindow">
-    <!-- <property name="decorated">False</property> -->
     <property name="hide_titlebar_when_maximized">True</property>
-    <property name="show_menubar">False</property>
     <property name="title" translatable="yes">Calls</property>
     <signal name="delete-event" handler="gtk_widget_hide_on_delete"/>
     <child>
       <object class="GtkOverlay">
-        <property name="visible">True</property>
         <child type="overlay">
           <object class="CallsInAppNotification" id="in_app_notification">
+            <property name="can-target">False</property>
             <property name="visible">True</property>
           </object>
-          <packing>
-            <property name="pass-through">True</property>
-          </packing>
+        </child>
+        <property name="child">
+          <object class="GtkStack" id="main_stack">
+            <child>
+              <object class="GtkStackPage">
+                <property name="name">calls</property>
+                <property name="child">
+                  <object class="GtkScrolledWindow">
+                    <property name="hscrollbar_policy">never</property>
+                    <property name="child">
+                      <object class="GtkViewport">
+                        <property name="child">
+                          <object class="GtkFlowBox" id="call_selector">
+                            <property name="orientation">vertical</property>
+                            <property name="homogeneous">True</property>
+                            <property name="column_spacing">12</property>
+                            <property name="row_spacing">12</property>
+                            <property name="selection_mode">none</property>
+                            <signal name="child-activated" handler="call_selector_child_activated_cb" swapped="no"/>
+                          </object>
+                        </property>
+                      </object>
+                    </property>
+                  </object>
+                </property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkStackPage">
+                <property name="name">active-call</property>
+                <property name="child">
+                  <object class="GtkStack" id="call_stack">
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                  </object>
+                </property>
+              </object>
+            </child>
+          </object>
+        </property>
+      </object>
+    </child>
+    <child type="titlebar">
+      <object class="GtkStack" id="header_bar_stack">
+        <property name="visible_child_name" bind-source="main_stack" bind-property="visible_child_name" bind-flags="bidirectional|sync-create"/>
+        <child>
+          <object class="GtkStackPage">
+            <property name="name">calls</property>
+            <property name="child">
+              <object class="GtkHeaderBar"/>
+            </property>
+          </object>
         </child>
         <child>
-          <object class="GtkStack" id="main_stack">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkScrolledWindow">
-                <property name="visible">True</property>
-                <property name="hscrollbar_policy">never</property>
+          <object class="GtkStackPage">
+            <property name="name">active-call</property>
+            <property name="child">
+              <object class="GtkHeaderBar">
                 <child>
-                  <object class="GtkViewport">
-                    <property name="visible">True</property>
+                  <object class="GtkButton" id="show_calls">
+                    <property name="receives_default">True</property>
+                    <property name="no_show_all">True</property>
+                    <signal name="clicked" handler="show_calls_clicked_cb" swapped="no"/>
                     <child>
-                      <object class="GtkFlowBox" id="call_selector">
-                        <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
-                        <property name="homogeneous">True</property>
-                        <property name="column_spacing">12</property>
-                        <property name="row_spacing">12</property>
-                        <property name="selection_mode">none</property>
-                        <signal name="child-activated" handler="call_selector_child_activated_cb" swapped="no"/>
+                      <object class="GtkImage">
+                        <property name="icon_name">system-switch-user-symbolic</property>
                       </object>
                     </child>
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="name">calls</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkStack" id="call_stack">
-                <property name="visible">True</property>
-                <property name="expand">True</property>
-              </object>
-              <packing>
-                <property name="name">active-call</property>
-              </packing>
-            </child>
+            </property>
           </object>
         </child>
       </object>
     </child>
-    <child type="titlebar">
-      <object class="GtkStack" id="header_bar_stack">
-        <property name="visible">True</property>
-        <property name="visible_child_name" bind-source="main_stack" bind-property="visible_child_name" bind-flags="bidirectional|sync-create"/>
-        <child>
-          <object class="GtkHeaderBar">
-            <property name="visible">True</property>
-          </object>
-          <packing>
-            <property name="name">calls</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHeaderBar">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkButton" id="show_calls">
-                <property name="visible">True</property>
-                <property name="receives_default">True</property>
-                <property name="no_show_all">True</property>
-                <signal name="clicked" handler="show_calls_clicked_cb" swapped="no"/>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="icon_name">system-switch-user-symbolic</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="name">active-call</property>
-          </packing>
-        </child>
-      </object>
-    </child>
   </template>
 </interface>
diff --git a/src/ui/contacts-box.ui b/src/ui/contacts-box.ui
index 488e20b..00c6c4c 100644
--- a/src/ui/contacts-box.ui
+++ b/src/ui/contacts-box.ui
@@ -1,49 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="4.0"/>
   <requires lib="libadwaita" version="0.0"/>
   <template class="CallsContactsBox" parent="GtkWidget">
-    <property name="visible">True</property>
     <child>
       <object class="GtkScrolledWindow">
-        <property name="visible">True</property>
-        <property name="expand">True</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
         <child>
           <object class="AdwClamp">
             <property name="visible">True</property>
             <child>
               <object class="GtkBox">
-                <property name="visible">True</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">12</property>
                 <property name="margin-top">12</property>
                 <property name="margin-bottom">32</property>
-                <property name="margin-left">12</property>
-                <property name="margin-right">12</property>
+                <property name="margin-start">12</property>
+                <property name="margin-end">12</property>
                 <child>
-                  <object class="GtkSearchEntry" id="search_entry">
-                    <property name="visible">True</property>
-                  </object>
+                  <object class="GtkSearchEntry" id="search_entry"/>
                 </child>
                 <child>
                   <object class="GtkFrame" id="contacts_frame">
-                    <property name="visible">True</property>
-                    <child>
+                    <property name="child">
                       <object class="GtkListBox" id="contacts_listbox">
-                        <property name="visible">True</property>
                         <child type="placeholder">
                           <object class="GtkBox" id="placeholder_empty">
-                            <property name="visible">True</property>
                             <property name="halign">center</property>
                             <property name="valign">center</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">24</property>
-                            <property name="margin">32</property>
-                            <property name="expand">True</property>
+                            <property name="margin-start">32</property>
+                            <property name="margin-end">32</property>
+                            <property name="margin-top">32</property>
+                            <property name="margin-bottom">32</property>
+                            <property name="hexpand">True</property>
+                            <property name="vexpand">True</property>
                             <child>
                               <object class="GtkImage">
-                                <property name="visible">True</property>
                                 <property name="pixel_size">128</property>
                                 <property name="icon_name">edit-find-symbolic</property>
                                 <style>
@@ -53,7 +48,6 @@
                             </child>
                             <child>
                               <object class="GtkLabel">
-                                <property name="visible">True</property>
                                 <property name="wrap">True</property>
                                 <property name="wrap-mode">word-char</property>
                                 <property name="justify">center</property>
@@ -66,7 +60,7 @@
                           </object>
                         </child>
                       </object>
-                    </child>
+                    </property>
                   </object>
                 </child>
               </object>
diff --git a/src/ui/contacts-row.ui b/src/ui/contacts-row.ui
index 09ab245..23c4036 100644
--- a/src/ui/contacts-row.ui
+++ b/src/ui/contacts-row.ui
@@ -1,48 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <requires lib="gtk" version="4.0"/>
   <template class="CallsContactsRow" parent="GtkListBoxRow">
-    <property name="visible">True</property>
     <property name="activatable">False</property>
     <property name="selectable">False</property>
-    <child>
+    <property name="child">
       <object class="GtkGrid" id="grid">
-        <property name="visible">True</property>
-        <property name="margin">6</property>
+        <property name="margin-start">6</property>
+        <property name="margin-end">6</property>
+        <property name="margin-top">6</property>
+        <property name="margin-bottom">6</property>
         <property name="column-spacing">12</property>
         <property name="row-spacing">3</property>
-
-        <!-- Avatar -->
         <child>
           <object class="AdwAvatar" id="avatar">
             <property name="visible">True</property>
             <property name="valign">center</property>
             <property name="size">36</property>
             <property name="show-initials">True</property>
+            <layout>
+              <property name="column">0</property>
+              <property name="row">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
-
-        <!-- Row title -->
         <child>
           <object class="GtkLabel" id="title">
-            <property name="visible">True</property>
             <property name="ellipsize">end</property>
             <property name="halign">start</property>
-            <property name="expand">True</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
             <style>
               <class name="bold-label"/>
             </style>
+            <layout>
+              <property name="column">1</property>
+              <property name="row">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
-
       </object>
-    </child>
+    </property>
   </template>
 </interface>
diff --git a/src/ui/history-box.ui b/src/ui/history-box.ui
index 9cd08af..f872e5f 100644
--- a/src/ui/history-box.ui
+++ b/src/ui/history-box.ui
@@ -1,45 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
 <interface>
-  <requires lib="gtk+" version="3.22"/>
+  <requires lib="gtk" version="4.0"/>
   <template class="CallsHistoryBox" parent="GtkWidget">
     <child>
       <object class="GtkStack" id="stack">
-        <property name="visible">True</property>
         <child>
-          <object class="AdwStatusPage">
-            <property name="visible">True</property>
-            <property name="icon-name">call-start-symbolic</property>
-            <property name="title" translatable="yes">No Recent Calls</property>
-          </object>
-          <packing>
+          <object class="GtkStackPage">
             <property name="name">empty</property>
-          </packing>
-        </child>
-
-        <child>
-          <object class="GtkScrolledWindow" id="scrolled_window">
-            <property name="visible">True</property>
-            <property name="hscrollbar-policy">never</property>
-            <child>
-              <object class="AdwClamp">
+            <property name="child">
+              <object class="AdwStatusPage">
                 <property name="visible">True</property>
+                <property name="icon-name">call-start-symbolic</property>
+                <property name="title" translatable="yes">No Recent Calls</property>
+              </object>
+            </property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkStackPage">
+            <property name="name">history</property>
+            <property name="child">
+              <object class="GtkScrolledWindow" id="scrolled_window">
+                <property name="hscrollbar-policy">never</property>
                 <child>
-                  <object class="GtkListBox" id="history">
+                  <object class="AdwClamp">
                     <property name="visible">True</property>
-                    <property name="margin">12</property>
-                    <property name="valign">start</property>
-                    <style>
-                      <class name="content"/>
-                    </style>
+                    <child>
+                      <object class="GtkListBox" id="history">
+                        <property name="margin-start">12</property>
+                        <property name="margin-end">12</property>
+                        <property name="margin-top">12</property>
+                        <property name="margin-bottom">12</property>
+                        <property name="valign">start</property>
+                        <style>
+                          <class name="content"/>
+                        </style>
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>
-            </child>
+            </property>
           </object>
-          <packing>
-            <property name="name">history</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/src/ui/in-app-notification.ui b/src/ui/in-app-notification.ui
index 38513ba..33e86a0 100644
--- a/src/ui/in-app-notification.ui
+++ b/src/ui/in-app-notification.ui
@@ -1,26 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="4.0"/>
   <template class="CallsInAppNotification" parent="GtkWidget">
     <property name="visible">False</property>
     <child>
       <object class="GtkRevealer" id="revealer">
-        <property name="visible">True</property>
-        <property name="reveal-child">False</property>
-        <property name="transition-type">slide-down</property>
         <property name="valign">start</property>
         <property name="halign">center</property>
-        <child>
+        <property name="child">
           <object class="GtkBox">
-            <property name="visible">True</property>
             <child>
               <object class="GtkButton">
-                <property name="visible">True</property>
                 <property name="receives_default">True</property>
                 <signal name="clicked" handler="calls_in_app_notification_hide" swapped="yes"/>
                 <child>
                   <object class="GtkImage">
-                    <property name="visible">True</property>
                     <property name="icon_name">window-close-symbolic</property>
                   </object>
                 </child>
@@ -28,23 +22,19 @@
                   <class name="flat"/>
                 </style>
               </object>
-              <packing>
-                <property name="pack_type">end</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label">
-                <property name="visible">True</property>
                 <property name="wrap">True</property>
-                <property name="margin-left">24</property>
-                <property name="margin-right">24</property>
+                <property name="margin-start">24</property>
+                <property name="margin-end">24</property>
               </object>
             </child>
             <style>
               <class name="app-notification"/>
             </style>
           </object>
-        </child>
+        </property>
       </object>
     </child>
   </template>
diff --git a/src/ui/main-window.ui b/src/ui/main-window.ui
index 5f98c1b..de8c6ae 100644
--- a/src/ui/main-window.ui
+++ b/src/ui/main-window.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="4.0"/>
   <requires lib="libadwaita" version="1.0"/>
   <template class="CallsMainWindow" parent="AdwApplicationWindow">
     <property name="title" translatable="yes">Calls</property>
@@ -10,7 +9,6 @@
     <signal name="delete-event" handler="gtk_widget_hide_on_delete"/>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="AdwHeaderBar">
@@ -27,11 +25,9 @@
             </child>
             <child>
               <object class="GtkMenuButton">
-                <property name="visible">True</property>
                 <property name="popover">menu_popover</property>
                 <child>
                   <object class="GtkImage">
-                    <property name="visible">True</property>
                     <property name="icon_name">open-menu-symbolic</property>
                   </object>
                 </child>
@@ -44,40 +40,35 @@
         </child>
         <child>
           <object class="GtkOverlay">
-            <property name="visible">True</property>
             <child type="overlay">
               <object class="CallsInAppNotification" id="in_app_notification">
+                <property name="can-target">False</property>
                 <property name="visible">True</property>
               </object>
-              <packing>
-                <property name="pass-through">True</property>
-              </packing>
             </child>
-            <child>
+            <property name="child">
               <object class="GtkBox">
-                <property name="visible">True</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkRevealer" id="permanent_error_revealer">
-                    <property name="visible">True</property>
                     <property name="reveal_child">True</property>
-                    <child>
+                    <property name="child">
                       <object class="GtkLabel" id="permanent_error_label">
                         <property name="justify">center</property>
                         <property name="wrap">True</property>
-                        <property name="visible">True</property>
                         <style>
                           <class name="error-state-message"/>
                         </style>
                       </object>
-                    </child>
+                    </property>
                   </object>
                 </child>
                 <child>
                   <object class="GtkStack" id="main_stack">
-                    <property name="visible">True</property>
-                    <property name="homogeneous">False</property>
-                    <property name="expand">True</property>
+                    <property name="vhomogeneous">False</property>
+                    <property name="hhomogeneous">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
                   </object>
                 </child>
                 <child>
@@ -88,15 +79,13 @@
                   </object>
                 </child>
               </object>
-            </child>
+            </property>
           </object>
         </child>
       </object>
     </child>
   </template>
-
   <object class="GtkDialog" id="ussd_dialog">
-    <property name="can-focus">False</property>
     <property name="modal">True</property>
     <property name="default-width">240</property>
     <property name="default-height">200</property>
@@ -106,11 +95,8 @@
         <property name="visible">True</property>
         <property name="show-close-button">False</property>
         <property name="title" translatable="yes">USSD</property>
-
         <child>
           <object class="GtkButton" id="ussd_cancel_button">
-            <property name="visible">True</property>
-            <property name="sensitive">True</property>
             <property name="has-default">True</property>
             <property name="can-default">True</property>
             <property name="use-underline">True</property>
@@ -121,13 +107,9 @@
             <property name="pack_type">start</property>
           </packing>
         </child>
-
         <child>
           <object class="GtkButton" id="ussd_close_button">
-            <property name="visible" bind-source="ussd_cancel_button" bind-property="visible"
-                      bind-flags="sync-create|invert-boolean|bidirectional"/>
-            <property name="visible">True</property>
-            <property name="sensitive">True</property>
+            <property name="visible" bind-source="ussd_cancel_button" bind-property="visible" bind-flags="sync-create|invert-boolean|bidirectional"/>
             <property name="has-default">True</property>
             <property name="can-default">True</property>
             <property name="use-underline">True</property>
@@ -138,11 +120,9 @@
             <property name="pack_type">start</property>
           </packing>
         </child>
-
         <child>
           <object class="GtkButton" id="ussd_reply_button">
             <property name="label" translatable="yes">_Send</property>
-            <property name="visible">True</property>
             <property name="sensitive">False</property>
             <property name="use-underline">True</property>
             <signal name="clicked" handler="window_ussd_reply_clicked_cb" swapped="yes"/>
@@ -154,28 +134,25 @@
             <property name="pack-type">end</property>
           </packing>
         </child>
-
       </object>
     </child>
     <child internal-child="vbox">
       <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="expand">True</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
         <property name="border-width">0</property>
-        <property name="margin">12</property>
-
+        <property name="margin-start">12</property>
+        <property name="margin-end">12</property>
+        <property name="margin-top">12</property>
+        <property name="margin-bottom">12</property>
         <child>
           <object class="GtkStack" id="ussd_stack">
-            <property name="visible">True</property>
-
             <child>
               <object class="GtkBox" id="ussd_content">
-                <property name="visible">True</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkLabel" id="ussd_label">
-                    <property name="visible">True</property>
                     <property name="wrap">True</property>
                     <property name="xalign">0</property>
                   </object>
@@ -188,28 +165,25 @@
                 </child>
               </object>
             </child>
-
             <child>
               <object class="GtkSpinner" id="ussd_spinner">
                 <property name="valign">center</property>
                 <property name="vexpand">True</property>
-                <property name="visible">True</property>
               </object>
             </child>
-
           </object>
         </child>
-
       </object>
     </child>
   </object>
-
   <object class="GtkPopoverMenu" id="menu_popover">
-    <child>
+    <property name="child">
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="orientation">vertical</property>
-        <property name="margin">12</property>
+        <property name="margin-start">12</property>
+        <property name="margin-end">12</property>
+        <property name="margin-top">12</property>
+        <property name="margin-bottom">12</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkModelButton">
@@ -220,7 +194,6 @@
         </child>
         <child>
           <object class="GtkSeparator">
-            <property name="visible">True</property>
             <property name="orientation">vertical</property>
           </object>
         </child>
@@ -243,9 +216,7 @@
             <property name="action-name">win.about</property>
           </object>
         </child>
-
       </object>
-    </child>
+    </property>
   </object>
-
 </interface>
diff --git a/src/ui/new-call-box.ui b/src/ui/new-call-box.ui
index 933a2db..2e2d872 100644
--- a/src/ui/new-call-box.ui
+++ b/src/ui/new-call-box.ui
@@ -1,29 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
 <interface>
-  <requires lib="gtk+" version="3.22"/>
+  <requires lib="gtk" version="4.0"/>
   <requires lib="libadwaita" version="1.0"/>
   <template class="CallsNewCallBox" parent="GtkWidget">
-    <property name="visible">True</property>
     <child>
       <object class="GtkBox">
-        <property name="margin_left">24</property>
-        <property name="margin_right">24</property>
+        <property name="margin-start">24</property>
+        <property name="margin-end">24</property>
         <property name="margin_top">6</property>
         <property name="orientation">vertical</property>
-        <property name="visible">True</property>
-
         <child>
           <object class="AdwClamp">
             <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkBox">
-                <property name="visible">True</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkListBox" id="origin_list_box">
-                    <property name="visible">True</property>
                     <property name="selection-mode">none</property>
                     <property name="halign">center</property>
                     <child>
@@ -72,7 +66,6 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="dial_result_btn">
-                            <property name="visible">True</property>
                             <property name="always_show_image">True</property>
                             <signal name="clicked" handler="dial_result_clicked_cb" swapped="yes"/>
                             <style>
@@ -80,7 +73,6 @@
                             </style>
                             <child>
                               <object class="GtkImage">
-                                <property name="visible">True</property>
                                 <property name="icon-name">call-start-symbolic</property>
                               </object>
                             </child>
diff --git a/src/ui/new-call-header-bar.ui b/src/ui/new-call-header-bar.ui
index 5e3c2ff..338b68f 100644
--- a/src/ui/new-call-header-bar.ui
+++ b/src/ui/new-call-header-bar.ui
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.22"/>
+  <requires lib="gtk" version="4.0"/>
   <template class="CallsNewCallHeaderBar" parent="GtkHeaderBar">
-    <property name="show-close-button">True</property>
     <property name="title" translatable="yes">New Call</property>
-    <property name="visible">True</property>
-    <child>
+    <child type="start">
       <object class="GtkButton" id="back">
         <property name="action-name">win.back</property>
-        <property name="visible">True</property>
         <property name="valign">center</property>
         <property name="use-underline">True</property>
         <style>
@@ -21,20 +18,14 @@
         </child>
         <child>
           <object class="GtkImage" id="back_image">
-            <property name="visible">True</property>
             <property name="icon-name">go-previous-symbolic</property>
-            <property name="icon-size">1</property>
+            <property name="icon-size">normal</property>
           </object>
         </child>
       </object>
-      <packing>
-        <property name="pack-type">start</property>
-      </packing>
     </child>
     <child type="title">
-      <object class="GtkStackSwitcher" id="stack_switcher">
-        <property name="visible">True</property>
-      </object>
+      <object class="GtkStackSwitcher" id="stack_switcher"/>
     </child>
   </template>
 </interface>