diff --git a/src/client/application/application-main-window.vala b/src/client/application/application-main-window.vala
index d605e027..97920ff6 100644
--- a/src/client/application/application-main-window.vala
+++ b/src/client/application/application-main-window.vala
@@ -1221,7 +1221,10 @@ public class Application.MainWindow :
             this.main_toolbar.show_close_button = false;
             this.main_layout.pack_start(main_toolbar, false, true, 0);
         } else {
-            set_titlebar(this.main_toolbar);
+            var titlebar = new Hdy.TitleBar();
+            titlebar.show();
+            titlebar.add(this.main_toolbar);
+            set_titlebar(titlebar);
         }
 
         // Status bar
diff --git a/src/client/components/main-toolbar.vala b/src/client/components/main-toolbar.vala
index 5afaea6c..e4b55743 100644
--- a/src/client/components/main-toolbar.vala
+++ b/src/client/components/main-toolbar.vala
@@ -102,8 +102,6 @@ public class MainToolbar : Gtk.Box {
 
     public void set_conversation_header(Gtk.HeaderBar header) {
         conversation_header.hide();
-        header.get_style_context().add_class("geary-titlebar");
-        header.get_style_context().add_class("geary-titlebar-right");
         guest_header_binding = bind_property("show-close-button-right", header,
             "show-close-button", BindingFlags.SYNC_CREATE);
         pack_start(header, true, true);
@@ -112,8 +110,6 @@ public class MainToolbar : Gtk.Box {
 
     public void remove_conversation_header(Gtk.HeaderBar header) {
         remove(header);
-        header.get_style_context().remove_class("geary-titlebar");
-        header.get_style_context().remove_class("geary-titlebar-right");
         guest_header_binding.unbind();
         header.decoration_layout = Gtk.Settings.get_default().gtk_decoration_layout;
         conversation_header.show();
diff --git a/ui/geary.css b/ui/geary.css
index ab8c07fb..0b21e6b5 100644
--- a/ui/geary.css
+++ b/ui/geary.css
@@ -45,15 +45,6 @@
   border-right: 0;
 }
 
-.geary-titlebar-left:dir(ltr),
-.geary-titlebar-right:dir(rtl) {
-  border-top-right-radius: 0px;
-}
-.geary-titlebar-right:dir(ltr),
-.geary-titlebar-left:dir(rtl) {
-  border-top-left-radius: 0px;
-}
-
 /* MainWindowInfoBarSet */
 
 .geary-info-bar-frame > border {
diff --git a/ui/main-toolbar.ui b/ui/main-toolbar.ui
index 5cf9e4d8..f7576f7d 100644
--- a/ui/main-toolbar.ui
+++ b/ui/main-toolbar.ui
@@ -73,10 +73,6 @@
             <property name="position">3</property>
           </packing>
         </child>
-        <style>
-          <class name="geary-titlebar"/>
-          <class name="geary-titlebar-left"/>
-        </style>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -89,6 +85,9 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
+        <style>
+          <class name="sidebar"/>
+        </style>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -331,11 +330,6 @@
             <property name="position">4</property>
           </packing>
         </child>
-        <style>
-          <class name="geary-titlebar"/>
-          <class name="geary-titlebar-right"/>
-          <class name="titlebar"/>
-        </style>
       </object>
       <packing>
         <property name="expand">True</property>