diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 36d26d10741..1a7e30b5a84 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -386,8 +386,11 @@
   visibility: hidden;
 }
 .openerp .oe_button_box {
-  width: 200px;
-  text-align: center;
+  width: 38%;
+  text-align: right;
+}
+.openerp .oe_button_box button {
+  margin: 4px;
 }
 .openerp .oe_avatar {
   margin: 0 16px 0 0;
@@ -536,7 +539,7 @@
   cursor: pointer;
 }
 .openerp .oe_dropdown_toggle {
-  color: #888888;
+  color: #404040;
   font-weight: normal;
 }
 .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened {
@@ -545,7 +548,8 @@
 .openerp .oe_dropdown_menu {
   display: none;
   position: absolute;
-  top: 32px;
+  top: 26px;
+  left: 0;
   z-index: 1;
   border: 1px solid #afafb6;
   background: white;
@@ -1857,7 +1861,7 @@
 .openerp .oe_form td.oe_form_group_cell_label label {
   line-height: 18px;
   display: block;
-  min-width: 120px;
+  min-width: 110px;
 }
 .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
   padding-left: 6px;
@@ -1929,9 +1933,10 @@
 }
 .openerp .oe_form .oe_form_field_char input,
 .openerp .oe_form .oe_form_field_url input,
+.openerp .oe_form .oe_form_field_email input,
 .openerp .oe_form .oe_form_field_text textarea,
 .openerp .oe_form .oe_form_field_selection select {
-  width: inherit;
+  width: 100%;
 }
 .openerp .oe_form .oe_form_field_text.oe_inline, .openerp .oe_form .oe_form_field_text.oe_inline > textarea {
   width: 500px;
@@ -2001,15 +2006,6 @@
   -webkit-border-radius: 0px;
   border-radius: 0px;
 }
-.openerp .oe_form .oe_form_field_many2one input, .openerp .oe_form .oe_form_field_binary input, .openerp .oe_form .oe_form_field_binary input, .openerp .oe_form .oe_form_field_url input {
-  border-right: none;
-  -webkit-border-top-right-radius: 0px;
-  -webkit-border-bottom-right-radius: 0px;
-  -moz-border-radius-topright: 0px;
-  -moz-border-radius-bottomright: 0px;
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
 .openerp .oe_form .oe_form_field_url button img {
   vertical-align: top;
 }
@@ -2073,10 +2069,19 @@
   right: 5px;
   top: 3px;
 }
-.openerp .oe_form .oe_form_field_with_button input {
-  width: 100%;
+.openerp .oe_form .oe_form_field_with_button.oe_no_button > .oe_button {
+  display: none;
 }
-.openerp .oe_form .oe_form_field_with_button > .oe_button {
+.openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) input {
+  border-right: none;
+  -webkit-border-top-right-radius: 0px;
+  -webkit-border-bottom-right-radius: 0px;
+  -moz-border-radius-topright: 0px;
+  -moz-border-radius-bottomright: 0px;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+.openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) > .oe_button {
   float: right;
   -moz-border-radius: 0;
   -webkit-border-radius: 0;
@@ -2084,6 +2089,9 @@
   border-bottom-left-radius: 0px;
   height: 22px;
 }
+.openerp .oe_form .oe_form_field_with_button input {
+  width: 100%;
+}
 .openerp .oe_form .oe_form_field_with_button > div {
   position: relative;
   overflow: hidden;
@@ -2138,8 +2146,8 @@
 }
 .openerp .oe_form_field_many2one span.oe_m2o_drop_down_button {
   position: absolute;
-  top: 3px;
-  right: 2px;
+  top: 1px;
+  right: 0px;
 }
 .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
   display: none;
@@ -2353,3 +2361,9 @@
 .kitten-mode-activated > * {
   opacity: 0.7;
 }
+
+div.ui-widget-overlay {
+  background: black;
+  filter: alpha(opacity=30);
+  opacity: 0.3;
+}
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 2ba3b79c411..559125aa3c3 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -330,8 +330,10 @@ $sheet-max-width: 860px
         clear: both
         visibility: hidden
     .oe_button_box
-        width: 200px
-        text-align: center
+        width: 38%
+        text-align: right
+        button
+            margin: 4px
     .oe_avatar
         margin: 0 16px 0 0
         img
@@ -432,14 +434,15 @@ $sheet-max-width: 860px
         position: relative
         cursor: pointer
     .oe_dropdown_toggle
-        color: #888
+        color: #404040
         font-weight: normal
     .oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened
         display: block
     .oe_dropdown_menu
         display: none
         position: absolute
-        top: 32px
+        top: 26px
+        left: 0
         z-index: 1
         border: 1px solid #afafb6
         background: white
@@ -1449,7 +1452,7 @@ $sheet-max-width: 860px
             label
                 line-height: 18px
                 display: block
-                min-width: 120px
+                min-width: 110px
         td.oe_form_group_cell + .oe_form_group_cell
             padding-left: 6px
         .oe_form_group
@@ -1512,9 +1515,10 @@ $sheet-max-width: 860px
             width: 100%
         .oe_form_field_char input,
         .oe_form_field_url input,
+        .oe_form_field_email input,
         .oe_form_field_text textarea,
         .oe_form_field_selection select
-            width: inherit
+            width: 100%
         .oe_form_field_text.oe_inline, .oe_form_field_text.oe_inline > textarea
             width: 500px
         .oe_form_field_float input
@@ -1560,14 +1564,6 @@ $sheet-max-width: 860px
             padding-left: 8px
             @include box-shadow(none)
             @include radius(0px)
-        .oe_form_field_many2one input, .oe_form_field_binary input, .oe_form_field_binary input, .oe_form_field_url input
-            border-right: none
-            -webkit-border-top-right-radius: 0px
-            -webkit-border-bottom-right-radius: 0px
-            -moz-border-radius-topright: 0px
-            -moz-border-radius-bottomright: 0px
-            border-top-right-radius: 0px
-            border-bottom-right-radius: 0px
         .oe_form_field_url button img
             vertical-align: top
         .oe_form_field_date,
@@ -1618,14 +1614,25 @@ $sheet-max-width: 860px
             filter: alpha(opacity=50)
             right: 5px
             top: 3px
-        .oe_form_field_with_button
+        .oe_form_field_with_button.oe_no_button > .oe_button
+            display: none
+        .oe_form_field_with_button:not(.oe_no_button)
             input
-                width: 100%
+                border-right: none
+                -webkit-border-top-right-radius: 0px
+                -webkit-border-bottom-right-radius: 0px
+                -moz-border-radius-topright: 0px
+                -moz-border-radius-bottomright: 0px
+                border-top-right-radius: 0px
+                border-bottom-right-radius: 0px
             > .oe_button
                 float: right
                 @include radius(0)
                 border-bottom-left-radius: 0px
                 height: 22px
+        .oe_form_field_with_button
+            input
+                width: 100%
             > div
                 position: relative
                 overflow: hidden
@@ -1680,8 +1687,8 @@ $sheet-max-width: 860px
             position: relative
         span.oe_m2o_drop_down_button
             position: absolute
-            top: 3px
-            right: 2px
+            top: 1px
+            right: 0px
     // }}}
     // FormView.one2many {{{
     .oe_form .oe_form_field_one2many > .oe_view_manager
@@ -1855,5 +1862,8 @@ $sheet-max-width: 860px
         opacity: 0.70
 // }}}
 
+div.ui-widget-overlay
+    background: black
+    @include opacity(0.3)
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 42ca90c4df4..0435313500f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -875,7 +875,7 @@
     </span>
 </t>
 <t t-name="FieldEmail">
-    <span class="oe_form_field oe_form_field_email oe_form_field_with_button" t-att-style="widget.node.attrs.style">
+    <span class="oe_form_field oe_form_field_email" t-att-style="widget.node.attrs.style">
         <a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri" target="_blank"/>
         <t t-if="!widget.get('effective_readonly')">
             <div>
@@ -893,11 +893,6 @@
     <t t-jquery="span:first">
         this.removeClass('oe_form_field_email').addClass('oe_form_field_url');
     </t>
-    <t t-jquery="button.oe_button" t-operation="replace">
-        <button class="oe_button" tabindex="-1" type="button" title="Open this resource">
-            <img t-att-src='_s + "/web/static/src/img/icons/gtk-ok.png"'/>
-        </button>
-    </t>
 </t>
 <t t-name="FieldText">
     <div class="oe_form_field oe_form_field_text" t-att-style="widget.node.attrs.style">
@@ -1472,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 5d0ac9ea8f3..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;
 }
@@ -29,7 +30,7 @@
   color: gold;
 }
 .openerp .oe_kanban_view .oe_kanban_content div:first-child {
-  margin-right: 12px;
+  margin-right: 16px;
 }
 .openerp .oe_kanban_view .oe_kanban_button_new {
   color: white;
@@ -49,6 +50,7 @@
 .openerp .oe_kanban_view .oe_kanban_group_title {
   font-size: 16px;
   font-weight: bold;
+  min-height: 30px;
   color: #333333;
   text-shadow: 0 1px 0 white;
 }
@@ -58,14 +60,11 @@
 }
 .openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_group_header {
   vertical-align: top;
-  padding: 6px 7px 0 6px;
+  padding: 6px 6px 6px 5px;
 }
 .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;
