diff --git a/Cargo.lock b/Cargo.lock
index f80c531..69f5275 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -501,7 +501,7 @@ dependencies = [
  "glib",
  "gtk-macros",
  "gtk4",
- "libhandy4",
+ "libadwaita",
  "log",
  "pretty_env_logger",
  "zbus",
@@ -682,15 +682,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
-name = "libc"
-version = "0.2.82"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929"
-
-[[package]]
-name = "libhandy4"
+name = "libadwaita"
 version = "0.1.0"
-source = "git+https://gitlab.gnome.org/bilelmoussaoui/libhandy4-rs#ea059551d1e0c2f77a483f37ad83eb5b358d4c5d"
+source = "git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs#b898c11fb6776fc7a9a6b920222fa3173216a80c"
 dependencies = [
  "bitflags",
  "gdk-pixbuf",
@@ -699,15 +693,15 @@ dependencies = [
  "glib",
  "gtk4",
  "lazy_static",
+ "libadwaita-sys",
  "libc",
- "libhandy4-sys",
  "pango",
 ]
 
 [[package]]
-name = "libhandy4-sys"
+name = "libadwaita-sys"
 version = "0.1.0"
-source = "git+https://gitlab.gnome.org/bilelmoussaoui/libhandy4-rs#ea059551d1e0c2f77a483f37ad83eb5b358d4c5d"
+source = "git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs#b898c11fb6776fc7a9a6b920222fa3173216a80c"
 dependencies = [
  "gdk-pixbuf-sys",
  "gdk4-sys",
@@ -720,6 +714,12 @@ dependencies = [
  "system-deps",
 ]
 
+[[package]]
+name = "libc"
+version = "0.2.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929"
+
 [[package]]
 name = "locale_config"
 version = "0.2.3"
diff --git a/Cargo.toml b/Cargo.toml
index 8c1cb02..4beb3c0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,6 +39,5 @@ git = "https://github.com/bilelmoussaoui/ashpd"
 version = "0.4.4"
 features = ["gettext-system"]
 
-[dependencies.libhandy]
-git = "https://gitlab.gnome.org/bilelmoussaoui/libhandy4-rs"
-package = "libhandy4"
+[dependencies.libadwaita]
+git = "https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs"
diff --git a/build-aux/flatpak/org.gnome.ImageViewer.Devel.json b/build-aux/flatpak/org.gnome.ImageViewer.Devel.json
index 33cdabe..588a8a1 100644
--- a/build-aux/flatpak/org.gnome.ImageViewer.Devel.json
+++ b/build-aux/flatpak/org.gnome.ImageViewer.Devel.json
@@ -39,13 +39,12 @@
     ],
     "modules" : [
         {
-            "name" : "libhandy4",
+            "name" : "libadwaita",
             "buildsystem" : "meson",
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "https://gitlab.gnome.org/exalm/libhandy.git",
-                    "branch" : "gtk4"
+                    "url" : "https://gitlab.gnome.org/exalm/libadwaita.git"
                 }
             ]
         },
diff --git a/data/gtk/window.ui b/data/gtk/window.ui
index 5163b00..6b4dce7 100644
--- a/data/gtk/window.ui
+++ b/data/gtk/window.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="IvWindow" parent="HdyApplicationWindow">
+  <template class="IvWindow" parent="AdwApplicationWindow">
     <property name="default-width">600</property>
     <property name="default-height">498</property>
     <property name="width-request">360</property>
@@ -31,7 +31,7 @@
             <property name="visible-child">status_page</property>
             <property name="vexpand">True</property>
             <child>
-              <object class="HdyStatusPage" id="status_page">
+              <object class="AdwStatusPage" id="status_page">
                 <property name="title" translatable="yes">Image Viewer</property>
                 <property name="description" translatable="yes">Click Here Or Drag An Image To View</property>
                 <child>
diff --git a/meson.build b/meson.build
index bf8211c..f1142fe 100644
--- a/meson.build
+++ b/meson.build
@@ -8,8 +8,8 @@ project('gnome-image-viewer',
 i18n = import('i18n')
 gnome = import('gnome')
 
-dependency('gtk4', version: '>=3.99.4')
-dependency('libhandy-4')
+dependency('gtk4', version: '>=4.0.0')
+dependency('libadwaita-1')
 
 iv_prefix = get_option('prefix')
 iv_bindir = join_paths(iv_prefix, get_option('bindir'))
diff --git a/src/main.rs b/src/main.rs
index a887204..6fd3c52 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -29,7 +29,7 @@ use application::IvApplication;
 
 fn main() {
     gtk::init().expect("Failed to initialize GTK.");
-    libhandy::init();
+    libadwaita::init();
     widgets::init();
     pretty_env_logger::init();
 
diff --git a/src/window.rs b/src/window.rs
index c6f4327..9b1b893 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -24,7 +24,7 @@ use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
 use gtk_macros::*;
-use libhandy::subclass::prelude as hdy;
+use libadwaita::subclass::prelude::*;
 
 use crate::config;
 use crate::widgets::IvImageView;
@@ -50,7 +50,7 @@ mod imp {
         #[template_child]
         pub stack: TemplateChild<gtk::Stack>,
         #[template_child]
-        pub status_page: TemplateChild<libhandy::StatusPage>,
+        pub status_page: TemplateChild<libadwaita::StatusPage>,
         #[template_child]
         pub image_view: TemplateChild<IvImageView>,
         #[template_child]
@@ -60,7 +60,7 @@ mod imp {
     impl ObjectSubclass for IvWindow {
         const NAME: &'static str = "IvWindow";
         type Type = super::IvWindow;
-        type ParentType = libhandy::ApplicationWindow;
+        type ParentType = libadwaita::ApplicationWindow;
         type Instance = glib::subclass::simple::InstanceStruct<Self>;
         type Class = glib::subclass::simple::ClassStruct<Self>;
 
@@ -133,12 +133,12 @@ mod imp {
     impl WidgetImpl for IvWindow {}
     impl WindowImpl for IvWindow {}
     impl ApplicationWindowImpl for IvWindow {}
-    impl hdy::ApplicationWindowImpl for IvWindow {}
+    impl AdwApplicationWindowImpl for IvWindow {}
 }
 
 glib::wrapper! {
     pub struct IvWindow(ObjectSubclass<imp::IvWindow>)
-        @extends gtk::Widget, gtk::Window, gtk::ApplicationWindow, libhandy::ApplicationWindow,
+        @extends gtk::Widget, gtk::Window, gtk::ApplicationWindow, libadwaita::ApplicationWindow,
         @implements gio::ActionMap, gio::ActionGroup;
 }