diff -Nru gnome-contacts-3.22.1/debian/changelog gnome-contacts-3.22.1/debian/changelog
--- gnome-contacts-3.22.1/debian/changelog	2016-09-26 21:47:57.000000000 -0700
+++ gnome-contacts-3.22.1/debian/changelog	2017-05-07 23:54:20.000000000 -0700
@@ -1,3 +1,10 @@
+gnome-contacts (3.22.1-0ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/patches/use_traditional_titlebars.patch:
+    - Add 'primary-toolbar' class to old-headerbars
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Sun, 07 May 2017 23:54:20 -0700
+
 gnome-contacts (3.22.1-0ubuntu1) yakkety; urgency=medium
 
   * New upstream stable release
diff -Nru gnome-contacts-3.22.1/debian/patches/use_traditional_titlebars.patch gnome-contacts-3.22.1/debian/patches/use_traditional_titlebars.patch
--- gnome-contacts-3.22.1/debian/patches/use_traditional_titlebars.patch	2016-09-26 21:47:57.000000000 -0700
+++ gnome-contacts-3.22.1/debian/patches/use_traditional_titlebars.patch	2017-05-07 23:54:20.000000000 -0700
@@ -263,11 +263,11 @@
      </child>
    </template>
    <object class="GtkSizeGroup">
-diff --git a/src/contacts-window.vala b/src/contacts-window.vala
-index c49d6a7..940f0c6 100644
---- a/src/contacts-window.vala
-+++ b/src/contacts-window.vala
-@@ -29,6 +29,8 @@ public class Contacts.Window : Gtk.ApplicationWindow {
+Index: gnome-contacts-3.22.1/src/contacts-window.vala
+===================================================================
+--- gnome-contacts-3.22.1.orig/src/contacts-window.vala
++++ gnome-contacts-3.22.1/src/contacts-window.vala
+@@ -29,6 +29,8 @@ public class Contacts.Window : Gtk.Appli
    [GtkChild]
    private SizeGroup left_pane_size_group;
    [GtkChild]
@@ -276,7 +276,7 @@
    private HeaderBar left_toolbar;
    [GtkChild]
    private HeaderBar right_toolbar;
-@@ -141,7 +143,7 @@ public class Contacts.Window : Gtk.ApplicationWindow {
+@@ -141,7 +143,7 @@ public class Contacts.Window : Gtk.Appli
  
      if ((app as App).settings.get_boolean ("did-initial-setup")) {
        view_switcher.visible_child_name = "content-view";
@@ -285,7 +285,7 @@
      } else {
        var change_book_action = app.lookup_action ("change_book") as GLib.SimpleAction;
        if (change_book_action != null) {
-@@ -158,13 +160,13 @@ public class Contacts.Window : Gtk.ApplicationWindow {
+@@ -158,13 +160,13 @@ public class Contacts.Window : Gtk.Appli
  	});
  
        view_switcher.visible_child_name = "setup-view";
@@ -301,7 +301,7 @@
  
  	  var e_store = setup_accounts_list.selected_store as Edsf.PersonaStore;
  	  eds_source_registry.set_default_address_book (e_store.source);
-@@ -182,6 +184,31 @@ public class Contacts.Window : Gtk.ApplicationWindow {
+@@ -182,6 +184,34 @@ public class Contacts.Window : Gtk.Appli
      init_content_widgets ();
    }
  
@@ -318,13 +318,16 @@
 +      if (view_switcher.visible_child_name == "setup-view")
 +      {
 +        setup_header_bar.get_style_context().remove_class("titlebar");
++        setup_header_bar.get_style_context().add_class("primary-toolbar");
 +      }
 +      else
 +      {
 +        left_toolbar.show_close_button = false;
 +        right_toolbar.show_close_button = false;
 +        left_toolbar.get_style_context().remove_class("titlebar");
++        left_toolbar.get_style_context().add_class("primary-toolbar");
 +        right_toolbar.get_style_context().remove_class("titlebar");
++        right_toolbar.get_style_context().add_class("primary-toolbar");
 +        setup_header_bar.destroy();
 +      }
 +      vbox.pack_start(header_bar,  false, false, 0);
@@ -333,6 +336,3 @@
    public void set_list_pane () {
      /* FIXME: if no contact is loaded per backend, I must place a sign
       * saying "import your contacts/add online account" */
--- 
-2.1.4
-