diff --git a/addons/account/static/src/scss/account_reconciliation.scss b/addons/account/static/src/scss/account_reconciliation.scss
index 2890d1f124e..582f76996cb 100644
--- a/addons/account/static/src/scss/account_reconciliation.scss
+++ b/addons/account/static/src/scss/account_reconciliation.scss
@@ -2,7 +2,6 @@
     .progress-bar {
         font-size: 1.08333333rem;
         height: 14px;
-        background-color: $o-enterprise-color;
         span {
             display: contents;
         }
diff --git a/addons/crm/static/src/scss/crm.scss b/addons/crm/static/src/scss/crm.scss
index e1f91be142f..9cfe1507798 100644
--- a/addons/crm/static/src/scss/crm.scss
+++ b/addons/crm/static/src/scss/crm.scss
@@ -12,7 +12,6 @@
             display: none;
         }
         span {
-            background-color: $o-brand-odoo;
             padding: 5px;
             font-size: small;
             z-index: 0;
diff --git a/addons/event/report/event_event_templates.xml b/addons/event/report/event_event_templates.xml
index fb9528c8c4e..a39ee91c82d 100644
--- a/addons/event/report/event_event_templates.xml
+++ b/addons/event/report/event_event_templates.xml
@@ -15,7 +15,7 @@
                 <div class="oe_structure"/>
                 <div class="o_event_foldable_badge_ticket_wrapper p-2">
                     <div class="o_event_foldable_badge_ticket_wrapper_top page">
-                        <h5 class="o_event_foldable_badge_event_name font-weight-bold text-center" t-field="event.name"/>
+                        <h5 class="o_event_foldable_badge_event_name text-odoo font-weight-bold text-center" t-field="event.name"/>
                         <div class="text-center o_event_foldable_badge_font_small">
                             <span itemprop="startDate" t-out="event.date_begin.date()"
                                 class="font-weight-bold"/>
@@ -117,7 +117,7 @@
                                 <div class="o_event_full_page_ticket_font_faded">
                                     Event Ticket For
                                 </div>
-                                <h5 class="o_event_full_page_ticket_event_name font-weight-bold py-0 my-0" t-field="event.name"/>
+                                <h5 class="o_event_full_page_ticket_event_name text-odoo font-weight-bold py-0 my-0" t-field="event.name"/>
                                 <span itemprop="startDate" t-out="event.date_begin.date()"
                                     class="font-weight-bold"/>
                                 <span itemprop="startDateTime" t-out="event.date_begin"
@@ -177,7 +177,7 @@
     </div>
 
     <div class="row footer o_event_full_page_ticket_footer d-block">
-        <div class="o_event_full_page_ticket_powered_by text-white text-center p-2 w-100">
+        <div class="o_event_full_page_ticket_powered_by bg-odoo text-white text-center p-2 w-100">
             <t t-if="event.organizer_id">
                 <span class="font-weight-bold" t-field="event.organizer_id.name"></span>
                 <span t-if="event.organizer_id.phone" class="pl-3 fa fa-phone"/>
diff --git a/addons/event/static/src/scss/event_foldable_badge_report.scss b/addons/event/static/src/scss/event_foldable_badge_report.scss
index c63217e65de..ffb6896d219 100644
--- a/addons/event/static/src/scss/event_foldable_badge_report.scss
+++ b/addons/event/static/src/scss/event_foldable_badge_report.scss
@@ -44,10 +44,6 @@
                 min-height: 80mm;
             }
 
-            .o_event_foldable_badge_event_name {
-                color: $o-brand-odoo;
-            }
-
             .o_event_foldable_badge_font_faded {
                 color: #939393;
             }
