diff --git a/data/icons/marker-symbolic.svg b/data/icons/marker-symbolic.svg
new file mode 100644
index 0000000000000000000000000000000000000000..94163cfe3fb66e87f522a80bbce6d404b6ee1e7b
--- /dev/null
+++ b/data/icons/marker-symbolic.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="16px" viewBox="0 0 16 16" width="16px"><filter id="a" height="100%" width="100%" x="0%" y="0%"><feColorMatrix color-interpolation-filters="sRGB" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/></filter><mask id="b"><g filter="url(#a)"><path d="m -1.6 -1.6 h 19.2 v 19.2 h -19.2 z" fill-opacity="0.5"/></g></mask><clipPath id="c"><path d="m 0 0 h 1600 v 1200 h -1600 z"/></clipPath><mask id="d"><g filter="url(#a)"><path d="m -1.6 -1.6 h 19.2 v 19.2 h -19.2 z" fill-opacity="0.7"/></g></mask><clipPath id="e"><path d="m 0 0 h 1600 v 1200 h -1600 z"/></clipPath><mask id="f"><g filter="url(#a)"><path d="m -1.6 -1.6 h 19.2 v 19.2 h -19.2 z" fill-opacity="0.35"/></g></mask><clipPath id="g"><path d="m 0 0 h 1600 v 1200 h -1600 z"/></clipPath><g mask="url(#b)"><g clip-path="url(#c)" transform="matrix(1 0 0 1 -176 -856)"><path d="m 550 182 c -0.351562 0.003906 -0.695312 0.101562 -1 0.28125 v 3.4375 c 0.304688 0.179688 0.648438 0.277344 1 0.28125 c 1.105469 0 2 -0.894531 2 -2 s -0.894531 -2 -2 -2 z m 0 5 c -0.339844 0 -0.679688 0.058594 -1 0.175781 v 6.824219 h 4 v -4 c 0 -1.65625 -1.34375 -3 -3 -3 z m 0 0"/></g></g><g mask="url(#d)"><g clip-path="url(#e)" transform="matrix(1 0 0 1 -176 -856)"><path d="m 569 182 v 4 c 1.105469 0 2 -0.894531 2 -2 s -0.894531 -2 -2 -2 z m 0 5 v 7 h 3 v -4 c 0 -1.65625 -1.34375 -3 -3 -3 z m 0 0"/></g></g><g mask="url(#f)"><g clip-path="url(#g)" transform="matrix(1 0 0 1 -176 -856)"><path d="m 573 182.269531 v 3.449219 c 0.613281 -0.355469 0.996094 -1.007812 1 -1.71875 c 0 -0.714844 -0.382812 -1.375 -1 -1.730469 z m 0 4.90625 v 6.824219 h 2 v -4 c 0 -1.269531 -0.800781 -2.402344 -2 -2.824219 z m 0 0"/></g></g><path d="m 9.5 2.5 l -6.5 6.5 v 3 l -3 3 h 4 l 1 -1 h 3 l 6.5 -6.5 c 4 -4 -1 -9 -5 -5 z m -5.5 7.5 l 3 3 h -2 l -1 -1 z m 0 0" fill="#222222"/></svg>
diff --git a/libmisc/ev-page-selector.c b/libmisc/ev-page-selector.c
index 340ddadbc21c6c3cc2bee6655c6fe5d3c17561e7..2113c39af1421654f53e6c90f7ac3570b704a109 100644
--- a/libmisc/ev-page-selector.c
+++ b/libmisc/ev-page-selector.c
@@ -88,7 +88,7 @@ update_pages_label (EvPageSelector *page_selector,
                 label_text = g_strdup_printf (_("(%d of %d)"), page + 1, n_pages);
         else
                 label_text = g_strdup_printf (_("of %d"), n_pages);
-	gtk_editable_set_text (GTK_EDITABLE (page_selector->label), label_text);
+	gtk_label_set_text (GTK_LABEL (page_selector->label), label_text);
 	g_free (label_text);
 }
 
@@ -133,7 +133,7 @@ ev_page_selector_update_max_width (EvPageSelector *page_selector)
         }
         g_free (max_page_label);
 
-        gtk_editable_set_width_chars (GTK_EDITABLE (page_selector->label), max_label_len);
+        gtk_label_set_width_chars (GTK_LABEL (page_selector->label), max_label_len);
         g_free (max_label);
 
         max_label_len = ev_document_get_max_label_len (page_selector->document);
diff --git a/libmisc/ev-page-selector.ui b/libmisc/ev-page-selector.ui
index b9b30daf17d24484edeecea2448d7deee1342c42..3a60add8448d2fbacc17fd3987c4186e3de18991 100644
--- a/libmisc/ev-page-selector.ui
+++ b/libmisc/ev-page-selector.ui
@@ -2,8 +2,7 @@
 <interface>
   <template class="EvPageSelector" parent="GtkBox">
     <style>
-      <class name="linked" />
-      <class name="tnum" />
+      <class name="numeric" />
     </style>
     <property name="orientation">horizontal</property>
     <property name="sensitive">False</property>
@@ -30,7 +29,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkEntry" id="label">
+      <object class="GtkLabel" id="label">
         <property name="max-width-chars">0</property>
         <property name="width-chars">5</property>
         <property name="sensitive">False</property>
diff --git a/shell/ev-annotations-toolbar.c b/shell/ev-annotations-toolbar.c
index 6e658ce440edbdd00b0a72ac60d67a3de6bd851e..aa80b42fc2d9de83da3fa4fdcd36692a6d35e900 100644
--- a/shell/ev-annotations-toolbar.c
+++ b/shell/ev-annotations-toolbar.c
@@ -24,6 +24,8 @@
 #include <evince-document.h>
 #include <glib/gi18n.h>
 
+#include <adwaita.h>
+
 enum {
         BEGIN_ADD_ANNOT,
         CANCEL_ADD_ANNOT,
@@ -86,21 +88,18 @@ ev_annotations_toolbar_toggle_button_if_active (EvAnnotationsToolbar *toolbar,
 static GtkWidget *
 ev_annotations_toolbar_create_toggle_button (EvAnnotationsToolbar *toolbar,
                                              const gchar          *label,
-                                             const gchar          *icon_name,
-                                             const gchar          *tooltip)
+                                             const gchar          *icon_name)
 {
-        GtkWidget *button = GTK_WIDGET (gtk_toggle_button_new ());
-
-        gtk_widget_set_tooltip_text (button, tooltip);
+        GtkWidget *button = gtk_toggle_button_new ();
+	GtkWidget *button_content = adw_button_content_new ();
 
-	if (label)
-                gtk_button_set_label (GTK_BUTTON (button), label);
+	adw_button_content_set_label (ADW_BUTTON_CONTENT (button_content),
+				      label);
+	adw_button_content_set_icon_name (ADW_BUTTON_CONTENT (button_content),
+					  icon_name);
 
-        if (icon_name)
-                gtk_button_set_icon_name (GTK_BUTTON (button), icon_name);
+	gtk_button_set_child (GTK_BUTTON (button), button_content);
 
-        /* For some reason adding text-button class to the GtkToogleButton makes the button smaller */
-	gtk_widget_add_css_class(button, "text-button");
         g_signal_connect (button, "toggled",
                           G_CALLBACK (ev_annotations_toolbar_annot_button_toggled),
                           toolbar);
@@ -113,24 +112,17 @@ ev_annotations_toolbar_init (EvAnnotationsToolbar *toolbar)
 {
         gtk_orientable_set_orientation (GTK_ORIENTABLE (toolbar), GTK_ORIENTATION_HORIZONTAL);
 
-	gtk_widget_add_css_class(GTK_WIDGET (toolbar), "inline-toolbar");
-	gtk_widget_add_css_class(GTK_WIDGET (toolbar), "linked");
+	gtk_widget_add_css_class (GTK_WIDGET (toolbar), "toolbar");
 
-        /* Use Text label until we have:
-         *   1. More buttons in the toolbar (lack of space)
-         *   2. Clear icons for an action.
-         */
         toolbar->text_button = ev_annotations_toolbar_create_toggle_button (toolbar,
                                /* Translators: an annotation that looks like a "sticky note" */
-                                                                            _("Note text"),
-                                                                            NULL,
-                                                                            _("Add text annotation"));
+                                                                            _("Add Note"),
+                                                                            "annotations-text-symbolic");
         gtk_box_append (GTK_BOX(toolbar), toolbar->text_button);
 
         toolbar->highlight_button = ev_annotations_toolbar_create_toggle_button (toolbar,
-                                                                                 _("Highlight text"),
-                                                                                 NULL,
-                                                                                 _("Add highlight annotation"));
+                                                                                 _("Highlight Text"),
+                                                                                 "marker-symbolic");
 
         gtk_box_append (GTK_BOX (toolbar), toolbar->highlight_button);
 }
