diff --git a/plugins/provider/sip/calls-sip-account-widget.c b/plugins/provider/sip/calls-sip-account-widget.c
index e16a05d..b71fcf2 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 {
-  GtkBin            parent;
+  GtkWidget         parent;
 
   /* Header bar */
   GtkWidget        *header_add;
@@ -87,7 +87,7 @@ struct _CallsSipAccountWidget {
   gboolean          port_self_change;
 };
 
-G_DEFINE_TYPE (CallsSipAccountWidget, calls_sip_account_widget, GTK_TYPE_BIN)
+G_DEFINE_TYPE (CallsSipAccountWidget, calls_sip_account_widget, GTK_TYPE_WIDGET)
 
 
 static gboolean
diff --git a/plugins/provider/sip/calls-sip-account-widget.h b/plugins/provider/sip/calls-sip-account-widget.h
index 19eff0a..f96945c 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, GtkBin)
+G_DECLARE_FINAL_TYPE (CallsSipAccountWidget, calls_sip_account_widget, CALLS, SIP_ACCOUNT_WIDGET, GtkWidget)
 
 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 26aa7bc..ef457f1 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="3.24"/>
   <requires lib="libhandy" version="1.0"/>
-  <template class="CallsSipAccountWidget" parent="GtkBin">
+  <template class="CallsSipAccountWidget" parent="GtkWidget">
     <property name="visible">True</property>
     <child>
       <object class="GtkBox">
