diff --git a/HACKING.md b/HACKING.md
index 196995d..24427a1 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -26,7 +26,7 @@ While much of the original codebase was written using [GNU's Coding Style][1],
 please try to follow this document for newly written code.
 For existing code you should probably try to not mix different code styles too much.
 This coding style is heavily inspired/copied from [phosh's Coding Style][2]
-which itself is mostly using [libhandy's Coding Style][3].
+which itself is mostly using [libadwaita's Coding Style][3].
 
 These are the differences:
 
@@ -124,8 +124,8 @@ individual C files should be structured as (top to bottom of file):
   The reason public methods go at the bottom is that they have declarations in
   the header file and can thus be referenced from anywhere else in the source
   file.
-  
+
   Try to avoid forward declarations where possible.
 [1]: https://www.gnu.org/prep/standards/standards.html#Formatting
 [2]: https://gitlab.gnome.org/World/Phosh/phosh/-/blob/main/HACKING.md#coding-style
-[3]: https://gitlab.gnome.org/GNOME/libhandy/-/blob/main/HACKING.md#coding-style
+[3]: https://gitlab.gnome.org/GNOME/libadwaita/-/blob/main/HACKING.md#coding-style
diff --git a/debian/control b/debian/control
index 4fff875..64c861b 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends:
  gstreamer1.0-plugins-bad,
  gstreamer1.0-plugins-good,
  gtk-doc-tools <!nodoc>,
+ libadwaita-1-dev (>= 1.2),
  libcallaudio-dev (>= 0.0.5),
  libebook-contacts1.2-dev,
  libfeedback-dev (>= 0.0.1),
@@ -19,7 +20,6 @@ Build-Depends:
  libgstreamer1.0-dev,
  libgtk-3-dev,
  libgtk-3-doc <!nodoc>,
- libhandy-1-dev (>= 1.1.90),
  libmm-glib-dev (>= 1.12.0),
  libpeas-dev,
  librsvg2-common,
diff --git a/plugins/provider/sip/calls-sip-account-widget.c b/plugins/provider/sip/calls-sip-account-widget.c
index b71fcf2..3c882f8 100644
--- a/plugins/provider/sip/calls-sip-account-widget.c
+++ b/plugins/provider/sip/calls-sip-account-widget.c
@@ -69,9 +69,9 @@ struct _CallsSipAccountWidget {
   GtkEntry         *password;
   GtkEntry         *port;
   char             *last_port;
-  HdyComboRow      *protocol;
-  GListStore       *protocols_store; /* bound model for protocol HdyComboRow */
-  HdyComboRow      *media_encryption;
+  AdwComboRow      *protocol;
+  GListStore       *protocols_store; /* bound model for protocol AdwComboRow */
+  AdwComboRow      *media_encryption;
   GListStore       *media_encryption_store;
   GtkSwitch        *tel_switch;
   GtkSwitch        *auto_connect_switch;
@@ -114,13 +114,13 @@ is_form_filled (CallsSipAccountWidget *self)
 static const char *
 get_selected_protocol (CallsSipAccountWidget *self)
 {
-  g_autoptr (HdyValueObject) obj = NULL;
+  g_autoptr (AdwValueObject) obj = NULL;
   const char *protocol = NULL;
   gint i;
 
-  if ((i = hdy_combo_row_get_selected_index (self->protocol)) != -1) {
+  if ((i = adw_combo_row_get_selected_index (self->protocol)) != -1) {
     obj = g_list_model_get_item (G_LIST_MODEL (self->protocols_store), i);
-    protocol = hdy_value_object_get_string (obj);
+    protocol = adw_value_object_get_string (obj);
   }
   return protocol;
 }
@@ -129,11 +129,11 @@ get_selected_protocol (CallsSipAccountWidget *self)
 static SipMediaEncryption
 get_selected_media_encryption (CallsSipAccountWidget *self)
 {
-  g_autoptr (HdyValueObject) obj = NULL;
+  g_autoptr (AdwValueObject) obj = NULL;
   SipMediaEncryption media_encryption = SIP_MEDIA_ENCRYPTION_NONE;
   gint i;
 
-  if ((i = hdy_combo_row_get_selected_index (self->media_encryption)) != -1) {
+  if ((i = adw_combo_row_get_selected_index (self->media_encryption)) != -1) {
     obj = g_list_model_get_item (G_LIST_MODEL (self->media_encryption_store), i);
     media_encryption = (SipMediaEncryption) GPOINTER_TO_INT (g_object_get_data (G_OBJECT (obj), "value"));
   }
@@ -158,7 +158,7 @@ update_media_encryption (CallsSipAccountWidget *self)
                             transport_is_tls | sdes_always_allowed);
 
   if (!transport_is_tls && !sdes_always_allowed)
-    hdy_combo_row_set_selected_index (self->media_encryption, 0);
+    adw_combo_row_set_selected_index (self->media_encryption, 0);
 }
 
 
@@ -335,9 +335,9 @@ find_protocol (CallsSipAccountWidget *self,
 
   len = g_list_model_get_n_items (G_LIST_MODEL (self->protocols_store));
   for (guint i = 0; i < len; i++) {
-    g_autoptr (HdyValueObject) obj =
+    g_autoptr (AdwValueObject) obj =
       g_list_model_get_item (G_LIST_MODEL (self->protocols_store), i);
-    const char *prot = hdy_value_object_get_string (obj);
+    const char *prot = adw_value_object_get_string (obj);
 
     if (g_strcmp0 (protocol, prot) == 0) {
       if (index)
@@ -363,7 +363,7 @@ find_media_encryption (CallsSipAccountWidget   *self,
   len = g_list_model_get_n_items (G_LIST_MODEL (self->media_encryption_store));
 
   for (guint i = 0; i < len; i++) {
-    g_autoptr (HdyValueObject) obj =
+    g_autoptr (AdwValueObject) obj =
       g_list_model_get_item (G_LIST_MODEL (self->media_encryption_store), i);
     SipMediaEncryption obj_enc =
       (SipMediaEncryption) GPOINTER_TO_INT (g_object_get_data (G_OBJECT (obj), "value"));
@@ -390,9 +390,9 @@ clear_form (CallsSipAccountWidget *self)
   gtk_entry_set_text (self->user, "");
   gtk_entry_set_text (self->password, "");
   gtk_entry_set_text (self->port, "0");
-  hdy_combo_row_set_selected_index (self->protocol, 0);
+  adw_combo_row_set_selected_index (self->protocol, 0);
   gtk_widget_set_sensitive (GTK_WIDGET (self->media_encryption), FALSE);
-  hdy_combo_row_set_selected_index (self->media_encryption, 0);
+  adw_combo_row_set_selected_index (self->media_encryption, 0);
   gtk_switch_set_state (self->tel_switch, FALSE);
   gtk_switch_set_state (self->auto_connect_switch, TRUE);
 
@@ -464,8 +464,8 @@ edit_form (CallsSipAccountWidget *self,
   gtk_entry_set_text (self->password, password);
   set_password_visibility (self, FALSE);
   gtk_entry_set_text (self->port, port_str);
-  hdy_combo_row_set_selected_index (self->protocol, protocol_index);
-  hdy_combo_row_set_selected_index (self->media_encryption, encryption_index);
+  adw_combo_row_set_selected_index (self->protocol, protocol_index);
+  adw_combo_row_set_selected_index (self->media_encryption, encryption_index);
   gtk_switch_set_state (self->tel_switch, can_tel);
   gtk_switch_set_state (self->auto_connect_switch, auto_connect);
 
@@ -652,7 +652,7 @@ calls_sip_account_widget_class_init (CallsSipAccountWidgetClass *klass)
 static void
 calls_sip_account_widget_init (CallsSipAccountWidget *self)
 {
-  HdyValueObject *obj;
+  AdwValueObject *obj;
 
   self->settings = calls_settings_get_default ();
 
@@ -663,43 +663,43 @@ calls_sip_account_widget_init (CallsSipAccountWidget *self)
 
   gtk_widget_init_template (GTK_WIDGET (self));
 
-  self->media_encryption_store = g_list_store_new (HDY_TYPE_VALUE_OBJECT);
+  self->media_encryption_store = g_list_store_new (ADW_TYPE_VALUE_OBJECT);
 
-  obj = hdy_value_object_new_string (_("No encryption"));
+  obj = adw_value_object_new_string (_("No encryption"));
   g_object_set_data (G_OBJECT (obj),
                      "value", GINT_TO_POINTER (SIP_MEDIA_ENCRYPTION_NONE));
   g_list_store_insert (self->media_encryption_store, 0, obj);
   g_clear_object (&obj);
 
   /* TODO Optional encryption */
-  obj = hdy_value_object_new_string (_("Force encryption"));
+  obj = adw_value_object_new_string (_("Force encryption"));
   g_object_set_data (G_OBJECT (obj),
                      "value", GINT_TO_POINTER (SIP_MEDIA_ENCRYPTION_FORCED));
   g_list_store_insert (self->media_encryption_store, 1, obj);
   g_clear_object (&obj);
 
-  hdy_combo_row_bind_name_model (self->media_encryption,
+  adw_combo_row_bind_name_model (self->media_encryption,
                                  G_LIST_MODEL (self->media_encryption_store),
-                                 (HdyComboRowGetNameFunc) hdy_value_object_dup_string,
+                                 (AdwComboRowGetNameFunc) adw_value_object_dup_string,
                                  NULL, NULL);
 
-  self->protocols_store = g_list_store_new (HDY_TYPE_VALUE_OBJECT);
+  self->protocols_store = g_list_store_new (ADW_TYPE_VALUE_OBJECT);
 
-  obj = hdy_value_object_new_string ("UDP");
+  obj = adw_value_object_new_string ("UDP");
   g_list_store_insert (self->protocols_store, 0, obj);
   g_clear_object (&obj);
 
-  obj = hdy_value_object_new_string ("TCP");
+  obj = adw_value_object_new_string ("TCP");
   g_list_store_insert (self->protocols_store, 1, obj);
   g_clear_object (&obj);
 
-  obj = hdy_value_object_new_string ("TLS");
+  obj = adw_value_object_new_string ("TLS");
   g_list_store_insert (self->protocols_store, 2, obj);
   g_clear_object (&obj);
 
-  hdy_combo_row_bind_name_model (self->protocol,
+  adw_combo_row_bind_name_model (self->protocol,
                                  G_LIST_MODEL (self->protocols_store),
-                                 (HdyComboRowGetNameFunc) hdy_value_object_dup_string,
+                                 (AdwComboRowGetNameFunc) adw_value_object_dup_string,
                                  NULL, NULL);
 }
 
diff --git a/plugins/provider/sip/calls-sip-account-widget.h b/plugins/provider/sip/calls-sip-account-widget.h
index f96945c..799995d 100644
--- a/plugins/provider/sip/calls-sip-account-widget.h
+++ b/plugins/provider/sip/calls-sip-account-widget.h
@@ -26,7 +26,7 @@
 
 #include "calls-sip-provider.h"
 
-#include <handy.h>
+#include <adwaita.h>
 
 G_BEGIN_DECLS
 
diff --git a/plugins/provider/sip/meson.build b/plugins/provider/sip/meson.build
index e288031..3a02489 100644
--- a/plugins/provider/sip/meson.build
+++ b/plugins/provider/sip/meson.build
@@ -46,7 +46,7 @@ sip_deps = [
   dependency('gobject-2.0'),
   dependency('gstreamer-1.0'),
   dependency('gtk4'),
-  dependency('libhandy-1', version: '>= 1.1.90'),
+  dependency('libadwaita-1', version: '>= 1.2'),
   dependency('libpeas-1.0'),
   dependency('sofia-sip-ua-glib'),
   dependency('libsecret-1'),
diff --git a/plugins/provider/sip/sip-account-widget.ui b/plugins/provider/sip/sip-account-widget.ui
index ef457f1..62489b2 100644
--- a/plugins/provider/sip/sip-account-widget.ui
+++ b/plugins/provider/sip/sip-account-widget.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.24"/>
-  <requires lib="libhandy" version="1.0"/>
+  <requires lib="libadwaita" version="1.0"/>
   <template class="CallsSipAccountWidget" parent="GtkWidget">
     <property name="visible">True</property>
     <child>
@@ -10,7 +10,7 @@
         <property name="orientation">vertical</property>
 
         <child>
-          <object class="HdyHeaderBar" id="header_add">
+          <object class="AdwHeaderBar" id="header_add">
             <property name="title" translatable="yes">Add Account</property>
             <property name="show-close-button">True</property>
             <child>
@@ -39,7 +39,7 @@
         </child>
 
         <child>
-          <object class="HdyHeaderBar" id="header_edit">
+          <object class="AdwHeaderBar" id="header_edit">
             <property name="visible">True</property>
             <property name="show-close-button">True</property>
             <property name="title" translatable="yes">Manage Account</property>
@@ -83,13 +83,13 @@
         </child>
 
         <child>
-          <object class="HdyPreferencesPage">
+          <object class="AdwPreferencesPage">
             <property name="visible">True</property>
             <child>
-              <object class="HdyPreferencesGroup">
+              <object class="AdwPreferencesGroup">
                 <property name="visible">True</property>
                 <child>
-                  <object class="HdyActionRow">
+                  <object class="AdwActionRow">
                     <property name="visible">True</property>
                     <property name="title" translatable="yes">Server</property>
                     <child>
@@ -104,10 +104,10 @@
               </object>
             </child>
             <child>
-              <object class="HdyPreferencesGroup">
+              <object class="AdwPreferencesGroup">
                 <property name="visible">True</property>
                 <child>
-                  <object class="HdyActionRow">
+                  <object class="AdwActionRow">
                     <property name="visible">True</property>
                     <property name="title" translatable="yes">Display Name</property>
                     <property name="subtitle" translatable="yes">Optional</property>
@@ -123,10 +123,10 @@
               </object>
             </child>
             <child>
-              <object class="HdyPreferencesGroup">
+              <object class="AdwPreferencesGroup">
                 <property name="visible">True</property>
                 <child>
-                  <object class="HdyActionRow">
+                  <object class="AdwActionRow">
                     <property name="visible">True</property>
                     <property name="title" translatable="yes">User ID</property>
                     <child>
@@ -139,7 +139,7 @@
                   </object>
                 </child>
                 <child>
-                  <object class="HdyActionRow">
+                  <object class="AdwActionRow">
                     <property name="visible">True</property>
                     <property name="title" translatable="yes">Password</property>
                     <child>
@@ -161,10 +161,10 @@
               </object>
             </child>
             <child>
-              <object class="HdyPreferencesGroup">
+              <object class="AdwPreferencesGroup">
                 <property name="visible">True</property>
                 <child>
-                  <object class="HdyActionRow">
+                  <object class="AdwActionRow">
                     <property name="visible">True</property>
                     <property name="title" translatable="yes">Port</property>
                     <child>
@@ -180,14 +180,14 @@
                   </object>
                 </child>
                 <child>
-                  <object class="HdyComboRow" id="protocol">
+                  <object class="AdwComboRow" id="protocol">
                     <property name="visible">True</property>
                     <property name="title" translatable="yes">Transport</property>
                     <signal name="notify::selected-index" handler="on_user_changed" swapped="yes"/>
                   </object>
                 </child>
                 <child>
-                  <object class="HdyComboRow" id="media_encryption">
+                  <object class="AdwComboRow" id="media_encryption">
                     <property name="visible">True</property>
                     <property name="title" translatable="yes">Media Encryption</property>
                     <signal name="notify::selected-index" handler="on_user_changed" swapped="yes"/>
@@ -196,10 +196,10 @@
               </object>
             </child>
             <child>
-              <object class="HdyPreferencesGroup">
+              <object class="AdwPreferencesGroup">
                 <property name="visible">True</property>
                 <child>
-                  <object class="HdyActionRow">
+                  <object class="AdwActionRow">
                     <property name="visible">True</property>
                     <property name="title" translatable="yes">Use for Phone Calls</property>
                     <child>
@@ -212,7 +212,7 @@
                   </object>
                 </child>
                 <child>
-                  <object class="HdyActionRow">
+                  <object class="AdwActionRow">
                     <property name="visible">True</property>
                     <property name="title" translatable="yes">Automatically Connect</property>
                     <child>
diff --git a/src/calls-account-overview.c b/src/calls-account-overview.c
index 088b39e..7f8634b 100644
--- a/src/calls-account-overview.c
+++ b/src/calls-account-overview.c
@@ -40,10 +40,10 @@
 
 /**
  * Section:calls-account-overview
- * short_description: A #HdyWindow to manage VoIP accounts
+ * short_description: A #AdwWindow to manage VoIP accounts
  * @Title: CallsAccountOverview
  *
- * This is a #HdyWindow derived window to display and manage the
+ * This is a #AdwWindow derived window to display and manage the
  * VoIP accounts. Each available #CallsAccount from any #CallsAccountProvider
  * will be listed as a #CallsAccountRow.
  */
@@ -55,7 +55,7 @@ typedef enum {
 
 
 struct _CallsAccountOverview {
-  HdyWindow                 parent;
+  AdwWindow                 parent;
 
   /* UI widgets */
   GtkStack                 *stack;
@@ -81,7 +81,7 @@ struct _CallsAccountOverview {
   CallsInAppNotification   *in_app_notification;
 };
 
-G_DEFINE_TYPE (CallsAccountOverview, calls_account_overview, HDY_TYPE_WINDOW)
+G_DEFINE_TYPE (CallsAccountOverview, calls_account_overview, ADW_TYPE_WINDOW)
 
 
 static void
diff --git a/src/calls-account-overview.h b/src/calls-account-overview.h
index 236a221..9ca591f 100644
--- a/src/calls-account-overview.h
+++ b/src/calls-account-overview.h
@@ -24,13 +24,13 @@
 
 #pragma once
 
-#include <handy.h>
+#include <adwaita.h>
 
 G_BEGIN_DECLS
 
 #define CALLS_TYPE_ACCOUNT_OVERVIEW (calls_account_overview_get_type ())
 
-G_DECLARE_FINAL_TYPE (CallsAccountOverview, calls_account_overview, CALLS, ACCOUNT_OVERVIEW, HdyWindow)
+G_DECLARE_FINAL_TYPE (CallsAccountOverview, calls_account_overview, CALLS, ACCOUNT_OVERVIEW, AdwWindow)
 
 CallsAccountOverview  *calls_account_overview_new                   (void);
 
diff --git a/src/calls-account-row.c b/src/calls-account-row.c
index ef1a1de..4cfd6bd 100644
--- a/src/calls-account-row.c
+++ b/src/calls-account-row.c
@@ -30,10 +30,10 @@
 
 /**
  * Section:calls-account-row
- * short_description: A #HdyActionRow for use in #CallsAccountOverview
+ * short_description: A #AdwActionRow for use in #CallsAccountOverview
  * @Title: CallsAccountRow
  *
- * This is a #HdyActionRow derived widget representing a #CallsAccount
+ * This is a #AdwActionRow derived widget representing a #CallsAccount
  * for VoIP accounts (currently only SIP).
  */
 
@@ -48,18 +48,18 @@ enum {
 static GParamSpec *props[PROP_LAST_PROP];
 
 struct _CallsAccountRow {
-  HdyActionRow          parent;
+  AdwActionRow          parent;
 
   CallsAccountProvider *provider;
   CallsAccount         *account;
   gboolean              online;
 
   /* UI elements */
-  HdyAvatar            *avatar;
+  AdwAvatar            *avatar;
   GtkSwitch            *online_switch;
 };
 
-G_DEFINE_TYPE (CallsAccountRow, calls_account_row, HDY_TYPE_ACTION_ROW)
+G_DEFINE_TYPE (CallsAccountRow, calls_account_row, ADW_TYPE_ACTION_ROW)
 
 
 static void
diff --git a/src/calls-account-row.h b/src/calls-account-row.h
index ac05d0b..58326b1 100644
--- a/src/calls-account-row.h
+++ b/src/calls-account-row.h
@@ -27,14 +27,14 @@
 #include "calls-account.h"
 #include "calls-account-provider.h"
 
-#include <handy.h>
+#include <adwaita.h>
 
 
 G_BEGIN_DECLS
 
 #define CALLS_TYPE_ACCOUNT_ROW (calls_account_row_get_type ())
 
-G_DECLARE_FINAL_TYPE (CallsAccountRow, calls_account_row, CALLS, ACCOUNT_ROW, HdyActionRow);
+G_DECLARE_FINAL_TYPE (CallsAccountRow, calls_account_row, CALLS, ACCOUNT_ROW, AdwActionRow);
 
 CallsAccountRow      *calls_account_row_new                  (CallsAccountProvider *provider,
                                                               CallsAccount         *account);
diff --git a/src/calls-application.c b/src/calls-application.c
index 3c6ffe2..7846be4 100644
--- a/src/calls-application.c
+++ b/src/calls-application.c
@@ -44,10 +44,10 @@
 #include "calls-ringer.h"
 #include "version.h"
 
+#include <adwaita.h>
 #include <call-ui.h>
 #include <glib/gi18n.h>
 #include <glib-unix.h>
-#include <handy.h>
 #include <libcallaudio.h>
 
 /**
@@ -474,18 +474,18 @@ startup (GApplication *application)
 {
   g_autoptr (GtkCssProvider) provider = NULL;
   g_autoptr (GError) error = NULL;
-#if HDY_CHECK_VERSION (1, 5, 0)
-  HdyStyleManager *style_manager;
+#if ADW_CHECK_VERSION (1, 5, 0)
+  AdwStyleManager *style_manager;
 #endif
 
   G_APPLICATION_CLASS (calls_application_parent_class)->startup (application);
 
-  hdy_init ();
+  adw_init ();
 
-#if HDY_CHECK_VERSION (1, 5, 0)
-  style_manager = hdy_style_manager_get_default ();
+#if ADW_CHECK_VERSION (1, 5, 0)
+  style_manager = adw_style_manager_get_default ();
 
-  hdy_style_manager_set_color_scheme (style_manager, HDY_COLOR_SCHEME_PREFER_LIGHT);
+  adw_style_manager_set_color_scheme (style_manager, ADW_COLOR_SCHEME_PREFER_LIGHT);
 #endif
 
   if (!call_audio_init (&error))
diff --git a/src/calls-call-record-row.c b/src/calls-call-record-row.c
index 0569891..4c83032 100644
--- a/src/calls-call-record-row.c
+++ b/src/calls-call-record-row.c
@@ -28,10 +28,10 @@
 #include "calls-manager.h"
 #include "calls-util.h"
 
+#include <adwaita.h>
 #include <glib/gi18n.h>
 #include <glib-object.h>
 #include <glib.h>
-#include <handy.h>
 
 #include <sys/time.h>
 #include <errno.h>
diff --git a/src/calls-call-selector-item.c b/src/calls-call-selector-item.c
index 65efa87..b551727 100644
--- a/src/calls-call-selector-item.c
+++ b/src/calls-call-selector-item.c
@@ -66,7 +66,7 @@ static void
 set_party (CallsCallSelectorItem *self)
 {
   CuiCall *call;
-  // FIXME: use HdyAvatar and the contact avatar
+  // FIXME: use AdwAvatar and the contact avatar
   GtkWidget *image = gtk_image_new_from_icon_name ("avatar-default-symbolic", GTK_ICON_SIZE_DIALOG);
 
   gtk_box_pack_start (self->main_box, image, TRUE, TRUE, 0);
diff --git a/src/calls-call-window.c b/src/calls-call-window.c
index 24dd263..ad027bf 100644
--- a/src/calls-call-window.c
+++ b/src/calls-call-window.c
@@ -35,9 +35,9 @@
 #include "calls-ui-call-data.h"
 #include "calls-util.h"
 
+#include <adwaita.h>
 #include <glib/gi18n.h>
 #include <glib-object.h>
-#include <handy.h>
 
 
 struct _CallsCallWindow {
diff --git a/src/calls-contacts-box.c b/src/calls-contacts-box.c
index 8e7304b..aecdfd0 100644
--- a/src/calls-contacts-box.c
+++ b/src/calls-contacts-box.c
@@ -29,8 +29,7 @@
 
 #include <glib/gi18n.h>
 
-#define HANDY_USE_UNSTABLE_API
-#include <handy.h>
+#include <adwaita.h>
 
 struct _CallsContactsBox {
   GtkWidget         parent_instance;
diff --git a/src/calls-contacts-row.c b/src/calls-contacts-row.c
index c633a8f..fdf5861 100644
--- a/src/calls-contacts-row.c
+++ b/src/calls-contacts-row.c
@@ -10,8 +10,8 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+#include <adwaita.h>
 #include <folks/folks.h>
-#include <handy.h>
 
 #include "calls-contacts-row.h"
 #include "calls-contacts-provider.h"
@@ -103,7 +103,7 @@ avatar_changed_cb (CallsContactsRow *self)
   if (icon == NULL)
     return;
 
-  hdy_avatar_set_loadable_icon (HDY_AVATAR (self->avatar), icon);
+  adw_avatar_set_loadable_icon (ADW_AVATAR (self->avatar), icon);
 }
 
 static void
diff --git a/src/calls-main-window.c b/src/calls-main-window.c
index 5cd18c5..c51e975 100644
--- a/src/calls-main-window.c
+++ b/src/calls-main-window.c
@@ -36,19 +36,19 @@
 #include "calls-util.h"
 #include "version.h"
 
+#include <adwaita.h>
 #include <glib/gi18n.h>
 #include <glib-object.h>
-#include <handy.h>
 
 
 struct _CallsMainWindow {
-  HdyApplicationWindow    parent_instance;
+  AdwApplicationWindow    parent_instance;
 
   GListModel             *record_store;
 
   CallsInAppNotification *in_app_notification;
 
-  HdyViewSwitcherTitle   *title_switcher;
+  AdwViewSwitcherTitle   *title_switcher;
   GtkStack               *main_stack;
 
   GtkRevealer            *permanent_error_revealer;
@@ -68,7 +68,7 @@ struct _CallsMainWindow {
   GtkButton              *ussd_reply_button;
 };
 
-G_DEFINE_TYPE (CallsMainWindow, calls_main_window, HDY_TYPE_APPLICATION_WINDOW);
+G_DEFINE_TYPE (CallsMainWindow, calls_main_window, ADW_TYPE_APPLICATION_WINDOW);
 
 enum {
   PROP_0,
@@ -428,7 +428,7 @@ size_allocate (GtkWidget     *widget,
 {
   CallsMainWindow *self = CALLS_MAIN_WINDOW (widget);
 
-  hdy_view_switcher_title_set_view_switcher_enabled (self->title_switcher,
+  adw_view_switcher_title_set_view_switcher_enabled (self->title_switcher,
                                                      allocation->width > 400);
 
   GTK_WIDGET_CLASS (calls_main_window_parent_class)->size_allocate (widget, allocation);
diff --git a/src/calls-main-window.h b/src/calls-main-window.h
index 58d2bb8..4e47c85 100644
--- a/src/calls-main-window.h
+++ b/src/calls-main-window.h
@@ -25,13 +25,13 @@
 #ifndef CALLS_MAIN_WINDOW_H__
 #define CALLS_MAIN_WINDOW_H__
 
-#include <handy.h>
+#include <adwaita.h>
 
 G_BEGIN_DECLS
 
 #define CALLS_TYPE_MAIN_WINDOW (calls_main_window_get_type ())
 
-G_DECLARE_FINAL_TYPE (CallsMainWindow, calls_main_window, CALLS, MAIN_WINDOW, HdyApplicationWindow);
+G_DECLARE_FINAL_TYPE (CallsMainWindow, calls_main_window, CALLS, MAIN_WINDOW, AdwApplicationWindow);
 
 CallsMainWindow *calls_main_window_new                      (GtkApplication *application,
                                                              GListModel     *record_store);
diff --git a/src/calls-new-call-box.c b/src/calls-new-call-box.c
index 55ee745..9eebe07 100644
--- a/src/calls-new-call-box.c
+++ b/src/calls-new-call-box.c
@@ -32,9 +32,9 @@
 #include "calls-ussd.h"
 #include "calls-util.h"
 
+#include <adwaita.h>
 #include <call-ui.h>
 #include <glib/gi18n.h>
-#include <handy.h>
 
 enum {
   PROP_0,
@@ -47,10 +47,10 @@ struct _CallsNewCallBox {
   GtkWidget     parent_instance;
 
   GtkListBox   *origin_list_box;
-  HdyComboRow  *origin_list;
+  AdwComboRow  *origin_list;
   CuiDialpad   *dialpad;
   GtkEntry     *address_entry;
-  HdyActionRow *result;
+  AdwActionRow *result;
   GtkButton    *dial_result;
 
   GList        *dial_queue;
@@ -65,11 +65,11 @@ static CallsOrigin *
 get_selected_origin (CallsNewCallBox *self)
 {
   g_autoptr (CallsOrigin) origin = NULL;
-  GListModel *model = hdy_combo_row_get_model (self->origin_list);
+  GListModel *model = adw_combo_row_get_model (self->origin_list);
   gint index = -1;
 
   if (model)
-    index = hdy_combo_row_get_selected_index (self->origin_list);
+    index = adw_combo_row_get_selected_index (self->origin_list);
 
   if (model && index >= 0)
     origin = g_list_model_get_item (model, index);
@@ -326,7 +326,7 @@ calls_new_call_box_init (CallsNewCallBox *self)
   gtk_widget_init_template (GTK_WIDGET (self));
 
   origins = calls_manager_get_origins (calls_manager_get_default ());
-  hdy_combo_row_bind_name_model (self->origin_list, origins,
+  adw_combo_row_bind_name_model (self->origin_list, origins,
                                  get_origin_name, self, NULL);
 
   g_signal_connect_object (origins,
diff --git a/src/meson.build b/src/meson.build
index c1411de..9db116a 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -31,7 +31,7 @@ calls_includes = [ top_include, src_include ]
 
 calls_deps = [ dependency('gobject-2.0', version: '>= 2.58'),
                dependency('gtk4'),
-               dependency('libhandy-1', version: '>= 1.4.0'),
+               dependency('libadwaita-1', version: '>= 1.2'),
                dependency('libfeedback-0.0'),
                dependency('libpeas-1.0'),
                dependency('gom-1.0'),
diff --git a/src/ui/account-overview.ui b/src/ui/account-overview.ui
index e4958e1..dddbe4c 100644
--- a/src/ui/account-overview.ui
+++ b/src/ui/account-overview.ui
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.24"/>
-  <requires lib="libhandy" version="1.0"/>
-  <template class="CallsAccountOverview" parent="HdyWindow">
+  <requires lib="libadwaita" version="1.0"/>
+  <template class="CallsAccountOverview" parent="AdwWindow">
     <property name="visible">True</property>
     <property name="default-width">380</property>
     <property name="default-height">660</property>
@@ -12,7 +12,7 @@
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="HdyHeaderBar">
+          <object class="AdwHeaderBar">
             <property name="title" translatable="yes">VoIP Accounts</property>
             <property name="show-close-button">True</property>
             <property name="visible">True</property>
@@ -47,7 +47,7 @@
 
                 <!-- First child type: No accounts present: Show a blurb and a Add button -->
                 <child>
-                  <object class="HdyStatusPage" id="intro">
+                  <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>
@@ -115,7 +115,7 @@
   </object>
 
 
-  <object class="HdyWindow" id="account_window">
+  <object class="AdwWindow" id="account_window">
     <property name="visible">False</property>
     <property name="default-width">380</property>
     <property name="default-height">660</property>
diff --git a/src/ui/account-row.ui b/src/ui/account-row.ui
index 6d11133..407f6f0 100644
--- a/src/ui/account-row.ui
+++ b/src/ui/account-row.ui
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.20"/>
-  <requires lib="libhandy" version="1.0"/>
-  <template class="CallsAccountRow" parent="HdyActionRow">
+  <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="HdyAvatar" id="avatar">
+      <object class="AdwAvatar" id="avatar">
         <property name="visible">True</property>
         <property name="show-initials">True</property>
         <property name="size">48</property>
diff --git a/src/ui/call-record-row.ui b/src/ui/call-record-row.ui
index 8869d01..34e3902 100644
--- a/src/ui/call-record-row.ui
+++ b/src/ui/call-record-row.ui
@@ -13,7 +13,7 @@
           <object class="GtkBox">
             <property name="visible">True</property>
             <child>
-              <object class="HdyAvatar" id="avatar">
+              <object class="AdwAvatar" id="avatar">
                 <property name="visible">True</property>
                 <property name="margin_left">8</property>
                 <property name="margin_top">8</property>
diff --git a/src/ui/contacts-box.ui b/src/ui/contacts-box.ui
index ef158f8..488e20b 100644
--- a/src/ui/contacts-box.ui
+++ b/src/ui/contacts-box.ui
@@ -2,7 +2,7 @@
 <!-- Generated with glade 3.22.0 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
-  <requires lib="libhandy" version="0.0"/>
+  <requires lib="libadwaita" version="0.0"/>
   <template class="CallsContactsBox" parent="GtkWidget">
     <property name="visible">True</property>
     <child>
@@ -10,7 +10,7 @@
         <property name="visible">True</property>
         <property name="expand">True</property>
         <child>
-          <object class="HdyClamp">
+          <object class="AdwClamp">
             <property name="visible">True</property>
             <child>
               <object class="GtkBox">
diff --git a/src/ui/contacts-row.ui b/src/ui/contacts-row.ui
index f4a9888..09ab245 100644
--- a/src/ui/contacts-row.ui
+++ b/src/ui/contacts-row.ui
@@ -13,7 +13,7 @@
 
         <!-- Avatar -->
         <child>
-          <object class="HdyAvatar" id="avatar">
+          <object class="AdwAvatar" id="avatar">
             <property name="visible">True</property>
             <property name="valign">center</property>
             <property name="size">36</property>
diff --git a/src/ui/history-box.ui b/src/ui/history-box.ui
index 2a8f42f..9cd08af 100644
--- a/src/ui/history-box.ui
+++ b/src/ui/history-box.ui
@@ -7,7 +7,7 @@
       <object class="GtkStack" id="stack">
         <property name="visible">True</property>
         <child>
-          <object class="HdyStatusPage">
+          <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>
@@ -22,7 +22,7 @@
             <property name="visible">True</property>
             <property name="hscrollbar-policy">never</property>
             <child>
-              <object class="HdyClamp">
+              <object class="AdwClamp">
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkListBox" id="history">
diff --git a/src/ui/main-window.ui b/src/ui/main-window.ui
index 36de8f7..5f98c1b 100644
--- a/src/ui/main-window.ui
+++ b/src/ui/main-window.ui
@@ -2,8 +2,8 @@
 <!-- Generated with glade 3.22.0 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
-  <requires lib="libhandy" version="1.0"/>
-  <template class="CallsMainWindow" parent="HdyApplicationWindow">
+  <requires lib="libadwaita" version="1.0"/>
+  <template class="CallsMainWindow" parent="AdwApplicationWindow">
     <property name="title" translatable="yes">Calls</property>
     <property name="hide_titlebar_when_maximized">True</property>
     <property name="show_menubar">False</property>
@@ -13,13 +13,13 @@
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="HdyHeaderBar">
+          <object class="AdwHeaderBar">
             <property name="visible">True</property>
             <property name="centering_policy">strict</property>
             <property name="show_close_button">True</property>
             <property name="title" bind-source="CallsMainWindow" bind-property="title" bind-flags="sync-create"/>
             <child type="title">
-              <object class="HdyViewSwitcherTitle" id="title_switcher">
+              <object class="AdwViewSwitcherTitle" id="title_switcher">
                 <property name="visible">True</property>
                 <property name="stack">main_stack</property>
                 <property name="title" bind-source="CallsMainWindow" bind-property="title" bind-flags="sync-create"/>
@@ -81,7 +81,7 @@
                   </object>
                 </child>
                 <child>
-                  <object class="HdyViewSwitcherBar" id="switcher_bar">
+                  <object class="AdwViewSwitcherBar" id="switcher_bar">
                     <property name="visible">True</property>
                     <property name="stack">main_stack</property>
                     <property name="reveal" bind-source="title_switcher" bind-property="title-visible" bind-flags="sync-create"/>
@@ -102,7 +102,7 @@
     <property name="default-height">200</property>
     <signal name="delete-event" handler="gtk_widget_hide_on_delete" object="ussd_dialog" swapped="yes"/>
     <child type="titlebar">
-      <object class="HdyHeaderBar">
+      <object class="AdwHeaderBar">
         <property name="visible">True</property>
         <property name="show-close-button">False</property>
         <property name="title" translatable="yes">USSD</property>
diff --git a/src/ui/new-call-box.ui b/src/ui/new-call-box.ui
index 89fe7d3..933a2db 100644
--- a/src/ui/new-call-box.ui
+++ b/src/ui/new-call-box.ui
@@ -2,7 +2,7 @@
 <!-- Generated with glade 3.22.0 -->
 <interface>
   <requires lib="gtk+" version="3.22"/>
-  <requires lib="libhandy" version="1.0"/>
+  <requires lib="libadwaita" version="1.0"/>
   <template class="CallsNewCallBox" parent="GtkWidget">
     <property name="visible">True</property>
     <child>
@@ -14,7 +14,7 @@
         <property name="visible">True</property>
 
         <child>
-          <object class="HdyClamp">
+          <object class="AdwClamp">
             <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <child>
@@ -27,7 +27,7 @@
                     <property name="selection-mode">none</property>
                     <property name="halign">center</property>
                     <child>
-                      <object class="HdyComboRow" id="origin_list">
+                      <object class="AdwComboRow" id="origin_list">
                         <property name="visible">True</property>
                         <signal name="notify::selected-index" handler="notify_selected_index_cb" swapped="yes"/>
                       </object>
@@ -58,13 +58,13 @@
                     <property name="margin-top">16</property>
                     <property name="selection-mode">none</property>
                     <child>
-                      <object class="HdyActionRow" id="result">
+                      <object class="AdwActionRow" id="result">
                         <property name="visible">False</property>
                         <property name="title" bind-source="address_entry" bind-property="text"/>
                         <property name="width-request">300</property>
                         <property name="subtitle" translatable="yes">SIP Account</property>
                         <child type="prefix">
-                          <object class="HdyAvatar">
+                          <object class="AdwAvatar">
                             <property name="visible">True</property>
                             <property name="show-initials">True</property>
                             <property name="size">36</property>