diff --git a/shell/ev-find-sidebar.c b/shell/ev-find-sidebar.c
index 672d9cfbbc06adadfa22fbb7a20e34bc9a6699a6..b0a9aba8606cc80a2b411bfae7ec5f1fe0c76676 100644
--- a/shell/ev-find-sidebar.c
+++ b/shell/ev-find-sidebar.c
@@ -194,6 +194,7 @@ ev_find_sidebar_init (EvFindSidebar *sidebar)
                                         GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
         priv->tree_view = gtk_tree_view_new ();
+	gtk_widget_add_css_class (priv->tree_view, "navigation-sidebar");
         ev_find_sidebar_reset_model (sidebar);
 
         gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->tree_view), -1);
diff --git a/shell/ev-password-view.c b/shell/ev-password-view.c
index 99e5deb4fd48693b584d0ce1acffc91400f27938..e0bce3c5413acd48a689c64c5754603ebd969a36 100644
--- a/shell/ev-password-view.c
+++ b/shell/ev-password-view.c
@@ -141,27 +141,23 @@ ev_password_view_set_filename (EvPasswordView *password_view,
 }
 
 static void
-ev_password_dialog_got_response (GtkDialog      *dialog,
-				 gint            response_id,
-				 EvPasswordView *password_view)
+ev_password_dialog_got_response (AdwMessageDialog *dialog,
+                                 GAsyncResult     *result,
+                                 EvPasswordView   *password_view)
 {
 	EvPasswordViewPrivate *priv = GET_PRIVATE (password_view);
+	const char *response = adw_message_dialog_choose_finish (dialog, result);
 
 	gtk_widget_set_sensitive (GTK_WIDGET (password_view), TRUE);
 
-	if (response_id == GTK_RESPONSE_OK) {
-		g_free (priv->password);
+	if (g_strcmp0 (response, "unlock") == 0) {
 		priv->password =
 			g_strdup (gtk_editable_get_text (GTK_EDITABLE (priv->password_entry)));
 
 		g_signal_emit (password_view, password_view_signals[UNLOCK], 0);
-	} else if (response_id == GTK_RESPONSE_CANCEL ||
-		   response_id == GTK_RESPONSE_CLOSE ||
-		   response_id == GTK_RESPONSE_DELETE_EVENT) {
+	} else {
 		g_signal_emit (password_view, password_view_signals[CANCELLED], 0);
 	}
-
-	gtk_window_destroy (GTK_WINDOW (dialog));
 }
 
 static void
@@ -179,82 +175,62 @@ ev_password_dialog_remember_button_toggled (GtkCheckButton *button,
 }
 
 static void
-ev_password_dialog_entry_changed_cb (GtkEditable *editable,
-				     GtkDialog   *dialog)
+ev_password_dialog_entry_changed_cb (GtkEditable      *editable,
+                                     AdwMessageDialog *dialog)
 {
 	const char *text;
 
 	text = gtk_editable_get_text (GTK_EDITABLE (editable));
 
-	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK,
-					   (text != NULL && *text != '\0'));
-}
-
-static void
-ev_password_dialog_entry_activated_cb (GtkEntry  *entry,
-				       GtkDialog *dialog)
-{
-	gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+	adw_message_dialog_set_response_enabled (dialog, "unlock",
+						 (text != NULL && *text != '\0'));
 }
 
 void
 ev_password_view_ask_password (EvPasswordView *password_view)
 {
-	GtkMessageDialog *dialog;
+	AdwMessageDialog *dialog;
 	GtkWidget *message_area;
-	GtkWidget *grid, *label;
 	GtkWidget *password_entry;
 	gchar     *text;
 	EvPasswordViewPrivate *priv = GET_PRIVATE (password_view);
 	GtkWindow *parent_window;
 
-        text = g_markup_printf_escaped (_("The document “%s” is locked and requires a password before it can be opened."),
+        text = g_markup_printf_escaped (_("The document “%s” is locked and requires a password before it can be opened"),
                                         priv->filename);
 
 	parent_window = GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (password_view)));
 
-	dialog = GTK_MESSAGE_DIALOG (gtk_message_dialog_new (parent_window,
-		                         GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-		                         GTK_MESSAGE_QUESTION,
-		                         GTK_BUTTONS_NONE,
-					 _("Password required")));
-	gtk_message_dialog_format_secondary_markup (dialog, "%s", text);
+	dialog = ADW_MESSAGE_DIALOG (adw_message_dialog_new (parent_window,
+							     _("Password Required"),
+							     NULL));
+	adw_message_dialog_set_body_use_markup (dialog, true);
+	adw_message_dialog_set_body (dialog, text);
 	g_free (text);
 
-	message_area = gtk_message_dialog_get_message_area (dialog);
-
-	gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-				_("_Cancel"), GTK_RESPONSE_CANCEL,
-				_("_Unlock"), GTK_RESPONSE_OK,
-				NULL);
-	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
-					   GTK_RESPONSE_OK, FALSE);
+	adw_message_dialog_add_responses (dialog,
+					  "cancel", _("_Cancel"),
+					  "unlock", _("_Unlock"),
+					  NULL);
+	adw_message_dialog_set_close_response (dialog, "cancel");
+	adw_message_dialog_set_default_response (dialog, "unlock");
+	adw_message_dialog_set_response_enabled (dialog, "unlock", FALSE);
 
-	grid = gtk_grid_new ();
-	gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
-	gtk_box_prepend (GTK_BOX (message_area), grid);
-
-	gtk_widget_set_halign (grid, GTK_ALIGN_CENTER);
-
-	label = gtk_label_new_with_mnemonic (_("_Password:"));
-	g_object_set (G_OBJECT (label), "xalign", 0., "yalign", 0.5, NULL);
+	message_area = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+	adw_message_dialog_set_extra_child (dialog, message_area);
 
 	password_entry = gtk_password_entry_new ();
 	gtk_password_entry_set_show_peek_icon (GTK_PASSWORD_ENTRY (password_entry), TRUE);
+	g_object_set (G_OBJECT (password_entry),
+		      "placeholder-text", _("Password"),
+		      NULL);
+	g_object_set (G_OBJECT (password_entry), "activates-default", TRUE, NULL);
 	g_object_set (G_OBJECT (password_entry), "width-chars", 32, NULL);
 	g_signal_connect (password_entry, "changed",
 			  G_CALLBACK (ev_password_dialog_entry_changed_cb),
 			  dialog);
-	g_signal_connect (password_entry, "activate",
-			  G_CALLBACK (ev_password_dialog_entry_activated_cb),
-			  dialog);
-	gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
 
-	gtk_grid_attach (GTK_GRID (grid), password_entry, 1, 0, 1, 1);
-	gtk_widget_set_hexpand (password_entry, TRUE);
-
-	gtk_label_set_mnemonic_widget (GTK_LABEL (label),
-				       password_entry);
+	gtk_box_append (GTK_BOX (message_area), password_entry);
 
 	priv->password_entry = password_entry;
 
