diff --git a/src/client/components/components-conversation-header-bar.vala b/src/client/components/components-conversation-header-bar.vala
index 85893011..202cf7c4 100644
--- a/src/client/components/components-conversation-header-bar.vala
+++ b/src/client/components/components-conversation-header-bar.vala
@@ -6,7 +6,7 @@
  */
 
 [GtkTemplate (ui = "/org/gnome/Geary/components-conversation-header-bar.ui")]
-public class Components.ConversationHeaderBar : Gtk.HeaderBar {
+public class Components.ConversationHeaderBar : Hdy.HeaderBar {
     public Components.ConversationActionBar action_bar { get; set; }
     public bool folded { get; set; }
 
diff --git a/src/client/components/main-toolbar.vala b/src/client/components/main-toolbar.vala
index 252b106c..607c2af3 100644
--- a/src/client/components/main-toolbar.vala
+++ b/src/client/components/main-toolbar.vala
@@ -24,7 +24,7 @@ public class MainToolbar : Hdy.Leaflet {
 
     // Folder header elements
     [GtkChild]
-    private Gtk.HeaderBar folder_header;
+    private Hdy.HeaderBar folder_header;
     [GtkChild]
     private Gtk.MenuButton main_menu_button;
 
@@ -33,7 +33,7 @@ public class MainToolbar : Hdy.Leaflet {
 
     // Conversations header elements
     [GtkChild]
-    private Gtk.HeaderBar conversations_header;
+    private Hdy.HeaderBar conversations_header;
     [GtkChild]
     private Gtk.ToggleButton search_conversations_button;
 
diff --git a/ui/components-conversation-header-bar.ui b/ui/components-conversation-header-bar.ui
index 1cb7a822..965f1262 100644
--- a/ui/components-conversation-header-bar.ui
+++ b/ui/components-conversation-header-bar.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.20"/>
-  <template class="ComponentsConversationHeaderBar" parent="GtkHeaderBar">
+  <template class="ComponentsConversationHeaderBar" parent="HdyHeaderBar">
     <property name="visible">True</property>
     <property name="hexpand">True</property>
     <signal name="notify::parent" handler="update_action_bar" swapped="no"/>
diff --git a/ui/main-toolbar.ui b/ui/main-toolbar.ui
index 39a04191..aba5529b 100644
--- a/ui/main-toolbar.ui
+++ b/ui/main-toolbar.ui
@@ -17,7 +17,7 @@
         <property name="transition_type">over</property>
         <property name="hexpand_set">True</property>
         <child>
-          <object class="GtkHeaderBar" id="folder_header">
+          <object class="HdyHeaderBar" id="folder_header">
             <property name="visible">True</property>
             <property name="show_close_button" bind-source="MainToolbar" bind-property="show_close_button" bind-flags="sync-create"/>
             <property name="title">Mail</property>
@@ -57,7 +57,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHeaderBar" id="conversations_header">
+          <object class="HdyHeaderBar" id="conversations_header">
             <property name="visible">True</property>
             <property name="hexpand">True</property>
             <property name="show_close_button" bind-source="MainToolbar" bind-property="show_close_button" bind-flags="sync-create"/>