diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 985eba051d1..23f91aec952 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "utf-8";
+@charset "UTF-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -182,9 +182,6 @@
 .openerp .ui-menu .ui-menu-item a.ui-state-active {
   background: #f0f0fa;
 }
-.openerp .ui-tabs {
-  margin: 0 -16px;
-}
 .openerp .oe_i {
   font-family: "mnmliconsRegular" !important;
   font-size: 21px;
@@ -302,7 +299,7 @@
 }
 .openerp .oe_notebook {
   margin: 8px 0;
-  padding: 0 8px;
+  padding: 0 16px;
   list-style: none;
   zoom: 1;
 }
@@ -328,7 +325,6 @@
 }
 .openerp .oe_notebook > li {
   position: relative;
-  margin-bottom: -1px;
 }
 .openerp .oe_notebook > li > a {
   padding: 0 12px;
@@ -1667,6 +1663,16 @@
   max-width: 960px;
   margin: 0 auto;
 }
+.openerp .oe_form_title {
+  width: 55%;
+}
+.openerp .oe_form_title:after {
+  content: ".";
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
+}
 .openerp ul.oe_form_steps {
   height: 30px;
   padding: 0;
@@ -1746,6 +1752,9 @@
   -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
   box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
 }
+.openerp .oe_application .oe_form_sheet .ui-tabs {
+  margin: 0 -16px;
+}
 .openerp .oe_form td.oe_form_group_cell_label {
   border-right: 1px solid #dddddd;
   padding: 2px 0px 2px 0px;
@@ -1758,6 +1767,9 @@
 .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
   padding-left: 8px;
 }
+.openerp .oe_form .oe_form_group {
+  margin: 5px 0px 5px 0px;
+}
 .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
   font-weight: bold;
   white-space: nowrap;
@@ -1976,19 +1988,6 @@
   position: relative;
   overflow: hidden;
 }
-.openerp .oe_form .oe_form_title {
-  width: 55%;
-}
-.openerp .oe_form .oe_form_title:after {
-  content: ".";
-  display: block;
-  height: 0;
-  clear: both;
-  visibility: hidden;
-}
-.openerp .oe_form .oe_form_group {
-  margin: 5px 0px 5px 0px;
-}
 .openerp .oe_hidden_input_file {
   overflow: hidden;
   position: relative;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index eb442256f36..b63995b3e87 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -194,8 +194,6 @@ $colour4: #8a89ba
             width: auto
             a.ui-state-active
                 background: #f0f0fa
-    .ui-tabs
-        margin: 0 -16px
     // }}}
     // Generic classes {{{
     .oe_i
@@ -270,7 +268,7 @@ $colour4: #8a89ba
     // Notebook {{{
     .oe_notebook
         margin: 8px 0
-        padding: 0 8px
+        padding: 0 16px
         list-style: none
         zoom: 1
     .oe_notebook:before, .oe_notebook:after
@@ -290,7 +288,6 @@ $colour4: #8a89ba
         border-width: 0 0 1px
     .oe_notebook > li
         position: relative
-        margin-bottom: -1px
     .oe_notebook > li > a
         padding: 0 12px
         margin-right: 2px
@@ -1325,6 +1322,14 @@ $colour4: #8a89ba
             min-width: 650px
             max-width: 960px
             margin: 0 auto
+    .oe_form_title
+        width: 55%
+    .oe_form_title:after
+        content: "."
+        display: block
+        height: 0
+        clear: both
+        visibility: hidden
     ul.oe_form_steps
         height: 30px
         padding: 0
@@ -1387,6 +1392,8 @@ $colour4: #8a89ba
             padding: 16px
             border: 1px solid #afafb6
             @include box-shadow(0 0 10px rgba(0,0,0,0.3))
+            .ui-tabs
+                margin: 0 -16px
     // }}}
     // FormView.group {{{
     .oe_form
@@ -1399,7 +1406,8 @@ $colour4: #8a89ba
                 min-width: 120px
         td.oe_form_group_cell + .oe_form_group_cell
             padding-left: 8px
-
+        .oe_form_group
+            margin: 5px 0px 5px 0px
     // }}}
     // FormView.label {{{
     .oe_form
@@ -1570,16 +1578,6 @@ $colour4: #8a89ba
             > div
                 position: relative
                 overflow: hidden
-        .oe_form_title
-            width: 55%
-        .oe_form_title:after
-            content: "."
-            display: block
-            height: 0
-            clear: both
-            visibility: hidden
-        .oe_form_group
-            margin: 5px 0px 5px 0px
     // }}}
     // FormView.fields_binary {{{
     /* http://www.quirksmode.org/dom/inputfile.html
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index a3a5481dcff..0100e45d6fc 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -1,4 +1,3 @@
-@charset "utf-8";
 .openerp .oe_kanban_view {
   height: inherit;
 }
@@ -16,6 +15,9 @@
 .openerp .oe_kanban_view .oe_kanban_clear {
   clear: both;
 }
+.openerp .oe_kanban_view .oe_kanban_content div:first-child {
+  margin-right: 12px;
+}
 .openerp .oe_kanban_view .oe_kanban_groups {
   height: inherit;
   width: 100%;
@@ -385,8 +387,8 @@
 }
 .openerp .oe_kanban_view a.oe_kanban_menuaction {
   position: absolute;
-  top: 0px;
-  right: 3px;
+  top: 3px;
+  right: 6px;
   display: none;
   color: #4c4c4c;
   cursor: pointer;
@@ -399,7 +401,7 @@
   position: absolute;
   top: 30px;
   right: -140px;
-  padding: 8px;
+  padding: 4px;
   border: 1px solid #afafb6;
   min-width: 160px;
   overflow-x: hidden;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index b3fa9059768..d91dc357397 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -32,6 +32,9 @@
         float: right
     .oe_kanban_clear
         clear: both
+    .oe_kanban_content
+        div:first-child
+            margin-right: 12px
     // }}}
     // KanbanGroups {{{
     .oe_kanban_groups
@@ -318,8 +321,8 @@
     // KanbanDropDown {{{
     a.oe_kanban_menuaction
         position: absolute
-        top: 0px
-        right: 3px
+        top: 3px
+        right: 6px
         display: none
         color: #4c4c4c
         cursor: pointer