@@ -264,7 +240,7 @@ ev_password_view_ask_password (EvPasswordView *password_view)
 		GtkWidget  *group;
 
 		remember_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-		gtk_box_prepend (GTK_BOX (message_area), remember_box);
+		gtk_box_append (GTK_BOX (message_area), remember_box);
 		gtk_widget_set_halign (remember_box, GTK_ALIGN_CENTER);
 
 		choice = gtk_check_button_new_with_mnemonic (_("Forget password _immediately"));
@@ -302,11 +278,9 @@ ev_password_view_ask_password (EvPasswordView *password_view)
 		gtk_box_append (GTK_BOX (remember_box), choice);
 	}
 
-	g_signal_connect (dialog, "response",
-			  G_CALLBACK (ev_password_dialog_got_response),
-			  password_view);
-
-	gtk_window_present (GTK_WINDOW (dialog));
+	adw_message_dialog_choose (dialog, NULL,
+				   (GAsyncReadyCallback) ev_password_dialog_got_response,
+				   password_view);
 }
 
 const gchar *
diff --git a/shell/ev-search-box.c b/shell/ev-search-box.c
index 1666bb79766f9ee65f26dc4e1980b9792aa48fb5..58ffcd1cf432c7e5f4dd917ba192bb0f76ed316b 100644
--- a/shell/ev-search-box.c
+++ b/shell/ev-search-box.c
@@ -258,13 +258,17 @@ ev_search_box_set_options (EvSearchBox  *box,
 
 
 static void
-whole_words_only_toggled_cb (GtkCheckButton	*button,
-                             EvSearchBox	*box)
+whole_words_only_toggled_cb (GSimpleAction *action,
+			     GVariant      *state,
+			     gpointer       user_data)
 {
+	EvSearchBox *box = EV_SEARCH_BOX (user_data);
         EvSearchBoxPrivate *priv = GET_PRIVATE (box);
         EvFindOptions options = priv->options;
+	gboolean active = g_variant_get_boolean (state);
+	g_simple_action_set_state (action, state);
 
-        if (gtk_check_button_get_active (button))
+        if (active)
                 options |= EV_FIND_WHOLE_WORDS_ONLY;
         else
                 options &= ~EV_FIND_WHOLE_WORDS_ONLY;
@@ -272,13 +276,17 @@ whole_words_only_toggled_cb (GtkCheckButton	*button,
 }
 
 static void
-case_sensitive_toggled_cb (GtkCheckButton	*button,
-                           EvSearchBox		*box)
+case_sensitive_toggled_cb (GSimpleAction *action,
+			   GVariant      *state,
+			   gpointer       user_data)
 {
+	EvSearchBox *box = EV_SEARCH_BOX (user_data);
         EvSearchBoxPrivate *priv = GET_PRIVATE (box);
         EvFindOptions options = priv->options;
+	gboolean active = g_variant_get_boolean (state);
+	g_simple_action_set_state (action, state);
 
-        if (gtk_check_button_get_active (button))
+        if (active)
                 options |= EV_FIND_CASE_SENSITIVE;
         else
                 options &= ~EV_FIND_CASE_SENSITIVE;
@@ -501,10 +509,23 @@ ev_search_box_class_init (EvSearchBoxClass *klass)
                                       "next", NULL);
 }
 
+const GActionEntry actions[] = {
+	{ "whole-words-only", NULL, NULL, "false", whole_words_only_toggled_cb },
+	{ "case-sensitive", NULL, NULL, "false", case_sensitive_toggled_cb },
+};
+
 static void
 ev_search_box_init (EvSearchBox *box)
 {
+	GSimpleActionGroup *group;
+
 	gtk_widget_init_template (GTK_WIDGET (box));
+
+	group = g_simple_action_group_new ();
+	g_action_map_add_action_entries (G_ACTION_MAP (group), actions,
+					 G_N_ELEMENTS (actions), box);
+
+	gtk_widget_insert_action_group (GTK_WIDGET (box), "search", G_ACTION_GROUP (group));
 }
 
 GtkWidget *
diff --git a/shell/ev-sidebar.c b/shell/ev-sidebar.c
index 222b098b90595bf361c02eb319d66170fa30beb7..9c05430f575ec3ada3c45d34438a45e159067ac2 100644
--- a/shell/ev-sidebar.c
+++ b/shell/ev-sidebar.c
@@ -36,6 +36,7 @@
 #include "ev-sidebar.h"
 #include "ev-sidebar-page.h"
 #include "ev-sidebar-links.h"
+#include "ev-stack-switcher.h"
 
 enum
 {
@@ -57,7 +58,7 @@ static void ev_sidebar_child_change_cb (GObject    *gobject,
 static void ev_sidebar_buildable_iface_init (GtkBuildableIface *iface);
 static GtkBuildableIface *parent_buildable_iface;
 
-G_DEFINE_TYPE_WITH_CODE (EvSidebar, ev_sidebar, GTK_TYPE_BOX,
+G_DEFINE_TYPE_WITH_CODE (EvSidebar, ev_sidebar, ADW_TYPE_BIN,
                          G_ADD_PRIVATE (EvSidebar)
                          G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
                                                 ev_sidebar_buildable_iface_init))
@@ -146,6 +147,8 @@ ev_sidebar_class_init (EvSidebarClass *ev_sidebar_class)
 	g_object_class->set_property = ev_sidebar_set_property;
 
 	g_type_ensure (EV_TYPE_SIDEBAR_LINKS);
+	g_type_ensure (EV_TYPE_STACK_SWITCHER);
+
 	gtk_widget_class_set_template_from_resource (widget_class,
 			"/org/gnome/evince/ui/sidebar.ui");
 	gtk_widget_class_bind_template_child_private (widget_class, EvSidebar, switcher);
diff --git a/shell/ev-sidebar.h b/shell/ev-sidebar.h
index 31423f7a667a5e4437526c1098789a97d0bb862b..8a65f26a5b583ba5150edbb266ec1b8399dbb0e5 100644
--- a/shell/ev-sidebar.h
+++ b/shell/ev-sidebar.h
@@ -25,17 +25,17 @@
 
 #pragma once
 
-#include <gtk/gtk.h>
+#include <adwaita.h>
 
 #include "ev-document-model.h"
 
 G_BEGIN_DECLS
 
 #define EV_TYPE_SIDEBAR		     (ev_sidebar_get_type())
-G_DECLARE_FINAL_TYPE (EvSidebar, ev_sidebar, EV, SIDEBAR, GtkBox);
+G_DECLARE_FINAL_TYPE (EvSidebar, ev_sidebar, EV, SIDEBAR, AdwBin);
 
 struct _EvSidebar {
-	GtkBox base_instance;
+	AdwBin base_instance;
 };
 
 GtkWidget *ev_sidebar_new       (void);
diff --git a/shell/ev-stack-switcher.c b/shell/ev-stack-switcher.c
new file mode 100644
index 0000000000000000000000000000000000000000..d68899f42a090aac83b0bb0b9c05105422c246c8
--- /dev/null
+++ b/shell/ev-stack-switcher.c
@@ -0,0 +1,303 @@
+/* ev-stack-switcher.c
+ *
+ * Copyright 2024 Christopher Davis <christopherdavis@gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "ev-stack-switcher.h"
+
+struct _EvStackSwitcher
+{
+	AdwBin parent_instance;
+
+	GtkBox *box;
+
+	GtkStack *stack;
+	GtkSelectionModel *pages;
+	GHashTable *buttons;
+};
+
+G_DEFINE_FINAL_TYPE (EvStackSwitcher, ev_stack_switcher, ADW_TYPE_BIN)
+
+enum {
+	PROP_0,
+	PROP_STACK,
+	N_PROPS
+};
+
+static GParamSpec *properties [N_PROPS];
+
+static void
+button_active_notify_cb (EvStackSwitcher *self,
+                         GParamSpec      *pspec,
+                         GtkToggleButton *button)
+{
+	gboolean active = gtk_toggle_button_get_active (button);
+	guint index = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (button), "child-index"));
+	gboolean selected = active;
+
+	if (active) {
+		gtk_selection_model_select_item (self->pages, index, TRUE);
+	} else {
+		selected = gtk_selection_model_is_selected (self->pages, index);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), selected);
+	}
+
+	gtk_accessible_update_state (GTK_ACCESSIBLE (button),
+				     GTK_ACCESSIBLE_STATE_SELECTED, selected,
+				     -1);
+}
+
+static void
+add_child (EvStackSwitcher *self,
+           guint            position)
+{
+	GtkWidget *button;
+        GtkStackPage *page;
+	g_autofree char *title, *icon_name;
+	gboolean visible, selected;
+
+	button = g_object_new (GTK_TYPE_TOGGLE_BUTTON,
+			       "accessible-role", GTK_ACCESSIBLE_ROLE_TAB,
+			       "hexpand", TRUE,
+			       "vexpand", TRUE,
+			       "focus-on-click", FALSE,
+			       NULL);
+
+	gtk_box_append (self->box, button);
+
+	page = g_list_model_get_item (G_LIST_MODEL (self->pages), position);
+	selected = gtk_selection_model_is_selected (self->pages, position);
+
+	gtk_accessible_update_state (GTK_ACCESSIBLE (button),
+				     GTK_ACCESSIBLE_STATE_SELECTED, selected,
+				     -1);
+	gtk_accessible_update_relation (GTK_ACCESSIBLE (button),
+					GTK_ACCESSIBLE_RELATION_CONTROLS, page, NULL,
+					-1);
+	g_object_get (page,
+		      "title", &title,
+		      "icon-name", &icon_name,
+		      "visible", &visible,
+		      NULL);
+
+	g_object_set_data (G_OBJECT (button), "child-index", GUINT_TO_POINTER (position));
+
+	g_object_bind_property (page, "icon-name",
+				button, "icon-name",
+				G_BINDING_SYNC_CREATE);
+	g_object_bind_property (page, "title",
+				button, "tooltip-text",
+				G_BINDING_SYNC_CREATE);
+	g_object_bind_property (page, "visible",
+				button, "visible",
+				G_BINDING_SYNC_CREATE);
+
+	gtk_accessible_update_property (GTK_ACCESSIBLE (button),
+					GTK_ACCESSIBLE_PROPERTY_LABEL, title,
+					-1);
+
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), selected);
+
+	gtk_widget_set_visible (button, visible);
+
+	g_hash_table_insert (self->buttons, g_object_ref (page), button);
+
+	g_signal_connect_swapped (button, "notify::active",
+				  G_CALLBACK (button_active_notify_cb), self);
+
+	g_object_unref (page);
+}
+
+static void
+populate_switcher (EvStackSwitcher *self)
+{
+  for (guint i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (self->pages)); i++)
+    add_child (self, i);
+}
+
+static void
+clear_switcher (EvStackSwitcher *self)
+{
+  GHashTableIter iter;
+  GtkWidget *page;
+  GtkWidget *button;
+
+  g_hash_table_iter_init (&iter, self->buttons);
+  while (g_hash_table_iter_next (&iter, (gpointer *)&page, (gpointer *)&button))
+    {
+      gtk_widget_unparent (button);
+      g_hash_table_iter_remove (&iter);
+    }
+}
+
+static void
+items_changed_cb (GListModel      *model,
+                  guint            position,
+                  guint            removed,
+                  guint            added,
+                  EvStackSwitcher *self)
+{
+  clear_switcher (self);
+  populate_switcher (self);
+}
+
+static void
+selection_changed_cb (GtkSelectionModel *model,
+                      guint              position,
+                      guint              n_items,
+                      EvStackSwitcher   *self)
+{
+  guint i;
+
+  for (i = position; i < position + n_items; i++)
+    {
+      GtkStackPage *page;
+      GtkWidget *button;
+      gboolean selected;
+
+      page = g_list_model_get_item (G_LIST_MODEL (self->pages), i);
+      button = g_hash_table_lookup (self->buttons, page);
+      if (button)
+        {
+          selected = gtk_selection_model_is_selected (self->pages, i);
+          gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), selected);
+
+          gtk_accessible_update_state (GTK_ACCESSIBLE (button),
+                                       GTK_ACCESSIBLE_STATE_SELECTED, selected,
+                                       -1);
+        }
+      g_object_unref (page);
+    }
+}
+
+static void
+disconnect_stack_signals (EvStackSwitcher *self)
+{
+  g_signal_handlers_disconnect_by_func (self->pages, items_changed_cb, self);
+  g_signal_handlers_disconnect_by_func (self->pages, selection_changed_cb, self);
+}
+
+static void
+connect_stack_signals (EvStackSwitcher *self)
+{
+  g_signal_connect (self->pages, "items-changed", G_CALLBACK (items_changed_cb), self);
+  g_signal_connect (self->pages, "selection-changed", G_CALLBACK (selection_changed_cb), self);
+}
+
+
+EvStackSwitcher *
+ev_stack_switcher_new (void)
+{
+	return g_object_new (EV_TYPE_STACK_SWITCHER, NULL);
+}
+
+static void
+ev_stack_switcher_finalize (GObject *object)
+{
+	G_OBJECT_CLASS (ev_stack_switcher_parent_class)->finalize (object);
+}
+
+static void
+ev_stack_switcher_get_property (GObject    *object,
+                                guint       prop_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+	EvStackSwitcher *self = EV_STACK_SWITCHER (object);
+
+	switch (prop_id)
+	  {
+	  case PROP_STACK:
+		g_value_set_object (value, self->stack);
+		break;
+	  default:
+	    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+	  }
+}
+
+static void
+ev_stack_switcher_set_property (GObject      *object,
+                                guint         prop_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+	EvStackSwitcher *self = EV_STACK_SWITCHER (object);
+
+	switch (prop_id)
+	  {
+	  case PROP_STACK:
+		ev_stack_switcher_set_stack (self, g_value_get_object (value));
+		break;
+	  default:
+	    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+	  }
+}
+
+static void
+ev_stack_switcher_class_init (EvStackSwitcherClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+	object_class->finalize = ev_stack_switcher_finalize;
+	object_class->get_property = ev_stack_switcher_get_property;
+	object_class->set_property = ev_stack_switcher_set_property;
+
+	properties [PROP_STACK] =
+		g_param_spec_object ("stack", NULL, NULL,
+		                     GTK_TYPE_STACK,
+		                     (G_PARAM_READWRITE |
+		                      G_PARAM_EXPLICIT_NOTIFY |
+		                      G_PARAM_STATIC_STRINGS));
+	g_object_class_install_property (object_class, PROP_STACK, properties [PROP_STACK]);
+
+	gtk_widget_class_set_accessible_role (widget_class, GTK_ACCESSIBLE_ROLE_TAB_LIST);
+}
+
+static void
+ev_stack_switcher_init (EvStackSwitcher *self)
+{
+	self->buttons = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+					       g_object_unref, NULL);
+	self->box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0));
+
+	gtk_widget_add_css_class (GTK_WIDGET (self->box), "toolbar");
+
+	adw_bin_set_child (ADW_BIN (self), GTK_WIDGET (self->box));
+}
+
+void
+ev_stack_switcher_set_stack (EvStackSwitcher *self,
+                             GtkStack        *stack)
+{
+	g_return_if_fail (EV_IS_STACK_SWITCHER (self));
+	g_return_if_fail (GTK_IS_STACK (stack));
+
+	if (self->stack == stack) {
+		return;
+	} else if (self->stack) {
+		disconnect_stack_signals (self);
+		clear_switcher (self);
+	}
+
+	g_set_object (&self->stack, stack);
+	g_set_object (&self->pages, gtk_stack_get_pages (stack));
+
+	populate_switcher (self);
+	connect_stack_signals (self);
+}
diff --git a/shell/ev-stack-switcher.h b/shell/ev-stack-switcher.h
new file mode 100644
index 0000000000000000000000000000000000000000..d90159e0c9c28809499e701d0c76ead671baef5c
--- /dev/null
+++ b/shell/ev-stack-switcher.h
@@ -0,0 +1,36 @@
+/* ev-stack-switcher.h
+ *
+ * Copyright 2024 Christopher Davis <christopherdavis@gnome.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#pragma once
+
+#include <adwaita.h>
+
+G_BEGIN_DECLS
+
+#define EV_TYPE_STACK_SWITCHER (ev_stack_switcher_get_type())
+
+G_DECLARE_FINAL_TYPE (EvStackSwitcher, ev_stack_switcher, EV, STACK_SWITCHER, AdwBin)
+
+EvStackSwitcher *ev_stack_switcher_new (void);
+
+void ev_stack_switcher_set_stack (EvStackSwitcher *self,
+				  GtkStack        *stack);
+
+G_END_DECLS
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 9841c564d50a31d0dd476a060b4c487c6760532f..6240c4f3eafa082a851112bdf5ef1b2f8f790f47 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -112,7 +112,6 @@ typedef struct {
 	GtkWidget *stack;
 	GtkWidget *main_box;
 	GtkWidget *toolbar;
-	GtkWidget *hpaned;
 	GtkWidget *sidebar;
 	GtkWidget *search_box;
 	GtkWidget *search_bar;
@@ -127,8 +126,11 @@ typedef struct {
 	GtkWidget *sidebar_layers;
 	GtkWidget *sidebar_annots;
 	GtkWidget *sidebar_bookmarks;
+	GtkWidget *annots_toolbar_revealer;
 	GtkWidget *annots_toolbar;
 
+	AdwOverlaySplitView *split_view;
+
 	/* Settings */
 	GSettings *settings;
 	GSettings *default_settings;
@@ -1030,10 +1032,6 @@ ev_window_init_metadata_with_default_values (EvWindow *window)
 		ev_metadata_set_boolean (metadata, "sidebar_visibility",
 					 g_settings_get_boolean (settings, "show-sidebar"));
 	}
-	if (!ev_metadata_has_key (metadata, "sidebar_size")) {
-		ev_metadata_set_int (metadata, "sidebar_size",
-				     g_settings_get_int (settings, "sidebar-size"));
-	}
 	if (!ev_metadata_has_key (metadata, "sidebar_page")) {
 		gchar *sidebar_page_id = g_settings_get_string (settings, "sidebar-page");
 
@@ -1085,17 +1083,16 @@ setup_sidebar_from_metadata (EvWindow *window)
 {
 	gboolean show_sidebar;
 	gchar *page_id;
-	gint   sidebar_size;
 	EvWindowPrivate *priv = GET_PRIVATE (window);
 
 	if (!priv->metadata)
 		return;
 
-	if (ev_metadata_get_boolean (priv->metadata, "sidebar_visibility", &show_sidebar))
-		gtk_widget_set_visible (priv->sidebar, show_sidebar);
+	adw_overlay_split_view_set_show_sidebar (priv->split_view,
+						 ev_metadata_get_boolean (priv->metadata,
+									  "sidebar_visibility",
+									  &show_sidebar));
 
-	if (ev_metadata_get_int (priv->metadata, "sidebar_size", &sidebar_size))
-		gtk_paned_set_position (GTK_PANED (priv->hpaned), sidebar_size);
 
 	if (ev_metadata_get_string (priv->metadata, "sidebar_page", &page_id))
 		ev_sidebar_set_visible_child_name (EV_SIDEBAR (priv->sidebar), page_id);
@@ -1383,9 +1380,9 @@ ev_window_setup_default (EvWindow *ev_window)
 	GSettings       *settings = priv->default_settings;
 
 	/* Sidebar */
-	gtk_paned_set_position (GTK_PANED (priv->hpaned),
-				g_settings_get_int (settings, "sidebar-size"));
-	gtk_widget_set_visible (priv->sidebar, g_settings_get_boolean (settings, "show-sidebar"));
+	adw_overlay_split_view_set_show_sidebar (priv->split_view,
+						 g_settings_get_boolean (settings, "show-sidebar"));
+	g_signal_emit_by_name (priv->split_view, "notify::show-sidebar", NULL);
 
 	/* Document model */
 	ev_document_model_set_continuous (model, g_settings_get_boolean (settings, "continuous"));
@@ -2666,6 +2663,8 @@ ev_window_open_copy_at_dest (EvWindow   *window,
 				 dest, 0, NULL);
 	gtk_widget_set_visible (new_priv->sidebar,
 				gtk_widget_is_visible (priv->sidebar));
+	adw_overlay_split_view_set_show_sidebar (new_priv->split_view,
+						 adw_overlay_split_view_get_show_sidebar (priv->split_view));
 
 	gtk_window_present (GTK_WINDOW (new_window));
 }
@@ -3838,8 +3837,6 @@ ev_window_save_settings (EvWindow *ev_window)
 	}
 	g_settings_set_boolean (settings, "show-sidebar",
 				gtk_widget_get_visible (priv->sidebar));
-	g_settings_set_int (settings, "sidebar-size",
-			    gtk_paned_get_position (GTK_PANED (priv->hpaned)));
 	g_settings_set_string (settings, "sidebar-page",
 				ev_sidebar_get_visible_child_name (EV_SIDEBAR (priv->sidebar)));
 	g_settings_set_boolean (settings, "enable-spellchecking",
@@ -4298,18 +4295,6 @@ ev_window_cmd_edit_copy (GSimpleAction *action,
 	ev_view_copy (EV_VIEW (priv->view));
 }
 
-static void
-sidebar_position_changed_cb (GObject    *object,
-				      GParamSpec *pspec,
-				      EvWindow   *ev_window)
-{
-	EvWindowPrivate *priv = GET_PRIVATE (ev_window);
-
-	if (priv->metadata && !ev_window_is_empty (ev_window))
-		ev_metadata_set_int (priv->metadata, "sidebar_size",
-				     gtk_paned_get_position (GTK_PANED (object)));
-}
-
 static void
 ev_window_update_fullscreen_action (EvWindow *window,
 				    gboolean  fullscreen)
@@ -5073,7 +5058,7 @@ ev_window_view_cmd_toggle_sidebar (GSimpleAction *action,
 
 	show_side_pane = g_variant_get_boolean (state);
 	g_simple_action_set_state (action, g_variant_new_boolean (show_side_pane));
-	gtk_widget_set_visible (priv->sidebar, show_side_pane);
+	adw_overlay_split_view_set_show_sidebar (priv->split_view, show_side_pane);
 }
 
 static void
@@ -5092,14 +5077,14 @@ sidebar_current_page_changed_cb (EvSidebar  *ev_sidebar,
 }
 
 static void
-sidebar_visibility_changed_cb (EvSidebar  *ev_sidebar,
-					 GParamSpec *pspec,
-					 EvWindow   *ev_window)
+sidebar_visibility_changed_cb (AdwOverlaySplitView *split_view,
+                               GParamSpec          *pspec,
+                               EvWindow            *ev_window)
 {
 	EvWindowPrivate *priv = GET_PRIVATE (ev_window);
 
 	if (!EV_WINDOW_IS_PRESENTATION (priv)) {
-		gboolean visible = gtk_widget_get_visible (GTK_WIDGET (ev_sidebar));
+		gboolean visible = adw_overlay_split_view_get_show_sidebar (split_view);
 
 		g_action_group_change_action_state (G_ACTION_GROUP (ev_window), "show-side-pane",
 						    g_variant_new_boolean (visible));
@@ -5492,7 +5477,7 @@ ev_window_show_find_bar (EvWindow *ev_window,
 {
 	EvWindowPrivate *priv = GET_PRIVATE (ev_window);
 
-	if (gtk_paned_get_start_child (GTK_PANED (priv->hpaned)) == priv->find_sidebar) {
+	if (adw_overlay_split_view_get_sidebar (priv->split_view) == priv->find_sidebar) {
 		gtk_widget_grab_focus (priv->search_box);
 		return;
 	}
@@ -5507,7 +5492,7 @@ ev_window_show_find_bar (EvWindow *ev_window,
 
 	ev_history_freeze (priv->history);
 
-	gtk_paned_set_start_child (GTK_PANED (priv->hpaned), priv->find_sidebar);
+	adw_overlay_split_view_set_sidebar (priv->split_view, priv->find_sidebar);
 
 	gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (priv->search_bar), TRUE);
 	gtk_widget_grab_focus (priv->search_box);
@@ -5527,10 +5512,10 @@ ev_window_close_find_bar (EvWindow *ev_window)
 {
 	EvWindowPrivate *priv = GET_PRIVATE (ev_window);
 
-	if (gtk_paned_get_start_child (GTK_PANED (priv->hpaned)) != priv->find_sidebar)
+	if (adw_overlay_split_view_get_sidebar (priv->split_view) != priv->find_sidebar)
 		return;
 
-	gtk_paned_set_start_child (GTK_PANED (priv->hpaned), priv->sidebar);
+	adw_overlay_split_view_set_sidebar (priv->split_view, priv->sidebar);
 
 	gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (priv->search_bar), FALSE);
 	gtk_widget_grab_focus (priv->view);
@@ -5681,7 +5666,8 @@ ev_window_cmd_toggle_edit_annots (GSimpleAction *action,
 	EvWindow *ev_window = user_data;
 	EvWindowPrivate *priv = GET_PRIVATE (ev_window);
 
-	gtk_widget_set_visible (priv->annots_toolbar, g_variant_get_boolean (state));
+	gtk_revealer_set_reveal_child (GTK_REVEALER (priv->annots_toolbar_revealer),
+				       g_variant_get_boolean (state));
 	g_simple_action_set_state (action, state);
 }
 
@@ -7007,11 +6993,12 @@ ev_window_class_init (EvWindowClass *ev_window_class)
 	gtk_widget_class_bind_template_child_private(widget_class, EvWindow, main_box);
 	gtk_widget_class_bind_template_child_private(widget_class, EvWindow, toolbar);
 	gtk_widget_class_bind_template_child_private(widget_class, EvWindow, sidebar);
-	gtk_widget_class_bind_template_child_private(widget_class, EvWindow, hpaned);
+	gtk_widget_class_bind_template_child_private(widget_class, EvWindow, split_view);
 	gtk_widget_class_bind_template_child_private(widget_class, EvWindow, scrolled_window);
 	gtk_widget_class_bind_template_child_private(widget_class, EvWindow, loading_message);
 	gtk_widget_class_bind_template_child_private(widget_class, EvWindow, password_view);
 
+	gtk_widget_class_bind_template_child_private (widget_class, EvWindow, annots_toolbar_revealer);
 	gtk_widget_class_bind_template_child_private (widget_class, EvWindow, annots_toolbar);
 	gtk_widget_class_bind_template_child_private (widget_class, EvWindow, find_sidebar);
 	gtk_widget_class_bind_template_child_private (widget_class, EvWindow, search_bar);
@@ -7039,7 +7026,6 @@ ev_window_class_init (EvWindowClass *ev_window_class)
 	gtk_widget_class_bind_template_callback (widget_class, window_size_changed_cb);
 	gtk_widget_class_bind_template_callback (widget_class, sidebar_visibility_changed_cb);
 	gtk_widget_class_bind_template_callback (widget_class, sidebar_current_page_changed_cb);
-	gtk_widget_class_bind_template_callback (widget_class, sidebar_position_changed_cb);
 	gtk_widget_class_bind_template_callback (widget_class, ev_window_button_pressed);
 	gtk_widget_class_bind_template_callback (widget_class, ev_window_drag_data_received);
 	gtk_widget_class_bind_template_callback (widget_class, view_popup_hide_cb);
@@ -7159,19 +7145,14 @@ gint
 ev_window_get_metadata_sidebar_size (EvWindow *ev_window)
 {
 	EvWindowPrivate *priv;
-	gint sidebar_size;
+	GtkWidget *sidebar;
 
 	g_return_val_if_fail (EV_WINDOW (ev_window), 0);
 
 	priv = GET_PRIVATE (ev_window);
+	sidebar = adw_overlay_split_view_get_sidebar (priv->split_view);
 
-	if (!priv->metadata)
-		return 0;
-
-	if (ev_metadata_get_int (priv->metadata, "sidebar_size", &sidebar_size))
-		return sidebar_size;
-
-	return 0;
+	return gtk_widget_get_width (GTK_WIDGET (sidebar));
 }
 
 /* Sets the position of the divider between the sidebar and the main view */
@@ -7185,5 +7166,6 @@ ev_window_set_divider_position (EvWindow *ev_window,
 
 	priv = GET_PRIVATE (ev_window);
 
-	gtk_paned_set_position (GTK_PANED (priv->hpaned), sidebar_width);
+	/* TODO: Rework the dual mode handling to work with AdwOverlaySplitView */
+	// gtk_paned_set_position (GTK_PANED (priv->hpaned), sidebar_width);
 }
diff --git a/shell/evince-password-view.ui b/shell/evince-password-view.ui
index 424a9948a6eaa2db71923c99f9a9baa1e4475723..423e69a0e5a5b2120cd2ae773d43d6f27911f8cc 100644
--- a/shell/evince-password-view.ui
+++ b/shell/evince-password-view.ui
@@ -15,40 +15,21 @@
           </object>
         </child>
         <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="spacing">24</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <child>
-              <object class="GtkImage">
-                <property name="icon-name">dialog-password-symbolic</property>
-                <property name="pixel-size">48</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="label" translatable="yes">This document is locked and can only be read by entering the correct password.</property>
-                <property name="wrap">True</property>
-                <property name="max-width-chars">64</property>
-                <property name="wrap-mode">char</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="orientation">horizontal</property>
+          <object class="AdwStatusPage">
+            <property name="icon-name">dialog-password-symbolic</property>
+            <property name="title" translatable="yes">Password Required</property>
+            <property name="description" translatable="yes">This document is locked and can only be read by entering the correct password</property>
+            <property name="child">
+              <object class="GtkButton">
                 <property name="halign">center</property>
-                <child>
-                  <object class="GtkButton">
-                    <property name="use-underline">True</property>
-                    <property name="label" translatable="yes">_Unlock Document</property>
-                    <signal name="clicked" handler="ev_password_view_clicked_cb" />
-                  </object>
-                </child>
+                <property name="use-underline">True</property>
+                <property name="label" translatable="yes">_Unlock Document</property>
+                <signal name="clicked" handler="ev_password_view_clicked_cb" />
+                <style>
+                  <class name="pill"/>
+                </style>
               </object>
-            </child>
+            </property>
           </object>
         </child>
       </object>
diff --git a/shell/evince-recent-view.ui b/shell/evince-recent-view.ui
index 899ad842ecee736b0c5ab6617b4224c55e2e9679..4d6453171daf97f22011f6e284db8da839026aaf 100644
--- a/shell/evince-recent-view.ui
+++ b/shell/evince-recent-view.ui
@@ -142,5 +142,8 @@
         </child>
       </object>
     </child>
+    <style>
+      <class name="view"/>
+    </style>
   </template>
 </interface>
diff --git a/shell/evince-search-box.ui b/shell/evince-search-box.ui
index ab24e8a699b561693aadd6a023856a1ad935cbc7..b4d856d1590f7fe734572b6358623da084544532 100644
--- a/shell/evince-search-box.ui
+++ b/shell/evince-search-box.ui
@@ -16,9 +16,7 @@
           <object class="GtkBox">
             <property name="orientation">horizontal</property>
             <property name="halign">center</property>
-            <style>
-              <class name="linked" />
-            </style>
+            <property name="spacing">6</property>
             <child>
               <object class="GtkSearchEntry" id="entry">
                 <signal name="search-changed" handler="search_changed_cb" />
@@ -27,35 +25,6 @@
                 <signal name="previous-match" handler="entry_previous_match_cb" />
               </object>
             </child>
-            <child>
-              <object class="GtkMenuButton">
-                <property name="direction">down</property>
-                <property name="icon-name">pan-down</property>
-                <property name="popover">
-                  <object class="GtkPopover">
-                    <child>
-                      <object class="GtkBox">
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="GtkCheckButton">
-                            <property name="label">_Whole Words Only</property>
-                            <property name="use-underline">True</property>
-                            <signal name="toggled" handler="whole_words_only_toggled_cb" />
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton">
-                            <property name="label">C_ase Sensitive</property>
-                            <property name="use-underline">True</property>
-                            <signal name="toggled" handler="case_sensitive_toggled_cb" />
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </property>
-              </object>
-            </child>
             <child>
               <object class="GtkButton" id="prev_button">
                 <property name="icon-name">go-up-symbolic</property>
@@ -72,9 +41,28 @@
                 <signal name="clicked" handler="next_clicked_cb" />
               </object>
             </child>
+            <child>
+              <object class="GtkMenuButton">
+                <property name="direction">down</property>
+                <property name="icon-name">view-more-symbolic</property>
+                <property name="menu-model">search_options</property>
+              </object>
+            </child>
           </object>
         </child>
       </object>
     </child>
   </template>
+  <menu id="search_options">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Whole Words Only</attribute>
+        <attribute name="action">search.whole-words-only</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">C_ase Sensitive</attribute>
+        <attribute name="action">search.case-sensitive</attribute>
+      </item>
+    </section>
+  </menu>
 </interface>
diff --git a/shell/evince-sidebar-bookmarks.ui b/shell/evince-sidebar-bookmarks.ui
index 632b3cca4c14a69ce0646c17cdc108540c34e922..8fc085ce5b4a2df538ec5bcd6a26d9e2eee6b000 100644
--- a/shell/evince-sidebar-bookmarks.ui
+++ b/shell/evince-sidebar-bookmarks.ui
@@ -37,7 +37,9 @@
                 <signal name="pressed" handler="ev_sidebar_bookmarks_button_press_cb" />
               </object>
             </child>
-
+            <style>
+              <class name="navigation-sidebar"/>
+            </style>
           </object>
         </child>
       </object>
@@ -46,17 +48,14 @@
     <child type="end">
       <object class="GtkBox" id="hbox">
         <style>
-          <class name="linked" />
+          <class name="toolbar"/>
+          <class name="nested"/>
         </style>
         <property name="orientation">horizontal</property>
-        <property name="margin-bottom">6</property>
-        <property name="margin-end">6</property>
-        <property name="margin-start">6</property>
-        <property name="margin-top">6</property>
-        <property name="halign">center</property>
-        <property name="valign">fill</property>
+        <property name="hexpand">True</property>
         <child>
           <object class="GtkButton" id="add_button">
+            <property name="hexpand">True</property>
             <property name="icon-name">list-add-symbolic</property>
             <property name="sensitive">False</property>
             <property name="tooltip-text" translatable="yes">Add bookmark</property>
@@ -65,6 +64,7 @@
         </child>
         <child>
           <object class="GtkButton" id="del_button">
+            <property name="hexpand">True</property>
             <property name="icon-name">list-remove-symbolic</property>
             <property name="sensitive">False</property>
             <property name="tooltip-text" translatable="yes">Remove bookmark</property>
diff --git a/shell/evince-sidebar-links.ui b/shell/evince-sidebar-links.ui
index 48cc67c1a6f1d855742f4ae0f50854ee66982ef8..0f4ee83c27e9b7c0d7c1b78e7dfbe07f6441cf94 100644
--- a/shell/evince-sidebar-links.ui
+++ b/shell/evince-sidebar-links.ui
@@ -56,6 +56,9 @@
                 <signal name="pressed" handler="button_press_cb" />
               </object>
             </child>
+            <style>
+              <class name="navigation-sidebar"/>
+            </style>
           </object>
         </child>
       </object>
diff --git a/shell/evince-sidebar-thumbnails.ui b/shell/evince-sidebar-thumbnails.ui
index a624d0b6af83a975f2cbe602f4af36b69fe73171..8dd633d3bbba6d3cdde04fd418ecbbf7db08cdf1 100644
--- a/shell/evince-sidebar-thumbnails.ui
+++ b/shell/evince-sidebar-thumbnails.ui
@@ -35,6 +35,9 @@
                 <attribute name="markup">0</attribute>
               </attributes>
             </child>
+            <style>
+              <class name="navigation-sidebar"/>
+            </style>
           </object>
         </child>
       </object>
diff --git a/shell/evince-sidebar.ui b/shell/evince-sidebar.ui
index 80818c2fd4e2444ee9753b2fc9230e52df07b36c..6034ad66c72b8804e2decba3f63facf8890586ba 100644
--- a/shell/evince-sidebar.ui
+++ b/shell/evince-sidebar.ui
@@ -1,24 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="EvSidebar" parent="GtkBox">
-    <property name="orientation">vertical</property>
-    <child>
-      <object class="GtkStack" id="stack">
-        <signal name="notify::visible-child" handler="ev_sidebar_child_change_cb" />
+  <template class="EvSidebar" parent="AdwBin">
+    <property name="child">
+      <object class="AdwToolbarView">
+        <property name="content">
+          <object class="GtkStack" id="stack">
+            <signal name="notify::visible-child" handler="ev_sidebar_child_change_cb" />
+          </object>
+        </property>
+        <child type="bottom">
+          <object class="EvStackSwitcher" id="switcher">
+            <property name="stack">stack</property>
+          </object>
+        </child>
       </object>
-    </child>
-    <child>
-      <object class="GtkSeparator" />
-    </child>
-    <child>
-      <object class="GtkStackSwitcher" id="switcher">
-        <style>
-          <class name="toolbar" />
-        </style>
-        <property name="stack">stack</property>
-        <property name="halign">fill</property>
-        <property name="hexpand">True</property>
-      </object>
-    </child>
+    </property>
   </template>
 </interface>
diff --git a/shell/evince-toolbar.ui b/shell/evince-toolbar.ui
index 774b1011839a364d0ba4b4e5704f132f99fc210b..c8efa0e810703c5bc766f98e4df28ad39c9b005f 100644
--- a/shell/evince-toolbar.ui
+++ b/shell/evince-toolbar.ui
@@ -36,7 +36,7 @@
           <object class="GtkMenuButton" id="action_menu_button">
             <property name="icon-name">open-menu-symbolic</property>
             <property name="tooltip-text" translatable="yes">File options</property>
-            <property name="menu-model">action-menu</property>
+            <property name="popover">action_popover</property>
             <property name="primary">True</property>
             <accessibility>
               <property name="label" translatable="yes">File options</property>
@@ -64,21 +64,8 @@
 
   <menu id="action-menu">
     <section>
-      <attribute name="display-hint">horizontal-buttons</attribute>
       <item>
-        <attribute name="label" translatable="yes">Print…</attribute>
-        <attribute name="action">win.print</attribute>
-        <attribute name="verb-icon">printer-symbolic</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Fullscreen</attribute>
-        <attribute name="action">win.fullscreen</attribute>
-        <attribute name="verb-icon">view-fullscreen-symbolic</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Send To…</attribute>
-        <attribute name="action">win.send-to</attribute>
-        <attribute name="verb-icon">send-to-symbolic</attribute>
+        <attribute name="custom">header</attribute>
       </item>
     </section>
     <section>
@@ -160,4 +147,37 @@
       </item>
     </section>
   </menu>
+
+  <object class="GtkPopoverMenu" id="action_popover">
+    <property name="menu-model">action-menu</property>
+    <child type="header">
+      <object class="GtkBox" id="button-box">
+        <property name="orientation">horizontal</property>
+        <property name="spacing">6</property>
+        <property name="homogeneous">True</property>
+        <child>
+          <object class="GtkButton">
+            <property name="tooltip_text" translatable="yes">Print…</property>
+            <property name="icon-name">printer-symbolic</property>
+            <property name="action-name">win.print</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton">
+            <property name="tooltip_text" translatable="yes">Fullscreen</property>
+            <property name="icon-name">view-fullscreen-symbolic</property>
+            <property name="action-name">win.fullscreen</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton">
+            <property name="tooltip_text" translatable="yes">Send To…</property>
+            <property name="icon-name">send-to-symbolic</property>
+            <property name="action-name">win.send-to</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+
 </interface>
diff --git a/shell/evince-window.ui b/shell/evince-window.ui
index 2d7eb94d16410eeefaa77eaaff5c8536b198ac64..71a8165934c5c0ca06ce4668b69a6089c2c73b62 100644
--- a/shell/evince-window.ui
+++ b/shell/evince-window.ui
@@ -31,18 +31,22 @@
             <property name="title">Document</property>
             <property name="child">
               <object class="AdwToolbarView" id="main_box">
+                <property name="top-bar-style">raised</property>
                 <child type="top">
                   <object class="EvToolbar" id="toolbar">
                     <property name="document-model">model</property>
                   </object>
                 </child>
                 <child type="top">
-                  <object class="EvAnnotationsToolbar" id="annots_toolbar">
-                    <property name="visible">False</property>
-                    <signal name="begin-add-annot" handler="ev_window_begin_add_annot"
-                      swapped="yes" />
-                    <signal name="cancel-add-annot" handler="ev_window_cancel_add_annot"
-                      swapped="yes" />
+                  <object class="GtkRevealer" id="annots_toolbar_revealer">
+                    <property name="child">
+                      <object class="EvAnnotationsToolbar" id="annots_toolbar">
+                        <signal name="begin-add-annot" handler="ev_window_begin_add_annot"
+                          swapped="yes" />
+                        <signal name="cancel-add-annot" handler="ev_window_cancel_add_annot"
+                          swapped="yes" />
+                      </object>
+                    </property>
                   </object>
                 </child>
                 <child type="top">
@@ -73,16 +77,12 @@
                   </object>
                 </child>
                 <property name="content">
-                  <object class="GtkPaned" id="hpaned">
-                    <property name="orientation">horizontal</property>
-                    <property name="vexpand">True</property>
-                    <property name="valign">fill</property>
-                    <property name="position">132</property>
-                    <signal name="notify::position" handler="sidebar_position_changed_cb" />
-                    <child>
+                  <object class="AdwOverlaySplitView" id="split_view">
+                    <property name="max-sidebar-width">250</property>
+                    <signal name="notify::show-sidebar" handler="sidebar_visibility_changed_cb" />
+                    <property name="sidebar">
                       <object class="EvSidebar" id="sidebar">
                         <property name="document-model">model</property>
-                        <signal name="notify::visible" handler="sidebar_visibility_changed_cb" />
                         <signal name="notify::current-page"
                           handler="sidebar_current_page_changed_cb" />
                         <child internal-child="stack">
@@ -174,8 +174,8 @@
                           </object>
                         </child>
                       </object>
-                    </child>
-                    <child>
+                    </property>
+                    <property name="content">
                       <object class="GtkBox" id="view_box">
                         <child>
                           <object class="GtkOverlay">
@@ -235,11 +235,7 @@
                           </object>
                         </child>
                       </object>
-                    </child>
-                    <!-- HACK: GtkPaned set the shrink-start-child property to True when they
-                    parsing
-                                the child node. Let's set the property to False after that. -->
-                    <property name="shrink-start-child">False</property>
+                    </property>
                   </object>
                 </property>
               </object>
diff --git a/shell/evince-zoom-action.ui b/shell/evince-zoom-action.ui
index b2c24bf0a2d8d4abf09dc7a95aeb1841a396bb36..0ac7bfc933f16bc3ced662c094e604dafeac30eb 100644
--- a/shell/evince-zoom-action.ui
+++ b/shell/evince-zoom-action.ui
@@ -7,7 +7,7 @@
     <child>
       <object class="GtkEntry" id="entry">
         <style>
-          <class name="tnum" />
+          <class name="numeric" />
         </style>
         <property name="secondary-icon-name">pan-down-symbolic</property>
         <property name="vexpand">True</property>
diff --git a/shell/evince.css b/shell/evince.css
index da8a5938ef851508b2ef2ed4fcde89e782a88c37..cef9fde1b9c7b2da2e78b3244477004f2a13dfa8 100644
--- a/shell/evince.css
+++ b/shell/evince.css
@@ -48,9 +48,9 @@ evpresentationview.white-mode {
     background-color: white;
 }
 
-.inline-toolbar {
-    border-width: 0 0 1px;
-    border-radius: 0;
+.toolbar.nested {
+  padding-top: 0px;
+  padding-bottom: 0px;
 }
 
 .content-view .combo {
@@ -58,16 +58,6 @@ evpresentationview.white-mode {
     padding-right: 2px;
 }
 
-.tnum {
-    font-feature-settings: "tnum";
-}
-
-searchbar.evsearchbox box {
-    padding-left: 0px;
-    padding-right: 0px;
-    border-spacing: 0px 6px;
-}
-
 .ev-author-label {
     opacity: 0.55;
     font-size: 82%;
diff --git a/shell/evince.gresource.xml b/shell/evince.gresource.xml
index 773c50ae66d3d1db89b11b318b57e38aaedda479..028f1aadfbc1246b8608efa8b7fabffecac21bcf 100644
--- a/shell/evince.gresource.xml
+++ b/shell/evince.gresource.xml
@@ -40,6 +40,7 @@
     <file alias="annotations-squiggly-symbolic.svg" preprocess="xml-stripblanks">icons/annotations-squiggly-symbolic.svg</file>
     <file alias="annotations-text-symbolic.svg" preprocess="xml-stripblanks">icons/annotations-text-symbolic.svg</file>
     <file alias="find-unsupported-symbolic.svg" preprocess="xml-stripblanks">icons/find-unsupported-symbolic.svg</file>
+    <file alias="marker-symbolic.svg" preprocess="xml-stripblanks">icons/marker-symbolic.svg</file>
     <file alias="outline-symbolic.svg" preprocess="xml-stripblanks">icons/outline-symbolic.svg</file>
     <file alias="visible-symbolic.svg" preprocess="xml-stripblanks">icons/visible-symbolic.svg</file>
     <file alias="x-office-document-symbolic.svg" preprocess="xml-stripblanks">icons/x-office-document-symbolic.svg</file>
diff --git a/shell/meson.build b/shell/meson.build
index 71dd3e0c1ef349ef22cad669dcc4b295e238b236..01123d67b4b445b21799a92c23661919fe3f7b1a 100644
--- a/shell/meson.build
+++ b/shell/meson.build
@@ -30,6 +30,7 @@ evince_sources = files(
   'ev-sidebar-links.c',
   'ev-sidebar-page.c',
   'ev-sidebar-thumbnails.c',
+  'ev-stack-switcher.c',
   'ev-zoom-action.c',
   'main.c',
 )