diff --git a/src/calls-contacts-box.c b/src/calls-contacts-box.c
index 64626eb..8e7304b 100644
--- a/src/calls-contacts-box.c
+++ b/src/calls-contacts-box.c
@@ -33,7 +33,7 @@
 #include <handy.h>
 
 struct _CallsContactsBox {
-  GtkBin            parent_instance;
+  GtkWidget         parent_instance;
 
   GtkWidget        *search_entry;
   GtkWidget        *contacts_frame;
@@ -43,7 +43,7 @@ struct _CallsContactsBox {
   FolksSimpleQuery *search_query;
 };
 
-G_DEFINE_TYPE (CallsContactsBox, calls_contacts_box, GTK_TYPE_BIN);
+G_DEFINE_TYPE (CallsContactsBox, calls_contacts_box, GTK_TYPE_WIDGET);
 
 static void
 search_changed_cb (CallsContactsBox *self,
diff --git a/src/calls-contacts-box.h b/src/calls-contacts-box.h
index 14eb91d..89c5e81 100644
--- a/src/calls-contacts-box.h
+++ b/src/calls-contacts-box.h
@@ -31,7 +31,7 @@ G_BEGIN_DECLS
 
 #define CALLS_TYPE_CONTACTS_BOX (calls_contacts_box_get_type ())
 
-G_DECLARE_FINAL_TYPE (CallsContactsBox, calls_contacts_box, CALLS, CONTACTS_BOX, GtkBin);
+G_DECLARE_FINAL_TYPE (CallsContactsBox, calls_contacts_box, CALLS, CONTACTS_BOX, GtkWidget);
 
 GtkWidget *calls_contacts_box_new (void);
 
diff --git a/src/calls-history-box.c b/src/calls-history-box.c
index 725085c..2b200c7 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 {
-  GtkBin             parent_instance;
+  GtkWidget          parent_instance;
 
   GtkStack          *stack;
   GtkListBox        *history;
@@ -54,7 +54,7 @@ struct _CallsHistoryBox {
 
 };
 
-G_DEFINE_TYPE (CallsHistoryBox, calls_history_box, GTK_TYPE_BIN);
+G_DEFINE_TYPE (CallsHistoryBox, calls_history_box, GTK_TYPE_WIDGET);
 
 
 enum {
diff --git a/src/calls-history-box.h b/src/calls-history-box.h
index a82bbc4..18ead93 100644
--- a/src/calls-history-box.h
+++ b/src/calls-history-box.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 
 #define CALLS_TYPE_HISTORY_BOX (calls_history_box_get_type ())
 
-G_DECLARE_FINAL_TYPE (CallsHistoryBox, calls_history_box, CALLS, HISTORY_BOX, GtkBin);
+G_DECLARE_FINAL_TYPE (CallsHistoryBox, calls_history_box, CALLS, HISTORY_BOX, GtkWidget);
 
 CallsHistoryBox *calls_history_box_new (GListModel *model);
 
diff --git a/src/calls-in-app-notification.c b/src/calls-in-app-notification.c
index 5be1ec8..6d09b6c 100644
--- a/src/calls-in-app-notification.c
+++ b/src/calls-in-app-notification.c
@@ -27,7 +27,7 @@
 #define DEFAULT_TIMEOUT_SECONDS 3
 
 struct _CallsInAppNotification {
-  GtkBin       parent_instance;
+  GtkWidget    parent_instance;
 
   GtkRevealer *revealer;
   GtkLabel    *label;
@@ -36,7 +36,7 @@ struct _CallsInAppNotification {
   guint        timeout_id;
 };
 
-G_DEFINE_TYPE (CallsInAppNotification, calls_in_app_notification, GTK_TYPE_BIN)
+G_DEFINE_TYPE (CallsInAppNotification, calls_in_app_notification, GTK_TYPE_WIDGET)
 
 
 enum {
diff --git a/src/calls-in-app-notification.h b/src/calls-in-app-notification.h
index 8cefeda..b113bfd 100644
--- a/src/calls-in-app-notification.h
+++ b/src/calls-in-app-notification.h
@@ -31,7 +31,7 @@ G_BEGIN_DECLS
 
 #define CALLS_TYPE_IN_APP_NOTIFICATION (calls_in_app_notification_get_type ())
 
-G_DECLARE_FINAL_TYPE (CallsInAppNotification, calls_in_app_notification, CALLS, IN_APP_NOTIFICATION, GtkBin)
+G_DECLARE_FINAL_TYPE (CallsInAppNotification, calls_in_app_notification, CALLS, IN_APP_NOTIFICATION, GtkWidget)
 
 CallsInAppNotification * calls_in_app_notification_new (void);
 void calls_in_app_notification_show (CallsInAppNotification *self, const gchar *message);
diff --git a/src/calls-new-call-box.c b/src/calls-new-call-box.c
index 5a13b2a..55ee745 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 {
-  GtkBin        parent_instance;
+  GtkWidget     parent_instance;
 
   GtkListBox   *origin_list_box;
   HdyComboRow  *origin_list;
@@ -58,7 +58,7 @@ struct _CallsNewCallBox {
   gboolean      numeric_input_only;
 };
 
-G_DEFINE_TYPE (CallsNewCallBox, calls_new_call_box, GTK_TYPE_BIN);
+G_DEFINE_TYPE (CallsNewCallBox, calls_new_call_box, GTK_TYPE_WIDGET);
 
 
 static CallsOrigin *
diff --git a/src/calls-new-call-box.h b/src/calls-new-call-box.h
index c384bbf..724105a 100644
--- a/src/calls-new-call-box.h
+++ b/src/calls-new-call-box.h
@@ -30,7 +30,7 @@ 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, GtkBin)
+G_DECLARE_FINAL_TYPE (CallsNewCallBox, calls_new_call_box, CALLS, NEW_CALL_BOX, GtkWidget)
 
 CallsNewCallBox *calls_new_call_box_new  (void);
 void             calls_new_call_box_dial (CallsNewCallBox *self,
diff --git a/src/ui/contacts-box.ui b/src/ui/contacts-box.ui
index 761868a..ef158f8 100644
--- a/src/ui/contacts-box.ui
+++ b/src/ui/contacts-box.ui
@@ -3,7 +3,7 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <requires lib="libhandy" version="0.0"/>
-  <template class="CallsContactsBox" parent="GtkBin">
+  <template class="CallsContactsBox" parent="GtkWidget">
     <property name="visible">True</property>
     <child>
       <object class="GtkScrolledWindow">
diff --git a/src/ui/history-box.ui b/src/ui/history-box.ui
index c9f9559..2a8f42f 100644
--- a/src/ui/history-box.ui
+++ b/src/ui/history-box.ui
@@ -2,7 +2,7 @@
 <!-- Generated with glade 3.22.0 -->
 <interface>
   <requires lib="gtk+" version="3.22"/>
-  <template class="CallsHistoryBox" parent="GtkBin">
+  <template class="CallsHistoryBox" parent="GtkWidget">
     <child>
       <object class="GtkStack" id="stack">
         <property name="visible">True</property>
diff --git a/src/ui/in-app-notification.ui b/src/ui/in-app-notification.ui
index a7dbe04..38513ba 100644
--- a/src/ui/in-app-notification.ui
+++ b/src/ui/in-app-notification.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.20"/>
-  <template class="CallsInAppNotification" parent="GtkBin">
+  <template class="CallsInAppNotification" parent="GtkWidget">
     <property name="visible">False</property>
     <child>
       <object class="GtkRevealer" id="revealer">
diff --git a/src/ui/new-call-box.ui b/src/ui/new-call-box.ui
index 989877f..89fe7d3 100644
--- a/src/ui/new-call-box.ui
+++ b/src/ui/new-call-box.ui
@@ -3,7 +3,7 @@
 <interface>
   <requires lib="gtk+" version="3.22"/>
   <requires lib="libhandy" version="1.0"/>
-  <template class="CallsNewCallBox" parent="GtkBin">
+  <template class="CallsNewCallBox" parent="GtkWidget">
     <property name="visible">True</property>
     <child>
       <object class="GtkBox">