diff --git a/addons/web/static/src/legacy/js/fields/upgrade_fields.js b/addons/web/static/src/legacy/js/fields/upgrade_fields.js
index 141aa616c92..343159cf22a 100644
--- a/addons/web/static/src/legacy/js/fields/upgrade_fields.js
+++ b/addons/web/static/src/legacy/js/fields/upgrade_fields.js
@@ -94,7 +94,7 @@ var AbstractFieldUpgrade = {
         this._super.apply(this, arguments);
         this._insertEnterpriseLabel($("<span>", {
             text: "Enterprise",
-            'class': "badge bg-primary oe_inline o_enterprise_label"
+            'class': "badge text-bg-primary oe_inline o_enterprise_label"
         }));
     },
     /**
diff --git a/addons/web/static/src/webclient/settings_form_view/settings_form_view.scss b/addons/web/static/src/webclient/settings_form_view/settings_form_view.scss
index 426288e06d1..9e4f6fbd071 100644
--- a/addons/web/static/src/webclient/settings_form_view/settings_form_view.scss
+++ b/addons/web/static/src/webclient/settings_form_view/settings_form_view.scss
@@ -18,6 +18,7 @@
 .o_setting_box {
    margin-bottom: 8px;
    margin-top: 8px;
+   position: relative;
 }
 
 .o_setting_left_pane {