diff -Nru baobab-3.24.0/debian/changelog baobab-3.24.0/debian/changelog
--- baobab-3.24.0/debian/changelog	2017-03-20 11:58:30.000000000 -0700
+++ baobab-3.24.0/debian/changelog	2017-05-08 09:31:16.000000000 -0700
@@ -1,3 +1,10 @@
+baobab (3.24.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/patches/use_traditional_titlebars_in_unity.patch:
+    - use headerbar in toolbar-mode in Unity (LP: #1689239)
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Mon, 08 May 2017 09:31:16 -0700
+
 baobab (3.24.0-0ubuntu1) zesty; urgency=medium
 
   * New upstream translations release
diff -Nru baobab-3.24.0/debian/patches/use_traditional_titlebars_in_unity.patch baobab-3.24.0/debian/patches/use_traditional_titlebars_in_unity.patch
--- baobab-3.24.0/debian/patches/use_traditional_titlebars_in_unity.patch	2017-03-20 11:58:30.000000000 -0700
+++ baobab-3.24.0/debian/patches/use_traditional_titlebars_in_unity.patch	2017-05-08 09:28:56.000000000 -0700
@@ -2,10 +2,10 @@
 Author: Jackson Doak <noskcaj@ubuntu.com>
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=745346
 
-Index: baobab-3.21.90/src/baobab-main-window.ui
+Index: baobab-3.24.0/src/baobab-main-window.ui
 ===================================================================
---- baobab-3.21.90.orig/src/baobab-main-window.ui
-+++ baobab-3.21.90/src/baobab-main-window.ui
+--- baobab-3.24.0.orig/src/baobab-main-window.ui
++++ baobab-3.24.0/src/baobab-main-window.ui
 @@ -40,363 +40,370 @@
        </object>
      </child>
@@ -721,10 +721,10 @@
 +  </child>
    </template>
  </interface>
-Index: baobab-3.21.90/src/baobab-window.vala
+Index: baobab-3.24.0/src/baobab-window.vala
 ===================================================================
---- baobab-3.21.90.orig/src/baobab-window.vala
-+++ baobab-3.21.90/src/baobab-window.vala
+--- baobab-3.24.0.orig/src/baobab-window.vala
++++ baobab-3.24.0/src/baobab-window.vala
 @@ -26,6 +26,8 @@ namespace Baobab {
      public class Window : Gtk.ApplicationWindow {
          private Settings ui_settings;
@@ -734,7 +734,7 @@
          private Gtk.HeaderBar header_bar;
          [GtkChild]
          private Gtk.Button back_button;
-@@ -166,6 +168,19 @@ namespace Baobab {
+@@ -166,6 +168,20 @@ namespace Baobab {
              active_location = null;
              scan_completed_handler = 0;
  
@@ -748,6 +748,7 @@
 +            {
 +                header_bar.show_close_button = false;
 +                header_bar.get_style_context().remove_class("titlebar");
++                header_bar.get_style_context().add_class("primary-toolbar");
 +                vbox.pack_start(header_bar,  false, false, 0);
 +            }
 +