diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index a8d7a061a81..2c8b2dd72d4 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1467,11 +1467,11 @@
 </t>
 <t t-name="AbstractFormPopup.buttons">
     <t t-if="! multi_select">
-        <button type="button" class="oe_button oe_abstractformpopup-form-save">Save</button>
+        <button type="button" class="oe_button oe_abstractformpopup-form-save oe_highlight">Save</button>
     </t>
     <t t-if="multi_select">
-        <button type="button" class="oe_button oe_abstractformpopup-form-save-new">Save &amp; New</button>
-        <button type="button" class="oe_button oe_abstractformpopup-form-save">Save &amp; Close</button>
+        <button type="button" class="oe_button oe_abstractformpopup-form-save-new oe_highlight">Save &amp; New</button>
+        <button type="button" class="oe_button oe_abstractformpopup-form-save oe_highlight">Save &amp; Close</button>
     </t>
     <button type="button" class="oe_button oe_abstractformpopup-form-close">Cancel</button>
 </t>
diff --git a/addons/web_kanban/static/src/css/Makefile b/addons/web_kanban/static/src/css/Makefile
new file mode 100644
index 00000000000..cae8f74448f
--- /dev/null
+++ b/addons/web_kanban/static/src/css/Makefile
@@ -0,0 +1,3 @@
+kanban.css: kanban.sass
+	sass -t expanded kanban.sass kanban.css
+
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index f16bd58bc5e..60967f50afd 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -1,3 +1,4 @@
+@charset "utf-8";
 .openerp .oe_kanban_view {
   height: inherit;
 }
@@ -64,9 +65,6 @@
 .openerp .oe_kanban_view .oe_kanban_column.oe_kanban_grouped, .openerp .oe_kanban_view .oe_kanban_group_header {
   background: #f0eeee;
 }
-.openerp .oe_kanban_view .oe_kanban_group_header.oe_kanban_no_group {
-  display: none;
-}
 .openerp .oe_kanban_view .oe_kanban_column.oe_kanban_grouped, .openerp .oe_kanban_view .oe_kanban_group_header {
   border-left: 1px solid #f0f8f8;
   border-right: 1px solid #b9b9b9;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 9ba57befe31..94daf4bd3cd 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -77,9 +77,6 @@
     .oe_kanban_column.oe_kanban_grouped, .oe_kanban_group_header
         background: #f0eeee
 
-    .oe_kanban_group_header.oe_kanban_no_group
-        display: none
-
     .oe_kanban_column.oe_kanban_grouped, .oe_kanban_group_header
         border-left: 1px solid #f0f8f8
         border-right: 1px solid #b9b9b9
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index bb162baa321..0021d522f43 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -198,15 +198,13 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
             var def = $.Deferred();
             self.do_clear_groups();
             self.dataset.read_slice(self.fields_keys.concat(['__last_update']), { 'limit': self.limit }).then(function(records) {
-                if (_.isEmpty(records)) {
-                    self.no_result();
-                    def.reject();
-                } else {
-                    var kgroup = new instance.web_kanban.KanbanGroup(self, records, null, self.dataset);
-                    self.do_add_groups([kgroup]).then(function() {
-                        def.resolve();
-                    });
-                }
+                var kgroup = new instance.web_kanban.KanbanGroup(self, records, null, self.dataset);
+                self.do_add_groups([kgroup]).then(function() {
+                    if (_.isEmpty(records)) {
+                        self.no_result();
+                    }
+                    def.resolve();
+                });
             }).then(null, function() {
                 def.reject();
             });