diff --git a/addons/web/__manifest__.py b/addons/web/__manifest__.py
index 307b309fe5d..4d4a90fa42a 100644
--- a/addons/web/__manifest__.py
+++ b/addons/web/__manifest__.py
@@ -147,7 +147,6 @@ This module provides the core of the Odoo Web Client.
             'web/static/src/legacy/scss/model_field_selector.scss',
             'web/static/src/legacy/scss/dropdown.scss',
             'web/static/src/legacy/scss/fields.scss',
-            'web/static/src/legacy/scss/fields_extra.scss',
             'web/static/src/legacy/scss/color_picker.scss',
             'base/static/src/scss/res_partner.scss',
 
diff --git a/addons/web/static/src/legacy/scss/fields.scss b/addons/web/static/src/legacy/scss/fields.scss
index eb72cdcfa72..0ef0c7467e3 100644
--- a/addons/web/static/src/legacy/scss/fields.scss
+++ b/addons/web/static/src/legacy/scss/fields.scss
@@ -384,3 +384,74 @@ button.o_field_float_toggle {
 select.o_field_widget.o_input {
     padding: 1px;  // Other inputs get a 1px padding automatically added by the browsers but selects do not
 }
+
+.o_field_widget.o_legacy_field_widget {
+    .o_field_many2one {
+        .o_input_dropdown .o_input {
+            transform: translateY($input-border-width + $dropdown-border-width);
+        }
+    }
+
+    // HTML fields
+    &.o_field_html.o_field_html { // Make rules more important
+        .note-editor {
+            border-color: map-get($grays, '400');
+        }
+        .note-editable {
+            border-radius: 0;
+        }
+        :not(.oe-bordered-editor).note-editable {
+            border: 0;
+            padding: 3px 40px 5px 0px;
+        }
+        .note-toolbar.panel-heading, .popover-body {
+            border-color: map-get($grays, '400');
+            background: map-get($grays, '100');
+
+            .btn-secondary {
+                background: transparent;
+                border-color: transparent;
+                @include o-hover-text-color($body-color, $link-color);
+            }
+            .show .btn-secondary, .btn-secondary.active, .btn-secondary:focus {
+                background: white !important;
+                color: $body-color !important;
+                border-color: map-get($grays, '400');
+            }
+            .dropdown-menu {
+                margin-top: 0;
+                border-top: none;
+                border-color: map-get($grays, '400');
+                background-color: white;
+                box-shadow: none;
+
+                a {
+                    background-color: transparent;
+                    color: $body-color;
+
+                    &:hover {
+                        background-color: map-get($grays, '200');
+                    }
+                }
+                &.show .btn-secondary, .btn-secondary.active, .btn-secondary:focus {
+                    border: none;
+                }
+            }
+            .btn-group.show::after {
+                @include o-position-absolute(auto, 1px, -1px, 1px);
+                height: 1px;
+                background-color: white;
+            }
+        }
+    }
+}
+
+.ui-autocomplete .ui-menu-item {
+    &.o_m2o_dropdown_option > a {
+        color: $o-brand-primary;
+
+        &.ui-state-active {
+            color: $o-brand-primary;
+        }
+    }
+}
diff --git a/addons/web/static/src/legacy/scss/fields_extra.scss b/addons/web/static/src/legacy/scss/fields_extra.scss
deleted file mode 100644
index 156e27a9344..00000000000
--- a/addons/web/static/src/legacy/scss/fields_extra.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// This file regroups all the rules which apply to field widgets wherever they
-// are in the DOM, in the community version.
-//
-
-//------------------------------------------------------------------------------
-// Fields
-//------------------------------------------------------------------------------
-
-.o_field_widget {
-    // Many2one
-    &.o_field_many2one .o_external_button {
-        flex: 0 0 auto;
-        padding: 0;
-        margin-left: 2px;
-        font-size: 19px;
-        color: #7C7BAD;
-        border: none;
-        &:hover {
-            background-color: transparent;
-        }
-    }
-}