diff --git a/addons/event/static/src/scss/event_full_page_ticket_report.scss b/addons/event/static/src/scss/event_full_page_ticket_report.scss
index f0ec907d7fb..3e2533b1018 100644
--- a/addons/event/static/src/scss/event_full_page_ticket_report.scss
+++ b/addons/event/static/src/scss/event_full_page_ticket_report.scss
@@ -1,6 +1,5 @@
 .o_event_full_page_ticket_footer {
     .o_event_full_page_ticket_powered_by {
-        background-color: $o-brand-odoo;
         font-size: .8rem;
         line-height: 1rem;
     }
@@ -36,10 +35,6 @@
             padding: 10px 3px;
             box-shadow: -3px 3px 9px 0px rgba(0,0,0,0.51);
 
-            .o_event_full_page_ticket_event_name {
-                color: $o-brand-odoo;
-            }
-
             .o_event_full_page_ticket_event_logo {
                 max-height: 50px;
             }
diff --git a/addons/hr_expense/static/src/scss/hr_expense.scss b/addons/hr_expense/static/src/scss/hr_expense.scss
index 51b590aacaa..c33accd90a4 100644
--- a/addons/hr_expense/static/src/scss/hr_expense.scss
+++ b/addons/hr_expense/static/src/scss/hr_expense.scss
@@ -20,10 +20,6 @@
     .o_expense_card_last {
         border-right: 0px;
     }
-
-    .o_expense_purple {
-        color: $o-enterprise-color;
-    }
 }
 .hr_expense {
     &.o_list_view, &.o_kanban_view {
diff --git a/addons/hr_expense/static/src/xml/expense_dashboard.xml b/addons/hr_expense/static/src/xml/expense_dashboard.xml
index ba1a10c8676..7cda520fac8 100644
--- a/addons/hr_expense/static/src/xml/expense_dashboard.xml
+++ b/addons/hr_expense/static/src/xml/expense_dashboard.xml
@@ -7,7 +7,7 @@
                 <div t-attf-class="o_expense_card o_arrow_button flex-grow-1 d-flex flex-column border-right-0">
                     <div class="content_center">
                         <div>
-                            <span t-esc="render_monetary_field(expenses[expense]['amount'], expenses[expense]['currency'])" class="h2 o_expense_purple"/>
+                            <span t-esc="render_monetary_field(expenses[expense]['amount'], expenses[expense]['currency'])" class="h2 text-odoo"/>
                         </div>
                         <b class="m-2"><span t-esc="expenses[expense]['description']"/></b>
                     </div>
diff --git a/addons/hr_holidays/static/src/dashboard/time_off_card.scss b/addons/hr_holidays/static/src/dashboard/time_off_card.scss
index cb0a63715a7..ef4c036603f 100644
--- a/addons/hr_holidays/static/src/dashboard/time_off_card.scss
+++ b/addons/hr_holidays/static/src/dashboard/time_off_card.scss
@@ -1,5 +1,4 @@
 .o_timeoff_card {
-    color: $o-enterprise-color;
     flex-direction: column;
     flex-grow: 1;
     display: flex;
@@ -44,10 +43,6 @@
 }
 
 .o_timeoff_card_mobile {
-    .o_timeoff_purple {
-        color: $o-enterprise-color;
-    }
-
     .o_timeoff_green {
         color: $o-enterprise-primary-color;
     }
diff --git a/addons/hr_holidays/static/src/dashboard/time_off_card.xml b/addons/hr_holidays/static/src/dashboard/time_off_card.xml
index 61f7fc8a240..79a4c1b22be 100644
--- a/addons/hr_holidays/static/src/dashboard/time_off_card.xml
+++ b/addons/hr_holidays/static/src/dashboard/time_off_card.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <templates xml:space="preserve">
-    <div t-name="hr_holidays.TimeOffCard" owl="1" class="o_timeoff_card py-3">
+    <div t-name="hr_holidays.TimeOffCard" owl="1" class="o_timeoff_card py-3 text-odoo">
         <t t-set="data" t-value="props.data"/>
         <t t-set="duration" t-value="props.requires_allocation ? data.virtual_remaining_leaves : data.virtual_leaves_taken"/>
         <t t-set="show_popover" t-value="true"/>
@@ -49,7 +49,7 @@
                 <strong t-esc="duration" class="o_timeoff_green"/> / <span t-esc="data.max_leaves"/> <t t-if="data.request_unit == 'hour'">Hours</t><t t-else="">Days</t> <span class="o_timeoff_green">Available</span>
             </t>
             <t t-else="">
-                <strong t-esc="duration"/> <t t-if="data.request_unit == 'hour'">Hours</t><t t-else="">Days</t> <span class="o_timeoff_purple">Taken</span>
+                <strong t-esc="duration"/> <t t-if="data.request_unit == 'hour'">Hours</t><t t-else="">Days</t> <span class="text-odoo">Taken</span>
             </t>
         </span>
     </t>
diff --git a/addons/hr_recruitment/static/src/scss/hr_job.scss b/addons/hr_recruitment/static/src/scss/hr_job.scss
index b6bee6b4b64..f0001d9b41f 100644
--- a/addons/hr_recruitment/static/src/scss/hr_job.scss
+++ b/addons/hr_recruitment/static/src/scss/hr_job.scss
@@ -13,7 +13,6 @@
             }
 
             span {
-                background-color: $o-brand-odoo;
                 padding: 5px;
                 font-size: small;
                 z-index: unset;
@@ -127,7 +126,6 @@
             }
 
             span {
-                background-color: $o-brand-odoo;
                 padding: 5px;
                 font-size: x-small;
                 z-index: unset;
diff --git a/addons/lunch/static/src/scss/lunch_view.scss b/addons/lunch/static/src/scss/lunch_view.scss
index 6b7056f96f7..540f4db3259 100644
--- a/addons/lunch/static/src/scss/lunch_view.scss
+++ b/addons/lunch/static/src/scss/lunch_view.scss
@@ -11,10 +11,6 @@
         background-color: white;
     }
 
-    .o_lunch_purple {
-        color: $o-brand-odoo;
-    }
-
     .o_flex_basis_0 {
         flex-basis: 0;
     }
diff --git a/addons/lunch/views/lunch_product_views.xml b/addons/lunch/views/lunch_product_views.xml
index fc25e3d0579..791e16c52dc 100644
--- a/addons/lunch/views/lunch_product_views.xml
+++ b/addons/lunch/views/lunch_product_views.xml
@@ -120,7 +120,7 @@
                                         <strong class="o_kanban_record_title">
                                             <div>
                                                 <span class="pr-1"><field name="is_favorite" widget="boolean_favorite" nolabel="1"/></span>
-                                                <div class="float-right o_lunch_purple">
+                                                <div class="float-right text-odoo">
                                                     <field name="price" widget="monetary"/>
                                                 </div>
                                                 <div t-if="record.is_new.raw_value" class="float-right o_lunch_new_product mr-1 badge-pill badge-success">
diff --git a/addons/sales_team/static/src/scss/crm_team_views.scss b/addons/sales_team/static/src/scss/crm_team_views.scss
index 7fe02506f27..2c626e1d13d 100644
--- a/addons/sales_team/static/src/scss/crm_team_views.scss
+++ b/addons/sales_team/static/src/scss/crm_team_views.scss
@@ -25,7 +25,6 @@ $o-kanban-medium-record-width: 350px;
         }
 
         span {
-            background-color: $o-brand-odoo;
             padding: 5px;
             font-size: small;
             height: auto;
diff --git a/addons/sales_team/views/crm_team_member_views.xml b/addons/sales_team/views/crm_team_member_views.xml
index 489ded2ee6a..7351847714f 100644
--- a/addons/sales_team/views/crm_team_member_views.xml
+++ b/addons/sales_team/views/crm_team_member_views.xml
@@ -56,7 +56,7 @@
                     <t t-name="kanban-box">
                         <div class="oe_kanban_card oe_kanban_global_click">
                             <div class="ribbon ribbon-top-right" attrs="{'invisible': [('active', '=', True)]}">
-                                <span class="bg-error">Archived</span>
+                                <span class="bg-odoo">Archived</span>
                             </div>
                             <div class="o_kanban_card_content d-flex">
                                 <div>
diff --git a/addons/web/static/src/legacy/scss/bootstrap_overridden.scss b/addons/web/static/src/legacy/scss/bootstrap_overridden.scss
index a8567ca2c33..54fd6e9b3ad 100644
--- a/addons/web/static/src/legacy/scss/bootstrap_overridden.scss
+++ b/addons/web/static/src/legacy/scss/bootstrap_overridden.scss
@@ -30,6 +30,14 @@ $info: $o-info !default;
 $warning: $o-warning !default;
 $danger: $o-danger !default;
 
+$theme-colors: () !default;
+$theme-colors: map-merge(
+    (
+        "odoo": $o-brand-odoo,
+    ),
+    $theme-colors
+);
+
 // Options
 //
 // Quickly modify global styling by enabling or disabling optional features.
diff --git a/addons/web/static/src/legacy/xml/base.xml b/addons/web/static/src/legacy/xml/base.xml
index b008922a0c8..4a6326b8aa0 100644
--- a/addons/web/static/src/legacy/xml/base.xml
+++ b/addons/web/static/src/legacy/xml/base.xml
@@ -341,9 +341,9 @@
             role="img"
             aria-label="search"
             t-on-keydown="(ev) => this._onFacetKeydown(facet, facet_index, ev)">
-            <span t-if="facet.icon" t-attf-class="o_searchview_facet_label {{ facet.icon }}"/>
-            <span t-else="" class="o_searchview_facet_label" t-esc="facet.title"/>
-            <div class="o_facet_values">
+            <span t-if="facet.icon" t-attf-class="o_searchview_facet_label bg-odoo {{ facet.icon }}"/>
+            <span t-else="" class="o_searchview_facet_label bg-odoo" t-esc="facet.title"/>
+            <div class="o_facet_values border border-odoo border-left-0">
                 <t t-foreach="facet.values" t-as="facetValue" t-key="facetValue_index">
                     <span t-if="!facetValue_first" class="o_facet_values_sep" t-esc="facet.separator"/>
                     <span class="o_facet_value" t-esc="facetValue"/>
diff --git a/addons/web/static/src/legacy/xml/search_panel.xml b/addons/web/static/src/legacy/xml/search_panel.xml
index 9c3ed883e3d..ca38ac17334 100644
--- a/addons/web/static/src/legacy/xml/search_panel.xml
+++ b/addons/web/static/src/legacy/xml/search_panel.xml
@@ -7,7 +7,7 @@
             t-attf-class="o_search_panel_section o_search_panel_{{ section.type }}"
             >
             <header class="o_search_panel_section_header text-uppercase o_cursor_default">
-                <i t-attf-class="fa {{ section.icon }} o_search_panel_section_icon mr-2"
+                <i t-attf-class="fa {{ section.icon }} o_search_panel_section_icon {{section.type === 'category' &amp;&amp; !section.color ? 'text-odoo' : ''}} mr-2"
                     t-att-style="section.color and ('color: ' + section.color)"
                 />
                 <b t-esc="section.description"/>
diff --git a/addons/web/static/src/search/search_bar/search_bar.xml b/addons/web/static/src/search/search_bar/search_bar.xml
index d6210f8603d..c2b4744ecda 100644
--- a/addons/web/static/src/search/search_bar/search_bar.xml
+++ b/addons/web/static/src/search/search_bar/search_bar.xml
@@ -10,12 +10,12 @@
                 t-on-keydown="ev => this.onFacetKeydown(facet, facet_index, ev)"
                 >
                 <t t-if="facet.icon">
-                    <span t-attf-class="o_searchview_facet_label {{ facet.icon }}"/>
+                    <span t-attf-class="o_searchview_facet_label bg-odoo {{ facet.icon }}"/>
                 </t>
                 <t t-else="">
-                    <span class="o_searchview_facet_label" t-esc="facet.title"/>
+                    <span class="o_searchview_facet_label bg-odoo" t-esc="facet.title"/>
                 </t>
-                <div class="o_facet_values">
+                <div class="o_facet_values border border-odoo border-left-0">
                     <t t-foreach="facet.values" t-as="facetValue" t-key="facetValue_index">
                         <t t-if="!facetValue_first">
                             <span class="o_facet_values_sep" t-esc="facet.separator"/>
diff --git a/addons/web/static/src/search/search_panel/search_panel.scss b/addons/web/static/src/search/search_panel/search_panel.scss
index 1aaeadaa428..7fe65e354ba 100644
--- a/addons/web/static/src/search/search_panel/search_panel.scss
+++ b/addons/web/static/src/search/search_panel/search_panel.scss
@@ -29,10 +29,6 @@ $o-searchpanel-filter-default-color: #D59244;
     border-right: 1px solid $gray-300;
     background-color: white;
 
-    .o_search_panel_category .o_search_panel_section_icon {
-        color: $o-brand-odoo;
-    }
-
     .o_search_panel_filter .o_search_panel_section_icon {
         color: $o-searchpanel-filter-default-color;
     }
diff --git a/addons/web/static/src/search/search_panel/search_panel.xml b/addons/web/static/src/search/search_panel/search_panel.xml
index 525eff412a6..b850fe03662 100644
--- a/addons/web/static/src/search/search_panel/search_panel.xml
+++ b/addons/web/static/src/search/search_panel/search_panel.xml
@@ -7,7 +7,7 @@
             t-attf-class="o_search_panel_section o_search_panel_{{ section.type }}"
             >
             <header class="o_search_panel_section_header text-uppercase o_cursor_default">
-                <i t-attf-class="fa {{ section.icon }} o_search_panel_section_icon mr-2"
+                <i t-attf-class="fa {{ section.icon }} o_search_panel_section_icon {{section.type === 'category' &amp;&amp; !section.color ? 'text-odoo' : ''}} mr-2"
                     t-att-style="section.color and ('color: ' + section.color)"
                 />
                 <b t-esc="section.description"/>
diff --git a/addons/web/static/src/search/search_panel/search_view.scss b/addons/web/static/src/search/search_panel/search_view.scss
index 9a355cef0c4..a6d12dbad32 100644
--- a/addons/web/static/src/search/search_panel/search_view.scss
+++ b/addons/web/static/src/search/search_panel/search_view.scss
@@ -18,7 +18,6 @@
 
             .o_searchview_facet_label {
                 align-items: center;
-                color: white;
                 flex: 0 0 auto;
                 padding: 0 3px;
                 @include o-text-overflow($display: flex);
diff --git a/addons/web/static/src/search/search_panel/search_view_extra.scss b/addons/web/static/src/search/search_panel/search_view_extra.scss
index ab13505eb6d..48095046922 100644
--- a/addons/web/static/src/search/search_panel/search_view_extra.scss
+++ b/addons/web/static/src/search/search_panel/search_view_extra.scss
@@ -5,13 +5,8 @@
     padding: 1px 25px 3px 5px;
 
     .o_searchview_facet {
-        border: 1px solid gray('600');
         background: $o-brand-lightsecondary;
 
-        .o_searchview_facet_label {
-            background-color: $o-brand-odoo;
-        }
-
         .o_facet_remove {
             color: gray('600');
             &:hover {
diff --git a/addons/website_hr_recruitment/views/hr_job_views.xml b/addons/website_hr_recruitment/views/hr_job_views.xml
index c83a52d325a..51d0a46703b 100644
--- a/addons/website_hr_recruitment/views/hr_job_views.xml
+++ b/addons/website_hr_recruitment/views/hr_job_views.xml
@@ -8,7 +8,7 @@
             <xpath expr="//div[hasclass('o_kanban_card_header')]" position="before">
                 <field name="website_published" invisible="1"/>
                 <div class="ribbon ribbon-top-right" attrs="{'invisible': [('website_published', '=', False)]}">
-                    <span class="o_recruitment_purple">Published</span>
+                    <span class="bg-odoo">Published</span>
                 </div>
             </xpath>
             <xpath expr="//div[@name='kanban_boxes']" position="inside">