diff --git a/src/client/components/main-toolbar.vala b/src/client/components/main-toolbar.vala
index cf769546..6140053c 100644
--- a/src/client/components/main-toolbar.vala
+++ b/src/client/components/main-toolbar.vala
@@ -59,9 +59,9 @@ public class MainToolbar : Hdy.Leaflet {
             BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
     }
 
-    public void set_conversation_header(Gtk.HeaderBar header) {
+    public void set_conversation_header(Hdy.HeaderBar header) {
         remove(conversation_header);
-        this.header_group.add_gtk_header_bar(header);
+        this.header_group.add_header_bar(header);
         header.hexpand = true;
         conversation_group.remove_widget(conversation_header);
         conversation_group.add_widget(header);
@@ -69,9 +69,9 @@ public class MainToolbar : Hdy.Leaflet {
         child_set(header, "name", "conversation", null);
     }
 
-    public void remove_conversation_header(Gtk.HeaderBar header) {
+    public void remove_conversation_header(Hdy.HeaderBar header) {
         remove(header);
-        this.header_group.remove_gtk_header_bar(header);
+        this.header_group.remove_header_bar(header);
         conversation_group.remove_widget(header);
         conversation_group.add_widget(conversation_header);
         add(conversation_header);
diff --git a/src/client/composer/composer-headerbar.vala b/src/client/composer/composer-headerbar.vala
index 5d6fc1aa..1ff1fd7f 100644
--- a/src/client/composer/composer-headerbar.vala
+++ b/src/client/composer/composer-headerbar.vala
@@ -5,7 +5,7 @@
  */
 
 [GtkTemplate (ui = "/org/gnome/Geary/composer-headerbar.ui")]
-public class Composer.Headerbar : Gtk.HeaderBar {
+public class Composer.Headerbar : Hdy.HeaderBar {
 
 
     public bool show_save_and_close {
diff --git a/ui/composer-headerbar.ui b/ui/composer-headerbar.ui
index 92eaf2f4..516acb07 100644
--- a/ui/composer-headerbar.ui
+++ b/ui/composer-headerbar.ui
@@ -2,7 +2,7 @@
 <!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
-  <template class="ComposerHeaderbar" parent="GtkHeaderBar">
+  <template class="ComposerHeaderbar" parent="HdyHeaderBar">
     <property name="visible">True</property>
     <child type="title">
       <object class="GtkBox">