diff --git a/plugins/provider/sip/calls-sip-account-widget.c b/plugins/provider/sip/calls-sip-account-widget.c
index 13662b2..8011e19 100644
--- a/plugins/provider/sip/calls-sip-account-widget.c
+++ b/plugins/provider/sip/calls-sip-account-widget.c
@@ -51,7 +51,7 @@ static GParamSpec *props[PROP_LAST_PROP];
 
 
 struct _CallsSipAccountWidget {
-  GtkWidget         parent;
+  AdwBin            parent;
 
   GtkWidget        *child;
 
@@ -89,7 +89,7 @@ struct _CallsSipAccountWidget {
   gboolean          port_self_change;
 };
 
-G_DEFINE_TYPE (CallsSipAccountWidget, calls_sip_account_widget, GTK_TYPE_WIDGET)
+G_DEFINE_TYPE (CallsSipAccountWidget, calls_sip_account_widget, ADW_TYPE_BIN)
 
 
 static gboolean
@@ -650,8 +650,6 @@ calls_sip_account_widget_class_init (CallsSipAccountWidgetClass *klass)
   gtk_widget_class_bind_template_callback (widget_class, on_password_visibility_changed);
   gtk_widget_class_bind_template_callback (widget_class, on_port_entry_insert_text);
   gtk_widget_class_bind_template_callback (widget_class, on_port_entry_after_insert_text);
-
-  gtk_widget_class_set_layout_manager_type(widget_class, GTK_TYPE_BOX_LAYOUT);
 }
 
 
diff --git a/plugins/provider/sip/calls-sip-account-widget.h b/plugins/provider/sip/calls-sip-account-widget.h
index 799995d..6259204 100644
--- a/plugins/provider/sip/calls-sip-account-widget.h
+++ b/plugins/provider/sip/calls-sip-account-widget.h
@@ -32,7 +32,7 @@ G_BEGIN_DECLS
 
 #define CALLS_TYPE_SIP_ACCOUNT_WIDGET (calls_sip_account_widget_get_type ())
 
