[REF] web, *: restore views design

Since the new views merge, a lot of design elements were broken. This
was particularly impacting the fields in the editable list view; indeed
the editable list view is not using an inline form view anymore so the
fields in the list were not properly styled as the LESS was still
defined assuming the form view environment (for example the invalid
fields were red for o2m fields in form view but not in editable list
view even though they got the right CSS class).

This commit refactor the LESS following these rules:
- No more division of non-layout and layout rules. Dividing LESS rules
  in x_layout.less and x.less was a mistake. Many rules can be
  considered to be layout and not layout at the same time, developers
  always have to switch from one file part to the other, many CSS
  selectors (and rules!) are duplicated for nothing, ...
- Field style is extracted from x_view.less and put in the new
  fields.less file. As before, the fields_extra.less will contain the
  rules specific to community so that the enterprise repo can override
  those by replacing the whole file.
- Many classes have been renamed so that o_form_x_y becomes o_x_y as
  many classes can now be applied outside of form view. These classes
  should not be used in templates anyway.

The commit also changes the DOM of fields so that it is more minimalist
(no useless parent div, etc).

Input elements are not automatically styled anymore, they have to get
the o_input class explicitely. This allows to fix lots of small style
bugs of previous versions (required monetary field had not the proper
style, readonly m2m tags appeared as editable, ...). This also improves
the LESS code.

The editable list view should also completely stop flickering on chrome
and firefox.

The commit also removes the orange outline on list view dirty cells.

The commit also removes deprecated static xml, LESS and other code.

Notice there are still styles to restore/fix and LESS to improve.

22 files changed, 1045 insertions, 1292 deletions

diff --git a/addons/web/static/src/less/animation.less b/addons/web/static/src/less/animation.less
index 4aeabc4acc4..c9fe2ae7af4 100644
--- a/addons/web/static/src/less/animation.less
+++ b/addons/web/static/src/less/animation.less
@@ -1,4 +1,4 @@
-/************** DEFINITION of ANIMATIONS *************/
+/************** DEFINITION of ANIMATIONS **************/
 // 'marked' effects
 @keyframes markAnim {
     0% {
@@ -145,51 +145,32 @@
   }
 }
 
