diff --git a/src/resources/style-dark.css b/src/resources/style-dark.css
index 68325fa..54b0a6e 100644
--- a/src/resources/style-dark.css
+++ b/src/resources/style-dark.css
@@ -1 +1,3 @@
-# dummy
\ No newline at end of file
+.custom-headerbar {
+    box-shadow: inset 0 2px 1px 0 alpha(white, .15);
+}
\ No newline at end of file
diff --git a/src/resources/style.css b/src/resources/style.css
index 6fc5e27..8b12e28 100644
--- a/src/resources/style.css
+++ b/src/resources/style.css
@@ -1,13 +1,14 @@
-vte-terminal { padding: 6px 6px 6px 6px; }
+vte-terminal { padding: 4px 4px 4px 4px; }
 
 .custom-headerbar {
   background: @surface_bg_color;
-  box-shadow: none;
+  box-shadow: inset 0 2px 0 1px alpha(white, .5);
 }
 
 .disclosure-button button {
   border-radius: 999px;
   background: none;
+  margin: 0;
 }
 .disclosure-button button:hover {
   background: alpha(@accent_color, 0.08);
@@ -25,7 +26,8 @@ vte-terminal { padding: 6px 6px 6px 6px; }
   padding: 0;
 }
 .disclosure-button:hover {
-  background: alpha(@accent_color, 0.08);
+  background: @accent_bg_color;
+  color: @accent_fg_color;
 }
 .disclosure-button:active {
   background: @accent_bg_color;
@@ -33,7 +35,16 @@ vte-terminal { padding: 6px 6px 6px 6px; }
 }
 .disclosure-button .toggle,
 .disclosure-button.image-button {
-  padding: 6px;
+  padding: 4px;
+}
+.disclosure-button .toggle {
+  box-shadow: none;
+}
+.disclosure-button:hover .toggle {
+  background: none;
+}
+.disclosure-button:active .toggle {
+  background: none;
 }
 
 .accelerator-main-window.with-borders:not(.fullscreen):not(.maximized):not(.tiled-left):not(.tiled-right) {
@@ -50,20 +61,15 @@ vte-terminal { padding: 6px 6px 6px 6px; }
 
 .custom-headerbar:backdrop windowhandle { filter: none; }
 
-.custom-headerbar:backdrop > * { filter: opacity(0.5); }
+.custom-headerbar:backdrop * { filter: opacity(0.95); }
 
 tab {
   border-radius: 0;
   border: none;
-  margin-top: 0;
-  margin-bottom: -2px;
+  margin-top: 2px;
+  margin-bottom: -4px;
   min-width: 200px;
-  min-height: 45px;
-}
-
-tab label {
-  margin-left: 16px;
-  margin-right: 16px;
+  min-height: 32px;
 }
 
 .transparent {
@@ -71,8 +77,8 @@ tab label {
 }
 
 .tab-child  {
-  margin: 4px 0 0;
-  border-radius: 12px 12px 0 0;
+  margin: 0;
+  border-radius: 4px 4px 0 0;
 }
 
 .tab-child.active {
@@ -80,8 +86,13 @@ tab label {
 }
 
 .tab-child label {
-  padding: 0;
-  margin: 0;
+  padding: 0 6px;
+  margin: -4px 0;
+}
+
+.tab-child button {
+  margin: -4px 6px 0 0;
+  border-radius: 999px;
 }
 
 .accelerator-main-window.with-borders tab:selected,
diff --git a/src/widgets/HeaderBar.vala b/src/widgets/HeaderBar.vala
index d9642dd..67543f3 100644
--- a/src/widgets/HeaderBar.vala
+++ b/src/widgets/HeaderBar.vala
@@ -56,6 +56,7 @@ public abstract class Terminal.BaseHeaderBar : Gtk.Box {
       halign = Gtk.Align.END,
     };
     menu_button.add_css_class ("disclosure-button");
+    menu_button.get_popover ().has_arrow = false;
 
     Settings.get_default ().schema.bind (
                                          "show-menu-button",
@@ -85,8 +86,7 @@ public class Terminal.HeaderBar : BaseHeaderBar {
   public HeaderBar (Window window) {
     base (window);
 
-    var hb = new Gtk.HeaderBar ();
-    hb.show_title_buttons = false;
+    var hb = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
     hb.halign = Gtk.Align.FILL;
     hb.hexpand = true;
 
@@ -102,7 +102,9 @@ public class Terminal.HeaderBar : BaseHeaderBar {
     this.unfullscreen_button.add_css_class ("disclosure-button");
 
     this.left_controls = new Gtk.WindowControls (Gtk.PackType.START);
+    left_controls.valign = Gtk.Align.START;
     this.right_controls = new Gtk.WindowControls (Gtk.PackType.END);
+    right_controls.valign = Gtk.Align.START;
 
     this.left_controls.bind_property ("empty", this.left_controls, "visible", GLib.BindingFlags.SYNC_CREATE | GLib.BindingFlags.INVERT_BOOLEAN, null, null);
     this.right_controls.bind_property ("empty", this.right_controls, "visible", GLib.BindingFlags.SYNC_CREATE | GLib.BindingFlags.INVERT_BOOLEAN, null, null);
@@ -122,9 +124,13 @@ public class Terminal.HeaderBar : BaseHeaderBar {
     layout.append (button_box);
     layout.append (this.right_controls);
 
-    hb.set_title_widget (layout);
-    this.append (hb);
-    hb.add_css_class ("flat");
+    hb.append (layout);
+
+    var wc = new Gtk.WindowHandle ();
+    wc.hexpand = true;
+    wc.set_child (hb);
+
+    this.append (wc);
     this.add_css_class ("custom-headerbar");
 
     this.connect_signals ();