@@ -374,6 +373,35 @@
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
   -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
 }
+.openerp .oe_kanban_view .oe_kanban_footer_left {
+  margin-top: 2px;
+}
+.openerp .oe_kanban_view .oe_kanban_footer_left > span {
+  margin-top: 2px;
+  display: inline-block;
+  background: #e6e6e6;
+  border: 1px solid #b9b9b9;
+  color: #666666;
+  padding: 0 2px;
+  line-height: 16px;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+}
+.openerp .oe_kanban_view .oe_kanban_footer_left > span .oe_e {
+  line-height: 12px;
+  font-size: 22px;
+}
+.openerp .oe_kanban_view .oe_kanban_footer_left .oe_kanban_mail_new {
+  line-height: 18px;
+  position: relative;
+  top: -1px;
+}
+.openerp .oe_kanban_view .oe_kanban_bottom_right {
+  float: right;
+  position: relative;
+  top: 2px;
+}
 .openerp .oe_kanban_view .oe_kanban_status {
   display: inline-block;
   height: 12px;
@@ -426,6 +454,7 @@
 }
 .openerp .oe_kanban_view .oe_dropdown_kanban .oe_dropdown_menu {
   left: 0;
+  top: 28px;
   min-width: 160px;
 }
 .openerp .oe_kanban_view .oe_kanban_colorpicker {
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 872d694c4db..94daf4bd3cd 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -44,7 +44,7 @@
         .oe_star_on
             color: gold
         div:first-child
-            margin-right: 12px
+            margin-right: 16px
     .oe_kanban_button_new
         color: white
         background: #DC5F59
@@ -63,6 +63,7 @@
     .oe_kanban_group_title
         font-size: 16px
         font-weight: bold
+        min-height: 30px
         color: #333333
         text-shadow: 0 1px 0 white
         > span
@@ -71,14 +72,11 @@
 
     .oe_kanban_column, .oe_kanban_group_header
         vertical-align: top
-        padding: 6px 7px 0 6px
+        padding: 6px 6px 6px 5px
 
     .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
@@ -317,8 +315,29 @@
     .oe_kanban_avatar
         @include radius(3px)
         @include box-shadow(0 1px 2px rgba(0,0,0,0.2))
-    //.oe_kanban_footer_left
-    //   float: left
+    .oe_kanban_footer_left
+        margin-top: 2px
+        > span
+            margin-top: 2px
+            display: inline-block
+            background: #E6E6E6
+            border: 1px solid #B9B9B9
+            color: #666
+            padding: 0 2px
+            line-height: 16px
+            @include radius(3px)
+            .oe_e
+                line-height: 12px
+                font-size: 22px
+        .oe_kanban_mail_new
+            line-height: 18px
+            position: relative
+            top: -1px
+    .oe_kanban_bottom_right
+        float: right
+        position: relative
+        top: 2px
+       
     .oe_kanban_status
         display: inline-block
         height: 12px
@@ -352,6 +371,7 @@
             text-decoration: none
         .oe_dropdown_menu
             left: 0
+            top: 28px
             min-width: 160px
     // }}}
     // KanbanColorPicker {{{
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();
             });