-/************** MIXINS for ANIMATIONS *************/
+/************** MIXINS for ANIMATIONS **************/
 .o-display-marked(@content, @top, @left, @color) {
-    position: absolute;
-    top: @top;
-    left: @left;
+    .o-position-absolute(@top: @top, @left: @left);
     font-size: 300px;
     font-family: "FontAwesome";
     content: @content;
     color: @color;
-    animation: markAnim ease-in-out 1s;
-    animation-iteration-count: 1;
-    transform-origin: 50% 50%;
-    animation-fill-mode:forwards; /*when the spec is finished*/
-    -webkit-animation: markAnim ease-in-out 1s;
-    -webkit-animation-iteration-count: 1;
-    -webkit-transform-origin: 50% 50%;
-    -webkit-animation-fill-mode:forwards; /*Chrome 16+, Safari 4+*/
-    -moz-animation: markAnim ease-in-out 1s;
-    -moz-animation-iteration-count: 1;
-    -moz-transform-origin: 50% 50%;
-    -moz-animation-fill-mode:forwards; /*FF 5+*/
-    -o-animation: markAnim ease-in-out 1s;
-    -o-animation-iteration-count: 1;
-    -o-transform-origin: 50% 50%;
-    -o-animation-fill-mode:forwards; /*Not implemented yet*/
-    -ms-animation: markAnim ease-in-out 1s;
-    -ms-animation-iteration-count: 1;
-    -ms-transform-origin: 50% 50%;
-    -ms-animation-fill-mode:forwards; /*IE 10+*/
+    .o-transform-origin();
+    .o-animation(markAnim, 1s, ease-in-out, 0s, 1, normal, forwards);
 
-    @media (max-width: 992px) {
+    @media (max-width: @screen-sm-max) {
         left: 40%;
         font-size: 30vw;
     }
 }
 
-
-/************** USAGE of ANIMATIONS *************/
+/************** USAGE of ANIMATIONS **************/
 // Animation on wow button
+// TODO the only difference here is the "content" property, just make an
+// 'o_wow' class for the other properties to avoid generating useless CSS
 .o_wow_thumbs:after {
-    .o-display-marked("\f164", 20%, 40%, #21b799);
+    .o-display-marked("\f164", 20%, 40%, @odoo-brand-optional);
 }
 .o_wow_peace:after {
-    .o-display-marked("\f118", 20%, 40%, #21b799);
+    .o-display-marked("\f118", 20%, 40%, @odoo-brand-optional);
 }
 .o_wow_heart:after {
-    .o-display-marked("\f004", 20%, 40%, #21b799);
+    .o-display-marked("\f004", 20%, 40%, @odoo-brand-optional);
 }
diff --git a/addons/web/static/src/less/control_panel.less b/addons/web/static/src/less/control_panel.less
index e2635af43d4..83048112815 100644
--- a/addons/web/static/src/less/control_panel.less
+++ b/addons/web/static/src/less/control_panel.less
@@ -1,63 +1,109 @@
+@breadcrumb-height: 30px;
+
 .o_control_panel {
+    .o-flex-display();
+    .o-flex-flow(row, wrap);
+    border-bottom: 1px solid @odoo-main-color-muted;
     .o-webclient-padding(@top: 10px, @bottom: 10px);
     background-color: @odoo-control-panel-background-color;
-    border-bottom: 1px solid @odoo-main-color-muted;
-    .breadcrumb {
-        font-size: 18px;
+
+    > .breadcrumb {
+        width: 50%;
         margin: 0px;
-        > li > a {
-            color: @odoo-brand-optional;
-            cursor: pointer;
-            &:hover {
-                color: darken(@odoo-brand-optional, 10%);
-                text-decoration: none;
+        font-size: 18px;
+
+        > li {
+            .o-text-overflow(@max-width: 90%);
+
+            > a {
+                color: @odoo-brand-optional;
+                cursor: pointer;
+
+                &:hover {
+                    color: darken(@odoo-brand-optional, 10%);
+                    text-decoration: none;
+                }
             }
         }
     }
 
-    // Sidebar
-    .o_cp_sidebar {
-        padding-right: 10px;
+    &.o_breadcrumb_full > .breadcrumb {
+        width: 100%;
+    }
 
-        .o_hidden_input_file {
-            position: relative;
-            input.o_form_input_file {
-                position: absolute;
-                top: 1px;
-                opacity: 0;
-                width: 100%;
-                height: 26px;
-            }
-            .o_form_binary_form span {
-                padding: 3px 25px;
-                color: @btn-default-color;
+    > .o_cp_searchview {
+        width: 50%;
+        min-height: @breadcrumb-height;
+    }
+
+    .btn.o_enable_searchview {
+        width: 10%;
+        margin-left: 2%;
+        padding: 0px;
+    }
+
+    > .o_cp_left {
+        .o-flex-display();
+        .o-justify-content(space-between);
+        width: 50%;
+        margin-top: 5px;
+
+        > .o_cp_sidebar {
+            padding-right: 10px;
+
+            .o_hidden_input_file {
+                position: relative;
+                input.o_input_file {
+                    position: absolute;
+                    top: 1px;
+                    opacity: 0;
+                    width: 100%;
+                    height: 26px;
+                }
+                .o_form_binary_form span {
+                    padding: 3px 25px;
+                    color: @btn-default-color;
+                }
+                .o_form_binary_form:hover {
+                    background-color: @table-bg-hover;
+                }
             }
-            .o_form_binary_form:hover {
-                background-color: @table-bg-hover;
+            .o_sidebar_delete_attachment {
+                padding: 0px;
+                position: absolute;
+                top: 5px;
+                right: 10px;
             }
         }
-        .o_sidebar_delete_attachment {
-            padding: 0px;
-            position: absolute;
-            top: 5px;
-            right: 10px;
-        }
     }
 
-    // Pager
-    .o_cp_pager {
-        text-align: center;
-        padding-left: 5px;
-        .user-select(none);
-    }
+    > .o_cp_right {
+        .o-flex-display();
+        width: 50%;
+        margin-top: 5px;
+
+        > .o_cp_pager {
+            margin: auto 0 auto auto;
+            padding-left: 5px;
+            text-align: center;
+            .user-select(none);
+        }
 
-    // View Switcher
-    .o_cp_switch_buttons {
-        padding-left: 5px;
+        > .o_cp_switch_buttons {
+            padding-left: 5px;
+        }
     }
 }
 
 .o_x2m_control_panel {
+    .o-flex-display();
+    .o-flex-flow(row, wrap);
+
+    .o_cp_buttons, .o_cp_pager {
+        .o-flex-display();
+        margin-right: auto;
+    }
+
     .o_cp_buttons > div {
         margin-top: 5px;
     }
@@ -68,7 +114,14 @@
     display: inline-block;
     width: 60px;
     text-align: right;
+
     &:focus {
         outline: none;
     }
 }
+
+@media print {
+    .o_control_panel {
+        display: none;
+    }
+}
diff --git a/addons/web/static/src/less/control_panel_layout.less b/addons/web/static/src/less/control_panel_layout.less
deleted file mode 100644
index 92f8397bca4..00000000000
--- a/addons/web/static/src/less/control_panel_layout.less
+++ /dev/null
@@ -1,70 +0,0 @@
-@breadcrumb-height: 30px;
-
-.o_control_panel {
-    .o-flex-display();
-    .o-flex-flow(row, wrap);
-
-    .breadcrumb {
-        width: 50%;
-
-        > li {
-            .o_text_overflow;
-            max-width: 90%;
-            display: inline-block;
-        }
-    }
-
-    &.o_breadcrumb_full {
-        .breadcrumb {
-            width: 100%;
-        }
-    }
-
-    .o_cp_searchview {
-        width: 50%;
-        min-height: @breadcrumb-height;
-    }
-
-    .btn.o_enable_searchview {
-        width: 10%;
-        margin-left: 2%;
-        padding: 0px;
-    }
-
-    .o_cp_left {
-        width: 50%;
-        margin-top: 5px;
-        .o-flex-display();
-        .o-justify-content(space-between);
-    }
-
-    .o_cp_right {
-        width: 50%;
-        margin-top: 5px;
-        .o-flex-display();
-
-        .o_cp_pager {
-            margin: auto 0 auto auto;
-        }
-    }
-}
-
-.o_x2m_control_panel {
-    .o-flex-display();
-    .o-flex-flow(row, wrap);
-
-    .o_cp_buttons {
-        .o-flex-display();
-        margin-right: auto;
-    }
-    .o_cp_pager {
-        .o-flex-display();
-        margin-left: auto;
-    }
-}
-
-@media print {
-    .o_control_panel {
-        display: none;
-    }
-}
diff --git a/addons/web/static/src/less/fields.less b/addons/web/static/src/less/fields.less
new file mode 100644
index 00000000000..329b4f62fbd
--- /dev/null
+++ b/addons/web/static/src/less/fields.less
@@ -0,0 +1,367 @@
+//
+// This file regroups all the rules which apply to field widgets wherever they
+// are in the DOM, in both community and enterprise versions.
+//
+
+// Invalid
+.o_field_invalid {
+    &.o_input, .o_input, &.o_form_label {
+        color: @brand-danger!important;
+        border-color: @brand-danger!important; // enterprise o_required_modifier rule overrides this without !important
+    }
+}
+
+// Empty
+.o_field_empty {
+    display: none!important;
+}
+
+// Numbers
+.o_field_number {
+    white-space: nowrap;
+}
+
+//------------------------------------------------------------------------------
+// Fields
+//------------------------------------------------------------------------------
+
+.o_field_widget {
+    display: inline-block;
+
+    // Block fields
+    &.note-editor, &.oe_form_field_html, &.oe_form_field_html_text, &.oe_form_field_text, &.o_view_manager_content, &.o_field_domain {
+        display: block;
+    }
+
+    // Flex fields (inline)
+    &.o_field_many2one, &.o_field_radio, &.o_field_many2manytags, &.o_field_percent_pie, &.o_field_monetary, &.o_field_binary_file {
+        @media (min-width: @screen-sm-min) {
+            .o-inline-flex-display();
+        }
+        > span, > button {
+            .o-flex(0, 0, auto);
+        }
+    }
+
+    // Dropdowns input (many2one, ...)
+    .o_input_dropdown {
+        .o-flex(1, 0, auto);
+        position: relative;
+        width: 100%;
+
+        > input {
+            height: 100%;
+            padding-right: 15px;
+            cursor: pointer;
+        }
+
+        .o_dropdown_button {
+            .o-position-absolute(0, 0);
+            pointer-events: none;
+            &:after {
+                .o-caret-down;
+            }
+        }
+    }
+
+    // Input in field
+    input[type="text"] {
+        display: inline-block;
+    }
+
+    // Text
+    &.o_field_text, &.oe_form_field_text .oe_form_text_content {
+        width: 100%;
+        white-space: pre-wrap;
+    }
+
+    // Monetary
+    &.o_field_monetary {
+        &.o_input {
+            .o-align-items(baseline);
+
+            > input {
+                width: 100px;
+                .o-flex(1, 0, auto);
+            }
+        }
+    }
+
+    // Many2many tags
+    &.o_field_many2manytags {
+        .o-flex-flow(row, wrap);
+        .o-align-items(baseline);
+
+        > .o_field_widget {
+            .o-flex(1, 0, 100px);
+            position: initial;
+            max-width: 100%;
+        }
+
+        > .badge {
+            .o-flex(0, 0, auto);
+            border: 0;
+            font-size: 12px;
+            color: white;
+            cursor: pointer;
+
+            &.o_tag_color_0 { background-color: #4D4D4D; }
+            &.o_tag_color_1 { background-color: #61BD4F; }
+            &.o_tag_color_2 { background-color: #F2D600; }
+            &.o_tag_color_3 { background-color: #FFAB4A; }
+            &.o_tag_color_4 { background-color: #EB5A46; }
+            &.o_tag_color_5 { background-color: #875A7B; }
+            &.o_tag_color_6 { background-color: #0079BF; }
+            &.o_tag_color_7 { background-color: #00C2E0; }
+            &.o_tag_color_8 { background-color: #4CD98E; }
+            &.o_tag_color_9 { background-color: #FF80CE; }
+            &.o_tag_color_10 { background-color: #B6BBBF; }
+
+            > .o_badge_text {
+                .o-text-overflow(inline-block);
+                max-width: 200px;
+            }
+
+            > ul {
+                @colored-tag-width: 45px;
+                width: 5*@colored-tag-width + 3px;
+                > li {
+                    float: left;
+                    color: black;
+                    > span {
+                        border-radius: 6px;
+                        width: @colored-tag-width;
+                        height: 30px;
+                        display: inline-block;
+                        border: 2px solid white;
+                        cursor: pointer;
+                        padding: 0;
+
+                        &:hover {
+                            opacity: 0.8;
+                        }
+                    }
+                }
+                > li:last-child {
+                    margin-top: 7px;
+                    cursor: auto;
+                }
+            }
+
+            .o_delete {
+                cursor: pointer;
+            }
+        }
+    }
+
+    // Stars
+    &.o_priority {
+        display: inline-block;
+        padding: 0;
+        margin: 0;
+        vertical-align: middle;
+        > .o_priority_star {
+            display: inline-block;
+            font-size: 1.35em;
+            &:hover, &:focus {
+                text-decoration: none;
+                outline: none;
+            }
+
+            + .o_priority_star {
+                padding-left: 5px;
+            }
+
+            &.fa-star-o {
+                color: @odoo-main-color-muted;
+            }
+            &.fa-star {
+                color: gold;
+            }
+        }
+    }
+
+    // Status
+    &.o_selection .o_status {
+        display: inline-block;
+        height: 12px;
+        width: 12px;
+        border-radius: 6px;
+        vertical-align: middle;
+
+        background-color: @odoo-brand-secondary;
+
+        &.o_status_green {
+            background-color: @brand-success;
+        }
+        &.o_status_red {
+            background-color: @brand-danger;
+        }
+    }
+
+    // Specific success color for toggle_button widget
+    .fa.o_toggle_button_success {
+        color: @brand-success;
+    }
+
+    // Many2One
+    &.o_field_many2one {
+        .o-inline-flex-display();
+        > span, > button {
+            .o-flex(0, 0, auto);
+        }
+    }
+
+    // Handle widget
+    &.o_row_handle {
+        cursor: ns-resize;
+    }
+
+    // Radio buttons
+    &.o_field_radio {
+        .o_radio_input {
+            outline: none;
+        }
+
+        .o_radio_item {
+            .o-flex(0, 0, auto);
+            .o-flex-display();
+            .o-align-items(center);
+
+            > input {
+                .o-flex(0, 0, auto);
+                margin: 0 @odoo-form-spacing-unit 0 0;
+            }
+            > label {
+                margin: 0;
+            }
+        }
+
+        &.o_horizontal {
+            .o_radio_item {
+                margin-right: @odoo-form-spacing-unit * 2;
+            }
+        }
+
+        &.o_vertical {
+            .o-flex-flow(column, nowrap);
+            .o_radio_item {
+                margin-bottom: @odoo-form-spacing-unit;
+            }
+        }
+    }
+
+    // Percent pie
+    &.o_field_percent_pie {
+        .o-align-items(center);
+
+        > .o_pie {
+            position: relative;
+            margin-right: 10px;
+            border-radius: 100%;
+            overflow: hidden;
+            background-color: @odoo-brand-optional;
+
+            &:after { // Outside pie border to go over border-radius irregularities
+                content: " ";
+                .o-position-absolute(0, 0);
+                width: 100%;
+                height: 100%;
+                border-radius: 100%;
+            }
+
+            .o_mask {
+                .o-position-absolute(0, 0);
+                .o-transform-origin(0);
+                width: 50%;
+                height: 100%;
+                background-color: @odoo-view-background-color;
+                &.o_full {
+                    background-color: inherit;
+                }
+            }
+
+            .o_pie_value {
+                .o-flex-display();
+                .o-justify-content(center);
+                .o-align-items(center);
+
+                border-radius: 100%;
+
+                font-weight: 700;
+                color: @odoo-brand-primary;
+            }
+        }
+    }
+
+    // Ace editor
+    &.o_ace_view_editor {
+        width: 100%;
+        .ace-view-editor {
+            height: 300px;
+            padding: 0 1em;
+        }
+    }
+
+    // Image
+    &.o_field_image {
+        position: relative;
+
+        .o_form_image_controls {
+            .o-position-absolute(0, 0);
+            width: 100%;
+
+            color: white;
+            background-color: @odoo-brand-optional;
+            opacity: 0;
+            transition: opacity ease 400ms;
+
+            > .fa {
+                margin: 5px;
+                cursor: pointer;
+            }
+        }
+        @media (max-width: @screen-xs-min) {
+            .o_form_image_controls{
+                position: initial;
+                opacity: 1;
+                > .fa{
+                    width: 50%;
+                    padding: 6px;
+                    margin: 0px;
+                    text-align: center;
+                    &.o_select_file_button{
+                        background: @odoo-brand-optional;
+                    }
+                    &.o_clear_file_button{
+                        background: @brand-danger;
+                    }
+                }
+            }
+        }
+
+        &:hover .o_form_image_controls {
+            opacity: 0.8;
+        }
+    }
+
+    // Input loading/file
+    .o_form_binary_progress, .o_hidden_input_file .o_input_file {
+        display: none;
+    }
+
+    // Domain
+    &.o_field_domain {
+        > .o_field_domain_panel {
+            margin-top: 8px;
+        }
+        &.o_inline_mode.o_edit_mode {
+            position: relative;
+
+            > .o_field_domain_panel {
+                .o-position-absolute(0, 0);
+                margin-top: 0;
+            }
+        }
+    }
+}
diff --git a/addons/web/static/src/less/fields_extra.less b/addons/web/static/src/less/fields_extra.less
new file mode 100644
index 00000000000..79d9628116d
--- /dev/null
+++ b/addons/web/static/src/less/fields_extra.less
@@ -0,0 +1,58 @@
+//
+// This file regroups all the rules which apply to field widgets wherever they
+// are in the DOM, in the community version.
+//
+
+// Required
+.o_required_modifier {
+    &.o_input, .o_input {
+        background-color: #D2D2FF;
+    }
+}
+
+//------------------------------------------------------------------------------
+// Fields
+//------------------------------------------------------------------------------
+
+.o_field_widget {
+    // Dropdowns input carret
+    .o_input_dropdown .o_dropdown_button {
+        .o-position-absolute(2px, 4px);
+    }
+
+    // Many2one
+    &.o_field_many2one .o_external_button {
+        padding: 0;
+        margin-left: 2px;
+        font-size: 19px;
+        color: #7C7BAD;
+        border: none;
+        &:hover {
+            background-color: transparent;
+        }
+    }
+
+    // Percent pie field
+    &.o_field_percent_pie {
+        @pie-dimension: 34px;
+        @pie-ring-width: 4px;
+
+        .o_pie {
+            width: @pie-dimension;
+            height: @pie-dimension;
+            margin-left: 5px;
+
+            &:after { // Outside pie border to go over border-radius irregularities
+                border: 1px solid @odoo-brand-primary;
+            }
+
+            .o_pie_value {
+                .o-position-absolute(@pie-ring-width, @pie-ring-width);
+                width: @pie-dimension - 2 * @pie-ring-width;
+                height: @pie-dimension - 2 * @pie-ring-width;
+                border: 1px solid white;
+                background-color: white;
+            }
+        }
+    }
+}
diff --git a/addons/web/static/src/less/form_view.less b/addons/web/static/src/less/form_view.less
index f8a221672d8..f7c5616342a 100644
--- a/addons/web/static/src/less/form_view.less
+++ b/addons/web/static/src/less/form_view.less
@@ -1,10 +1,7 @@
 .o_form_view {
     background-color: @odoo-view-background-color;
 
-    // Utility classes (+ oe_edit_only, oe_read_only, o_label_nowrap, o_text_overflow)
-    .o_form_invisible, .o_form_field_empty {
-        display: none!important;
-    }
+    // Utility classes
     .oe_form_box_info {
         .bg-info;
         .o-webclient-padding(@top: 5px, @bottom: 5px);
@@ -21,11 +18,72 @@
     .oe_grey {
         opacity: 0.5;
     }
+    .oe_inline {
+        width: auto!important;
+        @media (min-width: @screen-xs-min) {
+            &.o_inner_group {
+                width: 1px!important;
+            }
+        }
+    }
+    .oe_left {
+        .oe_inline;
+        float: left!important;
+    }
+    .oe_right {
+        .oe_inline;
+        float: right!important;
+    }
+
+    @media (min-width: @screen-xs-min) {
+        .o_row {
+            &, &.o_field_widget { // Some field may want to use o_row as root and these rules must prevalue
+                .o-flex-display();
+                width: auto!important;
+            }
+
+            .o-align-items(baseline);
+            min-width: 50px;
+            margin: 0 -@odoo-form-spacing-unit/2;
+
+            > div, > span, > button, > label, > a, > input { // > * did not add a level of priority to the rule
+                .o-flex(0, 0, auto);
+                width: auto!important;
+                margin-right: @odoo-form-spacing-unit/2;
+                margin-left: @odoo-form-spacing-unit/2;
+            }
+
+            > .o_row {
+                margin: 0;
+            }
+            > .btn {
+                padding-top: 0;
+                padding-bottom: 0;
+            }
+            > .o_field_boolean {
+                .o-align-self(center);
+            }
+        }
+
+        .o_row .o_field_many2one, .o_field_many2one.oe_inline {
+            &.o_with_button:not(:last-child) { // If invisible element as last child, this line has no effect but that's not very important
+                margin-right: (35px + (@odoo-form-spacing-unit/2));
+            }
+        }
+    }
+
+    .o_row > div > .o_field_widget {
+        width: 100%;
+    }
 
     // Readonly specific rules
     &.o_form_readonly {
         .oe_edit_only {
-            .o_form_invisible;
+            display: none!important;
+        }
+
+        .o_row, .o_row > div {
+            display: inline-block;
         }
 
         .o_form_uri { // FIXME maybe global?
@@ -47,42 +105,63 @@
     // Editable specific rules
     &.o_form_editable {
         .oe_read_only {
-            .o_form_invisible;
+            display: none!important;
         }
 
-        .o_form_field_many2manytags {
-            .o-input();
-
-            > .o_form_field {
-                .o-flex(1, 0, 100px);
-                position: initial;
-                max-width: 100%;
-
-                > .o_form_input_dropdown > .o_form_input {
-                    border-style: none!important;
-                }
-            }
+        .oe_title {
+            max-width: @container-sm - (2 * @odoo-horizontal-padding);
         }
 
-        .o_form_field_monetary {
-            .o-input();
-            .o-align-items(baseline);
+        @media (min-width: @screen-xs-min) {
+            .o_row {
+                > .o_field_widget, > div {
+                    .o-flex(1, 1, auto);
+                    width: 0!important; // 3rd flex argument does not work with input (must be auto and real width 0)
 
-            > .o_form_input {
-                border-style: none!important;
-                width: 100px;
-                .o-flex(1, 0, auto);
+                    &.o_field_boolean, &.o_priority {
+                        .o-flex(0, 0, auto);
+                        width: auto!important;
+                    }
+                }
             }
         }
     }
 
-    // Header containing status/workflow buttons
+    // Statusbar
     .o_form_statusbar {
-        background-color: @odoo-view-background-color;
+        .o-flex(0, 0, auto);
         position: relative; // Needed for the "More" dropdown
+        .o-flex-display();
+        .o-justify-content(space-between);
+        padding-left: @odoo-horizontal-padding;
         border-bottom: 1px solid @odoo-brand-secondary;
+        background-color: @odoo-view-background-color;
+
+        > .o_statusbar_buttons, > .o_statusbar_status {
+            .o-flex-display();
+            .o-align-items(center);
+            .o-align-content(space-around);
+        }
+
+        > .o_field_widget {
+            .o-align-self(center);
+            margin-bottom: 0px;
+        }
+
+        > .o_statusbar_buttons {
+            .o-flex-flow(row, wrap);
+
+            > .btn {
+                margin: 2px 3px 2px 0;
+            }
+        }
 
         > .o_statusbar_status {
+            .o-flex-flow(row-reverse, wrap-reverse);
+            .o-align-self(stretch);
+            .o-align-items(stretch);
+            overflow-x: hidden; // to prevent horizontal scroll due to last arrow
+
             > .o_arrow_button {
                 min-height: @odoo-statusbar-height;
                 font-size: 11px;
@@ -152,6 +231,7 @@
                     }
                 }
             }
+
             .o-status-more {
                 .o-position-absolute(100%, 0);
                 min-width: 100px;
@@ -161,6 +241,26 @@
                 }
             }
         }
+
+        // Touch device mode
+        > .o_statusbar_buttons > .btn-group {
+            > .dropdown-toggle {
+                &:after {
+                    .o-caret-down();
+                    margin-left: @odoo-form-spacing-unit;
+                }
+            }
+
+            > .dropdown-menu {
+                padding: 5px 0 2px 0;
+                min-width: 100px;
+
+                > li > .btn {
+                    min-width: 100%;
+                    margin-bottom: 3px;
+                }
+            }
+        }
     }
 
     // Button box
@@ -177,6 +277,12 @@
 
     // Title
     .oe_title {
+        > h1, > h2, > h3 {
+            width: 100%; // Needed because inline-block when is a hx.o_row
+            margin-top: 0;
+            margin-bottom: 0;
+            line-height: inherit;
+        }
         .o_priority > .o_priority_star {
             font-size: inherit;
         }
@@ -184,25 +290,62 @@
 
     // Groups
     .o_group {
-        &.o_label_nowrap {
-            .o_form_label {
-                white-space: nowrap;
+        display: inline-block;
+        width: 100%;
+        margin: 10px 0;
+
+        // o_group contains nested groups
+        .o-generate-groups(@odoo-form-group-cols);
+        .o-generate-groups(@n, @i: 1) when (@i =< @n) {
+            .o_group_col_@{i} {
+                display: inline-block;
+                width: floor(100% / 12 * @i);
+                vertical-align: top;
+            }
+            .o-generate-groups(@n, @i + 1);
+        }
+
+        &.o_inner_group {
+            display: inline-table;
+
+            > tbody > tr > td {
+                &.o_td_label {
+                    width: 0%;
+                    padding: 0 15px 0 0;
+                    min-width: 150px;
+                }
+                vertical-align: top;
+
+                span, .o_field_boolean, .oe_avatar, .o_form_uri {
+                    &.o_field_widget {
+                        width: auto;
+                    }
+                }
             }
         }
 
         .o_form_label {
             font-weight: normal;
         }
+
+        .o_field_widget {
+            width: 100%;
+
+            > .btn {
+                .o-flex(0, 0, auto);
+                padding: 0 10px;
+            }
+        }
+
+        &.o_label_nowrap .o_form_label {
+            white-space: nowrap;
+        }
+
         .o_td_label .o_form_label {
             font-weight: bold;
             margin-right: 0px;
         }
     }
-    &.oe_form_configuration {
-        .o_group .o_form_label {
-            white-space: nowrap;
-        }
-    }
 
     // Separators
     .o_horizontal_separator {
@@ -213,78 +356,33 @@
         }
     }
 
-    // Labels
-    .o_form_label {
-        font-size: @font-size-base; // The label muse have the same size whatever their position
-        line-height: @line-height-base;
-        margin-right: @odoo-form-spacing-unit;
-        &.o_form_invalid {
-            color: @brand-danger;
-        }
-    }
-
-    // ace editor RO
-    .oe_form_field_text .oe_form_text_content {
-        white-space: pre-wrap;
-    }
-
-    // Tags
-    .o_form_field_many2manytags {
-        .badge {
-            cursor: pointer;
-            color: white;
-            font-size: 12px;
-            border: 0;
-
-            > ul {
-                @colored-tag-width: 45px;
-                width: 5*@colored-tag-width + 3px;
-                > li {
-                    float: left;
-                    color: black;
-                    > span {
-                        border-radius: 6px;
-                        width: @colored-tag-width;
-                        height: 30px;
-                        display: inline-block;
-                        border: 2px solid white;
-                        cursor: pointer;
-                        padding: 0;
-
-                        &:hover {
-                            opacity: 0.8;
-                        }
-                    }
-                }
-                > li:last-child {
-                    margin-top: 7px;
-                    cursor: auto;
-                }
-            }
-        }
-    }
+    // Notebooks
+    .o_notebook {
+        clear: both; // For the notebook not to have alongside floating elements
+        margin-top: @odoo-form-spacing-unit * 2;
 
-    .o_form_invalid {
-        &.o_form_input, .o_form_input, &.o_form_textarea, .o_form_textarea {
-            border-color: @brand-danger!important; // enterprise o_form_required rule overrides this without !important
+        .nav-tabs > .tab-pane {
+            min-height: 100px;
         }
     }
 
-    // Boolean
-    .o_form_field_boolean {
+    // Labels
+    .o_form_label {
         margin: 0 @odoo-form-spacing-unit 0 0;
+        font-size: @font-size-base; // The label muse have the same size whatever their position
+        line-height: @line-height-base;
     }
 
-    // Numbers
-    .o_form_field_number {
-        white-space: nowrap;
+    // Form fields
+    .o_field_widget {
+        margin-bottom: @odoo-form-spacing-unit;
     }
-
-    // Radio buttons
-    .o_form_field_radio .o_form_radio {
-        outline: none;
+    .o_field_widget, .btn {
+        .o_field_widget {
+            margin-bottom: 0px;
+        }
     }
-    
+
     // Translate icon
     .o_field_translate {
         padding: 0;
@@ -299,160 +397,32 @@
             display: inline-block;
         }
     }
-    .o_form_field.o_form_invisible + .o_field_translate {
+    .o_field_widget.o_invisible_modifier + .o_field_translate {
         display: none;
     }
 
-    // Dropdowns input (many2one, ...)
-    .o_form_input_dropdown {
-        .o-flex(1, 0, auto);
-        position: relative;
-
-        > input {
-            padding-right: 15px;
-            cursor: pointer;
-        }
-
-        .o_dropdown_button {
-            pointer-events: none;
-            &:after {
-                .o-caret-down;
-            }
+    // Text field with oe_inline class
+    .o_field_text.oe_inline {
+        width: 100%!important;
+        @media (min-width: @screen-xs-min) {
+            width: 45%!important;
         }
     }
 
-    // Many2many tags
-    .badge .o_delete {
-        cursor: pointer;
-    }
-
-    // Image
-    .o_form_field_image {
-        position: relative;
-
-        .o_form_image_controls {
-            .o-position-absolute(0, 0);
+    // One2Many, Many2Many outside of group
+    .o_field_widget {
+        &.o_view_manager_content, &.o_field_one2many, &.o_field_many2many {
             width: 100%;
-
-            color: white;
-            background-color: @odoo-brand-optional;
-            opacity: 0;
-            transition: opacity ease 400ms;
-
-            > .fa {
-                margin: 5px;
-                cursor: pointer;
-            }
-        }
-        @media (max-width: @screen-xs-min) {
-            .o_form_image_controls{
-                position: initial;
-                opacity: 1;
-                > .fa{
-                    width: 50%;
-                    padding: 6px;
-                    margin: 0px;
-                    text-align: center;
-                    &.o_select_file_button{
-                        background: @odoo-brand-optional;
-                    }
-                    &.o_clear_file_button{
-                        background: @brand-danger;
-                    }
-                }
-            }
-        }
-
-        &:hover .o_form_image_controls {
-            opacity: 0.8;
-        }
-    }
-
-    // Input loading/file
-    .o_form_binary_progress, .o_hidden_input_file .o_form_input_file {
-        display: none;
-    }
-
-    // Timezone widget warning
-    .o_tz_warning {
-        color: @brand-danger;
-        cursor: help;
-        position: absolute;
-        margin-left: -40px;
-        margin-top: 5px;
-    }
-
-    // One2Many Kanban views
-    .o_form_field .o_kanban_view.o_kanban_ungrouped {
-        padding: 0;
-        .o_kanban_record {
-            box-shadow: none;
-        }
-    }
-
-    // One2Many List views
-    .o_form_field .o_list_view {
-        margin-bottom: 10px;
-
-        > tfoot > tr > td {
-            padding: 3px;
-            color: @odoo-main-text-color;
-        }
-    }
-    &.o_form_readonly .o_form_field .o_list_view .o_row_handle {
-        display: none;  // Hide the handler in non-edit mode
-    }
-
-    // Percent pie field
-    .o_form_field_percent_pie {
-        .o_pie {
-            position: relative;
-            border-radius: 100%;
-            overflow: hidden;
-            background-color: @odoo-brand-optional;
-
-            &:after { // Outside pie border to go over border-radius irregularities
-                content: " ";
-                .o-position-absolute(0, 0);
+            > div {
                 width: 100%;
-                height: 100%;
-                border-radius: 100%;
-            }
-
-            .o_mask {
-                .o-position-absolute(0, 0);
-                .o-transform-origin(0);
-                width: 50%;
-                height: 100%;
-                background-color: @odoo-view-background-color;
-                &.o_full {
-                    background-color: inherit;
-                }
-            }
-
-            .o_pie_value {
-                .o-flex-display();
-                .o-justify-content(center);
-                .o-align-items(center);
-
-                border-radius: 100%;
-
-                font-weight: 700;
-                color: @odoo-brand-primary;
             }
         }
     }
 
-    // Attachments
-    .oe_attachment {
-        display: inline-block;
-        border: 1px solid @odoo-brand-lightsecondary;
-        margin: 0 @odoo-form-spacing-unit @odoo-form-spacing-unit 0;
-        padding: @odoo-form-spacing-unit;
-    }
-
     // Specific style classes
     .o_group.o_inner_group.oe_subtotal_footer {
+        .oe_right;
+
         > tbody > tr > td {
             padding: 0;
 
@@ -470,7 +440,7 @@
                 }
             }
 
-            .o_form_field {
+            .o_field_widget {
                 text-align: right;
                 width: 100%;
             }
@@ -518,7 +488,7 @@
                 margin-right: 0;
             }
         }
-        > span.o_form_field {
+        > span.o_field_widget {
             width: auto;
         }
     }
@@ -556,12 +526,55 @@
         }
     }
 
-    // Notebooks
-    .o_notebook {
-        .nav-tabs {
-            > .tab-pane {
-                min-height: 100px;
-            }
+    // Boolean
+    .o_field_boolean {
+        margin: 0 @odoo-form-spacing-unit 0 0;
+    }
+
+    // Timezone widget warning
+    .o_tz_warning {
+        color: @brand-danger;
+        cursor: help;
+        position: absolute;
+        margin-left: -40px;
+        margin-top: 5px;
+    }
+
+    // One2Many Kanban views
+    .o_field_widget .o_kanban_view.o_kanban_ungrouped {
+        padding: 0;
+        .o_kanban_record {
+            box-shadow: none;
+        }
+    }
+
+    // One2Many List views
+    .o_field_widget .o_list_view {
+        margin-bottom: 10px;
+
+        > tfoot > tr > td {
+            padding: 3px;
+            color: @odoo-main-text-color;
+        }
+    }
+    &.o_form_readonly .o_field_widget .o_list_view .o_row_handle {
+        display: none;  // Hide the handler in non-edit mode
+    }
+
+    // Attachments
+    .oe_attachment {
+        display: inline-block;
+        border: 1px solid @odoo-brand-lightsecondary;
+        margin: 0 @odoo-form-spacing-unit @odoo-form-spacing-unit 0;
+        padding: @odoo-form-spacing-unit;
+    }
+
+    &.oe_form_configuration {
+        .o_group .o_form_label {
+            white-space: nowrap;
+        }
+        h2 {
+            margin-top: 32px !important;
         }
     }
 }
@@ -569,16 +582,30 @@
 // Overriden style when form view in modal
 .modal .modal-dialog {
     .o_form_view {
-        .o_form_sheet {
-            box-shadow: none;
+        .o_form_sheet_bg {
+            padding: 0;
+
+            > .o_form_sheet {
+                box-shadow: none;
+                width: 100%;
+                margin: 0 auto;
+                max-width: none;
+            }
+        }
+        .oe_chatter {
+            display: none;
+        }
+    }
+    &:not(.modal-lg) .o_form_view {
+        .o_group {
             width: 100%;
-            margin: 0 auto;
-            max-width: none;
         }
     }
+}
 
-    .o_form_invisible {
-        display: none!important;
+@media print {
+    .oe_button_box, .o_form_statusbar {
+        display: none !important;
     }
 }
 
@@ -619,10 +646,10 @@ label.o_light_label, .o_light_label label {
             margin-left: 30px;
             border-left: 1px solid #bbbbbb;
             padding-left: 10px;
-            .o_form_input_dropdown > .o_form_input {
+            .o_input_dropdown > .o_input {
                 width: 100%;
             }
-            .o_form_field {
+            .o_field_widget {
                 width: 50%;
             }
             button.btn-link {
@@ -631,7 +658,3 @@ label.o_light_label, .o_light_label label {
         }
     }
 }
-
-.oe_form_configuration h2 {
-    margin-top: 32px !important;
-}
diff --git a/addons/web/static/src/less/form_view_extra.less b/addons/web/static/src/less/form_view_extra.less
index 710b668c053..6e48c173c6e 100644
--- a/addons/web/static/src/less/form_view_extra.less
+++ b/addons/web/static/src/less/form_view_extra.less
@@ -1,10 +1,30 @@
+@sheet-max-width: 860px;
+@sheet-min-width: 650px;
+@sheet-padding: 16px;
+
 .o_form_view {
     .o_form_sheet_bg {
-        background: url(/web/static/src/img/form_sheetbg.png);
+        position: relative;
+        padding: @sheet-padding 0;
         border-bottom: 1px solid #ddd;
+        background: url(/web/static/src/img/form_sheetbg.png);
+
         .o_form_sheet {
+            min-width: @sheet-min-width;
+            max-width: @sheet-max-width;
+            min-height: 330px;
+            margin: 0 auto;
+            padding: 16px;
             border: 1px solid #c8c8d3;
             box-shadow: 0 4px 20px rgba(0,0,0,0.15);
+            background: white;
+
+            .ui-tabs {
+                margin: 0 -16px;
+            }
+            .oe_notebook_page {
+                padding: 0 16px;
+            }
         }
     }
 
@@ -16,26 +36,59 @@
             .btn-default;
         }
     }
-    &.o_form_nosheet > header {
-        margin: -16px -16px 0 -16px;
+    &.o_form_nosheet {
+        padding: 16px;
+        &.oe_form_nomargin {
+            margin: 0;
+        }
+        > header {
+            margin: -16px -16px 0 -16px;
+        }
     }
 
     // Button box
     .oe_button_box {
+        width: 400px;
+        text-align: right;
+        float: right;
+
+        &, & + .oe_avatar {
+            + .oe_title {
+                width: 400px;
+            }
+        }
+
         .oe_stat_button {
+            text-align: left;
+            width: 132px !important;
+            height: 40px;
+            margin: 0px -1px -1px 0px;
+            padding: 0;
             border-radius: 0;
             border-color: #ccc;
             background: white;
             outline: none;
+
             &:hover {
                 background-color: #e6e6e6;
             }
+
             .o_button_icon {
+                display: inline-block;
+                width: 37px;
+                padding: 0px 3px;
+                text-align: center;
+                vertical-align: middle;
                 color: #7C7BAD;
                 font-size: 24px;
             }
 
-            .o_stat_info { // contains the value and text
+            // Some buttons only display text and directly use the WidgetButton template instead of StatInfo
+            .o_stat_info, > span { // contains the value and text
+                display: inline-block;
+                max-width: 70%;
+                line-height: 1.2;
+
                 .o_stat_value {
                     .o-text-overflow(block);
                     font-weight: 700;
@@ -50,19 +103,34 @@
                     }
                 }
             }
-
-            // Some buttons only display text and directly use the WidgetButton template instead of StatInfo
             > span {
                 font-size: small;
                 white-space: normal; // text on several lines if needed
             }
+
+            > div {
+                text-align: left;
+                padding: 0;
+                line-height: 120%;
+                vertical-align: middle;
+            }
         }
     }
 
     // Avatar
-    .oe_avatar > img {
-        box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
-        border: none;
+    .oe_avatar {
+        float: left;
+        > img {
+            max-height: 90px;
+            max-width: 90px;
+            margin-bottom: 10px;
+            box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+            border: none;
+        }
+        + .oe_title {
+            padding-left: 95px;
+            margin-left: 5px;
+        }
     }
 
     // Groups
@@ -70,31 +138,15 @@
         .o_td_label {
             border-right: 1px solid #ddd;
         }
-    }
-
-    // All required form fields
-    .o_form_required {
-        &.o_form_input, .o_form_input, &.o_form_textarea, .o_form_textarea {
-            background-color: #D2D2FF;
+        .o_td_label + td {
+            padding: 2px 36px 2px 8px;
         }
-    }
-
-    .o_form_field.o_form_field_many2one .o_external_button {
-        padding: 0;
-        margin-left: 2px;
-        font-size: 19px;
-        color: #7C7BAD;
-        border: none;
-        &:hover {
-            background-color: transparent;
+        .o_field_widget.o_text_overflow {
+            width: 1px!important; // hack to make the table layout believe it is a small element (so that the table does not grow too much) ...
+            min-width: 100%;      // ... but in fact it takes the whole table space
         }
     }
 
-    // Dropdowns input carret
-    .o_form_input_dropdown .o_dropdown_button {
-        .o-position-absolute(2px, 4px);
-    }
-
     // Separators
     .o_horizontal_separator {
         color: @odoo-brand-optional;
@@ -106,30 +158,6 @@
         margin-left: -15px;
     }
 
-    // Percent pie field
-    .o_form_field_percent_pie {
-        @pie-dimension: 34px;
-        @pie-ring-width: 4px;
-
-        .o_pie {
-            width: @pie-dimension;
-            height: @pie-dimension;
-            margin-left: 5px;
-
-            &:after { // Outside pie border to go over border-radius irregularities
-                border: 1px solid @odoo-brand-primary;
-            }
-
-            .o_pie_value {
-                .o-position-absolute(@pie-ring-width, @pie-ring-width);
-                width: @pie-dimension - 2 * @pie-ring-width;
-                height: @pie-dimension - 2 * @pie-ring-width;
-                border: 1px solid white;
-                background-color: white;
-            }
-        }
-    }
-
     // Specific style classes
     .o_group.o_inner_group.oe_subtotal_footer {
         .oe_subtotal_footer_separator {
@@ -139,6 +167,15 @@
             border-right: none;
         }
     }
+
+    // Chatter
+    .oe_chatter {
+        display: block;
+        min-width: @sheet-min-width + 2* @sheet-padding;
+        max-width: @sheet-max-width + 2* @sheet-padding;
+        margin: 0 auto;
+        padding: 16px 16px 48px;
+    }
 }
 
 // Overriden style when form view in modal
diff --git a/addons/web/static/src/less/form_view_layout.less b/addons/web/static/src/less/form_view_layout.less
deleted file mode 100644
index 1f3cb374036..00000000000
--- a/addons/web/static/src/less/form_view_layout.less
+++ /dev/null
@@ -1,373 +0,0 @@
-.o_form_view {
-    .oe_inline {
-        width: auto!important;
-        @media (min-width: @screen-xs-min) {
-            &.o_inner_group {
-                width: 1px!important;
-            }
-        }
-    }
-    .oe_left {
-        .oe_inline;
-        float: left!important;
-    }
-    .oe_right {
-        .oe_inline;
-        float: right!important;
-    }
-
-    @media (min-width: @screen-xs-min) {
-        .o_row {
-            &, &.o_form_field { // Some field may want to use o_row as root and these rules must prevalue
-                .o-flex-display();
-                width: auto!important;
-            }
-
-            .o-align-items(baseline);
-            min-width: 50px;
-            margin: 0 -@odoo-form-spacing-unit/2;
-
-            > div, > span, > button, > label, > a, > input { // > * did not add a level of priority to the rule
-                .o-flex(0, 0, auto);
-                width: auto!important;
-                margin-right: @odoo-form-spacing-unit/2;
-                margin-left: @odoo-form-spacing-unit/2;
-            }
-
-            > .o_row {
-                margin: 0;
-            }
-            > .btn {
-                padding-top: 0;
-                padding-bottom: 0;
-            }
-            > .o_form_field_boolean {
-                .o-align-self(center);
-            }
-        }
-
-        .o_row .o_form_field_many2one, .o_form_field_many2one.oe_inline {
-            &.o_with_button:not(:last-child) { // If invisible element as last child, this line has no effect but that's not very important
-                margin-right: (35px + (@odoo-form-spacing-unit/2));
-            }
-        }
-    }
-
-    .o_row > div > .o_form_field {
-        width: 100%;
-    }
-
-    // Readonly specific rules
-    &.o_form_readonly {
-        .o_row {
-            display: inline-block;
-            > div {
-                display: inline-block;
-            }
-        }
-    }
-
-    // Editable specific rules
-    &.o_form_editable {
-        @media (min-width: @screen-xs-min) {
-            .o_row {
-                > .o_form_field, > div {
-                    .o-flex(1, 1, auto);
-                    width: 0!important; // 3rd flex argument does not work with input (must be auto and real width 0)
-
-                    &.o_form_field_boolean, &.o_priority {
-                        .o-flex(0, 0, auto);
-                        width: auto!important;
-                    }
-                }
-            }
-        }
-
-        .oe_title {
-            max-width: @container-sm - (2 * @odoo-horizontal-padding);
-        }
-    }
-
-     // Header containing status/workflow buttons
-    .o_form_statusbar {
-        .o-flex(0, 0, auto);
-        .o-flex-display();
-        .o-justify-content(space-between);
-
-        padding-left: @odoo-horizontal-padding;
-
-        > .o_statusbar_buttons, > .o_statusbar_status {
-            .o-flex-display();
-            .o-align-items(center);
-            .o-align-content(space-around);
-        }
-
-        > .o_form_field {
-            .o-align-self(center);
-            margin-bottom: 0px;
-        }
-
-        > .o_statusbar_buttons {
-            .o-flex-flow(row, wrap);
-
-            > .btn {
-                margin: 2px 3px 2px 0;
-            }
-        }
-
-        > .o_statusbar_status {
-            .o-flex-flow(row-reverse, wrap-reverse);
-            .o-align-self(stretch);
-            .o-align-items(stretch);
-            overflow-x: hidden; // to prevent horizontal scroll due to last arrow
-        }
-
-        // Touch device mode
-        > .o_statusbar_buttons > .btn-group {
-            > .dropdown-toggle {
-                &:after {
-                    .o-caret-down();
-                    margin-left: @odoo-form-spacing-unit;
-                }
-            }
-
-            > .dropdown-menu {
-                padding: 5px 0 2px 0;
-                min-width: 100px;
-
-                > li > .btn {
-                    min-width: 100%;
-                    margin-bottom: 3px;
-                }
-            }
-        }
-    }
-
-    // Title
-    .oe_title {
-        > h1, > h2, > h3 {
-            width: 100%; // Needed because inline-block when is a hx.o_row
-            margin-top: 0;
-            margin-bottom: 0;
-            line-height: inherit;
-        }
-    }
-
-    // Groups
-    .o_group {
-        display: inline-block;
-        width: 100%;
-        margin: 10px 0;
-
-        // o_group contains nested groups
-        .o-generate-groups(@odoo-form-group-cols);
-        .o-generate-groups(@n, @i: 1) when (@i =< @n) {
-            .o_group_col_@{i} {
-                display: inline-block;
-                width: floor(100% / 12 * @i);
-                vertical-align: top;
-            }
-            .o-generate-groups(@n, @i + 1);
-        }
-
-        &.o_inner_group {
-            display: inline-table;
-
-            > tbody > tr > td {
-                &.o_td_label {
-                    width: 0%;
-                    padding: 0 15px 0 0;
-                    min-width: 150px;
-                }
-                vertical-align: top;
-
-                span, .o_form_field_boolean, .oe_avatar, .o_form_uri {
-                    &.o_form_field {
-                        width: auto;
-                    }
-                }
-            }
-        }
-
-        .o_form_field {
-            width: 100%;
-
-            > .btn {
-                .o-flex(0, 0, auto);
-                padding: 0 10px;
-            }
-        }
-    }
-
-    // Notebooks
-    .o_notebook {
-        clear: both; // For the notebook not to have alongside floating elements
-        margin-top: @odoo-form-spacing-unit * 2;
-    }
-
-    // Labels
-    .o_form_label {
-        margin: 0;
-    }
-
-    // Form fields
-    .o_form_field {
-        display: inline-block;
-        margin-bottom: @odoo-form-spacing-unit;
-    }
-
-    // Block fields
-    .note-editor, .oe_form_field_html, .oe_form_field_html_text, .oe_form_field_text, .o_view_manager_content, .o_form_field_domain {
-        display: block;
-    }
-
-    // Flex fields
-    .o_form_field_many2one, .o_form_field_radio, .o_form_field_many2manytags, .o_form_field_percent_pie, .o_form_field_monetary, .o_form_field_binary_file {
-    @media (min-width: @screen-sm-min) {
-        .o-inline-flex-display();
-    }
-        > span, > button {
-            .o-flex(0, 0, auto);
-        }
-    }
-
-    .o_form_field, .btn {
-        .o_form_field {
-            margin-bottom: 0px;
-        }
-    }
-
-    // Input in field
-    .o_form_field {
-        .o_form_input_dropdown {
-            width: 100%;
-        }
-        .o_form_input {
-            display: inline-block;
-        }
-    }
-
-    // Textarea
-    .o_form_textarea {
-        white-space: pre-wrap;
-        width: 100%;
-        &.oe_inline {
-            width: 100%!important;
-            @media (min-width: @screen-xs-min) {
-                width: 45%!important;
-            }
-        }
-    }
-
-    // Radio buttons
-    .o_form_field_radio {
-        .o_radio_item {
-            .o-flex(0, 0, auto);
-            .o-flex-display();
-            .o-align-items(center);
-
-            > input {
-                .o-flex(0, 0, auto);
-                margin: 0 @odoo-form-spacing-unit 0 0;
-            }
-            > label {
-                margin: 0;
-            }
-        }
-
-        &.o_horizontal {
-            .o_radio_item {
-                margin-right: @odoo-form-spacing-unit * 2;
-            }
-        }
-
-        &.o_vertical {
-            .o-flex-flow(column, nowrap);
-            .o_radio_item {
-                margin-bottom: @odoo-form-spacing-unit;
-            }
-        }
-    }
-
-    // One2Many, Many2Many outside of group
-    .o_form_field {
-        &.o_view_manager_content, &.o_form_field_one2many, &.o_form_field_many2many {
-            width: 100%;
-            > div {
-                width: 100%;
-            }
-        }
-    }
-
-    // Many2many tags
-    .o_form_field_many2manytags {
-        .o-flex-flow(row, wrap);
-        .o-align-items(baseline);
-        .badge {
-            .o-flex(0, 0, auto);
-            > .o_badge_text {
-                .o-text-overflow(inline-block);
-                max-width: 200px;
-            }
-        }
-    }
-
-    // Percent pie
-    .o_form_field_percent_pie {
-        .o-align-items(center);
-        > .o_pie {
-            margin-right: 10px;
-        }
-    }
-
-    // Specific style classes
-    .o_group.o_inner_group.oe_subtotal_footer {
-        .oe_right;
-    }
-
-    //ace
-    .o_ace_view_editor {
-        width: 100%;
-        .ace-view-editor {
-            height: 300px;
-            padding: 0 1em;
-        }
-    }
-
-    .o_form_field_domain {
-        > .o_form_field_domain_panel {
-            margin-top: 8px;
-        }
-        &.o_inline_mode.o_edit_mode {
-            position: relative;
-
-            > .o_form_field_domain_panel {
-                .o-position-absolute(0, 0);
-                margin-top: 0;
-            }
-        }
-    }
-}
-
-// Overriden style when form view in modal
-.modal .modal-dialog {
-    .o_form_view {
-        .o_form_sheet_bg {
-            padding: 0;
-        }
-        .oe_chatter {
-            display: none;
-        }
-    }
-    &:not(.modal-lg) .o_form_view {
-        .o_group {
-            width: 100%;
-        }
-    }
-}
-
-@media print {
-    .oe_button_box {
-        display: none !important;
-    }
-}
diff --git a/addons/web/static/src/less/form_view_layout_extra.less b/addons/web/static/src/less/form_view_layout_extra.less
deleted file mode 100644
index 51c1c3f731e..00000000000
--- a/addons/web/static/src/less/form_view_layout_extra.less
+++ /dev/null
@@ -1,109 +0,0 @@
-@sheet-max-width: 860px;
-@sheet-min-width: 650px;
-@sheet-padding: 16px;
-
-.o_form_view {
-    &.o_form_nosheet {
-        padding: 16px;
-        &.oe_form_nomargin {
-            margin: 0;
-        }
-    }
-    .o_form_sheet_bg {
-        position: relative;
-        padding: @sheet-padding 0;
-        .o_form_sheet {
-            min-width: @sheet-min-width;
-            max-width: @sheet-max-width;
-            min-height: 330px;
-            background: white;
-            padding: 16px;
-            margin: 0 auto;
-            .ui-tabs {
-                margin: 0 -16px;
-            }
-            .oe_notebook_page {
-                padding: 0 16px;
-            }
-        }
-    }
-
-    // Button box
-    .oe_button_box {
-        width: 400px;
-        text-align: right;
-        float: right;
-        .oe_stat_button {
-            text-align: left;
-            width: 132px !important;
-            height: 40px;
-            margin: 0px -1px -1px 0px;
-            padding: 0;
-            > div {
-                text-align: left;
-                padding: 0;
-                line-height: 120%;
-                vertical-align: middle;
-            }
-            .o_button_icon {
-                display: inline-block;
-                width: 30%;
-                padding: 0px 3px;
-                width: 37px;
-                text-align: center;
-                vertical-align: middle;
-            }
-
-            .o_stat_info { // contains the value and text
-                display: inline-block;
-                max-width: 70%;
-                line-height: 1.2;
-            }
-
-            // Some buttons only display text and directly use the WidgetButton template instead of StatInfo
-            > span {
-                .o_stat_info; // layout
-            }
-        }
-
-        &, & + .oe_avatar {
-            + .oe_title {
-                width: 400px;
-            }
-        }
-    }
-
-    // Groups
-    .o_group {
-        .o_td_label + td {
-            padding: 2px 36px 2px 8px;
-        }
-        .o_form_field.o_text_overflow {
-            width: 1px!important; // hack to make the table layout believe it is a small element (so that the table does not grow too much) ...
-            min-width: 100%;      // ... but in fact it takes the whole table space
-        }
-    }
-
-    // Avatar
-    .oe_avatar {
-        float: left;
-        > img {
-            max-height: 90px;
-            max-width: 90px;
-            margin-bottom: 10px;
-        }
-        + .oe_title {
-            padding-left: 95px;
-            margin-left: 5px;
-        }
-    }
-
-    // Chatter
-    .oe_chatter {
-        display: block;
-        min-width: @sheet-min-width + 2* @sheet-padding;
-        max-width: @sheet-max-width + 2* @sheet-padding;
-        margin: 0 auto;
-        padding: 16px 16px 48px;
-    }
-}
diff --git a/addons/web/static/src/less/kanban_view.less b/addons/web/static/src/less/kanban_view.less
index 9b2f914d3b4..d1e39c8b18e 100644
--- a/addons/web/static/src/less/kanban_view.less
+++ b/addons/web/static/src/less/kanban_view.less
@@ -123,7 +123,7 @@
                 }
             }
         }
-        .o_form_field_many2manytags {
+        .o_field_many2manytags {
             display: block;
         }
         .oe_kanban_text_red {
@@ -552,3 +552,8 @@
         color: #639B89;
     }
 }
+
+// Introduced with new views (TODO check)
+.o_kanban {
+    height: 100%; // required for grouped kanban views
+}
diff --git a/addons/web/static/src/less/list_view.less b/addons/web/static/src/less/list_view.less
index bad4e370961..8fad7a04527 100644
--- a/addons/web/static/src/less/list_view.less
+++ b/addons/web/static/src/less/list_view.less
@@ -1,5 +1,7 @@
 @odoo-list-group-header-color: lighten(@odoo-brand-lightsecondary, 10%);
+
 .o_list_view {
+    position: relative;
     cursor: pointer;
     background-color: @odoo-view-background-color;
     margin-bottom: 0px;
@@ -12,7 +14,6 @@
 
     thead {
         color: @odoo-main-text-color;
-        background-color: #eee;
         border-bottom: 1px solid #cacaca;
         > tr > th {
             border-left: 1px solid #dfdfdf;
@@ -46,23 +47,8 @@
         }
     }
 
-    .o_list_record_selector {
+    .o_list_record_selector, .o_list_record_delete, .o_handle_cell {
         width: 1px;  // to prevent the column to expand
-        > input {
-            margin-left: 3px;
-            .hidden-xs();
-        }
-    }
-
-    .o_list_record_delete {
-        width: 13px;
-    }
-
-    .o_handle_cell {
-        width: 1px; // to prevent the column to expand
-        .o_row_handle {
-            cursor: ns-resize;
-        }
     }
 
     // Decoration of the row
@@ -80,8 +66,6 @@
     tbody > tr.o_group_header {
         height: 31px;
 
-        .o-vertical-gradient(#fcfcfc, #dedede);
-
         .o_group_name {
             white-space: nowrap;
         }
@@ -106,108 +90,77 @@
         border-top: none;  // Override bootstrap for grouped list views
     }
 
-    .o_list_number {
-        text-align: right;
-        white-space: nowrap;
-    }
-    .o_list_text {
-        white-space: pre-wrap;
-    }
-}
-
-.o_list_editable {
-    position: relative;
-
-    .o_temp_visible {
-        opacity: 0;
-        display: block!important;
-
-        &.o_form_invisible {
-            display: block!important;
+    // Values styling
+    .o_data_cell {
+        &.o_list_number, &.o_field_integer, &.o_field_float, &.o_field_monetary {
+            text-align: right;
+            white-space: nowrap;
+        }
+        &.o_list_text, &.o_field_text {
+            white-space: pre-wrap;
         }
     }
 
-    .o_list_view {
-        .o_row_edition > td {
-            visibility: hidden;  // Hide row's content during edition
-            &.o_list_record_selector, &.o_list_record_delete, &.o_list_button {
-                visibility: visible;
-            }
-
-            &.o_list_record_delete {
-                opacity: 0.5;
-                pointer-events: none;
-            }
+    //--------------------------------------------------------------------------
+    // Edition
+    //--------------------------------------------------------------------------
+    .o_data_row.o_selected_row > .o_data_cell:not(.o_readonly_modifier) {
+        position: relative;
+        padding: 0;
 
-            &.o_readonly {
-                visibility: visible;
-                color: transparent;
+        // Field widgets override
+        > .o_field_widget {
+            .o-position-absolute(0, 0, auto, 0);
+            min-height: 100%;
 
-                > .o_checkbox {
-                    visibility: hidden;
-                }
+            &:not(.o_field_text) {
+                white-space: nowrap;
             }
-        }
-    }
 
-    .o_form_view.o_list_editable_form {
-        padding: 0;
-        > .o_form_field {
-            padding: 0;
-            position: absolute;
-            white-space: nowrap;
-            &.o_form_textarea {
-                white-space: pre-wrap;
-            }
-            .o_form_field, .badge { // Many2Many tags
+            .o_field_widget, .badge { // Many2Many tags
                 display: block;
                 float: left;
                 white-space: normal;
                 max-width: 100%; // Fix a chrome bug where badge would not break on multiple lines
             }
-
-            &.o_readonly:not(.o_checkbox) {
-                background-color: transparent;
-                padding: 5px;
-            }
         }
         > .o_field_translate {
             position: absolute;
             width: 16px; // to have some space on the right
         }
-        .o_form_input_dropdown {
-            height: 100%;
-        }
-        .o_form_input {
-            height: 100%;
-            padding-left: 5px;
-            padding-right: 5px;
+        .o_input {
+            padding: 4px; // bootstrap cell - 1px of border
+            background-color: white;
+
+            .o_input {
+                padding: 0!important;
+            }
         }
-        .o_form_input, .o_form_textarea, .o_form_field_many2manytags, .o_form_field_monetary {
-            border-style: solid;
+        .o_input_dropdown {
+            min-height: 100%;
         }
-        .o_form_field_monetary .o_form_input {
+        .o_field_monetary input {
             width: 0;
         }
         .o_checkbox {
             padding: 7px 0 0 5px;
             background: transparent;
         }
-        .o_form_textarea {
+        .o_field_widget {
             min-width: 0;
         }
-        .o_with_button .o_form_input_dropdown {
+        .o_with_button .o_input_dropdown {
             width: 1%; // Hack so that the sibling button is not overlapped
         }
-        .o_form_input_dropdown, .o_datepicker {
-            > .o_form_input {
+        .o_input_dropdown, .o_datepicker {
+            > .o_input {
                 padding-right: 15px; // To prevent caret overlapping
             }
             > .o_dropdown_button, .o_datepicker_button {
                 .o-position-absolute(20%, 5px);
             }
         }
-        .o_form_field > .o_external_button {
+        .o_field_widget > .o_external_button {
             padding: 0;
             background-color: inherit;
             margin-left: 3px;
@@ -215,24 +168,15 @@
         .o_row_handle {
             visibility: hidden; // Hide sequence when editing
         }
-        .o_form_field_boolean {
+        .o_field_boolean {
             width: auto!important; // Override the width computed in JS (needed for Chrome)
         }
-        .o_form_field_number {
+        .o_field_number {
             text-align: right;
         }
     }
 }
 
-// Workaround a bug in safari mobile where the inputs are not displayed correctly.
-.modal {
-    .o_list_editable {
-        .o_form_view.o_list_editable_form {
-            -webkit-overflow-scrolling: auto;
-        }
-    }
-}
-
 // Buttons in ControlPanel
 .o_list_buttons {
     .o_list_button_save, .o_list_button_discard {
diff --git a/addons/web/static/src/less/list_view_extra.less b/addons/web/static/src/less/list_view_extra.less
new file mode 100644
index 00000000000..9a9413c0dd7
--- /dev/null
+++ b/addons/web/static/src/less/list_view_extra.less
@@ -0,0 +1,10 @@
+
+.o_list_view {
+    thead {
+        background-color: #eee;
+    }
+
+    tbody > tr.o_group_header {
+        .o-vertical-gradient(#fcfcfc, #dedede);
+    }
+}
diff --git a/addons/web/static/src/less/model_field_selector.less b/addons/web/static/src/less/model_field_selector.less
index 095e8b699f9..124c15cb8e5 100644
--- a/addons/web/static/src/less/model_field_selector.less
+++ b/addons/web/static/src/less/model_field_selector.less
@@ -28,8 +28,6 @@
     }
 
     &.o_edit_mode {
-        .o-input();
-
         > .o_field_selector_controls::after {
             .o-caret-down();
         }
diff --git a/addons/web/static/src/less/navbar.less b/addons/web/static/src/less/navbar.less
index 5f3aff0b98f..4e709ed7f9b 100644
--- a/addons/web/static/src/less/navbar.less
+++ b/addons/web/static/src/less/navbar.less
@@ -1,10 +1,10 @@
 
 .o_main_navbar {
+    position: relative;
     height: @odoo-navbar-height;
     border: 1px solid @odoo-navbar-inverse-link-hover-bg;
     background-color: @odoo-brand-primary;
     color: white;
-    .box-shadow(0px 0px 8px @odoo-main-text-color);
 
     > a, > button {
         float: left;
@@ -29,6 +29,24 @@
         }
     }
 
+    > .o_menu_brand {
+        display: block;
+        float: left;
+        margin-right: 35px;
+        .user-select(none);
+        color: white;
+        font-size: 22px;
+        font-weight: 500;
+        line-height: @odoo-navbar-height - 2;
+
+        @media (max-width: @screen-xs-max) {
+            float: none;
+            margin: 0;
+            border-bottom: 1px solid @odoo-navbar-inverse-link-hover-bg;
+            color: transparent;
+        }
+    }
+
     > .o_menu_toggle {
         margin-right: 5px;
     }
@@ -60,6 +78,37 @@
                     outline: none;
                 }
             }
+
+            &.o_extra_menu_items {
+                > a {
+                    width: @odoo-navbar-height - 2;
+                    text-align: center;
+                }
+                &.open > ul {
+                    padding: 0;
+
+                    > li {
+                        > a {
+                            background-color: @odoo-brand-primary;
+                            color: white;
+                            border-bottom: 1px solid @odoo-brand-lightsecondary;
+
+                            &.dropdown-toggle {
+                                background-color: lighten(@odoo-brand-primary, 15%);
+                                pointer-events: none; // hack to prevent clicking on it because dropdown always opened
+                            }
+                        }
+                        > ul { // remove dropdown-menu default style as it is nested in another one
+                            position: static;
+                            float: none;
+                            display: block;
+                            border: none;
+                            box-shadow: none;
+                            max-height: none;
+                        }
+                    }
+                }
+            }
         }
 
         &.o_menu_systray {
@@ -71,10 +120,6 @@
         }
     }
 
-    .o_menu_brand {
-        display: none;
-    }
-
     .open .dropdown-menu {
         max-height: 90vh; // the dropdown should not overstep the viewport
         overflow: auto;
@@ -89,6 +134,10 @@
         .o-menu-indentation(3);
     }
 
+    .oe_topbar_avatar {
+        height: 15px;
+    }
+
     @media (max-width: @screen-xs-max) {
         .o-transition(height, 200ms, linear);
 
diff --git a/addons/web/static/src/less/new_views.less b/addons/web/static/src/less/new_views.less
deleted file mode 100644
index f8c0ca2e7b6..00000000000
--- a/addons/web/static/src/less/new_views.less
+++ /dev/null
@@ -1,83 +0,0 @@
-.o_kanban {
-    height: 100%; // required for grouped kanban views
-}
-
-.o_list_view {
-    tr.o_selected_row {
-        outline: 1px solid lightgray;
-
-        > td:not(.o_readonly):not(.o_list_button) {
-            position: relative;
-            background-color: white;
-
-            > .o_field_widget, > .o_form_field_many2one {
-                .o-position-absolute(0, 0, 0, 0);
-            }
-
-            .o_form_field_many2one .o_form_input_dropdown {
-                .o-flex(1, 1, auto);
-
-                .o_form_input {
-                    height: 100%;
-                }
-
-                .o_dropdown_button {
-                    display: none;
-                }
-            }
-
-            .o_form_field_many2manytags {
-                .o_form_field_many2one {
-                    height: 100%;
-                    display: inline-block;
-                }
-            }
-
-            .o_field_boolean {
-                .o-flex-display();
-                .o-align-items(center);
-            }
-        }
-    }
-
-    td.o_field_dirty {
-        outline: 1px solid orange;
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Rules on fields moved from form_view(_layout).less (community or enterprise)
-// so that they also apply outside a form_view
-
-// Many2One
-.o_form_field_many2one {
-    .o-inline-flex-display();
-    > span, > button {
-        .o-flex(0, 0, auto);
-    }
-}
-// Many2ManyTags
-.o_form_field_many2manytags .badge {
-    cursor: pointer;
-    color: white;
-    font-size: 12px;
-    border: 0;
-}
-// Dropdowns input (many2one, ...)
-.o_form_input_dropdown {
-    .o-flex(1, 0, auto);
-    position: relative;
-
-    > input {
-        padding-right: 15px;
-        cursor: pointer;
-    }
-
-    .o_dropdown_button {
-        pointer-events: none;
-        &:after {
-            .o-caret-down;
-        }
-        .o-position-absolute(0, 0); // ENTERPRISE ONLY
-    }
-}
diff --git a/addons/web/static/src/less/search_view_extra.less b/addons/web/static/src/less/search_view_extra.less
index 0ef7b8dd1dd..9c263976e4d 100644
--- a/addons/web/static/src/less/search_view_extra.less
+++ b/addons/web/static/src/less/search_view_extra.less
@@ -11,7 +11,7 @@
         .o_searchview_facet_label {
             background-color: @gray-light;
         }
-            
+
         .o_facet_remove {
             color: @gray-light;
             &:hover {
@@ -40,5 +40,4 @@
     input[type="text"], select {
         .form-control();
     }
-
 }
diff --git a/addons/web/static/src/less/switch_company_menu.less b/addons/web/static/src/less/switch_company_menu.less
deleted file mode 100644
index 08774e24d49..00000000000
--- a/addons/web/static/src/less/switch_company_menu.less
+++ /dev/null
@@ -1,6 +0,0 @@
-.o_company {
-    margin-right:23px;
-}
-.o_current_company {
-    margin-right:10px;
-}
\ No newline at end of file
diff --git a/addons/web/static/src/less/tree_view.less b/addons/web/static/src/less/tree_view.less
deleted file mode 100644
index 66db28f58a8..00000000000
--- a/addons/web/static/src/less/tree_view.less
+++ /dev/null
@@ -1,50 +0,0 @@
-.o_treeview_table {
-    width: 100%;
-    background-color: white;
-    border-collapse: collapse;
-
-    thead {
-        color: @odoo-main-text-color;
-        background-color: @odoo-brand-lightsecondary;
-        > tr > th {
-            padding: 10px;
-        }
-    }
-
-    tbody {
-        > tr {
-            border: 1px solid @odoo-brand-lightsecondary;
-            &:hover {
-                background-color: lighten(@odoo-brand-lightsecondary, 15%);
-            }
-            > td {
-                border: 1px solid @odoo-brand-lightsecondary;
-                cursor: pointer;
-                height: 40px;
-                padding: 0 4px;
-                &.oe_number {
-                    text-align: right;
-                }
-            }
-        }
-        .treeview-tr, .treeview-td {
-            &.o_treeview_first > span {
-                padding-left: 16px;
-            }
-        }
-        .treeview-tr.o_treeview_first {
-            position: relative;
-            &:before {
-                position: absolute;
-                top: 13px;
-                .o-caret-right(6px);
-            }
-        }
-        .o_open .treeview-tr.o_treeview_first {
-            &:before {
-                top: 16px;
-                .o-caret-down(6px);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/addons/web/static/src/less/utils.less b/addons/web/static/src/less/utils.less
index 8d85eb0d977..19068dd3545 100644
--- a/addons/web/static/src/less/utils.less
+++ b/addons/web/static/src/less/utils.less
@@ -209,9 +209,9 @@
 // ------------------------------------------------------------------
 // Text overflow
 // ------------------------------------------------------------------
-.o-text-overflow(@display: inline-block) {
+.o-text-overflow(@display: inline-block, @max-width: 100%) {
     display: @display;
-    max-width: 100%;
+    max-width: @max-width;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
diff --git a/addons/web/static/src/less/views.less b/addons/web/static/src/less/views.less
index f2f9a97ee1b..db5fe8f814c 100644
--- a/addons/web/static/src/less/views.less
+++ b/addons/web/static/src/less/views.less
@@ -1,87 +1,7 @@
-// --------------------------------------------------------------------------
-// This file contains rules applying on elements shared between views
-// --------------------------------------------------------------------------
-
-// Many2many tags
-.o_form_field_many2manytags {
-    .o_tag_color_0 {
-        background-color: #4D4D4D;
-    }
-    .o_tag_color_1 {
-        background-color: #61BD4F;
-    }
-    .o_tag_color_2 {
-        background-color: #F2D600;
-    }
-    .o_tag_color_3 {
-        background-color: #FFAB4A;
-    }
-    .o_tag_color_4 {
-        background-color: #EB5A46;
-    }
-    .o_tag_color_5 {
-        background-color: #875A7B;
-    }
-    .o_tag_color_6 {
-        background-color: #0079BF;
-    }
-    .o_tag_color_7 {
-        background-color: #00C2E0;
-    }
-    .o_tag_color_8 {
-        background-color: #4CD98E;
-    }
-    .o_tag_color_9 {
-        background-color: #FF80CE;
-    }
-    .o_tag_color_10 {
-        background-color: #B6BBBF;
-    }
-}
-
-// Stars
-.o_priority {
-    display: inline-block;
-    padding: 0;
-    margin: 0;
-    vertical-align: middle;
-    > .o_priority_star {
-        display: inline-block;
-        font-size: 1.35em;
-        &:hover, &:focus {
-            text-decoration: none;
-            outline: none;
-        }
-
-        + .o_priority_star {
-            padding-left: 5px;
-        }
-
-        &.fa-star-o {
-            color: @odoo-main-color-muted;
-        }
-        &.fa-star {
-            color: gold;
-        }
-    }
-}
-
-.o_status {
-    display: inline-block;
-    height: 12px;
-    width: 12px;
-    border-radius: 6px;
-    vertical-align: middle;
-
-    background-color: @odoo-brand-secondary;
-
-    &.o_status_green {
-        background-color: @brand-success;
-    }
-    &.o_status_red {
-        background-color: @brand-danger;
-    }
-}
+/**
+ * This file regroups the rules which apply on elements which are shared between
+ * all renderers. For field default rules, see the fields.less file.
+ */
 
 // No content helper
 .oe_view_nocontent {
@@ -92,15 +12,12 @@
         display: inline!important;
     }
 }
-// Hide view_nocontent in x2many fields
-.o_form_field .oe_view_nocontent {
-    display: none;
-}
+.o_field_widget .oe_view_nocontent,
 .o_cannot_create .oe_view_nocontent_create {
     display: none;
 }
 
-// Specific success color for toggle_button widget
-.fa.o_toggle_button_success {
-    color: @brand-success;
+// Invisible modifier (can be inside the view, the button area, ...)
+.o_invisible_modifier {
+    display: none!important;
 }
diff --git a/addons/web/static/src/less/web_calendar.less b/addons/web/static/src/less/web_calendar.less
index b23b64bcfa7..ed25f8f8dd0 100644
--- a/addons/web/static/src/less/web_calendar.less
+++ b/addons/web/static/src/less/web_calendar.less
@@ -194,7 +194,7 @@
         .o_calendar_filter {
             padding: 8px;
             border-top: 1px solid lightgray;
-            .o_form_field_many2one {
+            .o_field_many2one {
                 width: 100%;
             }
         }
diff --git a/addons/web/static/src/less/webclient_extra.less b/addons/web/static/src/less/webclient_extra.less
index 43d316ec3a0..7c337352618 100644
--- a/addons/web/static/src/less/webclient_extra.less
+++ b/addons/web/static/src/less/webclient_extra.less
@@ -1,6 +1,6 @@
-// ------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // Checkboxes
-// ------------------------------------------------------------------
+//------------------------------------------------------------------------------
 div.o_checkbox {
     display: inline-block;
     vertical-align: sub;
@@ -9,29 +9,32 @@ div.o_checkbox {
     }
 }
 
-// ------------------------------------------------------------------
-// Inputs and selects
-// ------------------------------------------------------------------
-.o-input() {
+//------------------------------------------------------------------------------
+// Inputs and selects (note: put the o_input class to have the style)
+//------------------------------------------------------------------------------
+[type="text"], [type="password"], [type="number"], textarea, select {
+    width: 100%;
+    display: block;
+    outline: none;
+}
+.o_input {
     border: 1px solid @odoo-form-lightsecondary;
     border-radius: @border-radius-base;
     padding: 2px 4px;
     color: #1f1f1f;
-}
-input[type="text"], input[type="password"], input[type="number"], textarea, select {
-    .o-input();
 
-    width: 100%;
-    outline: none;
-    display: block;
+    .o_input {
+        border: none!important;
+        padding: 0;
+    }
 }
 select {
     background: white;
 }
 
-// ------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // Loading
-// ------------------------------------------------------------------
+//------------------------------------------------------------------------------
 .o_loading {
     position: fixed;
     top: 0;
@@ -45,9 +48,9 @@ select {
     border-bottom-left-radius: 8px;
 }
 
-// ------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // User menu in navbar
-// ------------------------------------------------------------------
+//------------------------------------------------------------------------------
 #oe_main_menu_navbar .oe_user_menu_placeholder .o_user_menu .oe_topbar_name {
     .o-text-overflow();
     max-width: 150px;