-G_DECLARE_FINAL_TYPE (CallsSipAccountWidget, calls_sip_account_widget, CALLS, SIP_ACCOUNT_WIDGET, GtkWidget)
+G_DECLARE_FINAL_TYPE (CallsSipAccountWidget, calls_sip_account_widget, CALLS, SIP_ACCOUNT_WIDGET, AdwBin)
 
 CallsSipAccountWidget *calls_sip_account_widget_new           (CallsSipProvider      *provider);
 void            calls_sip_account_widget_set_origin    (CallsSipAccountWidget *self,
diff --git a/plugins/provider/sip/sip-account-widget.ui b/plugins/provider/sip/sip-account-widget.ui
index b3b62dc..1af5312 100644
--- a/plugins/provider/sip/sip-account-widget.ui
+++ b/plugins/provider/sip/sip-account-widget.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk" version="4.0"/>
   <requires lib="libadwaita" version="1.0"/>
-  <template class="CallsSipAccountWidget" parent="GtkWidget">
+  <template class="CallsSipAccountWidget" parent="AdwBin">
     <child>
       <object class="AdwToolbarView" id="child">
         <child type="top">
diff --git a/src/calls-call-selector-item.c b/src/calls-call-selector-item.c
index 4018583..f4b80fe 100644
--- a/src/calls-call-selector-item.c
+++ b/src/calls-call-selector-item.c
@@ -33,7 +33,7 @@
 
 
 struct _CallsCallSelectorItem {
-  GtkBox     parent_instance;
+  AdwBin     parent_instance;
 
   CuiCallDisplay *display;
 
@@ -42,7 +42,7 @@ struct _CallsCallSelectorItem {
   GtkLabel       *status;
 };
 
-G_DEFINE_TYPE (CallsCallSelectorItem, calls_call_selector_item, GTK_TYPE_BOX);
+G_DEFINE_TYPE (CallsCallSelectorItem, calls_call_selector_item, ADW_TYPE_BIN);
 
 enum {
   PROP_0,
diff --git a/src/calls-call-selector-item.h b/src/calls-call-selector-item.h
index 5d77195..2c38236 100644
--- a/src/calls-call-selector-item.h
+++ b/src/calls-call-selector-item.h
@@ -25,6 +25,7 @@
 #ifndef CALLS_CALL_SELECTOR_ITEM_H__
 #define CALLS_CALL_SELECTOR_ITEM_H__
 
+#include <adwaita.h>
 #include <call-ui.h>
 #include <gtk/gtk.h>
 
@@ -33,7 +34,7 @@ G_BEGIN_DECLS
 #define CALLS_TYPE_CALL_SELECTOR_ITEM (calls_call_selector_item_get_type ())
 
 G_DECLARE_FINAL_TYPE (CallsCallSelectorItem, calls_call_selector_item,
-                      CALLS, CALL_SELECTOR_ITEM, GtkBox);
+                      CALLS, CALL_SELECTOR_ITEM, AdwBin);
 
 CallsCallSelectorItem *calls_call_selector_item_new         (CuiCallDisplay *display);
 CuiCallDisplay        *calls_call_selector_item_get_display (CallsCallSelectorItem *item);
diff --git a/src/calls-contacts-box.c b/src/calls-contacts-box.c
index 9137c68..b13c9c2 100644
--- a/src/calls-contacts-box.c
+++ b/src/calls-contacts-box.c
@@ -32,7 +32,7 @@
 #include <adwaita.h>
 
 struct _CallsContactsBox {
-  GtkWidget         parent_instance;
+  AdwBin            parent_instance;
 
   GtkWidget        *child;
 
@@ -44,7 +44,7 @@ struct _CallsContactsBox {
   FolksSimpleQuery *search_query;
 };
 
-G_DEFINE_TYPE (CallsContactsBox, calls_contacts_box, GTK_TYPE_WIDGET);
+G_DEFINE_TYPE (CallsContactsBox, calls_contacts_box, ADW_TYPE_BIN);
 
 static void
 search_changed_cb (CallsContactsBox *self,
@@ -187,8 +187,6 @@ calls_contacts_box_class_init (CallsContactsBoxClass *klass)
   gtk_widget_class_bind_template_child (widget_class, CallsContactsBox, contacts_frame);
   gtk_widget_class_bind_template_child (widget_class, CallsContactsBox, search_entry);
   gtk_widget_class_bind_template_child (widget_class, CallsContactsBox, placeholder_empty);
-
-  gtk_widget_class_set_layout_manager_type(widget_class, GTK_TYPE_BOX_LAYOUT);
 }
 
 
diff --git a/src/calls-contacts-box.h b/src/calls-contacts-box.h
index 89c5e81..b2e1a98 100644
--- a/src/calls-contacts-box.h
+++ b/src/calls-contacts-box.h
@@ -25,13 +25,14 @@
 #ifndef CALLS_CONTACTS_BOX_H__
 #define CALLS_CONTACTS_BOX_H__
 
+#include <adwaita.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
 #define CALLS_TYPE_CONTACTS_BOX (calls_contacts_box_get_type ())
 
-G_DECLARE_FINAL_TYPE (CallsContactsBox, calls_contacts_box, CALLS, CONTACTS_BOX, GtkWidget);
+G_DECLARE_FINAL_TYPE (CallsContactsBox, calls_contacts_box, CALLS, CONTACTS_BOX, AdwBin);
 
 GtkWidget *calls_contacts_box_new (void);
 
diff --git a/src/calls-history-box.c b/src/calls-history-box.c
index bcdff02..1ffeb45 100644
--- a/src/calls-history-box.c
+++ b/src/calls-history-box.c
@@ -38,7 +38,7 @@
 #define CALLS_HISTORY_INCREASE_N_PAGES_THRESHOLD 2
 
 struct _CallsHistoryBox {
-  GtkWidget          parent_instance;
+  AdwBin             parent_instance;
 
   GtkStack          *stack;
   GtkListBox        *history;
@@ -54,7 +54,7 @@ struct _CallsHistoryBox {
 
 };
 
-G_DEFINE_TYPE (CallsHistoryBox, calls_history_box, GTK_TYPE_WIDGET);
+G_DEFINE_TYPE (CallsHistoryBox, calls_history_box, ADW_TYPE_BIN);
 
 
 enum {
@@ -262,8 +262,6 @@ calls_history_box_class_init (CallsHistoryBoxClass *klass)
   gtk_widget_class_bind_template_child (widget_class, CallsHistoryBox, stack);
   gtk_widget_class_bind_template_child (widget_class, CallsHistoryBox, history);
   gtk_widget_class_bind_template_child (widget_class, CallsHistoryBox, scrolled_window);
-
-  gtk_widget_class_set_layout_manager_type(widget_class, GTK_TYPE_BOX_LAYOUT);
 }
 
 
diff --git a/src/calls-history-box.h b/src/calls-history-box.h
index 18ead93..e763b0b 100644
--- a/src/calls-history-box.h
+++ b/src/calls-history-box.h
@@ -27,13 +27,14 @@
 
 #include "calls-new-call-box.h"
 
+#include <adwaita.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
 #define CALLS_TYPE_HISTORY_BOX (calls_history_box_get_type ())
 
-G_DECLARE_FINAL_TYPE (CallsHistoryBox, calls_history_box, CALLS, HISTORY_BOX, GtkWidget);
+G_DECLARE_FINAL_TYPE (CallsHistoryBox, calls_history_box, CALLS, HISTORY_BOX, AdwBin);
 
 CallsHistoryBox *calls_history_box_new (GListModel *model);
 
diff --git a/src/calls-new-call-box.c b/src/calls-new-call-box.c
index 91cb6a0..fb95585 100644
--- a/src/calls-new-call-box.c
+++ b/src/calls-new-call-box.c
@@ -44,7 +44,7 @@ enum {
 static GParamSpec *props[PROP_LAST_PROP];
 
 struct _CallsNewCallBox {
-  GtkWidget     parent_instance;
+  AdwBin        parent_instance;
 
   GtkWidget    *child;
 
@@ -60,7 +60,7 @@ struct _CallsNewCallBox {
   gboolean      numeric_input_only;
 };
 
-G_DEFINE_TYPE (CallsNewCallBox, calls_new_call_box, GTK_TYPE_WIDGET);
+G_DEFINE_TYPE (CallsNewCallBox, calls_new_call_box, ADW_TYPE_BIN);
 
 
 static CallsOrigin *
@@ -379,8 +379,6 @@ calls_new_call_box_class_init (CallsNewCallBoxClass *klass)
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY);
 
   g_object_class_install_properties (object_class, PROP_LAST_PROP, props);
-
-  gtk_widget_class_set_layout_manager_type(widget_class, GTK_TYPE_BOX_LAYOUT);
 }
 
 
diff --git a/src/calls-new-call-box.h b/src/calls-new-call-box.h
index 724105a..13734bb 100644
--- a/src/calls-new-call-box.h
+++ b/src/calls-new-call-box.h
@@ -24,13 +24,14 @@
 
 #pragma once
 
+#include <adwaita.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
 #define CALLS_TYPE_NEW_CALL_BOX (calls_new_call_box_get_type ())
 
-G_DECLARE_FINAL_TYPE (CallsNewCallBox, calls_new_call_box, CALLS, NEW_CALL_BOX, GtkWidget)
+G_DECLARE_FINAL_TYPE (CallsNewCallBox, calls_new_call_box, CALLS, NEW_CALL_BOX, AdwBin)
 
 CallsNewCallBox *calls_new_call_box_new  (void);
 void             calls_new_call_box_dial (CallsNewCallBox *self,
diff --git a/src/ui/call-selector-item.ui b/src/ui/call-selector-item.ui
index 1c9591c..75aba4d 100644
--- a/src/ui/call-selector-item.ui
+++ b/src/ui/call-selector-item.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk" version="4.0"/>
-  <template class="CallsCallSelectorItem" parent="GtkBox">
+  <template class="CallsCallSelectorItem" parent="AdwBin">
     <child>
       <object class="GtkFrame">
         <property name="child">
diff --git a/src/ui/contacts-box.ui b/src/ui/contacts-box.ui
index ded07d9..7e53e14 100644
--- a/src/ui/contacts-box.ui
+++ b/src/ui/contacts-box.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk" version="4.0"/>
   <requires lib="libadwaita" version="0.0"/>
-  <template class="CallsContactsBox" parent="GtkWidget">
+  <template class="CallsContactsBox" parent="AdwBin">
     <child>
       <object class="GtkScrolledWindow" id="child">
         <property name="hexpand">True</property>
diff --git a/src/ui/history-box.ui b/src/ui/history-box.ui
index fbb54a0..6162594 100644
--- a/src/ui/history-box.ui
+++ b/src/ui/history-box.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk" version="4.0"/>
-  <template class="CallsHistoryBox" parent="GtkWidget">
+  <template class="CallsHistoryBox" parent="AdwBin">
     <child>
       <object class="GtkStack" id="stack">
         <property name="hexpand">True</property>
diff --git a/src/ui/new-call-box.ui b/src/ui/new-call-box.ui
index d0d2017..afd589a 100644
--- a/src/ui/new-call-box.ui
+++ b/src/ui/new-call-box.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk" version="4.0"/>
   <requires lib="libadwaita" version="1.0"/>
-  <template class="CallsNewCallBox" parent="GtkWidget">
+  <template class="CallsNewCallBox" parent="AdwBin">
     <child>
       <object class="GtkBox" id="child">
         <property name="margin-start">24</property>