diff --git a/addons/account/static/description/icon.png b/addons/account/static/description/icon.png
index bf531700dbb..d94a0ed2328 100644
Binary files a/addons/account/static/description/icon.png and b/addons/account/static/description/icon.png differ
diff --git a/addons/account/static/description/icon.svg b/addons/account/static/description/icon.svg
new file mode 100644
index 00000000000..a32927bf67f
--- /dev/null
+++ b/addons/account/static/description/icon.svg
@@ -0,0 +1 @@
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M38 46H12c-4.418 0-8-3.498-8-7.814V4h30c2.21 0 4 1.75 4 3.907V46Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path d="M38 46H12c-4.418 0-8-3.498-8-7.814V4h30c2.21 0 4 1.75 4 3.907V46Z" fill="url(#o_icon_account__a)" fill-opacity=".2"/><path d="M12 46h26a7.999 7.999 0 0 0 8-8H20a8 8 0 0 1-8 8Z" fill="var(--o-icons-purple-cyan, #102E7A)"/><path d="M12 46h26a7.999 7.999 0 0 0 8-8H20a8 8 0 0 1-8 8Z" fill="url(#o_icon_account__b)" fill-opacity=".3"/><path d="M38 8C23.408 8 10.687 16.014 4 27.88V4h30a4 4 0 0 1 4 4Z" fill="var(--o-icons-cyan-cyan, #0382F3)"/><path d="M38 8C23.408 8 10.687 16.014 4 27.88V4h30a4 4 0 0 1 4 4Z" fill="url(#o_icon_account__c)" fill-opacity=".2"/><path d="M20.425 34h1.181v-1.707c3.23-.198 5.394-1.791 5.394-4.435v-.021c0-2.332-1.495-3.498-4.442-4.143l-.952-.198v-3.02c1.035.167 1.715.74 1.86 1.708l.011.02 3.283-.01.01-.01c-.115-2.53-2.007-4.216-5.164-4.435V16h-1.18v1.739c-3.074.145-5.28 1.728-5.28 4.33v.021c0 2.343 1.547 3.602 4.338 4.216l.941.198v3.082c-1.223-.115-1.934-.625-2.101-1.54l-.01-.022-3.293.01-.021.011c.084 2.665 2.237 4.133 5.425 4.258V34Zm-1.777-12.19v-.022c0-.75.606-1.228 1.777-1.332v2.769c-1.213-.323-1.777-.729-1.777-1.416Zm4.85 6.423v.02c0 .802-.68 1.229-1.892 1.333v-2.821c1.36.343 1.892.697 1.892 1.468Z" fill="var(--o-icons-white, #FFFFFF)"/><defs><linearGradient id="o_icon_account__a" x1="4" y1="4" x2="44.828" y2="12.263" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_account__b" x1="12" y1="38" x2="31.963" y2="59.211" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_account__c" x1="4" y1="4" x2="41.721" y2="17.426" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/account/static/src/components/bills_upload/bills_upload.xml b/addons/account/static/src/components/bills_upload/bills_upload.xml
index a08f66c94e8..e01e7159fc7 100644
--- a/addons/account/static/src/components/bills_upload/bills_upload.xml
+++ b/addons/account/static/src/components/bills_upload/bills_upload.xml
@@ -51,13 +51,13 @@
     </t>
 
     <t t-name="account.ListView.Buttons" t-inherit="web.ListView.Buttons" t-inherit-mode="primary" owl="1">
-        <xpath expr="//*[@class='btn btn-primary o_list_button_add']" position="after">
+        <xpath expr="//div[hasclass('o_list_buttons')]" position="inside">
             <t t-call="account.AccountViewUploadButton"/>
         </xpath>
     </t>
 
     <t t-name="account.KanbanView.Buttons" t-inherit="web.KanbanView.Buttons" t-inherit-mode="primary" owl="1">
-        <xpath expr="//*[@class='btn btn-primary o-kanban-button-new']" position="after">
+        <xpath expr="//div[hasclass('o_cp_buttons')]" position="inside">
             <t t-call="account.AccountViewUploadButton"/>
         </xpath>
     </t>
diff --git a/addons/account/static/src/scss/account_journal_dashboard.scss b/addons/account/static/src/scss/account_journal_dashboard.scss
index fdefc7c3c88..91ddc1295d1 100644
--- a/addons/account/static/src/scss/account_journal_dashboard.scss
+++ b/addons/account/static/src/scss/account_journal_dashboard.scss
@@ -38,16 +38,6 @@
             width: 450px;
         }
     }
-
-    .o_kanban_group {
-        &:not(.o_column_folded) {
-            width: 450px + 2*$o-kanban-group-padding;
-
-            @include media-breakpoint-down(md) {
-                width: 100%;
-            }
-        }
-    }
 }
 
 // Style for the widget "dashboard_graph"
diff --git a/addons/account/static/tests/tours/account_dashboard_setup_bar_tests.js b/addons/account/static/tests/tours/account_dashboard_setup_bar_tests.js
index f3a99e9d0a5..2a61917394f 100644
--- a/addons/account/static/tests/tours/account_dashboard_setup_bar_tests.js
+++ b/addons/account/static/tests/tours/account_dashboard_setup_bar_tests.js
@@ -16,11 +16,12 @@
         position: 'bottom',
     }, {
         trigger: '.o_data_row:first .o_data_cell',
-        extra_trigger: '.breadcrumb',
+        extra_trigger: '.o_breadcrumb',
     }, {
-        trigger: '.o_control_panel button:contains("' + _t('Print') + '")',
+        trigger: '.o_control_panel .o_cp_action_menus .dropdown-toggle',
+        extra_trigger: '.o_breadcrumb .active:contains("INV/")',
     }, {
-        trigger: '.o_control_panel .o-dropdown--menu span:contains("' + _t('Invoices without Payment') + '")',
+        trigger: '.o_control_panel .o_cp_action_menus .o_menu_item:contains("' + _t('Invoices without Payment') + '")',
     }, {
         trigger: 'iframe .o_report_layout_standard h2',
         content: 'Primary color is correct',
diff --git a/addons/account/views/account_account_tag_views.xml b/addons/account/views/account_account_tag_views.xml
index 9d43680c58a..89a9d96264c 100644
--- a/addons/account/views/account_account_tag_views.xml
+++ b/addons/account/views/account_account_tag_views.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Tags">
                     <sheet>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <group>
                             <field name="active" invisible="1"/>
                             <field name="name"/>
diff --git a/addons/account/views/account_incoterms_view.xml b/addons/account/views/account_incoterms_view.xml
index 53e4ba18e22..332da23bc8e 100644
--- a/addons/account/views/account_incoterms_view.xml
+++ b/addons/account/views/account_incoterms_view.xml
@@ -20,7 +20,7 @@
             <field name="arch" type="xml">
                 <form string="Incoterms">
                     <sheet>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <group>
                             <field name="active" invisible="1"/>
                             <field name="name"/>
diff --git a/addons/account/views/account_journal_views.xml b/addons/account/views/account_journal_views.xml
index 7d9dd336a46..deb155ab402 100644
--- a/addons/account/views/account_journal_views.xml
+++ b/addons/account/views/account_journal_views.xml
@@ -33,10 +33,14 @@
                     <sheet>
                         <div name="button_box" class="oe_button_box">
                             <button class="oe_stat_button" type="action"
-                                    name="%(action_account_moves_all_a)d" icon="fa-book" string="Journal Entries"
-                                    context="{'search_default_journal_id':active_id}"/>
+                                    name="%(action_account_moves_all_a)d" icon="fa-book"
+                                    context="{'search_default_journal_id':active_id}">
+                                    <div class="o_stat_info">
+                                        <span class="o_stat_text">Journal Entries</span>
+                                    </div>
+                            </button>
                         </div>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <div class="oe_title">
                             <label for="name"/>
                             <h1><field name="name" placeholder="e.g. Customer Invoices"/></h1>
@@ -140,7 +144,7 @@
                                     </group>
                                     <group name="group_alias_no_domain" string="Create Invoices upon Emails" attrs="{'invisible': ['|', ('type', 'not in',  ('sale' ,'purchase')), ('alias_domain', '!=', False)]}">
                                         <div class="content-group" colspan="2">
-                                            <a type='action' name='%(action_open_settings)d' class="btn btn-link" role="button"><i class="fa fa-fw o_button_icon fa-arrow-right"/> Configure Email Servers</a>
+                                            <a type='action' name='%(action_open_settings)d' class="btn btn-link" role="button"><i class="oi oi-fw o_button_icon oi-arrow-right"/> Configure Email Servers</a>
                                         </div>
                                     </group>
                                     <group class="oe_edit_only" name="group_alias_edit" string="Create Invoices upon Emails" attrs="{'invisible': ['|', ('type', 'not in',  ('sale' ,'purchase')), ('alias_domain', '=', False)]}">
diff --git a/addons/account/views/account_menuitem.xml b/addons/account/views/account_menuitem.xml
index 7b275783a4d..8c05bcf55e6 100644
--- a/addons/account/views/account_menuitem.xml
+++ b/addons/account/views/account_menuitem.xml
@@ -4,7 +4,7 @@
     <menuitem name="Invoicing"
         id="menu_finance"
         groups="account.group_account_readonly,account.group_account_invoice"
-        web_icon="account,static/description/icon.png"
+        web_icon="account,static/description/icon.svg"
         sequence="55">
         <menuitem id="menu_board_journal_1" name="Dashboard" action="open_account_journal_dashboard_kanban" groups="account.group_account_readonly" sequence="1"/>
         <menuitem id="menu_finance_receivables" name="Customers" sequence="2">
diff --git a/addons/account/views/account_move_views.xml b/addons/account/views/account_move_views.xml
index 4203990cacf..6e95f28aa32 100644
--- a/addons/account/views/account_move_views.xml
+++ b/addons/account/views/account_move_views.xml
@@ -111,7 +111,7 @@
                                         <field name="name"/>
                                     </em>
                                     <div class="col-2 text-end">
-                                        <img t-att-src="kanban_image('res.partner', 'avatar_128', record.partner_id.raw_value)" t-att-title="record.partner_id.value" t-att-alt="record.partner_id.value" class="oe_kanban_avatar o_image_24_cover"/>
+                                        <img t-att-src="kanban_image('res.partner', 'avatar_128', record.partner_id.raw_value)" t-att-title="record.partner_id.value" t-att-alt="record.partner_id.value" class="oe_kanban_avatar o_avatar rounded"/>
                                     </div>
                                 </div>
                                 <div class="row">
@@ -683,22 +683,28 @@
                                     class="oe_stat_button"
                                     icon="fa-bars"
                                     type="object"
-                                    attrs="{'invisible': ['|', '|', ('move_type', '!=', 'entry'), ('id', '=', False), ('payment_id', '=', False)]}"
-                                    string="1 Payment">
+                                    attrs="{'invisible': ['|', '|', ('move_type', '!=', 'entry'), ('id', '=', False), ('payment_id', '=', False)]}">
+                                    <div class="o_stat_info">
+                                        <span class="o_stat_text">1 Payment</span>
+                                    </div>
                             </button>
                             <button name="open_reconcile_view"
                                     class="oe_stat_button"
                                     icon="fa-bars"
                                     type="object"
-                                    attrs="{'invisible': ['|', '|', ('move_type', '!=', 'entry'), ('id', '=', False), ('has_reconciled_entries', '=', False)]}"
-                                    string="Reconciled Items">
+                                    attrs="{'invisible': ['|', '|', ('move_type', '!=', 'entry'), ('id', '=', False), ('has_reconciled_entries', '=', False)]}">
+                                    <div class="o_stat_info">
+                                        <span class="o_stat_text">Reconciled Items</span>
+                                    </div>
                             </button>
                             <button name="open_created_caba_entries"
                                     class="oe_stat_button"
                                     icon="fa-usd"
                                     type="object"
-                                    attrs="{'invisible': [('tax_cash_basis_created_move_ids', '=', [])]}"
-                                    string="Cash Basis Entries">
+                                    attrs="{'invisible': [('tax_cash_basis_created_move_ids', '=', [])]}">
+                                    <div class="o_stat_info">
+                                        <span class="o_stat_text">Cash Basis Entries</span>
+                                    </div>
                             </button>
                         </div>
 
@@ -710,10 +716,10 @@
                         <widget name="web_ribbon" title="Partial"
                                 attrs="{'invisible': ['|', ('payment_state', '!=', 'partial'), ('move_type', 'not in', ('out_invoice', 'out_refund', 'in_invoice', 'in_refund', 'out_receipt', 'in_receipt'))]}"/>
                         <widget name="web_ribbon" title="Reversed"
-                                bg_color="bg-danger"
+                                bg_color="text-bg-danger"
                                 attrs="{'invisible': [('payment_state', '!=', 'reversed')]}"/>
                          <widget name="web_ribbon" text="Invoicing App Legacy"
-                                bg_color="bg-info"
+                                bg_color="text-bg-info"
                                 attrs="{'invisible': [('payment_state', '!=', 'invoicing_legacy')]}"
                                 tooltip="This entry has been generated through the Invoicing app, before installing Accounting. It has been disabled by the 'Invoicing Switch Threshold Date' setting so that it does not impact your accounting."/>
 
diff --git a/addons/account/views/account_onboarding_templates.xml b/addons/account/views/account_onboarding_templates.xml
index 6d020dbc6ab..9266df9108e 100644
--- a/addons/account/views/account_onboarding_templates.xml
+++ b/addons/account/views/account_onboarding_templates.xml
@@ -5,6 +5,8 @@
         <t t-call="base.onboarding_step">
             <t t-set="title">Invoice Layout</t>
             <t t-set="description">Customize the look of your invoices.</t>
+            <t t-set="image" t-value="'/base/static/img/onboarding_quotation-layout.png'"/>
+            <t t-set="alt" t-value="'Invoice Layout'"/>
             <t t-set="done_icon" t-value="'fa-star'" />
             <t t-set="btn_text">Customize</t>
             <t t-set="done_text">Looks great!</t>
@@ -19,6 +21,8 @@
             <t t-set="description">
                 Create your first invoice.
             </t>
+            <t t-set="image" t-value="'/base/static/img/onboarding_order-confirmation.png'"/>
+            <t t-set="alt" t-value="'Onboarding Create Invoice'"/>
             <t t-set="btn_text">Create</t>
             <t t-set="done_text">First invoice sent!</t>
             <t t-set="method" t-value="'action_open_account_onboarding_create_invoice'" />
@@ -32,6 +36,8 @@
             <t t-set="description">
                 Connect your financial accounts in seconds.
             </t>
+            <t t-set="image" t-value="'/base/static/img/onboarding_puzzle.png'"/>
+            <t t-set="alt" t-value="'Onboarding Bank Account'"/>
             <t t-set="btn_text">Add a bank account</t>
             <t t-set="done_text">Step Completed!</t>
             <t t-set="method" t-value="'setting_init_bank_account_action'" />
@@ -43,6 +49,8 @@
         <t t-call="base.onboarding_step">
             <t t-set="title">Accounting Periods</t>
             <t t-set="description">Define your fiscal years &amp; tax returns periodicity.</t>
+            <t t-set="image" t-value="'/base/static/img/onboarding_accounting-periods.png'"/>
+            <t t-set="alt" t-value="'Onboarding Accounting Periods'"/>
             <t t-set="btn_text">Configure</t>
             <t t-set="done_text">Step Completed!</t>
             <t t-set="method" t-value="'setting_init_fiscal_year_action'" />
@@ -54,6 +62,8 @@
         <t t-call="base.onboarding_step">
             <t t-set="title">Chart of Accounts</t>
             <t t-set="description">Setup your chart of accounts and record initial balances.</t>
+            <t t-set="image" t-value="'/base/static/img/onboarding_chart-of-accounts.png'"/>
+            <t t-set="alt" t-value="'Onboarding Chart of Accounts'"/>
             <t t-set="btn_text">Review</t>
             <t t-set="done_text">Chart of accounts set.</t>
             <t t-set="method" t-value="'setting_chart_of_accounts_action'" />
@@ -65,6 +75,8 @@
         <t t-call="base.onboarding_step">
             <t t-set="title">Taxes</t>
             <t t-set="description">Set default Taxes for sales and purchase transactions.</t>
+            <t t-set="image" t-value="'/base/static/img/onboarding_taxes.png'"/>
+            <t t-set="alt" t-value="'Onboarding Taxes'"/>
             <t t-set="btn_text">Review</t>
             <t t-set="done_text">Taxes set.</t>
             <t t-set="method" t-value="'action_open_taxes_onboarding'" />
@@ -75,8 +87,6 @@
     <!-- ONBOARDING PANELS -->
     <template id="account_invoice_onboarding_panel" name="account.invoice.onboarding.panel">
         <t t-call="base.onboarding_container">
-            <t t-set="classes" t-value="'o_onboarding_blue'"/>
-            <t t-set="bg_image" t-value="'/account/static/src/img/account_invoice_onboarding_bg.jpg'"/>
             <t t-set="close_method" t-value="'action_close_account_invoice_onboarding'"/>
             <t t-set="close_model" t-value="'res.company'"/>
             <t t-set="text_completed">Congratulations! You are all set.</t>
@@ -89,8 +99,6 @@
     </template>
     <template id="account_dashboard_onboarding_panel" name="account.dashboard.onboarding.panel">
         <t t-call="base.onboarding_container">
-            <t t-set="classes" t-value="'o_onboarding_orange'"/>
-            <t t-set="bg_image" t-value="'/account/static/src/img/account_dashboard_onboarding_bg.jpg'"/>
             <t t-set="close_method" t-value="'action_close_account_dashboard_onboarding'"/>
             <t t-set="close_model" t-value="'res.company'"/>
 
@@ -114,6 +122,8 @@
             <t t-set="title">Taxes</t>
             <t t-set="description">Choose a default sales tax for your products.</t>
             <t t-set="btn_text">Set taxes</t>
+            <t t-set="image" t-value="'/base/static/img/onboarding_taxes.png'"/>
+            <t t-set="alt" t-value="'Onboarding Taxes'"/>
             <t t-set="done_text">Step Completed!</t>
             <t t-set="method" t-value="'action_open_account_onboarding_sale_tax'" />
             <t t-set="model" t-value="'res.company'" />
diff --git a/addons/account/views/account_payment_term_views.xml b/addons/account/views/account_payment_term_views.xml
index b75c814754d..1658dbfaacd 100644
--- a/addons/account/views/account_payment_term_views.xml
+++ b/addons/account/views/account_payment_term_views.xml
@@ -35,7 +35,7 @@
                     <sheet>
                         <field name="active" invisible="1"/>
                         <field name="fiscal_country_codes" invisible="1"/>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <div class="oe_title">
                             <label for="name" string="Payment Terms"/>
                             <h1><field name="name" nolabel="1" placeholder="e.g. 30 days"/></h1>
diff --git a/addons/account/views/account_payment_view.xml b/addons/account/views/account_payment_view.xml
index e5e18cb2911..b026ae4a0b2 100644
--- a/addons/account/views/account_payment_view.xml
+++ b/addons/account/views/account_payment_view.xml
@@ -225,7 +225,7 @@
                                     attrs="{'invisible': [('reconciled_statement_lines_count','=', 0)]}">
                                 <div class="o_form_field o_stat_info">
                                     <field name="reconciled_statement_lines_count"/>
-                                    <span> Transaction</span>
+                                    <span class="o_stat_text">Transaction</span>
                                 </div>
                             </button>
 
@@ -242,7 +242,7 @@
                         </div>
 
                         <widget name="web_ribbon" text="Invoicing App Legacy"
-                                bg_color="bg-info"
+                                bg_color="text-bg-info"
                                 attrs="{'invisible': [('state', '!=', 'invoicing_legacy')]}"
                                 tooltip="This payment has been generated through the Invoicing app, before installing Accounting. It has been disabled by the 'Invoicing Switch Threshold Date' setting so that it does not impact your accounting."
                         />
diff --git a/addons/account/views/partner_view.xml b/addons/account/views/partner_view.xml
index 5d6e7376458..ebd337f1ea7 100644
--- a/addons/account/views/partner_view.xml
+++ b/addons/account/views/partner_view.xml
@@ -36,7 +36,7 @@
 
                     <sheet>
                     <div class="oe_button_box" name="button_box"/>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <group>
                         <group>
                             <field name="active" invisible="1"/>
diff --git a/addons/account/views/res_config_settings_views.xml b/addons/account/views/res_config_settings_views.xml
index 1c29c38d66c..b00009c63bf 100644
--- a/addons/account/views/res_config_settings_views.xml
+++ b/addons/account/views/res_config_settings_views.xml
@@ -87,7 +87,7 @@
                                         <field name="group_multi_currency" invisible="1"/>
                                     </div>
                                     <div class="mt8">
-                                        <button type="action" name="%(base.action_currency_form)d" string="Currencies" class="btn-link" icon="fa-arrow-right"/>
+                                        <button type="action" name="%(base.action_currency_form)d" string="Currencies" class="btn-link" icon="oi-arrow-right"/>
                                     </div>
                                 </div>
                             </setting>
@@ -128,7 +128,7 @@
                                 documentation="/applications/finance/accounting/receivables/customer_invoices/cash_rounding.html">
                                 <field name="group_cash_rounding"/>
                                 <div class="mt8">
-                                    <button name="%(account.rounding_list_action)d" icon="fa-arrow-right"
+                                    <button name="%(account.rounding_list_action)d" icon="oi-arrow-right"
                                             type="action" string="Cash Roundings" class="btn-link"
                                             attrs="{'invisible': [('group_cash_rounding', '=', False)]}"/>
                                 </div>
@@ -155,12 +155,12 @@
                                                     placeholder="Insert your terms &amp; conditions here..."/>
                                         </div>
                                         <div class="mt8" attrs="{'invisible': [('terms_type', '!=', 'html')]}">
-                                            <button name="action_update_terms" icon="fa-arrow-right" type="object" string="Update Terms" class="btn-link"/>
+                                            <button name="action_update_terms" icon="oi-arrow-right" type="object" string="Update Terms" class="btn-link"/>
                                         </div>
                                         <field name="preview_ready" invisible="1"/>
                                         <div class="mt4 ms-1" attrs="{'invisible': [('preview_ready', '=', False)]}">
                                             <a class="btn-link" href="/terms" role="button">
-                                                <i class="fa fa-arrow-right"></i>
+                                                <i class="oi oi-arrow-right"></i>
                                                 Preview
                                             </a>
                                         </div>
diff --git a/addons/account/views/terms_template.xml b/addons/account/views/terms_template.xml
index 6d033e689a6..647f3caa6e6 100644
--- a/addons/account/views/terms_template.xml
+++ b/addons/account/views/terms_template.xml
@@ -3,7 +3,7 @@
     <template id="account.account_terms_conditions_setting_banner" name="Account Terms and Conditions Setting Banner">
         <div id="terms_conditions" t-ignore="true" class="text-center">
             <span>This is a preview of your Terms &amp; Conditions.</span>
-            <a t-att-href="backend_url"><i class="fa fa-arrow-right me-1"/>Back to settings</a>
+            <a t-att-href="backend_url"><i class="oi oi-arrow-right me-1"/>Back to settings</a>
         </div>
         <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
     </template>
diff --git a/addons/account_check_printing/static/description/icon.png b/addons/account_check_printing/static/description/icon.png
index a674b194c73..54df73f03ea 100644
Binary files a/addons/account_check_printing/static/description/icon.png and b/addons/account_check_printing/static/description/icon.png differ
diff --git a/addons/account_check_printing/static/description/icon.svg b/addons/account_check_printing/static/description/icon.svg
index 1f94ecebfb8..6a3b41792bb 100644
--- a/addons/account_check_printing/static/description/icon.svg
+++ b/addons/account_check_printing/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#DA956B"/><stop offset="100%" stop-color="#CC7039"/></linearGradient><path id="d" d="M50.25 52.79l-3.61-3.11v-8.95H24.347v14.439H42.08l2.882 3.243h-21.43c-.985 0-1.782-.785-1.782-1.754v-13.59h-3.86a.884.884 0 0 1-.89-.877v-9.648c0-1.938 1.595-3.509 3.563-3.509h1.187v-12.28c0-.969.797-1.754 1.781-1.754h20.637c.473 0 .926.185 1.26.514l4.3 4.235c.334.329.522.775.522 1.24v8.045h1.188c1.967 0 3.562 1.571 3.562 3.509v9.648a.884.884 0 0 1-.89.877h-3.86v9.723zm-21.926-7.05c0 1.41 4.636 1.052 4.636 3.734 0 1.284-1.015 2.381-2.664 2.61v1.063c0 .148-.135.268-.301.268h-1.004c-.166 0-.3-.12-.3-.268v-1.08c-.992-.151-1.875-.56-2.478-1.075a.248.248 0 0 1-.033-.355l.762-.911a.326.326 0 0 1 .431-.048c.625.448 1.433.804 2.204.804.899 0 1.308-.478 1.308-.922 0-1.313-4.636-1.028-4.636-3.796 0-1.18.97-2.136 2.441-2.433v-1.117c0-.148.135-.268.301-.268h1.004c.166 0 .301.12.301.268v1.059c.807.083 1.681.365 2.29.847.105.082.132.219.065.328l-.59.976c-.087.143-.294.185-.442.09-.56-.36-1.248-.635-1.918-.635-.836 0-1.377.338-1.377.86zm-3.977-14.367H46.64v-8.14H43.6c-.676-.022-1.013-.354-1.013-.998v-2.923l-18.24-.07v12.131zm24.715 5.263c.984 0 1.782-.785 1.782-1.754 0-.97-.798-1.755-1.782-1.755-.983 0-1.78.786-1.78 1.755 0 .969.797 1.754 1.78 1.754zm-7.031 12.698c1.61.343 2.64.782 3.089 1.317l5.773 6.88-2.328 1.954-5.774-6.88c-.34-.404-.592-1.495-.76-3.27zm7.072 10.736l2.33-1.954 1.282 1.529c.428.51.383.982-.135 1.416l-.776.651c-.517.434-.99.397-1.418-.113l-1.283-1.529zm.494-5.272l.01-.009a.5.5 0 0 1 .704.062l2.334 2.781a.5.5 0 0 1-.061.705l-.01.008a.5.5 0 0 1-.705-.061l-2.334-2.782a.5.5 0 0 1 .062-.704zM35 44h9v.998h-9V44zm0 3h9v.998h-9V47z"/><path id="e" d="M50.25 50.79l-3.61-3.11v-8.95H24.347v14.439H42.08l2.882 3.243h-21.43c-.985 0-1.782-.785-1.782-1.754v-13.59h-3.86a.884.884 0 0 1-.89-.877v-9.648c0-1.938 1.595-3.509 3.563-3.509h1.187v-12.28c0-.969.797-1.754 1.781-1.754h20.637c.473 0 .926.185 1.26.514l4.3 4.235c.334.329.522.775.522 1.24v8.045h1.188c1.967 0 3.562 1.571 3.562 3.509v9.648a.884.884 0 0 1-.89.877h-3.86v9.723zm-21.926-7.05c0 1.41 4.636 1.052 4.636 3.734 0 1.284-1.015 2.381-2.664 2.61v1.063c0 .148-.135.268-.301.268h-1.004c-.166 0-.3-.12-.3-.268v-1.08c-.992-.151-1.875-.56-2.478-1.075a.248.248 0 0 1-.033-.355l.762-.911a.326.326 0 0 1 .431-.048c.625.448 1.433.804 2.204.804.899 0 1.308-.478 1.308-.922 0-1.313-4.636-1.028-4.636-3.796 0-1.18.97-2.136 2.441-2.433v-1.117c0-.148.135-.268.301-.268h1.004c.166 0 .301.12.301.268v1.059c.807.083 1.681.365 2.29.847.105.082.132.219.065.328l-.59.976c-.087.143-.294.185-.442.09-.56-.36-1.248-.635-1.918-.635-.836 0-1.377.338-1.377.86zm-3.977-14.367H46.64v-8.14H43.6c-.676-.022-1.013-.354-1.013-.998v-2.923l-18.24-.07v12.131zm24.715 5.263c.984 0 1.782-.785 1.782-1.754 0-.97-.798-1.755-1.782-1.755-.983 0-1.78.786-1.78 1.755 0 .969.797 1.754 1.78 1.754zm-7.031 12.698c1.61.343 2.64.782 3.089 1.317l5.773 6.88-2.328 1.954-5.774-6.88c-.34-.404-.592-1.495-.76-3.27zm7.072 10.736l2.33-1.954 1.282 1.529c.428.51.383.982-.135 1.416l-.776.651c-.517.434-.99.397-1.418-.113l-1.283-1.529zm.494-5.272l.01-.009a.5.5 0 0 1 .704.062l2.334 2.781a.5.5 0 0 1-.061.705l-.01.008a.5.5 0 0 1-.705-.061l-2.334-2.782a.5.5 0 0 1 .062-.704zM35 42h9v.998h-9V42zm0 3h9v.998h-9V45z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M42.865 69H4c-2 0-4-1-4-4V38.062l22.272-24.547L24.037 13H44.02L49 17v13h5.814v10.707l-4.599 5.878v4.163l-1.966 2.081.555.876.84-.876 2.964 3.459-.858.636L53 58.5 42.865 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M4 17a4 4 0 0 1 4-4h38v20a4 4 0 0 1-4 4H4V17Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M4 17a4 4 0 0 1 4-4h38v20a4 4 0 0 1-4 4H4V17Z" fill="url(#o_icon_account_check_printing__a)" fill-opacity=".2"/><path d="M8 8a4 4 0 0 1 4-4h26a4 4 0 0 1 4 4v5H8V8Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M8 8a4 4 0 0 1 4-4h26a4 4 0 0 1 4 4v5H8V8Z" fill="url(#o_icon_account_check_printing__b)" fill-opacity=".2"/><path d="M13 37h24v5a4 4 0 0 1-4 4H13v-9Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M13 37h24v5a4 4 0 0 1-4 4H13v-9Z" fill="url(#o_icon_account_check_printing__c)" fill-opacity=".2"/><path d="M37 37H13v-8h24v8Z" fill="var(--o-icons-purple-yellow, #912C18)"/><path d="M37 37H13v-8h24v8Z" fill="url(#o_icon_account_check_printing__d)" fill-opacity=".2"/><defs><linearGradient id="o_icon_account_check_printing__a" x1="4" y1="13" x2="48.066" y2="32.279" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_account_check_printing__b" x1="8" y1="4" x2="30.463" y2="25.215" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_account_check_printing__c" x1="13" y1="37" x2="33.769" y2="50.846" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_account_check_printing__d" x1="13" y1="29" x2="32.2" y2="43.4" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/account_payment/views/account_move_views.xml b/addons/account_payment/views/account_move_views.xml
index c6fb4ed6297..0be75f55b79 100644
--- a/addons/account_payment/views/account_move_views.xml
+++ b/addons/account_payment/views/account_move_views.xml
@@ -28,8 +28,11 @@
                 <field name="transaction_ids" invisible="1" />
                 <button name="action_view_payment_transactions" type="object"
                         class="oe_stat_button" icon="fa-money"
-                        string="Payment Transaction"
-                        attrs="{'invisible': [('transaction_ids', '=', [])]}" />
+                        attrs="{'invisible': [('transaction_ids', '=', [])]}">
+                        <div class="o_stat_info">
+                            <span class="o_stat_text">Payment Transaction</span>
+                        </div>
+                </button>
             </xpath>
         </field>
     </record>
diff --git a/addons/account_payment/views/onboarding_templates.xml b/addons/account_payment/views/onboarding_templates.xml
index 8485c35c26b..c689f85c2df 100644
--- a/addons/account_payment/views/onboarding_templates.xml
+++ b/addons/account_payment/views/onboarding_templates.xml
@@ -11,6 +11,8 @@
         <t t-call="base.onboarding_step">
             <t t-set="title">Online Payments</t>
             <t t-set="description">Enable credit &amp; debit card payments supported by Stripe</t>
+            <t t-set="image" t-value="'/base/static/img/onboarding_bank-account.png'"/>
+            <t t-set="alt" t-value="'Online Payments'"/>
             <t t-set="btn_text">Activate Stripe</t>
             <t t-set="done_text">Online payments enabled</t>
             <t t-set="model" t-value="'res.company'"/>
diff --git a/addons/analytic/views/analytic_account_views.xml b/addons/analytic/views/analytic_account_views.xml
index 7546634fb9b..3297661fbb1 100644
--- a/addons/analytic/views/analytic_account_views.xml
+++ b/addons/analytic/views/analytic_account_views.xml
@@ -17,7 +17,7 @@
                                 </div>
                             </button>
                         </div>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <div class="oe_title">
                             <label for="name"/>
                             <h1>
diff --git a/addons/auth_ldap/views/res_config_settings_views.xml b/addons/auth_ldap/views/res_config_settings_views.xml
index c00536dacce..c1c21069ad1 100644
--- a/addons/auth_ldap/views/res_config_settings_views.xml
+++ b/addons/auth_ldap/views/res_config_settings_views.xml
@@ -7,7 +7,7 @@
         <field name="arch" type="xml">
             <setting id="module_auth_ldap" position="inside">
                 <div class="mt8" attrs="{'invisible': [('module_auth_ldap','=',False)]}">
-                   <button type="action" name="%(auth_ldap.action_ldap_installer)d" string="LDAP Server" icon="fa-arrow-right" class="btn-link"/>
+                   <button type="action" name="%(auth_ldap.action_ldap_installer)d" string="LDAP Server" icon="oi-arrow-right" class="btn-link"/>
                 </div>
             </setting>
             <div id="auth_ldap_warning" position="replace"/>
diff --git a/addons/auth_oauth/views/res_config_settings_views.xml b/addons/auth_oauth/views/res_config_settings_views.xml
index 06abe9abea7..e6a20151428 100644
--- a/addons/auth_oauth/views/res_config_settings_views.xml
+++ b/addons/auth_oauth/views/res_config_settings_views.xml
@@ -8,7 +8,7 @@
                 <div id="msg_module_auth_oauth" position="replace">
                     <div class="content-group" attrs="{'invisible': [('module_auth_oauth','=',False)]}">
                         <div class="mt8">
-                            <button type="action" name="%(auth_oauth.action_oauth_provider)d" string="OAuth Providers" icon="fa-arrow-right" class="btn-link"/>
+                            <button type="action" name="%(auth_oauth.action_oauth_provider)d" string="OAuth Providers" icon="oi-arrow-right" class="btn-link"/>
                         </div>
                     </div>
                 </div>
@@ -20,7 +20,7 @@
                                 <label for="auth_oauth_google_client_id" string="Client ID:" class="col-lg-3 o_light_label"/>
                                 <field name="auth_oauth_google_client_id" placeholder="e.g. 1234-xyz.apps.googleusercontent.com"/>
                             </div>
-                            <a href="https://www.odoo.com/documentation/master/applications/general/auth/google.html" target="_blank"><i class="fa fa-fw fa-arrow-right"/>Tutorial</a>
+                            <a href="https://www.odoo.com/documentation/master/applications/general/auth/google.html" target="_blank"><i class="oi oi-fw oi-arrow-right"/>Tutorial</a>
                         </div>
                     </setting>
                 </setting>
diff --git a/addons/auth_signup/views/res_config_settings_views.xml b/addons/auth_signup/views/res_config_settings_views.xml
index b5a15839ee8..41e46d7265d 100644
--- a/addons/auth_signup/views/res_config_settings_views.xml
+++ b/addons/auth_signup/views/res_config_settings_views.xml
@@ -11,7 +11,7 @@
                         <field name="auth_signup_uninvited" class="o_light_label" widget="radio" options="{'horizontal': true}" required="True"/>
                         <div class="content-group" attrs="{'invisible': [('auth_signup_uninvited','=','b2b')]}">
                             <div class="mt8">
-                                <button type="object" name="action_open_template_user" string="Default Access Rights" icon="fa-arrow-right" class="btn-link"/>
+                                <button type="object" name="action_open_template_user" string="Default Access Rights" icon="oi-arrow-right" class="btn-link"/>
                             </div>
                         </div>
                     </setting>
diff --git a/addons/auth_totp/static/tests/totp_flow.js b/addons/auth_totp/static/tests/totp_flow.js
index fd9badb6d82..416f85262b2 100644
--- a/addons/auth_totp/static/tests/totp_flow.js
+++ b/addons/auth_totp/static/tests/totp_flow.js
@@ -21,7 +21,7 @@ function openRoot() {
 function openUserProfileAtSecurityTab() {
     return [{
         content: 'Open user account menu',
-        trigger: '.o_user_menu .oe_topbar_name',
+        trigger: '.o_user_menu .dropdown-toggle',
         run: 'click',
     }, {
         content: "Open preferences / profile screen",
@@ -154,7 +154,7 @@ registry.category("web_tour.tours").add('totp_login_enabled', {
     }
 }, {
     content: "check we're logged in",
-    trigger: ".o_user_menu .oe_topbar_name",
+    trigger: ".o_user_menu .dropdown-toggle",
     run() {}
 }]});
 
@@ -191,7 +191,7 @@ registry.category("web_tour.tours").add('totp_login_device', {
     }
 }, {
     content: "check we're logged in",
-    trigger: ".o_user_menu .oe_topbar_name",
+    trigger: ".o_user_menu .dropdown-toggle",
     run: 'click',
 }, {
     content: "click the Log out button",
@@ -212,7 +212,7 @@ registry.category("web_tour.tours").add('totp_login_device', {
     trigger: 'button:contains("Log in")',
 },  {
     content: "check we're logged in without 2FA",
-    trigger: ".o_user_menu .oe_topbar_name",
+    trigger: ".o_user_menu .dropdown-toggle",
     run() {}
 },
 // now go and disable two-factor authentication would be annoying to do in a separate tour
diff --git a/addons/base_address_extended/views/res_country_view.xml b/addons/base_address_extended/views/res_country_view.xml
index 9e57ed5700b..545a667db61 100644
--- a/addons/base_address_extended/views/res_country_view.xml
+++ b/addons/base_address_extended/views/res_country_view.xml
@@ -10,8 +10,10 @@
                     class="oe_stat_button"
                     icon="fa-globe"
                     type="action"
-                    context="{'default_country_id': active_id, 'search_default_country_id': active_id}"
-                    string="Cities">
+                    context="{'default_country_id': active_id, 'search_default_country_id': active_id}">
+                    <div class="o_field_widget o_stat_info">
+                        <span class="o_stat_text">Cities</span>
+                    </div>
                 </button>
             </xpath>
             <xpath expr="//field[@name='phone_code']" position="after">
diff --git a/addons/base_import/static/src/import_action/import_action.js b/addons/base_import/static/src/import_action/import_action.js
index ae46e037e93..c9cddf052cc 100644
--- a/addons/base_import/static/src/import_action/import_action.js
+++ b/addons/base_import/static/src/import_action/import_action.js
@@ -63,11 +63,7 @@ export class ImportAction extends Component {
 
     get display() {
         return {
-            controlPanel: {
-                "top-right": false,
-                "bottom-left": true,
-                "bottom-right": false,
-            },
+            controlPanel: {},
         };
     }
 
diff --git a/addons/base_import/static/src/import_action/import_action.xml b/addons/base_import/static/src/import_action/import_action.xml
index e5e4420a5a9..1c8958fcbfc 100644
--- a/addons/base_import/static/src/import_action/import_action.xml
+++ b/addons/base_import/static/src/import_action/import_action.xml
@@ -3,7 +3,7 @@
     <t t-name="ImportAction" owl="1">
         <div class="h-100 d-flex flex-column">
             <Layout className="'o_import_action d-flex h-100 overflow-auto bg-white'" display="display">
-                <t t-set-slot="layout-buttons">
+                <t t-set-slot="control-panel-create-button">
                     <t t-if="isPreviewing">
                         <button t-if="!state.isPaused" type="button" class="btn btn-primary m-1" t-on-click="() => this.handleImport(false)">Import</button>
                         <button t-else="" type="button" class="btn btn-primary m-1" t-on-click="() => this.handleImport(false)">Resume</button>
diff --git a/addons/base_import/static/src/import_data_column_error/import_data_column_error.xml b/addons/base_import/static/src/import_data_column_error/import_data_column_error.xml
index 226c9b4f4b3..548e1b5368b 100644
--- a/addons/base_import/static/src/import_data_column_error/import_data_column_error.xml
+++ b/addons/base_import/static/src/import_data_column_error/import_data_column_error.xml
@@ -30,7 +30,7 @@
                 <t t-if="typeof moreInfo === 'string'" t-esc="moreInfo"/>
                 <div t-else="" class="o_import_moreinfo" t-on-click="onMoreInfoClicked">
                     <a href="#" class="o_import_see_all">
-                        <i class="fa fa-arrow-right"></i> See possible values
+                        <i class="oi oi-arrow-right"></i> See possible values
                     </a>
                 </div>
                 <ul t-if="state.moreInfoContent" class="o_import_report_more">
diff --git a/addons/base_import/static/src/import_records/import_records.js b/addons/base_import/static/src/import_records/import_records.js
index 8b035061d47..83e7ce22bec 100644
--- a/addons/base_import/static/src/import_records/import_records.js
+++ b/addons/base_import/static/src/import_records/import_records.js
@@ -5,7 +5,7 @@ import { registry } from "@web/core/registry";
 import { useService } from "@web/core/utils/hooks";
 import { Component } from "@odoo/owl";
 
-const favoriteMenuRegistry = registry.category("favoriteMenu");
+const cogMenuRegistry = registry.category("cogMenu");
 
 /**
  * 'Import records' menu
@@ -46,4 +46,4 @@ export const importRecordsItem = {
         !!JSON.parse(config.viewArch.getAttribute("create") || "1"),
 };
 
-favoriteMenuRegistry.add("import-menu", importRecordsItem, { sequence: 1 });
+cogMenuRegistry.add("import-menu", importRecordsItem, { sequence: 1 });
diff --git a/addons/base_import/static/tests/import_action_tests.js b/addons/base_import/static/tests/import_action_tests.js
index aa6ace453ff..644c9fa1ef1 100644
--- a/addons/base_import/static/tests/import_action_tests.js
+++ b/addons/base_import/static/tests/import_action_tests.js
@@ -341,10 +341,11 @@ QUnit.module("Base Import Tests", (hooks) => {
             "button has the right download url"
         );
         assert.verifySteps(["partner/get_import_templates", "base_import.import/create"]);
+        // Contains invisible mobile buttons
         assert.containsN(
             target,
             ".o_control_panel button",
-            2,
+            5,
             "only two buttons are visible by default"
         );
     });
@@ -380,7 +381,7 @@ QUnit.module("Base Import Tests", (hooks) => {
 
         // Set and trigger the change of a file for the input
         const file = new File(["fake_file"], "fake_file.xlsx", { type: "text/plain" });
-        await editInput(target, "input[type='file']", file);
+        await editInput(target, ".o_control_panel_main_buttons .d-none input[type='file']", file);
         assert.verifySteps([
             "partner/get_import_templates",
             "base_import.import/create",
@@ -515,8 +516,10 @@ QUnit.module("Base Import Tests", (hooks) => {
 
         // Set and trigger the change of a file for the input
         const file = new File(["fake_file"], "fake_file.xls", { type: "text/plain" });
-        await editInput(target, "input[type='file']", file);
-        await click(target.querySelector(".o_control_panel button:first-child"));
+        await editInput(target, ".o_control_panel_main_buttons .d-none input[type='file']", file);
+        await click(
+            target.querySelector(".o_control_panel_main_buttons .d-none button:first-child")
+        );
         assert.verifySteps(["execute_import"]);
     });
 
@@ -533,7 +536,7 @@ QUnit.module("Base Import Tests", (hooks) => {
 
         // Set and trigger the change of a file for the input
         const file = new File(["fake_file"], "fake_file.csv", { type: "text/plain" });
-        await editInput(target, "input[type='file']", file);
+        await editInput(target, ".o_control_panel_main_buttons .d-none input[type='file']", file);
         assert.containsOnce(
             target,
             ".o_import_data_sidepanel .o_import_formatting",
@@ -563,7 +566,7 @@ QUnit.module("Base Import Tests", (hooks) => {
 
         // Set and trigger the change of a file for the input
         const file = new File(["fake_file"], "fake_file.csv", { type: "text/plain" });
-        await editInput(target, "input[type='file']", file);
+        await editInput(target, ".o_control_panel_main_buttons .d-none input[type='file']", file);
 
         await nextTick();
         assert.containsOnce(
@@ -604,7 +607,11 @@ QUnit.module("Base Import Tests", (hooks) => {
 
             // Set and trigger the change of a file for the input
             const file = new File(["fake_file"], "fake_file.xls", { type: "text/plain" });
-            await editInput(target, "input[type='file']", file);
+            await editInput(
+                target,
+                ".o_control_panel_main_buttons .d-none input[type='file']",
+                file
+            );
             assert.strictEqual(
                 target.querySelector(".o_import_data_sidepanel input[type=checkbox]").checked,
                 true,
@@ -637,7 +644,9 @@ QUnit.module("Base Import Tests", (hooks) => {
                 "as the column couldn't match with the database, user must make a choice"
             );
 
-            await click(target.querySelector(".o_control_panel button:first-child"));
+            await click(
+                target.querySelector(".o_control_panel_main_buttons .d-none button:first-child")
+            );
             assert.containsNone(
                 target,
                 ".o_notification_body",
@@ -660,7 +669,9 @@ QUnit.module("Base Import Tests", (hooks) => {
             );
 
             await editSelectMenu(target, ".o_import_data_content .o_select_menu", "Display name");
-            await click(target.querySelector(".o_control_panel button:first-child"));
+            await click(
+                target.querySelector(".o_control_panel_main_buttons .d-none button:first-child")
+            );
             assert.verifySteps([
                 "base_import.import/execute_import",
                 "1 records successfully imported",
@@ -700,10 +711,12 @@ QUnit.module("Base Import Tests", (hooks) => {
 
         // Set and trigger the change of a file for the input
         const file = new File(["fake_file"], "fake_file.xlsx", { type: "text/plain" });
-        await editInput(target, "input[type='file']", file);
+        await editInput(target, ".o_control_panel_main_buttons .d-none input[type='file']", file);
         // For this test, we force the display of an error message if this field is set
         await editSelectMenu(target, ".o_import_data_content .o_select_menu", "Selection");
-        await click(target.querySelector(".o_control_panel button:nth-child(2)"));
+        await click(
+            target.querySelector(".o_control_panel_main_buttons .d-none button:nth-child(2)")
+        );
         assert.strictEqual(
             target.querySelector(".o_import_data_content .alert-danger").textContent,
             "The file contains blocking errors (see below)",
@@ -730,7 +743,9 @@ QUnit.module("Base Import Tests", (hooks) => {
             "prevent option is selected by default"
         );
         editSelect(target, ".o_import_field_selection select", "item_2");
-        await click(target.querySelector(".o_control_panel button:nth-child(2)"));
+        await click(
+            target.querySelector(".o_control_panel_main_buttons .d-none button:nth-child(2)")
+        );
         assert.strictEqual(
             target.querySelector(".o_import_data_content .alert-info").textContent,
             "Everything seems valid.",
@@ -774,10 +789,12 @@ QUnit.module("Base Import Tests", (hooks) => {
 
         // Set and trigger the change of a file for the input
         const file = new File(["fake_file"], "fake_file.xlsx", { type: "text/plain" });
-        await editInput(target, "input[type='file']", file);
+        await editInput(target, ".o_control_panel_main_buttons .d-none input[type='file']", file);
         // For this test, we force the display of an error message if this field is set
         await editSelectMenu(target, ".o_import_data_content .o_select_menu", "Bar");
-        await click(target.querySelector(".o_control_panel button:nth-child(2)"));
+        await click(
+            target.querySelector(".o_control_panel_main_buttons .d-none button:nth-child(2)")
+        );
         assert.strictEqual(
             target.querySelector(".o_import_data_content .alert-danger").textContent,
             "The file contains blocking errors (see below)",
@@ -789,7 +806,9 @@ QUnit.module("Base Import Tests", (hooks) => {
             "options are 'prevent', choose a default boolean value or 'skip'"
         );
         editSelect(target, ".o_import_field_boolean select", "false");
-        await click(target.querySelector(".o_control_panel button:nth-child(2)"));
+        await click(
+            target.querySelector(".o_control_panel_main_buttons .d-none button:nth-child(2)")
+        );
         assert.strictEqual(
             target.querySelector(".o_import_data_content .alert-info").textContent,
             "Everything seems valid.",
@@ -837,10 +856,12 @@ QUnit.module("Base Import Tests", (hooks) => {
 
         // Set and trigger the change of a file for the input
         const file = new File(["fake_file"], "fake_file.xlsx", { type: "text/plain" });
-        await editInput(target, "input[type='file']", file);
+        await editInput(target, ".o_control_panel_main_buttons .d-none input[type='file']", file);
         // For this test, we force the display of an error message if this field is set
         await editSelectMenu(target, ".o_import_data_content .o_select_menu", "Many2Many");
-        await click(target.querySelector(".o_control_panel button:nth-child(2)"));
+        await click(
+            target.querySelector(".o_control_panel_main_buttons .d-none button:nth-child(2)")
+        );
         assert.strictEqual(
             target.querySelector(".o_import_data_content .alert-danger").textContent,
             "The file contains blocking errors (see below)",
@@ -852,14 +873,18 @@ QUnit.module("Base Import Tests", (hooks) => {
             "options are 'prevent', choose a default boolean value or 'skip'"
         );
         editSelect(target, ".o_import_field_many2many select", "name_create_enabled_fields");
-        await click(target.querySelector(".o_control_panel button:nth-child(2)"));
+        await click(
+            target.querySelector(".o_control_panel_main_buttons .d-none button:nth-child(2)")
+        );
         assert.strictEqual(
             target.querySelector(".o_import_data_content .alert-info").textContent,
             "Everything seems valid.",
             "import is now successful"
         );
         editSelect(target, ".o_import_field_many2many select", "import_skip_records");
-        await click(target.querySelector(".o_control_panel button:nth-child(2)"));
+        await click(
+            target.querySelector(".o_control_panel_main_buttons .d-none button:nth-child(2)")
+        );
         assert.strictEqual(
             target.querySelector(".o_import_data_content .alert-info").textContent,
             "Everything seems valid.",
@@ -914,8 +939,10 @@ QUnit.module("Base Import Tests", (hooks) => {
 
         // Set and trigger the change of a file for the input
         const file = new File(["fake_file"], "fake_file.xlsx", { type: "text/plain" });
-        await editInput(target, "input[type='file']", file);
-        await click(target.querySelector(".o_control_panel button:nth-child(1)"));
+        await editInput(target, ".o_control_panel_main_buttons .d-none input[type='file']", file);
+        await click(
+            target.querySelector(".o_control_panel_main_buttons .d-none button:nth-child(1)")
+        );
         assert.strictEqual(
             target.querySelector(".o_import_data_content .alert-danger").textContent,
             "The file contains blocking errors (see below)",
@@ -991,7 +1018,7 @@ QUnit.module("Base Import Tests", (hooks) => {
 
         // Set and trigger the change of a file for the input
         const file = new File(["fake_file"], "fake_file.xls", { type: "text/plain" });
-        await editInput(target, "input[type='file']", file);
+        await editInput(target, ".o_control_panel_main_buttons .d-none input[type='file']", file);
         assert.strictEqual(
             target.querySelector("input#o_import_batch_limit").value,
             "2000",
@@ -1004,7 +1031,9 @@ QUnit.module("Base Import Tests", (hooks) => {
         );
 
         await editInput(target, "input#o_import_batch_limit", 1);
-        await click(target.querySelector(".o_control_panel button:nth-child(2)"));
+        await click(
+            target.querySelector(".o_control_panel_main_buttons .d-none button:nth-child(2)")
+        );
         assert.strictEqual(
             target.querySelector(".o_import_data_content .alert-info").textContent,
             "Everything seems valid.",
@@ -1068,9 +1097,11 @@ QUnit.module("Base Import Tests", (hooks) => {
 
         // Set and trigger the change of a file for the input
         const file = new File(["fake_file"], "fake_file.xls", { type: "text/plain" });
-        await editInput(target, "input[type='file']", file);
+        await editInput(target, ".o_control_panel_main_buttons .d-none input[type='file']", file);
         await editInput(target, "input#o_import_batch_limit", 1);
-        await click(target.querySelector(".o_control_panel button:first-child"));
+        await click(
+            target.querySelector(".o_control_panel_main_buttons .d-none button:first-child")
+        );
         // Since a nextTick is added to each batch, we must wait twice before the end of the second batch
         await nextTick();
         await nextTick();
@@ -1086,7 +1117,8 @@ QUnit.module("Base Import Tests", (hooks) => {
             "a message is shown to indicate the user to resume from the third row"
         );
         assert.strictEqual(
-            target.querySelector(".o_control_panel button:first-child").textContent,
+            target.querySelector(".o_control_panel_main_buttons .d-none button:first-child")
+                .textContent,
             "Resume",
             "button contains the right text"
         );
@@ -1157,9 +1189,11 @@ QUnit.module("Base Import Tests", (hooks) => {
 
         // Set and trigger the change of a file for the input
         const file = new File(["fake_file"], "fake_file.xls", { type: "text/plain" });
-        await editInput(target, "input[type='file']", file);
+        await editInput(target, ".o_control_panel_main_buttons .d-none input[type='file']", file);
         await editInput(target, "input#o_import_batch_limit", 1);
-        await click(target.querySelector(".o_control_panel button:nth-child(2)"));
+        await click(
+            target.querySelector(".o_control_panel_main_buttons .d-none button:nth-child(2)")
+        );
         // Since a nextTick is added to each batch, we must wait twice before the end of the second batch
         await nextTick();
         await nextTick();
@@ -1169,7 +1203,8 @@ QUnit.module("Base Import Tests", (hooks) => {
             "Everything seems valid."
         );
         assert.strictEqual(
-            target.querySelector(".o_control_panel button:first-child").textContent,
+            target.querySelector(".o_control_panel_main_buttons .d-none button:first-child")
+                .textContent,
             "Import",
             "after testing, 'Resume' text is not shown"
         );
@@ -1245,7 +1280,11 @@ QUnit.module("Base Import Tests", (hooks) => {
 
             // Set and trigger the change of a file for the input
             const file = new File(["fake_file"], "fake_file.xls", { type: "text/plain" });
-            await editInput(target, "input[type='file']", file);
+            await editInput(
+                target,
+                ".o_control_panel_main_buttons .d-none input[type='file']",
+                file
+            );
 
             assert.strictEqual(
                 target.querySelector(
@@ -1261,7 +1300,9 @@ QUnit.module("Base Import Tests", (hooks) => {
                 "The relational field should be selected by default and the name should be the full path."
             );
 
-            await click(target.querySelector(".o_control_panel button:first-child"));
+            await click(
+                target.querySelector(".o_control_panel_main_buttons .d-none button:first-child")
+            );
         }
     );
 
@@ -1320,10 +1361,12 @@ QUnit.module("Base Import Tests", (hooks) => {
 
         // Set and trigger the change of a file for the input
         const file = new File(["fake_file"], "fake_file.xlsx", { type: "text/plain" });
-        await editInput(target, "input[type='file']", file);
+        await editInput(target, ".o_control_panel_main_buttons .d-none input[type='file']", file);
         // For this test, we force the display of an error message if this field is set
         await editSelectMenu(target, ".o_import_data_content .o_select_menu", "Many2Many");
-        await click(target.querySelector(".o_control_panel button:nth-child(2)"));
+        await click(
+            target.querySelector(".o_control_panel_main_buttons .d-none button:nth-child(2)")
+        );
 
         assert.strictEqual(
             target.querySelector(".o_import_data_content .alert-danger").textContent,
@@ -1387,13 +1430,17 @@ QUnit.module("Base Import Tests", (hooks) => {
 
         // Set and trigger the change of a file for the input
         const file = new File(["fake_file"], "fake_file.csv", { type: "text/plain" });
-        await editInput(target, "input[type='file']", file);
+        await editInput(target, ".o_control_panel_main_buttons .d-none input[type='file']", file);
         await editInput(target, ".o_import_date_format#date_format-3", "YYYYMMDD");
 
         // Parse the file again with the updated date format to check that
         // the format is correctly formatted in the UI
         await click(target.querySelector(".o_import_formatting button"));
-        await click(target.querySelector(".o_control_panel button:nth-child(2)"));
+        await click(
+            $(target).find(
+                ".o_control_panel_main_buttons > div:visible > button:contains(Import)"
+            )[0]
+        );
         assert.verifySteps(["execute_import"]);
         assert.strictEqual(
             target.querySelector(".o_import_date_format").value,
@@ -1412,7 +1459,7 @@ QUnit.module("Base Import Tests", (hooks) => {
 
         // Set and trigger the change of a file for the input
         const file = new File(["fake_file"], "fake_file.xlsx", { type: "text/plain" });
-        await editInput(target, "input[type='file']", file);
+        await editInput(target, ".o_control_panel_main_buttons .d-none input[type='file']", file);
         await editSelectMenu(target, ".o_import_data_content .o_select_menu", "Bar");
         assert.containsN(
             target,
@@ -1444,7 +1491,7 @@ QUnit.module("Base Import Tests", (hooks) => {
 
             // Set and trigger the change of a file for the input
             const file = new File(["fake_file"], "fake_file.csv", { type: "text/plain" });
-            await editInput(target, "input[type='file']", file);
+            await editInput(target, ".o_control_panel_collapsed_create input[type='file']", file);
             assert.strictEqual(
                 target.querySelector(".o_import_date_format").list.id,
                 "list-3",
diff --git a/addons/base_import/static/tests/import_records_tests.js b/addons/base_import/static/tests/import_records_tests.js
index 87b758b2fa9..7a578157f82 100644
--- a/addons/base_import/static/tests/import_records_tests.js
+++ b/addons/base_import/static/tests/import_records_tests.js
@@ -5,10 +5,9 @@ import { importRecordsItem } from "@base_import/import_records/import_records";
 import { registry } from "@web/core/registry";
 
 import { click, getFixture, selectDropdownItem } from "@web/../tests/helpers/utils";
-import { toggleFavoriteMenu } from "@web/../tests/search/helpers";
+import { toggleActionMenu } from "@web/../tests/search/helpers";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
-
-const favoriteMenuRegistry = registry.category("favoriteMenu");
+import { clearRegistryWithCleanup } from "@web/../tests/helpers/mock_env";
 
 let serverData;
 let target;
@@ -27,12 +26,14 @@ QUnit.module("Base Import Tests", (hooks) => {
             },
         };
         setupViewRegistries();
-        favoriteMenuRegistry.add("import-menu", importRecordsItem);
+        const cogMenuRegistry = registry.category("cogMenu");
+        clearRegistryWithCleanup(cogMenuRegistry);
+        cogMenuRegistry.add("import-menu", importRecordsItem);
     });
 
     QUnit.module("ImportRecords");
 
-    QUnit.test("import in favorite dropdown in list", async function (assert) {
+    QUnit.test("import in cog menu dropdown in list", async function (assert) {
         assert.expect(3);
 
         const actionService = {
@@ -56,14 +57,14 @@ QUnit.module("Base Import Tests", (hooks) => {
             },
         });
 
-        await toggleFavoriteMenu(target);
-        assert.containsOnce(target, ".o_favorite_menu .o-dropdown--menu");
+        await toggleActionMenu(target);
+        assert.containsOnce(target, ".o_cp_action_menus .o-dropdown--menu");
         assert.containsOnce(target, ".o_import_menu");
         await click(target.querySelector(".o_import_menu"));
     });
 
     QUnit.test(
-        'import favorite dropdown item should not be in list with create="0"',
+        'import should not be available in cog menu dropdown in list with create="0"',
         async function (assert) {
             await makeView({
                 type: "list",
@@ -75,14 +76,14 @@ QUnit.module("Base Import Tests", (hooks) => {
                 },
             });
 
-            await toggleFavoriteMenu(target);
-            assert.containsOnce(target, ".o_favorite_menu .o-dropdown--menu");
+            await toggleActionMenu(target);
+            assert.containsOnce(target, ".o_cp_action_menus .o-dropdown--menu");
             assert.containsNone(target, ".o_import_menu");
         }
     );
 
     QUnit.test(
-        'import favorite dropdown item should not be in list with import="0"',
+        'import should not be available in cog menu dropdown in list with import="0"',
         async function (assert) {
             await makeView({
                 type: "list",
@@ -94,13 +95,13 @@ QUnit.module("Base Import Tests", (hooks) => {
                 },
             });
 
-            await toggleFavoriteMenu(target);
-            assert.containsOnce(target, ".o_favorite_menu .o-dropdown--menu");
+            await toggleActionMenu(target);
+            assert.containsOnce(target, ".o_cp_action_menus .o-dropdown--menu");
             assert.containsNone(target, ".o_import_menu");
         }
     );
 
-    QUnit.test("import in favorite dropdown in kanban", async function (assert) {
+    QUnit.test("import in cog menu dropdown in kanban", async function (assert) {
         assert.expect(3);
 
         const actionService = {
@@ -131,14 +132,14 @@ QUnit.module("Base Import Tests", (hooks) => {
             },
         });
 
-        await toggleFavoriteMenu(target);
-        assert.containsOnce(target, ".o_favorite_menu .o-dropdown--menu");
+        await toggleActionMenu(target);
+        assert.containsOnce(target, ".o_cp_action_menus .o-dropdown--menu");
         assert.containsOnce(target, ".o_import_menu");
         await click(target.querySelector(".o_import_menu"));
     });
 
     QUnit.test(
-        'import favorite dropdown item should not be in list with create="0"',
+        'import should not be available in cog menu dropdown in kanban with create="0"',
         async function (assert) {
             await makeView({
                 type: "kanban",
@@ -156,15 +157,13 @@ QUnit.module("Base Import Tests", (hooks) => {
                     actionType: "ir.actions.act_window",
                 },
             });
-
-            await toggleFavoriteMenu(target);
-            assert.containsOnce(target, ".o_favorite_menu .o-dropdown--menu");
-            assert.containsNone(target, ".o_import_menu");
+            // Cog menu will not show when empty
+            assert.containsNone(target, ".o_cp_action_menus");
         }
     );
 
     QUnit.test(
-        'import dropdown favorite should not be in kanban with import="0"',
+        'import should not be available in cog menu dropdown in kanban with import="0"',
         async function (assert) {
             await makeView({
                 type: "kanban",
@@ -182,15 +181,13 @@ QUnit.module("Base Import Tests", (hooks) => {
                     actionType: "ir.actions.act_window",
                 },
             });
-
-            await toggleFavoriteMenu(target);
-            assert.containsOnce(target, ".o_favorite_menu .o-dropdown--menu");
-            assert.containsNone(target, ".o_import_menu");
+            // Cog menu will not show when empty
+            assert.containsNone(target, ".o_cp_action_menus");
         }
     );
 
     QUnit.test(
-        "import should not be available in favorite dropdown in pivot (other than kanban or list)",
+        "import should not be available in cog menu dropdown in pivot (other than kanban or list)",
         async function (assert) {
             serverData.models.foo.fields.foobar = {
                 string: "Fubar",
@@ -207,15 +204,13 @@ QUnit.module("Base Import Tests", (hooks) => {
                     actionType: "ir.actions.act_window",
                 },
             });
-
-            await toggleFavoriteMenu(target);
-            assert.containsOnce(target, ".o_favorite_menu .o-dropdown--menu");
-            assert.containsNone(target, ".o_import_menu");
+            // Cog menu will not show when empty
+            assert.containsNone(target, ".o_cp_action_menus");
         }
     );
 
     QUnit.test(
-        "import should not be available in favorite dropdown in dialog view",
+        "import should not be available in cog menu dropdown in dialog view",
         async function (assert) {
             serverData.models.bar = {
                 fields: {
@@ -244,8 +239,8 @@ QUnit.module("Base Import Tests", (hooks) => {
 
             await selectDropdownItem(target, "m2o", "Search More...");
             const dialog = target.querySelector(".modal");
-            await toggleFavoriteMenu(dialog);
-            assert.containsOnce(dialog, ".o_favorite_menu .o-dropdown--menu");
+            await toggleActionMenu(dialog);
+            assert.containsOnce(dialog, ".o_cp_action_menus .o-dropdown--menu");
             assert.containsNone(dialog, ".o_import_menu");
         }
     );
diff --git a/addons/base_setup/views/res_config_settings_views.xml b/addons/base_setup/views/res_config_settings_views.xml
index fd412b600b4..223acd2e7ef 100644
--- a/addons/base_setup/views/res_config_settings_views.xml
+++ b/addons/base_setup/views/res_config_settings_views.xml
@@ -25,7 +25,7 @@
                                     </span>
                                     <a href="https://www.odoo.com/documentation/master/applications/general/users.html" title="Documentation" class="o_doc_link" target="_blank"></a>
                                     <br/>
-                                    <button name="%(base.action_res_users)d" icon="fa-arrow-right" type="action" string="Manage Users" class="btn-link o_web_settings_access_rights"/>
+                                    <button name="%(base.action_res_users)d" icon="oi-arrow-right" type="action" string="Manage Users" class="btn-link o_web_settings_access_rights"/>
                                 </setting>
                             </block>
                         </div>
@@ -44,10 +44,10 @@
                                         </span>
                                     </div>
                                     <div class="mt8">
-                                        <button name="%(base.action_view_base_language_install)d" icon="fa-arrow-right" type="action" string="Add Languages" class="btn-link"/>
+                                        <button name="%(base.action_view_base_language_install)d" icon="oi-arrow-right" type="action" string="Add Languages" class="btn-link"/>
                                     </div>
                                     <div class="mt8" groups="base.group_no_one">
-                                        <button name="%(base.res_lang_act_window)d" icon="fa-arrow-right" type="action" string="Manage Languages" class="btn-link"/>
+                                        <button name="%(base.res_lang_act_window)d" icon="oi-arrow-right" type="action" string="Manage Languages" class="btn-link"/>
                                     </div>
                                 </setting>
                             </block>
@@ -61,7 +61,7 @@
                                     <br/>
                                     <field name="company_informations" class="text-muted" style="width: 90%;"/>
                                     <br/>
-                                    <button name="open_company" icon="fa-arrow-right" type="object" string="Update Info" class="btn-link"/>
+                                    <button name="open_company" icon="oi-arrow-right" type="object" string="Update Info" class="btn-link"/>
                                 </setting>
                                 <setting id="companies_setting">
                                     <field name='company_count' nolabel="1" class="w-auto ps-1 fw-bold"/>
@@ -73,7 +73,7 @@
                                     </span>
                                     <br/>
                                     <div class="mt8">
-                                        <button name="%(base.action_res_company_form)d" icon="fa-arrow-right" type="action" string="Manage Companies" class="btn-link"/>
+                                        <button name="%(base.action_res_company_form)d" icon="oi-arrow-right" type="action" string="Manage Companies" class="btn-link"/>
                                     </div>
                                 </setting>
                                 <setting id="document_layout_setting" string="Document Layout" help="Choose the layout of your documents" company_dependent="1">
@@ -82,11 +82,11 @@
                                             <label for="external_report_layout_id" string="Layout" class="col-3 col-lg-3 o_light_label"/>
                                             <field name="external_report_layout_id" domain="[('type','=', 'qweb')]" class="oe_inline"/>
                                         </div>
-                                            <button name="%(web.action_base_document_layout_configurator)d" string="Configure Document Layout" type="action" class="oe_link" icon="fa-arrow-right"/>
+                                            <button name="%(web.action_base_document_layout_configurator)d" string="Configure Document Layout" type="action" class="oe_link" icon="oi-arrow-right"/>
                                             <br groups="base.group_no_one"/>
-                                            <button name="edit_external_header" string="Edit Layout" type="object" class="oe_link" groups="base.group_no_one" icon="fa-arrow-right"/>
+                                            <button name="edit_external_header" string="Edit Layout" type="object" class="oe_link" groups="base.group_no_one" icon="oi-arrow-right"/>
                                             <br groups="base.group_no_one"/>
-                                            <button name="%(web.action_report_externalpreview)d" string="Preview Document" type="action" class="oe_link" groups="base.group_no_one" icon="fa-arrow-right"/>
+                                            <button name="%(web.action_report_externalpreview)d" string="Preview Document" type="action" class="oe_link" groups="base.group_no_one" icon="oi-arrow-right"/>
                                     </div>
                                 </setting>
                                 <field name="company_id" invisible="1"/>
@@ -114,12 +114,12 @@
                             <field name="user_default_rights"/>
                             <div class="content-group" attrs="{'invisible': [('user_default_rights','=',False)]}">
                                 <div class="mt8">
-                                    <button type="object" name="open_default_user" string="Default Access Rights" icon="fa-arrow-right" class="btn-link"/>
+                                    <button type="object" name="open_default_user" string="Default Access Rights" icon="oi-arrow-right" class="btn-link"/>
                                 </div>
                             </div>
                         </setting>
                         <setting string="API Keys" help="API Keys allow your users to access Odoo with external tools when multi-factor authentication is enabled." groups="base.group_system">
-                            <button type="action" name="%(base.action_apikeys_admin)d" string="Manage API Keys" icon="fa-arrow-right" class="btn-link"/>
+                            <button type="action" name="%(base.action_apikeys_admin)d" string="Manage API Keys" icon="oi-arrow-right" class="btn-link"/>
                         </setting>
                         <setting string="Import &amp; Export" help="Allow users to import data from CSV/XLS/XLSX/ODS files" documentation="/applications/general/export_import_data.html" groups="base.group_no_one" id="allow_import">
                             <field name="module_base_import" />
diff --git a/addons/board/static/description/icon.png b/addons/board/static/description/icon.png
index f13f852a626..7eda0e007cb 100644
Binary files a/addons/board/static/description/icon.png and b/addons/board/static/description/icon.png differ
diff --git a/addons/board/static/description/icon.svg b/addons/board/static/description/icon.svg
index ebd019e66b3..08b380afc7e 100644
--- a/addons/board/static/description/icon.svg
+++ b/addons/board/static/description/icon.svg
@@ -1,23 +1,40 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70">
-    <defs>
-        <path id="icon-a" d="M4,5.35309892e-14 C36.4160122,9.87060235e-15 58.0836068,-3.97961823e-14 65,5.07020818e-14 C69,6.733808e-14 70,1 70,5 C70,43.0488877 70,62.4235458 70,65 C70,69 69,70 65,70 C61,70 9,70 4,70 C1,70 7.10542736e-15,69 7.10542736e-15,65 C7.25721566e-15,62.4676575 3.83358709e-14,41.8005206 3.60818146e-14,5 C-1.13686838e-13,1 1,5.75716207e-14 4,5.35309892e-14 Z"/>
-        <linearGradient id="icon-c" x1="100%" x2="0%" y1="0%" y2="100%">
-            <stop offset="0%" stop-color="#CD7690"/>
-            <stop offset="100%" stop-color="#CA5377"/>
-        </linearGradient>
-        <path id="icon-d" d="M18.0450069,57.225 C16.6239398,57.2249541 15.319401,56.4292666 14.6550625,55.1573449 C12.9601701,51.9125391 12,48.2137078 12,44.2875 C12,31.4261695 22.2974514,21 35,21 C47.7025486,21 58,31.4261695 58,44.2875 C58,48.2137078 57.0398299,51.9125391 55.3449375,55.1573449 C54.6806259,56.4292924 53.3760701,57.2249902 51.9549931,57.225 L18.0450069,57.225 Z M52.8888889,41.7 C51.4775035,41.7 50.3333333,42.8584723 50.3333333,44.2875 C50.3333333,45.7165277 51.4775035,46.875 52.8888889,46.875 C54.3002743,46.875 55.4444444,45.7165277 55.4444444,44.2875 C55.4444444,42.8584723 54.3002743,41.7 52.8888889,41.7 Z M35,28.7625 C36.4113854,28.7625 37.5555556,27.6040277 37.5555556,26.175 C37.5555556,24.7459723 36.4113854,23.5875 35,23.5875 C33.5886146,23.5875 32.4444444,24.7459723 32.4444444,26.175 C32.4444444,27.6040277 33.5886146,28.7625 35,28.7625 Z M17.1111111,41.7 C15.6997257,41.7 14.5555556,42.8584723 14.5555556,44.2875 C14.5555556,45.7165277 15.6997257,46.875 17.1111111,46.875 C18.5224965,46.875 19.6666667,45.7165277 19.6666667,44.2875 C19.6666667,42.8584723 18.5224965,41.7 17.1111111,41.7 Z M22.3506389,28.8925219 C20.9392535,28.8925219 19.7950833,30.0509941 19.7950833,31.4800219 C19.7950833,32.9090496 20.9392535,34.0675219 22.3506389,34.0675219 C23.7620243,34.0675219 24.9061944,32.9090496 24.9061944,31.4800219 C24.9061944,30.0509941 23.7620243,28.8925219 22.3506389,28.8925219 Z M47.6493611,28.8925219 C46.2379757,28.8925219 45.0938056,30.0509941 45.0938056,31.4800219 C45.0938056,32.9090496 46.2379757,34.0675219 47.6493611,34.0675219 C49.0607465,34.0675219 50.2049167,32.9090496 50.2049167,31.4800219 C50.2049167,30.0509941 49.0607465,28.8925219 47.6493611,28.8925219 Z M40.6952153,31.4423414 C39.686809,31.1156695 38.6082049,31.6784508 38.285566,32.6992195 L34.6181042,44.3034293 C31.9739028,44.501373 29.8888889,46.7346281 29.8888889,49.4625 C29.8888889,52.3205555 32.1772292,54.6375 35,54.6375 C37.8227708,54.6375 40.1111111,52.3205555 40.1111111,49.4625 C40.1111111,47.8636676 39.3946771,46.434559 38.269434,45.4852699 L41.9365764,33.8821113 C42.2591354,32.8612617 41.7033819,31.7690133 40.6952153,31.4423414 Z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <mask id="icon-b" fill="#fff">
-            <use xlink:href="#icon-a"/>
-        </mask>
-        <g mask="url(#icon-b)">
-            <rect width="70" height="70" fill="url(#icon-c)"/>
-            <path fill="#FFF" fill-opacity=".383" d="M4,1.8 L65,1.8 C67.6666667,1.8 69.3333333,1.13333333 70,-0.2 C70,2.46666667 70,3.46666667 70,2.8 L1.10547097e-14,2.8 C-1.65952376e-14,3.46666667 -2.9161925e-14,2.46666667 -2.66453526e-14,-0.2 C0.666666667,1.13333333 2,1.8 4,1.8 Z" transform="matrix(1 0 0 -1 0 2.8)"/>
-            <path fill="#393939" d="M4,50 C2,50 -7.10542736e-15,49.851312 0,45.8367347 L0,26.3942795 L16.3536575,8.86200565 C29.4512192,-0.488174988 39.6666667,-2.3877551 47,3.16326531 C54.3333333,8.71428571 58,14.9591837 58,21.8979592 C55.8677728,29.7827578 54.7719047,33.7755585 54.7123959,33.8763613 C54.6528871,33.9771642 49.9857922,39.3517104 40.7111111,50 L4,50 Z" opacity=".324" transform="translate(0 20)"/>
-            <path fill="#000" fill-opacity=".383" d="M4,4 L65,4 C67.6666667,4 69.3333333,3 70,1 C70,3.66666667 70,5 70,5 L1.77635684e-15,5 C1.77635684e-15,5 1.77635684e-15,3.66666667 1.77635684e-15,1 C0.666666667,3 2,4 4,4 Z" transform="translate(0 65)"/>
-            <use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#icon-d"/>
-            <path fill="#FFF" fill-rule="nonzero" d="M18.0450069,55.225 C16.6239398,55.2249541 15.319401,54.4292666 14.6550625,53.1573449 C12.9601701,49.9125391 12,46.2137078 12,42.2875 C12,29.4261695 22.2974514,19 35,19 C47.7025486,19 58,29.4261695 58,42.2875 C58,46.2137078 57.0398299,49.9125391 55.3449375,53.1573449 C54.6806259,54.4292924 53.3760701,55.2249902 51.9549931,55.225 L18.0450069,55.225 Z M52.8888889,39.7 C51.4775035,39.7 50.3333333,40.8584723 50.3333333,42.2875 C50.3333333,43.7165277 51.4775035,44.875 52.8888889,44.875 C54.3002743,44.875 55.4444444,43.7165277 55.4444444,42.2875 C55.4444444,40.8584723 54.3002743,39.7 52.8888889,39.7 Z M35,26.7625 C36.4113854,26.7625 37.5555556,25.6040277 37.5555556,24.175 C37.5555556,22.7459723 36.4113854,21.5875 35,21.5875 C33.5886146,21.5875 32.4444444,22.7459723 32.4444444,24.175 C32.4444444,25.6040277 33.5886146,26.7625 35,26.7625 Z M17.1111111,39.7 C15.6997257,39.7 14.5555556,40.8584723 14.5555556,42.2875 C14.5555556,43.7165277 15.6997257,44.875 17.1111111,44.875 C18.5224965,44.875 19.6666667,43.7165277 19.6666667,42.2875 C19.6666667,40.8584723 18.5224965,39.7 17.1111111,39.7 Z M22.3506389,26.8925219 C20.9392535,26.8925219 19.7950833,28.0509941 19.7950833,29.4800219 C19.7950833,30.9090496 20.9392535,32.0675219 22.3506389,32.0675219 C23.7620243,32.0675219 24.9061944,30.9090496 24.9061944,29.4800219 C24.9061944,28.0509941 23.7620243,26.8925219 22.3506389,26.8925219 Z M47.6493611,26.8925219 C46.2379757,26.8925219 45.0938056,28.0509941 45.0938056,29.4800219 C45.0938056,30.9090496 46.2379757,32.0675219 47.6493611,32.0675219 C49.0607465,32.0675219 50.2049167,30.9090496 50.2049167,29.4800219 C50.2049167,28.0509941 49.0607465,26.8925219 47.6493611,26.8925219 Z M40.6952153,29.4423414 C39.686809,29.1156695 38.6082049,29.6784508 38.285566,30.6992195 L34.6181042,42.3034293 C31.9739028,42.501373 29.8888889,44.7346281 29.8888889,47.4625 C29.8888889,50.3205555 32.1772292,52.6375 35,52.6375 C37.8227708,52.6375 40.1111111,50.3205555 40.1111111,47.4625 C40.1111111,45.8636676 39.3946771,44.434559 38.269434,43.4852699 L41.9365764,31.8821113 C42.2591354,30.8612617 41.7033819,29.7690133 40.6952153,29.4423414 Z"/>
-        </g>
-    </g>
+<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 8C4 5.79086 5.79086 4 8 4H25V21C25 23.2091 23.2091 25 21 25H4V8Z" fill="var(--o-icons-magenta-pure, #FF689E)"/>
+<path d="M4 8C4 5.79086 5.79086 4 8 4H25V21C25 23.2091 23.2091 25 21 25H4V8Z" fill="url(#white_gradient_1)" fill-opacity="0.4"/>
+<path d="M4 35C4 32.7909 5.79086 31 8 31H19V42C19 44.2091 17.2091 46 15 46H4V35Z" fill="var(--o-icons-magenta-magenta, #FF2A62)"/>
+<path d="M4 35C4 32.7909 5.79086 31 8 31H19V42C19 44.2091 17.2091 46 15 46H4V35Z" fill="url(#white_gradient_2)" fill-opacity="0.3"/>
+<path d="M25 46H29C31.2091 46 33 44.2091 33 42V31H29C26.7909 31 25 32.7909 25 35V46Z" fill="var(--o-icons-yellow-pure, #FBB130)"/>
+<path d="M25 46H29C31.2091 46 33 44.2091 33 42V31H29C26.7909 31 25 32.7909 25 35V46Z" fill="url(#white_gradient_3)" fill-opacity="0.2"/>
+<path d="M31 17L31 21C31 23.2091 32.7909 25 35 25L46 25V21C46 18.7909 44.2091 17 42 17L31 17Z" fill="var(--o-icons-cyan-cyan, #03AAE9)"/>
+<path d="M31 17L31 21C31 23.2091 32.7909 25 35 25L46 25V21C46 18.7909 44.2091 17 42 17L31 17Z" fill="url(#white_gradient_4)" fill-opacity="0.3"/>
+<path d="M31 4L31 8C31 10.2091 32.7909 12 35 12L46 12V8C46 5.79086 44.2091 4 42 4L31 4Z" fill="var(--o-icons-cyan-pure, #1BD4F9)"/>
+<path d="M31 4L31 8C31 10.2091 32.7909 12 35 12L46 12V8C46 5.79086 44.2091 4 42 4L31 4Z" fill="url(#white_gradient_5)" fill-opacity="0.3"/>
+<path d="M38 46H42C44.2091 46 46 44.2091 46 42V31H42C39.7909 31 38 32.7909 38 35V46Z" fill="var(--o-icons-yellow-yellow, #ED7609)"/>
+<path d="M38 46H42C44.2091 46 46 44.2091 46 42V31H42C39.7909 31 38 32.7909 38 35V46Z" fill="url(#white_gradient_6)" fill-opacity="0.3"/>
+<defs>
+<linearGradient id="white_gradient_1" x1="4" y1="4" x2="28.7059" y2="10.1765" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="white_gradient_2" x1="4" y1="31" x2="21.6471" y2="35.4118" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="white_gradient_3" x1="25" y1="31" x2="34.8253" y2="32.31" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="white_gradient_4" x1="31" y1="17" x2="46.3723" y2="24.2058" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="white_gradient_5" x1="31" y1="4" x2="46.3723" y2="11.2058" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="white_gradient_6" x1="38" y1="31" x2="47.8253" y2="32.31" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+</defs>
 </svg>
diff --git a/addons/board/static/src/add_to_board/add_to_board.js b/addons/board/static/src/add_to_board/add_to_board.js
index 4602e156c21..7b257200e60 100644
--- a/addons/board/static/src/add_to_board/add_to_board.js
+++ b/addons/board/static/src/add_to_board/add_to_board.js
@@ -6,7 +6,7 @@ import { useAutofocus, useService } from "@web/core/utils/hooks";
 import { sprintf } from "@web/core/utils/strings";
 
 const { Component, useState } = owl;
-const favoriteMenuRegistry = registry.category("favoriteMenu");
+const cogMenuRegistry = registry.category("cogMenu");
 
 /**
  * 'Add to board' menu
@@ -99,4 +99,4 @@ export const addToBoardItem = {
     isDisplayed: ({ config }) => config.actionType === "ir.actions.act_window" && config.actionId,
 };
 
-favoriteMenuRegistry.add("add-to-board", addToBoardItem, { sequence: 10 });
+cogMenuRegistry.add("add-to-board", addToBoardItem, { sequence: 10 });
diff --git a/addons/board/static/tests/add_to_dashboard_tests.js b/addons/board/static/tests/add_to_dashboard_tests.js
index ddea0e7e56c..410b76a0dc5 100644
--- a/addons/board/static/tests/add_to_dashboard_tests.js
+++ b/addons/board/static/tests/add_to_dashboard_tests.js
@@ -12,10 +12,7 @@ import {
     applyGroup,
     removeFacet,
     toggleAddCustomGroup,
-    toggleComparisonMenu,
-    toggleFavoriteMenu,
-    toggleFilterMenu,
-    toggleGroupByMenu,
+    toggleSearchBarMenu,
     toggleMenuItem,
     toggleMenuItemOption,
 } from "@web/../tests/search/helpers";
@@ -142,13 +139,11 @@ QUnit.module("Board", (hooks) => {
         await click(document.querySelector(".o_column_sortable"));
 
         // Group It
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleAddCustomGroup(target);
         await applyGroup(target);
 
         // add this action to dashboard
-        await toggleFavoriteMenu(target);
-
         await testUtils.dom.triggerEvent($(".o_add_to_board button.dropdown-toggle"), "mouseenter");
         await testUtils.fields.editInput($(".o_add_to_board input"), "a name");
         await testUtils.dom.click($(".o_add_to_board .dropdown-menu button"));
@@ -202,11 +197,10 @@ QUnit.module("Board", (hooks) => {
 
         var filter_count = 0;
         // Add a first filter
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Filter on a");
 
         // Add it to dashboard
-        await toggleFavoriteMenu(target);
         await testUtils.dom.triggerEvent($(".o_add_to_board button.dropdown-toggle"), "mouseenter");
         await testUtils.dom.click($(".o_add_to_board .dropdown-menu button"));
 
@@ -214,11 +208,10 @@ QUnit.module("Board", (hooks) => {
         await removeFacet(target);
 
         // Add the second filter
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Filter on b");
 
         // Add it to dashboard
-        await toggleFavoriteMenu(target);
         await testUtils.dom.triggerEvent(
             target.querySelector(".o_add_to_board button.dropdown-toggle"),
             "mouseenter"
@@ -263,11 +256,10 @@ QUnit.module("Board", (hooks) => {
         });
 
         // Add a filter
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Filter");
 
         // Add it to dashboard
-        await toggleFavoriteMenu(target);
         await testUtils.dom.triggerEvent(
             target.querySelector(".o_add_to_board button.dropdown-toggle"),
             "mouseenter"
@@ -292,7 +284,7 @@ QUnit.module("Board", (hooks) => {
             type: "ir.actions.act_window",
             views: [[false, "pivot"]],
         });
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         assert.containsNone(target, ".o_add_to_board");
 
         // Sanity check
@@ -302,7 +294,7 @@ QUnit.module("Board", (hooks) => {
             type: "ir.actions.act_window",
             views: [[false, "pivot"]],
         });
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         assert.containsOnce(target, ".o_add_to_board");
     });
 
@@ -357,16 +349,14 @@ QUnit.module("Board", (hooks) => {
             });
 
             // filter on July 2020
-            await toggleFilterMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "Date");
             await toggleMenuItemOption(target, "Date", "July");
 
             // compare July 2020 to June 2020
-            await toggleComparisonMenu(target);
-            await toggleMenuItem(target, 0);
+            await toggleMenuItem(target.querySelector(".o_comparison_menu"), 0);
 
             // add the view to the dashboard
-            await toggleFavoriteMenu(target);
 
             await mouseEnter(target.querySelector(".o_add_to_board .dropdown-toggle"));
             const input = target.querySelector(".o_add_to_board .dropdown-menu input");
@@ -403,7 +393,7 @@ QUnit.module("Board", (hooks) => {
             views: [[false, "pivot"]],
         });
 
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await mouseEnter(target.querySelector(".o_add_to_board .dropdown-toggle"));
         const input = target.querySelector(".o_add_to_board .dropdown-menu input");
         await testUtils.fields.editInput(input, "Pipeline");
@@ -445,7 +435,7 @@ QUnit.module("Board", (hooks) => {
             context: { search_default_filter: 1 },
         });
 
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await mouseEnter(target.querySelector(".o_add_to_board .dropdown-toggle"));
         const input = target.querySelector(".o_add_to_board .dropdown-menu input");
         await testUtils.fields.editInput(input, "Pipeline");
diff --git a/addons/board/static/tests/board_test.js b/addons/board/static/tests/board_test.js
index 68386724144..6dc805a20aa 100644
--- a/addons/board/static/tests/board_test.js
+++ b/addons/board/static/tests/board_test.js
@@ -131,7 +131,10 @@ QUnit.module("Board", (hooks) => {
                     return Promise.resolve(true);
                 }
                 if (args.method === "get_views" && args.model == "partner") {
-                    assert.deepEqual(args.kwargs.views.find((v) => v[1] === 'list'), [4, "list"]);
+                    assert.deepEqual(
+                        args.kwargs.views.find((v) => v[1] === "list"),
+                        [4, "list"]
+                    );
                 }
             },
         });
diff --git a/addons/calendar/static/description/icon.png b/addons/calendar/static/description/icon.png
index 29b73e45ab5..a0220989ca6 100644
Binary files a/addons/calendar/static/description/icon.png and b/addons/calendar/static/description/icon.png differ
diff --git a/addons/calendar/static/description/icon.svg b/addons/calendar/static/description/icon.svg
index a68d570621e..f095898ab9e 100644
--- a/addons/calendar/static/description/icon.svg
+++ b/addons/calendar/static/description/icon.svg
@@ -1,23 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70">
-    <defs>
-        <path id="icon-a" d="M4,5.35309892e-14 C36.4160122,9.87060235e-15 58.0836068,-3.97961823e-14 65,5.07020818e-14 C69,6.733808e-14 70,1 70,5 C70,43.0488877 70,62.4235458 70,65 C70,69 69,70 65,70 C61,70 9,70 4,70 C1,70 7.10542736e-15,69 7.10542736e-15,65 C7.25721566e-15,62.4676575 3.83358709e-14,41.8005206 3.60818146e-14,5 C-1.13686838e-13,1 1,5.75716207e-14 4,5.35309892e-14 Z"/>
-        <linearGradient id="icon-c" x1="100%" x2="0%" y1="0%" y2="100%">
-            <stop offset="0%" stop-color="#CDC484"/>
-            <stop offset="100%" stop-color="#B5AA59"/>
-        </linearGradient>
-        <path id="icon-d" d="M28.3839286,37.7083333 L24.9017857,37.7083333 C24.3272321,37.7083333 23.8571429,37.2513021 23.8571429,36.6927083 L23.8571429,33.3072917 C23.8571429,32.7486979 24.3272321,32.2916667 24.9017857,32.2916667 L28.3839286,32.2916667 C28.9584821,32.2916667 29.4285714,32.7486979 29.4285714,33.3072917 L29.4285714,36.6927083 C29.4285714,37.2513021 28.9584821,37.7083333 28.3839286,37.7083333 Z M37.7857143,36.6927083 L37.7857143,33.3072917 C37.7857143,32.7486979 37.315625,32.2916667 36.7410714,32.2916667 L33.2589286,32.2916667 C32.684375,32.2916667 32.2142857,32.7486979 32.2142857,33.3072917 L32.2142857,36.6927083 C32.2142857,37.2513021 32.684375,37.7083333 33.2589286,37.7083333 L36.7410714,37.7083333 C37.315625,37.7083333 37.7857143,37.2513021 37.7857143,36.6927083 Z M46.1428571,36.6927083 L46.1428571,33.3072917 C46.1428571,32.7486979 45.6727679,32.2916667 45.0982143,32.2916667 L41.6160714,32.2916667 C41.0415179,32.2916667 40.5714286,32.7486979 40.5714286,33.3072917 L40.5714286,36.6927083 C40.5714286,37.2513021 41.0415179,37.7083333 41.6160714,37.7083333 L45.0982143,37.7083333 C45.6727679,37.7083333 46.1428571,37.2513021 46.1428571,36.6927083 Z M37.7857143,44.8177083 L37.7857143,41.4322917 C37.7857143,40.8736979 37.315625,40.4166667 36.7410714,40.4166667 L33.2589286,40.4166667 C32.684375,40.4166667 32.2142857,40.8736979 32.2142857,41.4322917 L32.2142857,44.8177083 C32.2142857,45.3763021 32.684375,45.8333333 33.2589286,45.8333333 L36.7410714,45.8333333 C37.315625,45.8333333 37.7857143,45.3763021 37.7857143,44.8177083 Z M29.4285714,44.8177083 L29.4285714,41.4322917 C29.4285714,40.8736979 28.9584821,40.4166667 28.3839286,40.4166667 L24.9017857,40.4166667 C24.3272321,40.4166667 23.8571429,40.8736979 23.8571429,41.4322917 L23.8571429,44.8177083 C23.8571429,45.3763021 24.3272321,45.8333333 24.9017857,45.8333333 L28.3839286,45.8333333 C28.9584821,45.8333333 29.4285714,45.3763021 29.4285714,44.8177083 Z M46.1428571,44.8177083 L46.1428571,41.4322917 C46.1428571,40.8736979 45.6727679,40.4166667 45.0982143,40.4166667 L41.6160714,40.4166667 C41.0415179,40.4166667 40.5714286,40.8736979 40.5714286,41.4322917 L40.5714286,44.8177083 C40.5714286,45.3763021 41.0415179,45.8333333 41.6160714,45.8333333 L45.0982143,45.8333333 C45.6727679,45.8333333 46.1428571,45.3763021 46.1428571,44.8177083 Z M54.5,22.8125 L54.5,52.6041667 C54.5,54.8470052 52.6283482,56.6666667 50.3214286,56.6666667 L19.6785714,56.6666667 C17.3716518,56.6666667 15.5,54.8470052 15.5,52.6041667 L15.5,22.8125 C15.5,20.5696615 17.3716518,18.75 19.6785714,18.75 L23.8571429,18.75 L23.8571429,14.3489583 C23.8571429,13.7903646 24.3272321,13.3333333 24.9017857,13.3333333 L28.3839286,13.3333333 C28.9584821,13.3333333 29.4285714,13.7903646 29.4285714,14.3489583 L29.4285714,18.75 L40.5714286,18.75 L40.5714286,14.3489583 C40.5714286,13.7903646 41.0415179,13.3333333 41.6160714,13.3333333 L45.0982143,13.3333333 C45.6727679,13.3333333 46.1428571,13.7903646 46.1428571,14.3489583 L46.1428571,18.75 L50.3214286,18.75 C52.6283482,18.75 54.5,20.5696615 54.5,22.8125 Z M50.3214286,52.0963542 L50.3214286,26.875 L19.6785714,26.875 L19.6785714,52.0963542 C19.6785714,52.375651 19.9136161,52.6041667 20.2008929,52.6041667 L49.7991071,52.6041667 C50.0863839,52.6041667 50.3214286,52.375651 50.3214286,52.0963542 Z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <mask id="icon-b" fill="#fff">
-            <use xlink:href="#icon-a"/>
-        </mask>
-        <g mask="url(#icon-b)">
-            <rect width="70" height="70" fill="url(#icon-c)"/>
-            <path fill="#FFF" fill-opacity=".383" d="M4,1.8 L65,1.8 C67.6666667,1.8 69.3333333,1.13333333 70,-0.2 C70,2.46666667 70,3.46666667 70,2.8 L1.10547097e-14,2.8 C-1.65952376e-14,3.46666667 -2.9161925e-14,2.46666667 -2.66453526e-14,-0.2 C0.666666667,1.13333333 2,1.8 4,1.8 Z" transform="matrix(1 0 0 -1 0 2.8)"/>
-            <path fill="#393939" d="M43.4796282,58 L3.97692274,58 C1.98846137,58 -7.06443391e-15,57.8520408 0,53.8571429 L2.26109583e-16,28.7421381 L18.1939643,6.70980496 L20,6 L24,0 L29.235775,0.958543565 L30.1559259,9.58543565 L42.1178875,8.51357709e-15 L45.7984911,0 L45.7984911,8 L54,8 L53.7495748,40.7451155 L43.4796282,58 Z" opacity=".324" transform="translate(0 12)"/>
-            <path fill="#000" fill-opacity=".383" d="M4,4 L65,4 C67.6666667,4 69.3333333,3 70,1 C70,3.66666667 70,5 70,5 L1.77635684e-15,5 C1.77635684e-15,5 1.77635684e-15,3.66666667 1.77635684e-15,1 C0.666666667,3 2,4 4,4 Z" transform="translate(0 65)"/>
-            <use fill="#000" fill-rule="nonzero" opacity=".35" xlink:href="#icon-d"/>
-            <path fill="#FFF" fill-rule="nonzero" d="M28.3839286,35.7083333 L24.9017857,35.7083333 C24.3272321,35.7083333 23.8571429,35.2513021 23.8571429,34.6927083 L23.8571429,31.3072917 C23.8571429,30.7486979 24.3272321,30.2916667 24.9017857,30.2916667 L28.3839286,30.2916667 C28.9584821,30.2916667 29.4285714,30.7486979 29.4285714,31.3072917 L29.4285714,34.6927083 C29.4285714,35.2513021 28.9584821,35.7083333 28.3839286,35.7083333 Z M37.7857143,34.6927083 L37.7857143,31.3072917 C37.7857143,30.7486979 37.315625,30.2916667 36.7410714,30.2916667 L33.2589286,30.2916667 C32.684375,30.2916667 32.2142857,30.7486979 32.2142857,31.3072917 L32.2142857,34.6927083 C32.2142857,35.2513021 32.684375,35.7083333 33.2589286,35.7083333 L36.7410714,35.7083333 C37.315625,35.7083333 37.7857143,35.2513021 37.7857143,34.6927083 Z M46.1428571,34.6927083 L46.1428571,31.3072917 C46.1428571,30.7486979 45.6727679,30.2916667 45.0982143,30.2916667 L41.6160714,30.2916667 C41.0415179,30.2916667 40.5714286,30.7486979 40.5714286,31.3072917 L40.5714286,34.6927083 C40.5714286,35.2513021 41.0415179,35.7083333 41.6160714,35.7083333 L45.0982143,35.7083333 C45.6727679,35.7083333 46.1428571,35.2513021 46.1428571,34.6927083 Z M37.7857143,42.8177083 L37.7857143,39.4322917 C37.7857143,38.8736979 37.315625,38.4166667 36.7410714,38.4166667 L33.2589286,38.4166667 C32.684375,38.4166667 32.2142857,38.8736979 32.2142857,39.4322917 L32.2142857,42.8177083 C32.2142857,43.3763021 32.684375,43.8333333 33.2589286,43.8333333 L36.7410714,43.8333333 C37.315625,43.8333333 37.7857143,43.3763021 37.7857143,42.8177083 Z M29.4285714,42.8177083 L29.4285714,39.4322917 C29.4285714,38.8736979 28.9584821,38.4166667 28.3839286,38.4166667 L24.9017857,38.4166667 C24.3272321,38.4166667 23.8571429,38.8736979 23.8571429,39.4322917 L23.8571429,42.8177083 C23.8571429,43.3763021 24.3272321,43.8333333 24.9017857,43.8333333 L28.3839286,43.8333333 C28.9584821,43.8333333 29.4285714,43.3763021 29.4285714,42.8177083 Z M46.1428571,42.8177083 L46.1428571,39.4322917 C46.1428571,38.8736979 45.6727679,38.4166667 45.0982143,38.4166667 L41.6160714,38.4166667 C41.0415179,38.4166667 40.5714286,38.8736979 40.5714286,39.4322917 L40.5714286,42.8177083 C40.5714286,43.3763021 41.0415179,43.8333333 41.6160714,43.8333333 L45.0982143,43.8333333 C45.6727679,43.8333333 46.1428571,43.3763021 46.1428571,42.8177083 Z M54.5,20.8125 L54.5,50.6041667 C54.5,52.8470052 52.6283482,54.6666667 50.3214286,54.6666667 L19.6785714,54.6666667 C17.3716518,54.6666667 15.5,52.8470052 15.5,50.6041667 L15.5,20.8125 C15.5,18.5696615 17.3716518,16.75 19.6785714,16.75 L23.8571429,16.75 L23.8571429,12.3489583 C23.8571429,11.7903646 24.3272321,11.3333333 24.9017857,11.3333333 L28.3839286,11.3333333 C28.9584821,11.3333333 29.4285714,11.7903646 29.4285714,12.3489583 L29.4285714,16.75 L40.5714286,16.75 L40.5714286,12.3489583 C40.5714286,11.7903646 41.0415179,11.3333333 41.6160714,11.3333333 L45.0982143,11.3333333 C45.6727679,11.3333333 46.1428571,11.7903646 46.1428571,12.3489583 L46.1428571,16.75 L50.3214286,16.75 C52.6283482,16.75 54.5,18.5696615 54.5,20.8125 Z M50.3214286,50.0963542 L50.3214286,24.875 L19.6785714,24.875 L19.6785714,50.0963542 C19.6785714,50.375651 19.9136161,50.6041667 20.2008929,50.6041667 L49.7991071,50.6041667 C50.0863839,50.6041667 50.3214286,50.375651 50.3214286,50.0963542 Z"/>
-        </g>
-    </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M16 38c3 0 6-1 6-5s-2.306-6-6-6a3 3 0 0 1 3-3h4c3.593 1.3 6 4 6 9 0 8-6 11-13 11S4 41 4 33h7c0 3 2 5 5 5Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M16 38c3 0 6-1 6-5s-2.306-6-6-6a3 3 0 0 1 3-3h4c3.593 1.3 6 4 6 9 0 8-6 11-13 11S4 41 4 33h7c0 3 2 5 5 5Z" fill="url(#o_icon_calendar__a)" fill-opacity=".2"/><path d="M23 24h-5a2 2 0 0 1-2-2c4 0 5-3 5-5 0-3-1.964-5-5-5-3 0-5 2-5 4H4C4 9.616 10 6 16 6s12 4 12 10-5 8-5 8Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M23 24h-5a2 2 0 0 1-2-2c4 0 5-3 5-5 0-3-1.964-5-5-5-3 0-5 2-5 4H4C4 9.616 10 6 16 6s12 4 12 10-5 8-5 8Z" fill="url(#o_icon_calendar__b)" fill-opacity=".2"/><path d="m23 24-7 3h-4v-2c0-2 1-3 4-3l7 2Z" fill="var(--o-icons-red-yellow, #F85318)"/><path d="m23 24-7 3h-4v-2c0-2 1-3 4-3l7 2Z" fill="url(#o_icon_calendar__c)" fill-opacity=".2"/><path d="M46 11v33h-3c-2 0-4-2-4-4V14l7-3Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M46 11v33h-3c-2 0-4-2-4-4V14l7-3Z" fill="url(#o_icon_calendar__d)" fill-opacity=".2"/><path d="M39 7.333 32 12l-1 6 8-4V7.333Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M39 7.333 32 12l-1 6 8-4V7.333Z" fill="url(#o_icon_calendar__e)" fill-opacity=".2"/><path d="M39 7.333 41 6h1c2 0 4 2 4 4v1l-7 3V7.333Z" fill="var(--o-icons-red-yellow, #F85318)"/><path d="M39 7.333 41 6h1c2 0 4 2 4 4v1l-7 3V7.333Z" fill="url(#o_icon_calendar__f)" fill-opacity=".2"/><defs><linearGradient id="o_icon_calendar__a" x1="4" y1="24" x2="32.47" y2="32.897" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_calendar__b" x1="4" y1="6" x2="31" y2="15" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_calendar__c" x1="12" y1="22" x2="22.557" y2="27.806" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_calendar__d" x1="39" y1="11" x2="47.725" y2="11.463" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_calendar__e" x1="31" y1="7.333" x2="40.66" y2="9.145" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_calendar__f" x1="39" y1="6" x2="47.35" y2="7.827" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_controller.xml b/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_controller.xml
index cef61afbe2e..e4c6d8caf7f 100644
--- a/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_controller.xml
+++ b/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_controller.xml
@@ -20,13 +20,10 @@
                 </div>
             </div>
         </DatePicker>
-    </t>
-
-    <t t-name="calendar.AttendeeCalendarController.controlButtons" t-inherit="web.CalendarController.controlButtons" owl="1">
-        <xpath expr="//span[hasclass('o_calendar_navigation_buttons')]" position="before">
-            <span class="o_calendar_create_buttons">
+        <xpath expr="//Layout" position="inside">
+            <t t-set-slot="control-panel-create-button">
                 <button class="btn btn-primary o-calendar-button-new me-1" t-on-click="onClickAddButton">New</button>
-            </span>
+            </t>
         </xpath>
     </t>
 </templates>
diff --git a/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_view.js b/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_view.js
index 96f6b793611..3d3f47f21a9 100644
--- a/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_view.js
+++ b/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_view.js
@@ -11,7 +11,6 @@ export const attendeeCalendarView = {
     Controller: AttendeeCalendarController,
     Model: AttendeeCalendarModel,
     Renderer: AttendeeCalendarRenderer,
-    buttonTemplate: "calendar.AttendeeCalendarController.controlButtons",
 };
 
 registry.category("views").add("attendee_calendar", attendeeCalendarView);
diff --git a/addons/calendar/static/src/views/fields/many2many_attendee_expandable.xml b/addons/calendar/static/src/views/fields/many2many_attendee_expandable.xml
index 3640a9cac56..bcfe38df89f 100644
--- a/addons/calendar/static/src/views/fields/many2many_attendee_expandable.xml
+++ b/addons/calendar/static/src/views/fields/many2many_attendee_expandable.xml
@@ -17,7 +17,7 @@
                         <br/><t t-out="declinedCount"/> declined
                         <br/><t t-out="uncertainCount"/> uncertain
                     </div>
-                    <i role="button" t-on-click="onExpanderClick" t-att-class="state.expanded ? 'fa fa-chevron-up' : 'fa fa-chevron-down'"></i>
+                    <i role="button" t-on-click="onExpanderClick" t-att-class="state.expanded ? 'oi oi-chevron-up' : 'oi oi-chevron-down'"></i>
                 </div>
             </t>
         </xpath>
diff --git a/addons/calendar/static/tests/calendar_tests.js b/addons/calendar/static/tests/calendar_tests.js
index b65bbba217e..8398e2a5ffb 100644
--- a/addons/calendar/static/tests/calendar_tests.js
+++ b/addons/calendar/static/tests/calendar_tests.js
@@ -91,11 +91,11 @@ QUnit.module(
             );
             assert.containsN(
                 target,
-                '.o_field_widget[name="partner_ids"] .badge',
+                '.o_field_widget[name="partner_ids"] .o_tag',
                 2,
                 "there should be 2 tags"
             );
-            const badges = target.querySelectorAll('.o_field_widget[name="partner_ids"] .badge');
+            const badges = target.querySelectorAll('.o_field_widget[name="partner_ids"] .o_tag');
             assert.strictEqual(
                 badges[0].textContent.trim(),
                 "Jesus",
diff --git a/addons/calendar/views/calendar_views.xml b/addons/calendar/views/calendar_views.xml
index ecfe36748c6..5a2ca6f3270 100644
--- a/addons/calendar/views/calendar_views.xml
+++ b/addons/calendar/views/calendar_views.xml
@@ -109,7 +109,7 @@
                     <div class="oe_button_box" name="button_box">
                         <button string="Document" icon="fa-bars" type="object" name="action_open_calendar_event" attrs="{'invisible': ['|', ('res_model', '=', False), ('res_id', '=', False)]}"/>
                     </div>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <field name="res_model" invisible="1" />
                     <field name="res_id" invisible="1" />
                     <field name="attendee_status" invisible="1"/>
@@ -160,7 +160,7 @@
                                             <span class="fa fa-plus"></span><span> Add Odoo meeting</span>
                                         </button>
                                         <button name="action_join_video_call" class="btn btn-link" help="Join Video Call" type="object" attrs="{'invisible': [('videocall_location', '=', False)]}">
-                                            <span class="fa fa-arrow-right"></span><span> Join video call</span>
+                                            <span class="oi oi-arrow-right"></span><span> Join video call</span>
                                         </button>
                                     </div>
                                     <field name="videocall_source" invisible="1"/>
@@ -336,7 +336,7 @@
                                 <span class="fa fa-plus"></span><span> Add Odoo meeting</span>
                             </button>
                             <button name="action_join_video_call" class="btn btn-link" help="Join Video Call" type="object" attrs="{'invisible': [('videocall_location', '=', False)]}">
-                                <span class="fa fa-arrow-right"></span><span> Join video call</span>
+                                <span class="oi oi-arrow-right"></span><span> Join video call</span>
                             </button>
                         </div>
                         <field name="description"/>
diff --git a/addons/contacts/static/description/icon.png b/addons/contacts/static/description/icon.png
index 769ac930f3e..3e57793d1ef 100644
Binary files a/addons/contacts/static/description/icon.png and b/addons/contacts/static/description/icon.png differ
diff --git a/addons/contacts/static/description/icon.svg b/addons/contacts/static/description/icon.svg
index 542d723f06a..d59f3097587 100644
--- a/addons/contacts/static/description/icon.svg
+++ b/addons/contacts/static/description/icon.svg
@@ -1,24 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70">
-    <defs>
-        <path id="icon-a" d="M4,5.35309892e-14 C36.4160122,9.87060235e-15 58.0836068,-3.97961823e-14 65,5.07020818e-14 C69,6.733808e-14 70,1 70,5 C70,43.0488877 70,62.4235458 70,65 C70,69 69,70 65,70 C61,70 9,70 4,70 C1,70 7.10542736e-15,69 7.10542736e-15,65 C7.25721566e-15,62.4676575 3.83358709e-14,41.8005206 3.60818146e-14,5 C-1.13686838e-13,1 1,5.75716207e-14 4,5.35309892e-14 Z"/>
-        <linearGradient id="icon-c" x1="100%" x2="0%" y1="0%" y2="100%">
-            <stop offset="0%" stop-color="#269396"/>
-            <stop offset="100%" stop-color="#218689"/>
-        </linearGradient>
-        <path id="icon-d" d="M51.4709821,28.8125 C51.970226,28.8125 52.375,28.4102246 52.375,27.9140625 L52.375,24.9192708 C52.375,24.4231087 51.970226,24.0208333 51.4709821,24.0208333 L49.9642857,24.0208333 L49.9642857,20.4270833 C49.9642857,18.4422852 48.3453404,16.8333333 46.3482143,16.8333333 L22.2410714,16.8333333 C20.2439453,16.8333333 18.625,18.4422852 18.625,20.4270833 L18.625,51.5729167 C18.625,53.5577148 20.2439453,55.1666667 22.2410714,55.1666667 L46.3482143,55.1666667 C48.3453404,55.1666667 49.9642857,53.5577148 49.9642857,51.5729167 L49.9642857,47.9791667 L51.4709821,47.9791667 C51.970226,47.9791667 52.375,47.5768913 52.375,47.0807292 L52.375,44.0859375 C52.375,43.5897754 51.970226,43.1875 51.4709821,43.1875 L49.9642857,43.1875 L49.9642857,38.3958333 L51.4709821,38.3958333 C51.970226,38.3958333 52.375,37.9935579 52.375,37.4973958 L52.375,34.5026042 C52.375,34.0064421 51.970226,33.6041667 51.4709821,33.6041667 L49.9642857,33.6041667 L49.9642857,28.8125 L51.4709821,28.8125 Z M45.8962054,51.5729167 L22.6930804,51.5729167 C22.4434427,51.5729167 22.2410714,51.3717946 22.2410714,51.1236979 L22.2410714,20.8763021 C22.2410714,20.6282054 22.4434427,20.4270833 22.6930804,20.4270833 L45.8962054,20.4270833 C46.145843,20.4270833 46.3482143,20.6282054 46.3482143,20.8763021 L46.3482143,51.1236979 C46.3482143,51.3717946 46.145843,51.5729167 45.8962054,51.5729167 Z M28.2678571,32.40625 C28.2678571,29.098278 30.9661244,26.4166667 34.2946429,26.4166667 C37.6231613,26.4166667 40.3214286,29.098278 40.3214286,32.40625 C40.3214286,35.714222 37.6231613,38.3958333 34.2946429,38.3958333 C30.9661244,38.3958333 28.2678571,35.714222 28.2678571,32.40625 Z M43.9375,42.3996452 L43.9375,43.7864583 C43.9375,44.7788574 43.1280273,45.5833333 42.1294643,45.5833333 L26.4598214,45.5833333 C25.4612584,45.5833333 24.6517857,44.7788574 24.6517857,43.7864583 L24.6517857,42.3996452 C24.6517857,40.7505632 25.7810547,39.313138 27.3908092,38.9131836 L30.0770229,38.2457943 C32.2693415,39.8129688 35.6901451,40.2631608 38.5122628,38.2457943 L41.1984766,38.9131836 C42.808231,39.313138 43.9375,40.750638 43.9375,42.3996452 Z"/>
-        <path id="icon-e" d="M51.4709821,26.8125 C51.970226,26.8125 52.375,26.4102246 52.375,25.9140625 L52.375,22.9192708 C52.375,22.4231087 51.970226,22.0208333 51.4709821,22.0208333 L49.9642857,22.0208333 L49.9642857,18.4270833 C49.9642857,16.4422852 48.3453404,14.8333333 46.3482143,14.8333333 L22.2410714,14.8333333 C20.2439453,14.8333333 18.625,16.4422852 18.625,18.4270833 L18.625,49.5729167 C18.625,51.5577148 20.2439453,53.1666667 22.2410714,53.1666667 L46.3482143,53.1666667 C48.3453404,53.1666667 49.9642857,51.5577148 49.9642857,49.5729167 L49.9642857,45.9791667 L51.4709821,45.9791667 C51.970226,45.9791667 52.375,45.5768913 52.375,45.0807292 L52.375,42.0859375 C52.375,41.5897754 51.970226,41.1875 51.4709821,41.1875 L49.9642857,41.1875 L49.9642857,36.3958333 L51.4709821,36.3958333 C51.970226,36.3958333 52.375,35.9935579 52.375,35.4973958 L52.375,32.5026042 C52.375,32.0064421 51.970226,31.6041667 51.4709821,31.6041667 L49.9642857,31.6041667 L49.9642857,26.8125 L51.4709821,26.8125 Z M45.8962054,49.5729167 L22.6930804,49.5729167 C22.4434427,49.5729167 22.2410714,49.3717946 22.2410714,49.1236979 L22.2410714,18.8763021 C22.2410714,18.6282054 22.4434427,18.4270833 22.6930804,18.4270833 L45.8962054,18.4270833 C46.145843,18.4270833 46.3482143,18.6282054 46.3482143,18.8763021 L46.3482143,49.1236979 C46.3482143,49.3717946 46.145843,49.5729167 45.8962054,49.5729167 Z M28.2678571,30.40625 C28.2678571,27.098278 30.9661244,24.4166667 34.2946429,24.4166667 C37.6231613,24.4166667 40.3214286,27.098278 40.3214286,30.40625 C40.3214286,33.714222 37.6231613,36.3958333 34.2946429,36.3958333 C30.9661244,36.3958333 28.2678571,33.714222 28.2678571,30.40625 Z M43.9375,40.3996452 L43.9375,41.7864583 C43.9375,42.7788574 43.1280273,43.5833333 42.1294643,43.5833333 L26.4598214,43.5833333 C25.4612584,43.5833333 24.6517857,42.7788574 24.6517857,41.7864583 L24.6517857,40.3996452 C24.6517857,38.7505632 25.7810547,37.313138 27.3908092,36.9131836 L30.0770229,36.2457943 C32.2693415,37.8129688 35.6901451,38.2631608 38.5122628,36.2457943 L41.1984766,36.9131836 C42.808231,37.313138 43.9375,38.750638 43.9375,40.3996452 Z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <mask id="icon-b" fill="#fff">
-            <use xlink:href="#icon-a"/>
-        </mask>
-        <g mask="url(#icon-b)">
-            <rect width="70" height="70" fill="url(#icon-c)"/>
-            <path fill="#FFF" fill-opacity=".383" d="M4,1.8 L65,1.8 C67.6666667,1.8 69.3333333,1.13333333 70,-0.2 C70,2.46666667 70,3.46666667 70,2.8 L1.10547097e-14,2.8 C-1.65952376e-14,3.46666667 -2.9161925e-14,2.46666667 -2.66453526e-14,-0.2 C0.666666667,1.13333333 2,1.8 4,1.8 Z" transform="matrix(1 0 0 -1 0 2.8)"/>
-            <path fill="#393939" d="M39.8461538,54 L4,54 C2,54 -7.10542736e-15,53.8544474 0,49.9245283 L2.20625402e-16,25.9563572 L19.6596494,1.0710105 L47,0 L49.9211999,35.2849068 L39.8461538,54 Z" opacity=".324" transform="translate(0 15)"/>
-            <path fill="#000" fill-opacity=".383" d="M4,4 L65,4 C67.6666667,4 69.3333333,3 70,1 C70,3.66666667 70,5 70,5 L1.77635684e-15,5 C1.77635684e-15,5 1.77635684e-15,3.66666667 1.77635684e-15,1 C0.666666667,3 2,4 4,4 Z" transform="translate(0 65)"/>
-            <use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#icon-d"/>
-            <use fill="#FFF" fill-rule="nonzero" xlink:href="#icon-e"/>
-        </g>
-    </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M38 46a8 8 0 0 0 8-8V8H12a4 4 0 0 0-4 4v34h30Zm-8-27a6 6 0 1 1-12 0 6 6 0 0 1 12 0Zm4 9H24a9 9 0 0 0-9 9h10a9 9 0 0 0 9-9Z" fill="var(--o-icons-red-pure, #FC787D)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M38 46a8 8 0 0 0 8-8V8H12a4 4 0 0 0-4 4v34h30Zm-8-27a6 6 0 1 1-12 0 6 6 0 0 1 12 0Zm4 9H24a9 9 0 0 0-9 9h10a9 9 0 0 0 9-9Z" fill="url(#o_icon_contacts__a)" fill-opacity=".2"/><path fill-rule="evenodd" clip-rule="evenodd" d="M38 42a4 4 0 0 0 4-4V4H12a8 8 0 0 0-8 8v30h34Zm-8-23a6 6 0 1 1-12 0 6 6 0 0 1 12 0Zm4 9H24a9 9 0 0 0-9 9h10a9 9 0 0 0 9-9Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M38 42a4 4 0 0 0 4-4V4H12a8 8 0 0 0-8 8v30h34Zm-8-23a6 6 0 1 1-12 0 6 6 0 0 1 12 0Zm4 9H24a9 9 0 0 0-9 9h10a9 9 0 0 0 9-9Z" fill="url(#o_icon_contacts__b)" fill-opacity=".2"/><path fill-rule="evenodd" clip-rule="evenodd" d="M42 38a4 4 0 0 1-4 4H8V12a4 4 0 0 1 4-4h30v30ZM30 19a6 6 0 1 1-12 0 6 6 0 0 1 12 0Zm4 9H24a9 9 0 0 0-9 9h10a9 9 0 0 0 9-9Z" fill="var(--o-icons-red-teal, #006158)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M42 38a4 4 0 0 1-4 4H8V12a4 4 0 0 1 4-4h30v30ZM30 19a6 6 0 1 1-12 0 6 6 0 0 1 12 0Zm4 9H24a9 9 0 0 0-9 9h10a9 9 0 0 0 9-9Z" fill="url(#o_icon_contacts__c)" fill-opacity=".2"/><defs><linearGradient id="o_icon_contacts__a" x1="8" y1="8" x2="52.706" y2="19.177" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_contacts__b" x1="4" y1="4" x2="48.706" y2="15.177" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_contacts__c" x1="8" y1="8" x2="48" y2="18" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/crm/static/description/icon.png b/addons/crm/static/description/icon.png
index 28b1b0ca4c5..532de0c1f84 100644
Binary files a/addons/crm/static/description/icon.png and b/addons/crm/static/description/icon.png differ
diff --git a/addons/crm/static/description/icon.svg b/addons/crm/static/description/icon.svg
index 4dc59c7787f..674c8ad83c3 100644
--- a/addons/crm/static/description/icon.svg
+++ b/addons/crm/static/description/icon.svg
@@ -1,24 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70">
-    <defs>
-        <path id="icon-a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/>
-        <linearGradient id="icon-c" x1="98.162%" x2="0%" y1="1.838%" y2="100%">
-            <stop offset="0%" stop-color="#797DA5"/>
-            <stop offset="50.799%" stop-color="#6D7194"/>
-            <stop offset="100%" stop-color="#626584"/>
-        </linearGradient>
-        <path id="icon-d" d="M56.583 23.333h-3.5c-.518 0-.983.226-1.304.584h-1.715l-2.27-2.647-.012-.013a7.581 7.581 0 0 0-5.707-2.59h-3.394c-1.294 0-2.545.36-3.623 1.021a8.19 8.19 0 0 0-3.95-1.021h-2.342c-2.107 0-4.2.818-5.775 2.391l-2.857 2.859H18.22a1.745 1.745 0 0 0-1.304-.584h-3.5a1.75 1.75 0 0 0-1.75 1.75v17.5c0 .967.783 1.75 1.75 1.75h3.5a1.75 1.75 0 0 0 1.65-1.166h1.37l5.495 4.927c1.862 1.928 4.37 3.24 7.042 3.24 1.195 0 2.354-.281 3.362-.798 1.818.037 3.726-.756 5.036-2.29a7.109 7.109 0 0 0 3.698-2.523c1.53-.32 2.97-1.202 3.896-2.556h2.967a1.75 1.75 0 0 0 1.65 1.166h3.5a1.75 1.75 0 0 0 1.75-1.75v-17.5a1.75 1.75 0 0 0-1.75-1.75zM15.167 42a1.167 1.167 0 1 1 0-2.333 1.167 1.167 0 0 1 0 2.333zm30.08-.42c-1.12 1.042-2.69.826-2.914.583.103.976-1.331 2.993-3.579 2.835-.404 1.351-2.057 2.467-3.754 1.878-.648.648-1.638.957-2.526.957-1.82 0-3.483-1.06-4.604-2.254l-5.928-5.316a2.332 2.332 0 0 0-1.557-.596h-1.718v-12.25h1.95c.619 0 1.212-.246 1.65-.684l3.2-3.2a4.667 4.667 0 0 1 3.3-1.366h2.34c.424 0 .84.057 1.24.167l-3.155 3.682a5.376 5.376 0 0 0-.048 6.96c2.362 2.833 6.663 2.86 9.077.143l1.894-2.193 5.282 6.99c.98 1.065.799 2.781-.15 3.664zm6.086-1.913H49.55a5.985 5.985 0 0 0-1.441-3.967l-5.693-7.534a1.752 1.752 0 0 0-2.907-1.894l-3.911 4.53a2.49 2.49 0 0 1-3.765-.068 1.885 1.885 0 0 1 .016-2.44l4.224-4.928a3.434 3.434 0 0 1 2.608-1.2h3.394c1.175 0 2.293.507 3.068 1.389l3.312 3.862h2.878v12.25zm3.5 2.333a1.167 1.167 0 1 1 0-2.333 1.167 1.167 0 0 1 0 2.333z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <mask id="icon-b" fill="#fff">
-            <use xlink:href="#icon-a"/>
-        </mask>
-        <g mask="url(#icon-b)">
-            <path fill="url(#icon-c)" d="M0 0H70V70H0z"/>
-            <path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/>
-            <path fill="#000" d="M33.423 69H4.006C2.003 69 0 68.854 0 64.911V38.065l12.348-13.998 8.686.293L29.375 21h14.023l6.01 4.089L58 24.36v19.558L33.423 69z" opacity=".165"/>
-            <path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/>
-            <path fill="#000" fill-rule="nonzero" d="M56.583 25.333h-3.5c-.518 0-.983.226-1.304.584h-1.715l-2.27-2.647-.012-.013a7.581 7.581 0 0 0-5.707-2.59h-3.394c-1.294 0-2.545.36-3.623 1.021a8.19 8.19 0 0 0-3.95-1.021h-2.342c-2.107 0-4.2.818-5.775 2.391l-2.857 2.859H18.22a1.745 1.745 0 0 0-1.304-.584h-3.5a1.75 1.75 0 0 0-1.75 1.75v17.5c0 .967.783 1.75 1.75 1.75h3.5a1.75 1.75 0 0 0 1.65-1.166h1.37l5.495 4.927c1.862 1.928 4.37 3.24 7.042 3.24 1.195 0 2.354-.281 3.362-.798 1.818.037 3.726-.756 5.036-2.29a7.109 7.109 0 0 0 3.698-2.523c1.53-.32 2.97-1.202 3.896-2.556h2.967a1.75 1.75 0 0 0 1.65 1.166h3.5a1.75 1.75 0 0 0 1.75-1.75v-17.5a1.75 1.75 0 0 0-1.75-1.75zM15.167 44a1.167 1.167 0 1 1 0-2.333 1.167 1.167 0 0 1 0 2.333zm30.08-.42c-1.12 1.042-2.69.826-2.914.583.103.976-1.331 2.993-3.579 2.835-.404 1.351-2.057 2.467-3.754 1.878-.648.648-1.638.957-2.526.957-1.82 0-3.483-1.06-4.604-2.254l-5.928-5.316a2.332 2.332 0 0 0-1.557-.596h-1.718v-12.25h1.95c.619 0 1.212-.246 1.65-.684l3.2-3.2a4.667 4.667 0 0 1 3.3-1.366h2.34c.424 0 .84.057 1.24.167l-3.155 3.682a5.376 5.376 0 0 0-.048 6.96c2.362 2.833 6.663 2.86 9.077.143l1.894-2.193 5.282 6.99c.98 1.065.799 2.781-.15 3.664zm6.086-1.913H49.55a5.985 5.985 0 0 0-1.441-3.967l-5.693-7.534a1.752 1.752 0 0 0-2.907-1.894l-3.911 4.53a2.49 2.49 0 0 1-3.765-.068 1.885 1.885 0 0 1 .016-2.44l4.224-4.928a3.434 3.434 0 0 1 2.608-1.2h3.394c1.175 0 2.293.507 3.068 1.389l3.312 3.862h2.878v12.25zm3.5 2.333a1.167 1.167 0 1 1 0-2.333 1.167 1.167 0 0 1 0 2.333z" opacity=".372"/>
-            <use fill="#FFF" fill-rule="nonzero" xlink:href="#icon-d"/>
-        </g>
-    </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M45.873 9c3.52.042 5.504 4.474 3.013 6.964l-8.424 8.42L36.5 27 25 9.001h20.873Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M45.873 9c3.52.042 5.504 4.474 3.013 6.964l-8.424 8.42L36.5 27 25 9.001h20.873Z" fill="url(#o_icon_crm__a)" fill-opacity=".2"/><path d="M10.945 25.788a3.972 3.972 0 0 0 0 5.62l8.434 8.428a3.977 3.977 0 0 0 5.622 0L23.5 36 15 27l-4.055-1.212Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M10.945 25.788a3.972 3.972 0 0 0 0 5.62l8.434 8.428a3.977 3.977 0 0 0 5.622 0L23.5 36 15 27l-4.055-1.212Z" fill="url(#o_icon_crm__b)" fill-opacity=".2"/><path d="M1.115 15.964C-1.377 13.474.608 9.041 4.129 9H25l15.46 15.383a3.972 3.972 0 0 1 0 5.62l-9.839 9.833a3.977 3.977 0 0 1-5.622 0L1.115 15.964Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path d="M1.115 15.964C-1.377 13.474.608 9.041 4.129 9H25l15.46 15.383a3.972 3.972 0 0 1 0 5.62l-9.839 9.833a3.977 3.977 0 0 1-5.622 0L1.115 15.964Z" fill="url(#o_icon_crm__c)" fill-opacity=".2"/><path d="M25 39.836a3.972 3.972 0 0 0 0-5.62l-8.434-8.428a3.977 3.977 0 0 0-5.622 0L25 39.836Z" fill="var(--o-icons-purple-teal, #003458)"/><path d="M25 39.836a3.972 3.972 0 0 0 0-5.62l-8.434-8.428a3.977 3.977 0 0 0-5.622 0L25 39.836Z" fill="url(#o_icon_crm__d)" fill-opacity=".3"/><path d="M17.62 16.306 25 9l9.137 9.062a5.966 5.966 0 0 0-8.434 0l-3.162 3.16a3.48 3.48 0 0 1-4.92 0 3.475 3.475 0 0 1 0-4.916Z" fill="var(--o-icons-purple-teal, #003458)"/><path d="M17.62 16.306 25 9l9.137 9.062a5.966 5.966 0 0 0-8.434 0l-3.162 3.16a3.48 3.48 0 0 1-4.92 0 3.475 3.475 0 0 1 0-4.916Z" fill="url(#o_icon_crm__e)" fill-opacity=".3"/><defs><linearGradient id="o_icon_crm__a" x1="25" y1="9" x2="52.888" y2="18.684" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_crm__b" x1="9.781" y1="25.788" x2="27.686" y2="30.267" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_crm__c" x1="0" y1="9" x2="47.056" y2="24.303" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_crm__d" x1="10.944" y1="24.624" x2="28.849" y2="29.103" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_crm__e" x1="16.602" y1="9" x2="36.355" y2="15.54" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/crm/static/src/scss/crm.scss b/addons/crm/static/src/scss/crm.scss
index d8497d06dc6..5aede173ca7 100644
--- a/addons/crm/static/src/scss/crm.scss
+++ b/addons/crm/static/src/scss/crm.scss
@@ -7,27 +7,6 @@
 }
 
 .o_opportunity_kanban .o_kanban_renderer {
-    .ribbon {
-        &::before, &::after {
-            display: none;
-        }
-        span {
-            padding: 5px;
-            font-size: small;
-            z-index: 0;
-        }
-    }
-
-    .ribbon-top-right {
-        margin-top: -9px;
-        span {
-            left: 12px;
-            right: 30px;
-            height: 25px;
-            top: 18px;
-        }
-    }
-
     .oe_kanban_card_ribbon {
         min-height: 105px;
         .o_kanban_record_title {
diff --git a/addons/crm/static/tests/forecast_view_tests.js b/addons/crm/static/tests/forecast_view_tests.js
index c9e3fedd78e..3f72591c552 100644
--- a/addons/crm/static/tests/forecast_view_tests.js
+++ b/addons/crm/static/tests/forecast_view_tests.js
@@ -3,8 +3,7 @@
 import { getFixture, patchWithCleanup } from "@web/../tests/helpers/utils";
 import { menuService } from "@web/webclient/menus/menu_service";
 import {
-    toggleFilterMenu,
-    toggleGroupByMenu,
+    toggleSearchBarMenu,
     toggleMenuItem,
     toggleMenuItemOption,
 } from "@web/../tests/search/helpers";
@@ -115,7 +114,7 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Bar");
 
         await toggleMenuItem(target, "Date Field");
@@ -123,7 +122,6 @@ QUnit.module("Views", (hooks) => {
 
         await toggleMenuItemOption(target, "Date Field", "Year");
 
-        await toggleFilterMenu(target);
         await toggleMenuItem(target, "Forecast Filter");
 
         unpatchDate();
diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index f731d10d19f..54a8cc06370 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -46,7 +46,7 @@
                                 </div>
                             </button>
                         </div>
-                        <widget name="web_ribbon" title="Lost" bg_color="bg-danger" attrs="{'invisible': ['|', ('probability', '&gt;', 0), ('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Lost" bg_color="text-bg-danger" attrs="{'invisible': ['|', ('probability', '&gt;', 0), ('active', '=', True)]}"/>
                         <widget name="web_ribbon" title="Won" attrs="{'invisible': [('probability', '&lt;', 100)]}" />
                         <div class="oe_title">
                             <h1><field class="text-break" options="{'line_breaks': False}" widget="text" name="name" placeholder="e.g. Product Pricing"/></h1>
@@ -561,7 +561,7 @@
                             <div t-attf-class="#{!selection_mode ? kanban_color(record.color.raw_value) : ''} #{lost_ribbon ? 'oe_kanban_card_ribbon' : ''} oe_kanban_global_click oe_kanban_card d-flex flex-column">
                                 <div class="ribbon ribbon-top-right"
                                     attrs="{'invisible': ['|', ('probability', '&gt;', 0), ('active', '=', True)]}">
-                                    <span class="bg-danger">Lost</span>
+                                    <span class="text-bg-danger">Lost</span>
                                 </div>
 
                                 <div class="oe_kanban_content flex-grow-1">
@@ -643,8 +643,8 @@
                     <div class="ribbon ribbon-top-right"
                         attrs="{'invisible': ['&amp;', '|', ('probability', '&gt;', 0), ('active', '=', True),
                             '|', ('probability', '&lt;', 100), ('active', '=', False)]}">
-                        <span t-if="won_ribbon" class="bg-success">Won</span>
-                        <span t-elif="lost_ribbon" class="bg-danger">Lost</span>
+                        <span t-if="won_ribbon" class="text-bg-success">Won</span>
+                        <span t-elif="lost_ribbon" class="text-bg-danger">Lost</span>
                     </div>
                 </xpath>
                 <xpath expr="//div[hasclass('o_kanban_record_subtitle')]" position="replace">
diff --git a/addons/crm/views/crm_lost_reason_views.xml b/addons/crm/views/crm_lost_reason_views.xml
index b5a7a410074..d410fdbbb65 100644
--- a/addons/crm/views/crm_lost_reason_views.xml
+++ b/addons/crm/views/crm_lost_reason_views.xml
@@ -28,7 +28,7 @@
                             </div>
                         </button>
                     </div>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="oe_title">
                         <div>
                             <label for="name"/>
diff --git a/addons/crm/views/crm_team_views.xml b/addons/crm/views/crm_team_views.xml
index 7f001c02a00..571c78d88ce 100644
--- a/addons/crm/views/crm_team_views.xml
+++ b/addons/crm/views/crm_team_views.xml
@@ -169,7 +169,7 @@
                             <div class="oe_edit_only" attrs="{'invisible': [('alias_domain', '=', False)]}">
                                 <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
                             </div>
-                            <button icon="fa-arrow-right" type="action" name="%(base_setup.action_general_configuration)d" string="Configure a custom domain" class="p-0 btn-link" attrs="{'invisible': [('alias_domain', '!=', False)]}"/>
+                            <button icon="oi-arrow-right" type="action" name="%(base_setup.action_general_configuration)d" string="Configure a custom domain" class="p-0 btn-link" attrs="{'invisible': [('alias_domain', '!=', False)]}"/>
                         </div>
                     </div>
                     <field name="alias_contact"
diff --git a/addons/crm/views/res_config_settings_views.xml b/addons/crm/views/res_config_settings_views.xml
index 92e83c3d275..f560c96a395 100644
--- a/addons/crm/views/res_config_settings_views.xml
+++ b/addons/crm/views/res_config_settings_views.xml
@@ -14,7 +14,7 @@
                             <field name="group_use_recurring_revenues"/>
                             <div attrs="{'invisible': [('group_use_recurring_revenues', '=', False)]}">
                                 <button type="action" name="crm.crm_recurring_plan_action"
-                                        string="Manage Recurring Plans" icon="fa-arrow-right" class="oe_link"/>
+                                        string="Manage Recurring Plans" icon="oi-arrow-right" class="oe_link"/>
                             </div>
                         </setting>
                         <setting id="crm_lead" title="Use leads if you need a qualification step before creating an opportunity or a customer. It can be a business card you received, a contact form filled in your website, or a file of unqualified prospects you import, etc. Once qualified, the lead can be converted into a business opportunity and/or a new customer in your address book." help="Add a qualification step before the creation of an opportunity">
diff --git a/addons/data_recycle/static/description/icon.png b/addons/data_recycle/static/description/icon.png
index 39733a9ca2e..2a492567dc8 100644
Binary files a/addons/data_recycle/static/description/icon.png and b/addons/data_recycle/static/description/icon.png differ
diff --git a/addons/data_recycle/static/description/icon.svg b/addons/data_recycle/static/description/icon.svg
index 56122f6879b..9a253612e11 100644
--- a/addons/data_recycle/static/description/icon.svg
+++ b/addons/data_recycle/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 140 140"><defs><style>.cls-1,.cls-4,.cls-8{fill:#fff;}.cls-1,.cls-3,.cls-4,.cls-6{fill-rule:evenodd;}.cls-2{mask:url(#mask);}.cls-3{fill:url(#linear-gradient);}.cls-4,.cls-6{fill-opacity:0.38;}.cls-5{fill:#393939;opacity:0.32;}.cls-5,.cls-7{isolation:isolate;}.cls-7{opacity:0.3;}</style><mask id="mask" x="0" y="0" width="140" height="140" maskUnits="userSpaceOnUse"><g id="b"><path id="a" class="cls-1" d="M8,0H130c8,0,10,2,10,10V130c0,8-2,10-10,10H8c-6,0-8-2-8-10V10C0,2,2,0,8,0Z"/></g></mask><linearGradient id="linear-gradient" x1="-1641.82" y1="-64.72" x2="-1643.82" y2="-66.72" gradientTransform="matrix(70, 0, 0, -70, 115067.27, -4530.13)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#94b6c8"/><stop offset="1" stop-color="#6a9eba"/></linearGradient></defs><title>Asset 41</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><g class="cls-2"><path class="cls-3" d="M0,0H140V140H0Z"/><path class="cls-4" d="M8,2H130q8,0,10,4V0H0V6Q2,2,8,2Z"/><path class="cls-5" d="M118.55,91.67,116,92.75l-4.57,5.06v-1l-1.09-1.37-.95-1.93L121.6,79.93l.09-4.15-.92-4.35-2.21-1.18L116.23,70l-8,8.83V74.31l14.11-15.73h-3.82l1-11.88-4.85,1.39-6.4,7v-5.2l12.86-14.26.43-7.92-3-2.95-1.31.37-1.73.73-4.28,4.53-2.65-5.08-.74.25-.53-1.38L89.25,42.11,68.49,69.19l2.16,8.23L51.77,67,25.18,90.67l-9.62-4.54L32.38,67.26V61.63l9.37-10.44h-1l5.65-6.25V43.49l4.69-4.56H41.75L33,48.29l-.62,2.9H23L0,76.63V130c0,6,4,8,8,8H89.57l31.52-34.93,1.56-6.22Z"/><polygon class="cls-5" points="32.38 24.64 0 60.7 0 67.55 38.62 24.64 32.38 24.64"/><path class="cls-6" d="M8,138H130q8,0,10-6v8H0v-8Q2,138,8,138Z"/><g class="cls-7"><path d="M116.66,38.37a3.69,3.69,0,0,0,4.94-1.17,6.53,6.53,0,0,0,1.05-3.51V31.63a6.07,6.07,0,0,0-.7-2.85,4.74,4.74,0,0,0-1.5-1.83,3.47,3.47,0,0,0-1.9-.49,3.36,3.36,0,0,0-3,1.67,6.45,6.45,0,0,0-1.06,3.5v2.06a6.19,6.19,0,0,0,.7,2.85A4.64,4.64,0,0,0,116.66,38.37Zm-.31-6.74a4.14,4.14,0,0,1,.81-2.6,1.68,1.68,0,0,1,1.39-.7,1.64,1.64,0,0,1,1.37.63,4.36,4.36,0,0,1,.85,2.67v2.06A4.09,4.09,0,0,1,120,36.3a1.66,1.66,0,0,1-1.38.7,1.61,1.61,0,0,1-1.36-.63,4.34,4.34,0,0,1-.86-2.68Z"/><path d="M98.92,59.21H97V48.94L93,50a1.68,1.68,0,0,0-.81.38A.84.84,0,0,0,92,51a1,1,0,0,0,.26.69.83.83,0,0,0,.62.29,2.76,2.76,0,0,0,.6-.11l1.68-.44v7.82h-1.9a1.43,1.43,0,0,0-1,.26.88.88,0,0,0-.29.67.9.9,0,0,0,.29.69,1.43,1.43,0,0,0,1,.26h5.67a1.43,1.43,0,0,0,1-.26.94.94,0,0,0,0-1.36A1.43,1.43,0,0,0,98.92,59.21Z"/><path d="M110.16,59.21h-1.89V48.94l-4,1.05a1.69,1.69,0,0,0-.8.38.84.84,0,0,0-.19.59,1,1,0,0,0,.26.69.81.81,0,0,0,.62.29,2.76,2.76,0,0,0,.6-.11l1.67-.44v7.82H104.5a1.48,1.48,0,0,0-1,.26.88.88,0,0,0-.28.67.89.89,0,0,0,.28.69,1.48,1.48,0,0,0,1,.26h5.66a1.44,1.44,0,0,0,1-.26.94.94,0,0,0,0-1.36A1.44,1.44,0,0,0,110.16,59.21Z"/><path d="M115.75,59.21a1.44,1.44,0,0,0-1,.26.88.88,0,0,0-.29.67.9.9,0,0,0,.29.69,1.44,1.44,0,0,0,1,.26h5.66a1.48,1.48,0,0,0,1-.26,1,1,0,0,0,0-1.36,1.48,1.48,0,0,0-1-.26h-1.89V48.94l-4,1.05a1.68,1.68,0,0,0-.81.38.89.89,0,0,0-.19.59,1,1,0,0,0,.26.69.83.83,0,0,0,.62.29,2.72,2.72,0,0,0,.61-.11l1.67-.44v7.82Z"/><path d="M82.92,83.35a3.52,3.52,0,0,0,1.92.5,3.37,3.37,0,0,0,3-1.68,6.48,6.48,0,0,0,1.06-3.5V76.61a6,6,0,0,0-.71-2.85,4.82,4.82,0,0,0-1.49-1.83,3.53,3.53,0,0,0-1.91-.5,3.36,3.36,0,0,0-3,1.68,6.52,6.52,0,0,0-1.05,3.5v2.06a6,6,0,0,0,.7,2.84A4.6,4.6,0,0,0,82.92,83.35Zm-.31-6.74A4.11,4.11,0,0,1,83.43,74a1.68,1.68,0,0,1,1.39-.69,1.62,1.62,0,0,1,1.36.63A4.32,4.32,0,0,1,87,76.61v2.06a4.15,4.15,0,0,1-.81,2.61,1.68,1.68,0,0,1-1.38.69,1.61,1.61,0,0,1-1.37-.63,4.29,4.29,0,0,1-.86-2.67Z"/><path d="M98.92,81.7H97V71.43l-4,1a1.68,1.68,0,0,0-.81.38.84.84,0,0,0-.19.59,1,1,0,0,0,.26.69.82.82,0,0,0,.62.28,2.25,2.25,0,0,0,.6-.11l1.68-.43V81.7h-1.9a1.43,1.43,0,0,0-1,.26.93.93,0,0,0,0,1.35,1.38,1.38,0,0,0,1,.26h5.67a1.38,1.38,0,0,0,1-.26.82.82,0,0,0,.29-.67.84.84,0,0,0-.29-.68A1.43,1.43,0,0,0,98.92,81.7Z"/><path d="M110.16,81.7h-1.89V71.43l-4,1a1.69,1.69,0,0,0-.8.38.84.84,0,0,0-.19.59,1,1,0,0,0,.26.69.8.8,0,0,0,.62.28,2.25,2.25,0,0,0,.6-.11l1.67-.43V81.7H104.5a1.48,1.48,0,0,0-1,.26,1,1,0,0,0,0,1.35,1.43,1.43,0,0,0,1,.26h5.66a1.39,1.39,0,0,0,1-.26.86.86,0,0,0,.29-.67.88.88,0,0,0-.29-.68A1.44,1.44,0,0,0,110.16,81.7Z"/><path d="M120.45,71.93a3.47,3.47,0,0,0-1.9-.5,3.35,3.35,0,0,0-3,1.68,6.45,6.45,0,0,0-1.06,3.5v2.06a6.12,6.12,0,0,0,.7,2.84,4.61,4.61,0,0,0,1.49,1.84,3.5,3.5,0,0,0,1.91.5,3.39,3.39,0,0,0,3-1.68,6.47,6.47,0,0,0,1.05-3.5V76.61a6,6,0,0,0-.7-2.85A4.74,4.74,0,0,0,120.45,71.93Zm.32,6.74a4.09,4.09,0,0,1-.82,2.61,1.68,1.68,0,0,1-1.38.69,1.61,1.61,0,0,1-1.36-.63,4.29,4.29,0,0,1-.86-2.67V76.61a4.17,4.17,0,0,1,.81-2.61,1.7,1.7,0,0,1,1.39-.69,1.64,1.64,0,0,1,1.37.63,4.32,4.32,0,0,1,.85,2.67Z"/><path d="M87.67,104.19H85.78V93.92l-4,1a1.68,1.68,0,0,0-.8.38.86.86,0,0,0-.2.59,1,1,0,0,0,.27.7.8.8,0,0,0,.61.28,2.24,2.24,0,0,0,.61-.11l1.67-.44v7.83H82a1.41,1.41,0,0,0-1,.26.93.93,0,0,0,0,1.35,1.41,1.41,0,0,0,1,.26h5.66a1.43,1.43,0,0,0,1-.26.86.86,0,0,0,.29-.67.88.88,0,0,0-.29-.68A1.43,1.43,0,0,0,87.67,104.19Z"/><path d="M98.92,104.19H97V93.92l-4,1a1.78,1.78,0,0,0-.81.38.85.85,0,0,0-.19.59,1,1,0,0,0,.26.7.82.82,0,0,0,.62.28,2.25,2.25,0,0,0,.6-.11l1.68-.44v7.83h-1.9a1.38,1.38,0,0,0-1,.26.93.93,0,0,0,0,1.35,1.38,1.38,0,0,0,1,.26h5.67a1.38,1.38,0,0,0,1-.26.82.82,0,0,0,.29-.67.84.84,0,0,0-.29-.68A1.38,1.38,0,0,0,98.92,104.19Z"/><path d="M109.21,94.42a3.5,3.5,0,0,0-1.91-.5,3.36,3.36,0,0,0-3,1.68,6.52,6.52,0,0,0-1,3.5v2.06a6,6,0,0,0,.7,2.84,4.68,4.68,0,0,0,1.48,1.84,3.52,3.52,0,0,0,1.92.5,3.36,3.36,0,0,0,3-1.68,6.4,6.4,0,0,0,1.06-3.5V99.1a6,6,0,0,0-.71-2.85A4.65,4.65,0,0,0,109.21,94.42Zm.31,6.74a4.15,4.15,0,0,1-.81,2.61,1.68,1.68,0,0,1-1.38.69,1.62,1.62,0,0,1-1.37-.63,4.33,4.33,0,0,1-.86-2.67V99.1a4.09,4.09,0,0,1,.82-2.61,1.68,1.68,0,0,1,1.39-.69,1.62,1.62,0,0,1,1.36.63,4.32,4.32,0,0,1,.85,2.67Z"/><path d="M120.45,94.42a3.47,3.47,0,0,0-1.9-.5,3.35,3.35,0,0,0-3,1.68,6.45,6.45,0,0,0-1.06,3.5v2.06a6.12,6.12,0,0,0,.7,2.84,4.69,4.69,0,0,0,1.49,1.84,3.5,3.5,0,0,0,1.91.5,3.39,3.39,0,0,0,3-1.68,6.47,6.47,0,0,0,1.05-3.5V99.1a6,6,0,0,0-.7-2.85A4.66,4.66,0,0,0,120.45,94.42Zm.32,6.74a4.09,4.09,0,0,1-.82,2.61,1.68,1.68,0,0,1-1.38.69,1.61,1.61,0,0,1-1.36-.63,4.33,4.33,0,0,1-.86-2.67V99.1a4.15,4.15,0,0,1,.81-2.61,1.7,1.7,0,0,1,1.39-.69,1.64,1.64,0,0,1,1.37.63,4.32,4.32,0,0,1,.85,2.67Z"/><path d="M76.43,104.19h-1.9V99.57a39.23,39.23,0,0,1-1.87,3.85v.77h-.42c-.38.65-.78,1.26-1.18,1.87h5.37a1.38,1.38,0,0,0,1-.26.86.86,0,0,0,.29-.67.88.88,0,0,0-.29-.68A1.38,1.38,0,0,0,76.43,104.19Z"/><path d="M110.7,28.78A4.73,4.73,0,0,0,109.21,27a3.6,3.6,0,0,0-1.88-.49l-4.1,4.62v2.61a6.07,6.07,0,0,0,.7,2.85,4.63,4.63,0,0,0,1.48,1.83,3.43,3.43,0,0,0,1.92.5,3.37,3.37,0,0,0,3-1.67,6.45,6.45,0,0,0,1.06-3.51V31.63A6.08,6.08,0,0,0,110.7,28.78Zm-1.18,4.91a4.15,4.15,0,0,1-.81,2.61,1.66,1.66,0,0,1-1.38.7,1.62,1.62,0,0,1-1.37-.63,4.34,4.34,0,0,1-.86-2.68V31.63a4.08,4.08,0,0,1,.82-2.6,1.67,1.67,0,0,1,1.39-.7,1.62,1.62,0,0,1,1.36.63,4.36,4.36,0,0,1,.85,2.67Z"/><path d="M104,18.13a4,4,0,0,0-2-.52A3.17,3.17,0,0,0,99.36,19L66.93,67.53l-.11-.07a14.4,14.4,0,0,0-8-2.67,12,12,0,0,0-2.46.26c-4.76,1-8,4.78-9.16,6.35l-1.1,1.47,27.75,20,.86-2.17c2.43-6.15,4-12.25-2.4-18.83l33-49.51A3.07,3.07,0,0,0,104,18.13Z"/><path d="M54.66,82.31l-10-7.21L43.62,76C36.39,81.82,29,87.83,20,87.83a21.89,21.89,0,0,1-8.84-1.94l-.11,0a.34.34,0,0,0-.18.06.3.3,0,0,0-.1.29,53.8,53.8,0,0,0,1.53,5.87,2,2,0,0,0,1.29,1.32,24,24,0,0,0,7.77,1.28h.53c5.19-.14,13.24-2,22.12-10.07a.71.71,0,0,1,.46-.19.6.6,0,0,1,.45.19c.5.53,0,1.7-1.27,3-9,9-16,9.71-22.44,9.71a26.45,26.45,0,0,1-6.8-.86h-.09a.26.26,0,0,0-.21.1.32.32,0,0,0-.05.34A45.7,45.7,0,0,0,19.92,107a2,2,0,0,0,1.56.75h.18a32.61,32.61,0,0,0,6.65-1.3,22,22,0,0,0,7.41-3.76,14.12,14.12,0,0,0,1.51-1.38A6.53,6.53,0,0,1,38.65,100a.3.3,0,0,1,.15,0h0a.23.23,0,0,1,.17.11,1.76,1.76,0,0,1-.13,2.1c-3.75,4.69-8.8,7.32-15.45,8a.3.3,0,0,0-.26.21.31.31,0,0,0,.08.33A31.82,31.82,0,0,0,30,115.85a1.4,1.4,0,0,0,.7.18,1.52,1.52,0,0,0,.42-.06c7.66-2.24,20.81-7.64,22.9-18.57a.61.61,0,0,1,.39-.51l.28-.1.25.21a2.23,2.23,0,0,1,.29,1.68c-1.71,8.7-8.76,15.2-20.38,18.8a.27.27,0,0,0-.21.28.29.29,0,0,0,.19.29,35.88,35.88,0,0,0,12.1,2c.65,0,1.3,0,2-.05,1.83-.8,17.58-8.22,23-24.25a.31.31,0,0,0-.1-.35Z"/><path d="M32.38,69.51c-.68-10.05-1.8-13.4-9.37-16.07h0c7.57-2.92,8.69-5.15,9.37-16.07h0C33,47.9,34.38,51,41.75,53.44h0c-6.7,2.67-7.82,3.78-9.37,16.07"/><path d="M46.43,47.19c-.34-3.76-.9-5-4.68-6h0c3.78-1.09,4.34-1.93,4.68-6h0c.31,4,1,5.12,4.69,6h0c-3.35,1-3.91,1.42-4.69,6"/><path d="M35.5,30.47c-.23-2.24-.6-3-3.12-3.58h0c2.52-.65,2.89-1.15,3.12-3.58h0c.21,2.35.67,3.05,3.12,3.58h0c-2.23.59-2.6.84-3.12,3.58"/></g><path class="cls-8" d="M116.66,36.13a3.5,3.5,0,0,0,1.91.5,3.39,3.39,0,0,0,3-1.68,6.47,6.47,0,0,0,1.05-3.5V29.39a6,6,0,0,0-.7-2.85,4.71,4.71,0,0,0-1.5-1.84,3.47,3.47,0,0,0-1.9-.49,3.35,3.35,0,0,0-3,1.68,6.42,6.42,0,0,0-1.06,3.5v2.06a6.12,6.12,0,0,0,.7,2.84A4.69,4.69,0,0,0,116.66,36.13Zm-.31-6.74a4.15,4.15,0,0,1,.81-2.61,1.7,1.7,0,0,1,1.39-.69,1.64,1.64,0,0,1,1.37.63,4.32,4.32,0,0,1,.85,2.67v2.06a4.13,4.13,0,0,1-.82,2.61,1.68,1.68,0,0,1-1.38.69,1.61,1.61,0,0,1-1.36-.63,4.33,4.33,0,0,1-.86-2.67Z"/><path class="cls-8" d="M98.92,57H97V46.7l-4,1a1.78,1.78,0,0,0-.81.38.84.84,0,0,0-.19.59,1,1,0,0,0,.26.7.82.82,0,0,0,.62.28,2.76,2.76,0,0,0,.6-.11l1.68-.44V57h-1.9a1.38,1.38,0,0,0-1,.26.86.86,0,0,0-.29.67.88.88,0,0,0,.29.68,1.43,1.43,0,0,0,1,.26h5.67a1.43,1.43,0,0,0,1-.26.93.93,0,0,0,0-1.35A1.38,1.38,0,0,0,98.92,57Z"/><path class="cls-8" d="M110.16,57h-1.89V46.7l-4,1a1.79,1.79,0,0,0-.8.38.84.84,0,0,0-.19.59,1,1,0,0,0,.26.7.8.8,0,0,0,.62.28,2.76,2.76,0,0,0,.6-.11l1.67-.44V57H104.5a1.43,1.43,0,0,0-1,.26.85.85,0,0,0-.28.67.87.87,0,0,0,.28.68,1.48,1.48,0,0,0,1,.26h5.66a1.44,1.44,0,0,0,1-.26.93.93,0,0,0,0-1.35A1.39,1.39,0,0,0,110.16,57Z"/><path class="cls-8" d="M115.75,57a1.39,1.39,0,0,0-1,.26.86.86,0,0,0-.29.67.88.88,0,0,0,.29.68,1.44,1.44,0,0,0,1,.26h5.66a1.48,1.48,0,0,0,1-.26,1,1,0,0,0,0-1.35,1.43,1.43,0,0,0-1-.26h-1.89V46.7l-4,1a1.78,1.78,0,0,0-.81.38.89.89,0,0,0-.19.59,1,1,0,0,0,.26.7.82.82,0,0,0,.62.28,2.72,2.72,0,0,0,.61-.11l1.67-.44V57Z"/><path class="cls-8" d="M82.92,81.1a3.43,3.43,0,0,0,1.92.5,3.38,3.38,0,0,0,3-1.67,6.54,6.54,0,0,0,1.06-3.51v-2a6.09,6.09,0,0,0-.71-2.86,4.82,4.82,0,0,0-1.49-1.83,3.52,3.52,0,0,0-1.91-.49,3.37,3.37,0,0,0-3,1.67,6.53,6.53,0,0,0-1.05,3.51v2a6.07,6.07,0,0,0,.7,2.85A4.63,4.63,0,0,0,82.92,81.1Zm-.31-6.73a4.09,4.09,0,0,1,.82-2.61,1.67,1.67,0,0,1,1.39-.7,1.62,1.62,0,0,1,1.36.63A4.37,4.37,0,0,1,87,74.37v2A4.15,4.15,0,0,1,86.22,79a1.66,1.66,0,0,1-1.38.7,1.61,1.61,0,0,1-1.37-.63,4.34,4.34,0,0,1-.86-2.68Z"/><path class="cls-8" d="M98.92,79.45H97V69.19l-4,1a1.78,1.78,0,0,0-.81.38.84.84,0,0,0-.19.59,1,1,0,0,0,.26.69.83.83,0,0,0,.62.29,2.76,2.76,0,0,0,.6-.11l1.68-.44v7.82h-1.9a1.43,1.43,0,0,0-1,.26.94.94,0,0,0,0,1.36,1.43,1.43,0,0,0,1,.26h5.67a1.43,1.43,0,0,0,1-.26.85.85,0,0,0,.29-.67.86.86,0,0,0-.29-.69A1.43,1.43,0,0,0,98.92,79.45Z"/><path class="cls-8" d="M110.16,79.45h-1.89V69.19l-4,1a1.79,1.79,0,0,0-.8.38.84.84,0,0,0-.19.59.94.94,0,0,0,.26.69.81.81,0,0,0,.62.29,2.76,2.76,0,0,0,.6-.11l1.67-.44v7.82H104.5a1.48,1.48,0,0,0-1,.26,1,1,0,0,0,0,1.36,1.48,1.48,0,0,0,1,.26h5.66a1.44,1.44,0,0,0,1-.26.88.88,0,0,0,.29-.67.9.9,0,0,0-.29-.69A1.44,1.44,0,0,0,110.16,79.45Z"/><path class="cls-8" d="M120.45,69.68a3.47,3.47,0,0,0-1.9-.49,3.36,3.36,0,0,0-3,1.67,6.45,6.45,0,0,0-1.06,3.51v2a6.19,6.19,0,0,0,.7,2.85,4.64,4.64,0,0,0,1.49,1.83,3.69,3.69,0,0,0,4.94-1.17,6.53,6.53,0,0,0,1.05-3.51v-2a6.08,6.08,0,0,0-.7-2.86A4.74,4.74,0,0,0,120.45,69.68Zm.32,6.74A4.09,4.09,0,0,1,120,79a1.66,1.66,0,0,1-1.38.7,1.61,1.61,0,0,1-1.36-.63,4.34,4.34,0,0,1-.86-2.68v-2a4.15,4.15,0,0,1,.81-2.61,1.68,1.68,0,0,1,1.39-.7,1.64,1.64,0,0,1,1.37.63,4.37,4.37,0,0,1,.85,2.68Z"/><path class="cls-8" d="M87.67,101.94H85.78V91.67l-4,1a1.59,1.59,0,0,0-.8.38.84.84,0,0,0-.2.59,1,1,0,0,0,.27.69.81.81,0,0,0,.61.29,2.72,2.72,0,0,0,.61-.11l1.67-.44v7.82H82a1.46,1.46,0,0,0-1,.26.94.94,0,0,0,0,1.36,1.46,1.46,0,0,0,1,.26h5.66a1.48,1.48,0,0,0,1-.26.94.94,0,0,0,0-1.36A1.48,1.48,0,0,0,87.67,101.94Z"/><path class="cls-8" d="M98.92,101.94H97V91.67l-4,1a1.68,1.68,0,0,0-.81.38.84.84,0,0,0-.19.59,1,1,0,0,0,.26.69.83.83,0,0,0,.62.29,2.76,2.76,0,0,0,.6-.11l1.68-.44v7.82h-1.9a1.43,1.43,0,0,0-1,.26.94.94,0,0,0,0,1.36,1.43,1.43,0,0,0,1,.26h5.67a1.43,1.43,0,0,0,1-.26.94.94,0,0,0,0-1.36A1.43,1.43,0,0,0,98.92,101.94Z"/><path class="cls-8" d="M109.21,92.17a3.5,3.5,0,0,0-1.91-.5,3.36,3.36,0,0,0-3,1.68,6.52,6.52,0,0,0-1,3.5v2.06a6,6,0,0,0,.7,2.84,4.6,4.6,0,0,0,1.48,1.84,3.43,3.43,0,0,0,1.92.5,3.37,3.37,0,0,0,3-1.67,6.45,6.45,0,0,0,1.06-3.51V96.85A6.08,6.08,0,0,0,110.7,94,4.73,4.73,0,0,0,109.21,92.17Zm.31,6.74a4.15,4.15,0,0,1-.81,2.61,1.69,1.69,0,0,1-1.38.7,1.61,1.61,0,0,1-1.37-.64,4.29,4.29,0,0,1-.86-2.67V96.85a4.08,4.08,0,0,1,.82-2.6,1.67,1.67,0,0,1,1.39-.7,1.62,1.62,0,0,1,1.36.63,4.34,4.34,0,0,1,.85,2.67Z"/><path class="cls-8" d="M120.45,92.17a3.47,3.47,0,0,0-1.9-.5,3.35,3.35,0,0,0-3,1.68,6.45,6.45,0,0,0-1.06,3.5v2.06a6.12,6.12,0,0,0,.7,2.84,4.61,4.61,0,0,0,1.49,1.84,3.69,3.69,0,0,0,4.94-1.17,6.53,6.53,0,0,0,1.05-3.51V96.85A6.07,6.07,0,0,0,122,94,4.74,4.74,0,0,0,120.45,92.17Zm.32,6.74a4.09,4.09,0,0,1-.82,2.61,1.69,1.69,0,0,1-1.38.7,1.59,1.59,0,0,1-1.36-.64,4.29,4.29,0,0,1-.86-2.67V96.85a4.14,4.14,0,0,1,.81-2.6,1.68,1.68,0,0,1,1.39-.7,1.64,1.64,0,0,1,1.37.63,4.34,4.34,0,0,1,.85,2.67Z"/><path class="cls-8" d="M76.43,101.94h-1.9V97.33a41.56,41.56,0,0,1-1.87,3.85v.76h-.42c-.38.65-.78,1.26-1.18,1.88h5.37a1.43,1.43,0,0,0,1-.26.94.94,0,0,0,0-1.36A1.43,1.43,0,0,0,76.43,101.94Z"/><path class="cls-8" d="M104,15.89a3.9,3.9,0,0,0-2-.53,3.15,3.15,0,0,0-2.69,1.35L66.93,65.29l-.11-.08a14.4,14.4,0,0,0-8-2.67,12,12,0,0,0-2.46.26c-4.76,1-8,4.79-9.16,6.35l-1.1,1.48,27.75,20,.86-2.17c2.43-6.15,4-12.24-2.4-18.83l33-49.51A3.06,3.06,0,0,0,104,15.89Z"/><path class="cls-8" d="M54.66,80.06l-10-7.2-1.07.86C36.39,79.58,29,85.59,20,85.59a22.06,22.06,0,0,1-8.84-1.94l-.11,0a.34.34,0,0,0-.18.07.29.29,0,0,0-.1.28,53.85,53.85,0,0,0,1.53,5.88,2,2,0,0,0,1.29,1.32,24.33,24.33,0,0,0,7.77,1.27h.53c5.19-.13,13.24-2,22.12-10.06a.67.67,0,0,1,.46-.2.61.61,0,0,1,.45.2c.5.52,0,1.69-1.27,3-9,9-16,9.71-22.44,9.71a26.45,26.45,0,0,1-6.8-.86l-.09,0a.26.26,0,0,0-.21.1.32.32,0,0,0-.05.34,45.47,45.47,0,0,0,5.82,10.14,2,2,0,0,0,1.56.75h.18a31.93,31.93,0,0,0,6.65-1.29,22.38,22.38,0,0,0,7.41-3.76,15.35,15.35,0,0,0,1.51-1.39,6.79,6.79,0,0,1,1.42-1.31.44.44,0,0,1,.15,0h0a.32.32,0,0,1,.17.11,1.78,1.78,0,0,1-.13,2.11c-3.75,4.68-8.8,7.32-15.45,8a.3.3,0,0,0-.26.2.32.32,0,0,0,.08.34A32.11,32.11,0,0,0,30,113.6a1.41,1.41,0,0,0,.7.19,1.23,1.23,0,0,0,.42-.07c7.66-2.24,20.81-7.64,22.9-18.56a.6.6,0,0,1,.39-.51l.28-.1.25.2a2.24,2.24,0,0,1,.29,1.69c-1.71,8.7-8.76,15.19-20.38,18.79a.28.28,0,0,0-.21.28.28.28,0,0,0,.19.29,35.88,35.88,0,0,0,12.1,2c.65,0,1.3,0,2,0,1.83-.8,17.58-8.23,23-24.26a.31.31,0,0,0-.1-.35Z"/><path class="cls-8" d="M32.38,67.26c-.68-10.05-1.8-13.4-9.37-16.07h0c7.57-2.91,8.69-5.15,9.37-16.07h0c.62,10.53,2,13.68,9.37,16.07h0c-6.7,2.67-7.82,3.79-9.37,16.07"/><path class="cls-8" d="M46.43,45c-.34-3.77-.9-5-4.68-6h0c3.78-1.1,4.34-1.93,4.68-6h0c.31,3.94,1,5.12,4.69,6h0c-3.35,1-3.91,1.41-4.69,6"/><path class="cls-8" d="M35.5,28.22c-.23-2.24-.6-3-3.12-3.58h0c2.52-.65,2.89-1.14,3.12-3.57h0c.21,2.34.67,3,3.12,3.57h0c-2.23.6-2.6.85-3.12,3.58"/></g><path class="cls-8" d="M110.7,26.54a4.7,4.7,0,0,0-1.49-1.84,3.6,3.6,0,0,0-1.88-.49l-4,3.9a5.92,5.92,0,0,0-.14,1.32v.93h0v1.08a6,6,0,0,0,.18,1.47,5.9,5.9,0,0,0,.53,1.41v0a4.72,4.72,0,0,0,1.48,1.83,3.52,3.52,0,0,0,1.92.5,3.36,3.36,0,0,0,3-1.68,6.4,6.4,0,0,0,1.06-3.5V29.39A6,6,0,0,0,110.7,26.54Zm-1.18,4.91a4.19,4.19,0,0,1-.81,2.61,1.68,1.68,0,0,1-1.38.69,1.62,1.62,0,0,1-1.37-.63,4.33,4.33,0,0,1-.86-2.67V29.39a4.09,4.09,0,0,1,.82-2.61,1.68,1.68,0,0,1,1.39-.69,1.62,1.62,0,0,1,1.36.63,4.32,4.32,0,0,1,.85,2.67Z"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="m15.17 41-2.292-8h24.246l-2.293 8H15.17Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path d="m15.17 41-2.292-8h24.246l-2.293 8H15.17Z" fill="url(#o_icon_data_recycle__a)" fill-opacity=".2"/><path d="m11.723 28.974-.004-.015L13.847 27h8.618l14.714 5.805-.056.195h-12.63l-12.77-4.026Z" fill="var(--o-icons-purple-teal, #003458)"/><path d="m11.723 28.974-.004-.015L13.847 27h8.618l14.714 5.805-.056.195h-12.63l-12.77-4.026Z" fill="url(#o_icon_data_recycle__b)" fill-opacity=".3"/><path d="m8.295 17.01-.005-.017L16.89 14l19.264 7H18.916L8.295 17.01Z" fill="var(--o-icons-purple-teal, #003458)"/><path d="m8.295 17.01-.005-.017L16.89 14l19.264 7H18.916L8.295 17.01Z" fill="url(#o_icon_data_recycle__c)" fill-opacity=".3"/><path d="M8.292 17 6 9h38l-2.292 8H8.292Z" fill="var(--o-icons-purple-cyan, #102E7A)"/><path d="M8.292 17 6 9h38l-2.292 8H8.292Z" fill="url(#o_icon_data_recycle__d)" fill-opacity=".3"/><path d="m11.724 28.977-2.292-8h31.136l-2.292 8H11.724Z" fill="var(--o-icons-cyan-cyan, #0382F3)"/><path d="m11.724 28.977-2.292-8h31.136l-2.292 8H11.724Z" fill="url(#o_icon_data_recycle__e)" fill-opacity=".2"/><defs><linearGradient id="o_icon_data_recycle__a" x1="12.878" y1="33" x2="32.132" y2="47.588" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_data_recycle__b" x1="11.719" y1="27" x2="26.693" y2="42.885" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_data_recycle__c" x1="8.29" y1="14" x2="25.79" y2="31.414" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_data_recycle__d" x1="6" y1="9" x2="25.708" y2="32.404" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_data_recycle__e" x1="9.432" y1="20.977" x2="29.424" y2="40.429" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/data_recycle/static/src/views/data_recycle_list_view.xml b/addons/data_recycle/static/src/views/data_recycle_list_view.xml
index 86a1054c87e..928e49fd915 100644
--- a/addons/data_recycle/static/src/views/data_recycle_list_view.xml
+++ b/addons/data_recycle/static/src/views/data_recycle_list_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates>
     <t t-name="DataRecycle.buttons" t-inherit="web.ListView.Buttons" t-inherit-mode="primary" owl="1">
-        <xpath expr="//t[@t-if='props.showButtons']">
+        <xpath expr="//div[hasclass('o_list_buttons')]" position="inside">
             <t t-if="nbSelected">
                 <button type="button" class="btn btn-primary o_data_recycle_validate_button" t-on-click="onValidateClick">
                     Validate
diff --git a/addons/delivery/views/delivery_carrier_views.xml b/addons/delivery/views/delivery_carrier_views.xml
index 0444223f6b9..ec0e27a2083 100644
--- a/addons/delivery/views/delivery_carrier_views.xml
+++ b/addons/delivery/views/delivery_carrier_views.xml
@@ -53,7 +53,7 @@
                                 class="oe_stat_button"
                                 type="object" icon="fa-stop">
                             <div class="o_stat_info o_field_widget">
-                                <span class="o_warning_text">Test</span>
+                                <span class="o_stat_text o_warning_text fw-bold">Test</span>
                                 <span class="o_stat_text">Environment</span>
                             </div>
                         </button>
@@ -62,7 +62,7 @@
                                 class="oe_stat_button"
                                 type="object" icon="fa-code">
                             <div class="o_stat_info o_field_widget">
-                                <span class="text-danger">No debug</span>
+                                <span class="o_stat_text text-danger">No debug</span>
                             </div>
                         </button>
                         <button name="toggle_debug"
@@ -74,7 +74,7 @@
                             </div>
                         </button>
                     </div>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="oe_title" name="title">
                         <label for="name" string="Shipping Method"/>
                         <h1>
diff --git a/addons/delivery/views/sale_order_views.xml b/addons/delivery/views/sale_order_views.xml
index f370e1aae2f..d21e76133c6 100644
--- a/addons/delivery/views/sale_order_views.xml
+++ b/addons/delivery/views/sale_order_views.xml
@@ -12,7 +12,7 @@
                 <field name="recompute_delivery_price" invisible="1"/>
             </field>
             <group name="note_group" position="before">
-                <div class="oe_right">
+                <div class="oe_right mb-2 ms-1">
                     <button
                         string="Add shipping"
                         name="action_open_delivery_wizard"
diff --git a/addons/delivery/wizard/choose_delivery_carrier_views.xml b/addons/delivery/wizard/choose_delivery_carrier_views.xml
index 5d2557a6385..e836248a17a 100644
--- a/addons/delivery/wizard/choose_delivery_carrier_views.xml
+++ b/addons/delivery/wizard/choose_delivery_carrier_views.xml
@@ -22,7 +22,7 @@
                         <div class="o_row">
                             <field name='display_price' widget="monetary" options="{'currency_field': 'currency_id'}" attrs="{'invisible': [('carrier_id','=', False)]}"/>
                             <button name="update_price" type="object" attrs="{'invisible': [('delivery_type','in', ('fixed', 'base_on_rule'))]}">
-                                <i class="fa fa-arrow-right me-1"/>Get rate
+                                <i class="oi oi-arrow-right me-1"/>Get rate
                             </button>
                         </div>
                     </group>
diff --git a/addons/delivery/wizard/res_config_settings_views.xml b/addons/delivery/wizard/res_config_settings_views.xml
index af650dd599b..7b73745d51d 100644
--- a/addons/delivery/wizard/res_config_settings_views.xml
+++ b/addons/delivery/wizard/res_config_settings_views.xml
@@ -12,7 +12,7 @@
                         <button name="%(delivery.action_delivery_carrier_form)d"
                                 type="action"
                                 class="btn-link"
-                                icon="fa-arrow-right"
+                                icon="oi-arrow-right"
                                 string="Shipping Methods"/>
                     </div>
                  </div>
diff --git a/addons/digest/views/digest_views.xml b/addons/digest/views/digest_views.xml
index fd7af2075fb..65f606cd8ab 100644
--- a/addons/digest/views/digest_views.xml
+++ b/addons/digest/views/digest_views.xml
@@ -57,7 +57,7 @@
                                 <group name="custom" string="Custom" groups="base.group_system">
                                     <div colspan="2">
                                         <p>Want to add your own KPIs?<br />
-                                        <a href="https://www.odoo.com/documentation/master/applications/general/digest_emails.html#custom-digest-emails" target="_blank"><i class="fa fa-arrow-right"></i> Check our Documentation</a></p>
+                                        <a href="https://www.odoo.com/documentation/master/applications/general/digest_emails.html#custom-digest-emails" target="_blank"><i class="oi oi-arrow-right"></i> Check our Documentation</a></p>
                                     </div>
                                 </group>
                             </group>
diff --git a/addons/digest/views/res_config_settings_views.xml b/addons/digest/views/res_config_settings_views.xml
index 1a3afbf7068..71f34ce4181 100644
--- a/addons/digest/views/res_config_settings_views.xml
+++ b/addons/digest/views/res_config_settings_views.xml
@@ -16,7 +16,7 @@
                                     <field name="digest_id" class="oe_inline"/>
                                 </div>
                                 <div class="mt8">
-                                    <button type="action" name="%(digest.digest_digest_action)d" string="Configure Digest Emails" icon="fa-arrow-right" class="btn-link"/>
+                                    <button type="action" name="%(digest.digest_digest_action)d" string="Configure Digest Emails" icon="oi-arrow-right" class="btn-link"/>
                                 </div>
                             </div>
                         </setting>
diff --git a/addons/event/report/event_event_templates.xml b/addons/event/report/event_event_templates.xml
index 1d6c99a70b2..9746e448415 100644
--- a/addons/event/report/event_event_templates.xml
+++ b/addons/event/report/event_event_templates.xml
@@ -22,7 +22,7 @@
                             <span itemprop="startDateTime" t-out="event.date_begin"
                                 class="fw-bold"
                                 t-options='{"widget": "datetime", "time_only": True, "tz_name": event.date_tz, "hide_seconds": True}'/>
-                            <span class="fa fa-arrow-right o_event_foldable_badge_font_faded"/>
+                            <span class="oi oi-arrow-right o_event_foldable_badge_font_faded"/>
                             <span t-if="not event.is_one_day"
                                 itemprop="endDate" t-out="event.date_end.date()"
                                 class="fw-bold"/>
@@ -123,7 +123,7 @@
                                 <span itemprop="startDateTime" t-out="event.date_begin"
                                     class="fw-bold"
                                     t-options='{"widget": "datetime", "time_only": True, "hide_seconds": True, "tz_name": event.date_tz}'/>
-                                <span class="fa fa-arrow-right o_event_full_page_ticket_font_faded"/>
+                                <span class="oi oi-arrow-right o_event_full_page_ticket_font_faded"/>
                                 <span t-if="not event.is_one_day"
                                     itemprop="endDate" t-out="event.date_end.date()"
                                     class="fw-bold"/>
diff --git a/addons/event/static/description/icon.png b/addons/event/static/description/icon.png
index 37f1441d48d..4dac2e4608e 100644
Binary files a/addons/event/static/description/icon.png and b/addons/event/static/description/icon.png differ
diff --git a/addons/event/static/description/icon.svg b/addons/event/static/description/icon.svg
index 35dc50c86ae..4e0201b641a 100644
--- a/addons/event/static/description/icon.svg
+++ b/addons/event/static/description/icon.svg
@@ -1,24 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70">
-    <defs>
-        <path id="icon-a" d="M4,5.35309892e-14 C36.4160122,9.87060235e-15 58.0836068,-3.97961823e-14 65,5.07020818e-14 C69,6.733808e-14 70,1 70,5 C70,43.0488877 70,62.4235458 70,65 C70,69 69,70 65,70 C61,70 9,70 4,70 C1,70 7.10542736e-15,69 7.10542736e-15,65 C7.25721566e-15,62.4676575 3.83358709e-14,41.8005206 3.60818146e-14,5 C-1.13686838e-13,1 1,5.75716207e-14 4,5.35309892e-14 Z"/>
-        <linearGradient id="icon-c" x1="100%" x2="0%" y1="0%" y2="100%">
-            <stop offset="0%" stop-color="#269396"/>
-            <stop offset="100%" stop-color="#218689"/>
-        </linearGradient>
-        <path id="icon-d" d="M24.4715571,29.3561696 L47.6197052,29.3561696 L47.6197052,43.4186696 L24.4715571,43.4186696 L24.4715571,29.3561696 Z M53.4067423,36.3874196 C53.4067423,38.32907 54.9612851,39.9030446 56.8789645,39.9030446 L56.8789645,46.9342946 C56.8789645,48.875945 55.3244217,50.4499196 53.4067423,50.4499196 L18.6845201,50.4499196 C16.7668407,50.4499196 15.2122978,48.875945 15.2122978,46.9342946 L15.2122978,39.9030446 C17.1299772,39.9030446 18.6845201,38.32907 18.6845201,36.3874196 C18.6845201,34.4457692 17.1299772,32.8717946 15.2122978,32.8717946 L15.2122978,25.8405446 C15.2122978,23.8988942 16.7668407,22.3249196 18.6845201,22.3249196 L53.4067423,22.3249196 C55.3244217,22.3249196 56.8789645,23.8988942 56.8789645,25.8405446 L56.8789645,32.8717946 C54.9612851,32.8717946 53.4067423,34.4457692 53.4067423,36.3874196 Z M49.9345201,28.7702321 C49.9345201,27.7994069 49.1572486,27.0124196 48.1984089,27.0124196 L23.8928534,27.0124196 C22.9340137,27.0124196 22.1567423,27.7994069 22.1567423,28.7702321 L22.1567423,44.0046071 C22.1567423,44.9754323 22.9340137,45.7624196 23.8928534,45.7624196 L48.1984089,45.7624196 C49.1572486,45.7624196 49.9345201,44.9754323 49.9345201,44.0046071 L49.9345201,28.7702321 Z"/>
-        <path id="icon-e" d="M24.4715571,27.3561696 L47.6197052,27.3561696 L47.6197052,41.4186696 L24.4715571,41.4186696 L24.4715571,27.3561696 Z M53.4067423,34.3874196 C53.4067423,36.32907 54.9612851,37.9030446 56.8789645,37.9030446 L56.8789645,44.9342946 C56.8789645,46.875945 55.3244217,48.4499196 53.4067423,48.4499196 L18.6845201,48.4499196 C16.7668407,48.4499196 15.2122978,46.875945 15.2122978,44.9342946 L15.2122978,37.9030446 C17.1299772,37.9030446 18.6845201,36.32907 18.6845201,34.3874196 C18.6845201,32.4457692 17.1299772,30.8717946 15.2122978,30.8717946 L15.2122978,23.8405446 C15.2122978,21.8988942 16.7668407,20.3249196 18.6845201,20.3249196 L53.4067423,20.3249196 C55.3244217,20.3249196 56.8789645,21.8988942 56.8789645,23.8405446 L56.8789645,30.8717946 C54.9612851,30.8717946 53.4067423,32.4457692 53.4067423,34.3874196 Z M49.9345201,26.7702321 C49.9345201,25.7994069 49.1572486,25.0124196 48.1984089,25.0124196 L23.8928534,25.0124196 C22.9340137,25.0124196 22.1567423,25.7994069 22.1567423,26.7702321 L22.1567423,42.0046071 C22.1567423,42.9754323 22.9340137,43.7624196 23.8928534,43.7624196 L48.1984089,43.7624196 C49.1572486,43.7624196 49.9345201,42.9754323 49.9345201,42.0046071 L49.9345201,26.7702321 Z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <mask id="icon-b" fill="#fff">
-            <use xlink:href="#icon-a"/>
-        </mask>
-        <g mask="url(#icon-b)">
-            <rect width="70" height="70" fill="url(#icon-c)"/>
-            <path fill="#FFF" fill-opacity=".383" d="M4,1.8 L65,1.8 C67.6666667,1.8 69.3333333,1.13333333 70,-0.2 C70,2.46666667 70,3.46666667 70,2.8 L1.10547097e-14,2.8 C-1.65952376e-14,3.46666667 -2.9161925e-14,2.46666667 -2.66453526e-14,-0.2 C0.666666667,1.13333333 2,1.8 4,1.8 Z" transform="matrix(1 0 0 -1 0 2.8)"/>
-            <path fill="#393939" d="M35,58 L4,58 C2,58 -7.10542736e-15,57.8520408 0,53.8571429 L2.0734159e-16,30.9596526 L29,0 L37,8.28571429 L58,29 L35,58 Z" opacity=".324" transform="translate(0 12)"/>
-            <path fill="#000" fill-opacity=".383" d="M4,4 L65,4 C67.6666667,4 69.3333333,3 70,1 C70,3.66666667 70,5 70,5 L1.77635684e-15,5 C1.77635684e-15,5 1.77635684e-15,3.66666667 1.77635684e-15,1 C0.666666667,3 2,4 4,4 Z" transform="translate(0 65)"/>
-            <use fill="#000" fill-rule="nonzero" opacity=".3" transform="rotate(45 36.046 36.387)" xlink:href="#icon-d"/>
-            <use fill="#FFF" fill-rule="nonzero" transform="rotate(45 36.046 34.387)" xlink:href="#icon-e"/>
-        </g>
-    </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M13.238 11.483a1.927 1.927 0 0 1 .654-2.55c1.403-.912 2.927-1.233 4.181-.613.2.1.376.24.54.39L49.26 37.346c.472.426.741 1.025.741 1.653H28L13.238 11.483Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M13.238 11.483a1.927 1.927 0 0 1 .654-2.55c1.403-.912 2.927-1.233 4.181-.613.2.1.376.24.54.39L49.26 37.346c.472.426.741 1.025.741 1.653H28L13.238 11.483Z" fill="url(#o_icon_event__a)" fill-opacity=".2"/><path d="M50 39c0 1.657-4.925 3-11 3s-11-1.343-11-3 4.925-3 11-3 11 1.343 11 3Z" fill="var(--o-icons-red-red, #F9383D)"/><path d="M50 39c0 1.657-4.925 3-11 3s-11-1.343-11-3 4.925-3 11-3 11 1.343 11 3Z" fill="url(#o_icon_event__b)" fill-opacity=".2"/><path d="M36.762 11.483a1.927 1.927 0 0 0-.654-2.55c-1.403-.912-2.927-1.233-4.181-.613-.2.1-.376.24-.54.39L.74 37.346A2.226 2.226 0 0 0 0 39h22l14.762-27.517Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M36.762 11.483a1.927 1.927 0 0 0-.654-2.55c-1.403-.912-2.927-1.233-4.181-.613-.2.1-.376.24-.54.39L.74 37.346A2.226 2.226 0 0 0 0 39h22l14.762-27.517Z" fill="url(#o_icon_event__c)" fill-opacity=".2"/><path d="M31.693 20.932 25 14.677l-6.693 6.255L25 33.408l6.693-12.476Z" fill="var(--o-icons-red-yellow, #F85318)"/><path d="M31.693 20.932 25 14.677l-6.693 6.255L25 33.408l6.693-12.476Z" fill="url(#o_icon_event__d)" fill-opacity=".2"/><path d="M0 39c0 1.657 4.925 3 11 3s11-1.343 11-3-4.925-3-11-3-11 1.343-11 3Z" fill="var(--o-icons-yellow-yellow, #F77B09)"/><path d="M0 39c0 1.657 4.925 3 11 3s11-1.343 11-3-4.925-3-11-3-11 1.343-11 3Z" fill="url(#o_icon_event__e)" fill-opacity=".2"/><defs><linearGradient id="o_icon_event__a" x1="13" y1="8" x2="55.469" y2="20.672" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_event__b" x1="28" y1="36" x2="42.943" y2="49.698" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_event__c" x1="0" y1="8" x2="42.469" y2="20.672" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_event__d" x1="18.307" y1="14.677" x2="34.522" y2="17.574" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_event__e" x1="0" y1="36" x2="14.943" y2="49.698" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/event/static/src/scss/event.scss b/addons/event/static/src/scss/event.scss
index 5fc7356516e..86b383f6312 100644
--- a/addons/event/static/src/scss/event.scss
+++ b/addons/event/static/src/scss/event.scss
@@ -24,26 +24,6 @@
         }
     }
     .oe_kanban_card_ribbon {
-        min-height: 95px;
-        .ribbon {
-            &::before, &::after {
-                display: none;
-            }
-            span {
-                padding: 5px;
-                font-size: small;
-                z-index: 0;
-            }
-        }
-        .ribbon-top-right {
-            margin-top: -1px;
-            span {
-                left: 7px;
-                right: 30px;
-                height: 25px;
-                top: 18px;
-            }
-        }
         // Used for "Group By"
         div.row {
             min-height: 95px;
diff --git a/addons/event/views/event_event_views.xml b/addons/event/views/event_event_views.xml
index 58fe1a4e8b4..16d6d39878c 100644
--- a/addons/event/views/event_event_views.xml
+++ b/addons/event/views/event_event_views.xml
@@ -13,9 +13,11 @@
                     <div class="oe_button_box" name="button_box" groups="base.group_user">
                         <button name="%(event.event_registration_action_stats_from_event)d"
                                 type="action" class="oe_stat_button" icon="fa-line-chart">
-                            <span class="o_stat_text">
-                                Registration statistics
-                            </span>
+                            <div class="o_stat_info">
+                                <span class="o_stat_text">
+                                    Registration statistics
+                                </span>
+                            </div>
                         </button>
                         <button name="%(event.act_event_registration_from_event)d"
                                 type="action"
@@ -31,7 +33,7 @@
                     <field name="legend_blocked" invisible="1"/>
                     <field name="legend_normal" invisible="1"/>
                     <field name="legend_done" invisible="1"/>
-                    <widget name="web_ribbon" text="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" text="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <field name="kanban_state" widget="state_selection" class="ms-auto float-end"/>
                     <div class="oe_title">
                         <label for="name" string="Event Name"/>
@@ -184,7 +186,7 @@
                                     </div>
                                     <div><t t-esc="luxon.DateTime.fromISO(record.date_begin.raw_value).toFormat('t')"/></div>
                                         <div t-if="record.date_begin.raw_value !== record.date_end.raw_value">
-                                            <i class="fa fa-arrow-right me-2 o_event_fontsize_09" title="End date"/>
+                                            <i class="oi oi-arrow-right me-2 o_event_fontsize_09" title="End date"/>
                                             <t t-esc="luxon.DateTime.fromISO(record.date_end.raw_value).toFormat('d MMM')"/>
                                         </div>
                                 </div>
diff --git a/addons/event/views/event_registration_views.xml b/addons/event/views/event_registration_views.xml
index d5497e684a9..eecc9f6266e 100644
--- a/addons/event/views/event_registration_views.xml
+++ b/addons/event/views/event_registration_views.xml
@@ -58,7 +58,7 @@
                 </header>
                 <sheet string="Registration">
                     <div class="oe_button_box" name="button_box"/>
-                    <widget name="web_ribbon" text="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" text="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <group>
                         <group string="Attendee" name="attendee">
                             <field class="o_text_overflow" name="name"/>
@@ -141,14 +141,14 @@
                         </div>
                     </t>
                     <t t-name="kanban-box">
-                        <div t-attf-class="#{!record.active.raw_value ? 'oe_kanban_card_ribbon' : ''} oe_kanban_global_click o_event_registration_kanban container-fluid p-0">
+                        <div t-attf-class="#{!record.active.raw_value ? 'oe_kanban_card_ribbon' : ''} oe_kanban_global_click o_event_registration_kanban container-fluid">
                             <div t-if="!record.active.raw_value" class="ribbon ribbon-top-right">
-                                <span class="bg-danger">Archived</span>
+                                <span class="text-bg-danger">Archived</span>
                             </div>
-                            <div class="row h-100">
-                                <div class="col-9 pe-0">
+                            <div class="row g-0 h-100">
+                                <div class="col-9">
                                     <div class="oe_kanban_content h-100">
-                                        <div class="o_kanban_record_body pt-1 ps-2 h-100 d-flex flex-column">
+                                        <div class="o_kanban_record_body h-100 d-flex flex-column">
                                             <b class="o_kanban_record_title"><field name="name"/></b>
                                             <field class="o_text_overflow" name="event_id" invisible="context.get('default_event_id')" />
                                             <span class="o_text_overflow" attrs="{'invisible': [('partner_id', '=', False)]}">Booked by <field name="partner_id" /></span>
@@ -162,7 +162,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div id="event_attendees_kanban_icons" class="col-3 ps-0">
+                                <div id="event_attendees_kanban_icons" class="col-3">
                                     <t t-call="event_attendees_kanban_icons_desktop"/>
                                     <t t-call="event_attendees_kanban_icons_mobile"/>
                                 </div>
diff --git a/addons/event_booth/views/event_booth_category_views.xml b/addons/event_booth/views/event_booth_category_views.xml
index e05b84a1e43..d7d89e0df5d 100644
--- a/addons/event_booth/views/event_booth_category_views.xml
+++ b/addons/event_booth/views/event_booth_category_views.xml
@@ -7,7 +7,7 @@
         <field name="arch" type="xml">
             <form string="Booth Type">
                 <sheet>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <field name="image_1920" widget='image' class="oe_avatar" options='{"preview_image": "image_128"}'/>
                     <div class="oe_title">
                         <label for="name" string="Booth Category"/>
diff --git a/addons/event_booth_sale/views/event_booth_views.xml b/addons/event_booth_sale/views/event_booth_views.xml
index a88968ec3c8..47b9d5ff2ef 100644
--- a/addons/event_booth_sale/views/event_booth_views.xml
+++ b/addons/event_booth_sale/views/event_booth_views.xml
@@ -10,7 +10,10 @@
             <div name="button_box" position="inside">
                 <button name="action_view_sale_order" type="object" class="oe_stat_button"
                         icon="fa-usd" groups="sales_team.group_sale_salesman"
-                        string="Sale Order" attrs="{'invisible': [('sale_order_id', '=', False)]}">
+                        attrs="{'invisible': [('sale_order_id', '=', False)]}">
+                        <div class="o_stat_info">
+                            <span class="o_stat_text">Sale Order</span>
+                        </div>
                 </button>
             </div>
             <div name="button_box" position="after">
diff --git a/addons/event_crm/views/event_lead_rule_views.xml b/addons/event_crm/views/event_lead_rule_views.xml
index aeb85388f0d..0c05acfb172 100644
--- a/addons/event_crm/views/event_lead_rule_views.xml
+++ b/addons/event_crm/views/event_lead_rule_views.xml
@@ -36,7 +36,7 @@
         <field name="arch" type="xml">
             <form string="Lead Generation Rule">
                 <sheet>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="oe_title">
                         <label for="name"/>
                         <h1><field name="name" placeholder="e.g. B2B Fairs"/></h1>
diff --git a/addons/event_sale/views/event_registration_views.xml b/addons/event_sale/views/event_registration_views.xml
index e5ebe88ccd8..a9b1ffd60ce 100644
--- a/addons/event_sale/views/event_registration_views.xml
+++ b/addons/event_sale/views/event_registration_views.xml
@@ -37,14 +37,17 @@
         <field name="arch" type="xml">
             <xpath expr="//div[@name='button_box']" position="inside">
                 <button name="action_view_sale_order" type="object"
-                        class="oe_stat_button" icon="fa-usd" string="Sale Order"
+                        class="oe_stat_button" icon="fa-usd"
                         groups="sales_team.group_sale_salesman"
                         attrs="{'invisible': [('sale_order_id', '=', False)]}">
+                        <div class="o_stat_info">
+                            <span class="o_stat_text">Sale Order</span>
+                        </div>
                 </button>
             </xpath>
             <xpath expr="//group" position="before">
                 <field name="is_paid" invisible="1"/>
-                <widget name="web_ribbon" title="Paid" bg_color="bg-success" attrs="{'invisible': [('is_paid', '=', False)]}"/>
+                <widget name="web_ribbon" title="Paid" bg_color="text-bg-success" attrs="{'invisible': [('is_paid', '=', False)]}"/>
             </xpath>
             <group name="utm_link" position="before">
                 <group string="Transaction" groups="base.group_no_one">
diff --git a/addons/fleet/static/description/icon.png b/addons/fleet/static/description/icon.png
index 92818a3ee51..3bf171f7ea6 100644
Binary files a/addons/fleet/static/description/icon.png and b/addons/fleet/static/description/icon.png differ
diff --git a/addons/fleet/static/description/icon.svg b/addons/fleet/static/description/icon.svg
index a3682586b80..f5d763ad6f3 100644
--- a/addons/fleet/static/description/icon.svg
+++ b/addons/fleet/static/description/icon.svg
@@ -1,25 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70">
-    <defs>
-        <path id="icon-a" d="M4,5.35309892e-14 C36.4160122,9.87060235e-15 58.0836068,-3.97961823e-14 65,5.07020818e-14 C69,6.733808e-14 70,1 70,5 C70,43.0488877 70,62.4235458 70,65 C70,69 69,70 65,70 C61,70 9,70 4,70 C1,70 7.10542736e-15,69 7.10542736e-15,65 C7.25721566e-15,62.4676575 3.83358709e-14,41.8005206 3.60818146e-14,5 C-1.13686838e-13,1 1,5.75716207e-14 4,5.35309892e-14 Z"/>
-        <linearGradient id="icon-c" x1="98.162%" x2="0%" y1="1.838%" y2="100%">
-            <stop offset="0%" stop-color="#797DA5"/>
-            <stop offset="50.799%" stop-color="#6D7194"/>
-            <stop offset="100%" stop-color="#626584"/>
-        </linearGradient>
-        <path id="icon-d" d="M54.8560384,29.8385417 L50.3951823,29.8385417 L49.7560221,28.1341146 C49.0079753,26.1392415 47.6869303,24.4434408 45.9358724,23.2298991 C44.1848145,22.0163574 42.1330566,21.375 40.0026042,21.375 L29.9973958,21.375 C27.866862,21.375 25.8151855,22.0164388 24.0641276,23.2298991 C22.3129883,24.4434408 20.9920247,26.1392415 20.2439779,28.1341146 L19.6048177,29.8385417 L15.1439616,29.8385417 C14.4773763,29.8385417 14.0067546,30.4915365 14.2175293,31.1239421 L14.868571,33.0770671 C15.0015005,33.4758244 15.3746728,33.7447878 15.7950033,33.7447917 L18.139974,33.7447917 L18.1357422,33.7561849 C16.5447591,34.6475423 15.46875,36.3487142 15.46875,38.3020833 L15.46875,42.2083333 C15.46875,43.5287272 15.9610189,44.7334798 16.7708333,45.6514486 L16.7708333,50.671875 C16.7708333,51.7505697 17.6452637,52.625 18.7239583,52.625 L22.6302083,52.625 C23.708903,52.625 24.5833333,51.7505697 24.5833333,50.671875 L24.5833333,47.4166667 L45.4166667,47.4166667 L45.4166667,50.671875 C45.4166667,51.7505697 46.291097,52.625 47.3697917,52.625 L51.2760417,52.625 C52.3547363,52.625 53.2291667,51.7505697 53.2291667,50.671875 L53.2291667,45.6514486 C54.0389811,44.7333984 54.53125,43.5286458 54.53125,42.2083333 L54.53125,38.3020833 C54.53125,36.3487142 53.4552409,34.6475423 51.8642578,33.7561849 L51.860026,33.7447917 L54.2049967,33.7447917 C54.6253272,33.7447878 54.9984995,33.4758244 55.131429,33.0770671 L55.7824707,31.1239421 C55.9932454,30.4915365 55.5226237,29.8385417 54.8560384,29.8385417 Z M25.1206868,29.9628906 C25.8787435,27.9414876 27.8385417,26.5833333 29.9973958,26.5833333 L40.0026042,26.5833333 C42.1614583,26.5833333 44.1212565,27.9414876 44.8793132,29.9628906 L46.0533854,33.09375 L23.9466146,33.09375 L25.1206868,29.9628906 Z M21.328125,42.859375 C19.8898926,42.859375 18.7239583,41.6934408 18.7239583,40.2552083 C18.7239583,38.8169759 19.8898926,37.6510417 21.328125,37.6510417 C22.7663574,37.6510417 25.234375,40.1190592 25.234375,41.5572917 C25.234375,42.9955241 22.7663574,42.859375 21.328125,42.859375 Z M48.671875,42.859375 C47.2336426,42.859375 44.765625,42.9955241 44.765625,41.5572917 C44.765625,40.1190592 47.2336426,37.6510417 48.671875,37.6510417 C50.1101074,37.6510417 51.2760417,38.8169759 51.2760417,40.2552083 C51.2760417,41.6934408 50.1101074,42.859375 48.671875,42.859375 Z"/>
-        <path id="icon-e" d="M54.8560384,27.8385417 L50.3951823,27.8385417 L49.7560221,26.1341146 C49.0079753,24.1392415 47.6869303,22.4434408 45.9358724,21.2298991 C44.1848145,20.0163574 42.1330566,19.375 40.0026042,19.375 L29.9973958,19.375 C27.866862,19.375 25.8151855,20.0164388 24.0641276,21.2298991 C22.3129883,22.4434408 20.9920247,24.1392415 20.2439779,26.1341146 L19.6048177,27.8385417 L15.1439616,27.8385417 C14.4773763,27.8385417 14.0067546,28.4915365 14.2175293,29.1239421 L14.868571,31.0770671 C15.0015005,31.4758244 15.3746728,31.7447878 15.7950033,31.7447917 L18.139974,31.7447917 L18.1357422,31.7561849 C16.5447591,32.6475423 15.46875,34.3487142 15.46875,36.3020833 L15.46875,40.2083333 C15.46875,41.5287272 15.9610189,42.7334798 16.7708333,43.6514486 L16.7708333,48.671875 C16.7708333,49.7505697 17.6452637,50.625 18.7239583,50.625 L22.6302083,50.625 C23.708903,50.625 24.5833333,49.7505697 24.5833333,48.671875 L24.5833333,45.4166667 L45.4166667,45.4166667 L45.4166667,48.671875 C45.4166667,49.7505697 46.291097,50.625 47.3697917,50.625 L51.2760417,50.625 C52.3547363,50.625 53.2291667,49.7505697 53.2291667,48.671875 L53.2291667,43.6514486 C54.0389811,42.7333984 54.53125,41.5286458 54.53125,40.2083333 L54.53125,36.3020833 C54.53125,34.3487142 53.4552409,32.6475423 51.8642578,31.7561849 L51.860026,31.7447917 L54.2049967,31.7447917 C54.6253272,31.7447878 54.9984995,31.4758244 55.131429,31.0770671 L55.7824707,29.1239421 C55.9932454,28.4915365 55.5226237,27.8385417 54.8560384,27.8385417 Z M25.1206868,27.9628906 C25.8787435,25.9414876 27.8385417,24.5833333 29.9973958,24.5833333 L40.0026042,24.5833333 C42.1614583,24.5833333 44.1212565,25.9414876 44.8793132,27.9628906 L46.0533854,31.09375 L23.9466146,31.09375 L25.1206868,27.9628906 Z M21.328125,40.859375 C19.8898926,40.859375 18.7239583,39.6934408 18.7239583,38.2552083 C18.7239583,36.8169759 19.8898926,35.6510417 21.328125,35.6510417 C22.7663574,35.6510417 25.234375,38.1190592 25.234375,39.5572917 C25.234375,40.9955241 22.7663574,40.859375 21.328125,40.859375 Z M48.671875,40.859375 C47.2336426,40.859375 44.765625,40.9955241 44.765625,39.5572917 C44.765625,38.1190592 47.2336426,35.6510417 48.671875,35.6510417 C50.1101074,35.6510417 51.2760417,36.8169759 51.2760417,38.2552083 C51.2760417,39.6934408 50.1101074,40.859375 48.671875,40.859375 Z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <mask id="icon-b" fill="#fff">
-            <use xlink:href="#icon-a"/>
-        </mask>
-        <g mask="url(#icon-b)">
-            <rect width="70" height="70" fill="url(#icon-c)"/>
-            <path fill="#FFF" fill-opacity=".383" d="M4,1.8 L65,1.8 C67.6666667,1.8 69.3333333,1.13333333 70,-0.2 C70,2.46666667 70,3.46666667 70,2.8 L1.10547097e-14,2.8 C-1.65952376e-14,3.46666667 -2.9161925e-14,2.46666667 -2.66453526e-14,-0.2 C0.666666667,1.13333333 2,1.8 4,1.8 Z" transform="matrix(1 0 0 -1 0 2.8)"/>
-            <path fill="#393939" d="M4,48 C2,48 -7.05642142e-15,47.8509317 4.59701721e-17,43.826087 L0,18.0539143 L14.3290638,6.33400231 L16.5273341,6.02061955 L23.2330679,0 L44,0 L53,13.5652174 L53,27.5773673 L37.5658729,48 L4,48 Z" opacity=".324" transform="translate(0 22)"/>
-            <path fill="#000" fill-opacity=".383" d="M4,4 L65,4 C67.6666667,4 69.3333333,3 70,1 C70,3.66666667 70,5 70,5 L1.77635684e-15,5 C1.77635684e-15,5 1.77635684e-15,3.66666667 1.77635684e-15,1 C0.666666667,3 2,4 4,4 Z" transform="translate(0 65)"/>
-            <use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#icon-d"/>
-            <use fill="#FFF" fill-rule="nonzero" xlink:href="#icon-e"/>
-        </g>
-    </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M30 25a5 5 0 1 1-10 0 5 5 0 0 1 10 0Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path d="M30 25a5 5 0 1 1-10 0 5 5 0 0 1 10 0Z" fill="url(#o_icon_fleet__a)" fill-opacity=".2"/><path fill-rule="evenodd" clip-rule="evenodd" d="M50 25c0 13.807-11.193 25-25 25S0 38.807 0 25 11.193 0 25 0s25 11.193 25 25ZM19.577 43.215C20.696 40.136 22 35.568 22 31h6c0 4.568 1.304 9.136 2.423 12.215a19.042 19.042 0 0 0 12.792-12.792C40.136 29.304 35.568 28 31 28v-6c4.568 0 9.136-1.304 12.215-2.423C40.88 11.726 33.609 6 25 6S9.12 11.726 6.785 19.577C9.864 20.696 14.432 22 19 22v6c-4.568 0-9.136 1.304-12.215 2.423a19.042 19.042 0 0 0 12.792 12.792Z" fill="var(--o-icons-purple-pure, #93407D)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M50 25c0 13.807-11.193 25-25 25S0 38.807 0 25 11.193 0 25 0s25 11.193 25 25ZM19.577 43.215C20.696 40.136 22 35.568 22 31h6c0 4.568 1.304 9.136 2.423 12.215a19.042 19.042 0 0 0 12.792-12.792C40.136 29.304 35.568 28 31 28v-6c4.568 0 9.136-1.304 12.215-2.423C40.88 11.726 33.609 6 25 6S9.12 11.726 6.785 19.577C9.864 20.696 14.432 22 19 22v6c-4.568 0-9.136 1.304-12.215 2.423a19.042 19.042 0 0 0 12.792 12.792Z" fill="url(#o_icon_fleet__b)" fill-opacity=".2"/><path fill-rule="evenodd" clip-rule="evenodd" d="M25 34a9 9 0 1 0 0-18 9 9 0 0 0 0 18Zm0-4a5 5 0 1 0 0-10 5 5 0 0 0 0 10Z" fill="var(--o-icons-purple-purple, #55103D)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M25 34a9 9 0 1 0 0-18 9 9 0 0 0 0 18Zm0-4a5 5 0 1 0 0-10 5 5 0 0 0 0 10Z" fill="url(#o_icon_fleet__c)" fill-opacity=".3"/><defs><linearGradient id="o_icon_fleet__a" x1="20" y1="20" x2="31.765" y2="22.941" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_fleet__b" x1="0" y1="0" x2="58.824" y2="14.706" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_fleet__c" x1="16" y1="16" x2="37.176" y2="21.294" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/fleet/views/fleet_vehicle_cost_views.xml b/addons/fleet/views/fleet_vehicle_cost_views.xml
index 6026294d448..28ecde1b5c5 100644
--- a/addons/fleet/views/fleet_vehicle_cost_views.xml
+++ b/addons/fleet/views/fleet_vehicle_cost_views.xml
@@ -15,7 +15,7 @@
                 </header>
                 <sheet>
                     <field name="active" invisible="1"/>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <field name="currency_id" invisible="1"/>
                     <div class="oe_title">
                         <h1><field name="name"/></h1>
@@ -230,7 +230,7 @@
                     <field name="state" widget="statusbar" options="{'clickable': '1'}"/>
                 </header>
                 <sheet>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <group col="2">
                         <group>
                             <field name="description" />
diff --git a/addons/fleet/views/fleet_vehicle_model_views.xml b/addons/fleet/views/fleet_vehicle_model_views.xml
index ca6f458b386..631b25bc2bb 100644
--- a/addons/fleet/views/fleet_vehicle_model_views.xml
+++ b/addons/fleet/views/fleet_vehicle_model_views.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <form string="Model">
                 <sheet>
-                    <widget name="web_ribbon" text="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" text="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="oe_button_box" name="button_box">
                         <button name="action_model_vehicle" type="object" icon="fa-car" class="oe_stat_button"
                             attrs="{'invisible': [('vehicle_count', '=', 0)]}">
diff --git a/addons/fleet/views/fleet_vehicle_views.xml b/addons/fleet/views/fleet_vehicle_views.xml
index a8b87eeac82..e0a21f44b25 100644
--- a/addons/fleet/views/fleet_vehicle_views.xml
+++ b/addons/fleet/views/fleet_vehicle_views.xml
@@ -71,7 +71,7 @@
                             <field name="odometer_count" widget="statinfo" string="Odometer"/>
                         </button>
                     </div>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <field name="image_128" widget='image' class="oe_avatar"/>
                     <div class="oe_title">
                         <label for="model_id"/>
diff --git a/addons/gamification/static/description/icon.png b/addons/gamification/static/description/icon.png
index 489aaf759b8..3c521f94a70 100644
Binary files a/addons/gamification/static/description/icon.png and b/addons/gamification/static/description/icon.png differ
diff --git a/addons/gamification/static/description/icon.svg b/addons/gamification/static/description/icon.svg
index 9b5eaf27ddd..095985cee88 100644
--- a/addons/gamification/static/description/icon.svg
+++ b/addons/gamification/static/description/icon.svg
@@ -1,22 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70">
-    <defs>
-        <path id="icon-a" d="M4,5.35309892e-14 C36.4160122,9.87060235e-15 58.0836068,-3.97961823e-14 65,5.07020818e-14 C69,6.733808e-14 70,1 70,5 C70,43.0488877 70,62.4235458 70,65 C70,69 69,70 65,70 C61,70 9,70 4,70 C1,70 7.10542736e-15,69 7.10542736e-15,65 C7.25721566e-15,62.4676575 3.83358709e-14,41.8005206 3.60818146e-14,5 C-1.13686838e-13,1 1,5.75716207e-14 4,5.35309892e-14 Z"/>
-        <linearGradient id="icon-c" x1="100%" x2="0%" y1="0%" y2="100%">
-            <stop offset="0%" stop-color="#7CC098"/>
-            <stop offset="100%" stop-color="#5F8A71"/>
-        </linearGradient>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <mask id="icon-b" fill="#fff">
-            <use xlink:href="#icon-a"/>
-        </mask>
-        <g mask="url(#icon-b)">
-            <rect width="70" height="70" fill="url(#icon-c)"/>
-            <path fill="#FFF" fill-opacity=".383" d="M4,1.8 L65,1.8 C67.6666667,1.8 69.3333333,1.13333333 70,-0.2 C70,2.46666667 70,3.46666667 70,2.8 L1.10547097e-14,2.8 C-1.65952376e-14,3.46666667 -2.9161925e-14,2.46666667 -2.66453526e-14,-0.2 C0.666666667,1.13333333 2,1.8 4,1.8 Z" transform="matrix(1 0 0 -1 0 2.8)"/>
-            <path fill="#393939" d="M4,50 C2,50 -7.10542736e-15,49.8542274 0,45.9183673 L2.12440903e-16,22.80445 L20,0 L50,0 L52.6478104,5.68199944 L41.6482009,31.5743024 L43.0774821,32.5463035 L33.6110344,50 L4,50 Z" opacity=".324" transform="translate(0 19)"/>
-            <path fill="#000" fill-opacity=".383" d="M4,4 L65,4 C67.6666667,4 69.3333333,3 70,1 C70,3.66666667 70,5 70,5 L1.77635684e-15,5 C1.77635684e-15,5 1.77635684e-15,3.66666667 1.77635684e-15,1 C0.666666667,3 2,4 4,4 Z" transform="translate(0 65)"/>
-            <path fill="#000" fill-rule="nonzero" d="M51.4715595,21.2569497 C50.3159332,20.3969451 48.6924841,20.2231449 46.6336479,20.7285969 C46.6324003,20.2243717 46.6249152,19.7692195 46.6132716,19.3884947 C46.6066181,19.1717555 46.4265583,19 46.2065776,19 L24.7936,19 C24.5736193,19 24.3935595,19.1717555 24.3869061,19.3880858 C24.3752625,19.7688106 24.3677773,20.2239628 24.3669456,20.727779 C22.3076936,20.2227359 20.6846603,20.3961272 19.5282023,21.2561318 C18.3235066,22.1525322 17.8041194,23.7052842 18.066516,25.6281284 C18.6299826,29.7592583 22.681536,35.3842525 28.5931529,38.1008528 C29.5911749,39.4793955 30.8245637,40.6395634 32.3357354,41.4615364 L32.3357354,41.7150803 C31.7706054,41.9665795 31.3734758,42.5243761 31.3734758,43.1717309 L31.3734758,43.2175324 C31.3734758,43.9070082 31.8246649,44.491795 32.4488445,44.716304 L32.4488445,45.4106872 C32.4488445,45.4106872 32.4488445,45.4106872 32.4488445,45.4110961 C31.7668628,46.7278887 30.6727812,48.4053678 29.1046392,49.5827112 C28.9661636,49.6869914 28.9104407,49.8661079 28.9661636,50.0288667 C29.0218865,50.1916256 29.1769958,50.300813 29.3516496,50.300813 L41.6489439,50.300813 C41.8231819,50.300813 41.9778753,50.1912166 42.034014,50.0288667 C42.0901528,49.8665168 42.034014,49.6869914 41.8955385,49.5827112 C40.3290598,48.4070036 39.2349782,46.7270708 38.551749,45.4086425 L38.551749,44.716304 C39.1759286,44.491795 39.6271177,43.9070082 39.6271177,43.2175324 L39.6271177,43.1717309 C39.6271177,42.524785 39.2299881,41.9673974 38.665274,41.7154892 L38.665274,41.4615364 C40.1768614,40.6395634 41.411082,39.4789866 42.409104,38.1000349 C48.3198892,35.3826168 52.3701951,29.7584404 52.9336617,25.6281284 C53.1956424,23.7052842 52.6762552,22.1529411 51.4715595,21.2569497 Z M20.5665611,25.2989303 C20.4879668,24.7206866 20.4459667,23.6844281 21.0501859,23.2345922 C21.644009,22.792935 22.8632592,22.8362829 24.4301537,23.3257862 C24.5848471,26.3998016 25.0688877,30.337502 26.3846134,33.8666696 C23.1048636,31.3455435 20.920443,27.8940748 20.5665611,25.2989303 Z M50.4336166,25.2985213 C50.0793188,27.893257 47.8965615,31.3439077 44.6176434,33.8646249 C45.9325374,30.3358662 46.4165781,26.3989837 46.5704398,23.3253772 C48.1373343,22.8362829 49.3557528,22.792935 49.9495759,23.2350011 C50.5542109,23.6844281 50.5126267,24.7206866 50.4336166,25.2985213 Z M42.9997627,51.2357724 C43.2067373,51.2357724 43.3746167,51.3477838 43.375,51.4861358 L43.375,53.7496365 C43.375,53.8879886 43.2071206,54 43.000146,54 L28.0002373,54 C27.7928794,54 27.625,53.8879886 27.625,53.7496365 L27.625,51.4861358 C27.625,51.3477838 27.7928794,51.2357724 28.0002373,51.2357724 L42.9997627,51.2357724 Z" opacity=".3"/>
-            <path fill="#FFF" fill-rule="nonzero" d="M51.4715595,19.2569497 C50.3159332,18.3969451 48.6924841,18.2231449 46.6336479,18.7285969 C46.6324003,18.2243717 46.6249152,17.7692195 46.6132716,17.3884947 C46.6066181,17.1717555 46.4265583,17 46.2065776,17 L24.7936,17 C24.5736193,17 24.3935595,17.1717555 24.3869061,17.3880858 C24.3752625,17.7688106 24.3677773,18.2239628 24.3669456,18.727779 C22.3076936,18.2227359 20.6846603,18.3961272 19.5282023,19.2561318 C18.3235066,20.1525322 17.8041194,21.7052842 18.066516,23.6281284 C18.6299826,27.7592583 22.681536,33.3842525 28.5931529,36.1008528 C29.5911749,37.4793955 30.8245637,38.6395634 32.3357354,39.4615364 L32.3357354,39.7150803 C31.7706054,39.9665795 31.3734758,40.5243761 31.3734758,41.1717309 C31.3734758,41.9070082 31.8246649,42.491795 32.4488445,42.716304 L32.4488445,43.4106872 C31.7668628,44.7278887 30.6727812,46.4053678 29.1046392,47.5827112 C28.9661636,47.6869914 28.9104407,47.8661079 28.9661636,48.0288667 C29.0218865,48.1916256 29.1769958,48.300813 29.3516496,48.300813 L41.6489439,48.300813 C41.8231819,48.300813 41.9778753,48.1912166 42.034014,48.0288667 C42.0901528,47.8665168 42.034014,47.6869914 41.8955385,47.5827112 C40.3290598,46.4070036 39.2349782,44.7270708 38.551749,43.4086425 L38.551749,42.716304 C39.1759286,42.491795 39.6271177,41.9070082 39.6271177,41.2175324 C39.6271177,40.524785 39.2299881,39.9673974 38.665274,39.7154892 L38.665274,39.4615364 C40.1768614,38.6395634 41.411082,37.4789866 42.409104,36.1000349 C48.3198892,33.3826168 52.3701951,27.7584404 52.9336617,23.6281284 C53.1956424,21.7052842 52.6762552,20.1529411 51.4715595,19.2569497 Z M20.5665611,23.2989303 C20.4879668,22.7206866 20.4459667,21.6844281 21.0501859,21.2345922 C21.644009,20.792935 22.8632592,20.8362829 24.4301537,21.3257862 C24.5848471,24.3998016 25.0688877,28.337502 26.3846134,31.8666696 C23.1048636,29.3455435 20.920443,25.8940748 20.5665611,23.2989303 Z M50.4336166,23.2985213 C50.0793188,25.893257 47.8965615,29.3439077 44.6176434,31.8646249 C45.9325374,28.3358662 46.4165781,24.3989837 46.5704398,21.3253772 C48.1373343,20.8362829 49.3557528,20.792935 49.9495759,21.2350011 C50.5542109,21.6844281 50.5126267,22.7206866 50.4336166,23.2985213 Z M42.9997627,49.2357724 C43.2067373,49.2357724 43.3746167,49.3477838 43.375,49.4861358 L43.375,51.7496365 C43.375,51.8879886 43.2071206,52 43.000146,52 L28.0002373,52 C27.7928794,52 27.625,51.8879886 27.625,51.7496365 L27.625,49.4861358 C27.625,49.3477838 27.7928794,49.2357724 28.0002373,49.2357724 L42.9997627,49.2357724 Z"/>
-        </g>
-    </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M42 33c0 9.389-7.611 17-17 17S8 42.39 8 33s7.611-17 17-17 17 7.611 17 17Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M42 33c0 9.389-7.611 17-17 17S8 42.39 8 33s7.611-17 17-17 17 7.611 17 17Z" fill="url(#o_icon_gamification__a)" fill-opacity=".2"/><path d="M33.496 18.272 25 33l-8.497-14.728A16.922 16.922 0 0 1 25 16c3.095 0 5.997.827 8.496 2.272Z" fill="var(--o-icons-yellow-yellow, #F77B09)"/><path d="M33.496 18.272 25 33l-8.497-14.728A16.922 16.922 0 0 1 25 16c3.095 0 5.997.827 8.496 2.272Z" fill="url(#o_icon_gamification__b)" fill-opacity=".2"/><path d="M8 33c0 9.389 7.611 17 17 17V16c-9.389 0-17 7.611-17 17Z" fill="var(--o-icons-yellow-yellow, #F77B09)"/><path d="M8 33c0 9.389 7.611 17 17 17V16c-9.389 0-17 7.611-17 17Z" fill="url(#o_icon_gamification__c)" fill-opacity=".2"/><path d="M16.62 0H25v16c-3.095 0-5.997.827-8.497 2.272L11.206 9.09a4 4 0 0 1 .08-4.131l1.95-3.092A4 4 0 0 1 16.618 0Z" fill="var(--o-icons-purple-red, #911E3D)"/><path d="M16.62 0H25v16c-3.095 0-5.997.827-8.497 2.272L11.206 9.09a4 4 0 0 1 .08-4.131l1.95-3.092A4 4 0 0 1 16.618 0Z" fill="url(#o_icon_gamification__d)" fill-opacity=".2"/><path d="M25 16c-3.096 0-5.997.827-8.497 2.272L25 33V16Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M25 16c-3.096 0-5.997.827-8.497 2.272L25 33V16Z" fill="url(#o_icon_gamification__e)" fill-opacity=".2"/><path d="M25 16c3.095 0 5.997.827 8.496 2.272l5.298-9.182a4 4 0 0 0-.08-4.131l-1.949-3.092A4 4 0 0 0 33.381 0H25v16Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M25 16c3.095 0 5.997.827 8.496 2.272l5.298-9.182a4 4 0 0 0-.08-4.131l-1.949-3.092A4 4 0 0 0 33.381 0H25v16Z" fill="url(#o_icon_gamification__f)" fill-opacity=".2"/><defs><linearGradient id="o_icon_gamification__a" x1="8" y1="16" x2="48" y2="26" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_gamification__b" x1="16.503" y1="16" x2="36.496" y2="20.996" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_gamification__c" x1="8" y1="16" x2="28.923" y2="18.615" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_gamification__d" x1="10.671" y1="0" x2="27.92" y2="3.382" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_gamification__e" x1="16.503" y1="16" x2="26.96" y2="17.307" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_gamification__f" x1="25" y1="0" x2="42.249" y2="3.382" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/gamification/views/gamification_badge_views.xml b/addons/gamification/views/gamification_badge_views.xml
index 7c8bef73aea..e3d4158c7c1 100644
--- a/addons/gamification/views/gamification_badge_views.xml
+++ b/addons/gamification/views/gamification_badge_views.xml
@@ -149,7 +149,7 @@
                                     <em t-out="record.description.value"/>
                                     <div>
                                         <t t-foreach="record.unique_owner_ids.raw_value.slice(0,11)" t-as="owner" t-key="owner">
-                                            <img class="oe_kanban_avatar o_image_24_cover rounded-circle" t-att-src="kanban_image('res.users', 'avatar_128', owner)" t-att-data-member_id="owner" alt="Owner"/>
+                                            <img class="oe_kanban_avatar o_avatar rounded" t-att-src="kanban_image('res.users', 'avatar_128', owner)" t-att-data-member_id="owner" alt="Owner"/>
                                         </t>
                                     </div>
                                 </div>
diff --git a/addons/gamification/views/gamification_challenge_views.xml b/addons/gamification/views/gamification_challenge_views.xml
index 1002b4d7bb2..18d6a02b6c4 100644
--- a/addons/gamification/views/gamification_challenge_views.xml
+++ b/addons/gamification/views/gamification_challenge_views.xml
@@ -39,8 +39,7 @@
                                 icon="fa-gift"
                                 attrs="{'invisible': [('state','=','draft')]}">
                             <div class="o_field_widget o_stat_info">
-                                <span class="o_stat_text">Related</span>
-                                <span class="o_stat_text">Goals</span>
+                                <span class="o_stat_text">Related Goals</span>
                             </div>
                         </button>
                     </div>
diff --git a/addons/google_calendar/static/description/icon.png b/addons/google_calendar/static/description/icon.png
index 9ef1b3effce..7f4daead8e9 100644
Binary files a/addons/google_calendar/static/description/icon.png and b/addons/google_calendar/static/description/icon.png differ
diff --git a/addons/google_calendar/static/description/icon.svg b/addons/google_calendar/static/description/icon.svg
index 6056dc85197..ab37c89084d 100644
--- a/addons/google_calendar/static/description/icon.svg
+++ b/addons/google_calendar/static/description/icon.svg
@@ -1,22 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70">
-    <defs>
-        <path id="icon-a" d="M4,5.35309892e-14 C36.4160122,9.87060235e-15 58.0836068,-3.97961823e-14 65,5.07020818e-14 C69,6.733808e-14 70,1 70,5 C70,43.0488877 70,62.4235458 70,65 C70,69 69,70 65,70 C61,70 9,70 4,70 C1,70 7.10542736e-15,69 7.10542736e-15,65 C7.25721566e-15,62.4676575 3.83358709e-14,41.8005206 3.60818146e-14,5 C-1.13686838e-13,1 1,5.75716207e-14 4,5.35309892e-14 Z"/>
-        <linearGradient id="icon-c" x1="100%" x2="0%" y1="0%" y2="100%">
-            <stop offset="0%" stop-color="#94B6C8"/>
-            <stop offset="100%" stop-color="#6A9EBA"/>
-        </linearGradient>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <mask id="icon-b" fill="#fff">
-            <use xlink:href="#icon-a"/>
-        </mask>
-        <g mask="url(#icon-b)">
-            <rect width="70" height="70" fill="url(#icon-c)"/>
-            <path fill="#FFF" fill-opacity=".383" d="M4,1.8 L65,1.8 C67.6666667,1.8 69.3333333,1.13333333 70,-0.2 C70,2.46666667 70,3.46666667 70,2.8 L1.10547097e-14,2.8 C-1.65952376e-14,3.46666667 -2.9161925e-14,2.46666667 -2.66453526e-14,-0.2 C0.666666667,1.13333333 2,1.8 4,1.8 Z" transform="matrix(1 0 0 -1 0 2.8)"/>
-            <path fill="#393939" d="M4,53 C2,53 -7.10542736e-15,52.8543956 0,48.9230769 L2.12440903e-16,23.797368 L15,0 L54,0 L54,26.3118387 L57.7908529,26.3118387 L59,37.7115385 L49.1366936,53 L4,53 Z" opacity=".324" transform="translate(0 16)"/>
-            <path fill="#000" fill-opacity=".383" d="M4,4 L65,4 C67.6666667,4 69.3333333,3 70,1 C70,3.66666667 70,5 70,5 L1.77635684e-15,5 C1.77635684e-15,5 1.77635684e-15,3.66666667 1.77635684e-15,1 C0.666666667,3 2,4 4,4 Z" transform="translate(0 65)"/>
-            <path fill="#000" fill-rule="nonzero" d="M42.0955645,41.4315062 L42.0955645,28.7560864 L40.3833955,28.7560864 C40.2604632,29.4411054 40.0321745,30.0062307 39.6985283,30.4514643 C39.3648683,30.8967319 38.9521929,31.2477943 38.4604987,31.5046545 C37.986355,31.7615447 37.4507537,31.9413579 36.8536946,32.0440934 C36.2566271,32.1297334 35.6420039,32.1725451 35.0098218,32.1725307 L35.0098218,33.9192846 L39.8565751,33.9192846 L39.8565751,46.9685596 L41.0044957,46.9685596 C41.0029977,46.9790279 41.0014988,46.9895081 41,47 C41.6666667,47 42,47.3333333 42,48 C42,48.6666667 42,49 42,49 C40.6666667,49.6666667 40,50.3333333 40,51 C40,51.5412134 40.219684,52.3021107 40.6590519,53.282692 L15,53.282692 L15,24.0484615 L54.763358,24.0484615 L54.763358,37 C51.587786,37 49.6666667,37 49,37 C48.3333333,37 48,37.3333333 48,38 C48,38 48,38.3333333 48,39 C48,39.6666667 47.3333333,40 46,40 C44.6666667,40 43.6666667,40 43,40 C42.6985215,40 42.397043,40.4771687 42.0955645,41.4315062 Z M54.763358,23.0403846 L15,23.0403846 L15,18 L54.763358,18 L54.763358,23.0403846 Z M59.1120093,49.6163985 L60.7668484,50.585058 C60.9558409,50.6956709 61.043561,50.9244177 60.9788291,51.1357594 C60.5489654,52.5392703 59.8150519,53.807242 58.8551784,54.8603674 C58.7072273,55.022782 58.4680825,55.059636 58.279231,54.9491254 L56.6256345,53.9806234 C55.9298948,54.5851374 55.1300224,55.0541223 54.2662772,55.3639727 L54.2662772,57.3006617 C54.2662804,57.5219079 54.1150225,57.7135885 53.9021551,57.7620931 C52.5447646,58.0712105 51.0869171,58.0871979 49.661028,57.7623688 C49.4478436,57.7138157 49.2958963,57.5223205 49.2958963,57.3007404 L49.2958963,55.3639727 C48.4321428,55.0541404 47.6322673,54.5851537 46.936539,53.9806234 L45.2829425,54.9491254 C45.0940909,55.059636 44.8549462,55.022782 44.7069951,54.8603674 C43.7471604,53.807242 43.0132081,52.5392703 42.5833444,51.1357594 C42.5186125,50.9244571 42.6063326,50.6957102 42.795325,50.585058 L44.450203,49.6163985 C44.2839859,48.7026748 44.2839859,47.7658257 44.450203,46.852102 L42.7953639,45.8834424 C42.6063714,45.7728296 42.5186513,45.5440828 42.5833832,45.332741 C43.0132469,43.9292302 43.7471604,42.6612585 44.7070339,41.6081331 C44.8549851,41.4457185 45.0941298,41.4088644 45.2829813,41.5193751 L46.9365778,42.4878771 C47.6323176,41.8833631 48.4321899,41.4143782 49.2959351,41.1045278 L49.2959351,39.1677994 C49.2959319,38.9465532 49.4471898,38.7548726 49.6600572,38.706368 C51.0174478,38.3972506 52.4752952,38.3812631 53.9011843,38.7060923 C54.1143687,38.7546454 54.266316,38.9461406 54.266316,39.1677207 L54.266316,41.1044884 C55.1300695,41.4143207 55.929945,41.8833074 56.6256733,42.4878377 L58.2792698,41.5193357 C58.4681214,41.4088251 58.7072661,41.4456791 58.8552172,41.6080937 C59.8150519,42.6612191 60.5490043,43.9291908 60.9788679,45.3327017 C61.0435999,45.544004 60.9558797,45.7727509 60.7668873,45.8834031 L59.1120093,46.8520626 C59.2782268,47.7657995 59.2782268,48.7026616 59.1120093,49.6163985 Z M54.8876185,48.2342305 C54.8876185,46.497188 53.4940371,45.0839902 51.7811062,45.0839902 C50.0681752,45.0839902 48.6745938,46.497188 48.6745938,48.2342305 C48.6745938,49.9712731 50.0681752,51.3844709 51.7811062,51.3844709 C53.4940371,51.3844709 54.8876185,49.9712731 54.8876185,48.2342305 Z M25.3383523,20.6895722 C25.3383523,19.7564466 24.5910361,19 23.6691756,19 C22.7473152,19 22,19.7564466 22,20.6895722 C22,21.6226969 22.7473152,22.3791434 23.6691756,22.3791434 C24.5910361,22.3791434 25.3383523,21.6226969 25.3383523,20.6895722 Z M48.3383523,20.6895722 C48.3383523,19.7564466 47.5910361,19 46.6691756,19 C45.7473152,19 45,19.7564466 45,20.6895722 C45,21.6226969 45.7473152,22.3791434 46.6691756,22.3791434 C47.5910361,22.3791434 48.3383523,21.6226969 48.3383523,20.6895722 Z M26.4684862,38.4146042 C26.856901,38.3632372 27.2695974,38.3375505 27.7065763,38.3375419 C28.2082784,38.3375505 28.685711,38.4146128 29.1388753,38.56873 C29.5920244,38.705738 29.9804432,38.9283634 30.3041359,39.2366062 C30.6278103,39.5277389 30.8867565,39.8959263 31.0809766,40.3411707 C31.2751764,40.7693028 31.3722814,41.2659282 31.3722915,41.8310479 C31.3722814,42.3790542 31.2670842,42.8756796 31.0567001,43.3209262 C30.86248,43.749055 30.5954416,44.1172436 30.2555839,44.4254907 C29.9157069,44.716619 29.5191949,44.947806 29.0660468,45.1190547 C28.6128825,45.2731815 28.1354499,45.3502438 27.6337468,45.3502428 C26.4522968,45.3502438 25.5540767,44.9820564 24.9390823,44.2456783 C24.3240808,43.4921803 24.0003972,42.5246163 23.9680316,41.3429851 L21.9045489,41.3429851 C21.8883645,42.2848667 22.009746,43.1239918 22.2686932,43.8603645 C22.5438228,44.5967437 22.9322426,45.221807 23.4339538,45.7355554 C23.9356609,46.2321829 24.5425662,46.6174956 25.2546737,46.8914955 C25.966772,47.1483714 26.7597961,47.2768082 27.6337468,47.2768093 C28.4429491,47.2768082 29.2036045,47.156934 29.915716,46.9171833 C30.6439946,46.6774327 31.2751764,46.3263705 31.8092643,45.8639933 C32.343331,45.4016194 32.7641185,44.8279318 33.0716299,44.1429281 C33.3953013,43.4408047 33.5571425,42.635929 33.5571547,41.7282978 C33.5571425,40.6323023 33.2981963,39.6818635 32.780315,38.8769803 C32.2785937,38.0721121 31.501755,37.5497989 30.4497938,37.3100397 L30.4497938,37.2586641 C31.1133351,36.9332983 31.6716884,36.4537981 32.1248557,35.8201615 C32.5941851,35.1694222 32.8288558,34.4416088 32.828867,33.6367202 C32.8288558,32.797607 32.69129,32.0697936 32.4161706,31.4532779 C32.1572132,30.8367933 31.7930699,30.3316054 31.3237385,29.937713 C30.8543879,29.5438538 30.2960346,29.2527287 29.6486766,29.0643354 C29.0174867,28.8588534 28.3296598,28.7561033 27.5851948,28.7560851 C26.7274274,28.7561033 25.966772,28.9016664 25.3032256,29.1927733 C24.6558555,29.4839167 24.1136865,29.8863545 23.6767167,30.4000879 C23.2397419,30.9138557 22.899874,31.5303563 22.6571131,32.2495921 C22.4305335,32.9688579 22.3010609,33.765171 22.2686932,34.6385346 L24.332176,34.6385346 C24.3321719,34.1076707 24.3969093,33.6024827 24.5263859,33.1229686 C24.6558555,32.6434824 24.8500654,32.2239193 25.1090157,31.8642784 C25.3841422,31.5046685 25.7240101,31.222106 26.1286194,31.0165897 C26.5332175,30.7939804 27.0187423,30.6826676 27.5851948,30.6826515 C28.4591324,30.6826676 29.1874202,30.9309809 29.7700581,31.4275901 C30.3526797,31.9242316 30.6439946,32.652045 30.6440038,33.6110324 C30.6439946,34.1076707 30.5549808,34.5443589 30.3769643,34.9210972 C30.1989296,35.2807349 29.9561677,35.5889853 29.6486766,35.8458493 C29.3573536,36.0856106 29.0093946,36.2739857 28.6047975,36.4109754 C28.2163705,36.5308604 27.8036742,36.5907986 27.3667084,36.5907879 C27.2210444,36.5907986 27.0753874,36.5907986 26.9297356,36.5907879 C26.7840726,36.5907986 26.6303224,36.582236 26.4684862,36.5651001 L26.4684862,38.4146042 Z M13.808,57.508 L12.524,57.508 L12.524,56.716 L16.034,56.716 L16.034,57.508 L14.75,57.508 L14.75,61 L13.808,61 L13.808,57.508 Z M16.526,56.716 L17.852,56.716 L18.854,59.662 L18.866,59.662 L19.814,56.716 L21.14,56.716 L21.14,61 L20.258,61 L20.258,57.964 L20.246,57.964 L19.196,61 L18.47,61 L17.42,57.994 L17.408,57.994 L17.408,61 L16.526,61 L16.526,56.716 Z" opacity=".3"/>
-            <path fill="#FFF" fill-rule="nonzero" d="M42.0955645,39.4315062 L42.0955645,26.7560864 L40.3833955,26.7560864 C40.2604632,27.4411054 40.0321745,28.0062307 39.6985283,28.4514643 C39.3648683,28.8967319 38.9521929,29.2477943 38.4604987,29.5046545 C37.986355,29.7615447 37.4507537,29.9413579 36.8536946,30.0440934 C36.2566271,30.1297334 35.6420039,30.1725451 35.0098218,30.1725307 L35.0098218,31.9192846 L39.8565751,31.9192846 L39.8565751,44.9685596 L41.0044957,44.9685596 C41.0029977,44.9790279 41.0014988,44.9895081 41,45 C41.6666667,45 42,45.3333333 42,46 C42,46.6666667 42,47 42,47 C40.6666667,47.6666667 40,48.3333333 40,49 C40,49.5412134 40.219684,50.3021107 40.6590519,51.282692 L15,51.282692 L15,22.0484615 L54.763358,22.0484615 L54.763358,35 C51.587786,35 49.6666667,35 49,35 C48.3333333,35 48,35.3333333 48,36 C48,36 48,36.3333333 48,37 C48,37.6666667 47.3333333,38 46,38 C44.6666667,38 43.6666667,38 43,38 C42.6985215,38 42.397043,38.4771687 42.0955645,39.4315062 Z M54.763358,21.0403846 L15,21.0403846 L15,16 L54.763358,16 L54.763358,21.0403846 Z M59.1120093,47.6163985 L60.7668484,48.585058 C60.9558409,48.6956709 61.043561,48.9244177 60.9788291,49.1357594 C60.5489654,50.5392703 59.8150519,51.807242 58.8551784,52.8603674 C58.7072273,53.022782 58.4680825,53.059636 58.279231,52.9491254 L56.6256345,51.9806234 C55.9298948,52.5851374 55.1300224,53.0541223 54.2662772,53.3639727 L54.2662772,55.3006617 C54.2662804,55.5219079 54.1150225,55.7135885 53.9021551,55.7620931 C52.5447646,56.0712105 51.0869171,56.0871979 49.661028,55.7623688 C49.4478436,55.7138157 49.2958963,55.5223205 49.2958963,55.3007404 L49.2958963,53.3639727 C48.4321428,53.0541404 47.6322673,52.5851537 46.936539,51.9806234 L45.2829425,52.9491254 C45.0940909,53.059636 44.8549462,53.022782 44.7069951,52.8603674 C43.7471604,51.807242 43.0132081,50.5392703 42.5833444,49.1357594 C42.5186125,48.9244571 42.6063326,48.6957102 42.795325,48.585058 L44.450203,47.6163985 C44.2839859,46.7026748 44.2839859,45.7658257 44.450203,44.852102 L42.7953639,43.8834424 C42.6063714,43.7728296 42.5186513,43.5440828 42.5833832,43.332741 C43.0132469,41.9292302 43.7471604,40.6612585 44.7070339,39.6081331 C44.8549851,39.4457185 45.0941298,39.4088644 45.2829813,39.5193751 L46.9365778,40.4878771 C47.6323176,39.8833631 48.4321899,39.4143782 49.2959351,39.1045278 L49.2959351,37.1677994 C49.2959319,36.9465532 49.4471898,36.7548726 49.6600572,36.706368 C51.0174478,36.3972506 52.4752952,36.3812631 53.9011843,36.7060923 C54.1143687,36.7546454 54.266316,36.9461406 54.266316,37.1677207 L54.266316,39.1044884 C55.1300695,39.4143207 55.929945,39.8833074 56.6256733,40.4878377 L58.2792698,39.5193357 C58.4681214,39.4088251 58.7072661,39.4456791 58.8552172,39.6080937 C59.8150519,40.6612191 60.5490043,41.9291908 60.9788679,43.3327017 C61.0435999,43.544004 60.9558797,43.7727509 60.7668873,43.8834031 L59.1120093,44.8520626 C59.2782268,45.7657995 59.2782268,46.7026616 59.1120093,47.6163985 Z M54.8876185,46.2342305 C54.8876185,44.497188 53.4940371,43.0839902 51.7811062,43.0839902 C50.0681752,43.0839902 48.6745938,44.497188 48.6745938,46.2342305 C48.6745938,47.9712731 50.0681752,49.3844709 51.7811062,49.3844709 C53.4940371,49.3844709 54.8876185,47.9712731 54.8876185,46.2342305 Z M25.3383523,18.6895722 C25.3383523,17.7564466 24.5910361,17 23.6691756,17 C22.7473152,17 22,17.7564466 22,18.6895722 C22,19.6226969 22.7473152,20.3791434 23.6691756,20.3791434 C24.5910361,20.3791434 25.3383523,19.6226969 25.3383523,18.6895722 Z M48.3383523,18.6895722 C48.3383523,17.7564466 47.5910361,17 46.6691756,17 C45.7473152,17 45,17.7564466 45,18.6895722 C45,19.6226969 45.7473152,20.3791434 46.6691756,20.3791434 C47.5910361,20.3791434 48.3383523,19.6226969 48.3383523,18.6895722 Z M26.4684862,36.4146042 C26.856901,36.3632372 27.2695974,36.3375505 27.7065763,36.3375419 C28.2082784,36.3375505 28.685711,36.4146128 29.1388753,36.56873 C29.5920244,36.705738 29.9804432,36.9283634 30.3041359,37.2366062 C30.6278103,37.5277389 30.8867565,37.8959263 31.0809766,38.3411707 C31.2751764,38.7693028 31.3722814,39.2659282 31.3722915,39.8310479 C31.3722814,40.3790542 31.2670842,40.8756796 31.0567001,41.3209262 C30.86248,41.749055 30.5954416,42.1172436 30.2555839,42.4254907 C29.9157069,42.716619 29.5191949,42.947806 29.0660468,43.1190547 C28.6128825,43.2731815 28.1354499,43.3502438 27.6337468,43.3502428 C26.4522968,43.3502438 25.5540767,42.9820564 24.9390823,42.2456783 C24.3240808,41.4921803 24.0003972,40.5246163 23.9680316,39.3429851 L21.9045489,39.3429851 C21.8883645,40.2848667 22.009746,41.1239918 22.2686932,41.8603645 C22.5438228,42.5967437 22.9322426,43.221807 23.4339538,43.7355554 C23.9356609,44.2321829 24.5425662,44.6174956 25.2546737,44.8914955 C25.966772,45.1483714 26.7597961,45.2768082 27.6337468,45.2768093 C28.4429491,45.2768082 29.2036045,45.156934 29.915716,44.9171833 C30.6439946,44.6774327 31.2751764,44.3263705 31.8092643,43.8639933 C32.343331,43.4016194 32.7641185,42.8279318 33.0716299,42.1429281 C33.3953013,41.4408047 33.5571425,40.635929 33.5571547,39.7282978 C33.5571425,38.6323023 33.2981963,37.6818635 32.780315,36.8769803 C32.2785937,36.0721121 31.501755,35.5497989 30.4497938,35.3100397 L30.4497938,35.2586641 C31.1133351,34.9332983 31.6716884,34.4537981 32.1248557,33.8201615 C32.5941851,33.1694222 32.8288558,32.4416088 32.828867,31.6367202 C32.8288558,30.797607 32.69129,30.0697936 32.4161706,29.4532779 C32.1572132,28.8367933 31.7930699,28.3316054 31.3237385,27.937713 C30.8543879,27.5438538 30.2960346,27.2527287 29.6486766,27.0643354 C29.0174867,26.8588534 28.3296598,26.7561033 27.5851948,26.7560851 C26.7274274,26.7561033 25.966772,26.9016664 25.3032256,27.1927733 C24.6558555,27.4839167 24.1136865,27.8863545 23.6767167,28.4000879 C23.2397419,28.9138557 22.899874,29.5303563 22.6571131,30.2495921 C22.4305335,30.9688579 22.3010609,31.765171 22.2686932,32.6385346 L24.332176,32.6385346 C24.3321719,32.1076707 24.3969093,31.6024827 24.5263859,31.1229686 C24.6558555,30.6434824 24.8500654,30.2239193 25.1090157,29.8642784 C25.3841422,29.5046685 25.7240101,29.222106 26.1286194,29.0165897 C26.5332175,28.7939804 27.0187423,28.6826676 27.5851948,28.6826515 C28.4591324,28.6826676 29.1874202,28.9309809 29.7700581,29.4275901 C30.3526797,29.9242316 30.6439946,30.652045 30.6440038,31.6110324 C30.6439946,32.1076707 30.5549808,32.5443589 30.3769643,32.9210972 C30.1989296,33.2807349 29.9561677,33.5889853 29.6486766,33.8458493 C29.3573536,34.0856106 29.0093946,34.2739857 28.6047975,34.4109754 C28.2163705,34.5308604 27.8036742,34.5907986 27.3667084,34.5907879 C27.2210444,34.5907986 27.0753874,34.5907986 26.9297356,34.5907879 C26.7840726,34.5907986 26.6303224,34.582236 26.4684862,34.5651001 L26.4684862,36.4146042 Z M13.808,55.508 L12.524,55.508 L12.524,54.716 L16.034,54.716 L16.034,55.508 L14.75,55.508 L14.75,59 L13.808,59 L13.808,55.508 Z M16.526,54.716 L17.852,54.716 L18.854,57.662 L18.866,57.662 L19.814,54.716 L21.14,54.716 L21.14,59 L20.258,59 L20.258,55.964 L20.246,55.964 L19.196,59 L18.47,59 L17.42,55.994 L17.408,55.994 L17.408,59 L16.526,59 L16.526,54.716 Z"/>
-        </g>
-    </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="m36.053 13.947-9.948-1.105-12.158 1.105L12.842 25l1.105 11.053L25 37.435l11.053-1.382 1.105-11.329-1.105-10.777Z" fill="#fff"/><path d="M18.482 31.096c-.826-.558-1.398-1.373-1.71-2.451l1.917-.79c.174.663.478 1.177.912 1.542.431.364.956.544 1.57.544.627 0 1.166-.19 1.616-.572.45-.381.677-.868.677-1.456 0-.603-.238-1.095-.713-1.476-.475-.38-1.072-.572-1.785-.572h-1.108v-1.898h.995c.613 0 1.13-.166 1.55-.497.42-.332.63-.785.63-1.362 0-.514-.188-.924-.564-1.23-.376-.307-.85-.462-1.428-.462-.564 0-1.012.15-1.343.451a2.641 2.641 0 0 0-.724 1.108l-1.898-.79c.25-.713.712-1.343 1.39-1.888.676-.544 1.541-.817 2.591-.817.777 0 1.476.149 2.095.45a3.584 3.584 0 0 1 1.456 1.249c.35.533.525 1.13.525 1.793 0 .677-.163 1.249-.49 1.719-.325.47-.726.829-1.201 1.08v.113a3.65 3.65 0 0 1 1.541 1.202c.401.54.603 1.183.603 1.935 0 .751-.19 1.423-.572 2.011a3.96 3.96 0 0 1-1.578 1.39c-.671.337-1.426.508-2.263.508a4.684 4.684 0 0 1-2.691-.834ZM30.25 21.58l-2.095 1.522-1.053-1.597 3.778-2.724h1.448v12.851H30.25V21.58Z" fill="#1A73E8"/><path d="M36.052 46 46 36.053l-4.973-2.21-4.974 2.21-2.21 4.973L36.052 46Z" fill="#EA4335"/><path d="M11.737 41.026 13.947 46h22.106v-9.947H13.948l-2.21 4.973Z" fill="#34A853"/><path d="M7.316 4A3.315 3.315 0 0 0 4 7.316v28.737l4.974 2.21 4.973-2.21V13.947h22.106l2.21-4.973L36.053 4H7.316Z" fill="#4285F4"/><path d="M4 36.053v6.631A3.315 3.315 0 0 0 7.316 46h6.631v-9.947H4Z" fill="#188038"/><path d="M36.053 13.947v22.106H46V13.947l-4.974-2.21-4.973 2.21Z" fill="#FBBC04"/><path d="M46 13.947V7.316A3.315 3.315 0 0 0 42.684 4h-6.631v9.947H46Z" fill="#1967D2"/></svg>
diff --git a/addons/google_calendar/static/src/scss/google_calendar.scss b/addons/google_calendar/static/src/scss/google_calendar.scss
index 759b6f31e52..53a844f70ea 100644
--- a/addons/google_calendar/static/src/scss/google_calendar.scss
+++ b/addons/google_calendar/static/src/scss/google_calendar.scss
@@ -1,7 +1,4 @@
 .o_calendar_sidebar {
-    .bg-primary {
-        background-color: $o-enterprise-primary-color;
-    }
     .o_google_sync_button_configured {
         color: white;
         height: 2em;
diff --git a/addons/google_calendar/static/tests/google_calendar_tests.js b/addons/google_calendar/static/tests/google_calendar_tests.js
index 5a9199ca7b9..2862bf8aab6 100644
--- a/addons/google_calendar/static/tests/google_calendar_tests.js
+++ b/addons/google_calendar/static/tests/google_calendar_tests.js
@@ -98,7 +98,7 @@ QUnit.module('Google Calendar', {
 }, function () {
 
     QUnit.test('sync google calendar', async function (assert) {
-        assert.expect(11);
+        assert.expect(13);
 
         let id = 7;
         await makeView({
@@ -136,8 +136,11 @@ QUnit.module('Google Calendar', {
         // sync_data was called a first time without filter, event from google calendar was created twice
         assert.containsN(target, '.fc-event-container', 4, "should display 4 events on the month");
 
-        await click(target.querySelector('.o_calendar_button_next'));
-        await click(target.querySelector('.o_calendar_button_prev'));
+        await click(target.querySelector('.ui-datepicker-next'));
+        await click(target.querySelector('.ui-datepicker-calendar > tbody > tr:nth-child(2) > td:nth-child(4) > a'));
+        await click(target.querySelector('.o_view_scale_selector .dropdown-toggle'));
+        await click(target.querySelector('.o_scale_button_month'));
+        await click(target.querySelector('.o_calendar_button_today'));
 
         assert.verifySteps([
             '/google_calendar/sync_data',
@@ -148,8 +151,10 @@ QUnit.module('Google Calendar', {
             '/web/dataset/call_kw/calendar.event/search_read',
             '/google_calendar/sync_data',
             '/web/dataset/call_kw/calendar.event/search_read',
+            "/google_calendar/sync_data",
+            "/web/dataset/call_kw/calendar.event/search_read",
         ], 'should do a search_read before and after the call to sync_data');
 
-        assert.containsN(target, '.fc-event-container', 6, "should now display 6 events on the month");
+        assert.containsN(target, '.fc-event-container', 7, "should now display 7 events on the month");
     });
 });
diff --git a/addons/google_gmail/static/description/icon.png b/addons/google_gmail/static/description/icon.png
index f28d0ab573f..3b3f0acfcc1 100644
Binary files a/addons/google_gmail/static/description/icon.png and b/addons/google_gmail/static/description/icon.png differ
diff --git a/addons/google_gmail/static/description/icon.svg b/addons/google_gmail/static/description/icon.svg
index 7965971e95e..a5102a08400 100644
--- a/addons/google_gmail/static/description/icon.svg
+++ b/addons/google_gmail/static/description/icon.svg
@@ -1 +1 @@
-<?xml version="1.0" ?><svg height="48px" viewBox="0 0 48 48" width="48px" xmlns="http://www.w3.org/2000/svg"><path d="M45,16.2l-5,2.75l-5,4.75L35,40h7c1.657,0,3-1.343,3-3V16.2z" fill="#4caf50"/><path d="M3,16.2l3.614,1.71L13,23.7V40H6c-1.657,0-3-1.343-3-3V16.2z" fill="#1e88e5"/><polygon fill="#e53935" points="35,11.2 24,19.45 13,11.2 12,17 13,23.7 24,31.95 35,23.7 36,17"/><path d="M3,12.298V16.2l10,7.5V11.2L9.876,8.859C9.132,8.301,8.228,8,7.298,8h0C4.924,8,3,9.924,3,12.298z" fill="#c62828"/><path d="M45,12.298V16.2l-10,7.5V11.2l3.124-2.341C38.868,8.301,39.772,8,40.702,8h0 C43.076,8,45,9.924,45,12.298z" fill="#fbc02d"/></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M6 42.009h7V24.494L3 16.767v22.151c0 1.71 1.345 3.091 3 3.091Z" fill="#4285F4"/><path d="M37 42.009h7c1.66 0 3-1.386 3-3.09V16.766l-10 7.727" fill="#34A853"/><path d="M37 11.1v13.394l10-7.728v-4.12c0-3.823-4.235-6.002-7.2-3.71" fill="#FBBC04"/><path d="M13 24.494V11.1l12 9.272L37 11.1v13.394l-12 9.272" fill="#EA4335"/><path d="M3 12.645v4.121l10 7.728V11.1l-2.8-2.164C7.23 6.644 3 8.823 3 12.646Z" fill="#C5221F"/></svg>
diff --git a/addons/google_gmail/views/fetchmail_server_views.xml b/addons/google_gmail/views/fetchmail_server_views.xml
index e965e2f61e5..a381d95104e 100644
--- a/addons/google_gmail/views/fetchmail_server_views.xml
+++ b/addons/google_gmail/views/fetchmail_server_views.xml
@@ -18,7 +18,7 @@
                     <button type="object"
                         name="open_google_gmail_uri" class="btn-link px-0"
                         attrs="{'invisible': ['|', '|', ('google_gmail_uri', '=', False), ('server_type', '!=', 'gmail'), ('google_gmail_refresh_token', '!=', False)]}">
-                        <i class="fa fa-arrow-right"/>
+                        <i class="oi oi-arrow-right"/>
                         Connect your Gmail account
                     </button>
                     <button type="object"
@@ -27,7 +27,7 @@
                         <i class="fa fa-cog" title="Edit Settings"/>
                     </button>
                     <button class="alert alert-warning d-block mt-2 text-start"
-                        icon="fa-arrow-right" type="action" role="alert"
+                        icon="oi-arrow-right" type="action" role="alert"
                         name="%(base.res_config_setting_act_window)d"
                         attrs="{'invisible': ['|', ('server_type', '!=', 'gmail'), ('google_gmail_uri', '!=', False)]}">
                         Setup your Gmail API credentials in the general settings to link a Gmail account.
diff --git a/addons/google_gmail/views/ir_mail_server_views.xml b/addons/google_gmail/views/ir_mail_server_views.xml
index 266f09859ed..2307d72c8d8 100644
--- a/addons/google_gmail/views/ir_mail_server_views.xml
+++ b/addons/google_gmail/views/ir_mail_server_views.xml
@@ -17,7 +17,7 @@
                     <button type="object"
                         name="open_google_gmail_uri" class="btn-link px-0"
                         attrs="{'invisible': ['|', '|', ('google_gmail_uri', '=', False), ('smtp_authentication', '!=', 'gmail'), ('google_gmail_refresh_token', '!=', False)]}">
-                        <i class="fa fa-arrow-right"/>
+                        <i class="oi oi-arrow-right"/>
                         Connect your Gmail account
                     </button>
                     <button type="object"
@@ -26,7 +26,7 @@
                         <i class="fa fa-cog" title="Edit Settings"/>
                     </button>
                     <button class="alert alert-warning d-block mt-2 text-start"
-                        icon="fa-arrow-right" type="action" role="alert"
+                        icon="oi-arrow-right" type="action" role="alert"
                         name="%(base.res_config_setting_act_window)d"
                         attrs="{'invisible': ['|', ('smtp_authentication', '!=', 'gmail'), ('google_gmail_uri', '!=', False)]}">
                         Setup your Gmail API credentials in the general settings to link a Gmail account.
diff --git a/addons/google_recaptcha/views/res_config_settings_view.xml b/addons/google_recaptcha/views/res_config_settings_view.xml
index 71cadb1e07d..759741d677e 100644
--- a/addons/google_recaptcha/views/res_config_settings_view.xml
+++ b/addons/google_recaptcha/views/res_config_settings_view.xml
@@ -24,7 +24,7 @@
                     </div>
                     <div>
                         <a href="https://www.google.com/recaptcha/admin/create" class="oe_link" target="_blank">
-                            <i class="fa fa-arrow-right"/> Generate reCAPTCHA v3 keys
+                            <i class="oi oi-arrow-right"/> Generate reCAPTCHA v3 keys
                         </a>
                     </div>
                 </div>
diff --git a/addons/hr/static/description/icon.png b/addons/hr/static/description/icon.png
index 7664263eae3..6236bf1e10d 100644
Binary files a/addons/hr/static/description/icon.png and b/addons/hr/static/description/icon.png differ
diff --git a/addons/hr/static/description/icon.svg b/addons/hr/static/description/icon.svg
index 753554b03d4..1149418c67f 100644
--- a/addons/hr/static/description/icon.svg
+++ b/addons/hr/static/description/icon.svg
@@ -1,24 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70">
-    <defs>
-        <path id="icon-a" d="M4,5.35309892e-14 C36.4160122,9.87060235e-15 58.0836068,-3.97961823e-14 65,5.07020818e-14 C69,6.733808e-14 70,1 70,5 C70,43.0488877 70,62.4235458 70,65 C70,69 69,70 65,70 C61,70 9,70 4,70 C1,70 7.10542736e-15,69 7.10542736e-15,65 C7.25721566e-15,62.4676575 3.83358709e-14,41.8005206 3.60818146e-14,5 C-1.13686838e-13,1 1,5.75716207e-14 4,5.35309892e-14 Z"/>
-        <linearGradient id="icon-c" x1="100%" x2="0%" y1="0%" y2="100%">
-            <stop offset="0%" stop-color="#269396"/>
-            <stop offset="100%" stop-color="#218689"/>
-        </linearGradient>
-        <path id="icon-d" d="M35.5,22.75 C39.6529297,22.75 43.0195312,26.1166016 43.0195312,30.2695312 C43.0195312,34.4224609 39.6529297,37.7890625 35.5,37.7890625 C31.3470703,37.7890625 27.9804687,34.4224609 27.9804687,30.2695312 C27.9804687,26.1166016 31.3470703,22.75 35.5,22.75 Z M43.6256055,38.3165755 L40.7623112,37.6007161 C37.2411654,40.1333659 32.9730794,39.5681836 30.2377604,37.6007161 L27.3744661,38.3165755 C25.0790039,38.8904232 23.46875,40.9527799 23.46875,43.3188542 L23.46875,47.671875 C23.46875,49.0957161 24.6230339,50.25 26.046875,50.25 L44.953125,50.25 C46.3769661,50.25 47.53125,49.0957161 47.53125,47.671875 L47.53125,43.3188542 C47.53125,40.9527799 45.9209961,38.8904232 43.6256055,38.3165755 Z M50.3958333,39.6510417 C53.1644531,39.6510417 55.4088542,37.4066406 55.4088542,34.6380208 C55.4088542,31.869401 53.1644531,29.625 50.3958333,29.625 C47.6272135,29.625 45.3828125,31.869401 45.3828125,34.6380208 C45.3828125,37.4066406 47.6272135,39.6510417 50.3958333,39.6510417 Z M20.6041667,39.6510417 C23.3727865,39.6510417 25.6171875,37.4066406 25.6171875,34.6380208 C25.6171875,31.869401 23.3727865,29.625 20.6041667,29.625 C17.8355469,29.625 15.5911458,31.869401 15.5911458,34.6380208 C15.5911458,37.4066406 17.8355469,39.6510417 20.6041667,39.6510417 Z M22.3229167,47.671875 L22.3229167,43.3188542 C22.3229167,42.1335612 22.6518424,41.0125781 23.2326367,40.0533008 C21.0850586,41.1074674 18.6968555,40.6769206 17.0959831,39.5255013 L15.1870964,40.0027409 C13.6568359,40.3852344 12.5833333,41.7602344 12.5833333,43.3375456 L12.5833333,46.2395833 C12.5833333,47.1888346 13.352832,47.9583333 14.3020833,47.9583333 L22.3350195,47.9583333 C22.3273388,47.8630362 22.3233016,47.7674804 22.3229167,47.671875 Z M55.8129036,40.0026693 L53.9040169,39.5254297 C51.9041797,40.9638802 49.5434049,40.902793 47.7604883,40.0423437 C48.3454362,41.004056 48.6770833,42.1289779 48.6770833,43.3188542 L48.6770833,47.671875 C48.6770833,47.7683398 48.6722135,47.8636589 48.6649805,47.9583333 L56.6979167,47.9583333 C57.647168,47.9583333 58.4166667,47.1888346 58.4166667,46.2395833 L58.4166667,43.3375456 C58.4166667,41.7602344 57.3431641,40.3852344 55.8129036,40.0026693 Z"/>
-        <path id="icon-e" d="M35.5,20.75 C39.6529297,20.75 43.0195312,24.1166016 43.0195312,28.2695312 C43.0195312,32.4224609 39.6529297,35.7890625 35.5,35.7890625 C31.3470703,35.7890625 27.9804687,32.4224609 27.9804687,28.2695312 C27.9804687,24.1166016 31.3470703,20.75 35.5,20.75 Z M43.6256055,36.3165755 L40.7623112,35.6007161 C37.2411654,38.1333659 32.9730794,37.5681836 30.2377604,35.6007161 L27.3744661,36.3165755 C25.0790039,36.8904232 23.46875,38.9527799 23.46875,41.3188542 L23.46875,45.671875 C23.46875,47.0957161 24.6230339,48.25 26.046875,48.25 L44.953125,48.25 C46.3769661,48.25 47.53125,47.0957161 47.53125,45.671875 L47.53125,41.3188542 C47.53125,38.9527799 45.9209961,36.8904232 43.6256055,36.3165755 Z M50.3958333,37.6510417 C53.1644531,37.6510417 55.4088542,35.4066406 55.4088542,32.6380208 C55.4088542,29.869401 53.1644531,27.625 50.3958333,27.625 C47.6272135,27.625 45.3828125,29.869401 45.3828125,32.6380208 C45.3828125,35.4066406 47.6272135,37.6510417 50.3958333,37.6510417 Z M20.6041667,37.6510417 C23.3727865,37.6510417 25.6171875,35.4066406 25.6171875,32.6380208 C25.6171875,29.869401 23.3727865,27.625 20.6041667,27.625 C17.8355469,27.625 15.5911458,29.869401 15.5911458,32.6380208 C15.5911458,35.4066406 17.8355469,37.6510417 20.6041667,37.6510417 Z M22.3229167,45.671875 L22.3229167,41.3188542 C22.3229167,40.1335612 22.6518424,39.0125781 23.2326367,38.0533008 C21.0850586,39.1074674 18.6968555,38.6769206 17.0959831,37.5255013 L15.1870964,38.0027409 C13.6568359,38.3852344 12.5833333,39.7602344 12.5833333,41.3375456 L12.5833333,44.2395833 C12.5833333,45.1888346 13.352832,45.9583333 14.3020833,45.9583333 L22.3350195,45.9583333 C22.3273388,45.8630362 22.3233016,45.7674804 22.3229167,45.671875 Z M55.8129036,38.0026693 L53.9040169,37.5254297 C51.9041797,38.9638802 49.5434049,38.902793 47.7604883,38.0423437 C48.3454362,39.004056 48.6770833,40.1289779 48.6770833,41.3188542 L48.6770833,45.671875 C48.6770833,45.7683398 48.6722135,45.8636589 48.6649805,45.9583333 L56.6979167,45.9583333 C57.647168,45.9583333 58.4166667,45.1888346 58.4166667,44.2395833 L58.4166667,41.3375456 C58.4166667,39.7602344 57.3431641,38.3852344 55.8129036,38.0026693 Z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <mask id="icon-b" fill="#fff">
-            <use xlink:href="#icon-a"/>
-        </mask>
-        <g mask="url(#icon-b)">
-            <rect width="70" height="70" fill="url(#icon-c)"/>
-            <path fill="#FFF" fill-opacity=".383" d="M4,1.8 L65,1.8 C67.6666667,1.8 69.3333333,1.13333333 70,-0.2 C70,2.46666667 70,3.46666667 70,2.8 L1.10547097e-14,2.8 C-1.65952376e-14,3.46666667 -2.9161925e-14,2.46666667 -2.66453526e-14,-0.2 C0.666666667,1.13333333 2,1.8 4,1.8 Z" transform="matrix(1 0 0 -1 0 2.8)"/>
-            <path fill="#393939" d="M44,47 L4,47 C2,47 -7.10542736e-15,46.8509317 0,42.826087 L1.81527147e-16,22.6291049 L17.2090667,6.04664397 L19.583071,9.5209307 L30.2767729,0.11143939 L40.9146315,10.270152 L46.6446282,6.41116033 L55.3045682,10.7749724 L52.3812234,16.1277957 L58.2417324,21.9036543 L44,47 Z" opacity=".324" transform="translate(0 23)"/>
-            <path fill="#000" fill-opacity=".383" d="M4,4 L65,4 C67.6666667,4 69.3333333,3 70,1 C70,3.66666667 70,5 70,5 L1.77635684e-15,5 C1.77635684e-15,5 1.77635684e-15,3.66666667 1.77635684e-15,1 C0.666666667,3 2,4 4,4 Z" transform="translate(0 65)"/>
-            <use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#icon-d"/>
-            <use fill="#FFF" fill-rule="nonzero" xlink:href="#icon-e"/>
-        </g>
-    </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M34 17a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M34 17a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" fill="url(#o_icon_hr__a)" fill-opacity=".2"/><path d="M12 24a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M12 24a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z" fill="url(#o_icon_hr__b)" fill-opacity=".2"/><path d="M46 24a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path d="M46 24a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z" fill="url(#o_icon_hr__c)" fill-opacity=".2"/><path d="M25 30H4a4 4 0 0 0-4 4v4a4 4 0 0 0 4 4h21V30Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M25 30H4a4 4 0 0 0-4 4v4a4 4 0 0 0 4 4h21V30Z" fill="url(#o_icon_hr__d)" fill-opacity=".2"/><path d="M46 30H25v12h21a4 4 0 0 0 4-4v-4a4 4 0 0 0-4-4Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path d="M46 30H25v12h21a4 4 0 0 0 4-4v-4a4 4 0 0 0-4-4Z" fill="url(#o_icon_hr__e)" fill-opacity=".2"/><path d="M12 30h14c6.627 0 12 5.373 12 12H24c-6.627 0-12-5.373-12-12Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M12 30h14c6.627 0 12 5.373 12 12H24c-6.627 0-12-5.373-12-12Z" fill="url(#o_icon_hr__f)" fill-opacity=".2"/><defs><linearGradient id="o_icon_hr__a" x1="16" y1="8" x2="37.176" y2="13.294" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr__b" x1="4" y1="20" x2="13.412" y2="22.353" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr__c" x1="38" y1="20" x2="47.412" y2="22.353" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr__d" x1="0" y1="30" x2="24.582" y2="42.803" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr__e" x1="25" y1="30" x2="49.582" y2="42.803" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr__f" x1="12" y1="30" x2="37.127" y2="43.611" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/hr/static/tests/m2x_avatar_employee_tests.js b/addons/hr/static/tests/m2x_avatar_employee_tests.js
index 5a874d39169..1b7adcf4642 100644
--- a/addons/hr/static/tests/m2x_avatar_employee_tests.js
+++ b/addons/hr/static/tests/m2x_avatar_employee_tests.js
@@ -214,22 +214,22 @@ QUnit.test("many2many_avatar_employee widget in form view", async function (asse
     });
     assert.containsN(
         document.body,
-        ".o_field_many2many_avatar_employee .badge",
+        ".o_field_many2many_avatar_employee .o_tag",
         2,
         "should have 2 records"
     );
     assert.strictEqual(
         document
-            .querySelector(".o_field_many2many_avatar_employee .badge img")
+            .querySelector(".o_field_many2many_avatar_employee .o_tag img")
             .getAttribute("data-src"),
         `/web/image/hr.employee.public/${employeeId_1}/avatar_128`
     );
 
     await dom.click(
-        document.querySelector(".o_field_many2many_avatar_employee .badge .o_m2m_avatar")
+        document.querySelector(".o_field_many2many_avatar_employee .o_tag .o_m2m_avatar")
     );
     await dom.click(
-        document.querySelectorAll(".o_field_many2many_avatar_employee .badge .o_m2m_avatar")[1]
+        document.querySelectorAll(".o_field_many2many_avatar_employee .o_tag .o_m2m_avatar")[1]
     );
     assert.verifySteps([
         `read m2x.avatar.employee ${avatarId_1}`,
@@ -413,19 +413,19 @@ QUnit.test(
             res_id: avatarId,
             views: [[false, "form"]],
         });
-        assert.containsN(document.body, ".o_field_many2many_avatar_employee .badge", 2);
+        assert.containsN(document.body, ".o_field_many2many_avatar_employee .o_tag", 2);
         assert.strictEqual(
             document
-                .querySelector(".o_field_many2many_avatar_employee .badge img")
+                .querySelector(".o_field_many2many_avatar_employee .o_tag img")
                 .getAttribute("data-src"),
             `/web/image/hr.employee.public/${employeeId_1}/avatar_128`
         );
 
         await dom.click(
-            document.querySelector(".o_field_many2many_avatar_employee .badge .o_m2m_avatar")
+            document.querySelector(".o_field_many2many_avatar_employee .o_tag .o_m2m_avatar")
         );
         await dom.click(
-            document.querySelectorAll(".o_field_many2many_avatar_employee .badge .o_m2m_avatar")[1]
+            document.querySelectorAll(".o_field_many2many_avatar_employee .o_tag .o_m2m_avatar")[1]
         );
         assert.verifySteps([
             `read m2x.avatar.employee ${employeeId_1}`,
diff --git a/addons/hr/static/tests/tours/hr_employee_flow.js b/addons/hr/static/tests/tours/hr_employee_flow.js
index bd1208b7179..cdfc8f39643 100644
--- a/addons/hr/static/tests/tours/hr_employee_flow.js
+++ b/addons/hr/static/tests/tours/hr_employee_flow.js
@@ -20,7 +20,7 @@ registry.category("web_tour.tours").add('hr_employee_tour', {
     },
     {
         content: "Open user account menu",
-        trigger: ".o_user_menu .oe_topbar_name",
+        trigger: ".o_user_menu .dropdown-toggle",
         run: 'click',
     }, {
         content: "Open My Profile",
diff --git a/addons/hr/views/hr_department_views.xml b/addons/hr/views/hr_department_views.xml
index 91590a1f609..e73d45b21ae 100644
--- a/addons/hr/views/hr_department_views.xml
+++ b/addons/hr/views/hr_department_views.xml
@@ -16,7 +16,7 @@
                                 <field string="Plans" name="plans_count" widget="statinfo"/>
                             </button>
                         </div>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <field name="active" invisible="1"/>
                         <group>
                             <group>
diff --git a/addons/hr/views/hr_employee_public_views.xml b/addons/hr/views/hr_employee_public_views.xml
index 06fa6d7f0b5..175bafc42f3 100644
--- a/addons/hr/views/hr_employee_public_views.xml
+++ b/addons/hr/views/hr_employee_public_views.xml
@@ -42,7 +42,7 @@
                         <div class="oe_button_box" name="button_box">
                             <!-- Used by other modules-->
                         </div>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <div class="row justify-content-between position-relative w-100 m-0 mb-2">
                             <div class="oe_title ps-0 pe-2">
                                 <label for="name" string="Employee Name"/>
diff --git a/addons/hr/views/hr_employee_views.xml b/addons/hr/views/hr_employee_views.xml
index 6ebf27690a9..193ad5603f6 100644
--- a/addons/hr/views/hr_employee_views.xml
+++ b/addons/hr/views/hr_employee_views.xml
@@ -60,7 +60,7 @@
                     <sheet>
                         <div name="button_box" class="oe_button_box">
                         </div>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <field name="avatar_128" invisible="1"/>
                         <div class="row justify-content-between position-relative w-100 m-0 mb-2">
                             <div class="oe_title mw-75 ps-0 pe-2">
diff --git a/addons/hr/views/hr_job_views.xml b/addons/hr/views/hr_job_views.xml
index 7cd4265ffbb..2b0a946fdbd 100644
--- a/addons/hr/views/hr_job_views.xml
+++ b/addons/hr/views/hr_job_views.xml
@@ -11,7 +11,7 @@
                     <field name="company_id" invisible="1"/>
                     <sheet>
                         <div class="oe_button_box" name="button_box"/>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <div class="oe_title">
                             <label for="name"/>
                             <h1><field name="name" options="{'line_breaks': False}" widget="text" placeholder="e.g. Sales Manager"/></h1>
diff --git a/addons/hr/views/hr_plan_views.xml b/addons/hr/views/hr_plan_views.xml
index 3b0a8f96da6..2d9ba7c338d 100644
--- a/addons/hr/views/hr_plan_views.xml
+++ b/addons/hr/views/hr_plan_views.xml
@@ -36,7 +36,7 @@
                 <form string="Planning">
                     <field name="company_id" invisible="1"/>
                     <sheet>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <div class="oe_title">
                             <label for="name" string="Plan Name"/>
                             <h1>
diff --git a/addons/hr_attendance/static/description/icon.png b/addons/hr_attendance/static/description/icon.png
index 5cca7ac8bde..5a703eaeadc 100644
Binary files a/addons/hr_attendance/static/description/icon.png and b/addons/hr_attendance/static/description/icon.png differ
diff --git a/addons/hr_attendance/static/description/icon.svg b/addons/hr_attendance/static/description/icon.svg
index bef191e78bc..02028cad21e 100644
--- a/addons/hr_attendance/static/description/icon.svg
+++ b/addons/hr_attendance/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#94B6C8"/><stop offset="100%" stop-color="#6A9EBA"/></linearGradient><path id="d" d="M28.278 17.235c5.193 0 9.404 4.271 9.404 9.54 0 5.27-4.21 9.541-9.404 9.541s-9.404-4.271-9.404-9.54c0-5.27 4.21-9.541 9.404-9.541zm6.018 19.492c0-.413-9.178 1.847-12.6-.65l-4.19 1.063c-2.512.638-4.275 2.927-4.275 5.554v2.209c0 1.58 1.264 2.862 2.822 2.862h15.466c-1.852-6.34 2.777-10.625 2.777-11.038zM45.5 33.794c-6.466 0-11.706 5.24-11.706 11.706 0 6.466 5.24 11.706 11.706 11.706 6.466 0 11.706-5.24 11.706-11.706 0-6.466-5.24-11.706-11.706-11.706zm2.695 16.525l-4.163-3.025a.57.57 0 0 1-.231-.458v-7.944c0-.312.255-.566.566-.566h2.266c.311 0 .566.254.566.566v6.5l2.997 2.18a.566.566 0 0 1 .123.793l-1.33 1.831a.57.57 0 0 1-.794.123z"/><path id="e" d="M28.278 15.235c5.193 0 9.404 4.271 9.404 9.54 0 5.27-4.21 9.541-9.404 9.541s-9.404-4.271-9.404-9.54c0-5.27 4.21-9.541 9.404-9.541zm6.018 19.492c0-.413-9.178 1.847-12.6-.65l-4.19 1.063c-2.512.638-4.275 2.927-4.275 5.554v2.209c0 1.58 1.264 2.862 2.822 2.862h15.466c-1.852-6.34 2.777-10.625 2.777-11.038zM45.5 31.794c-6.466 0-11.706 5.24-11.706 11.706 0 6.466 5.24 11.706 11.706 11.706 6.466 0 11.706-5.24 11.706-11.706 0-6.466-5.24-11.706-11.706-11.706zm2.695 16.525l-4.163-3.025a.57.57 0 0 1-.231-.458v-7.944c0-.312.255-.566.566-.566h2.266c.311 0 .566.254.566.566v6.5l2.997 2.18a.566.566 0 0 1 .123.793l-1.33 1.831a.57.57 0 0 1-.794.123z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M42.488 69H4c-2 0-4-1-4-4V41.348l20.938-22.35 14.703 11.46-4.201 5.183-1.252 7.42 6.406-7.111L46 33l9.958 15.844L42.488 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><circle cx="18" cy="16" r="10" fill="var(--o-icons-yellow-pure, #FBB130)"/><circle cx="18" cy="16" r="10" fill="url(#o_icon_hr_attendance__a)" fill-opacity=".2"/><path d="M10.216 9.721c.45-.557.96-1.065 1.518-1.515l7.479 6c.985.79 1.053 2.274.16 3.167-.892.893-2.375.825-3.164-.161l-5.993-7.49Z" fill="var(--o-icons-white, #FFFFFF)"/><circle cx="38" cy="24" r="5" fill="var(--o-icons-purple-yellow, #912C18)"/><circle cx="38" cy="24" r="5" fill="url(#o_icon_hr_attendance__b)" fill-opacity=".2"/><path d="M16 31h26a4 4 0 0 1 4 4v5a4 4 0 0 1-4 4H16V31Z" fill="var(--o-icons-purple-yellow, #912C18)"/><path d="M16 31h26a4 4 0 0 1 4 4v5a4 4 0 0 1-4 4H16V31Z" fill="url(#o_icon_hr_attendance__c)" fill-opacity=".2"/><path d="M4 31h16c7.18 0 13 5.82 13 13H17C9.82 44 4 38.18 4 31Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M4 31h16c7.18 0 13 5.82 13 13H17C9.82 44 4 38.18 4 31Z" fill="url(#o_icon_hr_attendance__d)" fill-opacity=".2"/><defs><linearGradient id="o_icon_hr_attendance__a" x1="8" y1="6" x2="31.529" y2="11.882" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_attendance__b" x1="33" y1="19" x2="44.765" y2="21.941" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_attendance__c" x1="16" y1="31" x2="44.135" y2="47.232" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_attendance__d" x1="4" y1="31" x2="31.65" y2="46.42" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/hr_attendance/static/src/client_action/greeting_message/greeting_message.xml b/addons/hr_attendance/static/src/client_action/greeting_message/greeting_message.xml
index b753e7161cd..0713fade70a 100644
--- a/addons/hr_attendance/static/src/client_action/greeting_message/greeting_message.xml
+++ b/addons/hr_attendance/static/src/client_action/greeting_message/greeting_message.xml
@@ -53,7 +53,7 @@
             </div>
             <div class="flex-grow-1">
                 <button class="o_hr_attendance_button_dismiss btn btn-primary btn-lg fs-2 px-5 py-3" t-on-click="() => this.onClickDismiss()">
-                    <i class="fa fa-chevron-left me-2"/>
+                    <i class="oi oi-chevron-left me-2"/>
                     <span class="fs-2">Go back</span>
                 </button>
             </div>
diff --git a/addons/hr_attendance/static/src/client_action/kiosk_confirm/kiosk_confirm.xml b/addons/hr_attendance/static/src/client_action/kiosk_confirm/kiosk_confirm.xml
index 0f14e86f849..13346bc156b 100644
--- a/addons/hr_attendance/static/src/client_action/kiosk_confirm/kiosk_confirm.xml
+++ b/addons/hr_attendance/static/src/client_action/kiosk_confirm/kiosk_confirm.xml
@@ -13,7 +13,7 @@
     <CardLayout>
 
         <button class="o_hr_attendance_back_button btn btn-block btn-secondary btn-lg d-block d-md-none py-5">
-            <i class="fa fa-chevron-left me-2"/> Go back
+            <i class="oi oi-chevron-left me-2"/> Go back
         </button>
 
         <t t-if="employeeId" t-call="hr_attendance.UserBadge">
@@ -22,7 +22,7 @@
         </t>
 
         <button t-on-click="() => this.onClickBack()" class="o_hr_attendance_back_button o_hr_attendance_back_button_md btn btn-secondary d-none d-md-inline-flex align-items-center position-absolute top-0 start-0 rounded-circle">
-            <i class="fa fa-2x fa-fw fa-chevron-left me-1" role="img" aria-label="Go back" title="Go back"/>
+            <i class="oi fa-2x fa-fw oi-chevron-left me-1" role="img" aria-label="Go back" title="Go back"/>
         </button>
 
         <div t-if="employeeId" class="flex-grow-1">
diff --git a/addons/hr_contract/static/description/icon.png b/addons/hr_contract/static/description/icon.png
index 3caa5db1fe8..fc8fd7c04d8 100644
Binary files a/addons/hr_contract/static/description/icon.png and b/addons/hr_contract/static/description/icon.png differ
diff --git a/addons/hr_contract/static/description/icon.svg b/addons/hr_contract/static/description/icon.svg
index 4351c5f047e..91df5ff7bea 100644
--- a/addons/hr_contract/static/description/icon.svg
+++ b/addons/hr_contract/static/description/icon.svg
@@ -1,49 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 70">
-  <defs>
-    <mask id="mask" x="0" y="0" width="70" height="70" maskUnits="userSpaceOnUse">
-      <g id="b">
-        <path id="a" d="M4,0H65c4,0,5,1,5,5V65c0,4-1,5-5,5H4c-3,0-4-1-4-5V5C0,1,1,0,4,0Z" fill="#fff" fill-rule="evenodd"/>
-      </g>
-    </mask>
-    <linearGradient id="linear-gradient" x1="-915.85" y1="568.8" x2="-916.85" y2="567.8" gradientTransform="matrix(70, 0, 0, -70, 64179.63, 39816)" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#cdc484"/>
-      <stop offset="1" stop-color="#b5aa59"/>
-    </linearGradient>
-  </defs>
-  <g mask="url(#mask)">
-    <g>
-      <path d="M0,0H70V70H0Z" fill-rule="evenodd" fill="url(#linear-gradient)"/>
-      <path d="M4,1H65c2.67,0,4.33.67,5,2V0H0V3C.67,1.67,2,1,4,1Z" fill="#fff" fill-opacity="0.38" fill-rule="evenodd"/>
-      <path d="M4,69a3.66,3.66,0,0,1-4-4V32.67L19.61,15.56,29.94,25,28,32.67c1.92-.12,12.08-.62,19-.59,4.12,0,7.17,1.52,8.27,1.64V53.56h3L58,56,51.24,69Z" fill="#393939" fill-rule="evenodd" opacity="0.32" style="isolation: isolate"/>
-      <path d="M4,69H65c2.67,0,4.33-1,5-3v4H0V66A3.92,3.92,0,0,0,4,69Z" fill-opacity="0.38" fill-rule="evenodd"/>
-      <g opacity="0.4">
-        <g>
-          <path d="M49.53,37.69H44a.75.75,0,0,1,0-1.5h5.56a.75.75,0,0,1,0,1.5Z"/>
-          <path d="M53.3,40.85H41.36a.75.75,0,0,1,0-1.5H53.3a.75.75,0,0,1,0,1.5Z"/>
-          <path d="M53.3,47.2H41.36a.75.75,0,0,1,0-1.5H53.3a.75.75,0,0,1,0,1.5Z"/>
-          <path d="M53.37,44H43.27a.75.75,0,0,1,0-1.5h10.1a.75.75,0,0,1,0,1.5Z"/>
-          <path d="M41.27,44.05a.75.75,0,0,0,0-1.5.75.75,0,0,0,0,1.5Z"/>
-          <path d="M58.8,54.43H57V36.8a3.49,3.49,0,0,0-3.35-3.62H36.26a.76.76,0,0,0-.21,0c-2.51.71-2.51,2.55-2.51,4.32v.59a.75.75,0,0,0,.22.53.76.76,0,0,0,.53.23h0l3.12,0V55.59a3.53,3.53,0,0,0,1.06,2.52A3.61,3.61,0,0,0,40,59h0a3.4,3.4,0,0,0,.84.11H56.28a.8.8,0,0,0,.26,0,3.53,3.53,0,0,0,3-3.47v-.41A.75.75,0,0,0,58.8,54.43ZM37.41,37.36H35c0-1.7.1-2.31,1.3-2.68h.08a1,1,0,0,1,.44.14,1.13,1.13,0,0,1,.55,1Zm1.5,18.23V35.8a2.63,2.63,0,0,0-.25-1.12h15a2,2,0,0,1,1.85,2.12V54.43H54.09l0-1.4a3.11,3.11,0,0,0,1-2.28,3.15,3.15,0,0,0-5.45-2.16H41.34a.75.75,0,0,0,0,1.5h7.52a2.84,2.84,0,0,0-.08.66,3,3,0,0,0,.1.73H41.34a.75.75,0,0,0,0,1.5h8.27v1.45h-7.4a.74.74,0,0,0-.54.23.73.73,0,0,0-.21.56c.09,1.56-.16,2.07-1.13,2.3a2,2,0,0,1-1.42-1.93Zm13-3.18a1.66,1.66,0,1,1,1.66-1.66A1.66,1.66,0,0,1,51.94,52.41Zm0,1.5a3.51,3.51,0,0,0,.66-.07l0,1.38-.15-.13a.74.74,0,0,0-.89,0l-.42.27V53.78A2.88,2.88,0,0,0,51.94,53.91ZM56,57.61l-13.39,0A3.9,3.9,0,0,0,43,55.93h6.63v.79a.75.75,0,0,0,.4.66.74.74,0,0,0,.77,0l1.12-.74.92.75a.78.78,0,0,0,.48.17.7.7,0,0,0,.31-.07.77.77,0,0,0,.44-.67v-.85h4A2,2,0,0,1,56,57.61Z"/>
-        </g>
-        <g>
-          <path d="M34.3,40.88a2.77,2.77,0,0,1-2.76-2.79v-.57a7.54,7.54,0,0,1,.86-4.05L29,32.63a11,11,0,0,1-12.74,0l-4.06,1a5.48,5.48,0,0,0-4.14,5.31v2.12a2.73,2.73,0,0,0,2.73,2.73H34.47a2.66,2.66,0,0,0,.94-.18V40.87Z"/>
-          <path d="M22.63,14.62h0a9.12,9.12,0,0,0,0,18.23h.19a9.12,9.12,0,0,0-.19-18.23Z"/>
-        </g>
-      </g>
-      <g>
-        <g>
-          <path d="M49.53,36.07H44a.75.75,0,0,1,0-1.5h5.56a.75.75,0,0,1,0,1.5Z" fill="#fff"/>
-          <path d="M53.3,39.23H41.36a.75.75,0,0,1,0-1.5H53.3a.75.75,0,0,1,0,1.5Z" fill="#fff"/>
-          <path d="M53.3,45.58H41.36a.75.75,0,0,1,0-1.5H53.3a.75.75,0,0,1,0,1.5Z" fill="#fff"/>
-          <path d="M53.37,42.41H43.27a.75.75,0,0,1,0-1.5h10.1a.75.75,0,1,1,0,1.5Z" fill="#fff"/>
-          <path d="M41.27,42.43a.75.75,0,0,0,0-1.5.75.75,0,0,0,0,1.5Z" fill="#fff"/>
-          <path d="M58.8,52.81H57V35.19a3.5,3.5,0,0,0-3.35-3.63H36.26a.76.76,0,0,0-.21,0c-2.51.72-2.51,2.55-2.51,4.32v.59a.79.79,0,0,0,.22.54.75.75,0,0,0,.53.22h3.12V54a3.51,3.51,0,0,0,1.06,2.52,3.42,3.42,0,0,0,1.57.88h0a3.41,3.41,0,0,0,.84.12H56.28a.82.82,0,0,0,.26-.06,3.52,3.52,0,0,0,3-3.47v-.41A.76.76,0,0,0,58.8,52.81ZM37.41,35.75H35c0-1.7.1-2.31,1.3-2.69h.08a1.1,1.1,0,0,1,.44.15,1.13,1.13,0,0,1,.55,1ZM38.91,54V34.18a2.63,2.63,0,0,0-.25-1.12h15a2,2,0,0,1,1.85,2.13V52.81H54.09l0-1.39A3.15,3.15,0,1,0,49.65,47H41.34a.75.75,0,0,0,0,1.5h7.52a3,3,0,0,0-.08.66,2.86,2.86,0,0,0,.1.73H41.34a.75.75,0,0,0,0,1.5h8.27v1.45h-7.4a.74.74,0,0,0-.54.23.73.73,0,0,0-.21.56c.09,1.56-.16,2.07-1.13,2.31A2,2,0,0,1,38.91,54Zm13-3.18a1.66,1.66,0,1,1,1.66-1.66A1.66,1.66,0,0,1,51.94,50.79Zm0,1.5a2.84,2.84,0,0,0,.66-.07l0,1.38-.15-.13a.77.77,0,0,0-.89,0l-.42.28V52.17A3.26,3.26,0,0,0,51.94,52.29ZM56,56l-13.39-.06A3.9,3.9,0,0,0,43,54.31h6.63v.79a.76.76,0,0,0,1.17.63L51.9,55l.92.75a.77.77,0,0,0,.48.16.7.7,0,0,0,.31-.07.76.76,0,0,0,.44-.66v-.86h4A2,2,0,0,1,56,56Z" fill="#fff"/>
-        </g>
-        <g>
-          <path d="M34.3,39.26a2.75,2.75,0,0,1-2.76-2.79V35.9a7.54,7.54,0,0,1,.86-4L29,31a11,11,0,0,1-12.74,0L12.2,32a5.48,5.48,0,0,0-4.14,5.31v2.12a2.73,2.73,0,0,0,2.73,2.73H34.47a2.66,2.66,0,0,0,.94-.17V39.25Z" fill="#fff"/>
-          <path d="M22.63,13h0a9.12,9.12,0,0,0,0,18.23h.19A9.12,9.12,0,0,0,22.63,13Z" fill="#fff"/>
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M34 17a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M34 17a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" fill="url(#o_icon_hr_contract__a)" fill-opacity=".2"/><path d="M12 24a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path d="M12 24a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z" fill="url(#o_icon_hr_contract__b)" fill-opacity=".2"/><path d="M46 24a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M46 24a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z" fill="url(#o_icon_hr_contract__c)" fill-opacity=".2"/><path d="M0 34a4 4 0 0 1 4-4h42a4 4 0 0 1 4 4v4a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4v-4Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M0 34a4 4 0 0 1 4-4h42a4 4 0 0 1 4 4v4a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4v-4Z" fill="url(#o_icon_hr_contract__d)" fill-opacity=".2"/><path d="M25 30H4a4 4 0 0 0-4 4v4a4 4 0 0 0 4 4h21V30Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path d="M25 30H4a4 4 0 0 0-4 4v4a4 4 0 0 0 4 4h21V30Z" fill="url(#o_icon_hr_contract__e)" fill-opacity=".2"/><path d="M12 30h14c6.627 0 12 5.373 12 12H24c-6.627 0-12-5.373-12-12Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M12 30h14c6.627 0 12 5.373 12 12H24c-6.627 0-12-5.373-12-12Z" fill="url(#o_icon_hr_contract__f)" fill-opacity=".2"/><defs><linearGradient id="o_icon_hr_contract__a" x1="16" y1="8" x2="37.176" y2="13.294" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_contract__b" x1="4" y1="20" x2="13.412" y2="22.353" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_contract__c" x1="38" y1="20" x2="47.412" y2="22.353" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_contract__d" x1="0" y1="30" x2="29.975" y2="61.224" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_contract__e" x1="0" y1="30" x2="24.582" y2="42.803" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_contract__f" x1="12" y1="30" x2="37.127" y2="43.611" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/hr_contract/views/hr_contract_views.xml b/addons/hr_contract/views/hr_contract_views.xml
index d2a98f1b2d0..8d747a93c7b 100644
--- a/addons/hr_contract/views/hr_contract_views.xml
+++ b/addons/hr_contract/views/hr_contract_views.xml
@@ -176,7 +176,7 @@
                                 </div>
                             </button>
                         </div>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <div class="oe_title pe-0 w-100 mw-100" name="title">
                             <h1 class="d-flex flex-row justify-content-between">
                                 <field name="name" class="text-truncate" placeholder="Contract Reference"/>
diff --git a/addons/hr_expense/static/description/icon.png b/addons/hr_expense/static/description/icon.png
index 5d100d06c44..ffb13766666 100644
Binary files a/addons/hr_expense/static/description/icon.png and b/addons/hr_expense/static/description/icon.png differ
diff --git a/addons/hr_expense/static/description/icon.svg b/addons/hr_expense/static/description/icon.svg
index b72a86f2356..472fab1fb88 100644
--- a/addons/hr_expense/static/description/icon.svg
+++ b/addons/hr_expense/static/description/icon.svg
@@ -1,24 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70">
-    <defs>
-        <path id="icon-a" d="M4,5.35309892e-14 C36.4160122,9.87060235e-15 58.0836068,-3.97961823e-14 65,5.07020818e-14 C69,6.733808e-14 70,1 70,5 C70,43.0488877 70,62.4235458 70,65 C70,69 69,70 65,70 C61,70 9,70 4,70 C1,70 7.10542736e-15,69 7.10542736e-15,65 C7.25721566e-15,62.4676575 3.83358709e-14,41.8005206 3.60818146e-14,5 C-1.13686838e-13,1 1,5.75716207e-14 4,5.35309892e-14 Z"/>
-        <linearGradient id="icon-c" x1="100%" x2="0%" y1="0%" y2="98.616%">
-            <stop offset="0%" stop-color="#797C79"/>
-            <stop offset="100%" stop-color="#545554"/>
-        </linearGradient>
-        <path id="icon-d" d="M29.2777778,17.2348485 C34.4714536,17.2348485 38.681713,21.506348 38.681713,26.7755682 C38.681713,32.0447884 34.4714536,36.3162879 29.2777778,36.3162879 C24.0841019,36.3162879 19.8738426,32.0447884 19.8738426,26.7755682 C19.8738426,21.506348 24.0841019,17.2348485 29.2777778,17.2348485 Z M42.7933813,37.84729 C42.7933813,41.2291455 53.1142387,40.370791 53.1141828,46.7993457 C53.1141828,49.8785938 50.8543359,52.5088721 47.1832578,53.0575293 L47.1832578,55.6054688 C47.1832578,55.9614111 46.8831254,56.25 46.5129453,56.25 L44.2785703,56.25 C43.9083902,56.25 43.6082578,55.9614111 43.6082578,55.6054688 L43.6082578,53.0156885 C41.4017008,52.6548584 39.4354508,51.6754395 38.0920887,50.4390137 C37.8475922,50.2139648 37.8167578,49.8485693 38.0193598,49.5878564 L39.7168703,47.4035937 C39.944609,47.1106006 40.3787481,47.0596289 40.6753613,47.2886523 C42.0671535,48.3632471 43.8647641,49.2161768 45.5824957,49.2161768 C47.5829875,49.2161768 48.4941098,48.0702539 48.4941098,47.005542 C48.4941098,43.8578662 38.1732523,44.5412305 38.1732523,37.9061572 C38.1732523,35.0744092 40.3334461,32.784873 43.6083137,32.0710547 L43.6083137,29.3945312 C43.6083137,29.0385889 43.9084461,28.75 44.2786262,28.75 L46.5130012,28.75 C46.8831813,28.75 47.1833137,29.0385889 47.1833137,29.3945312 L47.1833137,31.9317822 C48.979416,32.1313721 50.9263387,32.8088281 52.2826602,33.9623779 C52.5156496,34.1605176 52.5744695,34.4877783 52.4264981,34.7508545 L51.1108981,37.0899121 C50.9184625,37.4321045 50.4576227,37.5328125 50.1291695,37.3056689 C48.8809918,36.4425342 47.3510035,35.783877 45.8581059,35.783877 C43.9963688,35.783877 42.7933813,36.5938379 42.7933813,37.84729 Z M35.2962963,36.7272727 C35.2962963,36.3141183 26.1175854,38.5736818 22.6967864,36.0773525 L18.5053937,37.1404272 C15.9936026,37.7775087 14.2314815,40.0671622 14.2314815,42.6939608 L14.2314815,44.9029356 C14.2314815,46.4837136 15.4945475,47.7651515 17.052662,47.7651515 C29.017554,47.7651515 35,47.7651515 35,47.7651515 C33.1481481,41.4242424 35.2962963,37.1404272 35.2962963,36.7272727 Z"/>
-        <path id="icon-e" d="M29.2777778,15.2348485 C34.4714536,15.2348485 38.681713,19.506348 38.681713,24.7755682 C38.681713,30.0447884 34.4714536,34.3162879 29.2777778,34.3162879 C24.0841019,34.3162879 19.8738426,30.0447884 19.8738426,24.7755682 C19.8738426,19.506348 24.0841019,15.2348485 29.2777778,15.2348485 Z M42.7933813,35.84729 C42.7933813,39.2291455 53.1142387,38.370791 53.1141828,44.7993457 C53.1141828,47.8785938 50.8543359,50.5088721 47.1832578,51.0575293 L47.1832578,53.6054688 C47.1832578,53.9614111 46.8831254,54.25 46.5129453,54.25 L44.2785703,54.25 C43.9083902,54.25 43.6082578,53.9614111 43.6082578,53.6054688 L43.6082578,51.0156885 C41.4017008,50.6548584 39.4354508,49.6754395 38.0920887,48.4390137 C37.8475922,48.2139648 37.8167578,47.8485693 38.0193598,47.5878564 L39.7168703,45.4035937 C39.944609,45.1106006 40.3787481,45.0596289 40.6753613,45.2886523 C42.0671535,46.3632471 43.8647641,47.2161768 45.5824957,47.2161768 C47.5829875,47.2161768 48.4941098,46.0702539 48.4941098,45.005542 C48.4941098,41.8578662 38.1732523,42.5412305 38.1732523,35.9061572 C38.1732523,33.0744092 40.3334461,30.784873 43.6083137,30.0710547 L43.6083137,27.3945312 C43.6083137,27.0385889 43.9084461,26.75 44.2786262,26.75 L46.5130012,26.75 C46.8831813,26.75 47.1833137,27.0385889 47.1833137,27.3945312 L47.1833137,29.9317822 C48.979416,30.1313721 50.9263387,30.8088281 52.2826602,31.9623779 C52.5156496,32.1605176 52.5744695,32.4877783 52.4264981,32.7508545 L51.1108981,35.0899121 C50.9184625,35.4321045 50.4576227,35.5328125 50.1291695,35.3056689 C48.8809918,34.4425342 47.3510035,33.783877 45.8581059,33.783877 C43.9963688,33.783877 42.7933813,34.5938379 42.7933813,35.84729 Z M35.2962963,34.7272727 C35.2962963,34.3141183 26.1175854,36.5736818 22.6967864,34.0773525 L18.5053937,35.1404272 C15.9936026,35.7775087 14.2314815,38.0671622 14.2314815,40.6939608 L14.2314815,42.9029356 C14.2314815,44.4837136 15.4945475,45.7651515 17.052662,45.7651515 C29.017554,45.7651515 35,45.7651515 35,45.7651515 C33.1481481,39.4242424 35.2962963,35.1404272 35.2962963,34.7272727 Z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <mask id="icon-b" fill="#fff">
-            <use xlink:href="#icon-a"/>
-        </mask>
-        <g mask="url(#icon-b)">
-            <rect width="70" height="70" fill="url(#icon-c)"/>
-            <path fill="#FFF" fill-opacity=".383" d="M4,1.8 L65,1.8 C67.6666667,1.8 69.3333333,1.13333333 70,-0.2 C70,2.46666667 70,3.46666667 70,2.8 L1.10547097e-14,2.8 C-1.65952376e-14,3.46666667 -2.9161925e-14,2.46666667 -2.66453526e-14,-0.2 C0.666666667,1.13333333 2,1.8 4,1.8 Z" transform="matrix(1 0 0 -1 0 2.8)"/>
-            <path fill="#393939" d="M40.2790698,48 L4,48 C2,48 -7.10542736e-15,47.8556793 0,43.9590217 L2.0734159e-16,21.6246135 L20.6658658,0.0963982452 L37.783693,7.00604553 L34.121375,14.2273604 L43.799671,6.01962237 L50.8814479,14.2273604 L46.6827849,19.2273136 L52.6062041,25.9680455 L40.2790698,48 Z" opacity=".324" transform="translate(0 21)"/>
-            <path fill="#000" fill-opacity=".383" d="M4,4 L65,4 C67.6666667,4 69.3333333,3 70,1 C70,3.66666667 70,5 70,5 L1.77635684e-15,5 C1.77635684e-15,5 1.77635684e-15,3.66666667 1.77635684e-15,1 C0.666666667,3 2,4 4,4 Z" transform="translate(0 65)"/>
-            <use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#icon-d"/>
-            <use fill="#FFF" fill-rule="nonzero" xlink:href="#icon-e"/>
-        </g>
-    </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M28 16c0 5.523-4.477 10-10 10S8 21.523 8 16 12.477 6 18 6s10 4.477 10 10Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path d="M28 16c0 5.523-4.477 10-10 10S8 21.523 8 16 12.477 6 18 6s10 4.477 10 10Z" fill="url(#o_icon_hr_expense__a)" fill-opacity=".2"/><path d="M43 24a5 5 0 1 1-10 0 5 5 0 0 1 10 0Z" fill="var(--o-icons-purple-cyan, #102E7A)"/><path d="M43 24a5 5 0 1 1-10 0 5 5 0 0 1 10 0Z" fill="url(#o_icon_hr_expense__b)" fill-opacity=".3"/><path d="M16 31h26a4 4 0 0 1 4 4v5a4 4 0 0 1-4 4H20a4 4 0 0 1-4-4v-9Z" fill="var(--o-icons-purple-cyan, #102E7A)"/><path d="M16 31h26a4 4 0 0 1 4 4v5a4 4 0 0 1-4 4H20a4 4 0 0 1-4-4v-9Z" fill="url(#o_icon_hr_expense__c)" fill-opacity=".3"/><path d="M4 31h16c7.18 0 13 5.82 13 13H17C9.82 44 4 38.18 4 31Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path d="M4 31h16c7.18 0 13 5.82 13 13H17C9.82 44 4 38.18 4 31Z" fill="url(#o_icon_hr_expense__d)" fill-opacity=".2"/><path d="M17.617 22h.787v-1.138C20.558 20.73 22 19.668 22 17.905v-.014c0-1.554-.997-2.332-2.962-2.762l-.634-.132v-2.013c.69.111 1.143.493 1.24 1.139l.008.014 2.188-.007.007-.007c-.077-1.687-1.338-2.811-3.443-2.957V10h-.787v1.16c-2.05.096-3.52 1.151-3.52 2.886v.014c0 1.562 1.032 2.402 2.893 2.811l.627.132v2.054c-.816-.076-1.29-.416-1.401-1.027l-.007-.014-2.195.007-.014.007c.056 1.777 1.491 2.755 3.617 2.839V22Zm-1.185-8.127v-.014c0-.5.404-.82 1.185-.889v1.847c-.809-.216-1.185-.486-1.185-.944Zm3.234 4.282v.014c0 .534-.454.819-1.262.888v-1.88c.906.228 1.262.464 1.262.978Z" fill="var(--o-icons-white, #FFFFFF)"/><defs><linearGradient id="o_icon_hr_expense__a" x1="8" y1="6" x2="31.529" y2="11.882" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_expense__b" x1="33" y1="19" x2="44.765" y2="21.941" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_expense__c" x1="16" y1="31" x2="44.135" y2="47.232" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_expense__d" x1="4" y1="31" x2="31.65" y2="46.42" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/hr_expense/static/src/views/kanban.xml b/addons/hr_expense/static/src/views/kanban.xml
index 33fd41b0726..adafb2ddfe2 100644
--- a/addons/hr_expense/static/src/views/kanban.xml
+++ b/addons/hr_expense/static/src/views/kanban.xml
@@ -18,20 +18,14 @@
     </t>
 
     <t t-name="hr_expense.KanbanButtons" t-inherit="web.KanbanView.Buttons" t-inherit-mode="primary" owl="1">
-        <xpath expr="//t[@t-if='canCreate']" position="after">
+        <xpath expr="//div[hasclass('o_cp_buttons')]" position="inside">
+            <input type="file" name="ufile" class="d-none" t-ref="fileInput" multiple="1" accept="*" t-on-change="onChangeFileInput" />
             <button type="button" class="d-none d-md-inline o_button_upload_expense btn btn-primary mx-1" t-on-click.prevent="uploadDocument">
                 Upload
             </button>
-        </xpath>
-
-        <xpath expr="//t[@t-if='canCreate']" position="before">
             <button type="button" class="d-inline d-md-none o_button_upload_expense btn btn-primary mx-1" t-on-click.prevent="uploadDocument">
                 Scan
             </button>
         </xpath>
-
-        <xpath expr="//div" position="inside">
-            <input type="file" name="ufile" class="d-none" t-ref="fileInput" multiple="1" accept="*" t-on-change="onChangeFileInput" />
-        </xpath>
     </t>
 </templates>
diff --git a/addons/hr_expense/static/src/views/list.xml b/addons/hr_expense/static/src/views/list.xml
index f0d4a4b115f..559da464693 100644
--- a/addons/hr_expense/static/src/views/list.xml
+++ b/addons/hr_expense/static/src/views/list.xml
@@ -3,7 +3,8 @@
     <t t-name="hr_expense.ListButtons" t-inherit="web.ListView.Buttons" t-inherit-mode="primary" owl="1">
 
        <!-- hr.expense and hr.expense.sheet -->
-        <xpath expr="//button[hasclass('o_list_button_add')]" position="after">
+        <xpath expr="//div[hasclass('o_list_buttons')]" position="inside">
+            <input type="file" name="ufile" class="d-none" t-ref="fileInput" multiple="1" accept="*" t-on-change="onChangeFileInput"/>
             <button type="button" class="d-none d-md-inline o_button_upload_expense btn btn-primary mx-1" t-on-click.prevent="uploadDocument">
                 Scan
             </button>
@@ -11,32 +12,15 @@
                     t-on-click="() => this.action_show_expenses_to_submit()">
                 Create Report
             </button>
-        </xpath>
-
-        <xpath expr="//div" position="inside">
-            <input type="file" name="ufile" class="d-none" t-ref="fileInput" multiple="1" accept="*" t-on-change="onChangeFileInput"/>
-        </xpath>
-
-        <!-- hr.expense.sheet -->
-        <xpath expr="//button[hasclass('o_button_upload_expense')]" position="after">
             <button t-if="displaySubmit()" class="d-none d-md-block btn btn-secondary" t-on-click="() => this.onClick('action_submit_sheet')">
                 Submit
             </button>
-        </xpath>
-
-        <xpath expr="//button[hasclass('o_button_upload_expense')]" position="after">
             <button t-if="displayApprove()" class="d-none d-md-block btn btn-secondary" t-on-click="() => this.onClick('action_approve_expense_sheets')">
                 Approve Report
             </button>
-        </xpath>
-
-        <xpath expr="//button[hasclass('o_button_upload_expense')]" position="after">
             <button t-if="displayPost()" class="d-none d-md-block btn btn-secondary" t-on-click="() => this.onClick('action_sheet_move_create')">
                 Post Entries
             </button>
-        </xpath>
-
-        <xpath expr="//button[hasclass('o_button_upload_expense')]" position="after">
             <button t-if="displayPayment()" class="d-none d-md-block btn btn-secondary" t-on-click="() => this.onClick('action_register_payment')">
                 Register Payment
             </button>
diff --git a/addons/hr_expense/views/account_move_views.xml b/addons/hr_expense/views/account_move_views.xml
index 76bfd69e185..e96c4ecd08d 100644
--- a/addons/hr_expense/views/account_move_views.xml
+++ b/addons/hr_expense/views/account_move_views.xml
@@ -10,10 +10,13 @@
                     <field name="expense_sheet_id" invisible="1"/>
                     <button name="action_open_expense_report"
                             class="oe_stat_button"
-                            string="Expense Report"
                             icon="fa-file-text-o"
                             type="object"
-                            attrs="{'invisible': [('expense_sheet_id', '=', [])]}"/>
+                            attrs="{'invisible': [('expense_sheet_id', '=', [])]}">
+                            <div class="o_stat_info">
+                                <span class="o_stat_text">Expense Report</span>
+                            </div>
+                    </button>
                 </xpath>
             </field>
         </record>
diff --git a/addons/hr_expense/views/account_payment_views.xml b/addons/hr_expense/views/account_payment_views.xml
index 0fe6c8cd394..7247684e423 100644
--- a/addons/hr_expense/views/account_payment_views.xml
+++ b/addons/hr_expense/views/account_payment_views.xml
@@ -10,10 +10,13 @@
                     <field name="expense_sheet_id" invisible="1"/>
                     <button name="action_open_expense_report"
                             class="oe_stat_button"
-                            string="Expense Report"
                             icon="fa-file-text-o"
                             type="object"
-                            attrs="{'invisible': [('expense_sheet_id', '=', [])]}"/>
+                            attrs="{'invisible': [('expense_sheet_id', '=', [])]}">
+                            <div class="o_stat_info">
+                                <span class="o_stat_text">Expense Report</span>
+                            </div>
+                    </button>
                 </xpath>
             </field>
         </record>
diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml
index cf1e13c1ed5..348831f381a 100644
--- a/addons/hr_expense/views/hr_expense_views.xml
+++ b/addons/hr_expense/views/hr_expense_views.xml
@@ -500,7 +500,7 @@
             <field name="arch" type="xml">
                 <form string="Expense Categories">
                     <sheet>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <field name='product_variant_count' invisible='1'/>
                         <field name="id" invisible="1"/>
                         <field name="image_1920" widget="image" class="oe_avatar" options="{'image_preview': 'image_128'}"/>
@@ -727,7 +727,9 @@
                             type="object"
                             attrs="{'invisible': ['|', ('state', 'not in', ['post', 'done']), ('account_move_id', '=', False)]}"
                             groups="account.group_account_invoice">
-                            Journal Entry
+                            <div class="o_stat_info">
+                                <span class="o_stat_text">Journal Entry</span>
+                            </div>
                         </button>
                         <button name="action_open_expense_view"
                             class="oe_stat_button"
@@ -737,8 +739,8 @@
                             <field name="expense_number" widget="statinfo" string="Expenses"/>
                         </button>
                     </div>
-                    <widget name="web_ribbon" title="Paid" bg_color="bg-success" attrs="{'invisible': [('payment_state', '!=', 'paid')]}"/>
-                    <widget name="web_ribbon" title="Partial" bg_color="bg-info" attrs="{'invisible': [('payment_state', '!=', 'partial')]}"/>
+                    <widget name="web_ribbon" title="Paid" bg_color="text-bg-success" attrs="{'invisible': [('payment_state', '!=', 'paid')]}"/>
+                    <widget name="web_ribbon" title="Partial" bg_color="text-bg-info" attrs="{'invisible': [('payment_state', '!=', 'partial')]}"/>
                     <widget name="web_ribbon" title="In Payment" attrs="{'invisible': [('payment_state', '!=', 'in_payment')]}"/>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
diff --git a/addons/hr_expense/views/res_config_settings_views.xml b/addons/hr_expense/views/res_config_settings_views.xml
index 8c4e98885e2..7bb31a05fee 100644
--- a/addons/hr_expense/views/res_config_settings_views.xml
+++ b/addons/hr_expense/views/res_config_settings_views.xml
@@ -22,7 +22,7 @@
                                 </div>
                                 <div class="content-group" attrs="{'invisible': ['|', ('hr_expense_use_mailgateway', '=',  False), ('alias_domain', 'not in', ['localhost', '', False])]}">
                                     <div class="mt16">
-                                        <button type="action" name="base_setup.action_general_configuration" icon="fa-arrow-right" string="Setup your domain alias" class="btn-link"/>
+                                        <button type="action" name="base_setup.action_general_configuration" icon="oi-arrow-right" string="Setup your domain alias" class="btn-link"/>
                                     </div>
                                 </div>
                             </setting>
diff --git a/addons/hr_fleet/static/src/views/hr_fleet_kanban/hr_fleet_kanban_controller.xml b/addons/hr_fleet/static/src/views/hr_fleet_kanban/hr_fleet_kanban_controller.xml
index 6e0872fba22..ea1285f857b 100644
--- a/addons/hr_fleet/static/src/views/hr_fleet_kanban/hr_fleet_kanban_controller.xml
+++ b/addons/hr_fleet/static/src/views/hr_fleet_kanban/hr_fleet_kanban_controller.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates>
     <t t-name="hr_fleet.HrFleetKanbanController.Buttons" t-inherit="web.KanbanView.Buttons" t-inherit-mode="primary" owl="1">
-        <xpath expr="//button[hasclass('o-kanban-button-new')]" position="replace">
+        <xpath expr="//div[hasclass('o_cp_buttons')]" position="inside">
             <input type="file" multiple="true" t-ref="uploadFileInput" class="o_input_file o_hidden" t-on-change.stop="onInputChange"/>
             <button type="button" t-att-class="'d-none d-md-block btn' + (!env.isSmall ? ' btn-primary' : 'btn-secondary')" t-on-click="() => this.uploadFileInput.el.click()">
                 Upload
diff --git a/addons/hr_holidays/static/description/icon.png b/addons/hr_holidays/static/description/icon.png
index 7b2f835ef89..2a3dd0026d4 100644
Binary files a/addons/hr_holidays/static/description/icon.png and b/addons/hr_holidays/static/description/icon.png differ
diff --git a/addons/hr_holidays/static/description/icon.svg b/addons/hr_holidays/static/description/icon.svg
index 0395af2abed..9250c4f3781 100644
--- a/addons/hr_holidays/static/description/icon.svg
+++ b/addons/hr_holidays/static/description/icon.svg
@@ -1,24 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70">
-    <defs>
-        <path id="icon-a" d="M4,5.35309892e-14 C36.4160122,9.87060235e-15 58.0836068,-3.97961823e-14 65,5.07020818e-14 C69,6.733808e-14 70,1 70,5 C70,43.0488877 70,62.4235458 70,65 C70,69 69,70 65,70 C61,70 9,70 4,70 C1,70 7.10542736e-15,69 7.10542736e-15,65 C7.25721566e-15,62.4676575 3.83358709e-14,41.8005206 3.60818146e-14,5 C-1.13686838e-13,1 1,5.75716207e-14 4,5.35309892e-14 Z"/>
-        <linearGradient id="icon-c" x1="100%" x2="0%" y1="0%" y2="100%">
-            <stop offset="0%" stop-color="#CDC484"/>
-            <stop offset="100%" stop-color="#B5AA59"/>
-        </linearGradient>
-        <path id="icon-d" d="M27.2777778,16.2348485 C32.4714536,16.2348485 36.681713,20.506348 36.681713,25.7755682 C36.681713,31.0447884 32.4714536,35.3162879 27.2777778,35.3162879 C22.0841019,35.3162879 17.8738426,31.0447884 17.8738426,25.7755682 C17.8738426,20.506348 22.0841019,16.2348485 27.2777778,16.2348485 Z M32,36 C32,35.5868456 24.1175854,37.5736818 20.6967864,35.0773525 L16.5053937,36.1404272 C13.9936026,36.7775087 12.2314815,39.0671622 12.2314815,41.6939608 L12.2314815,43.9029356 C12.2314815,45.4837136 13.4945475,46.7651515 15.052662,46.7651515 C25.363233,46.7651515 30.5185185,46.7651515 30.5185185,46.7651515 C28.6666667,40.4242424 32,36.4131544 32,36 Z M48.5116455,29.4292211 L49.8821338,32.7804044 C50.108418,33.3336802 50.7775488,33.5511019 51.2858154,33.2365172 L54.3643115,31.3309087 C55.1962939,30.8159288 56.2338818,31.569761 56.0011523,32.5201752 L55.140166,36.0368953 C54.9979932,36.61751 55.4115674,37.186738 56.0077051,37.230942 L59.6183691,37.4987982 C60.5941357,37.5712005 60.9904688,38.790921 60.2436182,39.4230444 L57.4800293,41.7619923 C57.0237549,42.1481736 57.0237549,42.8517324 57.4800293,43.2379137 L60.2436719,45.5769153 C60.9905762,46.2090387 60.5942432,47.4287592 59.6184229,47.5011615 L56.0077588,47.7690177 C55.4116211,47.8132217 54.9980469,48.3824497 55.1402197,48.9630644 L56.0012061,52.4797846 C56.2338818,53.4301987 55.1962939,54.1840309 54.3643652,53.669051 L51.2858691,51.7634425 C50.7776025,51.4488041 50.108418,51.6662258 49.8821875,52.2195553 L48.5116992,55.5707386 C48.1413086,56.4764115 46.8587988,56.4764115 46.4884082,55.5707386 L45.1179199,52.2195553 C44.8916357,51.6662795 44.2225049,51.4488578 43.7142383,51.7634425 L40.6356885,53.669051 C39.8037061,54.1840309 38.7661182,53.4301987 38.9988477,52.4797846 L39.859834,48.9630644 C40.0020068,48.3824497 39.5884326,47.8132217 38.9922949,47.7690177 L35.3816309,47.5011615 C34.4058643,47.4287592 34.0095313,46.2090387 34.7563818,45.5769153 L37.5199707,43.2379674 C37.9762451,42.8517862 37.9762451,42.1482273 37.5199707,41.762046 L34.7563281,39.4230444 C34.0094238,38.790921 34.4057568,37.5712005 35.3815771,37.4987982 L38.9922412,37.230942 C39.5883789,37.186738 40.0019531,36.61751 39.8597803,36.0368953 L38.9987939,32.5201752 C38.7661182,31.569761 39.8037061,30.8159288 40.6356348,31.3309087 L43.7141846,33.2365172 C44.2224512,33.5511556 44.891582,33.3337339 45.1178662,32.7804044 L46.4883545,29.4292211 C46.8587451,28.5236019 48.1412549,28.5236019 48.5116455,29.4292211 Z M54.8046875,42.4999799 C54.8046875,38.4721469 51.5277832,35.1952995 47.5,35.1952995 C43.4721631,35.1952995 40.1953125,38.4721469 40.1953125,42.4999799 C40.1953125,46.5278128 43.4721631,49.8046602 47.5,49.8046602 C51.5277832,49.8046602 54.8046875,46.5278128 54.8046875,42.4999799 Z M53.0859375,42.4999799 C53.0859375,45.5800843 50.5801074,48.0859119 47.5,48.0859119 C44.4198926,48.0859119 41.9140625,45.5800843 41.9140625,42.4999799 C41.9140625,39.4198754 44.4198926,36.9140478 47.5,36.9140478 C50.5801074,36.9140478 53.0859375,39.4198754 53.0859375,42.4999799 Z"/>
-        <path id="icon-e" d="M27.2777778,14.2348485 C32.4714536,14.2348485 36.681713,18.506348 36.681713,23.7755682 C36.681713,29.0447884 32.4714536,33.3162879 27.2777778,33.3162879 C22.0841019,33.3162879 17.8738426,29.0447884 17.8738426,23.7755682 C17.8738426,18.506348 22.0841019,14.2348485 27.2777778,14.2348485 Z M32,34 C32,33.5868456 24.1175854,35.5736818 20.6967864,33.0773525 L16.5053937,34.1404272 C13.9936026,34.7775087 12.2314815,37.0671622 12.2314815,39.6939608 L12.2314815,41.9029356 C12.2314815,43.4837136 13.4945475,44.7651515 15.052662,44.7651515 C25.363233,44.7651515 30.5185185,44.7651515 30.5185185,44.7651515 C28.6666667,38.4242424 32,34.4131544 32,34 Z M48.5116455,27.4292211 L49.8821338,30.7804044 C50.108418,31.3336802 50.7775488,31.5511019 51.2858154,31.2365172 L54.3643115,29.3309087 C55.1962939,28.8159288 56.2338818,29.569761 56.0011523,30.5201752 L55.140166,34.0368953 C54.9979932,34.61751 55.4115674,35.186738 56.0077051,35.230942 L59.6183691,35.4987982 C60.5941357,35.5712005 60.9904688,36.790921 60.2436182,37.4230444 L57.4800293,39.7619923 C57.0237549,40.1481736 57.0237549,40.8517324 57.4800293,41.2379137 L60.2436719,43.5769153 C60.9905762,44.2090387 60.5942432,45.4287592 59.6184229,45.5011615 L56.0077588,45.7690177 C55.4116211,45.8132217 54.9980469,46.3824497 55.1402197,46.9630644 L56.0012061,50.4797846 C56.2338818,51.4301987 55.1962939,52.1840309 54.3643652,51.669051 L51.2858691,49.7634425 C50.7776025,49.4488041 50.108418,49.6662258 49.8821875,50.2195553 L48.5116992,53.5707386 C48.1413086,54.4764115 46.8587988,54.4764115 46.4884082,53.5707386 L45.1179199,50.2195553 C44.8916357,49.6662795 44.2225049,49.4488578 43.7142383,49.7634425 L40.6356885,51.669051 C39.8037061,52.1840309 38.7661182,51.4301987 38.9988477,50.4797846 L39.859834,46.9630644 C40.0020068,46.3824497 39.5884326,45.8132217 38.9922949,45.7690177 L35.3816309,45.5011615 C34.4058643,45.4287592 34.0095313,44.2090387 34.7563818,43.5769153 L37.5199707,41.2379674 C37.9762451,40.8517862 37.9762451,40.1482273 37.5199707,39.762046 L34.7563281,37.4230444 C34.0094238,36.790921 34.4057568,35.5712005 35.3815771,35.4987982 L38.9922412,35.230942 C39.5883789,35.186738 40.0019531,34.61751 39.8597803,34.0368953 L38.9987939,30.5201752 C38.7661182,29.569761 39.8037061,28.8159288 40.6356348,29.3309087 L43.7141846,31.2365172 C44.2224512,31.5511556 44.891582,31.3337339 45.1178662,30.7804044 L46.4883545,27.4292211 C46.8587451,26.5236019 48.1412549,26.5236019 48.5116455,27.4292211 Z M54.8046875,40.4999799 C54.8046875,36.4721469 51.5277832,33.1952995 47.5,33.1952995 C43.4721631,33.1952995 40.1953125,36.4721469 40.1953125,40.4999799 C40.1953125,44.5278128 43.4721631,47.8046602 47.5,47.8046602 C51.5277832,47.8046602 54.8046875,44.5278128 54.8046875,40.4999799 Z M53.0859375,40.4999799 C53.0859375,43.5800843 50.5801074,46.0859119 47.5,46.0859119 C44.4198926,46.0859119 41.9140625,43.5800843 41.9140625,40.4999799 C41.9140625,37.4198754 44.4198926,34.9140478 47.5,34.9140478 C50.5801074,34.9140478 53.0859375,37.4198754 53.0859375,40.4999799 Z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <mask id="icon-b" fill="#fff">
-            <use xlink:href="#icon-a"/>
-        </mask>
-        <g mask="url(#icon-b)">
-            <rect width="70" height="70" fill="url(#icon-c)"/>
-            <path fill="#FFF" fill-opacity=".383" d="M4,1.8 L65,1.8 C67.6666667,1.8 69.3333333,1.13333333 70,-0.2 C70,2.46666667 70,3.46666667 70,2.8 L1.10547097e-14,2.8 C-1.65952376e-14,3.46666667 -2.9161925e-14,2.46666667 -2.66453526e-14,-0.2 C0.666666667,1.13333333 2,1.8 4,1.8 Z" transform="matrix(1 0 0 -1 0 2.8)"/>
-            <path fill="#393939" d="M43.6444444,52 L4,52 C2,52 -7.10542736e-15,51.8514286 0,47.84 L2.21121142e-16,23.3197384 L20,0 L36,9.36 L30.6694253,16.3853185 L31.9690606,16.0436983 L28.4526012,19.3069352 L28.4526012,24.5134324 L39.2011791,11.8378465 L42.1902641,14.2434656 L46.8367307,9.36 L51,14.56 L60.3723121,27.0292074 L43.6444444,52 Z" opacity=".324" transform="translate(0 18)"/>
-            <path fill="#000" fill-opacity=".383" d="M4,4 L65,4 C67.6666667,4 69.3333333,3 70,1 C70,3.66666667 70,5 70,5 L1.77635684e-15,5 C1.77635684e-15,5 1.77635684e-15,3.66666667 1.77635684e-15,1 C0.666666667,3 2,4 4,4 Z" transform="translate(0 65)"/>
-            <use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#icon-d"/>
-            <use fill="#FFF" fill-rule="nonzero" xlink:href="#icon-e"/>
-        </g>
-    </g>
-</svg>
+<svg width="51" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M9.096 43.956a25.15 25.15 0 0 1-1.58-1.482c-.726-.743-.67-1.924.065-2.66l25.95-25.95 1.415 1.414a2 2 0 0 1 0 2.829l-25.85 25.85Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M9.096 43.956a25.15 25.15 0 0 1-1.58-1.482c-.726-.743-.67-1.924.065-2.66l25.95-25.95 1.415 1.414a2 2 0 0 1 0 2.829l-25.85 25.85Z" fill="url(#o_icon_hr_holidays__a)" fill-opacity=".2"/><path d="M15.848 15.808 7.362 7.322A25 25 0 0 1 30.947.708l-15.1 15.1Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M15.848 15.808 7.362 7.322A25 25 0 0 1 30.947.708l-15.1 15.1Z" fill="url(#o_icon_hr_holidays__b)" fill-opacity=".2"/><path d="m15.848 15.808 15.1-15.1a25 25 0 0 1 11.77 6.614L25.04 25l-9.192-9.192Z" fill="var(--o-icons-yellow-yellow, #F77B09)"/><path d="m15.848 15.808 15.1-15.1a25 25 0 0 1 11.77 6.614L25.04 25l-9.192-9.192Z" fill="url(#o_icon_hr_holidays__c)" fill-opacity=".2"/><path d="M33.525 33.485 25.04 25 42.718 7.322a24.998 24.998 0 0 1 6.315 10.655L33.525 33.485Z" fill="var(--o-icons-cyan-cyan, #0382F3)"/><path d="M33.525 33.485 25.04 25 42.718 7.322a24.998 24.998 0 0 1 6.315 10.655L33.525 33.485Z" fill="url(#o_icon_hr_holidays__d)" fill-opacity=".2"/><path d="m33.525 33.486 15.508-15.508a24.994 24.994 0 0 1-4.959 23.23c-.716.842-1.99.837-2.77.056l-7.779-7.778Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path d="m33.525 33.486 15.508-15.508a24.994 24.994 0 0 1-4.959 23.23c-.716.842-1.99.837-2.77.056l-7.779-7.778Z" fill="url(#o_icon_hr_holidays__e)" fill-opacity=".2"/><defs><linearGradient id="o_icon_hr_holidays__a" x1="7" y1="13.864" x2="40.767" y2="21.868" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_holidays__b" x1="7.362" y1="0" x2="33.243" y2="9.653" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_holidays__c" x1="15.848" y1=".708" x2="47.049" y2="9.336" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_holidays__d" x1="25.04" y1="7.322" x2="53.534" y2="13.855" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_holidays__e" x1="33.525" y1="17.977" x2="53.569" y2="21.445" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
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 bae22b2da9f..95d9be897fa 100644
--- a/addons/hr_holidays/static/src/dashboard/time_off_card.scss
+++ b/addons/hr_holidays/static/src/dashboard/time_off_card.scss
@@ -43,12 +43,6 @@
     }
 }
 
-.o_timeoff_card_mobile {
-    .o_timeoff_green {
-        color: $o-enterprise-primary-color;
-    }
-}
-
 .o_timeoff_popover {
     background-color: $o-view-background-color;
     font-size: 12px;
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 9fddd067ba3..d7c419680d3 100644
--- a/addons/hr_holidays/static/src/dashboard/time_off_card.xml
+++ b/addons/hr_holidays/static/src/dashboard/time_off_card.xml
@@ -46,10 +46,10 @@
 
         <span class="float-end o_timeoff_card_mobile">
             <t t-if="props.requires_allocation" name="duration_type">
-                <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>
+                <strong t-esc="duration" class="o_timeoff_green text-success"/> / <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 text-success">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="text-odoo">Taken</span>
+                <strong t-esc="duration"/> <t t-if="data.request_unit == 'hour'">Hours</t><t t-else="">Days</t> <span class="text-primary">Taken</span>
             </t>
         </span>
     </t>
diff --git a/addons/hr_holidays/static/src/scss/accrual_plan_level.scss b/addons/hr_holidays/static/src/scss/accrual_plan_level.scss
index becd4e5ae7e..5dc0d22b1cd 100644
--- a/addons/hr_holidays/static/src/scss/accrual_plan_level.scss
+++ b/addons/hr_holidays/static/src/scss/accrual_plan_level.scss
@@ -64,7 +64,7 @@ $o-hr-holidays-border-color: map-get($grays, '300');
                     width: 90px;
                     padding: 3px 0px;
                     border-radius: 3px;
-                    background-color: $o-btn-secondary-bg;
+                    background-color: $o-gray-200;
                     box-shadow: 0 1px 2px rgba(0,0,0,.1);
                 }
 
@@ -75,7 +75,7 @@ $o-hr-holidays-border-color: map-get($grays, '300');
                     margin-right: 2px;
                     width: 500px;
                     border-radius: 3px;
-                    background-color: $o-btn-secondary-bg;
+                    background-color: $o-gray-200;
                     box-shadow: 0 1px 2px rgba(0,0,0,.1);
 
                     // Triangle
@@ -85,7 +85,7 @@ $o-hr-holidays-border-color: map-get($grays, '300');
                         margin-left: 10px;
                         width: 14px;
                         height: 14px;
-                        background-color: $o-btn-secondary-bg;
+                        background-color: $o-gray-200;
                         border-bottom: 1px solid $o-hr-holidays-border-color;
                         transform: rotate(45deg);
                     }
@@ -98,12 +98,12 @@ $o-hr-holidays-border-color: map-get($grays, '300');
                         height: 12px;
                         border: 2px solid $o-brand-primary;
                         border-radius: 10px;
-                        background: $o-btn-secondary-bg;
+                        background: $o-gray-200;
                     }
 
                     .content {
                         position: relative;
-                        background-color: $o-btn-secondary-bg;
+                        background-color: $o-gray-200;
                         padding: 5px 7px;
                         font-size: 14px;
                     }
diff --git a/addons/hr_holidays/static/src/scss/time_off.scss b/addons/hr_holidays/static/src/scss/time_off.scss
index 7b656207d5e..1f0504b07f1 100644
--- a/addons/hr_holidays/static/src/scss/time_off.scss
+++ b/addons/hr_holidays/static/src/scss/time_off.scss
@@ -1,14 +1,8 @@
 .o_hr_leave_form {
     .o_form_sheet {
-        padding: 0!important;
         overflow: hidden;
-        .ribbon-top-right {
-            top: 16px;
-            right: -8px;
-        }
     }
     .o_hr_leave_content {
-        margin: 0;
         .o_group {
             margin: 0;
         }
diff --git a/addons/hr_holidays/static/src/tours/hr_holidays_tour.js b/addons/hr_holidays/static/src/tours/hr_holidays_tour.js
index 0e25e70c81a..529e42e9d87 100644
--- a/addons/hr_holidays/static/src/tours/hr_holidays_tour.js
+++ b/addons/hr_holidays/static/src/tours/hr_holidays_tour.js
@@ -82,10 +82,5 @@ registry.category("web_tour.tours").add('hr_holidays_tour', {
         trigger: 'button[name="action_approve"]',
         content: _t("Let's approve it"),
         position: 'bottom'
-    },
-    {
-        trigger: 'a[data-menu-xmlid="hr_holidays.menu_hr_holidays_root"]',
-        content: _t("State is now confirmed. We can go back to the calendar"),
-        position: 'bottom'
     }
 ]});
diff --git a/addons/hr_holidays/static/src/views/calendar/calendar_controller.js b/addons/hr_holidays/static/src/views/calendar/calendar_controller.js
index 40030311ec3..2ab051f7354 100644
--- a/addons/hr_holidays/static/src/views/calendar/calendar_controller.js
+++ b/addons/hr_holidays/static/src/views/calendar/calendar_controller.js
@@ -3,6 +3,7 @@
 import { ConfirmationDialog } from "@web/core/confirmation_dialog/confirmation_dialog";
 import { CalendarController } from '@web/views/calendar/calendar_controller';
 import { FormViewDialog } from '@web/views/view_dialogs/form_view_dialog';
+import { Dropdown, DropdownItem } from "@web/core/dropdown/dropdown";
 
 import { serializeDate } from "@web/core/l10n/dates";
 
@@ -111,8 +112,10 @@ export class TimeOffCalendarController extends CalendarController {
         });
     }
 }
-TimeOffCalendarController.template = "hr_holidays.CalendarController";
 TimeOffCalendarController.components = {
     ...TimeOffCalendarController.components,
+    Dropdown,
+    DropdownItem,
     FilterPanel: TimeOffCalendarFilterPanel,
 }
+TimeOffCalendarController.template = "hr_holidays.CalendarController"
\ No newline at end of file
diff --git a/addons/hr_holidays/static/src/views/calendar/calendar_controller.xml b/addons/hr_holidays/static/src/views/calendar/calendar_controller.xml
index 5a3db4ea95c..307458f8b4e 100644
--- a/addons/hr_holidays/static/src/views/calendar/calendar_controller.xml
+++ b/addons/hr_holidays/static/src/views/calendar/calendar_controller.xml
@@ -2,20 +2,22 @@
 <templates xml:space="preserve">
 
     <t t-name="hr_holidays.CalendarController" t-inherit="web.CalendarController" t-inherit-mode="primary" owl="1">
-        <xpath expr="//DatePicker" position="replace"/>
-    </t>
-
-    <t t-name="hr_holidays.CalendarController.controlButtons" t-inherit="web.CalendarController.controlButtons" t-inherit-mode="primary" owl="1">
-        <xpath expr="//ViewScaleSelector" position="after">
-            <span class="o_timeoff_buttons">
-                <button class="btn btn-primary btn-time-off mx-1" t-on-click="newTimeOffRequest" type="button">
-                    New Time Off
-                </button>
-                <button class="btn btn-secondary" t-on-click="newAllocationRequest" type="button">
-                    <t t-if="employeeId">New</t> Allocation Request
-                </button>
-            </span>
+        <xpath expr="//Layout" position="inside">
+            <t t-set-slot="control-panel-create-button">
+                <span class="o_timeoff_buttons btn-group">
+                    <div class="btn-group">
+                        <button class="btn btn-primary btn-time-off " t-on-click="newTimeOffRequest" type="button">
+                            New
+                        </button>
+                        <Dropdown togglerClass="'btn btn-primary'" showCaret="true" class="'btn-group'">
+                                <button class="btn btn-link" t-on-click="newAllocationRequest" type="button">
+                                    New Allocation Request
+                                </button>
+                        </Dropdown>
+                    </div>
+                </span>
+            </t>
         </xpath>
     </t>
 
-</templates>
+</templates>
\ No newline at end of file
diff --git a/addons/hr_holidays/static/src/views/calendar/calendar_view.js b/addons/hr_holidays/static/src/views/calendar/calendar_view.js
index 6439c10280a..f85bdfbcc5a 100644
--- a/addons/hr_holidays/static/src/views/calendar/calendar_view.js
+++ b/addons/hr_holidays/static/src/views/calendar/calendar_view.js
@@ -14,8 +14,6 @@ const TimeOffCalendarView = {
     Controller: TimeOffCalendarController,
     Renderer: TimeOffCalendarRenderer,
     Model: TimeOffCalendarModel,
-
-    buttonTemplate: "hr_holidays.CalendarController.controlButtons",
 }
 
 registry.category('views').add('time_off_calendar', TimeOffCalendarView);
diff --git a/addons/hr_holidays/views/hr_leave_type_views.xml b/addons/hr_holidays/views/hr_leave_type_views.xml
index a2afaa3f5e0..9cffedafb86 100644
--- a/addons/hr_holidays/views/hr_leave_type_views.xml
+++ b/addons/hr_holidays/views/hr_leave_type_views.xml
@@ -55,7 +55,7 @@
                             </div>
                         </button>
                     </div>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="oe_title">
                         <h1><field name="name"/></h1>
                     </div>
diff --git a/addons/hr_holidays/views/hr_leave_views.xml b/addons/hr_holidays/views/hr_leave_views.xml
index 5653d011b60..a1e1cc6c4ff 100644
--- a/addons/hr_holidays/views/hr_leave_views.xml
+++ b/addons/hr_holidays/views/hr_leave_views.xml
@@ -225,7 +225,7 @@
                 <field name="state" widget="statusbar" statusbar_visible="confirm,validate" attrs="{'invisible': [('active', '=', False)]}"/>
             </header>
             <sheet>
-                <widget name="web_ribbon" title="Canceled" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                <widget name="web_ribbon" title="Canceled" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                 <div class="alert alert-info" role="alert" attrs="{'invisible': ['|', ('request_unit_hours', '=', False), '|', ('tz_mismatch', '=', False), ('holiday_type', '=', 'category')]}">
                     <span attrs="{'invisible': [('holiday_type', '!=', 'employee')]}">
                         The employee has a different timezone than yours! Here dates and times are displayed in the employee's timezone
@@ -241,7 +241,7 @@
                 <field name="tz_mismatch" invisible="1"/>
                 <field name="holiday_type" invisible="1"/>
                 <field name="leave_type_request_unit" invisible="1"/>
-                <div class="o_hr_leave_content row">
+                <div class="o_hr_leave_content row my-n4 me-n4">
                     <div class="o_hr_leave_column col_left col-md-6 col-12">
                         <div name="title" class="o_hr_leave_title" invisible="1">
                             <field name="employee_id" readonly="1" force_save="1" invisible="1"/>
diff --git a/addons/hr_recruitment/static/description/icon.png b/addons/hr_recruitment/static/description/icon.png
index 4016779e05e..83e05f914fa 100644
Binary files a/addons/hr_recruitment/static/description/icon.png and b/addons/hr_recruitment/static/description/icon.png differ
diff --git a/addons/hr_recruitment/static/description/icon.svg b/addons/hr_recruitment/static/description/icon.svg
index d0352cc9fe9..cf877ef57b9 100644
--- a/addons/hr_recruitment/static/description/icon.svg
+++ b/addons/hr_recruitment/static/description/icon.svg
@@ -1,25 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70">
-    <defs>
-        <path id="icon-a" d="M4,5.35309892e-14 C36.4160122,9.87060235e-15 58.0836068,-3.97961823e-14 65,5.07020818e-14 C69,6.733808e-14 70,1 70,5 C70,43.0488877 70,62.4235458 70,65 C70,69 69,70 65,70 C61,70 9,70 4,70 C1,70 7.10542736e-15,69 7.10542736e-15,65 C7.25721566e-15,62.4676575 3.83358709e-14,41.8005206 3.60818146e-14,5 C-1.13686838e-13,1 1,5.75716207e-14 4,5.35309892e-14 Z"/>
-        <linearGradient id="icon-c" x1="98.162%" x2="0%" y1="1.838%" y2="100%">
-            <stop offset="0%" stop-color="#797DA5"/>
-            <stop offset="50.799%" stop-color="#6D7194"/>
-            <stop offset="100%" stop-color="#626584"/>
-        </linearGradient>
-        <path id="icon-d" d="M21.2876355,40.2488327 C21.644877,38.8191569 22.7635563,37.6632882 24.2438835,37.2932064 L27.2616862,36.5387663 C29.7246615,38.3103548 33.5677441,38.8192676 36.7383138,36.5387663 L39.7561165,37.2932064 C41.5646061,37.7453288 42.8333333,39.3702441 42.8333333,41.2344238 L42.8333333,41.2959901 C45.2976729,38.7278585 46.8104101,35.2404382 46.8104101,31.39867 C46.8104101,23.4931273 40.4116554,17.1061635 32.5165079,17.1061635 C24.6101932,17.1061635 18.2226057,23.5042934 18.2226057,31.39867 C18.2226057,34.7434734 19.3680481,37.8164357 21.2876355,40.2488327 Z M57.5996449,51.3156444 C58.3876447,52.1120396 58.3876447,53.3998274 57.5911718,54.1962225 L55.1932801,56.5938801 C54.4052803,57.3902752 53.1173667,57.3902752 52.3208938,56.5938801 L43.8731973,48.1470086 C43.4919071,47.7657556 43.2800792,47.248946 43.2800792,46.7067195 L43.2800792,45.3257365 C40.2890694,47.6640881 36.5270059,49.0535434 32.434491,49.0535434 C22.6988809,49.0535434 14.8104101,41.1658429 14.8104101,31.4311835 C14.8104101,21.6965241 22.6988809,13.8088235 32.434491,13.8088235 C42.1701011,13.8088235 50.0585719,21.6965241 50.0585719,31.4311835 C50.0585719,35.5232988 48.6689809,39.2849949 46.3304009,42.2757127 L47.7115188,42.2757127 C48.2537982,42.2757127 48.7706583,42.4875199 49.1519485,42.8687729 L57.5996449,51.3156444 Z M32,23.1666667 C35.7394466,23.1666667 38.7708333,26.1980534 38.7708333,29.9375 C38.7708333,33.6769466 35.7394466,36.7083333 32,36.7083333 C28.2605534,36.7083333 25.2291667,33.6769466 25.2291667,29.9375 C25.2291667,26.1980534 28.2605534,23.1666667 32,23.1666667 Z"/>
-        <path id="icon-e" d="M21.2876355,38.2488327 C21.644877,36.8191569 22.7635563,35.6632882 24.2438835,35.2932064 L27.2616862,34.5387663 C29.7246615,36.3103548 33.5677441,36.8192676 36.7383138,34.5387663 L39.7561165,35.2932064 C41.5646061,35.7453288 42.8333333,37.3702441 42.8333333,39.2344238 L42.8333333,39.2959901 C45.2976729,36.7278585 46.8104101,33.2404382 46.8104101,29.39867 C46.8104101,21.4931273 40.4116554,15.1061635 32.5165079,15.1061635 C24.6101932,15.1061635 18.2226057,21.5042934 18.2226057,29.39867 C18.2226057,32.7434734 19.3680481,35.8164357 21.2876355,38.2488327 Z M57.5996449,49.3156444 C58.3876447,50.1120396 58.3876447,51.3998274 57.5911718,52.1962225 L55.1932801,54.5938801 C54.4052803,55.3902752 53.1173667,55.3902752 52.3208938,54.5938801 L43.8731973,46.1470086 C43.4919071,45.7657556 43.2800792,45.248946 43.2800792,44.7067195 L43.2800792,43.3257365 C40.2890694,45.6640881 36.5270059,47.0535434 32.434491,47.0535434 C22.6988809,47.0535434 14.8104101,39.1658429 14.8104101,29.4311835 C14.8104101,19.6965241 22.6988809,11.8088235 32.434491,11.8088235 C42.1701011,11.8088235 50.0585719,19.6965241 50.0585719,29.4311835 C50.0585719,33.5232988 48.6689809,37.2849949 46.3304009,40.2757127 L47.7115188,40.2757127 C48.2537982,40.2757127 48.7706583,40.4875199 49.1519485,40.8687729 L57.5996449,49.3156444 Z M32,21.1666667 C35.7394466,21.1666667 38.7708333,24.1980534 38.7708333,27.9375 C38.7708333,31.6769466 35.7394466,34.7083333 32,34.7083333 C28.2605534,34.7083333 25.2291667,31.6769466 25.2291667,27.9375 C25.2291667,24.1980534 28.2605534,21.1666667 32,21.1666667 Z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <mask id="icon-b" fill="#fff">
-            <use xlink:href="#icon-a"/>
-        </mask>
-        <g mask="url(#icon-b)">
-            <rect width="70" height="70" fill="url(#icon-c)"/>
-            <path fill="#FFF" fill-opacity=".383" d="M4,1.8 L65,1.8 C67.6666667,1.8 69.3333333,1.13333333 70,-0.2 C70,2.46666667 70,3.46666667 70,2.8 L1.10547097e-14,2.8 C-1.65952376e-14,3.46666667 -2.9161925e-14,2.46666667 -2.66453526e-14,-0.2 C0.666666667,1.13333333 2,1.8 4,1.8 Z" transform="matrix(1 0 0 -1 0 2.8)"/>
-            <path fill="#393939" d="M44.7894737,57 L4,57 C2,57 -7.10542736e-15,56.8519481 0,52.8545455 L2.23548517e-16,28.151787 L18.9764771,5.20700378 L30.93373,0.994855357 L42.9934954,4.14545455 L48.0359957,15.0446694 L44.7894737,26.8973595 L57.8747796,38.6825776 L44.7894737,57 Z" opacity=".324" transform="translate(0 13)"/>
-            <path fill="#000" fill-opacity=".383" d="M4,4 L65,4 C67.6666667,4 69.3333333,3 70,1 C70,3.66666667 70,5 70,5 L1.77635684e-15,5 C1.77635684e-15,5 1.77635684e-15,3.66666667 1.77635684e-15,1 C0.666666667,3 2,4 4,4 Z" transform="translate(0 65)"/>
-            <use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#icon-d"/>
-            <use fill="#FFF" fill-rule="nonzero" xlink:href="#icon-e"/>
-        </g>
-    </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M32 25a7 7 0 1 1-14 0 7 7 0 0 1 14 0Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M32 25a7 7 0 1 1-14 0 7 7 0 0 1 14 0Z" fill="url(#o_icon_hr_recruitment__a)" fill-opacity=".2"/><path d="M25 46C13.402 46 4 36.598 4 25S13.402 4 25 4s21 9.402 21 21c0 5.799-2.35 11.049-6.15 14.85l-6.365-6.365A11.964 11.964 0 0 0 37 25c0-6.627-5.373-12-12-12s-12 5.373-12 12 5.373 12 12 12v9Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path d="M25 46C13.402 46 4 36.598 4 25S13.402 4 25 4s21 9.402 21 21c0 5.799-2.35 11.049-6.15 14.85l-6.365-6.365A11.964 11.964 0 0 0 37 25c0-6.627-5.373-12-12-12s-12 5.373-12 12 5.373 12 12 12v9Z" fill="url(#o_icon_hr_recruitment__b)" fill-opacity=".2"/><path fill-rule="evenodd" clip-rule="evenodd" d="M25 37a11.958 11.958 0 0 1-8.345-3.377A9 9 0 0 0 25 46h13a9 9 0 0 0-9-9h-4Z" fill="var(--o-icons-purple-pure, #93407D)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M25 37a11.958 11.958 0 0 1-8.345-3.377A9 9 0 0 0 25 46h13a9 9 0 0 0-9-9h-4Z" fill="url(#o_icon_hr_recruitment__c)" fill-opacity=".2"/><defs><linearGradient id="o_icon_hr_recruitment__a" x1="18" y1="18" x2="34.471" y2="22.118" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_recruitment__b" x1="4" y1="4" x2="53.412" y2="16.353" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_recruitment__c" x1="16" y1="33.623" x2="38.965" y2="43.828" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/hr_recruitment/static/src/scss/hr_job.scss b/addons/hr_recruitment/static/src/scss/hr_job.scss
index a48c06f303d..c3b3a2385ef 100644
--- a/addons/hr_recruitment/static/src/scss/hr_job.scss
+++ b/addons/hr_recruitment/static/src/scss/hr_job.scss
@@ -7,27 +7,6 @@
             }
         }
 
-        .ribbon {
-            &::before, &::after {
-                display: none;
-            }
-
-            span {
-                padding: 5px;
-                font-size: small;
-                z-index: unset;
-                height: auto;
-            }
-        }
-        .ribbon-top-right {
-            margin-top: -$o-kanban-dashboard-vpadding;
-
-            span {
-                left: 0px;
-                right: 30px;
-            }
-        }
-
         .text_top_padding{
             padding-top: 0.375rem;
         }
@@ -62,31 +41,6 @@
     }
 }
 
-.o_kanban_applicant {
-    .o_kanban_renderer {
-        .ribbon {
-            &::before, &::after {
-                display: none;
-            }
-
-            span {
-                padding: 5px;
-                font-size: x-small;
-                z-index: unset;
-                height: auto;
-            }
-        }
-        .ribbon-top-right {
-            margin-top: -$o-kanban-dashboard-vpadding;
-
-            span {
-                top: 10px;
-                left: 20px;
-            }
-        }
-    }
-}
-
 .o_kanban_view {
     .oe_kanban_card {
         .o_kanban_state_with_padding {
diff --git a/addons/hr_recruitment/views/hr_applicant_refuse_reason_views.xml b/addons/hr_recruitment/views/hr_applicant_refuse_reason_views.xml
index e07514e65d7..a29b77350df 100644
--- a/addons/hr_recruitment/views/hr_applicant_refuse_reason_views.xml
+++ b/addons/hr_recruitment/views/hr_applicant_refuse_reason_views.xml
@@ -7,7 +7,7 @@
             <field name="arch" type="xml">
                 <form string="Refuse Reason">
                     <sheet>
-                        <widget name="web_ribbon" text="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" text="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <div class="oe_title">
                             <div class="oe_edit_only">
                                 <label for="name"/>
diff --git a/addons/hr_recruitment/views/hr_applicant_views.xml b/addons/hr_recruitment/views/hr_applicant_views.xml
index 1d940a6ca5e..54eedcc1ffc 100644
--- a/addons/hr_recruitment/views/hr_applicant_views.xml
+++ b/addons/hr_recruitment/views/hr_applicant_views.xml
@@ -78,8 +78,8 @@
                             groups="hr.group_hr_user"
                             attrs="{'invisible': [('emp_id', '=', False)]}">
                         <div class="o_field_widget o_stat_info">
-                            <span class="o_stat_text"><field name="employee_name" readonly="1"/></span>
-                            <span class="o_stat_value">Employee</span>
+                            <span class="o_stat_value"><field name="employee_name" readonly="1"/></span>
+                            <span class="o_stat_text">Employee</span>
                         </div>
                     </button>
                     <button name="action_applications_email"
@@ -92,13 +92,13 @@
                     </button>
                     <button name="action_makeMeeting" class="oe_stat_button" icon="fa-calendar" type="object" attrs="{'invisible': [('id', '=', False)]}">
                         <div class="o_field_widget o_stat_info">
-                            <span class="o_stat_value"><field name="meeting_display_text" /></span>
-                            <span class="o_stat_text"><field name="meeting_display_date" readonly="1"/></span>
+                            <span class="o_stat_text"><field name="meeting_display_text" /></span>
+                            <span class="o_stat_value"><field name="meeting_display_date" readonly="1"/></span>
                         </div>
                     </button>
                 </div>
-                <widget name="web_ribbon" title="Refused" bg_color="bg-danger" attrs="{'invisible': [('application_status', '!=', 'refused')]}"/>
-                <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('application_status', '!=', 'archived')]}"/>
+                <widget name="web_ribbon" title="Refused" bg_color="text-bg-danger" attrs="{'invisible': [('application_status', '!=', 'refused')]}"/>
+                <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('application_status', '!=', 'archived')]}"/>
                 <widget name="web_ribbon" title="Hired" attrs="{'invisible': [('application_status', '!=', 'hired')]}" />
                 <field name="active" invisible="1"/>
                 <field name="legend_normal" invisible="1"/>
@@ -331,8 +331,8 @@
                     <t t-name="kanban-box">
                         <div t-attf-class="{{!selection_mode ? 'oe_kanban_color_' + kanban_getcolor(record.color.raw_value) : ''}} oe_kanban_card oe_kanban_global_click oe_applicant_kanban oe_semantic_html_override">
                             <field name="date_closed" invisible="1"/>
-                            <div class="ribbon ribbon-top-right pe-none" attrs="{'invisible': [('date_closed', '=', False)]}">
-                                <span class="bg-success">Hired</span>
+                            <div class="ribbon ribbon-top-right" attrs="{'invisible': [('date_closed', '=', False)]}">
+                                <span class="text-bg-success">Hired</span>
                             </div>
                             <span class="badge rounded-pill text-bg-danger float-end me-4" attrs="{'invisible': [('application_status', '!=', 'refused')]}">Refused</span>
                             <span class="badge rounded-pill text-bg-secondary float-end me-4" attrs="{'invisible': [('application_status', '!=', 'archived')]}">Archived</span>
diff --git a/addons/hr_recruitment_survey/views/res_config_setting_views.xml b/addons/hr_recruitment_survey/views/res_config_setting_views.xml
index a8524d671a0..b15c33450bc 100644
--- a/addons/hr_recruitment_survey/views/res_config_setting_views.xml
+++ b/addons/hr_recruitment_survey/views/res_config_setting_views.xml
@@ -8,7 +8,7 @@
             <setting id="interview_forms_setting" position="inside">
                 <div class="content-group">
                     <div class="mt8">
-                        <button name="%(survey.action_survey_form)d" icon="fa-arrow-right" type="action" string="Interview Survey" class="btn-link"/>
+                        <button name="%(survey.action_survey_form)d" icon="oi-arrow-right" type="action" string="Interview Survey" class="btn-link"/>
                     </div>
                 </div>
             </setting>
diff --git a/addons/hr_skills/static/description/icon.png b/addons/hr_skills/static/description/icon.png
index be4d8720439..1b98260463c 100644
Binary files a/addons/hr_skills/static/description/icon.png and b/addons/hr_skills/static/description/icon.png differ
diff --git a/addons/hr_skills/static/description/icon.svg b/addons/hr_skills/static/description/icon.svg
index 2df1128d8ca..6623197159b 100644
--- a/addons/hr_skills/static/description/icon.svg
+++ b/addons/hr_skills/static/description/icon.svg
@@ -1,49 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 70">
-  <defs>
-    <mask id="mask" x="0" y="0" width="70" height="70" maskUnits="userSpaceOnUse">
-      <g id="mask-2" data-name="mask">
-        <g id="b">
-          <path id="a" d="M4,0H65c4,0,5,1,5,5V65c0,4-1,5-5,5H4c-3,0-4-1-4-5V5C0,1,1,0,4,0Z" fill="#fff" fill-rule="evenodd"/>
-        </g>
-      </g>
-    </mask>
-    <linearGradient id="linear-gradient" x1="-909.8" y1="-216.96" x2="-910.8" y2="-217.96" gradientTransform="matrix(70, 0, 0, -70, 63756, -15187.42)" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#269396"/>
-      <stop offset="1" stop-color="#218689"/>
-    </linearGradient>
-  </defs>
-  <g mask="url(#mask)">
-    <g>
-      <path d="M0,0H70V70H0Z" fill-rule="evenodd" fill="url(#linear-gradient)"/>
-      <path d="M4,1H65c2.67,0,4.33.67,5,2V0H0V3C.67,1.67,2,1,4,1Z" fill="#fff" fill-opacity="0.38" fill-rule="evenodd"/>
-      <path d="M43,69H4c-2,0-4-.14-4-4V36.23L10.93,25.3l6-5,4.15,2.53L30.9,13l5.49-1.51,3.87,2.33L40,21.49,16.5,45.05l.72,1.51L30.16,33.63,40.85,33,52.13,21.68,54.77,21l5,9.6L41.22,49.17l7.69,1.15,5.64-5.64,1.24,11.49Z" fill="#393939" fill-rule="evenodd" opacity="0.32" style="isolation: isolate"/>
-      <path d="M4,69H65c2.67,0,4.33-1,5-3v4H0V66A3.92,3.92,0,0,0,4,69Z" fill-opacity="0.38" fill-rule="evenodd"/>
-      <g>
-        <g opacity="0.4">
-          <g>
-            <g>
-              <path d="M33.94,32.4h0a9.12,9.12,0,0,0,0,18.23h.19a9.12,9.12,0,0,0-.19-18.23Z"/>
-              <path d="M55.66,45a2.5,2.5,0,0,0-3.1,1.7L50.71,53,40.34,50.41a11,11,0,0,1-12.77,0L17.18,53.13,15.3,46.67a2.5,2.5,0,0,0-4.81,1.4L13,56.69a2.49,2.49,0,0,0,2.39,1.8,2.38,2.38,0,0,0,.46,0l8.94-1.64v4.76H43.08V56.38l8.81,2a2.74,2.74,0,0,0,.56.06,2.49,2.49,0,0,0,2.4-1.8l2.51-8.62A2.49,2.49,0,0,0,55.66,45Z"/>
-            </g>
-            <g>
-              <path d="M14.91,36a1.77,1.77,0,0,1-1.26-.52L8.08,29.94a1.77,1.77,0,0,1-.52-1.26,1.74,1.74,0,0,1,.52-1.26l5.57-5.58a1.8,1.8,0,0,1,2.53,0l5.57,5.57a1.8,1.8,0,0,1,0,2.53l-5.57,5.57A1.78,1.78,0,0,1,14.91,36ZM9.65,28.67l5.27,5.27,5.26-5.26-5.27-5.27Z"/>
-              <path d="M56.24,33.48H48a1.79,1.79,0,0,1-1.59-2.58h0l4.14-8.28a1.76,1.76,0,0,1,1.59-1h0a1.79,1.79,0,0,1,1.6,1l4.14,8.28a1.75,1.75,0,0,1-.08,1.73A1.77,1.77,0,0,1,56.24,33.48Zm-7.93-2h7.58L52.1,23.9Z"/>
-              <path d="M33.58,25.22a6.38,6.38,0,0,1-4.53-1.87h0a6.42,6.42,0,1,1,4.53,1.87Zm-3.12-3.28a4.41,4.41,0,1,0,0-6.24,4.43,4.43,0,0,0,0,6.24Z"/>
-            </g>
-          </g>
-        </g>
-        <g>
-          <g>
-            <path d="M35.93,30.42h0a9.12,9.12,0,0,0,0,18.23h.19a9.12,9.12,0,0,0-.19-18.23Z" fill="#fff"/>
-            <path d="M57.65,43a2.5,2.5,0,0,0-3.1,1.7L52.7,51l-10.37-2.6a11.06,11.06,0,0,1-12.77,0l-10.4,2.71-1.88-6.46a2.5,2.5,0,1,0-4.8,1.4L15,54.7a2.45,2.45,0,0,0,2.86,1.76l8.94-1.64v4.76H45.07V54.39l8.8,2a2.78,2.78,0,0,0,.57.07,2.5,2.5,0,0,0,2.4-1.81l2.51-8.62A2.49,2.49,0,0,0,57.65,43Z" fill="#fff"/>
-          </g>
-          <g>
-            <path d="M16.9,34a1.77,1.77,0,0,1-1.26-.52L10.07,28a1.77,1.77,0,0,1-.52-1.26,1.74,1.74,0,0,1,.52-1.26l5.57-5.58a1.79,1.79,0,0,1,2.52,0l5.58,5.58a1.74,1.74,0,0,1,.52,1.26A1.81,1.81,0,0,1,23.74,28l-5.57,5.57A1.78,1.78,0,0,1,16.9,34Zm-5.26-7.35L16.9,32l5.27-5.27L16.9,21.42Z" fill="#fff"/>
-            <path d="M58.23,31.49H50a1.75,1.75,0,0,1-1.51-.84,1.77,1.77,0,0,1-.08-1.74h0l4.14-8.28a1.75,1.75,0,0,1,1.59-1h0a1.78,1.78,0,0,1,1.6,1l4.14,8.28a1.79,1.79,0,0,1-1.6,2.58Zm-7.93-2h7.58l-3.79-7.58Z" fill="#fff"/>
-            <path d="M35.57,23.24A6.39,6.39,0,0,1,31,21.36h0a6.4,6.4,0,1,1,4.53,1.88ZM32.45,20a4.41,4.41,0,1,0,0-6.23,4.41,4.41,0,0,0,0,6.23Z" fill="#fff"/>
-          </g>
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M30.576 14.907a4.029 4.029 0 0 1 5.697 0l8.547 8.547a4.029 4.029 0 0 1 0 5.698L29.151 44.82a4.029 4.029 0 0 1-5.698 0l-8.546-8.547a4.029 4.029 0 0 1 0-5.698l15.669-15.669Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M30.576 14.907a4.029 4.029 0 0 1 5.697 0l8.547 8.547a4.029 4.029 0 0 1 0 5.698L29.151 44.82a4.029 4.029 0 0 1-5.698 0l-8.546-8.547a4.029 4.029 0 0 1 0-5.698l15.669-15.669Z" fill="url(#o_icon_hr_skills__a)" fill-opacity=".2"/><path d="M18.721 9.047a4.029 4.029 0 0 1 5.264-2.18l11.167 4.625a4.029 4.029 0 0 1 2.18 5.264l-8.48 20.473a4.029 4.029 0 0 1-5.263 2.18l-11.167-4.625a4.03 4.03 0 0 1-2.18-5.264l8.48-20.473Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M18.721 9.047a4.029 4.029 0 0 1 5.264-2.18l11.167 4.625a4.029 4.029 0 0 1 2.18 5.264l-8.48 20.473a4.029 4.029 0 0 1-5.263 2.18l-11.167-4.625a4.03 4.03 0 0 1-2.18-5.264l8.48-20.473Z" fill="url(#o_icon_hr_skills__b)" fill-opacity=".2"/><path d="M37.527 16.16c-.048.2-.113.399-.194.595l-8.48 20.473a4.029 4.029 0 0 1-5.265 2.18l-9.236-3.825a4.03 4.03 0 0 1 .555-5.008l15.669-15.669a4.029 4.029 0 0 1 5.697 0l1.254 1.254Z" fill="var(--o-icons-purple-purple, #55103D)"/><path d="M37.527 16.16c-.048.2-.113.399-.194.595l-8.48 20.473a4.029 4.029 0 0 1-5.265 2.18l-9.236-3.825a4.03 4.03 0 0 1 .555-5.008l15.669-15.669a4.029 4.029 0 0 1 5.697 0l1.254 1.254Z" fill="url(#o_icon_hr_skills__c)" fill-opacity=".3"/><path d="M4 8.029A4.029 4.029 0 0 1 8.029 4h12.087a4.029 4.029 0 0 1 4.029 4.029v22.16a4.029 4.029 0 0 1-4.03 4.028H8.03A4.029 4.029 0 0 1 4 30.188V8.03Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path d="M4 8.029A4.029 4.029 0 0 1 8.029 4h12.087a4.029 4.029 0 0 1 4.029 4.029v22.16a4.029 4.029 0 0 1-4.03 4.028H8.03A4.029 4.029 0 0 1 4 30.188V8.03Z" fill="url(#o_icon_hr_skills__d)" fill-opacity=".2"/><path d="M23.973 6.861c.112.37.172.762.172 1.168v22.16a4.029 4.029 0 0 1-4.029 4.028h-8.658a4.03 4.03 0 0 1-1.217-4.698l8.48-20.472a4.029 4.029 0 0 1 5.252-2.186Z" fill="var(--o-icons-purple-teal, #003458)"/><path d="M23.973 6.861c.112.37.172.762.172 1.168v22.16a4.029 4.029 0 0 1-4.029 4.028h-8.658a4.03 4.03 0 0 1-1.217-4.698l8.48-20.472a4.029 4.029 0 0 1 5.252-2.186Z" fill="url(#o_icon_hr_skills__e)" fill-opacity=".3"/><defs><linearGradient id="o_icon_hr_skills__a" x1="13.727" y1="13.727" x2="51.696" y2="23.22" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_skills__b" x1="9.934" y1="6.559" x2="43.119" y2="13.491" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_skills__c" x1="13.727" y1="13.726" x2="41.996" y2="20.198" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_skills__d" x1="4" y1="4" x2="28.501" y2="8.083" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_skills__e" x1="9.934" y1="6.558" x2="27.409" y2="8.803" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/hr_skills/static/src/fields/resume_one2many.scss b/addons/hr_skills/static/src/fields/resume_one2many.scss
index c681b80a0d3..9111ef65782 100644
--- a/addons/hr_skills/static/src/fields/resume_one2many.scss
+++ b/addons/hr_skills/static/src/fields/resume_one2many.scss
@@ -16,12 +16,15 @@
             }
 
             &:before {
-                @include o-position-absolute(0, $left: ($o-hrs-timeline-dot-size * .5 + $o-hrs-timeline-entry-padding));
-                width: 1px;
+                @include o-position-absolute(0, $left: ($o-hrs-timeline-dot-size * .5 + o-to-rem($o-horizontal-padding) - o-to-rem($border-width)));
+                width: $border-width;
                 height: 100%;
-                margin-left: 2.1rem;
                 background-color: $border-color;
                 content: "";
+
+                @include media-breakpoint-up(lg, $o-extra-grid-breakpoints) {
+                    left: ($o-hrs-timeline-dot-size * .5 + o-to-rem($o-horizontal-padding) * 2 - o-to-rem($border-width))
+                }
             }
         }
     }
diff --git a/addons/hr_skills/static/tests/tours/skills_tour.js b/addons/hr_skills/static/tests/tours/skills_tour.js
index f044e379918..7d97db8d8ca 100644
--- a/addons/hr_skills/static/tests/tours/skills_tour.js
+++ b/addons/hr_skills/static/tests/tours/skills_tour.js
@@ -147,9 +147,4 @@ registry.category("web_tour.tours").add('hr_skills_tour', {
         run: () => {},
     },
     ...stepUtils.saveForm(),
-    {
-        content: "Go back to employees",
-        trigger: 'a[data-menu-xmlid="hr.menu_hr_root"]',
-        run: "click",
-    }
 ]});
diff --git a/addons/hr_skills_slides/static/src/scss/hr_skills.scss b/addons/hr_skills_slides/static/src/scss/hr_skills.scss
index 40edfefed6e..1198e6c36cb 100644
--- a/addons/hr_skills_slides/static/src/scss/hr_skills.scss
+++ b/addons/hr_skills_slides/static/src/scss/hr_skills.scss
@@ -1,6 +1,6 @@
 .o_resume_line {
     .o_resume_line_icon.icon_circle {
-        color: $o-enterprise-primary-color;
+        color: $o-enterprise-action-color;
         vertical-align: middle;
     }
 }
diff --git a/addons/hr_timesheet/static/description/icon.png b/addons/hr_timesheet/static/description/icon.png
index cff4b595dc2..3c3353cdb27 100644
Binary files a/addons/hr_timesheet/static/description/icon.png and b/addons/hr_timesheet/static/description/icon.png differ
diff --git a/addons/hr_timesheet/static/description/icon.svg b/addons/hr_timesheet/static/description/icon.svg
index 8de1665b72a..c2faf1c32b1 100644
--- a/addons/hr_timesheet/static/description/icon.svg
+++ b/addons/hr_timesheet/static/description/icon.svg
@@ -1,23 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70">
-    <defs>
-        <path id="icon-a" d="M4,5.35309892e-14 C36.4160122,9.87060235e-15 58.0836068,-3.97961823e-14 65,5.07020818e-14 C69,6.733808e-14 70,1 70,5 C70,43.0488877 70,62.4235458 70,65 C70,69 69,70 65,70 C61,70 9,70 4,70 C1,70 7.10542736e-15,69 7.10542736e-15,65 C7.25721566e-15,62.4676575 3.83358709e-14,41.8005206 3.60818146e-14,5 C-1.13686838e-13,1 1,5.75716207e-14 4,5.35309892e-14 Z"/>
-        <linearGradient id="icon-c" x1="100%" x2="0%" y1="0%" y2="100%">
-            <stop offset="0%" stop-color="#B06161"/>
-            <stop offset="45.785%" stop-color="#984E4E"/>
-            <stop offset="100%" stop-color="#7C3838"/>
-        </linearGradient>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <mask id="icon-b" fill="#fff">
-            <use xlink:href="#icon-a"/>
-        </mask>
-        <g mask="url(#icon-b)">
-            <rect width="70" height="70" fill="url(#icon-c)"/>
-            <path fill="#FFF" fill-opacity=".383" d="M4,1.8 L65,1.8 C67.6666667,1.8 69.3333333,1.13333333 70,-0.2 C70,2.46666667 70,3.46666667 70,2.8 L1.10547097e-14,2.8 C-1.65952376e-14,3.46666667 -2.9161925e-14,2.46666667 -2.66453526e-14,-0.2 C0.666666667,1.13333333 2,1.8 4,1.8 Z" transform="matrix(1 0 0 -1 0 2.8)"/>
-            <path fill="#393939" d="M4,59 C2,59 -7.10542736e-15,58.8521303 0,54.8596491 L0,35.1929825 L29.9218256,0 L35,0 L35,11.3859649 L49,13.4561404 L54,35.1929825 L37.7206839,59 L4,59 Z" opacity=".324" transform="translate(0 11)"/>
-            <path fill="#000" fill-opacity=".383" d="M4,4 L65,4 C67.6666667,4 69.3333333,3 70,1 C70,3.66666667 70,5 70,5 L1.77635684e-15,5 C1.77635684e-15,5 1.77635684e-15,3.66666667 1.77635684e-15,1 C0.666666667,3 2,4 4,4 Z" transform="translate(0 65)"/>
-            <path fill="#000" d="M37.9166667,30.1041667 L37.9166667,42.0625 C37.9166667,42.3116313 37.8365885,42.516276 37.6764323,42.6764323 C37.516276,42.8365885 37.3116313,42.9166667 37.0625,42.9166667 L28.5208333,42.9166667 C28.2717019,42.9166667 28.0670573,42.8365885 27.906901,42.6764323 C27.7467448,42.516276 27.6666667,42.3116313 27.6666667,42.0625 L27.6666667,40.3541667 C27.6666667,40.1050353 27.7467448,39.9003906 27.906901,39.7402344 C28.0670573,39.5800781 28.2717019,39.5 28.5208333,39.5 L34.5,39.5 L34.5,30.1041667 C34.5,29.8550353 34.5800781,29.6503906 34.7402344,29.4902344 C34.9003906,29.3300781 35.1050353,29.25 35.3541667,29.25 L37.0625,29.25 C37.3116313,29.25 37.516276,29.3300781 37.6764323,29.4902344 C37.8365885,29.6503906 37.9166667,29.8550353 37.9166667,30.1041667 Z M49.0208333,39.5 C49.0208333,36.8663189 48.3713095,34.4372824 47.0722656,32.2128906 C45.7732215,29.9884988 44.0115027,28.2267792 41.7871094,26.9277344 C39.5627158,25.6286895 37.1336811,24.9791667 34.5,24.9791667 C31.8663189,24.9791667 29.4372824,25.6286895 27.2128906,26.9277344 C24.9884988,28.2267792 23.2267792,29.9884988 21.9277344,32.2128906 C20.6286895,34.4372824 19.9791667,36.8663189 19.9791667,39.5 C19.9791667,42.1336811 20.6286895,44.5627158 21.9277344,46.7871094 C23.2267792,49.0115027 24.9884988,50.7732215 27.2128906,52.0722656 C29.4372824,53.3713095 31.8663189,54.0208333 34.5,54.0208333 C37.1336811,54.0208333 39.5627158,53.3713095 41.7871094,52.0722656 C44.0115027,50.7732215 45.7732215,49.0115027 47.0722656,46.7871094 C48.3713095,44.5627158 49.0208333,42.1336811 49.0208333,39.5 Z M50.0369141,26.0953981 L52.6900045,24.0961511 C53.1310787,23.7637779 53.7580818,23.8518974 54.090455,24.2929716 L55.8959001,26.6888781 C56.2282733,27.1299524 56.1401538,27.7569554 55.6990796,28.0893287 L52.8223311,30.2571141 C54.2741095,33.1090334 55,36.1899942 55,39.5 C55,43.219185 54.0835491,46.649198 52.250651,49.7900391 C50.4177527,52.9308798 47.9308798,55.4177527 44.7900391,57.250651 C41.649198,59.0835491 38.219185,60 34.5,60 C30.7808149,60 27.3508035,59.0835491 24.2099609,57.250651 C21.0691184,55.4177527 18.5822488,52.9308798 16.749349,49.7900391 C14.9164495,46.649198 14,43.219185 14,39.5 C14,35.7808149 14.9164495,32.3508035 16.749349,29.2099609 C18.5822488,26.0691184 21.0691184,23.5822488 24.2099609,21.749349 C26.6343486,20.3345506 29.2310275,19.4657874 32,19.143059 L32,17 L30,17 C29.4477153,17 29,16.5522847 29,16 L29,14 C29,13.4477153 29.4477153,13 30,13 L40,13 C40.5522847,13 41,13.4477153 41,14 L41,16 C41,16.5522847 40.5522847,17 40,17 L38,17 L38,19.2845984 C40.3963771,19.684578 42.6597235,20.5061615 44.7900391,21.749349 C46.8093002,22.9277288 48.5582591,24.3764115 50.0369141,26.0953981 Z" opacity=".3"/>
-            <path fill="#FFF" d="M37.9166667,28.1041667 L37.9166667,40.0625 C37.9166667,40.3116313 37.8365885,40.516276 37.6764323,40.6764323 C37.516276,40.8365885 37.3116313,40.9166667 37.0625,40.9166667 L28.5208333,40.9166667 C28.2717019,40.9166667 28.0670573,40.8365885 27.906901,40.6764323 C27.7467448,40.516276 27.6666667,40.3116313 27.6666667,40.0625 L27.6666667,38.3541667 C27.6666667,38.1050353 27.7467448,37.9003906 27.906901,37.7402344 C28.0670573,37.5800781 28.2717019,37.5 28.5208333,37.5 L34.5,37.5 L34.5,28.1041667 C34.5,27.8550353 34.5800781,27.6503906 34.7402344,27.4902344 C34.9003906,27.3300781 35.1050353,27.25 35.3541667,27.25 L37.0625,27.25 C37.3116313,27.25 37.516276,27.3300781 37.6764323,27.4902344 C37.8365885,27.6503906 37.9166667,27.8550353 37.9166667,28.1041667 Z M49.0208333,37.5 C49.0208333,34.8663189 48.3713095,32.4372824 47.0722656,30.2128906 C45.7732215,27.9884988 44.0115027,26.2267792 41.7871094,24.9277344 C39.5627158,23.6286895 37.1336811,22.9791667 34.5,22.9791667 C31.8663189,22.9791667 29.4372824,23.6286895 27.2128906,24.9277344 C24.9884988,26.2267792 23.2267792,27.9884988 21.9277344,30.2128906 C20.6286895,32.4372824 19.9791667,34.8663189 19.9791667,37.5 C19.9791667,40.1336811 20.6286895,42.5627158 21.9277344,44.7871094 C23.2267792,47.0115027 24.9884988,48.7732215 27.2128906,50.0722656 C29.4372824,51.3713095 31.8663189,52.0208333 34.5,52.0208333 C37.1336811,52.0208333 39.5627158,51.3713095 41.7871094,50.0722656 C44.0115027,48.7732215 45.7732215,47.0115027 47.0722656,44.7871094 C48.3713095,42.5627158 49.0208333,40.1336811 49.0208333,37.5 Z M50.0369141,24.0953981 L52.6900045,22.0961511 C53.1310787,21.7637779 53.7580818,21.8518974 54.090455,22.2929716 L55.8959001,24.6888781 C56.2282733,25.1299524 56.1401538,25.7569554 55.6990796,26.0893287 L52.8223311,28.2571141 C54.2741095,31.1090334 55,34.1899942 55,37.5 C55,41.219185 54.0835491,44.649198 52.250651,47.7900391 C50.4177527,50.9308798 47.9308798,53.4177527 44.7900391,55.250651 C41.649198,57.0835491 38.219185,58 34.5,58 C30.7808149,58 27.3508035,57.0835491 24.2099609,55.250651 C21.0691184,53.4177527 18.5822488,50.9308798 16.749349,47.7900391 C14.9164495,44.649198 14,41.219185 14,37.5 C14,33.7808149 14.9164495,30.3508035 16.749349,27.2099609 C18.5822488,24.0691184 21.0691184,21.5822488 24.2099609,19.749349 C26.6343486,18.3345506 29.2310275,17.4657874 32,17.143059 L32,15 L30,15 C29.4477153,15 29,14.5522847 29,14 L29,12 C29,11.4477153 29.4477153,11 30,11 L40,11 C40.5522847,11 41,11.4477153 41,12 L41,14 C41,14.5522847 40.5522847,15 40,15 L38,15 L38,17.2845984 C40.3963771,17.684578 42.6597235,18.5061615 44.7900391,19.749349 C46.8093002,20.9277288 48.5582591,22.3764115 50.0369141,24.0953981 Z"/>
-        </g>
-    </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M45.445 23.222A22.222 22.222 0 1 0 12.11 42.467l11.111-19.245h22.223Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M45.445 23.222A22.222 22.222 0 1 0 12.11 42.467l11.111-19.245h22.223Z" fill="url(#o_icon_hr_timesheet__a)" fill-opacity=".2"/><path d="M5.313 32.53A22.223 22.223 0 1 0 37.889 7.533L26.778 26.778 5.313 32.53Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path d="M5.313 32.53A22.223 22.223 0 1 0 37.889 7.533L26.778 26.778 5.313 32.53Z" fill="url(#o_icon_hr_timesheet__b)" fill-opacity=".2"/><path d="M23.222 45.445c12.273 0 22.223-9.95 22.223-22.223 0-5.23-1.807-10.039-4.831-13.835a22.128 22.128 0 0 0-13.836-4.831c-12.273 0-22.222 9.949-22.222 22.222 0 5.23 1.807 10.04 4.83 13.836a22.128 22.128 0 0 0 13.836 4.83Z" fill="var(--o-icons-red-cyan, #1B567A)"/><path d="M23.222 45.445c12.273 0 22.223-9.95 22.223-22.223 0-5.23-1.807-10.039-4.831-13.835a22.128 22.128 0 0 0-13.836-4.831c-12.273 0-22.222 9.949-22.222 22.222 0 5.23 1.807 10.04 4.83 13.836a22.128 22.128 0 0 0 13.836 4.83Z" fill="url(#o_icon_hr_timesheet__c)" fill-opacity=".2"/><path d="M7.718 7.302c.646-.63 1.33-1.22 2.05-1.768.227.056.445.161.638.316L26.58 18.795c1.82 1.456 1.946 4.193.297 5.84-1.649 1.647-4.388 1.521-5.845-.297L8.074 8.18a1.651 1.651 0 0 1-.356-.878Z" fill="var(--o-icons-white, #FFFFFF)"/><defs><linearGradient id="o_icon_hr_timesheet__a" x1="1" y1="1" x2="52.834" y2="14.889" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_timesheet__b" x1="5.313" y1="7.533" x2="56.379" y2="20.983" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_timesheet__c" x1="4.556" y1="4.556" x2="52.66" y2="16.582" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/hr_timesheet/static/description/icon_timesheet.png b/addons/hr_timesheet/static/description/icon_timesheet.png
index 414a432768c..3c3353cdb27 100644
Binary files a/addons/hr_timesheet/static/description/icon_timesheet.png and b/addons/hr_timesheet/static/description/icon_timesheet.png differ
diff --git a/addons/hr_work_entry/views/hr_employee_views.xml b/addons/hr_work_entry/views/hr_employee_views.xml
index c8f03de9793..4a9ca99b061 100644
--- a/addons/hr_work_entry/views/hr_employee_views.xml
+++ b/addons/hr_work_entry/views/hr_employee_views.xml
@@ -9,7 +9,12 @@
             <div name="button_box" position="inside">
                 <field name="has_work_entries" invisible="1"/>
                 <button attrs="{'invisible': [('has_work_entries', '=', False)]}" type="object" class="oe_stat_button" id="open_work_entries"
-                    icon="fa-calendar" name="action_open_work_entries" string="Work Entries">
+                    icon="fa-calendar" name="action_open_work_entries">
+                    <div class="o_stat_info">
+                            <span class="o_stat_text">
+                            Work Entries
+                            </span>
+                        </div>
                 </button>
             </div>
         </field>
diff --git a/addons/hr_work_entry/views/hr_work_entry_views.xml b/addons/hr_work_entry/views/hr_work_entry_views.xml
index e66a9c704fa..271fa301ff5 100644
--- a/addons/hr_work_entry/views/hr_work_entry_views.xml
+++ b/addons/hr_work_entry/views/hr_work_entry_views.xml
@@ -169,7 +169,7 @@
         <field name="arch" type="xml">
             <form string="Work Entry Type" >
                 <sheet>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="oe_title">
                         <h1>
                             <field name="name" placeholder="Work Entry Type Name"/>
diff --git a/addons/hr_work_entry_contract/static/description/icon.png b/addons/hr_work_entry_contract/static/description/icon.png
index 94df3bb2072..49f1cfeaed2 100644
Binary files a/addons/hr_work_entry_contract/static/description/icon.png and b/addons/hr_work_entry_contract/static/description/icon.png differ
diff --git a/addons/hr_work_entry_contract/static/description/icon.svg b/addons/hr_work_entry_contract/static/description/icon.svg
index f8e0e969877..ce3cca7b165 100644
--- a/addons/hr_work_entry_contract/static/description/icon.svg
+++ b/addons/hr_work_entry_contract/static/description/icon.svg
@@ -1,24 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70">
-    <defs>
-        <path id="icon-a" d="M4,5.35309892e-14 C36.4160122,9.87060235e-15 58.0836068,-3.97961823e-14 65,5.07020818e-14 C69,6.733808e-14 70,1 70,5 C70,43.0488877 70,62.4235458 70,65 C70,69 69,70 65,70 C61,70 9,70 4,70 C1,70 7.10542736e-15,69 7.10542736e-15,65 C7.25721566e-15,62.4676575 3.83358709e-14,41.8005206 3.60818146e-14,5 C-1.13686838e-13,1 1,5.75716207e-14 4,5.35309892e-14 Z"/>
-        <linearGradient id="icon-c" x1="100%" x2="0%" y1="0%" y2="100%">
-            <stop offset="0%" stop-color="#CD7690"/>
-            <stop offset="100%" stop-color="#CA5377"/>
-        </linearGradient>
-        <path id="icon-d" d="M29.5,16.9166667 C34.5338704,16.9166667 38.6145833,20.9973796 38.6145833,26.03125 C38.6145833,31.0651204 34.5338704,35.1458333 29.5,35.1458333 C24.4661296,35.1458333 20.3854167,31.0651204 20.3854167,26.03125 C20.3854167,20.9973796 24.4661296,16.9166667 29.5,16.9166667 Z M38.3969283,46.0833333 L17.6510417,46.0833333 C16.1408691,46.0833333 14.9166667,44.8591309 14.9166667,43.3489583 L14.9166667,41.2386475 C14.9166667,38.7291748 16.6245687,36.5417887 19.0590739,35.9331624 L23.1215007,34.91757 C26.4370443,37.3024007 31.6104248,37.9874756 35.8784993,34.91757 L38.085401,35.4692877 C38.5061499,38.7235298 38.4706769,43.0476895 38.3969283,46.0833333 Z M58.75,30.5 C59.9921875,30.5 61,31.6757812 61,33.125 L61,52.375 C61,53.8242187 59.9921875,55 58.75,55 L42.25,55 C41.0078125,55 40,53.8242187 40,52.375 L40,33.125 C40,31.6757812 41.0078125,30.5 42.25,30.5 L44.5,30.5 L44.5,27.65625 C44.5,27.2953125 44.753125,27 45.0625,27 L46.9375,27 C47.246875,27 47.5,27.2953125 47.5,27.65625 L47.5,30.5 L53.5,30.5 L53.5,27.65625 C53.5,27.2953125 53.753125,27 54.0625,27 L55.9375,27 C56.246875,27 56.5,27.2953125 56.5,27.65625 L56.5,30.5 L58.75,30.5 Z M58.46875,52.375 C58.6234375,52.375 58.75,52.2105322 58.75,52.009516 L58.75,33.8571429 L42.25,33.8571429 L42.25,52.009516 C42.25,52.2105322 42.3765625,52.375 42.53125,52.375 L58.46875,52.375 Z M49.1056813,41.3851318 C49.1056813,42.9223389 54.4224866,42.5321777 54.4224578,45.454248 C54.4224578,46.8539063 53.2582943,48.0494873 51.3671328,48.298877 L51.3671328,49.4570312 C51.3671328,49.6188232 51.2125191,49.75 51.0218203,49.75 L49.8707786,49.75 C49.6800798,49.75 49.5254661,49.6188232 49.5254661,49.4570312 L49.5254661,48.2798584 C48.3887549,48.1158447 47.3758383,47.6706543 46.6838033,47.1086426 C46.5578505,47.0063477 46.5419661,46.8402588 46.6463369,46.7217529 L47.520812,45.7289063 C47.6381319,45.5957275 47.8617793,45.5725586 48.0145801,45.6766602 C48.7315639,46.1651123 49.6576057,46.5528076 50.5424978,46.5528076 C51.5730542,46.5528076 52.0424202,46.0319336 52.0424202,45.5479736 C52.0424202,44.1172119 46.7256148,44.427832 46.7256148,41.4118896 C46.7256148,40.1247314 47.8384419,39.0840332 49.5254949,38.7595703 L49.5254949,37.5429688 C49.5254949,37.3811768 49.6801086,37.25 49.8708074,37.25 L51.0218491,37.25 C51.2125479,37.25 51.3671616,37.3811768 51.3671616,37.5429688 L51.3671616,38.6962646 C52.2924264,38.7869873 53.2953866,39.0949219 53.9940977,39.6192627 C54.1141225,39.7093262 54.1444237,39.8580811 54.068196,39.9776611 L53.3904626,41.0408691 C53.2913292,41.1964111 53.0539268,41.2421875 52.8847237,41.1389404 C52.241723,40.7466064 51.4535473,40.4472168 50.6844788,40.4472168 C49.7254021,40.4472168 49.1056813,40.8153809 49.1056813,41.3851318 Z"/>
-        <path id="icon-e" d="M29.5,14.9166667 C34.5338704,14.9166667 38.6145833,18.9973796 38.6145833,24.03125 C38.6145833,29.0651204 34.5338704,33.1458333 29.5,33.1458333 C24.4661296,33.1458333 20.3854167,29.0651204 20.3854167,24.03125 C20.3854167,18.9973796 24.4661296,14.9166667 29.5,14.9166667 Z M38.3969283,44.0833333 L17.6510417,44.0833333 C16.1408691,44.0833333 14.9166667,42.8591309 14.9166667,41.3489583 L14.9166667,39.2386475 C14.9166667,36.7291748 16.6245687,34.5417887 19.0590739,33.9331624 L23.1215007,32.91757 C26.4370443,35.3024007 31.6104248,35.9874756 35.8784993,32.91757 L38.085401,33.4692877 C38.5061499,36.7235298 38.4706769,41.0476895 38.3969283,44.0833333 Z M58.75,28.5 C59.9921875,28.5 61,29.6757812 61,31.125 L61,50.375 C61,51.8242187 59.9921875,53 58.75,53 L42.25,53 C41.0078125,53 40,51.8242187 40,50.375 L40,31.125 C40,29.6757812 41.0078125,28.5 42.25,28.5 L44.5,28.5 L44.5,25.65625 C44.5,25.2953125 44.753125,25 45.0625,25 L46.9375,25 C47.246875,25 47.5,25.2953125 47.5,25.65625 L47.5,28.5 L53.5,28.5 L53.5,25.65625 C53.5,25.2953125 53.753125,25 54.0625,25 L55.9375,25 C56.246875,25 56.5,25.2953125 56.5,25.65625 L56.5,28.5 L58.75,28.5 Z M58.46875,50.375 C58.6234375,50.375 58.75,50.2105322 58.75,50.009516 L58.75,31.8571429 L42.25,31.8571429 L42.25,50.009516 C42.25,50.2105322 42.3765625,50.375 42.53125,50.375 L58.46875,50.375 Z M49.1056813,39.3851318 C49.1056813,40.9223389 54.4224866,40.5321777 54.4224578,43.454248 C54.4224578,44.8539063 53.2582943,46.0494873 51.3671328,46.298877 L51.3671328,47.4570312 C51.3671328,47.6188232 51.2125191,47.75 51.0218203,47.75 L49.8707786,47.75 C49.6800798,47.75 49.5254661,47.6188232 49.5254661,47.4570312 L49.5254661,46.2798584 C48.3887549,46.1158447 47.3758383,45.6706543 46.6838033,45.1086426 C46.5578505,45.0063477 46.5419661,44.8402588 46.6463369,44.7217529 L47.520812,43.7289063 C47.6381319,43.5957275 47.8617793,43.5725586 48.0145801,43.6766602 C48.7315639,44.1651123 49.6576057,44.5528076 50.5424978,44.5528076 C51.5730542,44.5528076 52.0424202,44.0319336 52.0424202,43.5479736 C52.0424202,42.1172119 46.7256148,42.427832 46.7256148,39.4118896 C46.7256148,38.1247314 47.8384419,37.0840332 49.5254949,36.7595703 L49.5254949,35.5429688 C49.5254949,35.3811768 49.6801086,35.25 49.8708074,35.25 L51.0218491,35.25 C51.2125479,35.25 51.3671616,35.3811768 51.3671616,35.5429688 L51.3671616,36.6962646 C52.2924264,36.7869873 53.2953866,37.0949219 53.9940977,37.6192627 C54.1141225,37.7093262 54.1444237,37.8580811 54.068196,37.9776611 L53.3904626,39.0408691 C53.2913292,39.1964111 53.0539268,39.2421875 52.8847237,39.1389404 C52.241723,38.7466064 51.4535473,38.4472168 50.6844788,38.4472168 C49.7254021,38.4472168 49.1056813,38.8153809 49.1056813,39.3851318 Z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <mask id="icon-b" fill="#fff">
-            <use xlink:href="#icon-a"/>
-        </mask>
-        <g mask="url(#icon-b)">
-            <rect width="70" height="70" fill="url(#icon-c)"/>
-            <path fill="#FFF" fill-opacity=".383" d="M4,1.8 L65,1.8 C67.6666667,1.8 69.3333333,1.13333333 70,-0.2 C70,2.46666667 70,3.46666667 70,2.8 L1.10547097e-14,2.8 C-1.65952376e-14,3.46666667 -2.9161925e-14,2.46666667 -2.66453526e-14,-0.2 C0.666666667,1.13333333 2,1.8 4,1.8 Z" transform="matrix(1 0 0 -1 0 2.8)"/>
-            <path fill="#393939" d="M45.4871795,51 L4,51 C2,51 -7.10542736e-15,50.851312 0,46.8367347 L2.08199737e-16,23.7312137 L22,0 L37,1.04081633 L36,15.6122449 L40.5053241,10.5061222 L41.4366949,9.83683131 L44.9722671,6.08098476 L49,12.4897959 L53.8072717,6.21274166 L56,11.4489796 L59,11.4489796 L60.3332838,33.1194301 L45.4871795,51 Z" opacity=".324" transform="translate(0 19)"/>
-            <path fill="#000" fill-opacity=".383" d="M4,4 L65,4 C67.6666667,4 69.3333333,3 70,1 C70,3.66666667 70,5 70,5 L1.77635684e-15,5 C1.77635684e-15,5 1.77635684e-15,3.66666667 1.77635684e-15,1 C0.666666667,3 2,4 4,4 Z" transform="translate(0 65)"/>
-            <use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#icon-d"/>
-            <use fill="#FFF" fill-rule="nonzero" xlink:href="#icon-e"/>
-        </g>
-    </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M0 12.5h50V38a4 4 0 0 1-4 4H0V12.5Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M0 12.5h50V38a4 4 0 0 1-4 4H0V12.5Z" fill="url(#o_icon_hr_work_entry_contract__a)" fill-opacity=".2"/><path d="M4 20.5a4 4 0 0 1-4-4V12a4 4 0 0 1 4-4h46v8.5a4 4 0 0 1-4 4H4Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path d="M4 20.5a4 4 0 0 1-4-4V12a4 4 0 0 1 4-4h46v8.5a4 4 0 0 1-4 4H4Z" fill="url(#o_icon_hr_work_entry_contract__b)" fill-opacity=".2"/><path d="M0 16.25h50v4a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4v-4Z" fill="var(--o-icons-purple-cyan, #102E7A)"/><path d="M0 16.25h50v4a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4v-4Z" fill="url(#o_icon_hr_work_entry_contract__c)" fill-opacity=".3"/><path d="M29.72 22.91a5.148 5.148 0 1 1-10.297 0 5.148 5.148 0 0 1 10.297 0Zm3.431 7.723h-8.58a7.723 7.723 0 0 0-7.723 7.722h8.58a7.723 7.723 0 0 0 7.723-7.722Z" fill="var(--o-icons-white, #FFFFFF)"/><defs><linearGradient id="o_icon_hr_work_entry_contract__a" x1="0" y1="12.5" x2="52.986" y2="34.952" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_work_entry_contract__b" x1="0" y1="8" x2="31.25" y2="39.25" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_hr_work_entry_contract__c" x1="0" y1="16.25" x2="18.161" y2="44.627" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/hr_work_entry_contract/static/src/views/work_entry_calendar/work_entry_calendar.xml b/addons/hr_work_entry_contract/static/src/views/work_entry_calendar/work_entry_calendar.xml
index 060d3b24f52..437c6d08c2b 100644
--- a/addons/hr_work_entry_contract/static/src/views/work_entry_calendar/work_entry_calendar.xml
+++ b/addons/hr_work_entry_contract/static/src/views/work_entry_calendar/work_entry_calendar.xml
@@ -2,7 +2,7 @@
 
 <templates>
     <t t-name="hr_work_entry_contract.calendar.controlButtons" t-inherit="web.CalendarController.controlButtons" t-inherit-mode="primary" owl="1">
-        <xpath expr="//ViewScaleSelector" position="after">
+        <xpath expr="." position="inside">
             <span class="btn-regenerate-work-entries">
                 <button class="btn btn-secondary ms-3" t-on-click="onRegenerateWorkEntries">
                     Regenerate Work Entries
diff --git a/addons/iap/static/description/icon.png b/addons/iap/static/description/icon.png
index 882a2dd46f4..36f6ed7e5ff 100644
Binary files a/addons/iap/static/description/icon.png and b/addons/iap/static/description/icon.png differ
diff --git a/addons/iap/static/description/icon.svg b/addons/iap/static/description/icon.svg
index 490fca169d4..2bfa84cb997 100644
--- a/addons/iap/static/description/icon.svg
+++ b/addons/iap/static/description/icon.svg
@@ -1,32 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 70">
-  <defs>
-    <mask id="mask" x="0" y="0" width="70" height="70" maskUnits="userSpaceOnUse">
-      <g id="b">
-        <path id="a" d="M4,0H65c4,0,5,1,5,5V65c0,4-1,5-5,5H4c-3,0-4-1-4-5V5C0,1,1,0,4,0Z" fill="#fff" fill-rule="evenodd"/>
-      </g>
-    </mask>
-    <linearGradient id="linear-gradient" x1="-1615.93" y1="477.94" x2="-1616.93" y2="476.94" gradientTransform="matrix(70, 0, 0, -70, 113184.99, 33455.73)" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#b06161"/>
-      <stop offset="0.46" stop-color="#984e4e"/>
-      <stop offset="1" stop-color="#7c3838"/>
-    </linearGradient>
-  </defs>
-  <g mask="url(#mask)">
-    <g>
-      <path d="M0,0H70V70H0Z" fill-rule="evenodd" fill="url(#linear-gradient)"/>
-      <path d="M4,1H65c2.67,0,4.33.67,5,2V0H0V3C.67,1.67,2,1,4,1Z" fill="#fff" fill-opacity="0.38" fill-rule="evenodd"/>
-      <path d="M4,69a3.66,3.66,0,0,1-4-4V35.5L17.47,18l7-3.37,6.65,3.1v8.18l2.16.64,3.49-3.49L48,23l3.58,2L50.35,48,29.21,69.08Z" fill="#393939" fill-rule="evenodd" opacity="0.32" style="isolation: isolate"/>
-      <path d="M4,69H65c2.67,0,4.33-1,5-3v4H0V66A3.92,3.92,0,0,0,4,69Z" fill-opacity="0.38" fill-rule="evenodd"/>
-      <g>
-        <g opacity="0.4">
-          <path d="M47.06,24.7H32.7v.88l3.94,1.82h0l.09.05h9.94a.4.4,0,0,1,.34.44V31H39.31v6.5h7.74v9.71a.34.34,0,0,1-.34.34H20.3a.33.33,0,0,1-.33-.34V44.06l-2.65,1.22-.07,0v2.24A2.73,2.73,0,0,0,20,50.3H47.06a2.73,2.73,0,0,0,2.71-2.75V27.45A2.73,2.73,0,0,0,47.06,24.7Z"/>
-          <path d="M36.29,30.76a.5.5,0,0,0,0-.13h0a.63.63,0,0,0-.1-.12l0,0L36,30.4h0L29.7,27.5V20a.44.44,0,0,0,0-.16v0a.61.61,0,0,0-.05-.12v0a.52.52,0,0,0-.1-.11l0,0a.41.41,0,0,0-.11-.07h0L22.7,16.33a.65.65,0,0,0-.51,0l-6.67,3.08h0a.41.41,0,0,0-.11.07l0,0a.52.52,0,0,0-.1.11v0a.61.61,0,0,0,0,.12v0a.41.41,0,0,0,0,.16V27.5l-6.3,2.89h0l-.11.08,0,0a.4.4,0,0,0-.1.12v0l-.06.12v0a.77.77,0,0,0,0,.15v8a.63.63,0,0,0,.34.56l6.66,3.08a.67.67,0,0,0,.52,0l6.36-2.94,6.36,2.94a.67.67,0,0,0,.52,0L36,39.48a.62.62,0,0,0,.36-.56V31a1.1,1.1,0,0,0,0-.16Zm-20.5,2.59L10.59,31l5.12-2.36L20.91,31Zm6,5.2L16.41,41V34.42l5.39-2.48Zm.62-16.19L17.22,20l5.2-2.4,5.2,2.4ZM23,23.43l5.44-2.51v6.62L23,30.06Zm6,9.92L23.92,31l5.2-2.4,5.12,2.36L29,33.35Zm6.05,5.18L29.66,41V34.42l5.43-2.52Z"/>
-        </g>
-        <g>
-          <path d="M49.06,22.7H34.7v.88l3.94,1.82h0l.09.05h9.94a.4.4,0,0,1,.34.44V29H41.31v6.5h7.74v9.71a.34.34,0,0,1-.34.34H22.3a.33.33,0,0,1-.33-.34V42.06l-2.65,1.22-.07,0v2.24A2.73,2.73,0,0,0,22,48.3H49.06a2.73,2.73,0,0,0,2.71-2.75V25.45A2.73,2.73,0,0,0,49.06,22.7Z" fill="#fff"/>
-          <path d="M38.29,28.76a.5.5,0,0,0,0-.13h0a.63.63,0,0,0-.1-.12l0,0L38,28.4h0L31.7,25.5V18a.44.44,0,0,0,0-.16v0a.61.61,0,0,0-.05-.12v0a.52.52,0,0,0-.1-.11l0,0a.41.41,0,0,0-.11-.07h0L24.7,14.33a.65.65,0,0,0-.51,0l-6.67,3.08h0a.41.41,0,0,0-.11.07l0,0a.52.52,0,0,0-.1.11v0a.61.61,0,0,0-.05.12v0a.41.41,0,0,0,0,.16V25.5l-6.3,2.89h0l-.11.08,0,0a.4.4,0,0,0-.1.12v0l-.06.12v0a.77.77,0,0,0,0,.15v8a.63.63,0,0,0,.34.56l6.66,3.08a.59.59,0,0,0,.52,0l6.36-2.94,6.36,2.94a.67.67,0,0,0,.52,0L38,37.48a.62.62,0,0,0,.36-.56V29a1.1,1.1,0,0,0,0-.16Zm-20.5,2.59L12.59,29l5.12-2.36L22.91,29Zm6,5.2L18.41,39V32.42l5.39-2.48Zm.62-16.19L19.22,18l5.2-2.4,5.2,2.4ZM25,21.43l5.44-2.51v6.62L25,28.06Zm6,9.92L25.92,29l5.2-2.4,5.12,2.36L31,31.35Zm6.05,5.18L31.66,39V32.42l5.43-2.52Z" fill="#fff"/>
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M0 12h50v26a4 4 0 0 1-4 4H0V12Z" fill="var(--o-icons-teal-teal, #00A079)"/><path d="M0 12h50v26a4 4 0 0 1-4 4H0V12Z" fill="url(#o_icon_iap__a)" fill-opacity=".2"/><path d="M4 21a4 4 0 0 1-4-4v-5a4 4 0 0 1 4-4h46v9a4 4 0 0 1-4 4H4Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M4 21a4 4 0 0 1-4-4v-5a4 4 0 0 1 4-4h46v9a4 4 0 0 1-4 4H4Z" fill="url(#o_icon_iap__b)" fill-opacity=".2"/><path d="M0 16h50v4a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4v-4Z" fill="var(--o-icons-red-teal, #006158)"/><path d="M0 16h50v4a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4v-4Z" fill="url(#o_icon_iap__c)" fill-opacity=".2"/><defs><linearGradient id="o_icon_iap__a" x1="0" y1="12" x2="53.254" y2="34.189" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_iap__b" x1="0" y1="8" x2="32.475" y2="39.226" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_iap__c" x1="0" y1="16" x2="18.161" y2="44.377" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/iap/static/src/action_buttons_widget/action_buttons_widget.xml b/addons/iap/static/src/action_buttons_widget/action_buttons_widget.xml
index fe8ec15744e..2b3a42759e9 100644
--- a/addons/iap/static/src/action_buttons_widget/action_buttons_widget.xml
+++ b/addons/iap/static/src/action_buttons_widget/action_buttons_widget.xml
@@ -4,8 +4,8 @@
     <t t-name="iap.ActionButtonsWidget" owl="1">
         <div class="mt-2 row">
             <div class="col-sm">
-                <button t-on-click="onBuyLinkClicked" class="btn btn-link buy_credits px-0 o-hidden-ios"><i class="fa fa-arrow-right"/> Buy credits</button><br/>
-                <button t-if="props.showServiceButtons" t-on-click="onViewServicesClicked" class="btn btn-link px-0 o-hidden-ios"><i class="fa fa-arrow-right me-1"/> View My Services</button>
+                <button t-on-click="onBuyLinkClicked" class="btn btn-link buy_credits px-0 o-hidden-ios"><i class="oi oi-arrow-right"/> Buy credits</button><br/>
+                <button t-if="props.showServiceButtons" t-on-click="onViewServicesClicked" class="btn btn-link px-0 o-hidden-ios"><i class="oi oi-arrow-right me-1"/> View My Services</button>
             </div>
         </div>
     </t>
diff --git a/addons/iap/views/res_config_settings.xml b/addons/iap/views/res_config_settings.xml
index 7a2c8c7b652..a7cfa9fc8af 100644
--- a/addons/iap/views/res_config_settings.xml
+++ b/addons/iap/views/res_config_settings.xml
@@ -20,7 +20,7 @@ if records:
                 <div id="iap_portal">
                     <block class='iap_portal' name="iap_purchases_setting_container">
                         <setting id="iap_credits_setting" string="Odoo IAP" help ="View your IAP Services and recharge your credits" documentation="/applications/general/in_app_purchase.html">
-                            <button name="%(iap.open_iap_account)d" icon="fa-arrow-right" type="action" string="View My Services" class="btn-link"/>
+                            <button name="%(iap.open_iap_account)d" icon="oi-arrow-right" type="action" string="View My Services" class="btn-link"/>
                         </setting>
                     </block>
                 </div>
diff --git a/addons/iap_mail/static/src/js/services/iap_notification_service.js b/addons/iap_mail/static/src/js/services/iap_notification_service.js
index 03c78a86aa9..f940d98d533 100644
--- a/addons/iap_mail/static/src/js/services/iap_notification_service.js
+++ b/addons/iap_mail/static/src/js/services/iap_notification_service.js
@@ -33,7 +33,7 @@ export const iapNotificationService = {
             // ℹ️ `_t` can only be inlined directly inside JS template literals
             // after Babel has been updated to version 2.12.
             const translatedText = _t("Buy more credits");
-            const message = Markup`<a class='btn btn-link' href='${notif.url}' target='_blank' ><i class='fa fa-arrow-right'></i> ${translatedText}</a>`;
+            const message = Markup`<a class='btn btn-link' href='${notif.url}' target='_blank' ><i class='oi oi-arrow-right'></i> ${translatedText}</a>`;
             notification.add(message, {
                 type: notif.error_type,
                 title: notif.title
diff --git a/addons/im_livechat/static/description/icon.png b/addons/im_livechat/static/description/icon.png
index e4500c6f334..8a914968b42 100644
Binary files a/addons/im_livechat/static/description/icon.png and b/addons/im_livechat/static/description/icon.png differ
diff --git a/addons/im_livechat/static/description/icon.svg b/addons/im_livechat/static/description/icon.svg
index 5c3dc54483c..88f08066e70 100644
--- a/addons/im_livechat/static/description/icon.svg
+++ b/addons/im_livechat/static/description/icon.svg
@@ -1,27 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70">
-    <defs>
-        <path id="icon-a" d="M4,5.35309892e-14 C36.4160122,9.87060235e-15 58.0836068,-3.97961823e-14 65,5.07020818e-14 C69,6.733808e-14 70,1 70,5 C70,43.0488877 70,62.4235458 70,65 C70,69 69,70 65,70 C61,70 9,70 4,70 C1,70 7.10542736e-15,69 7.10542736e-15,65 C7.25721566e-15,62.4676575 3.83358709e-14,41.8005206 3.60818146e-14,5 C-1.13686838e-13,1 1,5.75716207e-14 4,5.35309892e-14 Z"/>
-        <linearGradient id="icon-c" x1="100%" x2="0%" y1="0%" y2="100%">
-            <stop offset="0%" stop-color="#B06161"/>
-            <stop offset="45.785%" stop-color="#984E4E"/>
-            <stop offset="100%" stop-color="#7C3838"/>
-        </linearGradient>
-        <path id="icon-d" d="M43.2723381,47 L4.024685,47 C2.0123425,47 0,45.9810543 0,42.9242174 L1.48938458e-14,18.2012896 L16.225629,0 L25.9851921,2.3438768 L45.134626,15.7216414 L52.320905,8.28006517 L57.3517613,13.3747934 L52.0323386,25.8943714 L59,31.065596 L43.4971227,46.7652986 L43.2723381,47 Z"/>
-        <path id="icon-e" d="M29.8148059,45.4374895 C26.7685921,45.4374895 23.8982694,44.8827122 21.3772984,43.9035051 C18.8353437,45.9172903 15.7166184,47.1443958 12.4033677,47.4961458 C12.3794138,47.4986872 12.3553463,47.4999741 12.3312612,47.5000012 C12.0285762,47.5000012 11.7551388,47.2950872 11.6817361,47.0028098 C11.602338,46.6778841 11.8509027,46.4778919 12.0970368,46.2395091 C13.3136913,45.0550598 14.7886327,44.1239231 15.3654843,40.1448333 C13.0451961,37.8929934 11.6666667,35.0822747 11.6666667,32.0312864 C11.6666667,24.6264075 19.792577,18.6250012 29.8148059,18.6250012 C39.8370347,18.6250012 47.962945,24.6263255 47.962945,32.0312864 C47.962864,39.4413333 39.8370347,45.4374895 29.8148059,45.4374895 Z M57.9336461,54.2291067 C56.8039245,53.1522825 55.4343071,52.305802 54.8986939,48.68847 C60.4734134,43.3918762 59.125509,35.8148958 51.8464038,31.7026692 C51.8489153,31.8120989 51.851751,31.9214466 51.851751,32.0312864 C51.851751,42.0795403 41.3531335,49.7823567 28.8220864,49.3580911 C31.9105919,51.8978606 36.4369322,53.500013 41.4813857,53.500013 C44.3100649,53.500013 46.9753298,52.9956848 49.3161967,52.1054817 C51.676589,53.9361731 54.5725135,55.0517161 57.6491903,55.3714739 C57.9559262,55.4038762 58.2457293,55.2096262 58.3192131,54.9230091 C58.3930209,54.6276145 58.1621993,54.4458333 57.9336461,54.2291067 Z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <mask id="icon-b" fill="#fff">
-            <use xlink:href="#icon-a"/>
-        </mask>
-        <g mask="url(#icon-b)">
-            <rect width="70" height="70" fill="url(#icon-c)"/>
-            <path fill="#FFF" fill-opacity=".383" d="M4,1.8 L65,1.8 C67.6666667,1.8 69.3333333,1.13333333 70,-0.2 C70,2.46666667 70,3.46666667 70,2.8 L1.10547097e-14,2.8 C-1.65952376e-14,3.46666667 -2.9161925e-14,2.46666667 -2.66453526e-14,-0.2 C0.666666667,1.13333333 2,1.8 4,1.8 Z" transform="matrix(1 0 0 -1 0 2.8)"/>
-            <g transform="translate(0 22)">
-                <use fill="#000" fill-opacity=".151" xlink:href="#icon-d"/>
-            </g>
-            <path fill="#000" fill-opacity=".383" d="M4,4 L65,4 C67.6666667,4 69.3333333,3 70,1 C70,3.66666667 70,5 70,5 L1.77635684e-15,5 C1.77635684e-15,5 1.77635684e-15,3.66666667 1.77635684e-15,1 C0.666666667,3 2,4 4,4 Z" transform="translate(0 65)"/>
-            <use fill="#000" fill-rule="nonzero" opacity=".345" xlink:href="#icon-e"/>
-            <path fill="#FFF" fill-rule="nonzero" d="M29.8148059,43.4374895 C26.7685921,43.4374895 23.8982694,42.8827122 21.3772984,41.9035051 C18.8353437,43.9172903 15.7166184,45.1443958 12.4033677,45.4961458 C12.3794138,45.4986872 12.3553463,45.4999741 12.3312612,45.5000012 C12.0285762,45.5000012 11.7551388,45.2950872 11.6817361,45.0028098 C11.602338,44.6778841 11.8509027,44.4778919 12.0970368,44.2395091 C13.3136913,43.0550598 14.7886327,42.1239231 15.3654843,38.1448333 C13.0451961,35.8929934 11.6666667,33.0822747 11.6666667,30.0312864 C11.6666667,22.6264075 19.792577,16.6250012 29.8148059,16.6250012 C39.8370347,16.6250012 47.962945,22.6263255 47.962945,30.0312864 C47.962864,37.4413333 39.8370347,43.4374895 29.8148059,43.4374895 Z M57.9336461,52.2291067 C56.8039245,51.1522825 55.4343071,50.305802 54.8986939,46.68847 C60.4734134,41.3918762 59.125509,33.8148958 51.8464038,29.7026692 C51.8489153,29.8120989 51.851751,29.9214466 51.851751,30.0312864 C51.851751,40.0795403 41.3531335,47.7823567 28.8220864,47.3580911 C31.9105919,49.8978606 36.4369322,51.500013 41.4813857,51.500013 C44.3100649,51.500013 46.9753298,50.9956848 49.3161967,50.1054817 C51.676589,51.9361731 54.5725135,53.0517161 57.6491903,53.3714739 C57.9559262,53.4038762 58.2457293,53.2096262 58.3192131,52.9230091 C58.3930209,52.6276145 58.1621993,52.4458333 57.9336461,52.2291067 Z"/>
-        </g>
-    </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M4 26.222C4 27.204 4.796 28 5.778 28H16c6.627 0 12-5.373 12-12S22.627 4 16 4 4 9.373 4 16v10.222Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M4 26.222C4 27.204 4.796 28 5.778 28H16c6.627 0 12-5.373 12-12S22.627 4 16 4 4 9.373 4 16v10.222Z" fill="url(#o_icon_im_livechat__a)" fill-opacity=".2"/><path d="M46 5.778C46 4.796 45.204 4 44.222 4H34c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12V5.778Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M46 5.778C46 4.796 45.204 4 44.222 4H34c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12V5.778Z" fill="url(#o_icon_im_livechat__b)" fill-opacity=".2"/><path d="M25 23.938c1.867-2.116 3-4.894 3-7.938 0-3.043-1.133-5.822-3-7.937A11.954 11.954 0 0 0 22 16c0 3.044 1.133 5.822 3 7.938Z" fill="var(--o-icons-purple-red, #911E3D)"/><path d="M25 23.938c1.867-2.116 3-4.894 3-7.938 0-3.043-1.133-5.822-3-7.937A11.954 11.954 0 0 0 22 16c0 3.044 1.133 5.822 3 7.938Z" fill="url(#o_icon_im_livechat__c)" fill-opacity=".2"/><path d="M4 38.5C4 32.701 8.701 28 14.5 28S25 32.701 25 38.5V46H4v-7.5Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M4 38.5C4 32.701 8.701 28 14.5 28S25 32.701 25 38.5V46H4v-7.5Z" fill="url(#o_icon_im_livechat__d)" fill-opacity=".2"/><path d="M25 38.5C25 32.701 29.701 28 35.5 28S46 32.701 46 38.5V46H25v-7.5Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M25 38.5C25 32.701 29.701 28 35.5 28S46 32.701 46 38.5V46H25v-7.5Z" fill="url(#o_icon_im_livechat__e)" fill-opacity=".2"/><defs><linearGradient id="o_icon_im_livechat__a" x1="4" y1="4" x2="32.235" y2="11.059" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_im_livechat__b" x1="22" y1="4" x2="50.235" y2="11.059" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_im_livechat__c" x1="22" y1="8.063" x2="29.434" y2="8.765" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_im_livechat__d" x1="4" y1="28" x2="28.192" y2="35.056" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_im_livechat__e" x1="25" y1="28" x2="49.192" y2="35.056" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/im_livechat/static/src/legacy/widgets/public_livechat_window/public_livechat_window.xml b/addons/im_livechat/static/src/legacy/widgets/public_livechat_window/public_livechat_window.xml
index 9beadceb47e..c0d8e0b4b2f 100644
--- a/addons/im_livechat/static/src/legacy/widgets/public_livechat_window/public_livechat_window.xml
+++ b/addons/im_livechat/static/src/legacy/widgets/public_livechat_window/public_livechat_window.xml
@@ -34,7 +34,7 @@
     -->
     <t t-name="im_livechat.legacy.PublicLivechatWindow.HeaderContent">
         <span t-if="widget.isMobile()">
-            <a href="#" class="o_thread_window_close fa fa-1x fa-arrow-left" aria-label="Close chat window" title="Close chat window"/>
+            <a href="#" class="o_thread_window_close oi oi-arrow-left" aria-label="Close chat window" title="Close chat window"/>
         </span>
         <span class="o_thread_window_title">
             <t t-esc="widget.messaging.publicLivechatGlobal.publicLivechat.name"/>
diff --git a/addons/im_livechat/tests/test_message.py b/addons/im_livechat/tests/test_message.py
index b50a22d3ae9..6cbe3a4a903 100644
--- a/addons/im_livechat/tests/test_message.py
+++ b/addons/im_livechat/tests/test_message.py
@@ -65,7 +65,7 @@ class TestImLivechatMessage(TransactionCase):
             'message_type': 'notification',
             'messageReactionGroups': [],
             'model': 'discuss.channel',
-            'module_icon': '/mail/static/description/icon.png',
+            'module_icon': '/mail/static/description/icon.svg',
             'needaction_partner_ids': [],
             'notifications': [],
             'pinned_at': False,
diff --git a/addons/im_livechat/views/chatbot_script_views.xml b/addons/im_livechat/views/chatbot_script_views.xml
index de67db5ce19..2c8fbda4bb9 100644
--- a/addons/im_livechat/views/chatbot_script_views.xml
+++ b/addons/im_livechat/views/chatbot_script_views.xml
@@ -26,7 +26,7 @@
                         </button>
                     </div>
                     <field name="active" invisible="1"/>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <field name="image_1920" widget="image" class="oe_avatar" options="{'preview_image': 'image_128'}"/>
                     <div class="oe_title">
                         <label for="title" string="Chatbot Name"/>
diff --git a/addons/im_livechat/views/im_livechat_chatbot_templates.xml b/addons/im_livechat/views/im_livechat_chatbot_templates.xml
index 91d0e38fbec..0da13bf3d9c 100644
--- a/addons/im_livechat/views/im_livechat_chatbot_templates.xml
+++ b/addons/im_livechat/views/im_livechat_chatbot_templates.xml
@@ -20,7 +20,7 @@
                             <a t-attf-href="/web#view_type=form&amp;model=chatbot.script&amp;id=#{chatbot_data['chatbot_script_id']}&amp;action=im_livechat.chatbot_script_action">
                                 <span>You are currently testing</span>
                                 <span t-out="chatbot_data['chatbot_name']"/>
-                                <i class="fa fa-fw fa-arrow-right"/>Back to edit mode
+                                <i class="oi oi-fw oi-arrow-right"/>Back to edit mode
                             </a>
                         </div>
                         <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
diff --git a/addons/l10n_in/report/audit_trail_report_views.xml b/addons/l10n_in/report/audit_trail_report_views.xml
index 4e0a3ba8991..8192ce69526 100644
--- a/addons/l10n_in/report/audit_trail_report_views.xml
+++ b/addons/l10n_in/report/audit_trail_report_views.xml
@@ -12,7 +12,7 @@
                 <field name="author_id" widget="many2one_avatar"/>
                 <field name="l10n_in_audit_log_account_move_id"/>
                 <field name="l10n_in_audit_log_preview"/>
-                <button name="action_open_document" type="object" icon="fa-arrow-right" string="View Related Document" attrs="{'invisible': [('res_id', 'in', (0, False, ''))]}" />
+                <button name="action_open_document" type="object" icon="oi-arrow-right" string="View Related Document" attrs="{'invisible': [('res_id', 'in', (0, False, ''))]}" />
             </tree>
         </field>
     </record>
diff --git a/addons/l10n_in_edi/views/res_config_settings_views.xml b/addons/l10n_in_edi/views/res_config_settings_views.xml
index e8aaa753859..05e19eeb2d1 100644
--- a/addons/l10n_in_edi/views/res_config_settings_views.xml
+++ b/addons/l10n_in_edi/views/res_config_settings_views.xml
@@ -25,7 +25,7 @@
                         </div>
                     </div>
                     <div class='mt8'>
-                        <button name="l10n_in_edi_test" icon="fa-arrow-right" type="object" string="Verify Username and Password" class="btn-link"/>
+                        <button name="l10n_in_edi_test" icon="oi-arrow-right" type="object" string="Verify Username and Password" class="btn-link"/>
                     </div>
                 </setting>
             </xpath>
diff --git a/addons/l10n_in_edi_ewaybill/views/res_config_settings_views.xml b/addons/l10n_in_edi_ewaybill/views/res_config_settings_views.xml
index 1abce1ae527..878bb0ed412 100755
--- a/addons/l10n_in_edi_ewaybill/views/res_config_settings_views.xml
+++ b/addons/l10n_in_edi_ewaybill/views/res_config_settings_views.xml
@@ -25,7 +25,7 @@
                         </div>
                     </div>
                     <div class='mt8'>
-                        <button name="l10n_in_edi_ewaybill_test" icon="fa-arrow-right" type="object" string="Verify Username and Password" class="btn-link"/>
+                        <button name="l10n_in_edi_ewaybill_test" icon="oi-arrow-right" type="object" string="Verify Username and Password" class="btn-link"/>
                     </div>
                 </setting>
             </xpath>
diff --git a/addons/link_tracker/views/link_tracker_views.xml b/addons/link_tracker/views/link_tracker_views.xml
index b4e338c3ef4..eecb41665c5 100644
--- a/addons/link_tracker/views/link_tracker_views.xml
+++ b/addons/link_tracker/views/link_tracker_views.xml
@@ -30,7 +30,11 @@
                     <sheet>
                         <div class="oe_button_box" name="button_box">
                             <button type="object" icon="fa-sign-out" name="action_visit_page"
-                                string="Visit Page" class="oe_stat_button"/>
+                                string="Visit Page" class="oe_stat_button">
+                                <div class="o_field_widget o_stat_info">
+                                    <span class="o_stat_text">Visit Page</span>
+                                </div>
+                            </button>
 
                             <button type="object" class="oe_stat_button" name="action_view_statistics" icon="fa-bar-chart-o">
                                 <field name="count" string="Clicks" widget="statinfo"/>
diff --git a/addons/loyalty/static/src/xml/loyalty_templates.xml b/addons/loyalty/static/src/xml/loyalty_templates.xml
index 94163bbd808..5989a7aaf7e 100644
--- a/addons/loyalty/static/src/xml/loyalty_templates.xml
+++ b/addons/loyalty/static/src/xml/loyalty_templates.xml
@@ -57,8 +57,7 @@
     </t>
 
     <t t-name="loyalty.LoyaltyCardListView.buttons" owl="1" t-inherit-mode="primary" t-inherit="web.ListView.Buttons">
-        <xpath expr="//button[hasclass('o_list_button_add')]" position="replace"/>
-        <xpath expr="//t[contains(@t-if, 'isExportEnable')]" position="before">
+        <xpath expr="//div[hasclass('o_list_buttons')]" position="inside">
             <t t-set="supportedProgramTypes" t-value="['coupons', 'gift_card', 'ewallet']"/>
             <button t-if="supportedProgramTypes.includes(props.context.program_type)" type="button" class="btn btn-primary o_loyalty_card_list_button_generate" t-attf-data-tooltip="Generate {{props.context.program_item_name}}"
                 t-on-click.stop.prevent="() => this.actionService.doAction('loyalty.loyalty_generate_wizard_action', { additionalContext: this.props.context, onClose: () => {this.model.load()} })">
diff --git a/addons/loyalty/views/loyalty_program_views.xml b/addons/loyalty/views/loyalty_program_views.xml
index 0a831bb926c..6c9f13d5033 100644
--- a/addons/loyalty/views/loyalty_program_views.xml
+++ b/addons/loyalty/views/loyalty_program_views.xml
@@ -16,7 +16,7 @@
                         attrs="{'invisible': [('program_type', '!=', 'ewallet')]}" context="{'default_mode': 'selected'}"/>
                 </header>
                 <sheet>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="oe_button_box" name="button_box">
                         <button class="oe_stat_button" type="object" name="action_open_loyalty_cards" icon="fa-tags">
                             <div class="o_form_field o_stat_info">
diff --git a/addons/lunch/static/description/icon.png b/addons/lunch/static/description/icon.png
index e733ed22a4a..91e4dafed82 100644
Binary files a/addons/lunch/static/description/icon.png and b/addons/lunch/static/description/icon.png differ
diff --git a/addons/lunch/static/description/icon.svg b/addons/lunch/static/description/icon.svg
index 64a5d86e5c0..4329e95d4ad 100644
--- a/addons/lunch/static/description/icon.svg
+++ b/addons/lunch/static/description/icon.svg
@@ -1,24 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70">
-    <defs>
-        <path id="icon-a" d="M4,5.35309892e-14 C36.4160122,9.87060235e-15 58.0836068,-3.97961823e-14 65,5.07020818e-14 C69,6.733808e-14 70,1 70,5 C70,43.0488877 70,62.4235458 70,65 C70,69 69,70 65,70 C61,70 9,70 4,70 C1,70 7.10542736e-15,69 7.10542736e-15,65 C7.25721566e-15,62.4676575 3.83358709e-14,41.8005206 3.60818146e-14,5 C-1.13686838e-13,1 1,5.75716207e-14 4,5.35309892e-14 Z"/>
-        <linearGradient id="icon-c" x1="100%" x2="0%" y1="0%" y2="100%">
-            <stop offset="0%" stop-color="#CDC484"/>
-            <stop offset="100%" stop-color="#B5AA59"/>
-        </linearGradient>
-        <path id="icon-d" d="M34.9928486,19.5391573 C35.0500601,19.8604454 36.1442308,25.9991002 36.1442308,28.3438202 C36.1442308,31.9190055 34.1561298,34.4688031 31.216887,35.4941909 L32.1394231,51.7705126 C32.1894832,52.7070335 31.409976,53.5 30.4230769,53.5 L25.8461538,53.5 C24.8664063,53.5 24.0797476,52.7138694 24.1298077,51.7705126 L25.0523437,35.4941909 C22.1059495,34.4688031 20.125,31.9121696 20.125,28.3438202 C20.125,25.9922643 21.2191707,19.8604454 21.2763822,19.5391573 C21.5052284,18.1514658 24.5159856,18.1309581 24.7019231,19.6143524 L24.7019231,29.2666692 C24.7948918,29.4990904 25.7817909,29.4854186 25.8461538,29.2666692 C25.946274,27.5371818 26.4111178,19.7510707 26.4182692,19.5733369 C26.6542668,18.1514658 29.6149639,18.1514658 29.8438101,19.5733369 C29.858113,19.7579067 30.3158053,27.5371818 30.4159255,29.2666692 C30.4802885,29.4854186 31.4743389,29.4990904 31.5601563,29.2666692 L31.5601563,19.6143524 C31.7460938,18.137794 34.7640024,18.1514658 34.9928486,19.5391573 Z M43.5173678,39.0693762 L42.4446514,51.7226612 C42.3588341,52.6796898 43.1526442,53.5 44.1538462,53.5 L48.1586538,53.5 C49.1097957,53.5 49.875,52.7685567 49.875,51.8593796 L49.875,20.1407181 C49.875,19.2383769 49.1097957,18.5000977 48.1586538,18.5000977 C42.2587139,18.5000977 32.3253606,30.7022121 43.5173678,39.0693762 Z"/>
-        <path id="icon-e" d="M34.9928486,17.5391573 C35.0500601,17.8604454 36.1442308,23.9991002 36.1442308,26.3438202 C36.1442308,29.9190055 34.1561298,32.4688031 31.216887,33.4941909 L32.1394231,49.7705126 C32.1894832,50.7070335 31.409976,51.5 30.4230769,51.5 L25.8461538,51.5 C24.8664063,51.5 24.0797476,50.7138694 24.1298077,49.7705126 L25.0523437,33.4941909 C22.1059495,32.4688031 20.125,29.9121696 20.125,26.3438202 C20.125,23.9922643 21.2191707,17.8604454 21.2763822,17.5391573 C21.5052284,16.1514658 24.5159856,16.1309581 24.7019231,17.6143524 L24.7019231,27.2666692 C24.7948918,27.4990904 25.7817909,27.4854186 25.8461538,27.2666692 C25.946274,25.5371818 26.4111178,17.7510707 26.4182692,17.5733369 C26.6542668,16.1514658 29.6149639,16.1514658 29.8438101,17.5733369 C29.858113,17.7579067 30.3158053,25.5371818 30.4159255,27.2666692 C30.4802885,27.4854186 31.4743389,27.4990904 31.5601563,27.2666692 L31.5601563,17.6143524 C31.7460938,16.137794 34.7640024,16.1514658 34.9928486,17.5391573 Z M43.5173678,37.0693762 L42.4446514,49.7226612 C42.3588341,50.6796898 43.1526442,51.5 44.1538462,51.5 L48.1586538,51.5 C49.1097957,51.5 49.875,50.7685567 49.875,49.8593796 L49.875,18.1407181 C49.875,17.2383769 49.1097957,16.5000977 48.1586538,16.5000977 C42.2587139,16.5000977 32.3253606,28.7022121 43.5173678,37.0693762 Z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <mask id="icon-b" fill="#fff">
-            <use xlink:href="#icon-a"/>
-        </mask>
-        <g mask="url(#icon-b)">
-            <rect width="70" height="70" fill="url(#icon-c)"/>
-            <path fill="#FFF" fill-opacity=".383" d="M4,1.8 L65,1.8 C67.6666667,1.8 69.3333333,1.13333333 70,-0.2 C70,2.46666667 70,3.46666667 70,2.8 L1.10547097e-14,2.8 C-1.65952376e-14,3.46666667 -2.9161925e-14,2.46666667 -2.66453526e-14,-0.2 C0.666666667,1.13333333 2,1.8 4,1.8 Z" transform="matrix(1 0 0 -1 0 2.8)"/>
-            <path fill="#393939" d="M37.1559742,53 L4,52 C2,52 -7.10542736e-15,51.8543417 0,47.9215686 L2.11942169e-16,24.8800004 L21.6437579,0 L21,12.2352941 L26.7780762,0 L29.5940312,3.47275252 L33,0 L35,12.2352941 L41.1357671,3.93586958 L49,0 L49.7896212,33.2154878 L37.1559742,53 Z" opacity=".324" transform="translate(0 17)"/>
-            <path fill="#000" fill-opacity=".383" d="M4,4 L65,4 C67.6666667,4 69.3333333,3 70,1 C70,3.66666667 70,5 70,5 L1.77635684e-15,5 C1.77635684e-15,5 1.77635684e-15,3.66666667 1.77635684e-15,1 C0.666666667,3 2,4 4,4 Z" transform="translate(0 65)"/>
-            <use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#icon-d"/>
-            <use fill="#FFF" fill-rule="nonzero" xlink:href="#icon-e"/>
-        </g>
-    </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M42 25c0 9.389-7.611 17-17 17S8 34.389 8 25 15.611 8 25 8s17 7.611 17 17Z" fill="var(--o-icons-yellow-yellow, #F77B09)"/><path d="M42 25c0 9.389-7.611 17-17 17S8 34.389 8 25 15.611 8 25 8s17 7.611 17 17Z" fill="url(#o_icon_lunch__a)" fill-opacity=".2"/><path d="M19.008 40.914C12.576 38.49 8 32.28 8 25c0-9.389 7.611-17 17-17 7.28 0 13.492 4.576 15.914 11.01-2.887 10.638-11.267 19.017-21.906 21.904Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M19.008 40.914C12.576 38.49 8 32.28 8 25c0-9.389 7.611-17 17-17 7.28 0 13.492 4.576 15.914 11.01-2.887 10.638-11.267 19.017-21.906 21.904Z" fill="url(#o_icon_lunch__b)" fill-opacity=".2"/><path d="M19.68 15.361c0-1.808-1.52-3.331-3.192-2.64a8.338 8.338 0 0 0-4.512 4.513c-.692 1.67.831 3.19 2.64 3.19h1.063a4 4 0 0 0 4-4v-1.063Z" fill="var(--o-icons-white, #FFFFFF)"/><path d="M8.258 42.696c-.115-.31-.012-.748.232-.976L45.304 7.136c.243-.229.533-.162.649.149.115.311.011.748-.232.976L8.907 42.846c-.244.228-.534.161-.65-.15Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path d="M8.258 42.696c-.115-.31-.012-.748.232-.976L45.304 7.136c.243-.229.533-.162.649.149.115.311.011.748-.232.976L8.907 42.846c-.244.228-.534.161-.65-.15Z" fill="url(#o_icon_lunch__c)" fill-opacity=".2"/><path d="M4.036 42.657a.892.892 0 0 1 .332-.961l38.438-25.99c.293-.199.62-.09.729.243a.892.892 0 0 1-.332.961L4.764 42.901c-.293.198-.619.089-.728-.244Z" fill="var(--o-icons-teal-teal, #00A079)"/><path d="M4.036 42.657a.892.892 0 0 1 .332-.961l38.438-25.99c.293-.199.62-.09.729.243a.892.892 0 0 1-.332.961L4.764 42.901c-.293.198-.619.089-.728-.244Z" fill="url(#o_icon_lunch__d)" fill-opacity=".2"/><defs><linearGradient id="o_icon_lunch__a" x1="8" y1="8" x2="48" y2="18" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_lunch__b" x1="8" y1="8" x2="46.723" y2="17.681" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_lunch__c" x1="8.211" y1="7" x2="52.401" y2="18.602" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_lunch__d" x1="4" y1="15.606" x2="47.757" y2="31.408" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/lunch/static/src/components/lunch_dashboard.xml b/addons/lunch/static/src/components/lunch_dashboard.xml
index 59a8c02552b..92e1bd16822 100644
--- a/addons/lunch/static/src/components/lunch_dashboard.xml
+++ b/addons/lunch/static/src/components/lunch_dashboard.xml
@@ -72,7 +72,7 @@
     <t t-name="lunch.LunchDashboardOrder" owl="1">
         <LunchAlerts alerts="state.infos.alerts"/>
 
-        <div class="o_lunch_banner container-fluid p-4 border-bottom bg-view">
+        <div class="o_lunch_banner container-fluid p-4 bg-view">
             <div class="row h-100">
                 <div class="col-12 col-md-4">
                     <div class="row h-100 align-content-center">
diff --git a/addons/lunch/static/src/views/kanban.xml b/addons/lunch/static/src/views/kanban.xml
index 200f8520a7e..b25a68a46a9 100644
--- a/addons/lunch/static/src/views/kanban.xml
+++ b/addons/lunch/static/src/views/kanban.xml
@@ -4,7 +4,7 @@
         <div class="o_lunch_content d-flex flex-column h-100">
             <LunchDashboard openOrderLine.bind="openOrderLine"/>
 
-            <div class="overflow-auto">
+            <div class="overflow-auto border-top border-bottom">
                 <t t-call="web.KanbanRenderer"/>
             </div>
         </div>
diff --git a/addons/lunch/views/lunch_product_views.xml b/addons/lunch/views/lunch_product_views.xml
index 6af6295fe07..a8a075d5b11 100644
--- a/addons/lunch/views/lunch_product_views.xml
+++ b/addons/lunch/views/lunch_product_views.xml
@@ -70,7 +70,7 @@
                 <field name="company_id" invisible="1"/>
                 <field name="currency_id" invisible="1"/>
                 <sheet>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <field name="image_1920" widget="image" class="oe_avatar" options="{'preview_image': 'image_128'}"/>
                     <div class="oe_title">
                         <label for="name" class="oe-edit-only"/>
diff --git a/addons/lunch/views/lunch_supplier_views.xml b/addons/lunch/views/lunch_supplier_views.xml
index 85ae1cc6252..45d87a487ac 100644
--- a/addons/lunch/views/lunch_supplier_views.xml
+++ b/addons/lunch/views/lunch_supplier_views.xml
@@ -18,7 +18,7 @@
         <field name="arch" type="xml">
             <form>
                 <sheet>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="oe_title">
                         <label for="name" string="Vendor"/>
                         <h1><field name="name" required="1" placeholder="e.g. The Pizzeria Inn"/></h1>
diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py
index 01c69cf0b98..a8d293f5475 100644
--- a/addons/mail/__manifest__.py
+++ b/addons/mail/__manifest__.py
@@ -160,7 +160,7 @@ For more specific needs, you may also assign custom-defined actions
             ('include', 'web._assets_helpers'),
             ('include', 'web._assets_backend_helpers'),
             ('include', 'web.assets_common'),
-            ('include', 'web._assets_bootstrap'),
+            ('include', 'web._assets_bootstrap_backend'),
             'web/static/src/scss/bootstrap_overridden.scss',
             'web/static/src/webclient/webclient.scss',
             'web/static/src/core/utils/transitions.scss',  # included early because used by other files
diff --git a/addons/mail/static/description/icon.png b/addons/mail/static/description/icon.png
index 6513b53bad2..8b8503b5b00 100644
Binary files a/addons/mail/static/description/icon.png and b/addons/mail/static/description/icon.png differ
diff --git a/addons/mail/static/description/icon.svg b/addons/mail/static/description/icon.svg
index a71744fabdf..5601fa6472d 100644
--- a/addons/mail/static/description/icon.svg
+++ b/addons/mail/static/description/icon.svg
@@ -1 +1 @@
-<svg width="70" height="70" viewBox="0 0 70 70" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><title>mail/static/description/icon</title><defs><path d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z" id="a"/><linearGradient x1="100%" y1="0%" x2="0%" y2="100%" id="c"><stop stop-color="#CD7690" offset="0%"/><stop stop-color="#CA5377" offset="100%"/></linearGradient><path d="M57.706 35.71c0 9.276-10.012 16.777-22.351 16.777-3.749 0-7.287-.694-10.392-1.92-3.127 2.517-6.969 4.057-11.051 4.493a.835.835 0 0 1-.893-.621c-.1-.404.21-.654.513-.952 1.497-1.484 3.313-2.646 4.027-7.63-2.855-2.815-4.555-6.331-4.555-10.146 0-9.267 10.011-16.776 22.35-16.776 12.34 0 22.352 7.509 22.352 16.776zm-33.647-6.534a1 1 0 0 0-1 1v1.353a1 1 0 0 0 1 1h22.588a1 1 0 0 0 1-1v-1.353a1 1 0 0 0-1-1H24.06zm0 8.056a1 1 0 0 0-1 1v1.353a1 1 0 0 0 1 1h22.588a1 1 0 0 0 1-1v-1.353a1 1 0 0 0-1-1H24.06z" id="d"/><path d="M57.706 33.71c0 9.276-10.012 16.777-22.351 16.777-3.749 0-7.287-.694-10.392-1.92-3.127 2.517-6.969 4.057-11.051 4.493a.835.835 0 0 1-.893-.621c-.1-.404.21-.654.513-.952 1.497-1.484 3.313-2.646 4.027-7.63-2.855-2.815-4.555-6.331-4.555-10.146 0-9.267 10.011-16.776 22.35-16.776 12.34 0 22.352 7.509 22.352 16.776zm-33.647-6.534a1 1 0 0 0-1 1v1.353a1 1 0 0 0 1 1h22.588a1 1 0 0 0 1-1v-1.353a1 1 0 0 0-1-1H24.06zm0 8.056a1 1 0 0 0-1 1v1.353a1 1 0 0 0 1 1h22.588a1 1 0 0 0 1-1v-1.353a1 1 0 0 0-1-1H24.06z" id="e"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z" fill="#FFF" fill-opacity=".383"/><path d="M36.847 68.65L4 69c-2 0-4-.146-4-4.098V46.5L17.288 24 54 24.95v17.92L36.847 68.65z" fill="#393939" opacity=".324"/><path d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z" fill="#000" fill-opacity=".383"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M4 25C4 13.402 13.402 4 25 4s21 9.402 21 21-9.402 21-21 21H7.111A3.111 3.111 0 0 1 4 42.889V25Z" fill="var(--o-icons-red-yellow, #F85318)"/><path d="M4 25C4 13.402 13.402 4 25 4s21 9.402 21 21-9.402 21-21 21H7.111A3.111 3.111 0 0 1 4 42.889V25Z" fill="url(#o_icon_mail__a)" fill-opacity=".2"/><path d="M5.767 45.696C23.95 43.356 38 27.819 38 9c0-.166-.001-.331-.003-.496A20.91 20.91 0 0 0 25 4C13.402 4 4 13.402 4 25v17.889c0 1.237.722 2.305 1.767 2.807Z" fill="var(--o-icons-yellow-yellow, #F77B09)"/><path d="M5.767 45.696C23.95 43.356 38 27.819 38 9c0-.166-.001-.331-.003-.496A20.91 20.91 0 0 0 25 4C13.402 4 4 13.402 4 25v17.889c0 1.237.722 2.305 1.767 2.807Z" fill="url(#o_icon_mail__b)" fill-opacity=".2"/><defs><linearGradient id="o_icon_mail__a" x1="4" y1="4" x2="53.412" y2="16.353" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_mail__b" x1="4" y1="4" x2="44.804" y2="12.318" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/mail/static/src/attachments/attachment_view.xml b/addons/mail/static/src/attachments/attachment_view.xml
index a59f1282e0a..a56977c3def 100644
--- a/addons/mail/static/src/attachments/attachment_view.xml
+++ b/addons/mail/static/src/attachments/attachment_view.xml
@@ -11,10 +11,10 @@
                 <iframe t-if="state.thread.mainAttachment.isPdf" class="mb48" t-attf-src="/web/static/lib/pdfjs/web/viewer.html?file=/web/content/#{state.thread.mainAttachment.id}?filename%3D#{window.encodeURIComponent(state.thread.mainAttachment.name)}" t-ref="iframeViewerPdf"/>
                 <t t-if="state.thread.attachmentsInWebClientView.length > 1">
                     <a class="arrow o_move_previous text-center" href="#" t-on-click.prevent="onClickPrevious">
-                        <span class="fa fa-chevron-left"/>
+                        <span class="oi oi-chevron-left"/>
                     </a>
                     <a class="arrow o_move_next text-center" href="#" t-on-click.prevent="onClickNext">
-                        <span class="fa fa-chevron-right"/>
+                        <span class="oi oi-chevron-right"/>
                     </a>
                 </t>
             </t>
diff --git a/addons/mail/static/src/attachments/attachment_viewer.xml b/addons/mail/static/src/attachments/attachment_viewer.xml
index 708309c53ef..6b3a1d5c357 100644
--- a/addons/mail/static/src/attachments/attachment_viewer.xml
+++ b/addons/mail/static/src/attachments/attachment_viewer.xml
@@ -64,10 +64,10 @@
                 </div>
                 <t t-if="props.attachments.length > 1">
                     <div class="o-mail-AttachmentViewer-navigation position-absolute top-0 bottom-0 start-0 align-items-center justify-content-center d-flex my-auto ms-3 rounded-circle" t-on-click="previous" title="Previous (Left-Arrow)" aria-label="Previous" role="button">
-                        <span class="fa fa-chevron-left" role="img"/>
+                        <span class="oi oi-chevron-left" role="img"/>
                     </div>
                     <div class="o-mail-AttachmentViewer-navigation position-absolute top-0 bottom-0 end-0 align-items-center justify-content-center d-flex my-auto me-3 rounded-circle" t-on-click="next" title="Next (Right-Arrow)" aria-label="Next" role="button">
-                        <span class="fa fa-chevron-right" role="img"/>
+                        <span class="oi oi-chevron-right" role="img"/>
                     </div>
                 </t>
             </div>
diff --git a/addons/mail/static/src/composer/composer.scss b/addons/mail/static/src/composer/composer.scss
index 48d75de5126..dff2d5de476 100644
--- a/addons/mail/static/src/composer/composer.scss
+++ b/addons/mail/static/src/composer/composer.scss
@@ -48,8 +48,7 @@
 }
 
 .o-mail-Composer-avatar {
-    width: $o-mail-Avatar-size;
-    height: $o-mail-Avatar-size;
+    --Avatar-size: #{$o-mail-Avatar-size};
 }
 
 .o-fast-popover {
@@ -65,7 +64,3 @@
     padding-top: 10px;
     padding-bottom: 10px;
 }
-
-.o-mail-Composer-send {
-    border: 1px solid darken($primary, 5%);
-}
diff --git a/addons/mail/static/src/composer/composer.xml b/addons/mail/static/src/composer/composer.xml
index dbeace26b62..13631638bfe 100644
--- a/addons/mail/static/src/composer/composer.xml
+++ b/addons/mail/static/src/composer/composer.xml
@@ -6,14 +6,14 @@
     <t t-set="normal" t-value="props.mode === 'normal'"/>
     <t t-set="extended" t-value="props.mode === 'extended'"/>
     <div t-ref="composer">
-        <div class="o-mail-Composer d-grid flex-shrink-0 bg-view"
+        <div class="o-mail-Composer d-grid flex-shrink-0"
                 t-att-class="{
                     'px-3 py-4 o-extended': extended,
                     'p-3': normal,
                     'o-hasSelfAvatar px-3': !env.inChatWindow and thread,
                 }" t-attf-class="{{ props.className }}">
             <div class="o-mail-Composer-sidebarMain flex-shrink-0" t-if="!compact">
-                <img class="o-mail-Composer-avatar mt-1 rounded-circle" t-att-src="threadService.avatarUrl(store.self, props.composer.thread)" alt="Avatar of user"/>
+                <img class="o-mail-Composer-avatar o_avatar rounded" t-att-src="threadService.avatarUrl(store.self, props.composer.thread)" alt="Avatar of user"/>
             </div>
             <div class="o-mail-Composer-coreHeader text-truncate small p-2" t-if="props.composer.thread and props.messageToReplyTo?.thread === props.composer.thread">
                 <span class="cursor-pointer" t-on-click="() => env.messageHighlight?.highlightMessage(props.messageToReplyTo.message.id, props.composer.thread)">
@@ -77,8 +77,8 @@
                         <button t-if="thread and thread.type === 'chatter'" class="btn btn-light fa fa-expand mx-1 border-0 rounded-pill" title="Full composer" aria-label="Full composer" type="button" t-on-click="onClickFullComposer"/>
                     </div>
                 </div>
-                <button t-if="!compact or store.isSmall" class="o-mail-Composer-send btn btn-primary o-last border-start-0"
-                    t-att-class="{'mt-2': extended, 'rounded-0 rounded-end-3': !extended and !compact, 'align-self-stretch': !extended}"
+                <button t-if="!compact or store.isSmall" class="o-mail-Composer-send btn btn-secondary o-last border-start-0"
+                    t-att-class="{'mt-2': extended, 'rounded-0 rounded-end-3': !extended and !compact, 'align-self-stretch': !extended, 'border border-start-0': env.inDiscussApp}"
                     t-on-click="sendMessage"
                     type="button"
                     t-att-disabled="isSendButtonDisabled"
diff --git a/addons/mail/static/src/core_ui/message.js b/addons/mail/static/src/core_ui/message.js
index 9b1ab2a4971..ce9bd1a2d27 100644
--- a/addons/mail/static/src/core_ui/message.js
+++ b/addons/mail/static/src/core_ui/message.js
@@ -465,7 +465,7 @@ export class Message extends Component {
     }
 
     get imStatusClassName() {
-        let res = "position-absolute bottom-0 end-0";
+        let res = "position-absolute";
         if (this.hasOpenChatFeature) {
             res += " cursor-pointer";
         }
diff --git a/addons/mail/static/src/core_ui/message.xml b/addons/mail/static/src/core_ui/message.xml
index 1c5641109c3..3e36c683d9a 100644
--- a/addons/mail/static/src/core_ui/message.xml
+++ b/addons/mail/static/src/core_ui/message.xml
@@ -27,7 +27,7 @@
                 <div class="o-mail-Message-core position-relative d-flex flex-shrink-0">
                     <div class="o-mail-Message-sidebar d-flex flex-shrink-0" t-att-class="{ 'justify-content-end': isAlignedRight, 'align-items-center': props.squashed }">
                         <div t-if="!props.squashed" class="o-mail-Message-avatarContainer position-relative bg-view" t-on-click="ev => this.onClickAuthor(ev)">
-                            <img class="o-mail-Message-avatar w-100 h-100 rounded-circle o_object_fit_cover"
+                            <img class="o-mail-Message-avatar w-100 h-100 rounded o_object_fit_cover"
                                 t-att-title="authorText"
                                 t-att-src="authorAvatarUrl"
                                 t-att-class="{ 'o_redirect cursor-pointer': hasAuthorClickable }"/>
@@ -116,7 +116,7 @@
                                     </t>
                                 </t>
                             </div>
-                            <div t-if="props.hasActions and !message.isTransient" class="o-mail-Message-actions bg-view"
+                            <div t-if="props.hasActions and !message.isTransient" class="o-mail-Message-actions"
                                 t-att-class="{
                                     'position-absolute top-0': !env.inDiscussApp,
                                     'start-0 ms-3': isAlignedRight,
@@ -130,7 +130,7 @@
                                     'o-expanded': state.expandOptions
                                 }"
                             >
-                                <div class="d-flex rounded-1 shadow-sm overflow-hidden" t-att-class="{
+                                <div class="d-flex rounded-1 bg-view shadow-sm overflow-hidden" t-att-class="{
                                         'mt-3': env.inChatter and !(message.isDiscussion or message.isNotification),
                                         'flex-row-reverse': env.inChatWindow and isAlignedRight,
                                     }"
diff --git a/addons/mail/static/src/core_ui/message_in_reply.xml b/addons/mail/static/src/core_ui/message_in_reply.xml
index 08a3433a5e6..cd9e885cdb4 100644
--- a/addons/mail/static/src/core_ui/message_in_reply.xml
+++ b/addons/mail/static/src/core_ui/message_in_reply.xml
@@ -9,7 +9,7 @@
             <small class="position-relative d-block text-small mb-1" t-attf-class="{{ env.inChatWindow and props.alignedRight ? 'justify-content-end pe-5': 'ps-5' }}" t-on-click="() => this.props.onClick?.()">
                 <span class="o-mail-MessageInReply-corner position-absolute bottom-0 top-50 pe-4 border-top text-300" t-attf-class="{{ env.inChatWindow and props.alignedRight ? 'o-isRightAlign border-end' : 'o-isLeftAlign border-start' }}" t-att-class="{ 'ms-n2': store.discuss.isActive }"/>
                 <span t-if="!message.parentMessage.isEmpty" class="d-inline-flex align-items-center text-muted opacity-75" t-att-class="{ 'cursor-pointer opacity-100-hover': props.onClick }" t-attf-class="{{ env.inChatWindow and props.alignedRight ? 'pe-3': 'ps-3' }}">
-                    <img class="o-mail-MessageInReply-avatar me-2 rounded-circle" t-att-src="authorAvatarUrl" t-att-title="message.parentMessage.author.name" alt="Avatar"/>
+                    <img class="o-mail-MessageInReply-avatar me-2 rounded" t-att-src="authorAvatarUrl" t-att-title="message.parentMessage.author.name" alt="Avatar"/>
                     <span class="o-mail-MessageInReply-content overflow-hidden">
                         <b>@<t t-out="message.parentMessage.author.name"/></b>:
                         <span class="o-mail-MessageInReply-message ms-1 text-break">
diff --git a/addons/mail/static/src/core_ui/thread.xml b/addons/mail/static/src/core_ui/thread.xml
index 5eba8bc7bd8..9d20a735c1b 100644
--- a/addons/mail/static/src/core_ui/thread.xml
+++ b/addons/mail/static/src/core_ui/thread.xml
@@ -3,7 +3,7 @@
 
 <t t-name="mail.Thread" owl="1">
     <t t-if="env.inChatter" t-call="mail.Thread.jumpPresent"/> <!-- chatter has its own scrollable, this ensures proper sticky showing -->
-    <div class="o-mail-Thread flex-grow-1 bg-view" t-att-class="{ 'overflow-auto': props.hasScrollAdjust, 'pb-4': !state.showJumpPresent }" t-ref="messages">
+    <div class="o-mail-Thread flex-grow-1" t-att-class="{ 'overflow-auto': props.hasScrollAdjust, 'pb-4': !state.showJumpPresent }" t-ref="messages">
         <t t-if="!props.thread.isEmpty or props.thread.loadOlder or props.thread.hasLoadingFailed" name="content">
             <div class="d-flex flex-column position-relative" t-att-class="{'justify-content-end': !env.inChatter and props.thread.type !== 'mailbox'}" style="min-height:100%">
                 <span class="position-absolute w-100 invisible" t-att-class="props.order === 'asc' ? 'bottom-0' : 'top-0'" t-ref="present-treshold" t-att-style="`height: Min(${PRESENT_THRESHOLD}px, 100%)`"/>
diff --git a/addons/mail/static/src/discuss/channel_invitation.xml b/addons/mail/static/src/discuss/channel_invitation.xml
index d3f9fd5ba3c..66f497d4cba 100644
--- a/addons/mail/static/src/discuss/channel_invitation.xml
+++ b/addons/mail/static/src/discuss/channel_invitation.xml
@@ -15,7 +15,7 @@
                                 <div class="o-discuss-ChannelInvitation-avatar position-relative d-flex flex-shrink-0 bg-100">
                                     <img class="w-100 h-100 rounded-circle o_object_fit_cover o_redirect"
                                          t-att-src="threadService.avatarUrl(selectablePartner, props.thread)"/>
-                                    <ImStatus className="'position-absolute bottom-0 end-0'" persona="selectablePartner"/>
+                                    <ImStatus persona="selectablePartner"/>
                                 </div>
                             </div>
                             <span class="flex-grow-1 mx-2 text-truncate fs-6" t-esc="selectablePartner.name"/>
diff --git a/addons/mail/static/src/discuss/channel_member_list.xml b/addons/mail/static/src/discuss/channel_member_list.xml
index 1a8b8cfe780..2877f103fb7 100644
--- a/addons/mail/static/src/discuss/channel_member_list.xml
+++ b/addons/mail/static/src/discuss/channel_member_list.xml
@@ -30,7 +30,7 @@
             <div class="o-bg-inherit o-discuss-ChannelMember-avatar position-relative d-flex ms-4 flex-shrink-0">
                 <img class="w-100 h-100 rounded-circle o_object_fit_cover o_redirect"
                      t-att-src="threadService.avatarUrl(member.persona, props.thread)"/>
-                <ImStatus className="'position-absolute bottom-0 end-0'" persona="member.persona"/>
+                <ImStatus persona="member.persona"/>
             </div>
             <span class="ms-2 text-truncate" t-esc="member.persona.name"/>
             <span class="ms-auto">
diff --git a/addons/mail/static/src/discuss_app/discuss.xml b/addons/mail/static/src/discuss_app/discuss.xml
index cfe2ed1cfab..4798502c675 100644
--- a/addons/mail/static/src/discuss_app/discuss.xml
+++ b/addons/mail/static/src/discuss_app/discuss.xml
@@ -2,7 +2,7 @@
 <templates xml:space="preserve">
 
 <t t-name="mail.Discuss" owl="1">
-    <div class="o-mail-Discuss d-flex h-100 flex-grow-1" t-att-class="{ 'flex-column align-items-center bg-view': store.isSmall }" t-ref="root">
+    <div class="o-mail-Discuss d-flex h-100 flex-grow-1 border-top" t-att-class="{ 'flex-column align-items-center bg-view': store.isSmall }" t-ref="root">
         <div t-if="store.isSmall and store.discuss.activeTab === 'mailbox'" class="w-100 border-bottom" t-call="mail.Discuss.mobileTopbar" t-ref="mobileTopbar"/>
         <div t-if="thread and !(store.isSmall and ['chat', 'channel'].includes(store.discuss.activeTab))" class="o-mail-Discuss-content d-flex flex-column h-100 w-100 bg-view overflow-auto" t-ref="content">
             <div class="o-mail-Discuss-header px-3 bg-100 border-bottom d-flex flex-shrink-0" style="height:42px;">
diff --git a/addons/mail/static/src/discuss_app/im_status.scss b/addons/mail/static/src/discuss_app/im_status.scss
index 336f9c2b3d8..2b25307c894 100644
--- a/addons/mail/static/src/discuss_app/im_status.scss
+++ b/addons/mail/static/src/discuss_app/im_status.scss
@@ -1,12 +1,10 @@
 
 .o-mail-ImStatus {
-    width: 1.2em;
-    height: 1.2em;
-    line-height: 1.3em;
+    $-gap: $font-size-lg - $font-size-base;
 
-    i {
-        line-height: 2rem;
-    }
+    @include o-position-absolute($right: -$-gap, $bottom: -$-gap);
+    width: $font-size-lg;
+    height: $font-size-lg;
 }
 
 .o-bg-inherit {
diff --git a/addons/mail/static/src/discuss_app/im_status.xml b/addons/mail/static/src/discuss_app/im_status.xml
index 384da407b1f..0e8647d122f 100644
--- a/addons/mail/static/src/discuss_app/im_status.xml
+++ b/addons/mail/static/src/discuss_app/im_status.xml
@@ -2,7 +2,7 @@
 <templates xml:space="preserve">
 
     <t t-name="mail.ImStatus" owl="1">
-        <div class="o-mail-ImStatus d-flex justify-content-center flex-shrink-0 align-items-center rounded-circle small o-bg-inherit" t-att-class="props.className">
+        <div class="o-mail-ImStatus position-absolute top-100 start-100 translate-middle w-50 h-50 d-flex justify-content-center flex-shrink-0 align-items-center mt-n1 ms-n1 rounded-circle small o-bg-inherit" t-att-class="props.className">
             <span t-if="props.persona.im_status" class="d-flex flex-column">
                 <i t-if="props.persona.im_status === 'online'" class="fa fa-circle text-success" title="Online" role="img" aria-label="User is online"/>
                 <i t-if="props.persona.im_status === 'away'" class="fa fa-circle text-warning" title="Idle" role="img" aria-label="User is idle"/>
diff --git a/addons/mail/static/src/img/odoobot.png b/addons/mail/static/src/img/odoobot.png
index b1921736d32..f34516d8112 100644
Binary files a/addons/mail/static/src/img/odoobot.png and b/addons/mail/static/src/img/odoobot.png differ
diff --git a/addons/mail/static/src/img/odoobot_transparent.png b/addons/mail/static/src/img/odoobot_transparent.png
index e8c5a4dada8..46e3d84f2c2 100644
Binary files a/addons/mail/static/src/img/odoobot_transparent.png and b/addons/mail/static/src/img/odoobot_transparent.png differ
diff --git a/addons/mail/static/src/public/welcome_page.xml b/addons/mail/static/src/public/welcome_page.xml
index c9d0a9b31d5..1c7ad250850 100644
--- a/addons/mail/static/src/public/welcome_page.xml
+++ b/addons/mail/static/src/public/welcome_page.xml
@@ -34,7 +34,7 @@
                 </t>
                 <p t-if="store.user" class="fs-4">Logged as <span t-esc="store.user.name"/></p>
                 <button class="btn btn-success fa-stack align-self-end p-0 rounded-circle fs-1 shadow" title="Join Channel" t-att-disabled="store.guest and state.userName.trim() === ''" t-on-click="joinChannel">
-                    <i class="fa fa-arrow-right fa-stack"/>
+                    <i class="oi oi-arrow-right fa-stack"/>
                 </button>
             </div>
         </div>
diff --git a/addons/mail/static/src/rtc/call.xml b/addons/mail/static/src/rtc/call.xml
index 5745d90abd7..68043ed9c0b 100644
--- a/addons/mail/static/src/rtc/call.xml
+++ b/addons/mail/static/src/rtc/call.xml
@@ -21,8 +21,8 @@
 
                 <!-- Buttons -->
                 <t t-if="hasSidebarButton">
-                    <i t-if="state.sidebar" class="o-mail-Call-sidebarToggler p-2 fs-5 cursor-pointer position-absolute fa fa-arrow-right" title="Hide sidebar" t-on-click="() => this.state.sidebar = false"/>
-                    <i t-else="" class="o-mail-Call-sidebarToggler p-2 fs-5 cursor-pointer position-absolute fa fa-arrow-left" title="Show sidebar" t-on-click="() => this.state.sidebar = true"/>
+                    <i t-if="state.sidebar" class="o-mail-Call-sidebarToggler p-2 fs-5 cursor-pointer position-absolute oi oi-arrow-right" title="Hide sidebar" t-on-click="() => this.state.sidebar = false"/>
+                    <i t-else="" class="o-mail-Call-sidebarToggler p-2 fs-5 cursor-pointer position-absolute oi oi-arrow-left" title="Show sidebar" t-on-click="() => this.state.sidebar = true"/>
                 </t>
                 <div t-if="state.overlay or !isControllerFloating" class="o-mail-Call-overlay d-flex justify-content-center w-100 pb-1" t-att-class="{ 'o-isFloating position-absolute bottom-0 pb-3': isControllerFloating }">
                     <div t-on-mousemove="onMousemoveOverlay">
diff --git a/addons/mail/static/src/rtc/call_participant_card.scss b/addons/mail/static/src/rtc/call_participant_card.scss
index 33d4bc48836..b966c24ba7d 100644
--- a/addons/mail/static/src/rtc/call_participant_card.scss
+++ b/addons/mail/static/src/rtc/call_participant_card.scss
@@ -13,7 +13,7 @@
     border: solid $gray-500;
 
     &.o-isTalking {
-        border: solid darken($o-enterprise-primary-color, 5%);
+        border: solid darken($o-enterprise-action-color, 5%);
     }
 
     &.o-isInvitation:not(:hover) {
@@ -48,7 +48,7 @@
 
 .o-mail-CallParticipantCard {
     &.o-isTalking {
-        box-shadow: inset 0 0 0 map-get($spacers, 1) darken($o-enterprise-primary-color, 5%);
+        box-shadow: inset 0 0 0 map-get($spacers, 1) darken($o-enterprise-action-color, 5%);
     }
 }
 
diff --git a/addons/mail/static/src/scss/kanban_view.scss b/addons/mail/static/src/scss/kanban_view.scss
index bcd0a5aeb6a..2df6a5479e6 100644
--- a/addons/mail/static/src/scss/kanban_view.scss
+++ b/addons/mail/static/src/scss/kanban_view.scss
@@ -4,26 +4,6 @@ $o-kanban-attachement-image-size: 80px;
     .o_module_desc_short {
         max-width: 90%;
     }
-    .ribbon {
-        &::before, &::after {
-            display: none;
-        }
-
-        span {
-            padding: 5px;
-            font-size: x-small;
-            z-index: unset;
-            height: auto;
-        }
-    }
-    .ribbon-top-right {
-        margin-top: 54px;
-
-        span {
-            top: 15px;
-            left: 10px;
-        }
-    }
 }
 
 .o_kanban_renderer {
@@ -83,7 +63,6 @@ $o-kanban-attachement-image-size: 80px;
                 }
 
                 .oe_kanban_avatar {
-                    border-radius: 4px;
                     border: 1px solid $component-active-color;
                 }
             }
diff --git a/addons/mail/static/src/scss/m2x_avatar_user.scss b/addons/mail/static/src/scss/m2x_avatar_user.scss
index 66a659d74c5..7e8f5ed0a61 100644
--- a/addons/mail/static/src/scss/m2x_avatar_user.scss
+++ b/addons/mail/static/src/scss/m2x_avatar_user.scss
@@ -1,21 +1,6 @@
-@mixin o-avatar-image-hover {
-    cursor: pointer;
-    filter: brightness(0.8);
-}
-
-.o_field_many2one_avatar_user,
-.o_field_many2one_avatar.o_clickable_m2x_avatar {
-    .o_m2o_avatar img:hover {
-        @include o-avatar-image-hover;
+.o_field_many2many_avatar_user, .o_clickable_m2x_avatar {
+    img:hover {
+        cursor: context-menu;
+        outline: $border-width solid $o-action;
     }
-}
-
-.o_field_many2many_avatar_user,
-.o_field_many2manytags.avatar.o_clickable_m2x_avatar {
-    img.o_m2m_avatar {
-        margin-right: 2px;
-        &:hover {
-            @include o-avatar-image-hover;
-        }
-    }
-}
+}
\ No newline at end of file
diff --git a/addons/mail/static/src/scss/variables/primary_variables.scss b/addons/mail/static/src/scss/variables/primary_variables.scss
index 1d53ccdb9fe..ec2756a8dad 100644
--- a/addons/mail/static/src/scss/variables/primary_variables.scss
+++ b/addons/mail/static/src/scss/variables/primary_variables.scss
@@ -1,4 +1,4 @@
-$o-mail-Avatar-size: 36px !default;
+$o-mail-Avatar-size: 42px !default;
 $o-mail-ChatWindow-width: 340px !default;
 $o-mail-Chatter-mobile-gap: 2% !default;
 $o-mail-sidebar-icon-opacity: 0.7 !default;
diff --git a/addons/mail/static/src/views/activity/activity_controller.js b/addons/mail/static/src/views/activity/activity_controller.js
index 8ddcecb9294..9a3fe0d71c2 100644
--- a/addons/mail/static/src/views/activity/activity_controller.js
+++ b/addons/mail/static/src/views/activity/activity_controller.js
@@ -10,9 +10,11 @@ import { SelectCreateDialog } from "@web/views/view_dialogs/select_create_dialog
 import { sprintf } from "@web/core/utils/strings";
 import { useModel } from "@web/views/model";
 import { useService } from "@web/core/utils/hooks";
+import { SearchBar } from "@web/search/search_bar/search_bar";
+import { CogMenu } from "@web/search/cog_menu/cog_menu";
 
 export class ActivityController extends Component {
-    static components = { Layout };
+    static components = { Layout, SearchBar, CogMenu };
     static props = {
         ...standardViewProps,
         Model: Function,
diff --git a/addons/mail/static/src/views/activity/activity_controller.xml b/addons/mail/static/src/views/activity/activity_controller.xml
index 337bcc30ce0..fb3f56e89da 100644
--- a/addons/mail/static/src/views/activity/activity_controller.xml
+++ b/addons/mail/static/src/views/activity/activity_controller.xml
@@ -3,6 +3,12 @@
     <t t-name="mail.ActivityController" owl="1">
         <div t-att-class="props.className + (env.isSmall ? ' o_action_delegate_scroll': '')">
             <Layout display="props.display">
+                <t t-set-slot="control-panel-additional-actions">
+                    <CogMenu/>
+                </t>
+                <t t-set-slot="layout-actions">
+                    <SearchBar/>
+                </t>
                 <t t-component="props.Renderer" t-props="rendererProps" />
             </Layout>
         </div>
diff --git a/addons/mail/static/src/views/form/form_compiler.js b/addons/mail/static/src/views/form/form_compiler.js
index f604c69ac83..b460cf96eb8 100644
--- a/addons/mail/static/src/views/form/form_compiler.js
+++ b/addons/mail/static/src/views/form/form_compiler.js
@@ -5,7 +5,6 @@ import { registry } from "@web/core/registry";
 import { SIZES } from "@web/core/ui/ui_service";
 import { patch } from "@web/core/utils/patch";
 import { append, createElement, setAttributes } from "@web/core/utils/xml";
-import { ViewCompiler, getModifier } from "@web/views/view_compiler";
 import { FormCompiler } from "@web/views/form/form_compiler";
 
 function compileChatter(node, params) {
@@ -37,8 +36,9 @@ function compileChatter(node, params) {
                 break;
         }
     }
-    const chatterContainerXml = createElement("Chatter");
+    const chatterContainerXml = createElement("t");
     setAttributes(chatterContainerXml, {
+        "t-component": "__comp__.mailComponents.Chatter",
         hasActivities,
         hasFollowers,
         hasMessageList,
@@ -46,9 +46,9 @@ function compileChatter(node, params) {
         hasParentReloadOnFollowersUpdate,
         hasParentReloadOnMessagePosted,
         isAttachmentBoxVisibleInitially,
-        threadId: params.threadId,
-        threadModel: params.threadModel,
-        webRecord: params.webRecord,
+        threadId: "__comp__.props.record.resId or undefined",
+        threadModel: "__comp__.props.record.resModel",
+        webRecord: "__comp__.props.record",
         saveRecord: "() => __comp__.saveButtonClicked and __comp__.saveButtonClicked()",
     });
     const chatterContainerHookXml = createElement("div");
@@ -60,92 +60,24 @@ function compileChatter(node, params) {
 function compileAttachmentPreview(node, params) {
     const webClientViewAttachmentViewContainerHookXml = createElement("div");
     webClientViewAttachmentViewContainerHookXml.classList.add("o_attachment_preview");
-    const webClientViewAttachmentViewContainerXml = createElement("AttachmentView");
+    const webClientViewAttachmentViewContainerXml = createElement("t");
     setAttributes(webClientViewAttachmentViewContainerXml, {
-        threadId: params.threadId,
-        threadModel: params.threadModel,
+        "t-component": "__comp__.mailComponents.AttachmentView",
+        threadId: "__comp__.props.record.resId or undefined",
+        threadModel: "__comp__.props.record.resModel",
     });
     append(webClientViewAttachmentViewContainerHookXml, webClientViewAttachmentViewContainerXml);
     return webClientViewAttachmentViewContainerHookXml;
 }
 
-export class MailFormCompiler extends ViewCompiler {
-    setup() {
-        this.compilers.push({ selector: "t", fn: this.compileT });
-        this.compilers.push({ selector: "div.oe_chatter", fn: this.compileChatter });
-        this.compilers.push({
-            selector: "div.o_attachment_preview",
-            fn: this.compileAttachmentPreview,
-        });
-    }
-
-    compile(node, params) {
-        const res = super.compile(node, params).children[0];
-        const chatterContainerHookXml = res.querySelector(".o-mail-Form-chatter");
-        if (chatterContainerHookXml) {
-            setAttributes(chatterContainerHookXml, {
-                "t-if": `!__comp__.hasAttachmentViewer() and __comp__.uiService.size >= ${SIZES.XXL}`,
-                "t-attf-class": "o-aside",
-            });
-            const chatterContainerXml = chatterContainerHookXml.querySelector("Chatter");
-            setAttributes(chatterContainerXml, {
-                hasMessageListScrollAdjust: "true",
-                isInFormSheetBg: "false",
-            });
-        }
-        const attachmentViewHookXml = res.querySelector(".o_attachment_preview");
-        if (attachmentViewHookXml) {
-            setAttributes(attachmentViewHookXml, {
-                "t-if": `__comp__.hasAttachmentViewer()`,
-            });
-        }
-        return res;
-    }
-
-    compileT(node, params) {
-        const compiledRoot = createElement("t");
-        for (const child of node.childNodes) {
-            const invisible = getModifier(child, "invisible");
-            let compiledChild = this.compileNode(child, params, false);
-            compiledChild = this.applyInvisible(invisible, compiledChild, {
-                ...params,
-                recordExpr: "__comp__.model.root",
-            });
-            append(compiledRoot, compiledChild);
-        }
-        return compiledRoot;
-    }
-
-    compileChatter(node) {
-        return compileChatter(node, {
-            chatter: "__comp__.chatter",
-            threadId: "__comp__.model.root.resId or undefined",
-            threadModel: "__comp__.model.root.resModel",
-            webRecord: "__comp__.model.root",
-        });
-    }
-
-    compileAttachmentPreview(node) {
-        return compileAttachmentPreview(node, {
-            threadId: "__comp__.model.root.resId or undefined",
-            threadModel: "__comp__.model.root.resModel",
-        });
-    }
-}
-
 registry.category("form_compilers").add("chatter_compiler", {
     selector: "div.oe_chatter",
-    fn: (node) =>
-        compileChatter(node, {
-            threadId: "__comp__.props.record.resId or undefined",
-            threadModel: "__comp__.props.record.resModel",
-            webRecord: "__comp__.props.record",
-        }),
+    fn: compileChatter,
 });
 
 registry.category("form_compilers").add("attachment_preview_compiler", {
     selector: "div.o_attachment_preview",
-    fn: () => createElement("t"),
+    fn: compileAttachmentPreview,
 });
 
 patch(FormCompiler.prototype, "mail", {
@@ -156,7 +88,9 @@ patch(FormCompiler.prototype, "mail", {
         if (!chatterContainerHookXml) {
             return res; // no chatter, keep the result as it is
         }
-        const chatterContainerXml = chatterContainerHookXml.querySelector("Chatter");
+        const chatterContainerXml = chatterContainerHookXml.querySelector(
+            "t[t-component='__comp__.mailComponents.Chatter']"
+        );
         setAttributes(chatterContainerXml, {
             hasMessageListScrollAdjust: "false",
             isInFormSheetBg: "false",
@@ -170,24 +104,46 @@ patch(FormCompiler.prototype, "mail", {
         if (!parentXml) {
             return res; // miss-config: a sheet-bg is required for the rest
         }
-        if (params.hasAttachmentViewerInArch) {
+
+        const webClientViewAttachmentViewHookXml = res.querySelector(".o_attachment_preview");
+        if (webClientViewAttachmentViewHookXml) {
             // in sheet bg (attachment viewer present)
+            setAttributes(webClientViewAttachmentViewHookXml, {
+                "t-if": `__comp__.hasAttachmentViewer() and __comp__.uiService.size >= ${SIZES.XXL}`,
+            });
             const sheetBgChatterContainerHookXml = chatterContainerHookXml.cloneNode(true);
             sheetBgChatterContainerHookXml.classList.add("o-isInFormSheetBg");
             setAttributes(sheetBgChatterContainerHookXml, {
-                "t-if": `__comp__.props.hasAttachmentViewer`,
+                "t-if": `__comp__.hasAttachmentViewer() and __comp__.uiService.size >= ${SIZES.XXL}`,
             });
             append(formSheetBgXml, sheetBgChatterContainerHookXml);
-            const sheetBgChatterContainerXml =
-                sheetBgChatterContainerHookXml.querySelector("Chatter");
+            const sheetBgChatterContainerXml = sheetBgChatterContainerHookXml.querySelector(
+                "t[t-component='__comp__.mailComponents.Chatter']"
+            );
             setAttributes(sheetBgChatterContainerXml, {
                 isInFormSheetBg: "true",
+                hasMessageListScrollAdjust: "false",
+            });
+        }
+        // after sheet bg (standard position, either aside or below)
+        if (webClientViewAttachmentViewHookXml) {
+            setAttributes(chatterContainerHookXml, {
+                "t-if": `!(__comp__.hasAttachmentViewer() and __comp__.uiService.size >= ${SIZES.XXL})`,
+                "t-attf-class": `{{ __comp__.uiService.size >= ${SIZES.XXL} and !(__comp__.hasAttachmentViewer() and __comp__.uiService.size >= ${SIZES.XXL}) ? "o-aside" : "" }}`,
+            });
+            setAttributes(chatterContainerXml, {
+                isInFormSheetBg: "__comp__.hasAttachmentViewer()",
+                hasMessageListScrollAdjust: `__comp__.uiService.size >= ${SIZES.XXL} and !(__comp__.hasAttachmentViewer() and __comp__.uiService.size >= ${SIZES.XXL})`,
+            });
+        } else {
+            setAttributes(chatterContainerXml, {
+                isInFormSheetBg: "false",
+                hasMessageListScrollAdjust: `__comp__.uiService.size >= ${SIZES.XXL}`,
+            });
+            setAttributes(chatterContainerHookXml, {
+                "t-attf-class": `{{ __comp__.uiService.size >= ${SIZES.XXL} ? "o-aside" : "mt-4 mt-md-0" }}`,
             });
         }
-        // after sheet bg (standard position, below form)
-        setAttributes(chatterContainerHookXml, {
-            "t-if": `!__comp__.props.hasAttachmentViewer and __comp__.uiService.size < ${SIZES.XXL}`,
-        });
         append(parentXml, chatterContainerHookXml);
         return res;
     },
diff --git a/addons/mail/static/src/views/form/form_controller.js b/addons/mail/static/src/views/form/form_controller.js
deleted file mode 100644
index 2f4a7119f33..00000000000
--- a/addons/mail/static/src/views/form/form_controller.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/** @odoo-module */
-
-import { AttachmentView } from "@mail/attachments/attachment_view";
-import { Chatter } from "@mail/web/chatter";
-
-import { browser } from "@web/core/browser/browser";
-import { useService } from "@web/core/utils/hooks";
-import { createElement } from "@web/core/utils/xml";
-import { SIZES } from "@web/core/ui/ui_service";
-import { patch } from "@web/core/utils/patch";
-import { useDebounced } from "@web/core/utils/timing";
-import { FormController } from "@web/views/form/form_controller";
-import { useViewCompiler } from "@web/views/view_compiler";
-import { evalDomain } from "@web/views/utils";
-
-import { MailFormCompiler } from "./form_compiler";
-
-import { onMounted, onWillUnmount, useState } from "@odoo/owl";
-
-patch(FormController.prototype, "mail", {
-    setup() {
-        this._super();
-        this.messagingState = useState({
-            /** @type {import("@mail/core/thread_model").Thread} */
-            thread: undefined,
-        });
-        if (this.env.services["mail.thread"]) {
-            this.threadService = useService("mail.thread");
-        }
-        this.uiService = useService("ui");
-        this.hasAttachmentViewerInArch = false;
-
-        const { archInfo } = this.props;
-
-        const template = createElement("t");
-        const xmlDocAttachmentPreview = archInfo.xmlDoc.querySelector("div.o_attachment_preview");
-        if (xmlDocAttachmentPreview && xmlDocAttachmentPreview.parentNode.nodeName === "form") {
-            // TODO hasAttachmentViewer should also depend on the groups= and/or invisible modifier on o_attachment_preview (see invoice form)
-            template.appendChild(xmlDocAttachmentPreview);
-            this.hasAttachmentViewerInArch = true;
-            archInfo.arch = archInfo.xmlDoc.outerHTML;
-        }
-
-        const xmlDocChatter = archInfo.xmlDoc.querySelector("div.oe_chatter");
-        if (xmlDocChatter && xmlDocChatter.parentNode.nodeName === "form") {
-            template.appendChild(xmlDocChatter.cloneNode(true));
-        }
-
-        const mailTemplates = useViewCompiler(
-            MailFormCompiler,
-            archInfo.arch,
-            { Mail: template },
-            {}
-        );
-        this.mailTemplate = mailTemplates.Mail;
-
-        this.onResize = useDebounced(this.render, 200);
-        onMounted(() => browser.addEventListener("resize", this.onResize));
-        onWillUnmount(() => browser.removeEventListener("resize", this.onResize));
-    },
-    /**
-     * @returns {boolean}
-     */
-    hasAttachmentViewer() {
-        if (
-            !this.threadService ||
-            this.uiService.size < SIZES.XXL ||
-            !this.hasAttachmentViewerInArch ||
-            !this.model.root.resId
-        ) {
-            return false;
-        }
-        this.messagingState.thread = this.threadService.insert({
-            id: this.model.root.resId,
-            model: this.model.root.resModel,
-            type: "chatter",
-        });
-        return this.messagingState.thread.attachmentsInWebClientView.length > 0;
-    },
-    evalDomainFromRecord(record, expr) {
-        return evalDomain(expr, record.evalContext);
-    },
-});
-
-Object.assign(FormController.components, {
-    AttachmentView,
-    Chatter,
-});
diff --git a/addons/mail/static/src/views/form/form_controller.xml b/addons/mail/static/src/views/form/form_controller.xml
index 5d924383e79..cbe6afb3faf 100644
--- a/addons/mail/static/src/views/form/form_controller.xml
+++ b/addons/mail/static/src/views/form/form_controller.xml
@@ -2,14 +2,7 @@
 <templates xml:space="preserve">
 
     <t t-inherit="web.FormView" t-inherit-mode="extension">
-        <xpath expr="//div[hasclass('o_form_view_container')]" position="after">
-            <t t-if="mailTemplate">
-                <t t-call="{{ mailTemplate }}" t-call-context="{ __comp__: Object.assign(Object.create(this), { this: this }) }"/>
-            </t>
-        </xpath>
         <xpath expr="//Layout/t[@t-component='props.Renderer']" position="attributes">
-            <attribute name="hasAttachmentViewerInArch">hasAttachmentViewerInArch</attribute>
-            <attribute name="hasAttachmentViewer">hasAttachmentViewer()</attribute>
             <attribute name="saveButtonClicked">() => this.saveButtonClicked()</attribute>
         </xpath>
     </t>
diff --git a/addons/mail/static/src/views/form/form_renderer.js b/addons/mail/static/src/views/form/form_renderer.js
index cdc2cba6216..0648f0dd0f4 100644
--- a/addons/mail/static/src/views/form/form_renderer.js
+++ b/addons/mail/static/src/views/form/form_renderer.js
@@ -2,29 +2,51 @@
 
 import { Chatter } from "@mail/web/chatter";
 import { AttachmentView } from "@mail/attachments/attachment_view";
-
 import { patch } from "@web/core/utils/patch";
 import { FormRenderer } from "@web/views/form/form_renderer";
+import { browser } from "@web/core/browser/browser";
+import { useService } from "@web/core/utils/hooks";
+import { SIZES } from "@web/core/ui/ui_service";
+import { useDebounced } from "@web/core/utils/timing";
+import { onMounted, onWillUnmount, useState } from "@odoo/owl";
 
 patch(FormRenderer.prototype, "mail", {
-    get compileParams() {
-        return {
-            ...this._super(),
-            hasAttachmentViewerInArch: this.props.hasAttachmentViewerInArch,
-            saveButtonClicked: this.props.saveButtonClicked,
+    setup() {
+        this._super();
+        this.mailComponents = {
+            AttachmentView,
+            Chatter,
         };
+        this.messagingState = useState({
+            /** @type {import("@mail/core/thread_model").Thread} */
+            thread: undefined,
+        });
+        if (this.env.services["mail.thread"]) {
+            this.threadService = useService("mail.thread");
+        }
+        this.uiService = useService("ui");
+
+        this.onResize = useDebounced(this.render, 200);
+        onMounted(() => browser.addEventListener("resize", this.onResize));
+        onWillUnmount(() => browser.removeEventListener("resize", this.onResize));
+    },
+    /**
+     * @returns {boolean}
+     */
+    hasAttachmentViewer() {
+        if (!this.threadService || this.uiService.size < SIZES.XXL || !this.props.record.resId) {
+            return false;
+        }
+        this.messagingState.thread = this.threadService.insert({
+            id: this.props.record.resId,
+            model: this.props.record.resModel,
+            type: "chatter",
+        });
+        return this.messagingState.thread.attachmentsInWebClientView.length > 0;
     },
 });
 
 patch(FormRenderer.props, "mail", {
-    hasAttachmentViewerInArch: { type: Boolean, optional: true },
     // Template props : added by the FormCompiler
-    hasAttachmentViewer: { type: Boolean, optional: true },
-    chatter: { type: Object, optional: true },
     saveButtonClicked: { type: Function, optional: true },
 });
-
-Object.assign(FormRenderer.components, {
-    AttachmentView,
-    Chatter,
-});
diff --git a/addons/mail/static/src/views/form/form_renderer.scss b/addons/mail/static/src/views/form/form_renderer.scss
index 32d0d0f2f58..c68de30488e 100644
--- a/addons/mail/static/src/views/form/form_renderer.scss
+++ b/addons/mail/static/src/views/form/form_renderer.scss
@@ -4,20 +4,14 @@
 
 .o-mail-Form-chatter {
     --ChatterTopbar-padding-v: #{map-get($spacers, 2)};
-
-    @include media-breakpoint-down(md) {
-        --ChatterTopbar-padding-left: #{$o-horizontal-padding};
-        --ChatterTopbar-padding-right: #{$o-horizontal-padding};
-    }
+    --ChatterTopbar-padding-left: #{$o-horizontal-padding};
+    --ChatterTopbar-padding-right: #{$o-horizontal-padding};
 
     &.o-aside {
         --Chatter-max-width: #{$o-form-view-sheet-max-width};
-        --ChatterTopbar-padding-left: #{$o-horizontal-padding};
-        --ChatterTopbar-padding-right: #{$o-horizontal-padding};
 
         flex-shrink: 0;
         flex-grow: 1;
-        border-left: $border-width solid;
         padding: map-get($spacers, 0);
         max-width: var(--Chatter-max-width);
         width: $o-mail-Chatter-minWidth;
@@ -33,13 +27,10 @@
 
     &.o-isInFormSheetBg {
         background-color: $white;
-        width: auto;
         border-top: 1px solid $border-color;
     }
 
     &:not(.o-aside):not(.o-full-width) .o-mail-Chatter {
-        @include make-container-max-widths();
-
         margin-left: auto;
         margin-right: auto;
     }
@@ -49,11 +40,6 @@
 // Style
 // ------------------------------------------------------------------
 
-.o-mail-Form-chatter.o-aside {
-    border-left-color: $border-color;
-}
-
-
 .o-mail-Form-chatter {
     display: flex;
     margin: 0 auto;
diff --git a/addons/mail/static/src/web/activity/activity.scss b/addons/mail/static/src/web/activity/activity.scss
index 2f6e6b6588d..09904574a90 100644
--- a/addons/mail/static/src/web/activity/activity.scss
+++ b/addons/mail/static/src/web/activity/activity.scss
@@ -8,6 +8,5 @@
 }
 
 .o-mail-Activity-iconContainer {
-    @include o-position-absolute($top: auto, $left: auto, $bottom: -16%, $right: -5%);
     box-shadow: 0 0 0 2px $o-view-background-color;
 }
diff --git a/addons/mail/static/src/web/activity/activity.xml b/addons/mail/static/src/web/activity/activity.xml
index 292170499a8..2d05ca52fc6 100644
--- a/addons/mail/static/src/web/activity/activity.xml
+++ b/addons/mail/static/src/web/activity/activity.xml
@@ -3,11 +3,11 @@
 
 <t t-name="mail.Activity" owl="1">
     <t t-set="activity" t-value="props.data"/>
-    <div class="o-mail-Activity d-flex px-4 py-1 mb-2">
+    <div class="o-mail-Activity d-flex px-3 py-1 mb-2">
         <div class="o-mail-Activity-sidebar flex-shrink-0 position-relative">
-            <img class="w-100 h-100 rounded-circle" t-attf-src="/web/image/res.users/{{activity.user_id[0]}}/avatar_128"/>
+            <img class="w-100 h-100 rounded" t-attf-src="/web/image/res.users/{{activity.user_id[0]}}/avatar_128"/>
                 <div
-                    class="o-mail-Activity-iconContainer d-flex align-items-center justify-content-center rounded-circle w-50 h-50"
+                    class="o-mail-Activity-iconContainer position-absolute top-100 start-100 translate-middle d-flex align-items-center justify-content-center mt-n1 ms-n1 rounded-circle w-50 h-50"
                     t-att-class="{
                             'text-bg-success': activity.state === 'planned',
                             'text-bg-warning': activity.state === 'today',
@@ -18,7 +18,7 @@
                 </div>
         </div>
         <div class="flex-grow px-3">
-            <div class="o-mail-Activity-info">
+            <div class="o-mail-Activity-info lh-1">
                 <span class="fw-bolder text-success" t-if="state.delay === 1">Tomorrow:</span>
                 <span class="fw-bolder text-success" t-elif="state.delay gt 0">Due in <t t-esc="state.delay"/> days:</span>
                 <span class="fw-bolder text-danger" t-elif="state.delay === -1">Yesterday:</span>
@@ -29,7 +29,7 @@
                 <i class="fa fa-info-circle btn-link btn-primary cursor-pointer ms-1" role="img" title="Info" aria-label="Info" t-on-click="toggleDetails"></i>
             </div>
             <div t-if="state.showDetails">
-                <table class="o-mail-Activity-details table table-sm">
+                <table class="o-mail-Activity-details table table-sm mt-2">
                     <tbody>
                         <tr><td class="text-end fw-bolder">Activity type</td><td><t t-esc="activity.activity_type_id[1]"/></td></tr>
                         <tr><td class="text-end fw-bolder">Created</td><td><t t-esc="activity.create_date"/> by <t t-esc="activity.create_uid[1]"/></td></tr>
@@ -42,16 +42,16 @@
             <div t-if="activity.mail_template_ids.length > 0" class="o-mail-Activity-mailTemplates">
                 <ActivityMailTemplate activity="activity" onUpdate="props.onUpdate"/>
             </div>
-            <div t-if="activity.can_write">
+            <div t-if="activity.can_write" class="lh-lg">
                 <t name="tools">
-                    <span class="o-mail-Activity-markDone btn btn-link btn-primary p-0 me-3" t-on-click="onClickMarkAsDone"><i class="fa fa-check"/> Mark Done</span>
+                    <span class="o-mail-Activity-markDone btn btn-link btn-success p-0 me-3" t-on-click="onClickMarkAsDone"><i class="fa fa-check"/> Mark Done</span>
                     <FileUploader t-if="activity.activity_category === 'upload_file'" onUploaded.bind="onFileUploaded">
                         <t t-set-slot="toggler">
-                            <span class="btn btn-link btn-primary p-0 me-3"><i t-attf-class="fa {{ activity.icon }}"/><t t-out="' ' + activity.display_name"/></span>
+                            <span class="btn btn-link text-action p-0 me-3"><i t-attf-class="fa {{ activity.icon }}"/><t t-out="' ' + activity.display_name"/></span>
                         </t>
                     </FileUploader>
-                    <span class="o-mail-Activity-edit btn btn-link btn-primary p-0 me-3" t-on-click="edit"><i class="fa fa-pencil"/> Edit</span>
-                    <span class="btn btn-link btn-primary p-0" t-on-click="unlink"><i class="fa fa-times"/> Cancel</span>
+                    <span class="o-mail-Activity-edit btn btn-link text-action p-0 me-3" t-on-click="edit"><i class="fa fa-pencil"/> Edit</span>
+                    <span class="btn btn-link btn-danger p-0" t-on-click="unlink"><i class="fa fa-times"/> Cancel</span>
                 </t>
             </div>
         </div>
diff --git a/addons/mail/static/src/web/activity/activity_menu.xml b/addons/mail/static/src/web/activity/activity_menu.xml
index 491af0f9d97..ddda9dccaf2 100644
--- a/addons/mail/static/src/web/activity/activity_menu.xml
+++ b/addons/mail/static/src/web/activity/activity_menu.xml
@@ -5,7 +5,7 @@
     <Dropdown position="'bottom-end'" autoOpen="false" beforeOpen.bind="onBeforeOpen" menuClass="`p-0 ${ store.isSmall ? 'start-0 w-100 mh-100 bottom-0 d-flex flex-column' : ''}`">
         <t t-set-slot="toggler">
             <i class="fa fa-lg fa-clock-o" role="img" aria-label="Activities"></i>
-            <span t-if="store.activityCounter" class="o-mail-ActivityMenu-counter badge"><t t-esc="store.activityCounter"/></span>
+            <span t-if="store.activityCounter" class="o-mail-ActivityMenu-counter badge rounded-pill"><t t-esc="store.activityCounter"/></span>
         </t>
         <t t-set-slot="default">
             <div class="o-mail-ActivityMenu bg-view flex-grow-1 d-flex flex-column" t-att-class="{ 'overflow-auto w-100 mh-100': store.isSmall }">
diff --git a/addons/mail/static/src/web/chat_window/chat_window.xml b/addons/mail/static/src/web/chat_window/chat_window.xml
index 37ea890ce4c..35057606aba 100644
--- a/addons/mail/static/src/web/chat_window/chat_window.xml
+++ b/addons/mail/static/src/web/chat_window/chat_window.xml
@@ -15,7 +15,7 @@
     >
         <div class="o-mail-ChatWindow-header d-flex align-items-center flex-shrink-0" t-on-click="toggleFold" t-att-class="{ 'cursor-pointer': !store.isSmall, 'border-bottom': !props.chatWindow.folded }">
             <div t-if="store.isSmall" class="cursor-pointer d-flex align-items-center h-100 px-3 py-0 me-2" title="Close conversation" t-on-click="() => this.close()">
-                <i class="fa fa-arrow-left"/>
+                <i class="oi oi-arrow-left"/>
             </div>
             <ThreadIcon t-if="thread" thread="thread" className="'ms-3 me-1 my-0'"/>
             <span class="o-mail-ChatWindow-name text-truncate" t-att-title="props.chatWindow.displayName" t-esc="props.chatWindow.displayName" t-att-class="{
diff --git a/addons/mail/static/src/web/chatter.scss b/addons/mail/static/src/web/chatter.scss
index 894c2e1466e..9ece13bb8af 100644
--- a/addons/mail/static/src/web/chatter.scss
+++ b/addons/mail/static/src/web/chatter.scss
@@ -2,14 +2,6 @@
     display: none;
 }
 
-.o-mail-Chatter-topbar {
-    padding-inline-start: 0;
-}
-
-.o-mail-Form-chatter.o-aside .o-mail-Chatter-topbar  {
-    padding-inline-start: $o-horizontal-padding;
-}
-
 .o-chatter-disabled .o-mail-Message-actions {
     display: none;
 }
diff --git a/addons/mail/static/src/web/chatter.xml b/addons/mail/static/src/web/chatter.xml
index 662effea99c..602b1a7eb18 100644
--- a/addons/mail/static/src/web/chatter.xml
+++ b/addons/mail/static/src/web/chatter.xml
@@ -2,27 +2,27 @@
 <templates xml:space="preserve">
 
 <t t-name="mail.Chatter" owl="1">
-    <div class="o-mail-Chatter bg-view h-100 flex-grow-1 d-flex flex-column" t-att-class="{ 'overflow-auto': props.hasMessageListScrollAdjust, 'o-chatter-disabled': props.threadId === false }" t-ref="root">
-        <div class="o-mail-Chatter-topbar d-flex flex-shrink-0 flex-grow-0">
-            <button t-if="props.hasMessageList" class="o-mail-Chatter-sendMessage btn text-nowrap me-2" t-att-class="{ 'btn-odoo': state.thread.composer.type !== 'note', 'btn-light': state.thread.composer.type === 'note', 'o-active': state.thread.composer.type === 'message', 'my-2': !props.compactHeight }" t-att-disabled="!state.thread.hasWriteAccess and !(state.thread.hasReadAccess and state.thread.canPostOnReadonly) and props.threadId" data-hotkey="m" t-on-click="() => this.toggleComposer('message')">
+    <div class="o-mail-Chatter w-100 h-100 flex-grow-1 d-flex flex-column" t-att-class="{ 'overflow-auto': props.hasMessageListScrollAdjust, 'o-chatter-disabled': props.threadId === false }" t-ref="root">
+        <div class="o-mail-Chatter-topbar d-flex flex-shrink-0 flex-grow-0 px-3 overflow-x-auto">
+            <button t-if="props.hasMessageList" class="o-mail-Chatter-sendMessage btn text-nowrap me-1" t-att-class="{ 'btn-primary': state.thread.composer.type !== 'note', 'btn-secondary': state.thread.composer.type === 'note', 'o-active': state.thread.composer.type === 'message', 'my-2': !props.compactHeight }" t-att-disabled="!state.thread.hasWriteAccess and !(state.thread.hasReadAccess and state.thread.canPostOnReadonly) and props.threadId" data-hotkey="m" t-on-click="() => this.toggleComposer('message')">
                 Send message
             </button>
-            <button t-if="props.hasMessageList" class="o-mail-Chatter-logNote btn text-nowrap me-2" t-att-class="{ 'btn-odoo o-active': state.thread.composer.type === 'note', 'btn-light': state.thread.composer.type !== 'note', 'my-2': !props.compactHeight }" data-hotkey="shift+m" t-on-click="() => this.toggleComposer('note')">
+            <button t-if="props.hasMessageList" class="o-mail-Chatter-logNote btn text-nowrap me-2" t-att-class="{ 'btn-primary o-active': state.thread.composer.type === 'note', 'btn-secondary': state.thread.composer.type !== 'note', 'my-2': !props.compactHeight }" data-hotkey="shift+m" t-on-click="() => this.toggleComposer('note')">
                 Log note
             </button>
-            <div class="border-bottom flex-grow-1 d-flex" t-att-class="{ 'border-start ps-2 pe-4': props.hasActivities }">
-                <button t-if="props.hasActivities" class="btn btn-light text-nowrap" t-att-class="{ 'my-2': !props.compactHeight }" data-hotkey="shift+a" t-on-click="scheduleActivity">
+            <div class="flex-grow-1 d-flex">
+                <button t-if="props.hasActivities" class="btn btn-secondary text-nowrap" t-att-class="{ 'my-2': !props.compactHeight }" data-hotkey="shift+a" t-on-click="scheduleActivity">
                     <i class="fa fa-clock-o me-1"/>
                     <span>Activities</span>
                 </button>
-                <span class="o-mail-Chatter-topbarGrow flex-grow-1 border-start pe-2" t-att-class="{ 'ms-2': props.hasActivities }"/>
+                <span class="o-mail-Chatter-topbarGrow flex-grow-1 pe-2"/>
                 <FileUploader t-if="attachments.length === 0" fileUploadClass="'o-mail-Chatter-fileUploader'" multiUpload="true" onUploaded.bind="onUploaded" onClick="(ev) => this.onClickAttachFile(ev)">
                     <t t-set-slot="toggler">
                         <t t-call="mail.Chatter.attachFiles"/>
                     </t>
                 </FileUploader>
                 <t t-else="" t-call="mail.Chatter.attachFiles"/>
-                <Dropdown t-if="props.hasFollowers" position="'bottom-end'" disabled="isDisabled" class="'o-mail-Followers d-flex'" menuClass="'o-mail-Followers-dropdown flex-column p-0'" menuDisplay="'d-flex'" title="followerButtonLabel" togglerClass="'o-mail-Followers-button btn btn-light px-2 ' + (props.compactHeight ? '' : 'my-2')">
+                <Dropdown t-if="props.hasFollowers" position="'bottom-end'" disabled="isDisabled" class="'o-mail-Followers d-flex me-1'" menuClass="'o-mail-Followers-dropdown flex-column p-0'" menuDisplay="'d-flex'" title="followerButtonLabel" togglerClass="'o-mail-Followers-button btn btn-link text-action px-1 ' + (props.compactHeight ? '' : 'my-2')">
                     <t t-set-slot="toggler">
                         <i class="fa fa-user-o" role="img"/>
                         <span class="o-mail-Followers-counter ps-1" t-esc="state.thread.followers.length"/>
@@ -58,7 +58,7 @@
                 <button t-if="props.hasFollowers and state.thread.followerOfSelf" class="btn px-0" t-att-class="{ 'text-success': !unfollowHover.isHover, 'text-warning': unfollowHover.isHover, 'my-2': !props.compactHeight }" t-att-disabled="!props.threadId" t-on-click="onClickUnfollow" t-ref="unfollow">
                     <div class="position-relative">
                         <!-- Hidden element used to set the button maximum size -->
-                        <span class="invisible">
+                        <span class="d-flex invisible text-nowrap">
                             <i class="me-1 fa fa-fw fa-eye-slash"/><t t-out="followingText.length > unfollowText.length ? followingText : unfollowText"/>
                         </span>
                         <span class="position-absolute end-0 top-0" t-att-class="{ 'text-warning': unfollowHover.isHover }">
@@ -66,7 +66,16 @@
                         </span>
                     </div>
                 </button>
-                <button t-if="!state.thread.followerOfSelf" class="o-mail-Chatter-follow btn btn-link text-600" t-on-click="onClickFollow">Follow</button>
+                <button t-if="!state.thread.followerOfSelf" class="o-mail-Chatter-follow btn btn-link  px-0 text-600" t-on-click="onClickFollow">
+                    <div class="position-relative">
+                        <span class="d-flex invisible text-nowrap">
+                            <i class="me-1 fa fa-fw fa-eye-slash"/><t t-out="followingText.length > unfollowText.length ? followingText : unfollowText"/>
+                        </span>
+                        <span class="position-absolute end-0 top-0">
+                            Follow
+                        </span>
+                    </div>
+                </button>
             </div>
             <button t-if="props.close" class="o-mail-Chatter-close btn btn-dark flex-shrink-0 rounded-bottom-3" aria-label="Close" t-on-click="props.close">
                 <i class="oi oi-large oi-close"/>
@@ -136,7 +145,7 @@
 </t>
 
 <t t-name="mail.Chatter.attachFiles" owl="1">
-    <button class="btn btn-light" aria-label="Attach files" t-att-class="{ 'my-2': !props.compactHeight }" t-on-click="onClickAddAttachments">
+    <button class="btn btn-link text-action px-1" aria-label="Attach files" t-att-class="{ 'my-2': !props.compactHeight }" t-on-click="onClickAddAttachments">
         <i class="fa fa-paperclip fa-lg me-1"/>
         <span t-if="attachments.length > 0" t-esc="attachments.length"/>
         <i t-if="!state.thread.areAttachmentsLoaded and state.thread.isLoadingAttachments" class="fa fa-circle-o-notch fa-spin" aria-label="Attachment counter loading..."/>
diff --git a/addons/mail/static/src/web/discuss_app/sidebar.xml b/addons/mail/static/src/web/discuss_app/sidebar.xml
index 51f43f980e8..db39da9b910 100644
--- a/addons/mail/static/src/web/discuss_app/sidebar.xml
+++ b/addons/mail/static/src/web/discuss_app/sidebar.xml
@@ -54,7 +54,7 @@
     <t t-set="hover_class" t-value="'btn p-0 text-start text-700 opacity-100-hover opacity-75'"/>
     <div class="o-mail-DiscussCategory d-flex align-items-center my-1" t-att-class="category.extraClass">
         <div t-attf-class="d-flex align-items-baseline mx-1 {{ hover_class }}" t-on-click="() => this.toggleCategory(category)">
-            <i class="o-mail-DiscussCategory-icon small" t-att-class="category.isOpen ? 'fa fa-chevron-down' : 'fa fa-chevron-right'"/>
+            <i class="o-mail-DiscussCategory-icon small" t-att-class="category.isOpen ? 'oi oi-chevron-down' : 'oi oi-chevron-right'"/>
             <span class="btn-sm p-0 text-uppercase fw-bolder"><t t-esc="category.name"/></span>
         </div>
         <div class="flex-grow-1"/>
@@ -91,8 +91,8 @@
         t-on-click="(ev) => this.openThread(ev, thread)"
     >
         <div class="o-bg-inherit position-relative d-flex ms-4 flex-shrink-0" style="width:30px;height:30px">
-            <img class="w-100 h-100 rounded-circle" t-att-src="thread.imgUrl" alt="Thread Image"/>
-            <ThreadIcon t-if="thread.type === 'chat' or (thread.type === 'channel' and !thread.authorizedGroupFullName)" thread="thread" size="'small'" className="'o-mail-DiscussCategoryItem-threadIcon position-absolute bottom-0 end-0 d-flex align-items-center justify-content-center rounded-circle bg-100'"/>
+            <img class="w-100 h-100 rounded" t-att-src="thread.imgUrl" alt="Thread Image"/>
+            <ThreadIcon t-if="thread.type === 'chat' or (thread.type === 'channel' and !thread.authorizedGroupFullName)" thread="thread" size="'small'" className="'o-mail-DiscussCategoryItem-threadIcon position-absolute bottom-0 end-0 p-1 me-n1 mb-n1 d-flex align-items-center justify-content-center rounded-circle bg-100'"/>
         </div>
         <span class="ms-3 me-2 text-truncate" t-att-class="{ 'o-item-unread fw-bolder': thread.message_unread_counter > 0 }">
             <t t-esc="thread.displayName"/>
diff --git a/addons/mail/static/src/web/fields/avatar/avatar.scss b/addons/mail/static/src/web/fields/avatar/avatar.scss
index df7802ff21b..e69de29bb2d 100644
--- a/addons/mail/static/src/web/fields/avatar/avatar.scss
+++ b/addons/mail/static/src/web/fields/avatar/avatar.scss
@@ -1,12 +0,0 @@
-.o-mail-Avatar {
-    line-height: 19px;
-
-    > img {
-        height: 19px;
-        width: 19px;
-        &:hover {
-            cursor: pointer;
-            filter: brightness(0.8);
-        }
-    }
-}
diff --git a/addons/mail/static/src/web/fields/avatar/avatar.xml b/addons/mail/static/src/web/fields/avatar/avatar.xml
index 94c3d56c298..055c145148c 100644
--- a/addons/mail/static/src/web/fields/avatar/avatar.xml
+++ b/addons/mail/static/src/web/fields/avatar/avatar.xml
@@ -2,8 +2,8 @@
 <templates xml:space="preserve">
 
     <t t-name="mail.Avatar" owl="1">
-        <div class="o-mail-Avatar d-flex align-items-center">
-            <img class="rounded-circle me-2"
+        <div class="o-mail-Avatar o_avatar d-flex align-items-center">
+            <img class="rounded me-2"
                 t-attf-src="/web/image/{{props.resModel}}/{{props.resId}}/avatar_128"
                 t-on-click.stop.prevent="onClickAvatar"
             />
diff --git a/addons/mail/static/src/web/fields/many2many_avatar_user_field/many2many_avatar_user_field.scss b/addons/mail/static/src/web/fields/many2many_avatar_user_field/many2many_avatar_user_field.scss
index 71d6c0d0c5e..93adabeccf5 100644
--- a/addons/mail/static/src/web/fields/many2many_avatar_user_field/many2many_avatar_user_field.scss
+++ b/addons/mail/static/src/web/fields/many2many_avatar_user_field/many2many_avatar_user_field.scss
@@ -11,14 +11,11 @@
                 color: inherit;
                 margin-right: 0px;
             }
-        
-            .o_m2m_avatar, .o_m2m_avatar_empty {
+
+            .o_m2m_avatar_empty {
                 width: 20px;
                 height: 20px;
                 margin-left: 0px;
-            }
-        
-            .o_m2m_avatar_empty {
                 background-color: $o-gray-300;
                 vertical-align: bottom;
             }
diff --git a/addons/mail/static/src/web/fields/many2many_avatar_user_field/many2many_avatar_user_field.xml b/addons/mail/static/src/web/fields/many2many_avatar_user_field/many2many_avatar_user_field.xml
index 58193422aba..0fa9b6cbe56 100644
--- a/addons/mail/static/src/web/fields/many2many_avatar_user_field/many2many_avatar_user_field.xml
+++ b/addons/mail/static/src/web/fields/many2many_avatar_user_field/many2many_avatar_user_field.xml
@@ -21,7 +21,6 @@
 
     <t t-name="mail.KanbanMany2ManyTagsAvatarUserField" t-inherit="web.KanbanMany2ManyTagsAvatarField" t-inherit-mode="primary" owl="1">
         <TagsList position="attributes">
-            <attribute name="displayBadge">!props.readonly</attribute>
             <attribute name="displayText">displayText</attribute>
         </TagsList>
     </t>
diff --git a/addons/mail/static/src/web/fields/many2many_tags_email/many2many_tags_email.xml b/addons/mail/static/src/web/fields/many2many_tags_email/many2many_tags_email.xml
index 575c1b9b912..02fb4bfbbb6 100644
--- a/addons/mail/static/src/web/fields/many2many_tags_email/many2many_tags_email.xml
+++ b/addons/mail/static/src/web/fields/many2many_tags_email/many2many_tags_email.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
     <t t-name="FieldMany2ManyTagsEmailTagsList" t-inherit="web.TagsList" t-inherit-mode="primary" owl="1">
-        <xpath expr="//span[contains(@t-attf-class, 'badge')]" position="replace">
+        <xpath expr="//span[contains(@class, 'o_tag')]" position="replace">
             <div t-if="tag.email" t-attf-class="badge rounded-pill dropdown o_tag o_tag_color_0 #{tag.email.indexOf('@') &lt; 0 ? 'o_tag_error' : ''}" t-att-data-color="tag.colorIndex" t-att-data-index="tag_index" t-att-data-id="tag.id" t-att-title="tag.text">
                 <span class="o_badge_text" t-att-title="tag.email"><t t-esc="tag.text"/></span>
                 <a t-if="!readonly &amp;&amp; tag.onDelete" t-on-click.stop.prevent="tag.onDelete" href="#" class="fa fa-times o_delete" title="Delete" aria-label="Delete"/>
diff --git a/addons/mail/static/src/web/fields/many2one_avatar_user_field/many2one_avatar_user_field.js b/addons/mail/static/src/web/fields/many2one_avatar_user_field/many2one_avatar_user_field.js
index 81f318def44..9dccde8ac71 100644
--- a/addons/mail/static/src/web/fields/many2one_avatar_user_field/many2one_avatar_user_field.js
+++ b/addons/mail/static/src/web/fields/many2one_avatar_user_field/many2one_avatar_user_field.js
@@ -65,19 +65,8 @@ export class KanbanMany2OneAvatarUserField extends KanbanMany2OneAvatarField {
      * All props are normally passed to the Many2OneField however since
      * we add a new one, we need to filter it out.
      */
-    get m2oFieldProps() {
-        const props = {
-            ...this.props,
-        };
-        delete props.displayAvatarName;
-        return props;
-    }
-
     get popoverProps() {
-        const props = {
-            ...super.popoverProps,
-            readonly: false,
-        };
+        const props = super.popoverProps;
         delete props.displayAvatarName;
         return props;
     }
diff --git a/addons/mail/static/src/web/message_patch.xml b/addons/mail/static/src/web/message_patch.xml
index c4e4516c16c..762b9598d65 100644
--- a/addons/mail/static/src/web/message_patch.xml
+++ b/addons/mail/static/src/web/message_patch.xml
@@ -20,7 +20,7 @@
                         </t>
                     </ul>
                 </t>
-                <div t-if="message.body" class="o-mail-Message-body text-break mb-0 bg-view w-100" t-ref="body">
+                <div t-if="message.body" class="o-mail-Message-body text-break mb-0 w-100" t-ref="body">
                     <t t-out="message.body"/>
                 </div>
             </t>
diff --git a/addons/mail/static/src/web/messaging_menu/messaging_menu.xml b/addons/mail/static/src/web/messaging_menu/messaging_menu.xml
index c5ac62ab40a..e52c9d28d88 100644
--- a/addons/mail/static/src/web/messaging_menu/messaging_menu.xml
+++ b/addons/mail/static/src/web/messaging_menu/messaging_menu.xml
@@ -5,7 +5,7 @@
     <Dropdown t-if="!env.inDiscussApp" autoOpen="false" beforeOpen.bind="beforeOpen" onStateChanged="state => this.state.isOpen = state.open" position="'bottom-end'" menuClass="`p-0 ${ store.isSmall ? 'start-0 w-100 mh-100 bottom-0 d-flex flex-column' : ''}`">
         <t t-set-slot="toggler">
             <i class="fa fa-lg fa-comments" role="img" aria-label="Messages" t-on-click="() => store.discuss.activeTab = store.isSmall and store.discuss.activeTab === 'mailbox' ? 'all' : store.discuss.activeTab"></i>
-            <span t-if="counter" class="o-mail-MessagingMenu-counter badge"><t t-esc="counter"/></span>
+            <span t-if="counter" class="o-mail-MessagingMenu-counter badge rounded-pill"><t t-esc="counter"/></span>
         </t>
         <t t-set-slot="default">
             <t t-call="mail.MessagingMenu.content"/>
@@ -57,7 +57,7 @@
                 onClick="() => notification.requestPermission()"
             >
                 <t t-set-slot="icon">
-                    <ImStatus className="'position-absolute bottom-0 end-0'" persona="notificationRequest.partner"/>
+                    <ImStatus persona="notificationRequest.partner"/>
                 </t>
             </NotificationItem>
             <t t-if="store.discuss.activeTab === 'all'">
@@ -89,7 +89,7 @@
                     onSwipeLeft="hasTouch() and threadService.canUnpin(thread) ? { action: () => this.threadService.unpin(thread), icon: 'fa-times-circle', bgColor: 'bg-danger' } : undefined"
                 >
                     <t t-set-slot="icon">
-                        <ImStatus t-if="thread.type === 'chat'" className="'position-absolute bottom-0 end-0'" persona="thread.correspondent"/>
+                        <ImStatus t-if="thread.type === 'chat'" persona="thread.correspondent"/>
                     </t>
                     <t t-if="message" t-set-slot="body-icon">
                         <t t-if="message.isSelfAuthored">
diff --git a/addons/mail/static/src/web/messaging_menu/notification_item.xml b/addons/mail/static/src/web/messaging_menu/notification_item.xml
index f51b687becb..ae134d9fe85 100644
--- a/addons/mail/static/src/web/messaging_menu/notification_item.xml
+++ b/addons/mail/static/src/web/messaging_menu/notification_item.xml
@@ -5,7 +5,7 @@
     <ActionSwiper onLeftSwipe="props.onSwipeLeft ? props.onSwipeLeft : undefined" onRightSwipe="props.onSwipeRight ? props.onSwipeRight : undefined">
         <div class="o-mail-NotificationItem d-flex cursor-pointer align-items-center p-1" t-att-class="{ 'border-bottom': !props.isLast, 'o-muted': !props.hasMarkAsReadButton }" t-on-click="onClick">
             <div class="position-relative o-bg-inherit m-1 flex-shrink-0" style="width:40px;height:40px;">
-                <img class="w-100 h-100 rounded-circle" alt="Notification Item Image" t-att-src="props.iconSrc"/>
+                <img class="o_avatar w-100 h-100 rounded" alt="Notification Item Image" t-att-src="props.iconSrc"/>
                 <t t-slot="icon"/>
             </div>
             <div class="d-flex flex-column flex-grow-1 align-self-start m-2 overflow-auto">
diff --git a/addons/mail/static/tests/discuss_app/discuss_tests.js b/addons/mail/static/tests/discuss_app/discuss_tests.js
index 76261d419d5..12443fdd6a8 100644
--- a/addons/mail/static/tests/discuss_app/discuss_tests.js
+++ b/addons/mail/static/tests/discuss_app/discuss_tests.js
@@ -1994,6 +1994,6 @@ QUnit.test(
         await click(".o-mail-NotificationItem:contains(General)");
         await click(".o-mail-ChatWindow [title='Open in Discuss']");
         await click(".o-mail-DiscussCategoryItem:contains(General) [title='Channel settings']");
-        assert.strictEqual($(".breadcrumb").text(), "DiscussGeneral");
+        assert.strictEqual($(".o_breadcrumb").text(), "DiscussGeneral");
     }
 );
diff --git a/addons/mail/static/tests/discuss_app/sidebar_tests.js b/addons/mail/static/tests/discuss_app/sidebar_tests.js
index 7ef9d62bc69..cdc4ed0d7e4 100644
--- a/addons/mail/static/tests/discuss_app/sidebar_tests.js
+++ b/addons/mail/static/tests/discuss_app/sidebar_tests.js
@@ -830,7 +830,7 @@ QUnit.test("channel - states: close from the bus", async (assert) => {
             },
         });
     });
-    assert.containsOnce($, ".o-mail-DiscussCategory-channel .fa-chevron-right");
+    assert.containsOnce($, ".o-mail-DiscussCategory-channel .oi-chevron-right");
     assert.containsNone($, "button:contains(test)");
 });
 
@@ -851,7 +851,7 @@ QUnit.test("channel - states: open from the bus", async (assert) => {
             },
         });
     });
-    assert.containsOnce($, ".o-mail-DiscussCategory-channel .fa-chevron-down");
+    assert.containsOnce($, ".o-mail-DiscussCategory-channel .oi-chevron-down");
     assert.containsOnce($, "button:contains(test)");
 });
 
@@ -866,7 +866,7 @@ QUnit.test(
         assert.containsOnce($, "button:contains(test).o-active");
 
         await click(".o-mail-DiscussCategory span:contains(Channels)");
-        assert.containsOnce($, ".o-mail-DiscussCategory-channel .fa-chevron-right");
+        assert.containsOnce($, ".o-mail-DiscussCategory-channel .oi-chevron-right");
         assert.containsOnce($, "button:contains(test)");
 
         await click("button:contains(Inbox)");
@@ -958,7 +958,7 @@ QUnit.test("chat - states: close from the bus", async (assert) => {
             },
         });
     });
-    assert.containsOnce($, ".o-mail-DiscussCategory-chat .fa-chevron-right");
+    assert.containsOnce($, ".o-mail-DiscussCategory-chat .oi-chevron-right");
     assert.containsNone($, "button:contains(Mitchell Admin)");
 });
 
@@ -979,7 +979,7 @@ QUnit.test("chat - states: open from the bus", async (assert) => {
             },
         });
     });
-    assert.containsOnce($, ".o-mail-DiscussCategory-chat .fa-chevron-down");
+    assert.containsOnce($, ".o-mail-DiscussCategory-chat .oi-chevron-down");
     assert.containsOnce($, "button:contains(Mitchell Admin)");
 });
 
@@ -990,18 +990,18 @@ QUnit.test(
         pyEnv["discuss.channel"].create({ channel_type: "chat" });
         const { openDiscuss } = await start();
         await openDiscuss();
-        assert.containsOnce($, ".o-mail-DiscussCategory-chat .fa-chevron-down");
+        assert.containsOnce($, ".o-mail-DiscussCategory-chat .oi-chevron-down");
         assert.containsOnce($, "button:contains(Mitchell Admin)");
 
         await click("button:contains(Mitchell Admin)");
         assert.containsOnce($, "button:contains(Mitchell Admin).o-active");
 
         await click(".o-mail-DiscussCategory-chat span:contains(Direct messages)");
-        assert.containsOnce($, ".o-mail-DiscussCategory-chat .fa-chevron-right");
+        assert.containsOnce($, ".o-mail-DiscussCategory-chat .oi-chevron-right");
         assert.containsOnce($, "button:contains(Mitchell Admin)");
 
         await click("button:contains(Inbox)");
-        assert.containsOnce($, ".o-mail-DiscussCategory-chat .fa-chevron-right");
+        assert.containsOnce($, ".o-mail-DiscussCategory-chat .oi-chevron-right");
         assert.containsNone($, "button:contains(Mitchell Admin)");
     }
 );
diff --git a/addons/mail/static/tests/web/chatter_tests.js b/addons/mail/static/tests/web/chatter_tests.js
index 0b7a14448bf..7c7836b665d 100644
--- a/addons/mail/static/tests/web/chatter_tests.js
+++ b/addons/mail/static/tests/web/chatter_tests.js
@@ -190,10 +190,10 @@ QUnit.test("Composer type is kept when switching from aside to bottom", async (a
     });
     assert.hasClass(
         $("button:contains(Log note)"),
-        "btn-odoo",
+        "btn-primary",
         "Active button should be the log note button"
     );
-    assert.doesNotHaveClass($("button:contains(Send message)"), "btn-odoo");
+    assert.doesNotHaveClass($("button:contains(Send message)"), "btn-primary");
 });
 
 QUnit.test("chatter: drop attachments", async (assert) => {
diff --git a/addons/mail/static/tests/web/debug_menu_tests.js b/addons/mail/static/tests/web/debug_menu_tests.js
index fc5a4edc166..5a90cd0c678 100644
--- a/addons/mail/static/tests/web/debug_menu_tests.js
+++ b/addons/mail/static/tests/web/debug_menu_tests.js
@@ -54,5 +54,8 @@ QUnit.test("Manage Messages", async (assert) => {
     await click(dropdownItems[0]);
     await legacyExtraNextTick();
     assert.verifySteps(["message_read"]);
-    assert.strictEqual($(".breadcrumb-item.active")[0].innerText.trim(), "Manage Messages");
+    assert.strictEqual(
+        target.querySelector(".o_breadcrumb .active > span").innerText.trim(),
+        "Manage Messages"
+    );
 });
diff --git a/addons/mail/static/tests/web/fields/m2x_avatar_user_tests.js b/addons/mail/static/tests/web/fields/m2x_avatar_user_tests.js
index 7db434a06c2..5a86cf17760 100644
--- a/addons/mail/static/tests/web/fields/m2x_avatar_user_tests.js
+++ b/addons/mail/static/tests/web/fields/m2x_avatar_user_tests.js
@@ -330,9 +330,9 @@ QUnit.test(
             views: [[false, "form"]],
         });
         assert.strictEqual(
-            $(".o_field_many2many_avatar_user.o_field_widget .badge img")[0].getAttribute(
-                "data-src"
-            ),
+            document.body
+                .querySelector(".o_field_many2many_avatar_user.o_field_widget .o_avatar img")
+                .getAttribute("data-src"),
             `/web/image/res.users/${userId}/avatar_128`
         );
     }
@@ -374,7 +374,7 @@ QUnit.test("many2many_avatar_user widget in form view", async (assert) => {
         res_id: avatarUserId,
         views: [[false, "form"]],
     });
-    await click(document.body, ".o_field_many2many_avatar_user .badge .o_m2m_avatar");
+    await click(document.body, ".o_field_many2many_avatar_user .o_avatar img");
     assert.containsOnce($, ".o-mail-ChatWindow");
     assert.strictEqual($(".o-mail-ChatWindow-name").text(), "Partner 1");
 });
diff --git a/addons/mail/static/tests/web/form_renderer_tests.js b/addons/mail/static/tests/web/form_renderer_tests.js
index 6c4527e7aba..41551565fc9 100644
--- a/addons/mail/static/tests/web/form_renderer_tests.js
+++ b/addons/mail/static/tests/web/form_renderer_tests.js
@@ -70,12 +70,12 @@ QUnit.test("Form view not scrolled when switching record", async (assert) => {
         },
         { resIds: [partnerId_1, partnerId_2] }
     );
-    assert.strictEqual($(".breadcrumb-item.active").text(), "Partner 1");
+    assert.strictEqual($(".o_breadcrumb .active").text(), "Partner 1");
     assert.strictEqual($(".o_content")[0].scrollTop, 0);
     $(".o_content")[0].scrollTop = 150;
 
     await click(".o_pager_next");
-    assert.strictEqual($(".breadcrumb-item.active").text(), "Partner 2");
+    assert.strictEqual($(".o_breadcrumb .active").text(), "Partner 2");
     assert.strictEqual($(".o_content")[0].scrollTop, 0);
 
     await click(".o_pager_previous");
diff --git a/addons/mail/tests/test_user_modify_own_profile.py b/addons/mail/tests/test_user_modify_own_profile.py
index 7d3e7846ed4..40b6f245df4 100644
--- a/addons/mail/tests/test_user_modify_own_profile.py
+++ b/addons/mail/tests/test_user_modify_own_profile.py
@@ -16,5 +16,5 @@ class TestUserModifyOwnProfile(HttpCase):
 
         # avoid 'reload_context' action in the middle of the tour to ease steps and form save checks
         with patch.object(Users, 'preference_save', lambda self: True):
-            self.start_tour("/web", "mail/static/tests/tours/user_modify_own_profile_tour.js", login="demo")
+            self.start_tour("/web", "mail/static/tests/tours/user_modify_own_profile_tour.js", login="demo", step_delay=100)
         self.assertEqual(self.env.ref('base.user_demo').email, "updatedemail@example.com")
diff --git a/addons/mail/views/discuss_channel_views.xml b/addons/mail/views/discuss_channel_views.xml
index 83c802f018f..efb29bd74e5 100644
--- a/addons/mail/views/discuss_channel_views.xml
+++ b/addons/mail/views/discuss_channel_views.xml
@@ -20,18 +20,20 @@
                             </div>
                         </t>
                         <t t-name="kanban-box">
-                            <div class="o_discuss_channel_kanban oe_module_vignette oe_kanban_global_click d-flex align-items-center">
+                            <div class="o_discuss_channel_kanban oe_module_vignette oe_kanban_global_click">
                                 <div class="ribbon ribbon-top-right o_small" attrs="{'invisible': [('active', '=', True)]}">
-                                    <span class="bg-danger">Archived</span>
+                                    <span class="text-bg-danger">Archived</span>
                                 </div>
-                                <img t-att-src="kanban_image('discuss.channel', 'avatar_128', record.id.raw_value)" class="oe_module_icon" alt="Channel"/>
-                                <div class="oe_module_desc">
-                                    <h4 class="o_kanban_record_title">#<field name="name"/></h4>
-                                    <p class="oe_module_name" t-att-class="!record.active.raw_value ? 'o_module_desc_short': ''">
-                                        <field name="description"/>
-                                    </p>
-                                    <button type="object" attrs="{'invisible':['|', ('is_member','=',True), ('group_ids', '!=', [])]}" class="btn btn-primary float-end" name="channel_join">Join</button>
-                                    <button type="object" attrs="{'invisible':['|', ('is_member','=',False), ('group_ids', '!=', [])]}" class="btn btn-secondary float-end" name="action_unfollow">Leave</button>
+                                <div class="d-flex align-items-center">
+                                    <img t-att-src="kanban_image('discuss.channel', 'avatar_128', record.id.raw_value)" class="oe_module_icon" alt="Channel"/>
+                                    <div class="oe_module_desc">
+                                        <h4 class="o_kanban_record_title">#<field name="name"/></h4>
+                                        <p class="oe_module_name" t-att-class="!record.active.raw_value ? 'o_module_desc_short': ''">
+                                            <field name="description"/>
+                                        </p>
+                                        <button type="object" attrs="{'invisible':['|', ('is_member','=',True), ('group_ids', '!=', [])]}" class="btn btn-primary float-end" name="channel_join">Join</button>
+                                        <button type="object" attrs="{'invisible':['|', ('is_member','=',False), ('group_ids', '!=', [])]}" class="btn btn-secondary float-end" name="action_unfollow">Leave</button>
+                                    </div>
                                 </div>
                             </div>
                         </t>
@@ -50,7 +52,7 @@
                         <div class="oe_button_box" name="button_box"/>
                         <field name="avatar_128" invisible="1"/>
                         <field name="image_128" widget="image" class="oe_avatar" options="{'size': [90, 90], 'preview_image':'avatar_128'}"/>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <div class="oe_title">
                             <label for="name" string="Group Name"/>
                             <h1>
diff --git a/addons/mail/views/fetchmail_views.xml b/addons/mail/views/fetchmail_views.xml
index a610a3ab81e..b52a3e94fe4 100644
--- a/addons/mail/views/fetchmail_views.xml
+++ b/addons/mail/views/fetchmail_views.xml
@@ -30,7 +30,7 @@
                     </header>
                     <sheet>
                     <field name="active" invisible="1"/>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger"
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger"
                         attrs="{'invisible': [('active', '=', True)]}"/>
                      <group>
                         <group>
diff --git a/addons/mail/views/mail_activity_views.xml b/addons/mail/views/mail_activity_views.xml
index 50029945cef..531e868d146 100644
--- a/addons/mail/views/mail_activity_views.xml
+++ b/addons/mail/views/mail_activity_views.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <form string="Activities">
                 <sheet>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
                         <h1><field name="name" placeholder="e.g. Schedule a meeting"/></h1>
@@ -99,9 +99,13 @@
             <form string="Log an Activity" create="false">
                 <sheet string="Activity">
                     <div class="oe_button_box" name="button_box" invisible="1">
-                        <button name="action_open_document" string="Open Document"
+                        <button name="action_open_document"
                                 type="object" class="oe_link" icon="fa-file-text-o"
-                                attrs="{'invisible': ['|', ('res_model', '=', False), ('res_id', '=', 0)]}"/>
+                                attrs="{'invisible': ['|', ('res_model', '=', False), ('res_id', '=', 0)]}">
+                                <div class="o_field_widget o_stat_info">
+                                    <span class="o_stat_text">Open Document</span>
+                                </div>
+                        </button>
                     </div>
                     <group invisible="1">
                         <field name="activity_category" invisible="1" />
diff --git a/addons/mail/views/mail_alias_views.xml b/addons/mail/views/mail_alias_views.xml
index d5c9eb2903c..abe7afb26de 100644
--- a/addons/mail/views/mail_alias_views.xml
+++ b/addons/mail/views/mail_alias_views.xml
@@ -18,9 +18,13 @@
                             <button name="open_document" string="Open Document"
                                     type="object" class="oe_link" icon="fa-sitemap"
                                     attrs="{'invisible': ['|', ('alias_model_id', '=', False), ('alias_force_thread_id', '=', 0)]}"/>
-                            <button name="open_parent_document" string="Open Parent Document"
+                            <button name="open_parent_document"
                                     type="object" class="oe_link" icon="fa-sitemap"
-                                    attrs="{'invisible': ['|', ('alias_parent_model_id', '=', False), ('alias_parent_thread_id', '=', 0)]}"/>
+                                    attrs="{'invisible': ['|', ('alias_parent_model_id', '=', False), ('alias_parent_thread_id', '=', 0)]}">
+                                    <div class="o_field_widget o_stat_info">
+                                        <span class="o_stat_text">Open Parent Document</span>
+                                    </div>
+                            </button>
                         </div>
                         <div class="d-flex">
                             <h2 class="flex-grow-1"><field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline"/></h2>
diff --git a/addons/mail/views/mail_blacklist_views.xml b/addons/mail/views/mail_blacklist_views.xml
index b823331e09b..c0d5eaea3b7 100644
--- a/addons/mail/views/mail_blacklist_views.xml
+++ b/addons/mail/views/mail_blacklist_views.xml
@@ -25,7 +25,7 @@
                         attrs="{'invisible': ['|', ('active', '=', True), ('email', '=', False)]}"/>
                 </header>
                 <sheet>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <group>
                         <group>
                             <field name="email"/>
diff --git a/addons/mail/views/mail_mail_views.xml b/addons/mail/views/mail_mail_views.xml
index 9d36e0271ca..81dffdc8aad 100644
--- a/addons/mail/views/mail_mail_views.xml
+++ b/addons/mail/views/mail_mail_views.xml
@@ -16,9 +16,13 @@
                         <field name="model" invisible="1"/>
                         <field name="res_id" invisible="1"/>
                         <div class="oe_button_box" name="button_box">
-                            <button name="action_open_document" string="Open Document"
+                            <button name="action_open_document"
                                     type="object" class="oe_link" icon="fa-file-text-o"
-                                    attrs="{'invisible': ['|', ('model', '=', False), ('res_id', '=', 0)]}"/>
+                                    attrs="{'invisible': ['|', ('model', '=', False), ('res_id', '=', 0)]}">
+                                    <div class="o_field_widget o_stat_info">
+                                        <span class="o_stat_text">Open Document</span>
+                                    </div>
+                            </button>
                         </div>
                         <field name="mail_message_id_int" required="0" invisible="1"/>
                         <label for="subject" class="oe_edit_only"/>
diff --git a/addons/mail/views/mail_message_views.xml b/addons/mail/views/mail_message_views.xml
index 21c13604595..64e2a3c9185 100644
--- a/addons/mail/views/mail_message_views.xml
+++ b/addons/mail/views/mail_message_views.xml
@@ -26,9 +26,13 @@
                 <form string="Message" duplicate="0">
                     <sheet>
                         <div class="oe_button_box" name="button_box">
-                            <button name="action_open_document" string="Open Document"
+                            <button name="action_open_document"
                                 type="object" class="oe_link" icon="fa-file-text-o"
-                                attrs="{'invisible': ['|', ('model', '=', False), ('res_id', '=', 0)]}"/>
+                                attrs="{'invisible': ['|', ('model', '=', False), ('res_id', '=', 0)]}">
+                                <div class="o_field_widget o_stat_info">
+                                    <span class="o_stat_text">Open Document</span>
+                                </div>
+                            </button>
                         </div>
                         <group>
                             <group>
diff --git a/addons/mail/views/mail_template_views.xml b/addons/mail/views/mail_template_views.xml
index 357160be16e..0c8fd913f05 100644
--- a/addons/mail/views/mail_template_views.xml
+++ b/addons/mail/views/mail_template_views.xml
@@ -36,8 +36,12 @@
                                     <span class="o_stat_text">Context Action</span>
                                 </div>
                             </button>
-                            <button class="oe_stat_button" name="%(mail_template_preview_action)d" icon="fa-search-plus" string="Preview"
-                                    type="action" target="new"/>
+                            <button class="oe_stat_button" name="%(mail_template_preview_action)d" icon="fa-search-plus"
+                                    type="action" target="new">
+                                    <div class="o_field_widget o_stat_info">
+                                        <span class="o_stat_text">Preview</span>
+                                    </div>
+                            </button>
                         </div>
                         <div class="oe_title">
                             <label for="name"/>
diff --git a/addons/mail/views/res_config_settings_views.xml b/addons/mail/views/res_config_settings_views.xml
index 2b2caaf3797..cc7bfcf598c 100644
--- a/addons/mail/views/res_config_settings_views.xml
+++ b/addons/mail/views/res_config_settings_views.xml
@@ -12,7 +12,7 @@
                         <setting id="activities_setting" string="Activities" help="Configure your activity types">
                             <div class="content-group">
                                 <div class="mt8">
-                                    <button name="%(mail.mail_activity_type_action)d" string="Activity Types" type="action" class="oe_link" icon="fa-arrow-right"/>
+                                    <button name="%(mail.mail_activity_type_action)d" string="Activity Types" type="action" class="oe_link" icon="oi-arrow-right"/>
                                 </div>
                             </div>
                         </setting>
@@ -23,12 +23,12 @@
                                     <div class="mt8">
                                         <button type="action"
                                         name="%(action_email_server_tree)d"
-                                        string="Incoming Email Servers" icon="fa-arrow-right" class="btn-link"/>
+                                        string="Incoming Email Servers" icon="oi-arrow-right" class="btn-link"/>
                                     </div>
                                     <div class="mt8">
                                         <button type="action"
                                         name="%(base.action_ir_mail_server_list)d"
-                                        string="Outgoing Email Servers" icon="fa-arrow-right" class="btn-link"/>
+                                        string="Outgoing Email Servers" icon="oi-arrow-right" class="btn-link"/>
                                     </div>
                                 </div>
                             </div>
@@ -70,7 +70,7 @@
                         <setting string="Custom ICE server list" help="Configure your ICE server list for webRTC">
                             <div class="content-group">
                                 <div class="row col-lg-4">
-                                    <button type="action" name="%(mail.action_ice_servers)d" string="ICE Servers" icon="fa-arrow-right" class="btn-link"/>
+                                    <button type="action" name="%(mail.action_ice_servers)d" string="ICE Servers" icon="oi-arrow-right" class="btn-link"/>
                                 </div>
                             </div>
                         </setting>
@@ -89,11 +89,11 @@
                             <span class="d-block w-75 py-2">Button Color</span>
                             <field name="secondary_color" class="d-block w-25 p-0 m-0" widget="color"/>
                         </div>
-                        <button name="open_email_layout" icon="fa-arrow-right"
+                        <button name="open_email_layout" icon="oi-arrow-right"
                             type="object" string="Update Mail Layout"
                             groups="base.group_no_one" class="btn-link"/>
                         <br groups="base.group_no_one"/>
-                        <button name="open_mail_templates" icon="fa-arrow-right" type="object" string="Review All Templates" class="btn-link"/>
+                        <button name="open_mail_templates" icon="oi-arrow-right" type="object" string="Review All Templates" class="btn-link"/>
                     </setting>
                 </setting>
             </field>
diff --git a/addons/mail_bot/static/description/icon.png b/addons/mail_bot/static/description/icon.png
index a12624f4af4..fa2e98a7c44 100644
Binary files a/addons/mail_bot/static/description/icon.png and b/addons/mail_bot/static/description/icon.png differ
diff --git a/addons/mail_bot/static/description/icon.svg b/addons/mail_bot/static/description/icon.svg
index ad6e700a49b..96969aa8aae 100644
--- a/addons/mail_bot/static/description/icon.svg
+++ b/addons/mail_bot/static/description/icon.svg
@@ -1,25 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 70">
-  <defs>
-    <mask id="mask" x="0" y="0" width="70" height="70" maskUnits="userSpaceOnUse">
-      <g id="b">
-        <path id="a" d="M4,0H65c4,0,5,1,5,5V65c0,4-1,5-5,5H4c-3,0-4-1-4-5V5C0,1,1,0,4,0Z" fill="#fff" fill-rule="evenodd"/>
-      </g>
-    </mask>
-    <linearGradient id="linear-gradient" x1="-909.8" y1="477.94" x2="-910.8" y2="476.94" gradientTransform="matrix(70, 0, 0, -70, 63756, 33455.73)" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#269396"/>
-      <stop offset="1" stop-color="#218689"/>
-    </linearGradient>
-  </defs>
-  <g mask="url(#mask)">
-    <g>
-      <path d="M0,0H70V70H0Z" fill-rule="evenodd" fill="url(#linear-gradient)"/>
-      <path d="M4,1H65c2.67,0,4.33.67,5,2V0H0V3C.67,1.67,2,1,4,1Z" fill="#fff" fill-opacity="0.38" fill-rule="evenodd"/>
-      <path d="M21.76,69H4c-2,0-4-.15-4-4.06v-20L21.16,23.82c17.19-5.88,27.55,1.44,28.92,16.84Z" fill="#393939" fill-rule="evenodd" opacity="0.32" style="isolation: isolate"/>
-      <path d="M4,69H65c2.67,0,4.33-1,5-3v4H0V66A3.92,3.92,0,0,0,4,69Z" fill-opacity="0.38" fill-rule="evenodd"/>
-      <g>
-        <path d="M33,21.2c-10.18,0-18.44,6.09-18.44,13.61a11.49,11.49,0,0,0,3.76,8.25A8.54,8.54,0,0,1,15,49.25c-.25.24-.5.44-.42.77a.69.69,0,0,0,.73.51,17.63,17.63,0,0,0,9.12-3.66A23.59,23.59,0,0,0,33,48.43h0c10.18,0,18.44-6.09,18.44-13.62S43.18,21.2,33,21.2ZM24.77,36.64a2.51,2.51,0,0,1-1.77.73,2,2,0,0,1-.49,0,2.43,2.43,0,0,1-.9-.37,2.24,2.24,0,0,1-.38-.31,2.49,2.49,0,0,1-.73-1.77,2.09,2.09,0,0,1,.05-.49,2.44,2.44,0,0,1,.14-.46,2.22,2.22,0,0,1,.23-.43,1.91,1.91,0,0,1,.31-.38,2.24,2.24,0,0,1,.38-.31,3.62,3.62,0,0,1,.43-.24,2.52,2.52,0,0,1,2.73.55,2.33,2.33,0,0,1,.31.38,2.93,2.93,0,0,1,.23.43,2.44,2.44,0,0,1,.14.46,2.81,2.81,0,0,1,.05.49A2.53,2.53,0,0,1,24.77,36.64Zm10,0a2.51,2.51,0,0,1-1.77.73,2,2,0,0,1-.49,0,2.43,2.43,0,0,1-.9-.37,2.24,2.24,0,0,1-.38-.31,2.49,2.49,0,0,1-.73-1.77,2.09,2.09,0,0,1,.05-.49,2.44,2.44,0,0,1,.14-.46,2.22,2.22,0,0,1,.23-.43,1.91,1.91,0,0,1,.31-.38,2.24,2.24,0,0,1,.38-.31,3.62,3.62,0,0,1,.43-.24,2.52,2.52,0,0,1,2.73.55,2.33,2.33,0,0,1,.31.38,2.93,2.93,0,0,1,.23.43,2.44,2.44,0,0,1,.14.46,2.81,2.81,0,0,1,0,.49A2.53,2.53,0,0,1,34.77,36.64Zm10,0a2.51,2.51,0,0,1-1.77.73,2,2,0,0,1-.49,0,2.43,2.43,0,0,1-.9-.37,2.24,2.24,0,0,1-.38-.31,2.49,2.49,0,0,1-.73-1.77,2.09,2.09,0,0,1,0-.49,2.44,2.44,0,0,1,.14-.46,2.22,2.22,0,0,1,.23-.43,1.91,1.91,0,0,1,.31-.38,2.24,2.24,0,0,1,.38-.31,3.62,3.62,0,0,1,.43-.24,2.52,2.52,0,0,1,2.73.55,2.33,2.33,0,0,1,.31.38,2.93,2.93,0,0,1,.23.43,2.44,2.44,0,0,1,.14.46,2.81,2.81,0,0,1,0,.49A2.53,2.53,0,0,1,44.77,36.64Z" opacity="0.4"/>
-        <path d="M35,19.2c-10.18,0-18.44,6.09-18.44,13.61a11.49,11.49,0,0,0,3.76,8.25A8.54,8.54,0,0,1,17,47.25c-.25.24-.5.44-.42.77a.69.69,0,0,0,.73.51,17.63,17.63,0,0,0,9.12-3.66A23.59,23.59,0,0,0,35,46.43h0c10.18,0,18.44-6.09,18.44-13.62S45.18,19.2,35,19.2ZM26.77,34.64a2.51,2.51,0,0,1-1.77.73,2,2,0,0,1-.49,0,2.43,2.43,0,0,1-.9-.37,2.24,2.24,0,0,1-.38-.31,2.49,2.49,0,0,1-.73-1.77,2.09,2.09,0,0,1,.05-.49,2.44,2.44,0,0,1,.14-.46,2.22,2.22,0,0,1,.23-.43,1.91,1.91,0,0,1,.31-.38,2.24,2.24,0,0,1,.38-.31,3.62,3.62,0,0,1,.43-.24,2.52,2.52,0,0,1,2.73.55,2.33,2.33,0,0,1,.31.38,2.93,2.93,0,0,1,.23.43,2.44,2.44,0,0,1,.14.46,2.81,2.81,0,0,1,.05.49A2.53,2.53,0,0,1,26.77,34.64Zm10,0a2.51,2.51,0,0,1-1.77.73,2,2,0,0,1-.49,0,2.43,2.43,0,0,1-.9-.37,2.24,2.24,0,0,1-.38-.31,2.49,2.49,0,0,1-.73-1.77,2.09,2.09,0,0,1,0-.49,2.44,2.44,0,0,1,.14-.46,2.22,2.22,0,0,1,.23-.43,1.91,1.91,0,0,1,.31-.38,2.24,2.24,0,0,1,.38-.31,3.62,3.62,0,0,1,.43-.24,2.52,2.52,0,0,1,2.73.55,2.33,2.33,0,0,1,.31.38,2.93,2.93,0,0,1,.23.43,2.44,2.44,0,0,1,.14.46,2.81,2.81,0,0,1,0,.49A2.53,2.53,0,0,1,36.77,34.64Zm10,0a2.51,2.51,0,0,1-1.77.73,2,2,0,0,1-.49,0,2.43,2.43,0,0,1-.9-.37,2.24,2.24,0,0,1-.38-.31,2.49,2.49,0,0,1-.73-1.77,2.09,2.09,0,0,1,0-.49,2.44,2.44,0,0,1,.14-.46,2.22,2.22,0,0,1,.23-.43,1.91,1.91,0,0,1,.31-.38,2.24,2.24,0,0,1,.38-.31,3.62,3.62,0,0,1,.43-.24,2.52,2.52,0,0,1,2.73.55,2.33,2.33,0,0,1,.31.38,2.93,2.93,0,0,1,.23.43,2.44,2.44,0,0,1,.14.46,2.81,2.81,0,0,1,0,.49A2.53,2.53,0,0,1,46.77,34.64Z" fill="#fff"/>
-      </g>
-    </g>
-  </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#o_icon_mail_bot__a)"><circle cx="25" cy="25" r="25" fill="var(--o-icons-purple-pure, #93407D)"/><circle cx="25" cy="25" r="25" fill="url(#o_icon_mail_bot__b)" fill-opacity=".2"/><path d="M39.26 34.26C36.227 38.918 30.973 42 25 42s-11.227-3.081-14.26-7.74l-1.033 1.033c-.63.63-1.707.184-1.707-.707V25c0-9.389 7.611-17 17-17s17 7.611 17 17v9.586c0 .89-1.077 1.337-1.707.707l-1.034-1.034Z" fill="var(--o-icons-purple-purple, #55103D)"/><path d="M39.26 34.26C36.227 38.918 30.973 42 25 42s-11.227-3.081-14.26-7.74l-1.033 1.033c-.63.63-1.707.184-1.707-.707V25c0-9.389 7.611-17 17-17s17 7.611 17 17v9.586c0 .89-1.077 1.337-1.707.707l-1.034-1.034Z" fill="#fff"/><circle cx="25" cy="25" r="12" fill="var(--o-icons-purple-cyan, #102E7A)"/><circle cx="25" cy="25" r="12" fill="url(#o_icon_mail_bot__c)" fill-opacity=".3"/><path d="M32 25a3 3 0 0 0-6 0h6Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path d="M32 25a3 3 0 0 0-6 0h6Z" fill="url(#o_icon_mail_bot__d)" fill-opacity=".2"/><path d="M24 25a3 3 0 0 0-6 0h6Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path d="M24 25a3 3 0 0 0-6 0h6Z" fill="url(#o_icon_mail_bot__e)" fill-opacity=".2"/></g><defs><linearGradient id="o_icon_mail_bot__b" x1="0" y1="0" x2="58.824" y2="14.706" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_mail_bot__c" x1="13" y1="13" x2="41.235" y2="20.059" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_mail_bot__d" x1="26" y1="22" x2="32" y2="25" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_mail_bot__e" x1="18" y1="22" x2="24" y2="25" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/mail_group/views/mail_group_message_views.xml b/addons/mail_group/views/mail_group_message_views.xml
index 720cd1517bc..57fd117d837 100644
--- a/addons/mail_group/views/mail_group_message_views.xml
+++ b/addons/mail_group/views/mail_group_message_views.xml
@@ -63,9 +63,9 @@
                         attrs="{'invisible': ['|', ('moderation_status', '!=', 'pending_moderation'), ('is_group_moderated', '=', True)]}"/>
                 </header>
                 <sheet>
-                    <widget name="web_ribbon" title="Rejected" bg_color="bg-danger"
+                    <widget name="web_ribbon" title="Rejected" bg_color="text-bg-danger"
                         attrs="{'invisible': [('moderation_status', '!=', 'rejected')]}"/>
-                    <widget name="web_ribbon" title="Accepted" bg_color="bg-success"
+                    <widget name="web_ribbon" title="Accepted" bg_color="text-bg-success"
                         attrs="{'invisible': [('moderation_status', '!=', 'accepted')]}"/>
                     <group>
                         <field name="mail_message_id" invisible="1"/>
diff --git a/addons/mail_group/views/mail_group_views.xml b/addons/mail_group/views/mail_group_views.xml
index e0eb8486f4a..2248cff9905 100644
--- a/addons/mail_group/views/mail_group_views.xml
+++ b/addons/mail_group/views/mail_group_views.xml
@@ -116,7 +116,7 @@
                                     <div class="oe_edit_only" attrs="{'invisible': [('alias_domain', '=', False)]}">
                                         <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
                                     </div>
-                                    <button icon="fa-arrow-right" type="action" name="%(base_setup.action_general_configuration)d" string="Configure a custom domain" class="p-0 btn-link" attrs="{'invisible': [('alias_domain', '!=', False)]}"/>
+                                    <button icon="oi-arrow-right" type="action" name="%(base_setup.action_general_configuration)d" string="Configure a custom domain" class="p-0 btn-link" attrs="{'invisible': [('alias_domain', '!=', False)]}"/>
                                 </div>
                             </div>
                             <field name="description"/>
diff --git a/addons/mail_group/views/portal_templates.xml b/addons/mail_group/views/portal_templates.xml
index 93fdea262f8..dc890dda4f3 100644
--- a/addons/mail_group/views/portal_templates.xml
+++ b/addons/mail_group/views/portal_templates.xml
@@ -20,7 +20,7 @@
             </div>
             <div t-if="mail_groups" class="container mt32">
                 <div t-if="'unsubscribe' in request.params" class="offset-lg-9 col-lg-3 alert alert-info" role="status">
-                    <h5>Need to unsubscribe? <br/>It's right here! <span class="fa fa-2x fa-arrow-down float-end" role="img" aria-label="" title="Read this !"/></h5>
+                    <h5>Need to unsubscribe? <br/>It's right here! <span class="oi fa-2x oi-arrow-down float-end" role="img" aria-label="" title="Read this !"/></h5>
                 </div>
                 <div class="row mb-4" t-foreach="mail_groups" t-as="group_data">
                     <t t-set="group" t-value="group_data['group']"/>
@@ -110,12 +110,12 @@
                         <div class="row">
                             <h4 t-if="prev_message" t-attf-class="{{'col-lg-6' if next_message else ''}}">
                                 <a t-attf-href="/groups/#{slug(group)}/#{slug(prev_message)}?#{mode and 'mode=%s' % mode or ''}">
-                                    <i class="fa fa-arrow-left" role="img" aria-label="Previous message" title="Previous message"/> <t t-esc="prev_message.subject"/>
+                                    <i class="oi oi-arrow-left" role="img" aria-label="Previous message" title="Previous message"/> <t t-esc="prev_message.subject"/>
                                 </a>
                             </h4>
                             <h4 t-if="next_message" t-attf-class="{{'col-lg-6' if prev_message else ''}} text-end">
                                 <a t-attf-href="/groups/#{slug(group)}/#{slug(next_message)}?#{mode and 'mode=%s' % mode or ''}">
-                                    <t t-esc="next_message.subject"/> <i class="fa fa-arrow-right" role="img" aria-label="Next message" title="Next message"/>
+                                    <t t-esc="next_message.subject"/> <i class="oi oi-arrow-right" role="img" aria-label="Next message" title="Next message"/>
                                 </a>
                             </h4>
                         </div>
@@ -176,10 +176,10 @@
                         <div class="o_mg_link_parent" t-if="group_message_child_ids and (not mode or mode == 'thread')">
                             <p class="mt8">
                                 <a href="#" class="o_mg_link_hide">
-                                    <i class="fa fa-chevron-right" role="img" aria-label="Hide replies" title="Hide replies"/> <t t-esc="len(group_message_child_ids)"/> replies
+                                    <i class="oi oi-chevron-right" role="img" aria-label="Hide replies" title="Hide replies"/> <t t-esc="len(group_message_child_ids)"/> replies
                                 </a>
                                 <a href="#" class="o_mg_link_show d-none">
-                                    <i class="fa fa-chevron-down" role="img" aria-label="Show replies" title="Show replies"/> <t t-esc="len(group_message_child_ids)"/> replies
+                                    <i class="oi oi-chevron-down" role="img" aria-label="Show replies" title="Show replies"/> <t t-esc="len(group_message_child_ids)"/> replies
                                 </a>
                             </p>
                             <div class="o_mg_link_content o_mg_replies ms-5 d-none">
@@ -208,10 +208,10 @@
             <t t-set="attachments" t-value="message.attachment_ids"/>
             <p t-if="attachments" class="mt8">
                 <a href="#" class="o_mg_link_hide">
-                    <i class="fa fa-chevron-right" role="img" aria-label="Hide attachments" title="Hide attachments"/> <t t-esc="len(attachments)"/> attachments
+                    <i class="oi oi-chevron-right" role="img" aria-label="Hide attachments" title="Hide attachments"/> <t t-esc="len(attachments)"/> attachments
                 </a>
                 <a href="#" class="o_mg_link_show d-none">
-                    <i class="fa fa-chevron-down" role="img" aria-label="Show attachments" title="Show attachments"/> <t t-esc="len(attachments)"/> attachments
+                    <i class="oi oi-chevron-down" role="img" aria-label="Show attachments" title="Show attachments"/> <t t-esc="len(attachments)"/> attachments
                 </a>
             </p>
             <div class="o_mg_link_content d-none row justify-content-center">
diff --git a/addons/maintenance/static/description/icon.png b/addons/maintenance/static/description/icon.png
index f99e8a37069..cc708256cb8 100644
Binary files a/addons/maintenance/static/description/icon.png and b/addons/maintenance/static/description/icon.png differ
diff --git a/addons/maintenance/static/description/icon.svg b/addons/maintenance/static/description/icon.svg
index f3f853ecf7a..ce2191531b8 100644
--- a/addons/maintenance/static/description/icon.svg
+++ b/addons/maintenance/static/description/icon.svg
@@ -1 +1 @@
-<svg width="70" height="70" viewBox="0 0 70 70" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><title>maintenance/static/description/icon</title><defs><path d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z" id="a"/><linearGradient x1="100%" y1="0%" x2="0%" y2="98.616%" id="c"><stop stop-color="#797C79" offset="0%"/><stop stop-color="#545554" offset="100%"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z" fill="#FFF" fill-opacity=".383"/><path d="M42.863 70H4c-2 0-4-.149-4-4.17V42.7L22 21l35 33.362L42.863 70z" fill="#393939" opacity=".324"/><path d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z" fill="#000" fill-opacity=".383"/><path d="M34.821 40.185l-9.488-9.488-3.163 3.163h-3.162c-1.487 1.054-3.02 2.372-4.602 3.953-1.02 1.53-1.81 2.88-2.372 4.05-.622-2.173-.173-4.424 1.346-6.755 1.116-1.36 2.465-3.093 4.046-5.202v-2.372l7.907-7.906c2.635.527 3.69-.528 3.163-3.163l3.162-3.163 6.326 5.535A38.251 38.251 0 0 1 34.82 22c-2.636-.528-3.953.527-3.953 3.162l-2.372 2.372 8.697 9.488 3.953-.79L56.96 52.045v3.163l-4.744 4.744h-3.163L34.03 44.138v-2.372l.791-1.58z" fill="#000" opacity=".3"/><path d="M34.821 38.185l-9.488-9.488-3.163 3.163h-3.162c-1.487 1.054-3.02 2.372-4.602 3.953-1.02 1.53-1.81 2.88-2.372 4.05-.622-2.173-.173-4.424 1.346-6.755 1.116-1.36 2.465-3.093 4.046-5.202v-2.372l7.907-7.906c2.635.527 3.69-.528 3.163-3.163l3.162-3.163 6.326 5.535A38.251 38.251 0 0 1 34.82 20c-2.636-.528-3.953.527-3.953 3.162l-2.372 2.372 8.697 9.488 3.953-.79L56.96 50.045v3.163l-4.744 4.744h-3.163L34.03 42.138v-2.372l.791-1.58z" fill="#FFF"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M12.17 24.192s6.122-2.586 7.78-4.242c1.656-1.657 4.242-7.779 4.242-7.779l13.435 13.435s-6.099 2.563-7.778 4.243c-1.68 1.68-4.243 7.778-4.243 7.778L12.17 24.192Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path d="M12.17 24.192s6.122-2.586 7.78-4.242c1.656-1.657 4.242-7.779 4.242-7.779l13.435 13.435s-6.099 2.563-7.778 4.243c-1.68 1.68-4.243 7.778-4.243 7.778L12.17 24.192Z" fill="url(#o_icon_maintenance__a)" fill-opacity=".2"/><path fill-rule="evenodd" clip-rule="evenodd" d="M42.577 22.778c4.296-4.296 4.296-11.26 0-15.556-4.296-4.296-11.26-4.296-15.556 0-4.296 4.296-4.296 11.26 0 15.556 4.295 4.296 11.26 4.296 15.556 0Zm-4.243-4.242a5 5 0 1 0-7.07-7.072 5 5 0 0 0 7.07 7.071Z" fill="var(--o-icons-cyan-cyan, #0382F3)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M42.577 22.778c4.296-4.296 4.296-11.26 0-15.556-4.296-4.296-11.26-4.296-15.556 0-4.296 4.296-4.296 11.26 0 15.556 4.295 4.296 11.26 4.296 15.556 0Zm-4.243-4.242a5 5 0 1 0-7.07-7.072 5 5 0 0 0 7.07 7.071Z" fill="url(#o_icon_maintenance__b)" fill-opacity=".2"/><path fill-rule="evenodd" clip-rule="evenodd" d="M22.778 42.577c4.296-4.296 4.296-11.26 0-15.556-4.296-4.296-11.26-4.296-15.556 0-4.296 4.295-4.296 11.26 0 15.556 4.296 4.296 11.26 4.296 15.556 0Zm-4.242-4.243a5 5 0 1 0-7.071-7.07 5 5 0 0 0 7.07 7.07Z" fill="var(--o-icons-cyan-cyan, #0382F3)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M22.778 42.577c4.296-4.296 4.296-11.26 0-15.556-4.296-4.296-11.26-4.296-15.556 0-4.296 4.295-4.296 11.26 0 15.556 4.296 4.296 11.26 4.296 15.556 0Zm-4.242-4.243a5 5 0 1 0-7.071-7.07 5 5 0 0 0 7.07 7.07Z" fill="url(#o_icon_maintenance__c)" fill-opacity=".2"/><defs><linearGradient id="o_icon_maintenance__a" x1="12.171" y1="12.171" x2="42.119" y2="19.658" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_maintenance__b" x1="23.799" y1="4" x2="49.681" y2="10.471" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_maintenance__c" x1="4" y1="23.799" x2="29.882" y2="30.269" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/maintenance/views/maintenance_views.xml b/addons/maintenance/views/maintenance_views.xml
index ec2193e0e69..7c523f58bb8 100644
--- a/addons/maintenance/views/maintenance_views.xml
+++ b/addons/maintenance/views/maintenance_views.xml
@@ -342,7 +342,7 @@
                             <field string="Maintenance" name="maintenance_count" widget="statinfo"/>
                         </button>
                     </div>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="oe_title">
                         <label for="name"/>
                         <h1><field name="name" string="Name" placeholder="e.g. LED Monitor"/></h1>
@@ -748,7 +748,7 @@
         <field name="arch" type="xml">
             <form string="Maintenance Team">
                 <sheet>
-                <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                 <div class="oe_title">
                     <label for="name" string="Team Name"/>
                     <h1>
diff --git a/addons/mass_mailing/static/description/icon.png b/addons/mass_mailing/static/description/icon.png
index 98685d0aa4c..94761bd8a2c 100644
Binary files a/addons/mass_mailing/static/description/icon.png and b/addons/mass_mailing/static/description/icon.png differ
diff --git a/addons/mass_mailing/static/description/icon.svg b/addons/mass_mailing/static/description/icon.svg
index b48aed5a13b..e29a714d7e2 100644
--- a/addons/mass_mailing/static/description/icon.svg
+++ b/addons/mass_mailing/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="98.616%"><stop offset="0%" stop-color="#797C79"/><stop offset="100%" stop-color="#545554"/></linearGradient><path id="d" d="M16.995 35.708c-2.743 1.538-2.48 5.47.455 6.638L26.564 46c.611 7.72 1.423 11.72 2.436 12 .948.262 3.602-2.35 7.962-7.835l8.923 3.57c.47.185.965.278 1.46.278.653 0 1.299-.163 1.881-.48a3.736 3.736 0 0 0 1.906-2.665C54.969 28.136 56.548 16.513 55.868 16c-.77-.582-13.728 5.987-38.873 19.708zm13.397 16.813v-4.99l2.918 1.166-2.918 3.824zm16.952-2.217L35.08 45.398l11.18-15.631c.853-1.198-.758-2.589-1.89-1.638l-16.865 14.24-8.596-3.446 33.172-18.544-4.737 29.925z"/><path id="e" d="M16.995 33.708c-2.743 1.538-2.48 5.47.455 6.638L26.564 44c.611 7.72 1.423 11.72 2.436 12 .948.262 3.602-2.35 7.962-7.835l8.923 3.57c.47.185.965.278 1.46.278.653 0 1.299-.163 1.881-.48a3.736 3.736 0 0 0 1.906-2.665C54.969 26.136 56.548 14.513 55.868 14c-.77-.582-13.728 5.987-38.873 19.708zm13.397 16.813v-4.99l2.918 1.166-2.918 3.824zm16.952-2.217L35.08 43.398l11.18-15.631c.853-1.198-.758-2.589-1.89-1.638l-16.865 14.24-8.596-3.446 33.172-18.544-4.737 29.925z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M40.1 69H4c-2 0-4-.146-4-4.078V47.679L15.8 35 54 17l-3.062 32.732L40.1 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M41.845 4.447 5.18 28.487c-1.844 1.21-1.455 3.961.655 4.638L42.5 44.878c1.725.553 3.5-.702 3.5-2.475V6.61c0-2.084-2.383-3.324-4.155-2.162Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path d="M41.845 4.447 5.18 28.487c-1.844 1.21-1.455 3.961.655 4.638L42.5 44.878c1.725.553 3.5-.702 3.5-2.475V6.61c0-2.084-2.383-3.324-4.155-2.162Z" fill="url(#o_icon_mass_mailing__a)" fill-opacity=".2"/><path d="m44.671 4.347-18.15 35.409 17.729 5.683c.863.276 1.75-.351 1.75-1.237V6.28s-.12-.688-.469-1.175c-.318-.444-.86-.758-.86-.758Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="m44.671 4.347-18.15 35.409 17.729 5.683c.863.276 1.75-.351 1.75-1.237V6.28s-.12-.688-.469-1.175c-.318-.444-.86-.758-.86-.758Z" fill="url(#o_icon_mass_mailing__b)" fill-opacity=".2"/><path d="M13.886 35.634 44.67 4.342 23.323 46l-9.437-10.366Z" fill="var(--o-icons-purple-cyan, #102E7A)"/><path d="M13.886 35.634 44.67 4.342 23.323 46l-9.437-10.366Z" fill="url(#o_icon_mass_mailing__c)" fill-opacity=".3"/><defs><linearGradient id="o_icon_mass_mailing__a" x1="4" y1="4" x2="53.412" y2="16.353" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_mass_mailing__b" x1="4" y1="4" x2="53.412" y2="16.353" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_mass_mailing__c" x1="4" y1="4" x2="53.412" y2="16.353" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/mass_mailing/static/src/scss/mass_mailing.scss b/addons/mass_mailing/static/src/scss/mass_mailing.scss
index 8e179d86382..9c213709396 100644
--- a/addons/mass_mailing/static/src/scss/mass_mailing.scss
+++ b/addons/mass_mailing/static/src/scss/mass_mailing.scss
@@ -27,13 +27,6 @@
         .o_statusbar_buttons {
             flex-grow: 1;
         }
-
-        .o_statusbar_status {
-            border-left: solid $o-gray-300 1px;
-        }
-    }
-    .o_mass_mailing_mailing_group {
-        margin-top: $o-sheet-cancel-tpadding + 33px;
     }
     .o-mail-Form-chatter {
         margin: 0;
@@ -183,7 +176,6 @@
 }
 
 .o_mass_mailing_mailing_form.o_mass_mailing_form_full_width .alert.alert-info:not(.o_invisible_modifier) {
-    margin: 0 0 0 12px;
     flex: 1;
     padding: unset;
     border-left-width: 1px;
diff --git a/addons/mass_mailing/views/mailing_list_views.xml b/addons/mass_mailing/views/mailing_list_views.xml
index 4ce6ee1e5cc..5d23c2ea343 100644
--- a/addons/mass_mailing/views/mailing_list_views.xml
+++ b/addons/mass_mailing/views/mailing_list_views.xml
@@ -51,42 +51,18 @@
                         </button>
                         <button name="action_view_contacts_bouncing"
                                 type="object" icon="fa-exchange" class="oe_stat_button">
-                            <div class="o_field_widget o_stat_info">
-                                <div class="oe_inline">
-                                    <span class="o_stat_value">
-                                        <field name="contact_pct_bounce" widget="statinfo" nolabel="1"/>
-                                    </span>
-                                    <span class="o_stat_value">%</span>
-                                </div>
-                                <span class="o_stat_text">Bounce</span>
-                            </div>
+                                <field name="contact_pct_bounce" widget="statinfo" string="% Bounce"/>
                         </button>
                         <button name="action_view_contacts_opt_out"
                                 type="object" icon="fa-bell-slash-o" class="oe_stat_button">
-                            <div class="o_field_widget o_stat_info">
-                                <div class="oe_inline">
-                                    <span class="o_stat_value">
-                                        <field name="contact_pct_opt_out" widget="statinfo" nolabel="1"/>
-                                    </span>
-                                    <span class="o_stat_value">%</span>
-                                </div>
-                                <span class="o_stat_text">Opt-out</span>
-                            </div>
+                                <field name="contact_pct_opt_out" widget="statinfo" string="% Opt-out"/>
                         </button>
                         <button name="action_view_contacts_blacklisted"
                                 type="object" icon="fa-ban" class="oe_stat_button">
-                            <div class="o_field_widget o_stat_info">
-                                <div class="oe_inline">
-                                    <span class="o_stat_value">
-                                        <field name="contact_pct_blacklisted" widget="statinfo" nolabel="1"/>
-                                    </span>
-                                    <span class="o_stat_value">%</span>
-                                </div>
-                                <span class="o_stat_text">Blacklist</span>
-                            </div>
+                                <field name="contact_pct_blacklisted" widget="statinfo" string="% Blacklist"/>
                         </button>
                     </div>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="oe_title">
                         <label for="name"/>
                         <h1>
@@ -225,7 +201,7 @@
                                         <field name="contact_count_email"/>
                                     </span>
                                     <br/>
-                                    <span class="text-secondary">
+                                    <span class="text-muted">
                                         <i class="fa fa-envelope-o"/> Contacts
                                     </span>
                                 </a>
@@ -235,7 +211,7 @@
                                         <field name="mailing_count"/>
                                     </span>
                                     <br/>
-                                    <span class="text-secondary">Mailings</span>
+                                    <span class="text-muted">Mailings</span>
                                 </a>
                                 <hr class="w-100 d-block d-sm-none opacity-0 m-0 p-0"/>
                                 <a class="me-sm-0 me-3 text-large" tabindex="-1"
@@ -244,7 +220,7 @@
                                         <field name="contact_pct_bounce"/> %
                                     </span>
                                     <br/>
-                                    <span class="text-secondary">Bounce</span>
+                                    <span class="text-muted">Bounce</span>
                                 </a>
                                 <a class="me-sm-0 me-3 text-large" tabindex="-1"
                                     name="action_view_contacts_opt_out" type="object">
@@ -252,7 +228,7 @@
                                         <field name="contact_pct_opt_out"/> %
                                     </span>
                                     <br/>
-                                    <span class="text-secondary">Opt-Out</span>
+                                    <span class="text-muted">Opt-Out</span>
                                 </a>
                                 <a class="me-sm-0 me-3 text-large" tabindex="-1"
                                     name="action_view_contacts_blacklisted" type="object">
@@ -260,7 +236,7 @@
                                         <field name="contact_pct_blacklisted"/> %
                                     </span>
                                     <br/>
-                                    <span class="text-secondary">Blacklist</span>
+                                    <span class="text-muted">Blacklist</span>
                                 </a>
                             </div>
                             <div class="o_kanban_ungrouped_action_buttons col-12 col-lg-2 py-0 pe-2 ps-md-2 my-md-auto my-2 d-none d-md-flex flex-wrap justify-content-lg-end">
diff --git a/addons/mass_mailing/views/mailing_mailing_views.xml b/addons/mass_mailing/views/mailing_mailing_views.xml
index cba8755af9a..f2f84c36dda 100644
--- a/addons/mass_mailing/views/mailing_mailing_views.xml
+++ b/addons/mass_mailing/views/mailing_mailing_views.xml
@@ -58,7 +58,7 @@
             <field name="model">mailing.mailing</field>
             <field name="arch" type="xml">
                 <form string="Mailing" class="o_mass_mailing_mailing_form">
-                    <header style="min-height:31px;">
+                    <header class="pt-3">
                         <button name="action_launch" type="object" class="oe_highlight" string="Send"
                             attrs="{'invisible': [('state', 'in', ('in_queue',  'sending', 'done'))]}" data-hotkey="v"
                             confirm="This will send the email to all recipients. Are you sure you want to proceed?"
@@ -74,7 +74,7 @@
 
                         <field name="state" readonly="1" widget="statusbar"/>
                     </header>
-                    <div class="alert alert-info text-center" role="alert"
+                    <div class="alert alert-info mb-2 text-center" role="alert"
                         attrs="{'invisible': ['&amp;','&amp;','&amp;','&amp;','&amp;',('state', '!=', 'in_queue'),('sent', '=', 0),('canceled', '=', 0),('scheduled', '=', 0),('failed', '=', 0),('warning_message', '=', False)]}">
                         <div class="o_mails_canceled" attrs="{'invisible': [('canceled', '=', 0)]}">
                             <button class="btn-link py-0"
@@ -166,7 +166,7 @@
                                 <field name="bounced_ratio" string="Bounced" widget="percentpie"/>
                             </button>
                         </div>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <group class="o_mass_mailing_mailing_group">
                             <field name="active" invisible="1"/>
                             <field name="mailing_type" widget="radio" options="{'horizontal': true}" invisible="1"
diff --git a/addons/mass_mailing/views/mailing_trace_views.xml b/addons/mass_mailing/views/mailing_trace_views.xml
index d45952f66de..f6bfa590078 100644
--- a/addons/mass_mailing/views/mailing_trace_views.xml
+++ b/addons/mass_mailing/views/mailing_trace_views.xml
@@ -80,7 +80,9 @@
                     <div class="oe_button_box" name="button_box">
                         <button name="action_view_contact"
                                 type="object" icon="fa-user" class="oe_stat_button">
-                            <span widget="statinfo">Open Recipient</span>
+                                <div class="o_field_widget o_stat_info">
+                                    <span class="o_stat_text">Open Recipient</span>
+                                </div>
                         </button>
                     </div>
                     <group>
diff --git a/addons/mass_mailing/views/res_config_settings_views.xml b/addons/mass_mailing/views/res_config_settings_views.xml
index ab14c9a52c4..abec47246b1 100644
--- a/addons/mass_mailing/views/res_config_settings_views.xml
+++ b/addons/mass_mailing/views/res_config_settings_views.xml
@@ -20,7 +20,7 @@
                                                 placeholder="Default Server"/>
                                     </div>
                                     <div class="mt8">
-                                        <button type="action" name="base.action_ir_mail_server_list" string="Configure Outgoing Mail Servers" icon="fa-arrow-right" class="oe_link"/>
+                                        <button type="action" name="base.action_ir_mail_server_list" string="Configure Outgoing Mail Servers" icon="oi-arrow-right" class="oe_link"/>
                                     </div>
                                 </div>
                             </setting>
diff --git a/addons/mass_mailing_sms/static/description/icon.png b/addons/mass_mailing_sms/static/description/icon.png
index 3076ce49bea..b2f8a182e78 100644
Binary files a/addons/mass_mailing_sms/static/description/icon.png and b/addons/mass_mailing_sms/static/description/icon.png differ
diff --git a/addons/mass_mailing_sms/static/description/icon.svg b/addons/mass_mailing_sms/static/description/icon.svg
index b4feab2c5ca..7324ff0a985 100644
--- a/addons/mass_mailing_sms/static/description/icon.svg
+++ b/addons/mass_mailing_sms/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#94B6C8"/><stop offset="100%" stop-color="#6A9EBA"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><g><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/></g><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><path fill="#000" fill-opacity=".151" d="M3 69.6c-2 0-4-1-4-4.1V29.7l18.6-18.9L44.3 12v16.727l4.585-3.484 7.039.82-3.47 4.437 3.062 5L44.3 46.516v6.83L31.2 69.6H3z"/><path fill="#000" fill-opacity=".3" fill-rule="nonzero" d="M44.3 14c0-1.1-.9-2-2-2H19c-1.1 0-2 .9-2 2v40.6c0 1.1.9 2 2 2h23.3c1.1 0 2-.9 2-2v-10c-.7.5-1.5 1-2.3 1.4v5.3c0 .2-.1.3-.3.3H19.6c-.2 0-.3-.1-.3-.3v-33c0-.2.1-.3.3-.3h22.1c.2 0 .3.1.3.3v2.8c.5 0 1.1-.1 1.6-.1h.7v-7zM30.7 52.4c.8 0 1.5.7 1.5 1.5s-.7 1.5-1.5 1.5-1.5-.7-1.5-1.5.7-1.5 1.5-1.5zm3.1-35.9h-6.1c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h6.1c.3 0 .5.2.5.5s-.3.5-.5.5z"/><path fill="#FFF" fill-rule="nonzero" d="M43.6 42.4c-.5 0-1.1 0-1.6-.1v7.1c0 .2-.1.3-.3.3H19.6c-.2 0-.3-.1-.3-.3v-33c0-.2.1-.3.3-.3h22.1c.2 0 .3.1.3.3v2.9c.5 0 1.1-.1 1.6-.1h.7V12c0-1.1-.9-2-2-2H19c-1.1 0-2 .9-2 2v40.7c0 1.1.9 2 2 2h23.3c1.1 0 2-.9 2-2V42.4h-.7zm-16-28.7h6.1c.3 0 .5.2.5.5s-.2.5-.4.5h-6.1c-.3 0-.5-.2-.5-.5s.1-.5.4-.5zm3.1 39.9c-.8 0-1.5-.7-1.5-1.5s.7-1.5 1.5-1.5 1.5.7 1.5 1.5c0 .9-.7 1.5-1.5 1.5z"/><text fill="#000" fill-opacity=".3" font-family="IBMPlexMono-Bold, IBM Plex Mono" font-size="18" font-weight="bold" letter-spacing="-.215" transform="translate(17 10)"><tspan x="8.144" y="29">SMS</tspan></text><text fill="#FFF" font-family="IBMPlexMono-Bold, IBM Plex Mono" font-size="18" font-weight="bold" letter-spacing="-.215" transform="translate(17 10)"><tspan x="8.144" y="27">SMS</tspan></text></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M13 8a4 4 0 0 1 4-4h16a4 4 0 0 1 4 4v34a4 4 0 0 1-4 4H17a4 4 0 0 1-4-4V8Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M13 8a4 4 0 0 1 4-4h16a4 4 0 0 1 4 4v34a4 4 0 0 1-4 4H17a4 4 0 0 1-4-4V8Z" fill="url(#o_icon_mass_mailing_sms__a)" fill-opacity=".2"/><path d="M37 19v18a9 9 0 1 1 0-18Z" fill="var(--o-icons-red-teal, #006158)"/><path d="M37 19v18a9 9 0 1 1 0-18Z" fill="url(#o_icon_mass_mailing_sms__b)" fill-opacity=".2"/><path d="M13 31V13a9 9 0 1 1 0 18Z" fill="var(--o-icons-red-cyan, #1B567A)"/><path d="M13 31V13a9 9 0 1 1 0 18Z" fill="url(#o_icon_mass_mailing_sms__c)" fill-opacity=".2"/><path d="M13 13H4v9a9 9 0 0 0 9 9V13Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path d="M13 13H4v9a9 9 0 0 0 9 9V13Z" fill="url(#o_icon_mass_mailing_sms__d)" fill-opacity=".2"/><path d="M37 37h9v-9a9 9 0 0 0-9-9v18Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path d="M37 37h9v-9a9 9 0 0 0-9-9v18Z" fill="url(#o_icon_mass_mailing_sms__e)" fill-opacity=".2"/><defs><linearGradient id="o_icon_mass_mailing_sms__a" x1="13" y1="4" x2="42.4" y2="8.2" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_mass_mailing_sms__b" x1="28" y1="19" x2="39.077" y2="20.385" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_mass_mailing_sms__c" x1="13" y1="13" x2="24.077" y2="14.385" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_mass_mailing_sms__d" x1="4" y1="13" x2="15.077" y2="14.385" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_mass_mailing_sms__e" x1="37" y1="19" x2="48.077" y2="20.385" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/mass_mailing_sms/views/mailing_list_views.xml b/addons/mass_mailing_sms/views/mailing_list_views.xml
index 6058b8afaff..23b9b8a945b 100644
--- a/addons/mass_mailing_sms/views/mailing_list_views.xml
+++ b/addons/mass_mailing_sms/views/mailing_list_views.xml
@@ -21,7 +21,7 @@
                         <field name="contact_count_sms"/>
                     </span>
                     <br/>
-                    <span class="text-secondary">
+                    <span class="text-muted">
                         <i class="fa fa-phone"/> Contacts
                     </span>
                 </a>
diff --git a/addons/membership/static/description/icon.png b/addons/membership/static/description/icon.png
index d1d9740a548..74f61c44eb7 100644
Binary files a/addons/membership/static/description/icon.png and b/addons/membership/static/description/icon.png differ
diff --git a/addons/membership/static/description/icon.svg b/addons/membership/static/description/icon.svg
index e8d664f649b..2eb7d120d2a 100644
--- a/addons/membership/static/description/icon.svg
+++ b/addons/membership/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#7CC098"/><stop offset="100%" stop-color="#5F8A71"/></linearGradient><path id="d" d="M35.5 16.633c6.472 0 11.719 5.083 11.719 11.354 0 6.27-5.247 11.354-11.719 11.354-6.472 0-11.719-5.084-11.719-11.354S29.028 16.633 35.5 16.633zm13.424 23.688l-5.223-1.265c-5.488 3.824-12.14 2.971-16.402 0l-5.223 1.265c-3.13.759-5.326 3.483-5.326 6.61v2.628c0 1.881 1.574 3.406 3.516 3.406h30.468c1.942 0 3.516-1.525 3.516-3.406V46.93c0-3.126-2.196-5.85-5.326-6.609z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-.146-4-4.082V44.253l26.224-25.045 20.526 9.775-8.576 13.025L53 42.469l1.122 5.966L41.75 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><path fill="#FFF" fill-rule="nonzero" d="M35.5 14.633c6.472 0 11.719 5.083 11.719 11.354 0 6.27-5.247 11.354-11.719 11.354-6.472 0-11.719-5.084-11.719-11.354S29.028 14.633 35.5 14.633zm13.424 23.688l-5.223-1.265c-5.488 3.824-12.14 2.971-16.402 0l-5.223 1.265c-3.13.759-5.326 3.483-5.326 6.61v2.628c0 1.881 1.574 3.406 3.516 3.406h30.468c1.942 0 3.516-1.525 3.516-3.406V44.93c0-3.126-2.196-5.85-5.326-6.609z"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M43 24a5 5 0 1 1-10 0 5 5 0 0 1 10 0Z" fill="var(--o-icons-purple-red, #911E3D)"/><path d="M43 24a5 5 0 1 1-10 0 5 5 0 0 1 10 0Z" fill="url(#o_icon_membership__a)" fill-opacity=".2"/><path d="M28 16c0 5.523-4.477 10-10 10S8 21.523 8 16 12.477 6 18 6s10 4.477 10 10Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M28 16c0 5.523-4.477 10-10 10S8 21.523 8 16 12.477 6 18 6s10 4.477 10 10Z" fill="url(#o_icon_membership__b)" fill-opacity=".2"/><path d="M16 31h26a4 4 0 0 1 4 4v5a4 4 0 0 1-4 4H16V31Z" fill="var(--o-icons-purple-red, #911E3D)"/><path d="M16 31h26a4 4 0 0 1 4 4v5a4 4 0 0 1-4 4H16V31Z" fill="url(#o_icon_membership__c)" fill-opacity=".2"/><path d="M4 31h16c7.18 0 13 5.82 13 13H17C9.82 44 4 38.18 4 31Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M4 31h16c7.18 0 13 5.82 13 13H17C9.82 44 4 38.18 4 31Z" fill="url(#o_icon_membership__d)" fill-opacity=".2"/><defs><linearGradient id="o_icon_membership__a" x1="33" y1="19" x2="44.765" y2="21.941" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_membership__b" x1="8" y1="6" x2="31.529" y2="11.882" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_membership__c" x1="16" y1="31" x2="44.135" y2="47.232" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_membership__d" x1="4" y1="31" x2="31.65" y2="46.42" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/microsoft_calendar/static/description/icon.png b/addons/microsoft_calendar/static/description/icon.png
index 7c890376036..e414f5e5228 100644
Binary files a/addons/microsoft_calendar/static/description/icon.png and b/addons/microsoft_calendar/static/description/icon.png differ
diff --git a/addons/microsoft_calendar/static/description/icon.svg b/addons/microsoft_calendar/static/description/icon.svg
index 29159a84a90..bfe3a2c33a4 100644
--- a/addons/microsoft_calendar/static/description/icon.svg
+++ b/addons/microsoft_calendar/static/description/icon.svg
@@ -1,71 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 70">
-  <defs>
-    <mask id="mask" x="0" y="0" width="70" height="70" maskUnits="userSpaceOnUse">
-      <g id="mask-2" data-name="mask">
-        <g id="b">
-          <path id="a" d="M4,0H65c4,0,5,1,5,5V65c0,4-1,5-5,5H4c-3,0-4-1-4-5V5C0,1,1,0,4,0Z" fill="#fff" fill-rule="evenodd"/>
-        </g>
-      </g>
-    </mask>
-    <linearGradient id="linear-gradient" x1="-998.51" y1="-216.96" x2="-999.51" y2="-217.96" gradientTransform="matrix(70, 0, 0, -70, 69966, -15187.42)" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#94b6c8"/>
-      <stop offset="1" stop-color="#6a9eba"/>
-    </linearGradient>
-  </defs>
-  <g mask="url(#mask)">
-    <g>
-      <path d="M0,0H70V70H0Z" fill-rule="evenodd" fill="url(#linear-gradient)"/>
-      <path d="M4,1H65c2.67,0,4.33.67,5,2V0H0V3C.67,1.67,2,1,4,1Z" fill="#fff" fill-opacity="0.38" fill-rule="evenodd"/>
-      <path d="M45.3,69H4c-2,0-4-.14-4-4V33.43l13-13,21.72.11,2.69-2.68L57.05,23l-.28,29L54.33,54.5l.5,1.33,1.34-1.31.88-.16-.37,3.25Z" fill="#393939" fill-rule="evenodd" opacity="0.32" style="isolation: isolate"/>
-      <path d="M4,69H65c2.67,0,4.33-1,5-3v4H0V66A3.92,3.92,0,0,0,4,69Z" fill-opacity="0.38" fill-rule="evenodd"/>
-      <g>
-        <g opacity="0.4">
-          <g>
-            <g>
-              <ellipse cx="21.42" cy="36.92" rx="2.88" ry="4.39"/>
-              <path d="M10.74,22.56V51.79a.57.57,0,0,0,.46.56l21.13,3.9a.56.56,0,0,0,.67-.56V18.3a.57.57,0,0,0-.68-.56L11.19,22A.58.58,0,0,0,10.74,22.56ZM21.42,44.28c-3.23,0-5.85-3.29-5.85-7.36s2.62-7.35,5.85-7.35,5.85,3.29,5.85,7.35S24.65,44.28,21.42,44.28Z"/>
-            </g>
-            <g>
-              <polygon points="36.56 46.29 35.73 46.29 34.89 46.29 34.89 50.77 35.73 50.77 36.56 50.77 37.39 50.77 37.39 46.29 36.56 46.29"/>
-              <path d="M54,19.65H34.92V25.7H53.48V52.56H34.92v1.78H54a1.21,1.21,0,0,0,1.26-1.25V21A1.31,1.31,0,0,0,54,19.65Z"/>
-              <polygon points="49.91 27.49 48.12 27.49 46.33 27.49 46.33 31.97 48.12 31.97 49.91 31.97 51.7 31.97 51.7 27.49 49.91 27.49"/>
-              <polygon points="49.91 33.76 48.12 33.76 46.33 33.76 46.33 38.24 48.12 38.24 49.91 38.24 51.7 38.24 51.7 33.76 49.91 33.76"/>
-              <polygon points="49.91 40.02 48.12 40.02 46.33 40.02 46.33 44.5 48.12 44.5 49.91 44.5 51.7 44.5 51.7 40.02 49.91 40.02"/>
-              <polygon points="42.76 27.49 40.97 27.49 39.18 27.49 39.18 31.97 40.97 31.97 42.76 31.97 44.54 31.97 44.54 27.49 42.76 27.49"/>
-              <polygon points="42.76 33.76 40.97 33.76 39.18 33.76 39.18 38.24 40.97 38.24 42.76 38.24 44.54 38.24 44.54 33.76 42.76 33.76"/>
-              <polygon points="42.76 40.02 40.97 40.02 39.18 40.02 39.18 44.5 40.97 44.5 42.76 44.5 44.54 44.5 44.54 40.02 42.76 40.02"/>
-              <polygon points="42.76 46.29 40.97 46.29 39.18 46.29 39.18 50.77 40.97 50.77 42.76 50.77 44.54 50.77 44.54 46.29 42.76 46.29"/>
-              <polygon points="36.56 27.49 35.73 27.49 34.89 27.49 34.89 31.97 35.73 31.97 36.56 31.97 37.39 31.97 37.39 27.49 36.56 27.49"/>
-              <polygon points="36.56 33.76 35.73 33.76 34.89 33.76 34.89 38.24 35.73 38.24 36.56 38.24 37.39 38.24 37.39 33.76 36.56 33.76"/>
-              <polygon points="36.56 40.02 35.73 40.02 34.89 40.02 34.89 44.5 35.73 44.5 36.56 44.5 37.39 44.5 37.39 40.02 36.56 40.02"/>
-            </g>
-            <polygon points="49.37 56.99 48.33 56.99 48.33 56.35 51.17 56.35 51.17 56.99 50.13 56.99 50.13 59.83 49.37 59.83 49.37 56.99 49.37 56.99"/>
-            <polygon points="51.33 56.35 52.4 56.35 53.21 58.74 53.22 58.74 53.99 56.35 55.06 56.35 55.06 59.83 54.34 59.83 54.34 57.37 54.34 57.37 53.49 59.83 52.9 59.83 52.05 57.39 52.04 57.39 52.04 59.83 51.33 59.83 51.33 56.35"/>
-          </g>
-        </g>
-        <g>
-          <g>
-            <ellipse cx="23.41" cy="34.93" rx="2.88" ry="4.39" fill="#fff"/>
-            <path d="M12.73,20.57V49.79a.57.57,0,0,0,.47.56l21.13,3.91a.57.57,0,0,0,.67-.57V16.31a.57.57,0,0,0-.68-.57L13.19,20A.57.57,0,0,0,12.73,20.57ZM23.41,42.28c-3.23,0-5.85-3.29-5.85-7.35s2.62-7.36,5.85-7.36,5.86,3.29,5.86,7.36S26.65,42.28,23.41,42.28Z" fill="#fff"/>
-          </g>
-          <g>
-            <polygon points="38.56 44.29 37.72 44.29 36.89 44.29 36.89 48.77 37.72 48.77 38.56 48.77 39.39 48.77 39.39 44.29 38.56 44.29" fill="#fff"/>
-            <path d="M56,17.65H36.92V23.7H55.48V50.56H36.92v1.79H56a1.22,1.22,0,0,0,1.26-1.25V19A1.32,1.32,0,0,0,56,17.65Z" fill="#fff"/>
-            <polygon points="51.9 25.49 50.12 25.49 48.33 25.49 48.33 29.97 50.12 29.97 51.9 29.97 53.69 29.97 53.69 25.49 51.9 25.49" fill="#fff"/>
-            <polygon points="51.9 31.76 50.12 31.76 48.33 31.76 48.33 36.24 50.12 36.24 51.9 36.24 53.69 36.24 53.69 31.76 51.9 31.76" fill="#fff"/>
-            <polygon points="51.9 38.02 50.12 38.02 48.33 38.02 48.33 42.5 50.12 42.5 51.9 42.5 53.69 42.5 53.69 38.02 51.9 38.02" fill="#fff"/>
-            <polygon points="44.75 25.49 42.97 25.49 41.18 25.49 41.18 29.97 42.97 29.97 44.75 29.97 46.54 29.97 46.54 25.49 44.75 25.49" fill="#fff"/>
-            <polygon points="44.75 31.76 42.97 31.76 41.18 31.76 41.18 36.24 42.97 36.24 44.75 36.24 46.54 36.24 46.54 31.76 44.75 31.76" fill="#fff"/>
-            <polygon points="44.75 38.02 42.97 38.02 41.18 38.02 41.18 42.5 42.97 42.5 44.75 42.5 46.54 42.5 46.54 38.02 44.75 38.02" fill="#fff"/>
-            <polygon points="44.75 44.29 42.97 44.29 41.18 44.29 41.18 48.77 42.97 48.77 44.75 48.77 46.54 48.77 46.54 44.29 44.75 44.29" fill="#fff"/>
-            <polygon points="38.56 25.49 37.72 25.49 36.89 25.49 36.89 29.97 37.72 29.97 38.56 29.97 39.39 29.97 39.39 25.49 38.56 25.49" fill="#fff"/>
-            <polygon points="38.56 31.76 37.72 31.76 36.89 31.76 36.89 36.24 37.72 36.24 38.56 36.24 39.39 36.24 39.39 31.76 38.56 31.76" fill="#fff"/>
-            <polygon points="38.56 38.02 37.72 38.02 36.89 38.02 36.89 42.5 37.72 42.5 38.56 42.5 39.39 42.5 39.39 38.02 38.56 38.02" fill="#fff"/>
-          </g>
-          <polygon points="51.37 55 50.33 55 50.33 54.36 53.16 54.36 53.16 55 52.13 55 52.13 57.83 51.37 57.83 51.37 55 51.37 55" fill="#fff"/>
-          <polygon points="53.33 54.36 54.4 54.36 55.21 56.74 55.22 56.74 55.98 54.36 57.05 54.36 57.05 57.83 56.34 57.83 56.34 55.37 56.33 55.37 55.48 57.83 54.9 57.83 54.05 55.39 54.04 55.39 54.04 57.83 53.33 57.83 53.33 54.36" fill="#fff"/>
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M29.2 13.45h15.26c.85 0 1.54.69 1.54 1.54v20.02c0 .85-.69 1.54-1.54 1.54H29.2v-23.1Z" fill="#1976D2"/><path d="M43.9 18.656H29.2v16.319h14.7v-16.32Z" fill="#fff"/><path d="M28.15 46 4 41.275V8.725L28.15 4v42Z" fill="#1976D2"/><path d="M15.813 17.125c-3.335 0-6.038 3.526-6.038 7.875s2.703 7.875 6.037 7.875c3.335 0 6.038-3.526 6.038-7.875 0-4.35-2.703-7.875-6.038-7.875Zm-.263 12.6c-1.74 0-3.15-2.116-3.15-4.725 0-2.61 1.41-4.725 3.15-4.725S18.7 22.39 18.7 25c0 2.609-1.41 4.725-3.15 4.725Z" fill="#fff"/><path d="M32.084 31.023H29.25v3.045h2.835v-3.045Zm3.571 0H32.82v3.045h2.835v-3.045Zm3.572 0h-2.835v3.045h2.834v-3.045Zm-7.143-3.756H29.25v3.045h2.835v-3.045Zm3.571 0H32.82v3.045h2.835v-3.045Zm3.572 0h-2.835v3.045h2.834v-3.045Zm3.57 0h-2.834v3.045h2.834v-3.045Zm-10.713-3.626H29.25v3.045h2.835v-3.045Zm3.571 0H32.82v3.045h2.835v-3.045Zm3.572 0h-2.835v3.045h2.834v-3.045Zm3.57 0h-2.834v3.045h2.834v-3.045Zm-7.142-3.774H32.82v3.045h2.835v-3.045Zm3.572 0h-2.835v3.045h2.834v-3.045Zm3.57 0h-2.834v3.045h2.834v-3.045Z" fill="#1976D2"/></svg>
diff --git a/addons/microsoft_calendar/static/src/scss/microsoft_calendar.scss b/addons/microsoft_calendar/static/src/scss/microsoft_calendar.scss
index 6930f837c4e..c5080d791f4 100644
--- a/addons/microsoft_calendar/static/src/scss/microsoft_calendar.scss
+++ b/addons/microsoft_calendar/static/src/scss/microsoft_calendar.scss
@@ -1,6 +1,6 @@
 .o_calendar_sidebar {
     .bg-primary {
-        background-color: $o-enterprise-primary-color;
+        background-color: $o-enterprise-action-color;
     }
     .o_microsoft_sync_button_configured {
         color: white;
diff --git a/addons/microsoft_outlook/static/description/icon.png b/addons/microsoft_outlook/static/description/icon.png
index 6c454d3f896..e7e034d5fd3 100644
Binary files a/addons/microsoft_outlook/static/description/icon.png and b/addons/microsoft_outlook/static/description/icon.png differ
diff --git a/addons/microsoft_outlook/static/description/icon.svg b/addons/microsoft_outlook/static/description/icon.svg
index 9408317cf0e..7f36a568b35 100644
--- a/addons/microsoft_outlook/static/description/icon.svg
+++ b/addons/microsoft_outlook/static/description/icon.svg
@@ -1,51 +1 @@
-<?xml version="1.0" ?><svg id="Capa_1" style="enable-background:new 0 0 128 128;" version="1.1" viewBox="0 0 128 128" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><style type="text/css">
-	.st0{fill:#21A365;}
-	.st1{fill:#107C41;}
-	.st2{fill:#185B37;}
-	.st3{fill:#33C481;}
-	.st4{fill:#17864C;}
-	.st5{fill:#FFFFFF;}
-	.st6{fill:#036C70;}
-	.st7{fill:#1A9BA1;}
-	.st8{fill:#37C6D0;}
-	.st9{fill:#04878B;}
-	.st10{fill:#4F59CA;}
-	.st11{fill:#7B82EA;}
-	.st12{fill:#4C53BB;}
-	.st13{fill:#0F78D5;}
-	.st14{fill:#29A7EB;}
-	.st15{fill:#0358A8;}
-	.st16{fill:#0F79D6;}
-	.st17{fill:#038387;}
-	.st18{fill:#048A8E;}
-	.st19{fill:#C8421D;}
-	.st20{fill:#FF8F6A;}
-	.st21{fill:#ED6B47;}
-	.st22{fill:#891323;}
-	.st23{fill:#AF2131;}
-	.st24{fill:#C94E60;}
-	.st25{fill:#E08195;}
-	.st26{fill:#B42839;}
-	.st27{fill:#0464B8;}
-	.st28{fill:#0377D4;}
-	.st29{fill:#4FD8FF;}
-	.st30{fill:#1681D7;}
-	.st31{fill:#0178D4;}
-	.st32{fill:#042071;}
-	.st33{fill:#168FDE;}
-	.st34{fill:#CA64EA;}
-	.st35{fill:#7E1FAF;}
-	.st36{fill:#AE4BD5;}
-	.st37{fill:#9332BF;}
-	.st38{fill:#7719AA;}
-	.st39{fill:#0078D4;}
-	.st40{fill:#1490DF;}
-	.st41{fill:#0364B8;}
-	.st42{fill:#28A8EA;}
-	.st43{fill:#41A5ED;}
-	.st44{fill:#2C7BD5;}
-	.st45{fill:#195ABE;}
-	.st46{fill:#103E91;}
-	.st47{fill:#2166C3;}
-	.st48{opacity:0.2;}
-</style><g><path class="st27" d="M120.2,22.8H34.2V9.1C34.2,6.8,36,5,38.2,5h77.9c2.3,0,4.1,1.8,4.1,4.1V22.8z"/><rect class="st28" height="26.6" width="28.7" x="34.2" y="22.8"/><rect class="st14" height="26.6" width="28.7" x="62.9" y="22.8"/><rect class="st29" height="26.6" width="28.7" x="91.6" y="22.8"/><rect class="st30" height="26.6" width="28.7" x="34.2" y="49.4"/><rect class="st31" height="26.6" width="28.7" x="62.9" y="49.4"/><rect class="st14" height="26.6" width="28.7" x="91.6" y="49.4"/><rect class="st27" height="26.6" width="28.7" x="62.9" y="75.9"/><rect class="st30" height="26.6" width="28.7" x="91.6" y="75.9"/></g><path class="st32" d="M126.9,69.1l-6.6,3.9V61.8l6.5,3.6C128.3,66.1,128.3,68.2,126.9,69.1z"/><path class="st33" d="M126.9,69.1l-0.6,0.4l0,0l-0.7,0.4l-5.3,3.1v-0.1l-88.4,50.6h89.1c3.8,0,6.8-3.1,6.8-6.8l0.1-49.4  C128,67.9,127.6,68.7,126.9,69.1z"/><g><path class="st14" d="M122,123.5H32.8c-3.8,0-6.8-3.1-6.8-6.8V68.5L122,123.5z"/></g><path class="st30" d="M59,96.5h-53c-3.5,0-6.4-2.9-6.4-6.4V37.9c0-3.5,2.9-6.4,6.4-6.4h53c3.5,0,6.4,2.9,6.4,6.4v52.2  C65.4,93.6,62.6,96.5,59,96.5z"/><g><path class="st5" d="M32.5,82.9c-10.3,0-16.8-7.8-16.8-18.2c0-11,7.1-18.8,17.3-18.8c10.6,0,16.8,7.9,16.8,18.1   C49.9,76.1,42.5,82.9,32.5,82.9L32.5,82.9z M32.9,77.7c6.4,0,10-5.9,10-13.4c0-6.8-3.4-13.1-10-13.1s-10.1,6.2-10.1,13.4   S26.4,77.7,32.9,77.7L32.9,77.7z"/></g><path class="st48" d="M65.5,37.3c0,0.2,0,0.4,0,0.6v52.2c0,3.5-2.9,6.4-6.4,6.4H26v5.7h38.4c3.5,0,6.4-2.9,6.4-6.4V43.6  C70.8,40.4,68.5,37.7,65.5,37.3z"/></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M46 26.475a.936.936 0 0 0-.448-.804h-.005l-.017-.01-14.554-8.6a1.956 1.956 0 0 0-2.182 0l-14.553 8.6-.018.01a.946.946 0 0 0 .023 1.621l14.553 8.6a1.956 1.956 0 0 0 2.182 0l14.554-8.6a.935.935 0 0 0 .465-.817Z" fill="#0A2767"/><path d="M15.938 20.733h9.55v8.74h-9.55v-8.74Zm28.109-8.883V7.852A1.813 1.813 0 0 0 42.276 6H17.492a1.813 1.813 0 0 0-1.77 1.852v3.998l14.65 3.9 13.675-3.9Z" fill="#0364B8"/><path d="M15.72 11.85h9.768v8.775h-9.767V11.85Z" fill="#0078D4"/><path d="M35.256 11.85h-9.768v8.775l9.768 8.775h8.79v-8.775l-8.79-8.775Z" fill="#28A8EA"/><path d="M25.488 20.625h9.768V29.4h-9.768v-8.775Z" fill="#0078D4"/><path d="M25.488 29.4h9.768v8.775h-9.768V29.4Z" fill="#0364B8"/><path d="M15.938 29.472h9.55v7.944h-9.55v-7.944Z" fill="#14447D"/><path d="M35.256 29.4h8.79v8.775h-8.79V29.4Z" fill="#0078D4"/><path d="m45.553 27.238-.019.01-14.553 8.17a2.032 2.032 0 0 1-.984.304l-.796-.463a1.99 1.99 0 0 1-.195-.112l-14.75-8.403h-.006l-.482-.269v16.54A2 2 0 0 0 15.783 45h28.233c.017 0 .032-.008.05-.008.233-.015.463-.063.683-.142.095-.04.187-.088.274-.142.066-.038.178-.118.178-.118.5-.37.797-.954.8-1.575v-16.54a.877.877 0 0 1-.448.763Z" fill="url(#o_icon_microsoft_outlook__a)"/><path opacity=".5" d="M45.219 26.41v1.014L30 37.882 14.246 26.751a.01.01 0 0 0-.01-.01l-1.445-.868v-.73l.596-.01 1.26.72.03.01.107.069s14.807 8.434 14.846 8.453l.567.332c.048-.02.097-.04.156-.059.03-.02 14.7-8.258 14.7-8.258l.166.01Z" fill="#0A2767"/><path d="m45.553 27.238-.019.011-14.553 8.17a2.044 2.044 0 0 1-2.182 0l-14.554-8.17-.017-.01a.877.877 0 0 1-.46-.764v16.54A2 2 0 0 0 15.78 45h28.205A2 2 0 0 0 46 43.015v-16.54a.877.877 0 0 1-.447.763Z" fill="#1490DF"/><path opacity=".1" d="m31.193 35.299-.218.122a2.025 2.025 0 0 1-.963.313l5.537 6.536 9.659 2.323c.265-.2.475-.462.612-.763L31.193 35.3Z"/><path opacity=".05" d="m32.18 34.745-1.205.676a2.027 2.027 0 0 1-.963.313l2.594 7.14L45.21 44.59a1.97 1.97 0 0 0 .79-1.575v-.214l-13.82-8.056Z"/><path d="M15.809 45h28.174c.434.002.857-.134 1.206-.39L29.2 35.26a1.977 1.977 0 0 1-.195-.111l-14.75-8.403h-.006l-.481-.27v16.482A2.042 2.042 0 0 0 15.809 45Z" fill="#28A8EA"/><path opacity=".1" d="M27.442 15.587v20.797a1.792 1.792 0 0 1-1.123 1.657c-.21.09-.436.137-.665.137H13.768V14.775h1.953V13.8h9.934a1.793 1.793 0 0 1 1.787 1.787Z"/><path opacity=".2" d="M26.465 16.562V37.36c.003.235-.047.468-.146.682a1.78 1.78 0 0 1-1.641 1.109h-10.91V14.775h10.91c.283-.003.563.068.81.205.6.3.977.913.977 1.582Z"/><path opacity=".2" d="M26.465 16.562V35.41a1.801 1.801 0 0 1-1.787 1.79h-10.91V14.776h10.91c.283-.003.563.068.81.205.6.3.977.913.977 1.582Z"/><path opacity=".2" d="M25.488 16.562V35.41a1.795 1.795 0 0 1-1.787 1.79h-9.933V14.776H23.7c.988 0 1.788.8 1.787 1.786v.001Z"/><path d="M5.79 14.775h17.908c.989 0 1.79.8 1.79 1.787v17.876c0 .987-.801 1.787-1.79 1.787H5.79c-.988 0-1.79-.8-1.79-1.787V16.562c0-.987.802-1.787 1.79-1.787Z" fill="url(#o_icon_microsoft_outlook__b)"/><path d="M9.596 22.27a5.202 5.202 0 0 1 2.045-2.255 6.191 6.191 0 0 1 3.25-.813 5.762 5.762 0 0 1 3.007.771 5.16 5.16 0 0 1 1.99 2.155 6.94 6.94 0 0 1 .697 3.169 7.33 7.33 0 0 1-.718 3.315 5.28 5.28 0 0 1-2.05 2.23 5.992 5.992 0 0 1-3.12.792 5.89 5.89 0 0 1-3.074-.78 5.236 5.236 0 0 1-2.016-2.16 6.779 6.779 0 0 1-.705-3.13 7.528 7.528 0 0 1 .694-3.293Zm2.18 5.295a3.375 3.375 0 0 0 1.15 1.484 3.01 3.01 0 0 0 1.798.54 3.152 3.152 0 0 0 1.918-.558c.51-.375.899-.89 1.118-1.484a5.75 5.75 0 0 0 .356-2.07 6.289 6.289 0 0 0-.336-2.096 3.314 3.314 0 0 0-1.082-1.546 2.975 2.975 0 0 0-1.902-.585 3.104 3.104 0 0 0-1.839.545 3.404 3.404 0 0 0-1.172 1.496 5.937 5.937 0 0 0-.008 4.276v-.002Z" fill="#fff"/><path d="M35.256 11.85h8.79v8.775h-8.79V11.85Z" fill="#50D9FF"/><defs><linearGradient id="o_icon_microsoft_outlook__a" x1="29.884" y1="26.475" x2="29.884" y2="45" gradientUnits="userSpaceOnUse"><stop stop-color="#35B8F1"/><stop offset="1" stop-color="#28A8EA"/></linearGradient><linearGradient id="o_icon_microsoft_outlook__b" x1="7.733" y1="13.378" x2="21.718" y2="37.643" gradientUnits="userSpaceOnUse"><stop stop-color="#1784D9"/><stop offset=".5" stop-color="#107AD5"/><stop offset="1" stop-color="#0A63C9"/></linearGradient></defs></svg>
diff --git a/addons/microsoft_outlook/views/fetchmail_server_views.xml b/addons/microsoft_outlook/views/fetchmail_server_views.xml
index 8a3d6d955b8..f1aed89ac9d 100644
--- a/addons/microsoft_outlook/views/fetchmail_server_views.xml
+++ b/addons/microsoft_outlook/views/fetchmail_server_views.xml
@@ -20,7 +20,7 @@
                     <button type="object"
                         name="open_microsoft_outlook_uri" class="btn-link px-0"
                         attrs="{'invisible': ['|', '|', ('is_microsoft_outlook_configured', '=', False), ('server_type', '!=', 'outlook'), ('microsoft_outlook_refresh_token', '!=', False)]}">
-                        <i class="fa fa-arrow-right"/>
+                        <i class="oi oi-arrow-right"/>
                         Connect your Outlook account
                     </button>
                     <button type="object"
@@ -29,7 +29,7 @@
                         <i class="fa fa-cog" title="Edit Settings"/>
                     </button>
                     <button class="alert alert-warning d-block mt-2 text-start"
-                        icon="fa-arrow-right" type="action" role="alert"
+                        icon="oi-arrow-right" type="action" role="alert"
                         name="%(base.res_config_setting_act_window)d"
                         attrs="{'invisible': ['|', ('is_microsoft_outlook_configured', '=', True), ('server_type', '!=', 'outlook')]}">
                         Setup your Outlook API credentials in the general settings to link a Outlook account.
diff --git a/addons/microsoft_outlook/views/ir_mail_server_views.xml b/addons/microsoft_outlook/views/ir_mail_server_views.xml
index 03d42379650..3e15d2eb9e8 100644
--- a/addons/microsoft_outlook/views/ir_mail_server_views.xml
+++ b/addons/microsoft_outlook/views/ir_mail_server_views.xml
@@ -19,7 +19,7 @@
                     <button type="object"
                         name="open_microsoft_outlook_uri" class="btn-link px-0"
                         attrs="{'invisible': ['|', '|', ('is_microsoft_outlook_configured', '=', False), ('smtp_authentication', '!=', 'outlook'), ('microsoft_outlook_refresh_token', '!=', False)]}">
-                        <i class="fa fa-arrow-right"/>
+                        <i class="oi oi-arrow-right"/>
                         Connect your Outlook account
                     </button>
                     <button type="object"
@@ -28,7 +28,7 @@
                         <i class="fa fa-cog" title="Edit Settings"/>
                     </button>
                     <button class="alert alert-warning d-block mt-2 text-start"
-                        icon="fa-arrow-right" type="action" role="alert"
+                        icon="oi-arrow-right" type="action" role="alert"
                         name="%(base.res_config_setting_act_window)d"
                         attrs="{'invisible': ['|', ('is_microsoft_outlook_configured', '=', True), ('smtp_authentication', '!=', 'outlook')]}">
                         Setup your Outlook API credentials in the general settings to link a Outlook account.
diff --git a/addons/mrp/static/description/icon.png b/addons/mrp/static/description/icon.png
index cd285ea9f65..02e4e5ba05f 100644
Binary files a/addons/mrp/static/description/icon.png and b/addons/mrp/static/description/icon.png differ
diff --git a/addons/mrp/static/description/icon.svg b/addons/mrp/static/description/icon.svg
index cca7bcfd7af..d03a0251072 100644
--- a/addons/mrp/static/description/icon.svg
+++ b/addons/mrp/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#7CC098"/><stop offset="100%" stop-color="#5F8A71"/></linearGradient><path id="d" d="M53.373 32.454c.742 0 1.206.784.824 1.4-2.009 3.235-5.668 5.4-9.848 5.4-6.318 0-11.445-4.944-11.484-11.056C32.825 22.058 38.012 17 44.349 17c4.176 0 7.831 2.16 9.842 5.389.385.62-.07 1.41-.818 1.41h-8.386l-3.19 4.328 3.19 4.327h8.386zM39.684 39.64l-15.97 15.473c-1.994 1.931-5.226 1.931-7.22 0a4.837 4.837 0 0 1 0-6.994l15.971-15.472c1.289 3.183 3.932 5.744 7.219 6.993zm-16.39 10.74c0-1.024-.857-1.854-1.914-1.854s-1.914.83-1.914 1.854.857 1.854 1.914 1.854 1.914-.83 1.914-1.854z"/><path id="e" d="M53.373 30.454c.742 0 1.206.784.824 1.4-2.009 3.235-5.668 5.4-9.848 5.4-6.318 0-11.445-4.944-11.484-11.056C32.825 20.058 38.012 15 44.349 15c4.176 0 7.831 2.16 9.842 5.389.385.62-.07 1.41-.818 1.41h-8.386l-3.19 4.328 3.19 4.327h8.386zM39.684 37.64l-15.97 15.473c-1.994 1.931-5.226 1.931-7.22 0a4.837 4.837 0 0 1 0-6.994l15.971-15.472c1.289 3.183 3.932 5.744 7.219 6.993zm-16.39 10.74c0-1.024-.857-1.854-1.914-1.854s-1.914.83-1.914 1.854.857 1.854 1.914 1.854 1.914-.83 1.914-1.854z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V36.075l15.053-15.2 18.452.218 2.734 6.93v4.524L53.62 51.98 42.667 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" transform="matrix(-1 0 0 1 69.334 0)" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" transform="matrix(-1 0 0 1 69.334 0)" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M50 19.023c0-.735-.737-1.23-1.398-.938l-28 12.403a1.026 1.026 0 0 0-.602.939v9.55c0 .565.448 1.023 1 1.023h25c2.21 0 4-1.83 4-4.089V19.023Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M50 19.023c0-.735-.737-1.23-1.398-.938l-28 12.403a1.026 1.026 0 0 0-.602.939v9.55c0 .565.448 1.023 1 1.023h25c2.21 0 4-1.83 4-4.089V19.023Z" fill="url(#o_icon_mrp__a)" fill-opacity=".2"/><path d="M42 14.018c0-.722-.719-1.214-1.376-.942l-30 12.394a1.017 1.017 0 0 0-.624.943v14.57c0 .562.448 1.017 1 1.017h27c2.21 0 4-1.821 4-4.068V14.018Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M42 14.018c0-.722-.719-1.214-1.376-.942l-30 12.394a1.017 1.017 0 0 0-.624.943v14.57c0 .562.448 1.017 1 1.017h27c2.21 0 4-1.821 4-4.068V14.018Z" fill="url(#o_icon_mrp__b)" fill-opacity=".2"/><path d="m42 21.01-21.398 9.478a1.026 1.026 0 0 0-.602.939v9.55c0 .565.448 1.023 1 1.023h17c2.21 0 4-1.821 4-4.068V21.01Z" fill="var(--o-icons-red-yellow, #F85318)"/><path d="m42 21.01-21.398 9.478a1.026 1.026 0 0 0-.602.939v9.55c0 .565.448 1.023 1 1.023h17c2.21 0 4-1.821 4-4.068V21.01Z" fill="url(#o_icon_mrp__c)" fill-opacity=".2"/><path d="M32 9.015c0-.72-.719-1.21-1.376-.94l-30 12.364a1.015 1.015 0 0 0-.624.94v19.607C0 41.546.448 42 1 42h27c2.21 0 4-1.817 4-4.058V9.015Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path d="M32 9.015c0-.72-.719-1.21-1.376-.94l-30 12.364a1.015 1.015 0 0 0-.624.94v19.607C0 41.546.448 42 1 42h27c2.21 0 4-1.817 4-4.058V9.015Z" fill="url(#o_icon_mrp__d)" fill-opacity=".2"/><path d="M32 16.639 10.624 25.47a1.017 1.017 0 0 0-.624.943v14.57c0 .562.448 1.017 1 1.017h17c2.21 0 4-1.817 4-4.058V16.64Z" fill="var(--o-icons-red-teal, #006158)"/><path d="M32 16.639 10.624 25.47a1.017 1.017 0 0 0-.624.943v14.57c0 .562.448 1.017 1 1.017h17c2.21 0 4-1.817 4-4.058V16.64Z" fill="url(#o_icon_mrp__e)" fill-opacity=".2"/><defs><linearGradient id="o_icon_mrp__a" x1="20" y1="18" x2="54.164" y2="28.676" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_mrp__b" x1="10" y1="13" x2="47.171" y2="23.254" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_mrp__c" x1="20" y1="21.01" x2="45.733" y2="27.753" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_mrp__d" x1="0" y1="8" x2="37.902" y2="16.918" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_mrp__e" x1="10" y1="16.639" x2="36.265" y2="22.335" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/mrp/static/src/components/bom_overview_control_panel/mrp_bom_overview_control_panel.xml b/addons/mrp/static/src/components/bom_overview_control_panel/mrp_bom_overview_control_panel.xml
index 4db09eb6453..162f84d8a9d 100644
--- a/addons/mrp/static/src/components/bom_overview_control_panel/mrp_bom_overview_control_panel.xml
+++ b/addons/mrp/static/src/components/bom_overview_control_panel/mrp_bom_overview_control_panel.xml
@@ -3,7 +3,7 @@
 
     <t t-name="mrp.BomOverviewControlPanel" owl="1">
         <ControlPanel display="controlPanelDisplay">
-            <t t-set-slot="control-panel-bottom-left-buttons">
+            <t t-set-slot="control-panel-always-buttons">
                 <div class="o_cp_buttons">
                     <div class="o_list_buttons o_mrp_bom_report_buttons">
                         <button t-on-click="() => this.props.print()" type="button" class="btn btn-primary">Print</button>
@@ -15,47 +15,44 @@
                 </div>
             </t>
 
-            <t t-set-slot="control-panel-top-right">
-                <form class="row gx-0">
-                    <div class="col-lg-8 row">
-                        <div class="col-lg-11 row gx-1 mb-2">
-                            <label for="bom_quantity" class="col-xl-2 col-lg-3 col-sm-4">Quantity:</label>
-                            <div t-attf-class="{{ props.showOptions.uom ? 'col-xl-7 col-lg-6 col-sm-5' : 'col-xl-10 col-lg-9 col-sm-8' }}">
-                                <input id="bom_quantity" type="number" step="any" t-on-change="ev => this.updateQuantity(ev)" t-on-keypress="ev => this.onKeyPress(ev)" t-att-value="props.bomQuantity" min="1" class="o_input"/>
-                            </div>
-                            <div t-if="props.showOptions.uom" class="col-xl-3 col-lg-3 col-sm-3">
-                                <span t-esc="props.uomName"/>
-                            </div>
+            <t t-set-slot="layout-actions">
+            <div class="d-flex flex-column gap-1">
+                <form class="d-flex w-100 gap-2">
+                        <label class="visually-hidden" for="bom_quantity">Quantity</label>
+                        <div class="input-group">
+                            <div class="input-group-text">Quantity</div>
+                            <input id="bom_quantity" type="number" step="any" t-on-change="ev => this.updateQuantity(ev)" t-on-keypress="ev => this.onKeyPress(ev)" t-att-value="props.bomQuantity" min="1" class="o_input form-control text-end"/>
+                            <div t-if="props.showOptions.uom" t-esc="props.uomName" class="input-group-text">Quantity</div>
                         </div>
-                        <div t-if="props.showVariants" class="col-lg-11 row gx-1 mb-1">
-                            <label class="col-xl-2 col-lg-3 col-sm-4">Variant:</label>
-                            <div class="col-xl-10 col-lg-9 col-sm-8">
-                                <select class="o_input" t-on-change="(ev) => this.props.changeVariant(ev.target.value)">
-                                    <option t-foreach="props.variants" t-as="variant" t-att-value="variant" t-key="variant">
-                                        <t t-esc="props.variants[variant]"/>
-                                    </option>
-                                </select>
-                            </div>
+                    <t t-if="props.showVariants" >
+                        <label class="visually-hidden" for="bom_quantity">Variant</label>
+                        <div class="input-group">
+                            <div class="input-group-text">Variant</div>
+                            <select class="o_input form-control" t-on-change="(ev) => this.props.changeVariant(ev.target.value)">
+                                <option t-foreach="props.variants" t-as="variant" t-att-value="variant" t-key="variant">
+                                    <t t-esc="props.variants[variant]"/>
+                                </option>
+                            </select>
                         </div>
-                    </div>
-                </form>
-            </t>
-
-            <t t-set-slot="control-panel-bottom-right">
-                <div class="o_search_options">
-                    <t t-if="props.warehouses.length > 1">
-                        <Dropdown class="'btn-group'" togglerClass="'btn btn-secondary'">
-                            <t t-set-slot="toggler">
-                                <span class="fa fa-home"/> Warehouse: <span t-esc="props.currentWarehouse.name"/>
-                            </t>
-                            <t t-foreach="props.warehouses" t-as="wh" t-key="wh.id">
-                                <DropdownItem onSelected="() => this.props.changeWarehouse(wh.id)" t-esc="wh.name"/>
-                            </t>
-                        </Dropdown>
                     </t>
-                    <BomOverviewDisplayFilter
-                        showOptions="props.showOptions"
-                        changeDisplay.bind="props.changeDisplay"/>
+                </form>
+                <div class="d-flex w-100 gap-1">
+                    <div class="col d-flex gap-1">
+                        <t t-if="props.warehouses.length > 1">
+                            <Dropdown class="'btn-group'" togglerClass="'btn btn-secondary'">
+                                <t t-set-slot="toggler">
+                                    <span class="fa fa-home"/> Warehouse: <span t-esc="props.currentWarehouse.name"/>
+                                </t>
+                                <t t-foreach="props.warehouses" t-as="wh" t-key="wh.id">
+                                    <DropdownItem onSelected="() => this.props.changeWarehouse(wh.id)" t-esc="wh.name"/>
+                                </t>
+                            </Dropdown>
+                        </t>
+                        <BomOverviewDisplayFilter
+                            showOptions="props.showOptions"
+                            changeDisplay.bind="props.changeDisplay"/>
+                    </div>
+                </div>
                 </div>
             </t>
         </ControlPanel>
diff --git a/addons/mrp/static/src/components/bom_overview_display_filter/mrp_bom_overview_display_filter.xml b/addons/mrp/static/src/components/bom_overview_display_filter/mrp_bom_overview_display_filter.xml
index 0adf1c31b0c..5484467d85d 100644
--- a/addons/mrp/static/src/components/bom_overview_display_filter/mrp_bom_overview_display_filter.xml
+++ b/addons/mrp/static/src/components/bom_overview_display_filter/mrp_bom_overview_display_filter.xml
@@ -5,7 +5,7 @@
         <Dropdown class="'btn-group'" togglerClass="'btn btn-secondary'">
             <t t-set-slot="toggler">
                 <span class="fa fa-filter"/>
-                Display: <span t-esc="currentDisplayedNames"/>
+                Display: <span class="text-wrap" t-esc="currentDisplayedNames"/>
             </t>
             <t t-foreach="displayableOptions" t-as="optionKey" t-key="optionKey">
                 <DropdownItem parentClosingMode="'none'" class="{ o_menu_item: true, selected: props.showOptions[optionKey] }" onSelected="() => this.props.changeDisplay(optionKey)" t-esc="displayOptions[optionKey]"/>
diff --git a/addons/mrp/static/src/components/mo_overview/mrp_mo_overview.xml b/addons/mrp/static/src/components/mo_overview/mrp_mo_overview.xml
index ec2070caef4..d6282088f57 100644
--- a/addons/mrp/static/src/components/mo_overview/mrp_mo_overview.xml
+++ b/addons/mrp/static/src/components/mo_overview/mrp_mo_overview.xml
@@ -2,14 +2,16 @@
 <templates xml:space="preserve">
 
     <div t-name="mrp.MoOverview" class="o_action" owl="1">
-        <Layout display="{ controlPanel: { 'top-right': false } }">
-            <t t-set-slot="control-panel-bottom-right">
+        <Layout display="{ controlPanel: {} }">
+            <t t-set-slot="layout-actions">
                 <MoOverviewDisplayFilter showOptions="state.showOptions" limited="state.isDone" changeDisplay.bind="onChangeDisplay"/>
             </t>
 
-            <t t-set-slot="control-panel-bottom-left">
-                <button class="btn btn-primary" t-on-click="onPrint">Print</button>
-                <button class="btn btn-primary" t-on-click="onUnfold">Unfold</button>
+            <t t-set-slot="control-panel-create-button">
+                <div class="d-flex gap-1">
+                    <button class="btn btn-primary" t-on-click="onPrint">Print</button>
+                    <button class="btn btn-primary" t-on-click="onUnfold">Unfold</button>
+                </div>
             </t>
 
             <div class="py-3 py-lg-5 overflow-auto border-bottom bg-view">
diff --git a/addons/mrp/static/src/views/mrp_documents_kanban/mrp_documents_kanban_controller.xml b/addons/mrp/static/src/views/mrp_documents_kanban/mrp_documents_kanban_controller.xml
index 3e365f35a38..355c336be51 100644
--- a/addons/mrp/static/src/views/mrp_documents_kanban/mrp_documents_kanban_controller.xml
+++ b/addons/mrp/static/src/views/mrp_documents_kanban/mrp_documents_kanban_controller.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates>
     <t t-name="mrp.MrpDocumentsKanbanView.Buttons" t-inherit="web.KanbanView.Buttons" t-inherit-mode="primary" owl="1">
-        <div role="toolbar" position="inside">
+        <xpath expr="//div[hasclass('o_cp_buttons')]" position="inside">
             <input type="file" multiple="true" t-ref="uploadFileInput" class="o_input_file o_hidden" t-on-change.stop="onFileInputChange"/>
             <button type="button" t-attf-class="btn btn-primary o_mrp_documents_kanban_upload"
                 t-on-click.stop.prevent="() => this.uploadFileInputRef.el.click()">
                 Upload
             </button>
-        </div>
+        </xpath>
     </t>
 </templates>
diff --git a/addons/mrp/static/src/widgets/mrp_workorder_popover.xml b/addons/mrp/static/src/widgets/mrp_workorder_popover.xml
index 31643877358..a8316635009 100644
--- a/addons/mrp/static/src/widgets/mrp_workorder_popover.xml
+++ b/addons/mrp/static/src/widgets/mrp_workorder_popover.xml
@@ -4,7 +4,7 @@
     <div t-name="mrp.workorderPopover" owl="1">
         <h6>Scheduling Information</h6>
         <t t-foreach="props.infos" t-as="info" t-key="info_index">
-            <i t-attf-class="fa fa-arrow-right me-2 #{ info.color }"></i><t t-esc="info.msg"/><br/>
+            <i t-attf-class="oi oi-arrow-right me-2 #{ info.color }"></i><t t-esc="info.msg"/><br/>
         </t>
         <button t-if="props.replan" t-on-click="onReplanClick" class="btn btn-sm btn-primary m-1 float-end action_replan_button">Replan</button>
     </div>
diff --git a/addons/mrp/views/mrp_bom_views.xml b/addons/mrp/views/mrp_bom_views.xml
index 8ce0b8b55f6..926f3d9be3b 100644
--- a/addons/mrp/views/mrp_bom_views.xml
+++ b/addons/mrp/views/mrp_bom_views.xml
@@ -45,9 +45,13 @@
                                 </div>
                             </button>
                             <button name="%(action_report_mrp_bom)d" type="action"
-                                class="oe_stat_button" icon="fa-bars" string="Overview"/>
+                                class="oe_stat_button" icon="fa-bars">
+                                <div class="o_stat_info">
+                                    <span class="o_stat_text">Overview</span>
+                                </div>
+                            </button>
                         </div>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <group>
                         <group>
                             <field name="active" invisible="1"/>
diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml
index db43aba7f34..5fc387a7c8d 100644
--- a/addons/mrp/views/mrp_production_views.xml
+++ b/addons/mrp/views/mrp_production_views.xml
@@ -176,7 +176,7 @@
                                 <span class="o_stat_text">Unbuilds</span>
                             </div>
                         </button>
-                        <button class="oe_stat_button" name="action_see_move_scrap" type="object" icon="fa-arrows-v" attrs="{'invisible': [('scrap_count', '=', 0)]}">
+                        <button class="oe_stat_button" name="action_see_move_scrap" type="object" icon="oi-arrows-v" attrs="{'invisible': [('scrap_count', '=', 0)]}">
                             <div class="o_field_widget o_stat_info">
                                 <span class="o_stat_value"><field name="scrap_count"/></span>
                                 <span class="o_stat_text">Scraps</span>
@@ -185,9 +185,21 @@
                         <button type="object" name="action_view_mo_delivery" class="oe_stat_button" icon="fa-truck"  groups="base.group_user" attrs="{'invisible': [('delivery_count', '=', 0)]}">
                             <field name="delivery_count" widget="statinfo" string="Transfers"/>
                         </button>
-                        <button name="%(stock.action_stock_report)d" icon="fa-arrow-up" class="oe_stat_button" string="Traceability" type="action" states="done" groups="stock.group_production_lot"/>
-                        <button name="%(action_mrp_production_moves)d" type="action" string="Product Moves" class="oe_stat_button" icon="fa-exchange" attrs="{'invisible': [('state', 'not in', ('progress', 'done'))]}"/>
-                        <button name="%(action_report_mo_overview)d" type="action" class="oe_stat_button" icon="fa-bars" string="Overview"/>
+                        <button name="%(stock.action_stock_report)d" icon="oi-arrow-up" class="oe_stat_button" string="Traceability" type="action" states="done" groups="stock.group_production_lot">
+                            <div class="o_stat_info">
+                                <span class="o_stat_text">Traceability</span>
+                            </div>
+                        </button>
+                        <button name="%(action_mrp_production_moves)d" type="action" class="oe_stat_button" icon="fa-exchange" attrs="{'invisible': [('state', 'not in', ('progress', 'done'))]}">
+                            <div class="o_stat_info">
+                                <span class="o_stat_text">Product Moves</span>
+                            </div>
+                        </button>
+                        <button name="%(action_report_mo_overview)d" type="action" class="oe_stat_button" icon="fa-bars">
+                            <div class="o_stat_info">
+                                <span class="o_stat_text">Overview</span>
+                            </div>
+                        </button>
                     </div>
                     <div class="oe_title">
                         <label class="o_form_label" for="name" string="MO Reference"/>
diff --git a/addons/mrp/views/mrp_routing_views.xml b/addons/mrp/views/mrp_routing_views.xml
index 5f0a456a024..f34aaa422e8 100644
--- a/addons/mrp/views/mrp_routing_views.xml
+++ b/addons/mrp/views/mrp_routing_views.xml
@@ -86,7 +86,7 @@
             <field name="arch" type="xml">
                 <form string="Routing Work Centers">
                     <sheet>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <group>
                             <group name="description">
                                 <field name="active" invisible="1"/>
diff --git a/addons/mrp/views/mrp_unbuild_views.xml b/addons/mrp/views/mrp_unbuild_views.xml
index c0dae5b866c..f3337ced34a 100644
--- a/addons/mrp/views/mrp_unbuild_views.xml
+++ b/addons/mrp/views/mrp_unbuild_views.xml
@@ -95,7 +95,11 @@
                     <sheet>
                         <div class="oe_button_box" name="button_box">
                             <button class="oe_stat_button" name="%(action_mrp_unbuild_moves)d"
-                                    string="Product Moves" type="action" icon="fa-exchange" states="done"/>
+                                    type="action" icon="fa-exchange" states="done">
+                                    <div class="o_stat_info">
+                                        <span class="o_stat_text">Product Moves</span>
+                                    </div>
+                            </button>
                         </div>
                         <div class="oe_title">
                             <h1><field name="name" placeholder="Unbuild Order" nolabel="1"/></h1>
diff --git a/addons/mrp/views/mrp_workcenter_views.xml b/addons/mrp/views/mrp_workcenter_views.xml
index ff2d0329fa4..b4d50ee285d 100644
--- a/addons/mrp/views/mrp_workcenter_views.xml
+++ b/addons/mrp/views/mrp_workcenter_views.xml
@@ -334,7 +334,7 @@
                                 </div>
                             </button>
                         </div>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <group>
                             <group>
                                 <field name="active" invisible="1"/>
diff --git a/addons/mrp/views/mrp_workorder_views.xml b/addons/mrp/views/mrp_workorder_views.xml
index d1badcc42fc..5bbbc2670c8 100644
--- a/addons/mrp/views/mrp_workorder_views.xml
+++ b/addons/mrp/views/mrp_workorder_views.xml
@@ -141,7 +141,7 @@
             </header>
             <sheet>
                 <div class="oe_button_box" name="button_box">
-                    <button class="oe_stat_button" name="action_see_move_scrap" type="object" icon="fa-arrows-v" attrs="{'invisible': [('scrap_count', '=', 0)]}">
+                    <button class="oe_stat_button" name="action_see_move_scrap" type="object" icon="oi-arrows-v" attrs="{'invisible': [('scrap_count', '=', 0)]}">
                         <div class="o_field_widget o_stat_info">
                             <span class="o_stat_value"><field name="scrap_count"/></span>
                             <span class="o_stat_text">Scraps</span>
@@ -447,7 +447,7 @@
                                             <span t-if="record.working_state.raw_value != 'blocked' and record.working_user_ids.raw_value.length == 0 and record.last_working_user_id.raw_value"><i class="fa fa-pause" role="img" aria-label="Pause" title="Pause"/></span>
                                             <span t-if="record.working_state.raw_value == 'blocked' and (record.working_user_ids.raw_value.length == 0 or record.last_working_user_id.raw_value)"><i class="fa fa-stop" role="img" aria-label="Stop" title="Stop"/></span>
                                             <t name="user_avatar" t-if="record.last_working_user_id.raw_value">
-                                                <img t-att-src="kanban_image('res.users', 'avatar_128', record.last_working_user_id.raw_value)" class="oe_kanban_avatar" alt="Avatar"/>
+                                                <img t-att-src="kanban_image('res.users', 'avatar_128', record.last_working_user_id.raw_value)" class="oe_kanban_avatar o_avatar rounded" alt="Avatar"/>
                                             </t>
                                         </div>
                                     </div>
diff --git a/addons/mrp/views/res_config_settings_views.xml b/addons/mrp/views/res_config_settings_views.xml
index 838bcc349e2..3481795bcc5 100644
--- a/addons/mrp/views/res_config_settings_views.xml
+++ b/addons/mrp/views/res_config_settings_views.xml
@@ -16,7 +16,7 @@
                                 <div id="workorder_settings_workcenters" class="content-group" attrs="{'invisible': [('group_mrp_routings','=',False)]}">
                                     <div class="mt8">
                                         <div>
-                                            <button name="%(mrp.mrp_workcenter_action)d" icon="fa-arrow-right" type="action" string="Work Centers" class="btn-link"/>
+                                            <button name="%(mrp.mrp_workcenter_action)d" icon="oi-arrow-right" type="action" string="Work Centers" class="btn-link"/>
                                         </div>
                                     </div>
                                 </div>
diff --git a/addons/mrp_account/views/mrp_production_views.xml b/addons/mrp_account/views/mrp_production_views.xml
index d0602fb8b8c..4b68de29983 100644
--- a/addons/mrp_account/views/mrp_production_views.xml
+++ b/addons/mrp_account/views/mrp_production_views.xml
@@ -20,15 +20,23 @@
             </xpath>
             <xpath expr="//div[@name='button_box']" position="inside">
                 <t groups="stock.group_stock_manager">
-                    <button string="Valuation" type="object"
+                    <button type="object"
                         name="action_view_stock_valuation_layers"
                         class="oe_stat_button" icon="fa-dollar" groups="base.group_no_one"
-                        attrs="{'invisible': [('show_valuation', '=', False)]}" />
+                        attrs="{'invisible': [('show_valuation', '=', False)]}" >
+                        <div class="o_stat_info">
+                            <span class="o_stat_text">Valuation</span>
+                        </div>
+                    </button>
                     <button class="oe_stat_button" type="object"
                         name="action_view_analytic_account"
-                        string="Analytic Account" icon="fa-bar-chart-o"
+                        icon="fa-bar-chart-o"
                         attrs="{'invisible': ['|', ('analytic_account_id', '=', False), ('state', 'in', ['draft', 'cancel'])]}"
-                        groups="analytic.group_analytic_accounting"/>
+                        groups="analytic.group_analytic_accounting">
+                        <div class="o_stat_info">
+                            <span class="o_stat_text">Analytic Account</span>
+                        </div>
+                    </button>
                 </t>
             </xpath>
             <xpath expr="//page[@name='miscellaneous']//field[@name='date_deadline']" position="after">
diff --git a/addons/mrp_subcontracting/static/src/subcontracting_portal/picking_form_controller.xml b/addons/mrp_subcontracting/static/src/subcontracting_portal/picking_form_controller.xml
index d0fc1b01abc..e51056dd86e 100644
--- a/addons/mrp_subcontracting/static/src/subcontracting_portal/picking_form_controller.xml
+++ b/addons/mrp_subcontracting/static/src/subcontracting_portal/picking_form_controller.xml
@@ -2,7 +2,7 @@
 <templates xml:space="preserve">
 
     <t t-name="mrp_subcontracting.PickingFormController" t-inherit="web.FormView" t-inherit-mode="primary" owl="1">
-        <xpath expr="//ActionMenus" position="replace"/>
+        <t t-set-slot="control-panel-additional-actions"/>
     </t>
 
 </templates>
diff --git a/addons/note/static/description/icon.png b/addons/note/static/description/icon.png
index 051123e526c..916b9717cb7 100644
Binary files a/addons/note/static/description/icon.png and b/addons/note/static/description/icon.png differ
diff --git a/addons/note/static/description/icon.svg b/addons/note/static/description/icon.svg
index 212191dcb49..6b7a2a1ec8a 100644
--- a/addons/note/static/description/icon.svg
+++ b/addons/note/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="98.616%"><stop offset="0%" stop-color="#797C79"/><stop offset="100%" stop-color="#545554"/></linearGradient><path id="d" d="M56.342 31.863l-1.875 1.876a.489.489 0 0 1-.692 0l-4.517-4.516a.489.489 0 0 1 0-.692l1.876-1.876c.761-.76 1.998-.76 2.763 0l2.445 2.446a1.95 1.95 0 0 1 0 2.762zM15 47v-2h17v2H15zm0-4.915v-2h19v2H15zm0-9v-2h22v2H15zm0 5v-2h14v2H15zm0-9v-2h28v2H15zm32.647 1.057a.494.494 0 0 1 .696 0l4.516 4.516c.192.192.192.5 0 .692L42.174 46.034l-4.944.867a.978.978 0 0 1-1.13-1.131l.862-4.944 10.685-10.684zm-6.515 9.769a.567.567 0 0 0 .806 0l6.266-6.266a.567.567 0 0 0 0-.805.567.567 0 0 0-.805 0l-6.267 6.265a.567.567 0 0 0 0 .806zm-1.468 3.422V41.38h-1.477l-.46 2.624 1.265 1.265 2.625-.46v-1.476h-1.953z"/><path id="e" d="M56.342 29.863l-1.875 1.876a.489.489 0 0 1-.692 0l-4.517-4.516a.489.489 0 0 1 0-.692l1.876-1.876c.761-.76 1.998-.76 2.763 0l2.445 2.446a1.95 1.95 0 0 1 0 2.762zM15 45v-2h17v2H15zm0-4.915v-2h19v2H15zm0-9v-2h22v2H15zm0 5v-2h14v2H15zm0-9v-2h28v2H15zm32.647 1.057a.494.494 0 0 1 .696 0l4.516 4.516c.192.192.192.5 0 .692L42.174 44.034l-4.944.867a.978.978 0 0 1-1.13-1.131l.862-4.944 10.685-10.684zm-6.515 9.769a.567.567 0 0 0 .806 0l6.266-6.266a.567.567 0 0 0 0-.805.567.567 0 0 0-.805 0l-6.267 6.265a.567.567 0 0 0 0 .806zm-1.468 3.422V39.38h-1.477l-.46 2.624 1.265 1.265 2.625-.46v-1.476h-1.953z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V41.668l15.07-16.471h27.883v1.843L31.949 38.148l1.998 1.89-4.983 4.239h1.513l21.088-19.832L56 30 25.947 68.643 4 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M10 41h36a3 3 0 0 1-3 3H10v-3Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path d="M10 41h36a3 3 0 0 1-3 3H10v-3Z" fill="url(#o_icon_note__a)" fill-opacity=".2"/><path d="M9 41h19c0 1.657-1.418 3-3.167 3H9v-3Z" fill="var(--o-icons-teal-teal, #00A079)"/><path d="M9 41h19c0 1.657-1.418 3-3.167 3H9v-3Z" fill="url(#o_icon_note__b)" fill-opacity=".2"/><path d="M40.706 7.282a4.35 4.35 0 0 1 0 6.193L9.906 44H4v-6.192L34.457 7.282a4.447 4.447 0 0 1 6.249 0Z" fill="var(--o-icons-purple-teal, #003458)"/><path d="M40.706 7.282a4.35 4.35 0 0 1 0 6.193L9.906 44H4v-6.192L34.457 7.282a4.447 4.447 0 0 1 6.249 0Z" fill="url(#o_icon_note__c)" fill-opacity=".3"/><defs><linearGradient id="o_icon_note__a" x1="10" y1="41" x2="14.5" y2="54.5" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_note__b" x1="9" y1="41" x2="15.772" y2="51.723" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_note__c" x1="4" y1="6" x2="48.706" y2="17.177" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/note/static/src/scss/note.scss b/addons/note/static/src/scss/note.scss
index d7b900b5568..840f558c27e 100644
--- a/addons/note/static/src/scss/note.scss
+++ b/addons/note/static/src/scss/note.scss
@@ -7,16 +7,11 @@
     .o_form_sheet_bg {
         display: flex;
         flex-direction: column;
-        padding: 0;
         .o_form_statusbar {
             margin: 0;
         }
         .o_form_sheet {
-            margin: 0;
-            border: none;
             flex: 1;
-            box-shadow: none;
-            padding: 0;
             max-width: 100%;
             .oe_pad {
                 flex: 1;
diff --git a/addons/note/views/note_views.xml b/addons/note/views/note_views.xml
index ce39d4c2fbf..582cdb628a5 100644
--- a/addons/note/views/note_views.xml
+++ b/addons/note/views/note_views.xml
@@ -122,7 +122,7 @@
                         <img
                             t-if="follower_index &lt; 5"
                             t-att-src="kanban_image('res.partner', 'avatar_128', follower)"
-                            class="oe_kanban_avatar o_image_24_cover rounded-circle border border-white bg-white ml-n2"
+                            class="oe_kanban_avatar o_avatar rounded border border-white bg-white ml-n2"
                             t-att-data-member_id="follower"
                             alt="Follower"/>
                         <small
@@ -163,9 +163,13 @@
         <field name="arch" type="xml">
             <form string="Note" class="o_note_form_view">
                 <header>
-                    <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}" placeholder="Tags"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" options="{'clickable': '1'}"/>
+                  <div class="py-1 px-2 border rounded bg-view">
+                    <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}" placeholder="Tags" class="mb-0"/>
+                  </div>
+                  <div class="py-1 px-2 border rounded bg-view">
+                    <field name="company_id" groups="base.group_multi_company" class="mb-0"/>
+                  </div>
+                  <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" options="{'clickable': '1'}"/>
                 </header>
                 <sheet>
                     <field name="memo" type="html" class="oe_memo" default_focus="1" options="{'resizable': false, 'collaborative': true}"/>
diff --git a/addons/onboarding/__manifest__.py b/addons/onboarding/__manifest__.py
index 82b077628a3..759d6af3e0f 100644
--- a/addons/onboarding/__manifest__.py
+++ b/addons/onboarding/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Onboarding Toolbox',
-    'version': '1.0',
+    'version': '1.1',
     'category': 'Hidden',
     'sequence': 9001,
     'description': """
diff --git a/addons/onboarding/data/onboarding_data.xml b/addons/onboarding/data/onboarding_data.xml
index 5e30c744697..8c18ac54bfa 100644
--- a/addons/onboarding/data/onboarding_data.xml
+++ b/addons/onboarding/data/onboarding_data.xml
@@ -9,6 +9,8 @@
                     <t t-set="done_icon" t-value="step.done_icon"/>
                     <t t-set="btn_text" t-value="step.button_text"/>
                     <t t-set="done_text" t-value="step.done_text"/>
+                    <t t-set="image" t-value="'/web/image/onboarding.onboarding.step/'+str(step.id)+'/step_image'"/>
+                    <t t-set="alt" t-value="step.step_image_alt"/>
                     <!-- Model/method used by JS implementation of banners for each step-->
                     <t t-set="method" t-value="step.panel_step_open_action_name"/>
                     <t t-set="model">onboarding.onboarding.step</t>
diff --git a/addons/onboarding/models/onboarding_onboarding.py b/addons/onboarding/models/onboarding_onboarding.py
index 58186015843..5630a339773 100644
--- a/addons/onboarding/models/onboarding_onboarding.py
+++ b/addons/onboarding/models/onboarding_onboarding.py
@@ -17,11 +17,6 @@ class Onboarding(models.Model):
 
     is_per_company = fields.Boolean('Should be done per company?', default=True)
 
-    panel_background_color = fields.Selection(
-        [('orange', 'Orange'), ('blue', 'Blue'), ('violet', 'Violet'), ('none', 'None')],
-        string="Panel's Background color", default='orange',
-        help="Color gradient added to the panel's background.")
-    panel_background_image = fields.Binary("Panel's background image")
     panel_close_action_name = fields.Char(
         'Closing action', help='Name of the onboarding model action to execute when closing the panel.')
 
@@ -95,9 +90,6 @@ class Onboarding(models.Model):
     def _prepare_rendering_values(self):
         self.ensure_one()
         values = {
-            'bg_image': f'/web/image/onboarding.onboarding/{self.id}/panel_background_image',
-            'classes': f'o_onboarding_{self.panel_background_color}'
-                       if self.panel_background_color not in {False, 'none'} else '',
             'close_method': self.panel_close_action_name,
             'close_model': 'onboarding.onboarding',
             'steps': self.step_ids,
diff --git a/addons/onboarding/models/onboarding_step.py b/addons/onboarding/models/onboarding_step.py
index ca687719c94..bf69546f9ef 100644
--- a/addons/onboarding/models/onboarding_step.py
+++ b/addons/onboarding/models/onboarding_step.py
@@ -22,6 +22,9 @@ class OnboardingStep(models.Model):
     done_icon = fields.Char('Font Awesome Icon when completed', default='fa-star')
     done_text = fields.Char(
         'Text to show when step is completed', default=_('Step Completed! - Click to review'), translate=True)
+    step_image = fields.Binary("Step Image")
+    step_image_alt = fields.Char(
+        'Alt Text for the Step Image', translate=True, help='Show when impossible to load the image')
     panel_step_open_action_name = fields.Char(
         string='Opening action', required=True,
         help='Name of the onboarding step model action to execute when opening the step, '
diff --git a/addons/onboarding/views/onboarding_views.xml b/addons/onboarding/views/onboarding_views.xml
index 9857f34a3e6..4cce16cae32 100644
--- a/addons/onboarding/views/onboarding_views.xml
+++ b/addons/onboarding/views/onboarding_views.xml
@@ -38,11 +38,6 @@
                         <page name="Onboarding steps">
                             <field name="step_ids"/>
                         </page>
-                        <page name="Panel Rendering">
-                            <group>
-                                <field name="panel_background_color" string="Background color"/>
-                            </group>
-                        </page>
                     </notebook>
                 </sheet>
             </form>
diff --git a/addons/partner_autocomplete/static/description/icon.png b/addons/partner_autocomplete/static/description/icon.png
index b6b1907a324..5585603904e 100644
Binary files a/addons/partner_autocomplete/static/description/icon.png and b/addons/partner_autocomplete/static/description/icon.png differ
diff --git a/addons/partner_autocomplete/static/description/icon.svg b/addons/partner_autocomplete/static/description/icon.svg
index 9ad48a637a7..95c208aef1d 100644
--- a/addons/partner_autocomplete/static/description/icon.svg
+++ b/addons/partner_autocomplete/static/description/icon.svg
@@ -1,55 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 70">
-  <defs>
-    <mask id="mask" x="-0.01" y="0" width="70.01" height="70" maskUnits="userSpaceOnUse">
-      <g id="b">
-        <path id="a" d="M4,0H65c4,0,5,1,5,5V65c0,4-1,5-5,5H4c-3,0-4-1-4-5V5C0,1,1,0,4,0Z" fill="#fff" fill-rule="evenodd"/>
-      </g>
-    </mask>
-    <linearGradient id="linear-gradient" x1="-1261.07" y1="477.94" x2="-1262.07" y2="476.94" gradientTransform="matrix(70, 0, 0, -70, 88344.99, 33455.73)" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#d5cc95"/>
-      <stop offset="1" stop-color="#c1b66c"/>
-    </linearGradient>
-  </defs>
-  <g mask="url(#mask)">
-    <g>
-      <path d="M0,0H70V70H0Z" fill-rule="evenodd" fill="url(#linear-gradient)"/>
-      <path d="M4,1H65c2.67,0,4.33.67,5,2V0H0V3C.67,1.67,2,1,4,1Z" fill="#fff" fill-opacity="0.38" fill-rule="evenodd"/>
-      <path d="M4,69a3.66,3.66,0,0,1-4-4v-45L7.07,13l31.7-1a2.56,2.56,0,0,0-.18,2l2.89-2.88,4,3.29,2.35,2.35L50.69,16l6.65-6.6L61.9,14l-6.91,7-1.44,2.87-2.12,2.1,0,3.1,2.91-2.91,6,.14,2.33,2.64-.91,27.6L49.23,69Z" fill="#494949" fill-rule="evenodd" opacity="0.32" style="isolation: isolate"/>
-      <path d="M4,69H65c2.67,0,4.33-1,5-3v4H0V66A3.92,3.92,0,0,0,4,69Z" fill-opacity="0.38" fill-rule="evenodd"/>
-      <g>
-        <g opacity="0.4">
-          <path d="M45.64,28.11H7.53a1.65,1.65,0,0,1-1.66-1.65V17.67A1.66,1.66,0,0,1,7.53,16h29a2.85,2.85,0,0,1,.21-2H7.53a3.67,3.67,0,0,0-3.66,3.66v8.79a3.66,3.66,0,0,0,3.66,3.65H45.64Z"/>
-          <path d="M56.77,28.11H52.34v2h4.43a2.9,2.9,0,0,1,2.9,2.9V54.62a2.9,2.9,0,0,1-2.9,2.89H14.91A2.9,2.9,0,0,1,12,54.62V33a2.9,2.9,0,0,1,2.9-2.9H45.64v-2H14.91A4.91,4.91,0,0,0,10,33V54.62a4.9,4.9,0,0,0,4.9,4.89H56.77a4.9,4.9,0,0,0,4.9-4.89V33A4.91,4.91,0,0,0,56.77,28.11Z"/>
-          <g>
-            <path d="M12.92,19.63,11,24.2a.66.66,0,0,1-.19.27.5.5,0,0,1-.29.09.46.46,0,0,1-.36-.14.52.52,0,0,1-.11-.33,1.11,1.11,0,0,1,0-.17l2.25-5.38a.56.56,0,0,1,.22-.28.44.44,0,0,1,.32-.08.58.58,0,0,1,.3.09.55.55,0,0,1,.2.27l2.21,5.27a.63.63,0,0,1,.05.22.5.5,0,0,1-.16.39.52.52,0,0,1-.35.14.46.46,0,0,1-.29-.1.68.68,0,0,1-.2-.27l-1.94-4.51ZM11.25,23.1l.5-1h2.42l.18,1Z"/>
-            <path d="M20,25.66a.58.58,0,0,1-.18.43.56.56,0,0,1-.43.17.54.54,0,0,1-.42-.17.57.57,0,0,1-.17-.43v-8a.62.62,0,0,1,.17-.44.59.59,0,0,1,.44-.18.54.54,0,0,1,.42.18.62.62,0,0,1,.17.44Z"/>
-          </g>
-          <g>
-            <path d="M18.24,35.8,16.3,40.37a.52.52,0,0,1-.2.26.42.42,0,0,1-.28.1.46.46,0,0,1-.36-.14.48.48,0,0,1-.12-.33.55.55,0,0,1,0-.17l2.24-5.38a.57.57,0,0,1,.22-.28.47.47,0,0,1,.32-.08.53.53,0,0,1,.3.09.57.57,0,0,1,.21.27L20.87,40a.6.6,0,0,1,0,.22.49.49,0,0,1-.15.38.5.5,0,0,1-.35.15.43.43,0,0,1-.29-.1.6.6,0,0,1-.2-.27L18,35.85Zm-1.66,3.47.49-1H19.5l.17,1Z"/>
-            <path d="M24.5,34.38a1.79,1.79,0,0,1,1.28.41,1.6,1.6,0,0,1,.43,1.2,1.28,1.28,0,0,1-.82,1.23,2.48,2.48,0,0,1-1,.18l0-.41a3.19,3.19,0,0,1,.64.08,2.31,2.31,0,0,1,.7.27,1.53,1.53,0,0,1,.78,1.43,2.26,2.26,0,0,1-.19,1,1.45,1.45,0,0,1-.51.58,1.94,1.94,0,0,1-.68.29,3.37,3.37,0,0,1-.69.07H22.23a.53.53,0,0,1-.55-.54V34.93a.53.53,0,0,1,.16-.39.53.53,0,0,1,.39-.16Zm-.17,1.07h-1.6l.12-.15v1.63l-.11-.08h1.62a.73.73,0,0,0,.47-.17.6.6,0,0,0,.21-.5.73.73,0,0,0-.2-.56A.72.72,0,0,0,24.33,35.45Zm.08,2.46H22.77l.08-.07v1.9l-.09-.09h1.71a.94.94,0,0,0,.66-.22.86.86,0,0,0,.24-.66.92.92,0,0,0-.16-.59.7.7,0,0,0-.39-.22A2.17,2.17,0,0,0,24.41,37.91Z"/>
-            <path d="M18.24,47.8,16.3,52.37a.52.52,0,0,1-.2.26.42.42,0,0,1-.28.1.46.46,0,0,1-.36-.14.48.48,0,0,1-.12-.33.55.55,0,0,1,0-.17l2.24-5.38a.57.57,0,0,1,.22-.28.47.47,0,0,1,.32-.08.53.53,0,0,1,.3.09.57.57,0,0,1,.21.27L20.87,52a.6.6,0,0,1,0,.22.49.49,0,0,1-.15.38.5.5,0,0,1-.35.15.43.43,0,0,1-.29-.1.6.6,0,0,1-.2-.27L18,47.85Zm-1.66,3.47.49-1H19.5l.17,1Z"/>
-            <path d="M24.5,46.38a1.79,1.79,0,0,1,1.28.41,1.6,1.6,0,0,1,.43,1.2,1.28,1.28,0,0,1-.82,1.23,2.48,2.48,0,0,1-1,.18l0-.41a3.19,3.19,0,0,1,.64.08,2.31,2.31,0,0,1,.7.27,1.53,1.53,0,0,1,.78,1.43,2.26,2.26,0,0,1-.19,1,1.45,1.45,0,0,1-.51.58,1.94,1.94,0,0,1-.68.29,3.37,3.37,0,0,1-.69.07H22.23a.53.53,0,0,1-.55-.54V46.93a.53.53,0,0,1,.16-.39.53.53,0,0,1,.39-.16Zm-.17,1.07h-1.6l.12-.15v1.63l-.11-.08h1.62a.73.73,0,0,0,.47-.17.6.6,0,0,0,.21-.5.73.73,0,0,0-.2-.56A.72.72,0,0,0,24.33,47.45Zm.08,2.46H22.77l.08-.07v1.9l-.09-.09h1.71a.94.94,0,0,0,.66-.22.86.86,0,0,0,.24-.66.92.92,0,0,0-.16-.59.7.7,0,0,0-.39-.22A2.17,2.17,0,0,0,24.41,49.91Z"/>
-            <path d="M32,46.69a.48.48,0,0,1,.28.37.56.56,0,0,1-.13.46.4.4,0,0,1-.3.18.74.74,0,0,1-.38-.07,2.18,2.18,0,0,0-.45-.16,2.73,2.73,0,0,0-.5,0,2.33,2.33,0,0,0-.87.15,1.85,1.85,0,0,0-1.06,1.11,2.33,2.33,0,0,0-.14.85,2.54,2.54,0,0,0,.16,1,1.84,1.84,0,0,0,.43.67,1.72,1.72,0,0,0,.66.4,2.39,2.39,0,0,0,.82.13,2.59,2.59,0,0,0,.48,0,1.54,1.54,0,0,0,.47-.16.74.74,0,0,1,.38-.07.49.49,0,0,1,.31.19.56.56,0,0,1,.13.47.48.48,0,0,1-.28.34,2.55,2.55,0,0,1-.48.2,2.78,2.78,0,0,1-.5.11,2.92,2.92,0,0,1-.51,0,3.87,3.87,0,0,1-1.23-.2,2.93,2.93,0,0,1-1-.62,2.59,2.59,0,0,1-.72-1,3.58,3.58,0,0,1-.26-1.41,3.3,3.3,0,0,1,.24-1.27,3.07,3.07,0,0,1,.67-1,3.25,3.25,0,0,1,1-.66,3.46,3.46,0,0,1,1.3-.24,3.27,3.27,0,0,1,1.48.35Z"/>
-          </g>
-          <path d="M40.79,21.86h3.15A4.34,4.34,0,0,1,44.63,20l-2.54-2.53a2.81,2.81,0,0,1-.82.13,2.6,2.6,0,1,1,2.18-1.17L45.8,18.8A4.56,4.56,0,0,1,48.47,18a4.61,4.61,0,0,1,3.1,1.2L55,15.69a3.27,3.27,0,1,1,2.57,1.24,3.31,3.31,0,0,1-1.54-.38l-3.47,4a4.49,4.49,0,0,1,.45,2,4.54,4.54,0,0,1-3.58,4.42v4.63a3.49,3.49,0,1,1-1.2,0V27a4.55,4.55,0,0,1-4.33-3.94H40.76a3.46,3.46,0,1,1,0-1.2Zm7.7,4.2a3.6,3.6,0,1,0-3.64-3.6A3.61,3.61,0,0,0,48.49,26.06Z" fill-rule="evenodd"/>
-        </g>
-        <g>
-          <path d="M47.66,26.1H9.54a1.66,1.66,0,0,1-1.66-1.66V15.66A1.66,1.66,0,0,1,9.54,14h29v0a2.77,2.77,0,0,1,.2-2H9.54a3.66,3.66,0,0,0-3.66,3.66v8.78A3.66,3.66,0,0,0,9.54,28.1H47.66Z" fill="#fff"/>
-          <path d="M58.78,26.1H54.36v2h4.42a2.9,2.9,0,0,1,2.9,2.9V52.6a2.9,2.9,0,0,1-2.9,2.9H16.92A2.9,2.9,0,0,1,14,52.6V31a2.9,2.9,0,0,1,2.9-2.9H47.66v-2H16.92A4.91,4.91,0,0,0,12,31V52.6a4.91,4.91,0,0,0,4.9,4.9H58.78a4.91,4.91,0,0,0,4.9-4.9V31A4.91,4.91,0,0,0,58.78,26.1Z" fill="#fff"/>
-          <g>
-            <path d="M14.93,17.61,13,22.19a.59.59,0,0,1-.2.26.47.47,0,0,1-.28.09.45.45,0,0,1-.36-.13.48.48,0,0,1-.12-.33.51.51,0,0,1,0-.17l2.24-5.39a.62.62,0,0,1,.22-.28.53.53,0,0,1,.32-.08.54.54,0,0,1,.3.1.52.52,0,0,1,.2.26l2.22,5.28a.59.59,0,0,1,0,.21.5.5,0,0,1-.15.39.51.51,0,0,1-.35.14.48.48,0,0,1-.29-.09.71.71,0,0,1-.21-.27l-1.93-4.51Zm-1.67,3.48.5-1h2.43l.17,1Z" fill="#fff"/>
-            <path d="M22.05,23.64a.64.64,0,0,1-.17.44.62.62,0,0,1-.44.17.59.59,0,0,1-.42-.17.64.64,0,0,1-.17-.44v-8a.6.6,0,0,1,.18-.44.63.63,0,0,1,.86,0,.63.63,0,0,1,.16.44Z" fill="#fff"/>
-          </g>
-          <g>
-            <path d="M20.26,33.78l-2,4.57a.49.49,0,0,1-.47.36.46.46,0,0,1-.37-.13.52.52,0,0,1-.11-.33,1,1,0,0,1,0-.17l2.25-5.39a.56.56,0,0,1,.22-.28.51.51,0,0,1,.32-.08.6.6,0,0,1,.3.1.52.52,0,0,1,.2.26L22.88,38a.63.63,0,0,1,.05.21.48.48,0,0,1-.16.39.47.47,0,0,1-.35.14.52.52,0,0,1-.29-.09.79.79,0,0,1-.2-.27L20,33.84Zm-1.67,3.48.5-1h2.43l.17,1Z" fill="#fff"/>
-            <path d="M26.51,32.37a1.8,1.8,0,0,1,1.29.4,1.59,1.59,0,0,1,.42,1.2,1.31,1.31,0,0,1-.21.74,1.28,1.28,0,0,1-.61.5,2.46,2.46,0,0,1-1,.17l0-.4a2.66,2.66,0,0,1,.64.08,2.41,2.41,0,0,1,.7.27,1.5,1.5,0,0,1,.55.54,1.57,1.57,0,0,1,.22.88,2.09,2.09,0,0,1-.19,1,1.48,1.48,0,0,1-.51.59,1.88,1.88,0,0,1-.67.28,3.42,3.42,0,0,1-.7.08H24.24a.53.53,0,0,1-.39-.16.53.53,0,0,1-.16-.39v-5.2a.53.53,0,0,1,.16-.39.53.53,0,0,1,.39-.16Zm-.16,1.06h-1.6l.11-.14v1.63l-.1-.08h1.62a.67.67,0,0,0,.46-.18.58.58,0,0,0,.21-.49.7.7,0,0,0-.19-.56A.72.72,0,0,0,26.35,33.43Zm.07,2.47H24.78l.08-.07v1.89l-.09-.09h1.71a.92.92,0,0,0,.66-.22,1.07,1.07,0,0,0,.08-1.24.73.73,0,0,0-.38-.23A2.19,2.19,0,0,0,26.42,35.9Z" fill="#fff"/>
-            <path d="M20.26,45.78l-2,4.57a.49.49,0,0,1-.47.36.46.46,0,0,1-.37-.13.52.52,0,0,1-.11-.33,1,1,0,0,1,0-.17l2.25-5.39a.56.56,0,0,1,.22-.28.51.51,0,0,1,.32-.08.6.6,0,0,1,.3.1.52.52,0,0,1,.2.26L22.88,50a.63.63,0,0,1,.05.21.48.48,0,0,1-.16.39.47.47,0,0,1-.35.14.52.52,0,0,1-.29-.09.79.79,0,0,1-.2-.27L20,45.84Zm-1.67,3.48.5-1h2.43l.17,1Z" fill="#fff"/>
-            <path d="M26.51,44.37a1.8,1.8,0,0,1,1.29.4,1.59,1.59,0,0,1,.42,1.2,1.31,1.31,0,0,1-.21.74,1.28,1.28,0,0,1-.61.5,2.46,2.46,0,0,1-1,.17l0-.4a2.66,2.66,0,0,1,.64.08,2.41,2.41,0,0,1,.7.27,1.5,1.5,0,0,1,.55.54,1.57,1.57,0,0,1,.22.88,2.09,2.09,0,0,1-.19,1,1.48,1.48,0,0,1-.51.59,1.88,1.88,0,0,1-.67.28,3.42,3.42,0,0,1-.7.08H24.24a.53.53,0,0,1-.39-.16.53.53,0,0,1-.16-.39v-5.2a.53.53,0,0,1,.16-.39.53.53,0,0,1,.39-.16Zm-.16,1.06h-1.6l.11-.14v1.63l-.1-.08h1.62a.67.67,0,0,0,.46-.18.58.58,0,0,0,.21-.49.7.7,0,0,0-.19-.56A.72.72,0,0,0,26.35,45.43Zm.07,2.47H24.78l.08-.07v1.89l-.09-.09h1.71a.92.92,0,0,0,.66-.22,1.07,1.07,0,0,0,.08-1.24.73.73,0,0,0-.38-.23A2.19,2.19,0,0,0,26.42,47.9Z" fill="#fff"/>
-            <path d="M34,44.68a.46.46,0,0,1,.27.36.52.52,0,0,1-.13.46.4.4,0,0,1-.3.18.62.62,0,0,1-.37-.07,2.47,2.47,0,0,0-.46-.15,2,2,0,0,0-.5-.06,2.41,2.41,0,0,0-.87.16A1.94,1.94,0,0,0,31,46a2.08,2.08,0,0,0-.41.67,2.63,2.63,0,0,0-.14.86,2.7,2.7,0,0,0,.16.95,1.9,1.9,0,0,0,.44.68,1.73,1.73,0,0,0,.65.4,2.47,2.47,0,0,0,.82.13,2.72,2.72,0,0,0,.49,0,1.63,1.63,0,0,0,.47-.16.61.61,0,0,1,.37-.06.47.47,0,0,1,.31.19.54.54,0,0,1,.13.46.46.46,0,0,1-.27.35,3.19,3.19,0,0,1-.48.19l-.5.12a3,3,0,0,1-.52,0,3.61,3.61,0,0,1-1.23-.21,3.16,3.16,0,0,1-1-.61,3,3,0,0,1-.72-1,3.65,3.65,0,0,1-.26-1.41,3.35,3.35,0,0,1,.24-1.28,3,3,0,0,1,.68-1,3,3,0,0,1,1-.67,3.4,3.4,0,0,1,1.29-.24,3.33,3.33,0,0,1,.78.09A2.89,2.89,0,0,1,34,44.68Z" fill="#fff"/>
-          </g>
-          <path d="M42.81,19.84H46A4.48,4.48,0,0,1,46.64,18l-2.53-2.54A2.58,2.58,0,1,1,45.9,13a2.52,2.52,0,0,1-.43,1.41l2.35,2.35a4.62,4.62,0,0,1,5.76.36l3.47-3.46a3.18,3.18,0,0,1-.7-2,3.26,3.26,0,1,1,1.73,2.85l-3.48,4a4.45,4.45,0,0,1,.46,2,4.54,4.54,0,0,1-3.58,4.42v4.64a3.49,3.49,0,1,1-1.2,0V25A4.56,4.56,0,0,1,46,21H42.78a3.46,3.46,0,1,1,0-1.2ZM50.5,24a3.6,3.6,0,1,0-3.63-3.6A3.62,3.62,0,0,0,50.5,24Z" fill="#fff" fill-rule="evenodd"/>
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M0 8h33a4 4 0 0 1 4 4v13H4a4 4 0 0 1-4-4V8Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M0 8h33a4 4 0 0 1 4 4v13H4a4 4 0 0 1-4-4V8Z" fill="url(#o_icon_partner_autocomplete__a)" fill-opacity=".2"/><path d="M4 17a4 4 0 0 1 4-4h38a4 4 0 0 1 4 4v8H4v-8Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M4 17a4 4 0 0 1 4-4h38a4 4 0 0 1 4 4v8H4v-8Z" fill="url(#o_icon_partner_autocomplete__b)" fill-opacity=".2"/><path d="M37 13v12H4v-8a4 4 0 0 1 4-4h29Z" fill="var(--o-icons-purple-purple, #55103D)"/><path d="M37 13v12H4v-8a4 4 0 0 1 4-4h29Z" fill="url(#o_icon_partner_autocomplete__c)" fill-opacity=".3"/><path d="M4 31h46v6H4v-6Z" fill="var(--o-icons-yellow-yellow, #F77B09)"/><path d="M4 31h46v6H4v-6Z" fill="url(#o_icon_partner_autocomplete__d)" fill-opacity=".2"/><path d="M4 25h46v6H4v-6Z" fill="var(--o-icons-purple-red, #911E3D)"/><path d="M4 25h46v6H4v-6Z" fill="url(#o_icon_partner_autocomplete__e)" fill-opacity=".2"/><path d="M4 37h46v1a4 4 0 0 1-4 4H8a4 4 0 0 1-4-4v-1Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M4 37h46v1a4 4 0 0 1-4 4H8a4 4 0 0 1-4-4v-1Z" fill="url(#o_icon_partner_autocomplete__f)" fill-opacity=".2"/><defs><linearGradient id="o_icon_partner_autocomplete__a" x1="0" y1="8" x2="35.685" y2="27.417" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_partner_autocomplete__b" x1="4" y1="13" x2="33.973" y2="41.724" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_partner_autocomplete__c" x1="4" y1="13" x2="32.011" y2="32.257" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_partner_autocomplete__d" x1="4" y1="31" x2="16.303" y2="54.581" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_partner_autocomplete__e" x1="4" y1="25" x2="16.303" y2="48.581" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_partner_autocomplete__f" x1="4" y1="37" x2="13.142" y2="58.025" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/partner_autocomplete/static/src/xml/partner_autocomplete.xml b/addons/partner_autocomplete/static/src/xml/partner_autocomplete.xml
index da4242d1838..846bdbf2e57 100644
--- a/addons/partner_autocomplete/static/src/xml/partner_autocomplete.xml
+++ b/addons/partner_autocomplete/static/src/xml/partner_autocomplete.xml
@@ -31,13 +31,13 @@
 
     <t t-name="partner_autocomplete.InsufficientCreditNotification" owl="1">
         <div class="o-hidden-ios">
-            <a class="btn btn-link" t-att-href="credits_url"><i class="fa fa-arrow-right"/> Buy more credits</a>
+            <a class="btn btn-link" t-att-href="credits_url"><i class="oi oi-arrow-right"/> Buy more credits</a>
         </div>
     </t>
 
     <t t-name="partner_autocomplete.AccountTokenMissingNotification" owl="1">
         <div class="">
-            <a class="btn btn-link" t-att-href="account_url" ><i class="fa fa-arrow-right"/> Set Your Account Token</a>
+            <a class="btn btn-link" t-att-href="account_url" ><i class="oi oi-arrow-right"/> Set Your Account Token</a>
         </div>
     </t>
 </templates>
diff --git a/addons/payment/static/description/icon.png b/addons/payment/static/description/icon.png
index 4fced91cce6..4136dd1b417 100644
Binary files a/addons/payment/static/description/icon.png and b/addons/payment/static/description/icon.png differ
diff --git a/addons/payment/static/description/icon.svg b/addons/payment/static/description/icon.svg
index cff0a33bb04..da2b17d2c82 100644
--- a/addons/payment/static/description/icon.svg
+++ b/addons/payment/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="98.616%"><stop offset="0%" stop-color="#797C79"/><stop offset="100%" stop-color="#545554"/></linearGradient><path id="d" d="M19.25 34.621C20.983 35.541 22.9 36 25 36c4 0 7-1.667 9-5h15.036v-3.212a.342.342 0 0 0-.339-.343H35c.347-.502.423-1.416.228-2.742h13.808c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V34.62zm29.447 12.934a.342.342 0 0 0 .339-.343V37.5H21.964v9.712c0 .188.152.343.339.343h26.394zm-18.614-5.713v2.285a.683.683 0 0 1-.677.685h-4.062a.683.683 0 0 1-.677-.685v-2.285c0-.377.304-.686.677-.686h4.062c.373 0 .677.309.677.686zm10.834 0v2.285a.683.683 0 0 1-.677.685h-7.674a.683.683 0 0 1-.677-.685v-2.285c0-.377.305-.686.677-.686h7.674c.372 0 .677.309.677.686zM22.874 19.77c0 2.517 8.146 1.879 8.146 6.663 0 2.292-1.783 4.25-4.681 4.657v1.897c0 .265-.237.48-.53.48h-1.763c-.292 0-.53-.215-.53-.48v-1.928c-1.74-.268-3.293-.997-4.353-1.917a.447.447 0 0 1-.058-.634l1.34-1.625a.566.566 0 0 1 .757-.086c1.098.8 2.517 1.435 3.873 1.435 1.58 0 2.299-.853 2.299-1.646 0-2.342-8.147-1.834-8.147-6.772 0-2.107 1.705-3.811 4.29-4.342V13.48c0-.265.237-.48.53-.48h1.763c.292 0 .529.215.529.48v1.888c1.418.149 2.954.653 4.025 1.511.184.148.23.391.113.587l-1.038 1.74c-.152.255-.516.33-.775.161-.985-.642-2.193-1.132-3.371-1.132-1.47 0-2.42.603-2.42 1.535z"/><path id="e" d="M19.25 32.621C20.983 33.541 22.9 34 25 34c4 0 7-1.667 9-5h15.036v-3.212a.342.342 0 0 0-.339-.343H35c.347-.502.423-1.416.228-2.742h13.808c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V32.62zm29.447 12.934a.342.342 0 0 0 .339-.343V35.5H21.964v9.712c0 .188.152.343.339.343h26.394zm-18.614-5.713v2.285a.683.683 0 0 1-.677.685h-4.062a.683.683 0 0 1-.677-.685v-2.285c0-.377.304-.686.677-.686h4.062c.373 0 .677.309.677.686zm10.834 0v2.285a.683.683 0 0 1-.677.685h-7.674a.683.683 0 0 1-.677-.685v-2.285c0-.377.305-.686.677-.686h7.674c.372 0 .677.309.677.686zM22.874 17.77c0 2.517 8.146 1.879 8.146 6.663 0 2.292-1.783 4.25-4.681 4.657v1.897c0 .265-.237.48-.53.48h-1.763c-.292 0-.53-.215-.53-.48v-1.928c-1.74-.268-3.293-.997-4.353-1.917a.447.447 0 0 1-.058-.634l1.34-1.625a.566.566 0 0 1 .757-.086c1.098.8 2.517 1.435 3.873 1.435 1.58 0 2.299-.853 2.299-1.646 0-2.342-8.147-1.834-8.147-6.772 0-2.107 1.705-3.811 4.29-4.342V11.48c0-.265.237-.48.53-.48h1.763c.292 0 .529.215.529.48v1.888c1.418.149 2.954.653 4.025 1.511.184.148.23.391.113.587l-1.038 1.74c-.152.255-.516.33-.775.161-.985-.642-2.193-1.132-3.371-1.132-1.47 0-2.42.603-2.42 1.535z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V36.095l23.6-24.837 5.552 6.125-3.147 3.581 4.02 6.176 5.257-4.413L48 23l3.377 2.017v21.868L32.142 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M0 12h50v26a4 4 0 0 1-4 4H0V12Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M0 12h50v26a4 4 0 0 1-4 4H0V12Z" fill="url(#o_icon_payment__a)" fill-opacity=".2"/><path d="M4 21a4 4 0 0 1-4-4v-5a4 4 0 0 1 4-4h46v9a4 4 0 0 1-4 4H4Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M4 21a4 4 0 0 1-4-4v-5a4 4 0 0 1 4-4h46v9a4 4 0 0 1-4 4H4Z" fill="url(#o_icon_payment__b)" fill-opacity=".2"/><path d="M0 16h50v4a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4v-4Z" fill="var(--o-icons-yellow-yellow, #F77B09)"/><path d="M0 16h50v4a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4v-4Z" fill="url(#o_icon_payment__c)" fill-opacity=".2"/><defs><linearGradient id="o_icon_payment__a" x1="0" y1="12" x2="53.254" y2="34.189" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_payment__b" x1="0" y1="8" x2="32.475" y2="39.226" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_payment__c" x1="0" y1="16" x2="18.161" y2="44.377" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/payment/views/payment_provider_views.xml b/addons/payment/views/payment_provider_views.xml
index b8adf8a0143..efdb7978b7c 100644
--- a/addons/payment/views/payment_provider_views.xml
+++ b/addons/payment/views/payment_provider_views.xml
@@ -37,7 +37,7 @@
                                 type="object"
                                 icon="fa-globe">
                             <div class="o_stat_info o_field_widget">
-                                <span class="text-success">Published</span>
+                                <span class="o_stat_text text-success">Published</span>
                             </div>
                         </button>
                         <button name="action_toggle_is_published"
@@ -46,14 +46,14 @@
                                 type="object"
                                 icon="fa-eye-slash">
                             <div class="o_stat_info o_field_widget">
-                                <span class="text-danger">Unpublished</span>
+                                <span class="o_stat_text text-danger">Unpublished</span>
                             </div>
                         </button>
                     </div>
                     <field name="image_128" widget="image" class="oe_avatar"
                            attrs="{'readonly': [('module_state', '!=', 'installed')]}"/>
-                    <widget name="web_ribbon" title="Disabled" bg_color="bg-danger" attrs="{'invisible': ['|', ('module_state', '!=', 'installed'), ('state', '!=', 'disabled')]}"/>
-                    <widget name="web_ribbon" title="Test Mode" bg_color="bg-warning" attrs="{'invisible': ['|', ('module_state', '!=', 'installed'), ('state', '!=', 'test')]}"/>
+                    <widget name="web_ribbon" title="Disabled" bg_color="text-bg-danger" attrs="{'invisible': ['|', ('module_state', '!=', 'installed'), ('state', '!=', 'disabled')]}"/>
+                    <widget name="web_ribbon" title="Test Mode" bg_color="text-bg-warning" attrs="{'invisible': ['|', ('module_state', '!=', 'installed'), ('state', '!=', 'test')]}"/>
                     <div class="oe_title">
                         <h1><field name="name" placeholder="Name"/></h1>
                         <div attrs="{'invisible': ['|', ('module_state', '=', 'installed'), ('module_id', '=', False)]}">
diff --git a/addons/payment/views/payment_token_views.xml b/addons/payment/views/payment_token_views.xml
index aa9a673432b..79d0d19e364 100644
--- a/addons/payment/views/payment_token_views.xml
+++ b/addons/payment/views/payment_token_views.xml
@@ -14,7 +14,7 @@
                                 type="action" icon="fa-money" string="Payments">
                         </button>
                     </div>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <group>
                         <group name="general_information">
                             <field name="payment_details"/>
diff --git a/addons/payment/wizards/payment_onboarding_views.xml b/addons/payment/wizards/payment_onboarding_views.xml
index 5a163f17375..7bd71aae308 100644
--- a/addons/payment/wizards/payment_onboarding_views.xml
+++ b/addons/payment/wizards/payment_onboarding_views.xml
@@ -18,7 +18,7 @@
                                     <field name="paypal_pdt_token" password="True" attrs="{'required': [('payment_method', '=', 'paypal')]}" />
                                 </group>
                                 <a href="https://www.odoo.com/documentation/master/applications/finance/payment_providers/paypal.html" target="_blank">
-                                    <span><i class="fa fa-arrow-right"/> How to configure your PayPal account</span>
+                                    <span><i class="oi oi-arrow-right"/> How to configure your PayPal account</span>
                                 </a>
                             </div>
 
diff --git a/addons/payment_adyen/static/description/icon.png b/addons/payment_adyen/static/description/icon.png
index 40cbb9e27b5..293d0a14dea 100644
Binary files a/addons/payment_adyen/static/description/icon.png and b/addons/payment_adyen/static/description/icon.png differ
diff --git a/addons/payment_adyen/static/description/icon.svg b/addons/payment_adyen/static/description/icon.svg
index 79ba689e91a..000bd0b6ea9 100644
--- a/addons/payment_adyen/static/description/icon.svg
+++ b/addons/payment_adyen/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#7CC098"/><stop offset="100%" stop-color="#5F8A71"/></linearGradient><path id="d" d="M19.25 45h2.714v2.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V37.5H38.5V31h10.536v-3.212a.342.342 0 0 0-.339-.343H38.5v-2.742h10.536c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V45zm-3.79 10.642h-1.037V55h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 55h1.07l.809 2.389h.01L20.075 55h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V55zm13.58-34.853a4.263 4.263 0 0 1 4.281 4.28v17.004H18.281A4.263 4.263 0 0 1 14 37.151v-4.757a4.263 4.263 0 0 1 4.28-4.28h4.638v6.777c0 .595.476 1.19 1.19 1.19h2.377v-9.394c0-.595-.475-1.19-1.189-1.19h-10.94v-5.35h16.648z"/><path id="e" d="M19.25 43h2.714v2.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V35.5H38.5V29h10.536v-3.212a.342.342 0 0 0-.339-.343H38.5v-2.742h10.536c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V43zm-3.79 10.642h-1.037V53h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 53h1.07l.809 2.389h.01L20.075 53h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V53zm13.58-34.853a4.263 4.263 0 0 1 4.281 4.28v17.004H18.281A4.263 4.263 0 0 1 14 35.151v-4.757a4.263 4.263 0 0 1 4.28-4.28h4.638v6.777c0 .595.476 1.19 1.19 1.19h2.377v-9.394c0-.595-.475-1.19-1.189-1.19h-10.94v-5.35h16.648z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V33.916L14.423 18.5 35 25.5l3.5-2.797L48 23l3.576 1.968-.236 22.01L39.224 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M7.054 20.637c.977 0 1.77.783 1.77 1.75v6.977H1.77A1.76 1.76 0 0 1 0 27.614V25.66c0-.967.792-1.75 1.77-1.75h1.907v2.772c0 .276.226.5.505.5h.965V23.32c0-.277-.226-.5-.506-.5H.126v-2.182h6.928Zm8.387 6.545V17h3.677v12.364h-7.054a1.76 1.76 0 0 1-1.77-1.75v-5.227c0-.967.792-1.75 1.77-1.75h1.906v6.045c0 .276.227.5.506.5h.965Zm10.294 0v-6.545h3.677V31.25a1.76 1.76 0 0 1-1.77 1.75h-6.927v-2.545h5.02v-1.091h-3.377a1.76 1.76 0 0 1-1.77-1.75v-6.977h3.677v6.045c0 .276.226.5.505.5h.965Zm12.201-6.545c.977 0 1.77.783 1.77 1.75v1.954a1.76 1.76 0 0 1-1.77 1.75h-1.907V23.32c0-.277-.226-.5-.505-.5h-.965v3.863c0 .276.226.5.505.5h4.515v2.182h-6.927a1.76 1.76 0 0 1-1.77-1.75v-6.977h7.054Zm10.294 0c.978 0 1.77.783 1.77 1.75v6.977h-3.676v-6.046c0-.275-.228-.5-.506-.5h-.965v6.546h-3.677v-8.727h7.054Z" fill="#32AA52"/><path d="M43.105 4h.972V.818h1.108V0H42v.818h1.105V4Zm2.775 0h.858V1.453h.053L47.663 4h.555l.871-2.547h.056V4H50V0h-1.108l-.924 2.714h-.05L46.99 0h-1.11v4Z" fill="#D1D5DB"/></svg>
diff --git a/addons/payment_alipay/static/description/icon.png b/addons/payment_alipay/static/description/icon.png
index 0c7801b87aa..fa337eb3c95 100644
Binary files a/addons/payment_alipay/static/description/icon.png and b/addons/payment_alipay/static/description/icon.png differ
diff --git a/addons/payment_alipay/static/description/icon.svg b/addons/payment_alipay/static/description/icon.svg
index 27cab76931d..7f56d59ff7c 100644
--- a/addons/payment_alipay/static/description/icon.svg
+++ b/addons/payment_alipay/static/description/icon.svg
@@ -1,39 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 70">
-  <defs>
-    <mask id="mask" x="0" y="0" width="70" height="70" maskUnits="userSpaceOnUse">
-      <g id="b">
-        <path id="a" d="M4,0H65c4,0,5,1,5,5V65c0,4-1,5-5,5H4c-3,0-4-1-4-5V5C0,1,1,0,4,0Z" fill="#fff" fill-rule="evenodd"/>
-      </g>
-    </mask>
-    <linearGradient id="linear-gradient" x1="-1349.79" y1="-4.39" x2="-1350.79" y2="-5.39" gradientTransform="matrix(70, 0, 0, -70, 94554.99, -307.17)" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#94b6c8"/>
-      <stop offset="1" stop-color="#6a9eba"/>
-    </linearGradient>
-  </defs>
-  <g mask="url(#mask)">
-    <g>
-      <path d="M0,0H70V70H0Z" fill-rule="evenodd" fill="url(#linear-gradient)"/>
-      <path d="M4,1H65c2.67,0,4.33.67,5,2V0H0V3C.67,1.67,2,1,4,1Z" fill="#fff" fill-opacity="0.38" fill-rule="evenodd"/>
-      <path d="M4,69a3.66,3.66,0,0,1-4-4V33.92L14.68,19.3,34,18.45,35.6,27.6l3.27-3.27,10.33-.18.45,24.05L28.85,69Z" fill="#393939" fill-rule="evenodd" opacity="0.32" style="isolation: isolate"/>
-      <path d="M4,69H65c2.67,0,4.33-1,5-3v4H0V66A3.92,3.92,0,0,0,4,69Z" fill-opacity="0.38" fill-rule="evenodd"/>
-      <g>
-        <g opacity="0.4">
-          <path d="M47,24.7H36.5v2.74H46.7a.34.34,0,0,1,.34.34V31H36.5v6.5H47v9.72a.34.34,0,0,1-.34.34H20.3a.35.35,0,0,1-.34-.34V46H17.25v1.56A2.73,2.73,0,0,0,20,50.29H47a2.73,2.73,0,0,0,2.71-2.74V27.44A2.73,2.73,0,0,0,47,24.7Z"/>
-          <polygon points="12.42 55.64 13.46 55.64 13.46 58.47 14.22 58.47 14.22 55.64 15.26 55.64 15.26 54.99 12.42 54.99 12.42 55.64"/>
-          <polygon points="17.31 57.38 17.3 57.38 16.49 54.99 15.42 54.99 15.42 58.47 16.13 58.47 16.13 56.03 16.14 56.03 16.99 58.47 17.58 58.47 18.42 56.01 18.43 56.01 18.43 58.47 19.14 58.47 19.14 54.99 18.07 54.99 17.31 57.38"/>
-          <g id="_13-alipay" data-name="13-alipay">
-            <path d="M30.64,18.77H14.85a3.6,3.6,0,0,0-3.6,3.61V38.17a3.61,3.61,0,0,0,3.6,3.61H30.64a3.62,3.62,0,0,0,3.61-3.58c-2.36-1.31-5.68-3.1-8.81-4.54a9.57,9.57,0,0,1-7.63,4.16c-3.63,0-4.82-2.33-5-3.92-.2-2,.77-4.19,5.11-4.19A23.63,23.63,0,0,1,24.46,31a20.84,20.84,0,0,0,1.36-3.1H16.67V27H21.4v-1.6H15.78v-1H21.4V21.87H24v2.59h5.62v1H24V27h4.56a34.92,34.92,0,0,1-2,4.67c2.51.86,5.14,1.85,7.63,2.71v-12A3.59,3.59,0,0,0,30.64,18.77Zm-17,14.94c.05,1,.53,2.76,3.59,2.76,2.68,0,4.76-2,6.06-3.74a17.49,17.49,0,0,0-5.62-1.62C14.23,31.11,13.62,32.81,13.67,33.71Z"/>
-          </g>
-        </g>
-        <g>
-          <path d="M49,22.7H38.5v2.74H48.7a.34.34,0,0,1,.34.34V29H38.5v6.5H49v9.72a.34.34,0,0,1-.34.34H22.3a.35.35,0,0,1-.34-.34V44H19.25v1.56A2.73,2.73,0,0,0,22,48.29H49a2.73,2.73,0,0,0,2.71-2.74V25.44A2.73,2.73,0,0,0,49,22.7Z" fill="#fff"/>
-          <polygon points="14.42 53.64 15.46 53.64 15.46 56.47 16.22 56.47 16.22 53.64 17.26 53.64 17.26 52.99 14.42 52.99 14.42 53.64" fill="#fff"/>
-          <polygon points="19.31 55.38 19.3 55.38 18.49 52.99 17.42 52.99 17.42 56.47 18.13 56.47 18.13 54.03 18.14 54.03 18.99 56.47 19.58 56.47 20.42 54.01 20.43 54.01 20.43 56.47 21.14 56.47 21.14 52.99 20.07 52.99 19.31 55.38" fill="#fff"/>
-          <g id="_13-alipay-2" data-name="13-alipay">
-            <path d="M32.64,16.77H16.85a3.6,3.6,0,0,0-3.6,3.61V36.17a3.61,3.61,0,0,0,3.6,3.61H32.64a3.62,3.62,0,0,0,3.61-3.58c-2.36-1.31-5.68-3.1-8.81-4.54a9.57,9.57,0,0,1-7.63,4.16c-3.63,0-4.82-2.33-5-3.92-.2-2,.77-4.19,5.11-4.19A23.63,23.63,0,0,1,26.46,29a20.84,20.84,0,0,0,1.36-3.1H18.67V25H23.4v-1.6H17.78v-1H23.4V19.87H26v2.59h5.62v1H26V25h4.56a34.92,34.92,0,0,1-2,4.67c2.51.86,5.14,1.85,7.63,2.71v-12A3.59,3.59,0,0,0,32.64,16.77Zm-17,14.94c.05,1,.53,2.76,3.59,2.76,2.68,0,4.76-2,6.06-3.74a17.49,17.49,0,0,0-5.62-1.62C16.23,29.11,15.62,30.81,15.67,31.71Z" fill="#fff"/>
-          </g>
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M39.274 4H10.728A6.727 6.727 0 0 0 4 10.728v28.544A6.727 6.727 0 0 0 10.728 46h28.546A6.726 6.726 0 0 0 46 39.272V10.728A6.725 6.725 0 0 0 39.274 4Z" fill="#1677FF"/><path d="M15.348 36.298c-6.534 0-8.466-5.146-5.236-7.962 1.077-.952 3.046-1.416 4.096-1.52 3.882-.384 7.474 1.097 11.714 3.166-2.98 3.888-6.776 6.316-10.574 6.316Zm23.232-5.926c-1.681-.563-3.936-1.423-6.448-2.332 1.508-2.622 2.713-5.609 3.505-8.854h-8.279v-2.982H37.5V14.54H27.358V9.569H23.22c-.726 0-.726.716-.726.716v4.255H12.236v1.664h10.257v2.982h-8.468v1.664h16.424a29.28 29.28 0 0 1-2.365 5.781c-5.33-1.758-11.017-3.183-14.59-2.306-2.285.563-3.756 1.567-4.62 2.62-3.969 4.828-1.123 12.16 7.257 12.16 4.955 0 9.728-2.762 13.427-7.314C35.075 34.443 46 38.997 46 38.997v-6.49s-1.372-.11-7.42-2.135Z" fill="#fff"/><path d="M43.105 4h.972V.818h1.108V0H42v.818h1.105V4Zm2.775 0h.858V1.453h.053L47.663 4h.555l.871-2.547h.056V4H50V0h-1.108l-.924 2.714h-.05L46.99 0h-1.11v4Z" fill="#D1D5DB"/></svg>
diff --git a/addons/payment_aps/static/description/icon.png b/addons/payment_aps/static/description/icon.png
index fa889c63000..81a37db82ee 100644
Binary files a/addons/payment_aps/static/description/icon.png and b/addons/payment_aps/static/description/icon.png differ
diff --git a/addons/payment_aps/static/description/icon.svg b/addons/payment_aps/static/description/icon.svg
index 2f38528ff2f..eed0f3d87bd 100644
--- a/addons/payment_aps/static/description/icon.svg
+++ b/addons/payment_aps/static/description/icon.svg
@@ -1,27 +1 @@
-<svg width="70" height="70" viewBox="0 0 70 70" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <mask id="mask0_2_36" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="70" height="70">
-    <path d="M4 0H65C69 0 70 1 70 5V65C70 69 69 70 65 70H4C1 70 0 69 0 65V5C0 1 1 0 4 0Z" fill="white"/>
-    </mask>
-    <g mask="url(#mask0_2_36)">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H70V70H0V0Z" fill="url(#paint0_linear_2_36)"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M4 1H65C67.667 1 69.333 1.667 70 3V0H0V3C0.667 1.667 2 1 4 1Z" fill="white" fill-opacity="0.383"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M4 69H65C67.667 69 69.333 68 70 66V70H0V66C0.667 68 2 69 4 69Z" fill="black" fill-opacity="0.383"/>
-    </g>
-    <path opacity="0.324" fill-rule="evenodd" clip-rule="evenodd" d="M4 69C2 69 0 68 0 65V33.916C0 33.916 18 23 19.5 22.5C21 22 23 22 23 22L28.7087 22.703H37.25L48 23L51.576 24.968L51.34 46.978L39.224 69H4Z" fill="#393939"/>
-    <path d="M30.3879 41.7839C21.4712 46.0275 15.9374 42.477 12.395 40.3205C12.1758 40.1846 11.8033 40.3523 12.1265 40.7236C13.3067 42.1545 17.1742 45.6035 22.2225 45.6035C27.2743 45.6035 30.2796 42.847 30.6556 42.3662C31.029 41.8894 30.7653 41.6264 30.3879 41.7839ZM32.8921 40.4009C32.6527 40.0891 31.4361 40.031 30.6705 40.125C29.9036 40.2164 28.7527 40.685 28.8527 40.9664C28.9041 41.0718 29.0089 41.0246 29.5357 40.9772C30.0639 40.9245 31.5436 40.7377 31.852 41.1408C32.1617 41.5467 31.38 43.4801 31.2372 43.7919C31.0993 44.1037 31.2899 44.1841 31.549 43.9764C31.8046 43.7688 32.2672 43.2312 32.5777 42.4704C32.886 41.7055 33.0741 40.6383 32.8921 40.4009Z" fill="#465C68"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M24.3924 33.1249C24.3924 34.2383 24.4205 35.1669 23.8577 36.1557C23.4035 36.9597 22.6839 37.4541 21.88 37.4541C20.7826 37.4541 20.1435 36.618 20.1435 35.384C20.1435 32.948 22.3261 32.5058 24.3924 32.5058V33.1249ZM27.2745 40.0912C27.0856 40.2599 26.8122 40.2721 26.5992 40.1594C25.6506 39.3716 25.4817 39.0058 24.9592 38.2541C23.3915 39.854 22.282 40.3323 20.248 40.3323C17.8442 40.3323 15.9709 38.849 15.9709 35.8784C15.9709 33.559 17.2292 31.9792 19.0179 31.2075C20.5696 30.5241 22.7362 30.4035 24.3924 30.2146V29.8448C24.3924 29.1654 24.4446 28.3615 24.0467 27.7746C23.6969 27.248 23.0297 27.0309 22.4427 27.0309C21.3534 27.0309 20.3806 27.5896 20.1435 28.7473C20.0952 29.0047 19.9063 29.2579 19.649 29.2699L16.8754 28.9725C16.6423 28.9202 16.385 28.7313 16.4493 28.3735C17.0885 25.013 20.1233 24 22.8406 24C24.2315 24 26.0484 24.3699 27.1458 25.4231C28.5367 26.7214 28.404 28.4539 28.404 30.3392V34.7931C28.404 36.1317 28.9587 36.7185 29.4813 37.4421C29.6661 37.6994 29.7064 38.009 29.4732 38.2018C28.8903 38.6882 27.8532 39.5927 27.2825 40.0992L27.2745 40.0912Z" fill="#465C68"/>
-    <path d="M30.3879 39.7839C21.4712 44.0275 15.9374 40.477 12.395 38.3205C12.1758 38.1846 11.8033 38.3523 12.1265 38.7236C13.3067 40.1545 17.1742 43.6035 22.2225 43.6035C27.2743 43.6035 30.2796 40.847 30.6556 40.3662C31.029 39.8894 30.7653 39.6264 30.3879 39.7839ZM32.8921 38.4009C32.6527 38.0891 31.4361 38.031 30.6705 38.125C29.9036 38.2164 28.7527 38.685 28.8527 38.9664C28.9041 39.0718 29.0089 39.0246 29.5357 38.9772C30.0639 38.9245 31.5436 38.7377 31.852 39.1408C32.1617 39.5467 31.38 41.4801 31.2372 41.7919C31.0993 42.1037 31.2899 42.1841 31.549 41.9764C31.8046 41.7688 32.2672 41.2312 32.5777 40.4704C32.886 39.7055 33.0741 38.6383 32.8921 38.4009Z" fill="white"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M24.3924 31.1249C24.3924 32.2383 24.4205 33.1669 23.8577 34.1557C23.4035 34.9597 22.6839 35.4541 21.88 35.4541C20.7826 35.4541 20.1435 34.618 20.1435 33.384C20.1435 30.948 22.3261 30.5058 24.3924 30.5058V31.1249ZM27.2745 38.0912C27.0856 38.2599 26.8122 38.2721 26.5992 38.1594C25.6506 37.3716 25.4817 37.0058 24.9592 36.2541C23.3915 37.854 22.282 38.3323 20.248 38.3323C17.8442 38.3323 15.9709 36.849 15.9709 33.8784C15.9709 31.559 17.2292 29.9792 19.0179 29.2075C20.5696 28.5241 22.7362 28.4035 24.3924 28.2146V27.8448C24.3924 27.1654 24.4446 26.3615 24.0467 25.7746C23.6969 25.248 23.0297 25.0309 22.4427 25.0309C21.3534 25.0309 20.3806 25.5896 20.1435 26.7473C20.0952 27.0047 19.9063 27.2579 19.649 27.2699L16.8754 26.9725C16.6423 26.9202 16.385 26.7313 16.4493 26.3735C17.0885 23.013 20.1233 22 22.8406 22C24.2315 22 26.0484 22.3699 27.1458 23.4231C28.5367 24.7214 28.404 26.4539 28.404 28.3392V32.7931C28.404 34.1317 28.9587 34.7185 29.4813 35.4421C29.6661 35.6994 29.7064 36.009 29.4732 36.2018C28.8903 36.6882 27.8532 37.5927 27.2825 38.0992L27.2745 38.0912Z" fill="white"/>
-    <path d="M32 37.5C31.5 37.5 30.9327 36.408 30.9327 35.4908L31.0317 31H49.036V27.788C49.0363 27.6976 49.0008 27.6108 48.9372 27.5466C48.8737 27.4823 48.7874 27.4458 48.697 27.445H31.0317C30.8494 26.7368 30.5144 26.0864 29.9023 25.5151C29.5571 25.1837 29.1449 24.9159 28.6974 24.703H49.036C50.536 24.703 51.75 25.931 51.75 27.445V47.555C51.75 49.069 50.537 50.297 49.036 50.297H21.964C20.464 50.297 19.25 49.069 19.25 47.555H21.964C21.964 47.555 22.116 47.555 22.303 47.555H48.697C48.7874 47.5542 48.8737 47.5177 48.9372 47.4534C49.0008 47.3892 49.0363 47.3024 49.036 47.212V37.5C49.036 37.5 32.5 37.5 32 37.5Z" fill="#465C68"/>
-    <path d="M15.459 55.642H14.423V55H17.256V55.642H16.219V58.474H15.459V55.642Z" fill="#465C68"/>
-    <path d="M17.422 55H18.492L19.301 57.389H19.311L20.075 55H21.145V58.474H20.434V56.012H20.424L19.577 58.474H18.991L18.143 56.036H18.133V58.474H17.422V55Z" fill="#465C68"/>
-    <path d="M32 35.5C31.5 35.5 30.9327 34.408 30.9327 33.4908L31.0317 29H49.036V25.788C49.0363 25.6976 49.0008 25.6108 48.9372 25.5466C48.8737 25.4823 48.7874 25.4458 48.697 25.445H31.0317C30.8494 24.7368 30.5144 24.0864 29.9023 23.5151C29.5571 23.1837 29.1449 22.9159 28.6974 22.703H49.036C50.536 22.703 51.75 23.931 51.75 25.445V45.555C51.75 47.069 50.537 48.297 49.036 48.297H21.964C20.464 48.297 19.25 47.069 19.25 45.555H21.964C21.964 45.555 22.116 45.555 22.303 45.555H48.697C48.7874 45.5542 48.8737 45.5177 48.9372 45.4534C49.0008 45.3892 49.0363 45.3024 49.036 45.212V35.5C49.036 35.5 32.5 35.5 32 35.5Z" fill="white"/>
-    <path d="M15.459 53.642H14.423V53H17.256V53.642H16.219V56.474H15.459V53.642Z" fill="white"/>
-    <path d="M17.422 53H18.492L19.301 55.389H19.311L20.075 53H21.145V56.474H20.434V54.012H20.424L19.577 56.474H18.991L18.143 54.036H18.133V56.474H17.422V53Z" fill="white"/>
-    <defs>
-    <linearGradient id="paint0_linear_2_36" x1="70" y1="0" x2="0" y2="70" gradientUnits="userSpaceOnUse">
-    <stop stop-color="#DA956B"/>
-    <stop offset="1" stop-color="#CC7039"/>
-    </linearGradient>
-    </defs>
-</svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M40.84 38.587c-17.865 8.236-28.952 1.345-36.049-2.84-.439-.264-1.185.062-.538.782C6.619 39.306 14.366 46 24.482 46c10.12 0 16.142-5.35 16.895-6.283.748-.925.22-1.436-.536-1.13Zm5.017-2.684c-.48-.605-2.917-.718-4.45-.535-1.537.177-3.843 1.086-3.643 1.632.103.205.313.113 1.369.021 1.058-.102 4.022-.464 4.64.318.62.788-.946 4.54-1.231 5.145-.277.605.105.761.624.358.512-.403 1.44-1.446 2.061-2.923.618-1.484.995-3.555.63-4.016Z" fill="#F90"/><path d="M36.319 25.513V11.721C36.319 9.352 33.953 4 25.45 4c-8.5 0-13.023 5.146-13.023 9.782l7.105.616s1.582-4.633 5.255-4.633c3.674 0 3.422 2.882 3.422 3.505v2.997c-4.706.153-16.39 1.455-16.39 11 0 10.264 13.374 10.694 17.76 4.06.169.27.361.533.602.78 1.614 1.644 3.767 3.602 3.767 3.602l5.485-5.25c.002-.002-3.115-2.372-3.115-4.946Zm-16.252.484c0-4.408 4.876-5.302 8.144-5.407v3.794c-.001 7.517-8.144 6.38-8.144 1.613Z"/><path d="M43.105 4h.972V.818h1.108V0H42v.818h1.105V4Zm2.775 0h.858V1.453h.053L47.663 4h.555l.871-2.547h.056V4H50V0h-1.108l-.924 2.714h-.05L46.99 0h-1.11v4Z" fill="#D1D5DB"/></svg>
diff --git a/addons/payment_asiapay/static/description/icon.png b/addons/payment_asiapay/static/description/icon.png
index 36f40b9aab2..d16d465a96a 100644
Binary files a/addons/payment_asiapay/static/description/icon.png and b/addons/payment_asiapay/static/description/icon.png differ
diff --git a/addons/payment_asiapay/static/description/icon.svg b/addons/payment_asiapay/static/description/icon.svg
index f0af4b2f239..72feef3a206 100644
--- a/addons/payment_asiapay/static/description/icon.svg
+++ b/addons/payment_asiapay/static/description/icon.svg
@@ -1,25 +1 @@
-<svg width="70" height="70" viewBox="0 0 70 70" fill="none" xmlns="http://www.w3.org/2000/svg">
-<mask id="mask0_3_167" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="70" height="70">
-<path d="M4 0H65C69 0 70 1 70 5V65C70 69 69 70 65 70H4C1 70 0 69 0 65V5C0 1 1 0 4 0Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_3_167)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H70V70H0V0Z" fill="url(#paint0_linear_3_167)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 1H65C67.667 1 69.333 1.667 70 3V0H0V3C0.667 1.667 2 1 4 1Z" fill="white" fill-opacity="0.383"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 69H65C67.667 69 69.333 68 70 66V70H0V66C0.667 68 2 69 4 69Z" fill="black" fill-opacity="0.383"/>
-</g>
-<path opacity="0.324" fill-rule="evenodd" clip-rule="evenodd" d="M4 69C2 69 0 68 0 65V33.916C0 33.916 17 21.5 18.5 21C20 20.5 23 20.5 23 20.5L28.7087 22.703H37.25L48 23L51.576 24.968L51.34 46.978L39.224 69H4Z" fill="#393939"/>
-<path d="M26.3156 37.6268C26.2605 38.8771 23.8758 39.3985 21.8287 39.3985C19.8212 39.3985 18.954 37.7879 18.954 36.2127C18.954 32.0789 24.5867 32.0789 26.3156 32.0415V37.6268ZM29.3105 27.5129C29.3105 24.2042 27.7743 22 23.2458 22C20.7247 22 17.1041 23.1389 17.1041 23.8109C17.1041 24.0066 17.1438 24.1234 17.2242 24.3204L17.7343 25.6986C17.7755 25.8197 17.8913 25.8962 18.0119 25.8962C18.3631 25.8962 20.1774 24.6392 22.8117 24.6392C25.6093 24.6392 26.3157 25.8962 26.3157 28.1833V29.5979C23.8759 29.6769 16 29.7955 16 36.4483C16 39.9537 18.0119 42 21.118 42C25.7194 42 29.3105 41.2544 29.3105 35.901V27.5129Z" fill="#465C68"/>
-<path d="M26.3156 35.6268C26.2605 36.8771 23.8758 37.3985 21.8287 37.3985C19.8212 37.3985 18.954 35.7879 18.954 34.2127C18.954 30.0789 24.5867 30.0789 26.3156 30.0415V35.6268ZM29.3105 25.5129C29.3105 22.2042 27.7743 20 23.2458 20C20.7247 20 17.1041 21.1389 17.1041 21.8109C17.1041 22.0066 17.1438 22.1234 17.2242 22.3204L17.7343 23.6986C17.7755 23.8197 17.8913 23.8962 18.0119 23.8962C18.3631 23.8962 20.1774 22.6392 22.8117 22.6392C25.6093 22.6392 26.3157 23.8962 26.3157 26.1833V27.5979C23.8759 27.6769 16 27.7955 16 34.4483C16 37.9537 18.0119 40 21.118 40C25.7194 40 29.3105 39.2544 29.3105 33.901V25.5129Z" fill="white"/>
-<path d="M19.2568 45L19.25 47.555C19.25 49.069 20.464 50.297 21.964 50.297H49.036C50.537 50.297 51.75 49.069 51.75 47.555V27.445C51.75 25.931 50.536 24.703 49.036 24.703H32V27.445H48.697C48.7874 27.4458 48.8737 27.4823 48.9372 27.5466C49.0008 27.6108 49.0363 27.6976 49.036 27.788V31H32V37.5H49.036V47.212C49.0363 47.3024 49.0008 47.3892 48.9372 47.4534C48.8737 47.5177 48.7874 47.5542 48.697 47.555H22.303C22.116 47.555 21.964 47.4 21.964 47.212V45H19.2568Z" fill="#465C68"/>
-<path d="M14.423 55.642H15.459V58.474H16.219V55.642H17.256V55H14.423V55.642Z" fill="#465C68"/>
-<path d="M18.492 55H17.422V58.474H18.133V56.036H18.143L18.991 58.474H19.577L20.424 56.012H20.434V58.474H21.145V55H20.075L19.311 57.389H19.301L18.492 55Z" fill="#465C68"/>
-<path d="M19.2568 43L19.25 45.555C19.25 47.069 20.464 48.297 21.964 48.297H49.036C50.537 48.297 51.75 47.069 51.75 45.555V25.445C51.75 23.931 50.536 22.703 49.036 22.703H32V25.445H48.697C48.7874 25.4458 48.8737 25.4823 48.9372 25.5466C49.0008 25.6108 49.0363 25.6976 49.036 25.788V29H32V35.5H49.036V45.212C49.0363 45.3024 49.0008 45.3892 48.9372 45.4534C48.8737 45.5177 48.7874 45.5542 48.697 45.555H22.303C22.116 45.555 21.964 45.4 21.964 45.212V43H19.2568Z" fill="white"/>
-<path d="M14.423 53.642H15.459V56.474H16.219V53.642H17.256V53H14.423V53.642Z" fill="white"/>
-<path d="M18.492 53H17.422V56.474H18.133V54.036H18.143L18.991 56.474H19.577L20.424 54.012H20.434V56.474H21.145V53H20.075L19.311 55.389H19.301L18.492 53Z" fill="white"/>
-<defs>
-<linearGradient id="paint0_linear_3_167" x1="70" y1="0" x2="0" y2="70" gradientUnits="userSpaceOnUse">
-<stop stop-color="#CDC484"/>
-<stop offset="1" stop-color="#B5AA59"/>
-</linearGradient>
-</defs>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M18.012 25.826h-.69a6.387 6.387 0 0 0-2.83.95c-1.323.693-1.323 2.407-1.323 3.043v12.223c0 .127 0 .313.126.313.184-.058.127 0 .311-.058l1.127-.313c.127 0 .184-.127.184-.255v-4.815c.564.382 1.254.764 2.393.822h.437c2.704 0 3.9-2.848 3.9-6.204.011-2.916-1.127-5.706-3.635-5.706Zm-.449 10.324h-.253c-1-.057-1.702-.382-2.393-.764v-6.4c0-.695.943-1.551 2.462-1.62.138-.024.195-.024.31-.024 1.887 0 2.014 2.28 2.014 4.248 0 2.28-.184 4.56-2.14 4.56Z" fill="#3C4187"/><path d="M29.343 11.254h-.38c-1.45.058-3.279.694-3.279 1.076 0 .127 0 .185.057.313l.311.764c.058.127.058.127.127.127.253 0 1.277-.764 2.795-.764h.104c1.633 0 2.082.764 2.082 2.153v.822c-.506 0-1.323.057-2.21.185-1.829.312-3.9 1.273-3.9 3.935 0 2.083 1.14 3.299 3.026 3.299h.886c1.45-.128 2.393-.44 2.646-.637 1.196-.764 1.323-2.222 1.323-3.414v-4.56c0-2.026-.943-3.3-3.588-3.3Zm1.817 9.445c0 .382-1.138.822-2.209.891h-.38c-1.196 0-1.829-.949-1.829-1.898 0-1.389 1.07-1.967 2.21-2.222.885-.255 1.76-.255 2.208-.255v3.484Z" fill="#F89C33"/><path d="M40.674 26.335c0-.184.069-.44-.127-.44l-1.254-.069c-.184 0-.31 0-.31.127l-.07 9.502c-.632.568-1.38.765-2.519.765-1.45.058-2.324-1.459-2.393-3.3-.126-2.349 0-4.432 0-6.782 0-.058-.253-.255-.437-.255h-1.139s-.253.313-.253.382c.057 1.262.506 9.121.817 9.688.126.185.38.567.632.891.254.255.564.44.944.695.817.509 3.393.312 4.406-.567l.057 1.076-.057 1.203c-.07 1.204-.07 3.171-1.887 3.23-1.196 0-1.76-.764-1.956-.127 0 .057-.184.949-.126 1.076.184.255.76.51 1.76.567 1.324.058 2.83-.636 3.28-1.586.759-1.516.689-5.069.689-6.4l-.057-9.676Z" fill="#3C4187"/><path d="M19.829 12.458c0-.127.057-.185.057-.255 0-.127-.057-.255-.253-.313-.633-.312-1.956-.694-2.773-.694-2.082 0-3.531 1.332-3.531 3.3 0 3.552 5.165 2.974 5.165 5.45 0 1.135-.817 1.713-1.83 1.713-1.633 0-2.83-.822-3.025-.822-.057 0-.195 0-.253.197l-.311.764c-.057.058-.057.127-.057.255 0 .44 2.392 1.145 3.52 1.145 2.013 0 3.773-1.145 3.773-3.356 0-3.669-5.223-2.917-5.223-5.51 0-1.133.817-1.585 1.76-1.585 1.197 0 2.21.636 2.324.636.127 0 .184-.069.311-.255l.346-.67Zm3.463-.567c0-.185-.058-.313-.311-.313h-1.196c-.184 0-.31.07-.31.256v10.764c0 .184.125.255.31.255h1.196c.184 0 .31-.07.31-.255V11.89Zm.379-4.502c0-.764-.633-1.389-1.38-1.389-.818 0-1.45.636-1.45 1.39 0 .821.62 1.457 1.45 1.457.747 0 1.38-.637 1.38-1.458Z" fill="#F89C33"/><path d="M26.996 25.919h-.38c-1.45.07-3.279.694-3.279 1.076 0 .127 0 .185.058.313l.31.764c.058.127.058.127.127.127.253 0 1.277-.764 2.796-.764h.103c1.633 0 2.082.764 2.082 2.153v.822c-.506 0-1.323.057-2.21.184-1.828.313-3.899 1.274-3.899 3.936 0 2.083 1.139 3.299 3.025 3.299h.886c1.45-.127 2.393-.452 2.646-.637 1.196-.764 1.323-2.222 1.323-3.426v-4.56c.012-2.014-.942-3.287-3.588-3.287Zm1.83 9.445c0 .382-1.14.822-2.21.892h-.38c-1.196 0-1.829-.95-1.829-1.899 0-1.389 1.07-1.967 2.21-2.222.885-.255 1.76-.255 2.208-.255v3.484Z" fill="#3C4187"/><path d="M8.291 11.254h-.38c-1.45.058-3.279.694-3.279 1.076 0 .127 0 .185.058.313l.31.764c.058.127.058.127.127.127.254 0 1.277-.764 2.796-.764h.103c1.633 0 2.07.764 2.07 2.153v.822c-.506 0-1.323.057-2.196.185-1.83.312-3.9 1.273-3.9 3.935 0 2.083 1.139 3.299 3.025 3.299h.886c1.45-.128 2.393-.44 2.646-.637 1.196-.764 1.323-2.222 1.323-3.414v-4.56c0-2.026-.943-3.3-3.589-3.3Zm1.83 9.445c0 .382-1.14.822-2.197.891h-.38c-1.196 0-1.83-.949-1.83-1.898 0-1.389 1.07-1.967 2.21-2.222.885-.255 1.76-.255 2.196-.255v3.484Z" fill="#F89C33"/><path d="M46 27.423c0 .51-.184.95-.54 1.309a1.776 1.776 0 0 1-1.3.543c-.507 0-.944-.184-1.301-.543a1.798 1.798 0 0 1-.54-1.309c0-.509.183-.949.54-1.308a1.776 1.776 0 0 1 1.3-.544c.506 0 .944.185 1.3.544.357.36.54.788.54 1.308Zm-.241 0c0-.451-.161-.822-.472-1.145a1.541 1.541 0 0 0-1.127-.475 1.54 1.54 0 0 0-1.127.475 1.567 1.567 0 0 0-.472 1.145c0 .452.161.822.472 1.146.31.313.69.475 1.127.475.437 0 .817-.15 1.127-.475a1.61 1.61 0 0 0 .472-1.146Zm-.542.938h-.483l-.598-.764h-.265v.764h-.357v-1.956h.598c.138 0 .242 0 .323.011a.55.55 0 0 1 .23.081c.08.047.149.104.183.174a.595.595 0 0 1 .058.266.508.508 0 0 1-.115.348.883.883 0 0 1-.311.22l.737.856Zm-.701-1.4c0-.058-.011-.093-.023-.14a.252.252 0 0 0-.092-.103c-.034-.023-.08-.035-.115-.046-.046-.012-.103-.012-.172-.012h-.241v.66h.207c.069 0 .126-.012.195-.024a.355.355 0 0 0 .15-.07c.034-.034.068-.068.08-.115.011-.023.011-.08.011-.15Z" fill="#3C4187"/></svg>
diff --git a/addons/payment_authorize/static/description/icon.png b/addons/payment_authorize/static/description/icon.png
index 235f1adbd41..380b415624e 100644
Binary files a/addons/payment_authorize/static/description/icon.png and b/addons/payment_authorize/static/description/icon.png differ
diff --git a/addons/payment_authorize/static/description/icon.svg b/addons/payment_authorize/static/description/icon.svg
index c2755ee6bc7..22bf5c0dcba 100644
--- a/addons/payment_authorize/static/description/icon.svg
+++ b/addons/payment_authorize/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#94B6C8"/><stop offset="100%" stop-color="#6A9EBA"/></linearGradient><path id="d" d="M19.25 46h2.714v1.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V37.5H33.625l-2.62-6.5h18.031v-3.212a.342.342 0 0 0-.339-.343H29.765l-1.018-2.742h20.289c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V46zm-3.79 9.642h-1.037V55h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 55h1.07l.809 2.389h.01L20.075 55h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V55zm17.163-12.266c0 .228-.19.342-.57.342-.253 0-.481-.013-.684-.038l-4.826-.076-4.826.076a4.036 4.036 0 0 1-.57.038c-.507 0-.76-.127-.76-.38 0-.279.342-.418 1.026-.418 2.23-.025 3.344-.253 3.344-.684 0-.025-.025-.127-.076-.304l-.304-1.026-.19-.532c-.228-.785-.785-2.52-1.672-5.206h-8.132c-1.52 4.053-2.28 6.384-2.28 6.992 0 .355.152.57.456.646.076.025.71.076 1.9.152.735.025 1.102.152 1.102.38 0 .253-.33.38-.988.38-1.165 0-2.52-.05-4.066-.152-.38-.025-.773-.038-1.178-.038-.405 0-.798.025-1.178.076A4.157 4.157 0 0 1 9.62 43c-.355 0-.532-.114-.532-.342 0-.228.399-.355 1.197-.38.798-.025 1.374-.146 1.729-.361s.633-.627.836-1.235c3.268-9.323 5.928-16.809 7.98-22.458a5.04 5.04 0 0 1 .304-1.026l.19-.684c.076-.279.177-.418.304-.418.076 0 .14.076.19.228.33.988 1.077 3.053 2.242 6.194.912 2.457 3.18 8.626 6.802 18.506.203.557.462.912.779 1.064.317.152.969.24 1.957.266.659.025.988.152.988.38zM24.25 33.652l-2.014-5.662-1.824-5.206c-1.064 2.787-2.343 6.41-3.838 10.868h7.676z"/><path id="e" d="M19.25 44h2.714v1.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V35.5H33.625l-2.62-6.5h18.031v-3.212a.342.342 0 0 0-.339-.343H29.765l-1.018-2.742h20.289c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V44zm-3.79 9.642h-1.037V53h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 53h1.07l.809 2.389h.01L20.075 53h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V53zm17.163-12.266c0 .228-.19.342-.57.342-.253 0-.481-.013-.684-.038l-4.826-.076-4.826.076a4.036 4.036 0 0 1-.57.038c-.507 0-.76-.127-.76-.38 0-.279.342-.418 1.026-.418 2.23-.025 3.344-.253 3.344-.684 0-.025-.025-.127-.076-.304l-.304-1.026-.19-.532c-.228-.785-.785-2.52-1.672-5.206h-8.132c-1.52 4.053-2.28 6.384-2.28 6.992 0 .355.152.57.456.646.076.025.71.076 1.9.152.735.025 1.102.152 1.102.38 0 .253-.33.38-.988.38-1.165 0-2.52-.05-4.066-.152-.38-.025-.773-.038-1.178-.038-.405 0-.798.025-1.178.076A4.157 4.157 0 0 1 9.62 41c-.355 0-.532-.114-.532-.342 0-.228.399-.355 1.197-.38.798-.025 1.374-.146 1.729-.361s.633-.627.836-1.235c3.268-9.323 5.928-16.809 7.98-22.458a5.04 5.04 0 0 1 .304-1.026l.19-.684c.076-.279.177-.418.304-.418.076 0 .14.076.19.228.33.988 1.077 3.053 2.242 6.194.912 2.457 3.18 8.626 6.802 18.506.203.557.462.912.779 1.064.317.152.969.24 1.957.266.659.025.988.152.988.38zM24.25 31.652l-2.014-5.662-1.824-5.206c-1.064 2.787-2.343 6.41-3.838 10.868h7.676z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V33.916l21.6-19.82 3.4 8.607h12.25L48 23l3.576 1.968-.236 22.01L39.224 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><circle cx="18.5" cy="18.5" r="14.5" fill="#3477F6"/><circle cx="37.5" cy="37.5" r="8.5" fill="#F5C142"/><path d="M43.105 4h.972V.818h1.108V0H42v.818h1.105V4Zm2.775 0h.858V1.453h.053L47.663 4h.555l.871-2.547h.056V4H50V0h-1.108l-.924 2.714h-.05L46.99 0h-1.11v4Z" fill="#D1D5DB"/></svg>
diff --git a/addons/payment_buckaroo/static/description/icon.png b/addons/payment_buckaroo/static/description/icon.png
index b7ad04c3cfd..607885bdb9d 100644
Binary files a/addons/payment_buckaroo/static/description/icon.png and b/addons/payment_buckaroo/static/description/icon.png differ
diff --git a/addons/payment_buckaroo/static/description/icon.svg b/addons/payment_buckaroo/static/description/icon.svg
index 1f21334c31c..92e80fa77c8 100644
--- a/addons/payment_buckaroo/static/description/icon.svg
+++ b/addons/payment_buckaroo/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#CDC484"/><stop offset="100%" stop-color="#B5AA59"/></linearGradient><path id="d" d="M31.757 37.5L34 31h15.036v-3.212a.342.342 0 0 0-.339-.343H35l.92-2.742h13.116c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742 2.258.007 3.907.022 5.137 0h24.31a.342.342 0 0 0 .339-.343V37.5H31.757zM15.46 55.642h-1.036V55h2.833v.642h-1.037v2.832h-.76v-2.832zM17.423 55h1.07l.809 2.389h.01L20.075 55h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V55zM13 19h3.688l2.517 7.42h8.184L29.994 19H33l-8.76 26h-1.97L13 19zm7 11l2.964 9L26 30h-6z"/><path id="e" d="M31.757 35.5L34 29h15.036v-3.212a.342.342 0 0 0-.339-.343H35l.92-2.742h13.116c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742 2.258.007 3.907.022 5.137 0h24.31a.342.342 0 0 0 .339-.343V35.5H31.757zM15.46 53.642h-1.036V53h2.833v.642h-1.037v2.832h-.76v-2.832zM17.423 53h1.07l.809 2.389h.01L20.075 53h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V53zM13 17h3.688l2.517 7.42h8.184L29.994 17H33l-8.76 26h-1.97L13 17zm7 11l2.964 9L26 28h-6z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V33.916l13.5-16.675L18.889 24l11.172-7 .967 5.703 4.533.036L48 23l3.576 1.968-.236 22.01L39.224 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M43.105 50h.972v-3.182h1.108V46H42v.818h1.105V50Zm2.775 0h.858v-2.547h.053L47.663 50h.555l.871-2.547h.056V50H50v-4h-1.108l-.924 2.714h-.05L46.99 46h-1.11v4Z" fill="#D1D5DB"/><path d="M31.894 21.692H18.548l6.924 15.123 6.422-15.123ZM4 4h6.297l5.727 12.304h18.264L39.703 4H46L27.552 46h-4.348L4 4Z" fill="#CDD905"/></svg>
diff --git a/addons/payment_custom/static/description/icon.png b/addons/payment_custom/static/description/icon.png
index 401e2551725..b382c69c25c 100644
Binary files a/addons/payment_custom/static/description/icon.png and b/addons/payment_custom/static/description/icon.png differ
diff --git a/addons/payment_custom/static/description/icon.svg b/addons/payment_custom/static/description/icon.svg
index e26329ba15b..0fe24616546 100644
--- a/addons/payment_custom/static/description/icon.svg
+++ b/addons/payment_custom/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="98.616%"><stop offset="0%" stop-color="#797C79"/><stop offset="100%" stop-color="#545554"/></linearGradient><path id="d" d="M19.25 33.173c1.733.551 3.65.827 5.75.827 4 0 7-1 9-3h15.036v-3.212a.342.342 0 0 0-.339-.343H35c.347-.502.514-1.416.5-2.742h13.536c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V33.173zm29.447 14.382a.342.342 0 0 0 .339-.343V37.5H21.964v9.712c0 .188.152.343.339.343h26.394zm-18.614-5.713v2.285a.683.683 0 0 1-.677.685h-4.062a.683.683 0 0 1-.677-.685v-2.285c0-.377.304-.686.677-.686h4.062c.373 0 .677.309.677.686zm10.834 0v2.285a.683.683 0 0 1-.677.685h-7.674a.683.683 0 0 1-.677-.685v-2.285c0-.377.305-.686.677-.686h7.674c.372 0 .677.309.677.686zm-9.242-18.427a.938.938 0 0 1 0 1.42L24.8 30.772c-.6.52-1.55.1-1.55-.71v-3.434c-6.058.087-8.67 1.591-6.898 7.256.197.629-.563 1.116-1.097.728C13.546 33.369 12 30.99 12 28.59c0-5.946 4.975-7.204 11.25-7.276v-3.127c0-.807.948-1.23 1.55-.71l6.875 5.937z"/><path id="e" d="M19.25 31.173c1.733.551 3.65.827 5.75.827 4 0 7-1 9-3h15.036v-3.212a.342.342 0 0 0-.339-.343H35c.347-.502.514-1.416.5-2.742h13.536c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V31.173zm29.447 14.382a.342.342 0 0 0 .339-.343V35.5H21.964v9.712c0 .188.152.343.339.343h26.394zm-18.614-5.713v2.285a.683.683 0 0 1-.677.685h-4.062a.683.683 0 0 1-.677-.685v-2.285c0-.377.304-.686.677-.686h4.062c.373 0 .677.309.677.686zm10.834 0v2.285a.683.683 0 0 1-.677.685h-7.674a.683.683 0 0 1-.677-.685v-2.285c0-.377.305-.686.677-.686h7.674c.372 0 .677.309.677.686zm-9.242-18.427a.938.938 0 0 1 0 1.42L24.8 28.772c-.6.52-1.55.1-1.55-.71v-3.434c-6.058.087-8.67 1.591-6.898 7.256.197.629-.563 1.116-1.097.728C13.546 31.369 12 28.99 12 26.59c0-5.946 4.975-7.204 11.25-7.276v-3.127c0-.807.948-1.23 1.55-.71l6.875 5.937z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V33.916L13 23l4.914-2.142 5.764-5.35L32 22l3.561.74L48 23l3.576 1.968-.236 22.01L39.224 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M0 12h50v26a4 4 0 0 1-4 4H0V12Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M0 12h50v26a4 4 0 0 1-4 4H0V12Z" fill="url(#o_icon_payment_custom__a)" fill-opacity=".2"/><path d="M4 21a4 4 0 0 1-4-4v-5a4 4 0 0 1 4-4h46v9a4 4 0 0 1-4 4H4Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path d="M4 21a4 4 0 0 1-4-4v-5a4 4 0 0 1 4-4h46v9a4 4 0 0 1-4 4H4Z" fill="url(#o_icon_payment_custom__b)" fill-opacity=".2"/><path d="M0 16h50v4a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4v-4Z" fill="var(--o-icons-red-teal, #006158)"/><path d="M0 16h50v4a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4v-4Z" fill="url(#o_icon_payment_custom__c)" fill-opacity=".2"/><defs><linearGradient id="o_icon_payment_custom__a" x1="0" y1="12" x2="53.254" y2="34.189" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_payment_custom__b" x1="0" y1="8" x2="32.475" y2="39.226" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_payment_custom__c" x1="0" y1="16" x2="18.161" y2="44.377" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/payment_demo/static/description/icon.png b/addons/payment_demo/static/description/icon.png
index 10527dcb3f4..867bf77cac6 100644
Binary files a/addons/payment_demo/static/description/icon.png and b/addons/payment_demo/static/description/icon.png differ
diff --git a/addons/payment_demo/static/description/icon.svg b/addons/payment_demo/static/description/icon.svg
index fe6f252ca4c..6829a703537 100644
--- a/addons/payment_demo/static/description/icon.svg
+++ b/addons/payment_demo/static/description/icon.svg
@@ -1,26 +1 @@
-<svg width="70" height="70" viewBox="0 0 70 70" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_160_30)">
-<mask id="mask0_160_30" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="70" height="70">
-<path d="M4 0H65C69 0 70 1 70 5V65C70 69 69 70 65 70H4C1 70 0 69 0 65V5C0 1 1 0 4 0Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_160_30)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H70V70H0V0Z" fill="url(#paint0_linear_160_30)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 1H65C67.667 1 69.333 1.667 70 3V0H0V3C0.667 1.667 2 1 4 1Z" fill="white" fill-opacity="0.383"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 69H65C67.667 69 69.333 68 70 66V70H0V66C0.667 68 2 69 4 69Z" fill="black" fill-opacity="0.383"/>
-</g>
-<path opacity="0.324" fill-rule="evenodd" clip-rule="evenodd" d="M4 69C2 69 0 68 0 65V39.5C0 39.5 16 23.703 17.5 22.703H31H37.25L48 23L51.576 24.968L51.34 46.978L39.224 69H4Z" fill="#393939"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M28 27.445H48.697C48.7874 27.4458 48.8737 27.4823 48.9372 27.5466C49.0008 27.6108 49.0363 27.6976 49.036 27.788V31H28.0612L31.7806 37.5H49.036V47.212C49.0363 47.3024 49.0008 47.3892 48.9372 47.4534C48.8737 47.5177 48.7874 47.5542 48.697 47.555H22.303C22.116 47.555 21.964 47.4 21.964 47.212V44H19.2595L19.25 47.555C19.25 49.069 20.464 50.297 21.964 50.297H49.036C50.537 50.297 51.75 49.069 51.75 47.555V27.445C51.75 25.931 50.536 24.703 49.036 24.703H28V27.445Z" fill="#465C68"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M28 25.445H48.697C48.7874 25.4458 48.8737 25.4823 48.9372 25.5466C49.0008 25.6108 49.0363 25.6976 49.036 25.788V29H28.0612L31.7806 35.5H49.036V45.212C49.0363 45.3024 49.0008 45.3892 48.9372 45.4534C48.8737 45.5177 48.7874 45.5542 48.697 45.555H22.303C22.116 45.555 21.964 45.4 21.964 45.212V42H19.2595L19.25 45.555C19.25 47.069 20.464 48.297 21.964 48.297H49.036C50.537 48.297 51.75 47.069 51.75 45.555V25.445C51.75 23.931 50.536 22.703 49.036 22.703H28V25.445Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M19.9412 12.3794C19.9412 12.9967 19.4408 13.4971 18.8235 13.4971C18.2063 13.4971 17.7059 12.9967 17.7059 12.3794C17.7059 11.7622 18.2063 11.2618 18.8235 11.2618C19.4408 11.2618 19.9412 11.7622 19.9412 12.3794ZM22.7353 15.7324C23.6612 15.7324 24.4118 14.9818 24.4118 14.0559C24.4118 13.13 23.6612 12.3794 22.7353 12.3794C21.8094 12.3794 21.0588 13.13 21.0588 14.0559C21.0588 14.9818 21.8094 15.7324 22.7353 15.7324ZM19.3824 19.0853C20.3082 19.0853 21.0588 18.3347 21.0588 17.4088C21.0588 16.4829 20.3082 15.7324 19.3824 15.7324C18.4565 15.7324 17.7059 16.4829 17.7059 17.4088C17.7059 18.3347 18.4565 19.0853 19.3824 19.0853ZM22.3442 20.9457H18.3501C17.239 20.9457 16.7525 21.7025 16.7525 22.1642C16.7525 22.746 17.0797 23.2533 17.5645 23.5207C17.5558 23.5865 17.5513 23.6536 17.5513 23.7217V29.1963L11.2445 39.0567C10.581 40.0941 11.3461 41.4383 12.6002 41.4383H28.3998C29.6539 41.4383 30.419 40.0941 29.7555 39.0567L23.143 28.7184V23.7217C23.143 23.6536 23.1385 23.5865 23.1298 23.5207C23.6146 23.2533 23.9418 22.746 23.9418 22.1642C23.9418 21.7505 23.4553 20.9457 22.3442 20.9457ZM21.5454 23.7217L19.1489 23.7217V29.1963C19.1489 29.4877 19.0651 29.7732 18.907 30.0204L12.6002 39.8808H28.3998L21.7873 29.5425C21.6292 29.2953 21.5454 29.0098 21.5454 28.7184V23.7217ZM26.3383 38.9073H14.356L17.5629 34.0442C17.7835 33.7096 18.2294 33.5929 18.6259 33.6864C19.2966 33.8445 20.2476 33.894 21.146 33.4561C22.4241 32.8331 23.2762 33.7157 23.5424 34.2348L26.3383 38.9073Z" fill="#465C68"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M19.9412 10.3794C19.9412 10.9967 19.4408 11.4971 18.8235 11.4971C18.2063 11.4971 17.7059 10.9967 17.7059 10.3794C17.7059 9.76217 18.2063 9.26178 18.8235 9.26178C19.4408 9.26178 19.9412 9.76217 19.9412 10.3794ZM22.7353 13.7324C23.6612 13.7324 24.4118 12.9818 24.4118 12.0559C24.4118 11.13 23.6612 10.3794 22.7353 10.3794C21.8094 10.3794 21.0588 11.13 21.0588 12.0559C21.0588 12.9818 21.8094 13.7324 22.7353 13.7324ZM19.3824 17.0853C20.3082 17.0853 21.0588 16.3347 21.0588 15.4088C21.0588 14.4829 20.3082 13.7324 19.3824 13.7324C18.4565 13.7324 17.7059 14.4829 17.7059 15.4088C17.7059 16.3347 18.4565 17.0853 19.3824 17.0853ZM22.3442 18.9457H18.3501C17.239 18.9457 16.7525 19.7025 16.7525 20.1642C16.7525 20.746 17.0797 21.2533 17.5645 21.5207C17.5558 21.5865 17.5513 21.6536 17.5513 21.7217V27.1963L11.2445 37.0567C10.581 38.0941 11.3461 39.4383 12.6002 39.4383H28.3998C29.6539 39.4383 30.419 38.0941 29.7555 37.0567L23.143 26.7184V21.7217C23.143 21.6536 23.1385 21.5865 23.1298 21.5207C23.6146 21.2533 23.9418 20.746 23.9418 20.1642C23.9418 19.7505 23.4553 18.9457 22.3442 18.9457ZM21.5454 21.7217L19.1489 21.7217V27.1963C19.1489 27.4877 19.0651 27.7732 18.907 28.0204L12.6002 37.8808H28.3998L21.7873 27.5425C21.6292 27.2953 21.5454 27.0098 21.5454 26.7184V21.7217ZM26.3383 36.9073H14.356L17.5629 32.0442C17.7835 31.7096 18.2294 31.5929 18.6259 31.6864C19.2966 31.8445 20.2476 31.894 21.146 31.4561C22.4241 30.8331 23.2762 31.7157 23.5424 32.2348L26.3383 36.9073Z" fill="white"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_160_30" x1="70" y1="0" x2="0" y2="70" gradientUnits="userSpaceOnUse">
-<stop stop-color="#CDC484"/>
-<stop offset="1" stop-color="#B5AA59"/>
-</linearGradient>
-<clipPath id="clip0_160_30">
-<rect width="70" height="70" fill="white"/>
-</clipPath>
-</defs>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M0 12h50v26a4 4 0 0 1-4 4H0V12Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M0 12h50v26a4 4 0 0 1-4 4H0V12Z" fill="url(#o_icon_payment_demo__a)" fill-opacity=".2"/><path d="M4 21a4 4 0 0 1-4-4v-5a4 4 0 0 1 4-4h46v9a4 4 0 0 1-4 4H4Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M4 21a4 4 0 0 1-4-4v-5a4 4 0 0 1 4-4h46v9a4 4 0 0 1-4 4H4Z" fill="url(#o_icon_payment_demo__b)" fill-opacity=".2"/><path d="M0 16h50v4a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4v-4Z" fill="var(--o-icons-purple-yellow, #912C18)"/><path d="M0 16h50v4a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4v-4Z" fill="url(#o_icon_payment_demo__c)" fill-opacity=".2"/><defs><linearGradient id="o_icon_payment_demo__a" x1="0" y1="12" x2="53.254" y2="34.189" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_payment_demo__b" x1="0" y1="8" x2="32.475" y2="39.226" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_payment_demo__c" x1="0" y1="16" x2="18.161" y2="44.377" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/payment_flutterwave/static/description/icon.png b/addons/payment_flutterwave/static/description/icon.png
index e4b7fdaea45..323e44ae40e 100644
Binary files a/addons/payment_flutterwave/static/description/icon.png and b/addons/payment_flutterwave/static/description/icon.png differ
diff --git a/addons/payment_flutterwave/static/description/icon.svg b/addons/payment_flutterwave/static/description/icon.svg
index 39fa2cfe167..004063de7db 100644
--- a/addons/payment_flutterwave/static/description/icon.svg
+++ b/addons/payment_flutterwave/static/description/icon.svg
@@ -1,80 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 26.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 70 70" style="enable-background:new 0 0 70 70;" xml:space="preserve">
-<style type="text/css">
-	.st0{filter:url(#Adobe_OpacityMaskFilter);}
-	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
-	.st2{mask:url(#b_00000056428700427525433750000007737325548001924286_);}
-	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
-	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;fill-opacity:0.383;}
-	.st5{opacity:0.324;fill-rule:evenodd;clip-rule:evenodd;fill:#393939;enable-background:new    ;}
-	.st6{fill-rule:evenodd;clip-rule:evenodd;fill-opacity:0.383;}
-	.st7{opacity:0.4;}
-	.st8{fill-rule:evenodd;clip-rule:evenodd;}
-	.st9{fill:#FFFFFF;}
-</style>
-<defs>
-	<filter id="Adobe_OpacityMaskFilter" filterUnits="userSpaceOnUse" x="0" y="0" width="70" height="70">
-		<feColorMatrix  type="matrix" values="1 0 0 0 0  0 1 0 0 0  0 0 1 0 0  0 0 0 1 0"/>
-	</filter>
-</defs>
-<mask maskUnits="userSpaceOnUse" x="0" y="0" width="70" height="70" id="b_00000056428700427525433750000007737325548001924286_">
-	<g class="st0">
-		<path id="a_00000138559125790419082090000007347613071121435547_" class="st1" d="M4,0h61c4,0,5,1,5,5v60c0,4-1,5-5,5H4
-			c-3,0-4-1-4-5V5C0,1,1,0,4,0z"/>
-	</g>
-</mask>
-<g class="st2">
-	
-		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-2234.6001" y1="1879.5037" x2="-2235.6001" y2="1878.5037" gradientTransform="matrix(70 0 0 -70 156492 131565.2656)">
-		<stop  offset="0" style="stop-color:#94B6C8"/>
-		<stop  offset="1" style="stop-color:#6A9EBA"/>
-	</linearGradient>
-	<path class="st3" d="M0,0h70v70H0V0z"/>
-	<path class="st4" d="M4,1h61c2.7,0,4.3,0.7,5,2V0H0v3C0.7,1.7,2,1,4,1z"/>
-	<path class="st5" d="M4,69c-2,0-4-1-4-4V31.9l12.6-12.5c5.9-2.4,10.9-1.3,15.3,3.3c10-7.1,15.8-7.6,11.3,8l7.5-7.4L56.7,24
-		l-0.5,23.9L35.2,69H4z"/>
-	<path class="st6" d="M4,69h61c2.7,0,4.3-1,5-3v4H0v-4C0.7,68,2,69,4,69z"/>
-	<g class="st7">
-		<polygon points="19.7,55.6 18.7,55.6 18.7,55 21.5,55 21.5,55.6 20.5,55.6 20.5,58.5 19.7,58.5 19.7,55.6 		"/>
-		<polygon points="21.7,55 22.7,55 23.6,57.4 23.6,57.4 24.3,55 25.4,55 25.4,58.5 24.7,58.5 24.7,56 24.7,56 23.8,58.5 23.2,58.5 
-			22.4,56 22.4,56 22.4,58.5 21.7,58.5 		"/>
-		<path d="M53.3,24.7h-9.9c0,0.9-0.2,1.8-0.4,2.7h10c0.2,0,0.3,0.2,0.3,0.3V31H41.6c-0.9,1.9-2.2,3.9-3.8,5.8c0,0.2,0,0.5,0.1,0.7
-			h15.4v9.7c0,0.1,0,0.2-0.1,0.2c-0.1,0.1-0.1,0.1-0.2,0.1H26.6c-0.1,0-0.2,0-0.2-0.1c-0.1-0.1-0.1-0.1-0.1-0.2v-1
-			c-0.3-0.1-0.7-0.2-1-0.3c-0.6,0.2-1.2,0.3-1.7,0.4v1.2c0,1.5,1.2,2.7,2.7,2.7h27.1c1.5,0,2.7-1.2,2.7-2.7V27.4
-			C56,25.9,54.8,24.7,53.3,24.7z"/>
-		<path id="path0_00000051376682181676208090000007751481062063305623_" class="st8" d="M34.3,18.7c-2.7,0.2-5.8,1.6-8.7,3.8
-			c-0.4,0.3-0.3,0.3-0.8-0.1c-6.2-4.5-12.3-4.9-14.2-1c-1.6,3.4,0.3,8.9,4.8,14c0.3,0.4,0.4,0.4,0.3,0.5c0,0-0.1,0.3-0.1,0.6
-			c-1,5.7,3.1,8.5,9.2,6.4c0.3-0.1,0.5-0.2,0.5-0.1c0,0,0.3,0.1,0.6,0.2c6.1,2.1,10.1-1,8.9-6.8l-0.1-0.3l0.3-0.3
-			c4.5-5,6.5-10.8,4.9-14.2C38.9,19.5,36.8,18.4,34.3,18.7 M16.5,21.2c1.9,0.3,4.5,1.5,6.6,3l0.2,0.1L23,24.5
-			c-2.7,2.4-5,5.6-6.3,8.4c-0.1,0.3-0.1,0.3-0.3,0c-3.5-4.4-4.9-8.9-3.3-10.9C13.7,21.3,14.9,21,16.5,21.2 M35.6,21.2
-			c1.1,0.2,1.8,0.7,2.1,1.6c0.8,2-0.4,5.6-2.9,9.1c-0.5,0.6-1,1.4-1.1,1.3c0,0-0.1-0.2-0.2-0.4c-1.2-2.6-3.4-5.6-5.8-7.9
-			c-0.3-0.3-0.5-0.5-0.5-0.5s0.2-0.2,0.4-0.3C30.6,21.9,33.6,20.9,35.6,21.2 M25.5,26.2c2.7,2.4,5,5.6,6.2,8.4
-			c0.2,0.6,0.3,0.5-0.2,1c-1.7,1.7-3.8,3.2-5.7,4.2c-0.6,0.3-0.5,0.3-1.2-0.1c-1.7-0.9-3.3-2-4.9-3.4c-0.6-0.5-1.2-1.1-1.2-1.2
-			c0,0,0-0.2,0.1-0.3c1-2.5,2.7-5.1,5-7.5c0.5-0.6,1.5-1.5,1.6-1.5C25.2,25.9,25.3,26,25.5,26.2 M18.4,38.5c1,0.9,2.2,1.8,3.3,2.4
-			c0.3,0.2,0.3,0.2-0.3,0.2c-2.2,0.2-3.4-0.8-3.5-2.8l0-0.3l0.1,0.1C18,38.1,18.2,38.3,18.4,38.5 M32.5,38.4c-0.1,2.1-1.4,3-3.8,2.7
-			c-0.2,0-0.2,0,0.2-0.2c1-0.6,2.3-1.6,3.3-2.5c0.2-0.2,0.3-0.3,0.3-0.3C32.5,38.1,32.5,38.2,32.5,38.4"/>
-	</g>
-	<g>
-		<polygon class="st9" points="21.7,53.6 20.7,53.6 20.7,53 23.5,53 23.5,53.6 22.5,53.6 22.5,56.5 21.7,56.5 21.7,53.6 		"/>
-		<polygon class="st9" points="23.7,53 24.7,53 25.6,55.4 25.6,55.4 26.3,53 27.4,53 27.4,56.5 26.7,56.5 26.7,54 26.7,54 
-			25.8,56.5 25.2,56.5 24.4,54 24.4,54 24.4,56.5 23.7,56.5 		"/>
-		<path class="st9" d="M55.3,22.7h-9.9c0,0.9-0.2,1.8-0.4,2.7h10c0.2,0,0.3,0.2,0.3,0.3V29H43.6c-0.9,1.9-2.2,3.9-3.8,5.8
-			c0,0.2,0,0.5,0.1,0.7h15.4v9.7c0,0.1,0,0.2-0.1,0.2c-0.1,0.1-0.1,0.1-0.2,0.1H28.6c-0.1,0-0.2,0-0.2-0.1c-0.1-0.1-0.1-0.1-0.1-0.2
-			v-1c-0.3-0.1-0.7-0.2-1-0.3c-0.6,0.2-1.2,0.3-1.7,0.4v1.2c0,1.5,1.2,2.7,2.7,2.7h27.1c1.5,0,2.7-1.2,2.7-2.7V25.4
-			C58,23.9,56.8,22.7,55.3,22.7z"/>
-		<path id="path0_00000123403326104996206480000014033077542406494338_" class="st1" d="M36.3,16.7c-2.7,0.2-5.8,1.6-8.7,3.8
-			c-0.4,0.3-0.3,0.3-0.8-0.1c-6.2-4.5-12.3-4.9-14.2-1c-1.6,3.4,0.3,8.9,4.8,14c0.3,0.4,0.4,0.4,0.3,0.5c0,0-0.1,0.3-0.1,0.6
-			c-1,5.7,3.1,8.5,9.2,6.4c0.3-0.1,0.5-0.2,0.5-0.1c0,0,0.3,0.1,0.6,0.2c6.1,2.1,10.1-1,8.9-6.8l-0.1-0.3l0.3-0.3
-			c4.5-5,6.5-10.8,4.9-14.2C40.9,17.5,38.8,16.4,36.3,16.7 M18.5,19.2c1.9,0.3,4.5,1.5,6.6,3l0.2,0.1L25,22.5
-			c-2.7,2.4-5,5.6-6.3,8.4c-0.1,0.3-0.1,0.3-0.3,0c-3.5-4.4-4.9-8.9-3.3-10.9C15.7,19.3,16.9,19,18.5,19.2 M37.6,19.2
-			c1.1,0.2,1.8,0.7,2.1,1.6c0.8,2-0.4,5.6-2.9,9.1c-0.5,0.6-1,1.4-1.1,1.3c0,0-0.1-0.2-0.2-0.4c-1.2-2.6-3.4-5.6-5.8-7.9
-			c-0.3-0.3-0.5-0.5-0.5-0.5c0,0,0.2-0.2,0.4-0.3C32.6,19.9,35.6,18.9,37.6,19.2 M27.5,24.2c2.7,2.4,5,5.6,6.2,8.4
-			c0.2,0.6,0.3,0.5-0.2,1c-1.7,1.7-3.8,3.2-5.7,4.2c-0.6,0.3-0.5,0.3-1.2-0.1c-1.7-0.9-3.3-2-4.9-3.4c-0.6-0.5-1.2-1.1-1.2-1.2
-			c0,0,0-0.2,0.1-0.3c1-2.5,2.7-5.1,5-7.5c0.5-0.6,1.5-1.5,1.6-1.5C27.2,23.9,27.3,24,27.5,24.2 M20.4,36.5c1,0.9,2.2,1.8,3.3,2.4
-			c0.3,0.2,0.3,0.2-0.3,0.2c-2.2,0.2-3.4-0.8-3.5-2.8l0-0.3l0.1,0.1C20,36.1,20.2,36.3,20.4,36.5 M34.5,36.4c-0.1,2.1-1.4,3-3.8,2.7
-			c-0.2,0-0.2,0,0.2-0.2c1-0.6,2.3-1.6,3.3-2.5c0.2-0.2,0.3-0.3,0.3-0.3C34.5,36.1,34.5,36.2,34.5,36.4"/>
-	</g>
-</g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M43.105 50h.972v-3.182h1.108V46H42v.818h1.105V50Zm2.775 0h.858v-2.547h.053L47.663 50h.555l.871-2.547h.056V50H50v-4h-1.108l-.924 2.714h-.05L46.99 46h-1.11v4Z" fill="#D1D5DB"/><path d="M4 15.425c0-2.209.644-4.089 2.027-5.428l2.385 2.35c-2.647 2.608-.334 10.715 7.227 18.164 7.56 7.448 15.79 9.728 18.436 7.12l2.386 2.35c-4.484 4.417-14.668 1.268-23.207-7.12C7.339 27.01 4 20.406 4 15.424Z" fill="#009A46"/><path d="M19.05 42c-2.242 0-4.15-.634-5.51-1.997l2.385-2.35c2.648 2.608 10.876.329 18.436-7.12 7.561-7.449 9.875-15.555 7.227-18.164l2.385-2.35c4.484 4.418 1.288 14.452-7.226 22.864C30.807 38.71 24.082 42 19.049 42Z" fill="#FF5805"/><path d="M37.51 29.522c-1.455-4.112-4.412-8.506-8.323-12.36C20.648 8.75 10.463 5.625 5.98 10.019c-.31.329-.024 1.104.62 1.739.644.634 1.455.916 1.765.61 2.647-2.608 10.876-.329 18.437 7.12 3.577 3.525 6.248 7.473 7.536 11.115 1.121 3.195 1.026 5.78-.286 7.073-.31.305-.048 1.08.62 1.738.668.658 1.455.917 1.765.611 2.29-2.279 2.671-6.015 1.073-10.503Z" fill="#F5AFCB"/><path d="M43.95 10.02c-2.29-2.256-6.083-2.632-10.638-1.08-4.174 1.433-8.634 4.346-12.545 8.2-8.539 8.412-11.71 18.446-7.227 22.863.31.306 1.121.047 1.765-.61.644-.659.93-1.434.62-1.74-2.647-2.608-.334-10.714 7.227-18.163 3.577-3.525 7.584-6.157 11.257-7.425 3.244-1.105 5.867-1.01 7.18.282.31.305 1.096.046 1.764-.611.668-.658.93-1.387.596-1.716Z" fill="#FF9B00"/></svg>
diff --git a/addons/payment_mercado_pago/static/description/icon.png b/addons/payment_mercado_pago/static/description/icon.png
index b5a9b4b4dc1..780835c6af2 100644
Binary files a/addons/payment_mercado_pago/static/description/icon.png and b/addons/payment_mercado_pago/static/description/icon.png differ
diff --git a/addons/payment_mercado_pago/static/description/icon.svg b/addons/payment_mercado_pago/static/description/icon.svg
index 702eac660ef..06f5c3ab9d3 100644
--- a/addons/payment_mercado_pago/static/description/icon.svg
+++ b/addons/payment_mercado_pago/static/description/icon.svg
@@ -1,26 +1 @@
-<svg width="70" height="70" viewBox="0 0 70 70" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <mask id="mask0_3_265" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="70" height="70">
-    <path d="M4 0H65C69 0 70 1 70 5V65C70 69 69 70 65 70H4C1 70 0 69 0 65V5C0 1 1 0 4 0Z" fill="white"/>
-    </mask>
-    <g mask="url(#mask0_3_265)">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H70V70H0V0Z" fill="url(#paint0_linear_3_265)"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M4 1H65C67.667 1 69.333 1.667 70 3V0H0V3C0.667 1.667 2 1 4 1Z" fill="white" fill-opacity="0.383"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M4 69H65C67.667 69 69.333 68 70 66V70H0V66C0.667 68 2 69 4 69Z" fill="black" fill-opacity="0.383"/>
-    </g>
-    <path opacity="0.324" fill-rule="evenodd" clip-rule="evenodd" d="M4 69C2 69 0 68 0 65V33.916L8.01445 22.7066H13.6388L16.8306 19.9728L27.1533 19.9728L30.3274 22.7132H34.666H48.107L51.576 24.968L51.34 46.978L39.224 69H4Z" fill="#393939"/>
-    <path d="M27.0181 21.75H23.26C22.91 21.75 22.5731 21.8789 22.315 22.1109L18.0144 25.9781C18.01 25.9824 18.0056 25.991 18.0013 25.9953C17.275 26.6656 17.2881 27.7355 17.9094 28.4016C18.465 28.9988 19.6331 29.1578 20.3638 28.5176C20.3681 28.5133 20.3769 28.5133 20.3812 28.509L23.8769 25.3637C24.1612 25.1102 24.6075 25.1273 24.8656 25.4066C25.1281 25.6859 25.1062 26.1199 24.8219 26.3777L23.68 27.4047L30.05 32.4836C30.1769 32.5867 30.2906 32.6984 30.3956 32.8145V24.5L28.0069 22.1539C27.7487 21.8961 27.39 21.75 27.0181 21.75ZM31.8 24.5086V34.1293C31.8 34.8898 32.4256 35.5043 33.2 35.5043H36V24.5086H31.8ZM8 35.5H10.8C11.5744 35.5 12.2 34.8855 12.2 34.125V24.5086H8V35.5ZM29.1706 33.5535L22.6388 28.3457L21.3263 29.5273C20.0269 30.6918 18.0362 30.5801 16.8769 29.3383C15.7 28.075 15.7919 26.1199 17.0694 24.9684L20.6481 21.75H16.9819C16.61 21.75 16.2556 21.8961 15.9931 22.1539L13.6 24.5V34.1207H14.4006L18.36 37.6398C19.5587 38.598 21.3219 38.4176 22.2975 37.2402L22.3062 37.2316L23.0894 37.8977C23.785 38.4562 24.8131 38.3488 25.3775 37.6656L26.7512 36.007L26.9875 36.1961C27.5869 36.673 28.4706 36.5871 28.9562 35.9941L29.3719 35.4914C29.8619 34.8984 29.77 34.0348 29.1706 33.5535Z" fill="#41535E"/>
-    <path d="M27.0181 19.9497H23.26C22.91 19.9497 22.5731 20.0786 22.315 20.3106L18.0144 24.1778C18.01 24.1821 18.0056 24.1907 18.0013 24.195C17.275 24.8653 17.2881 25.9352 17.9094 26.6012C18.465 27.1985 19.6331 27.3575 20.3638 26.7172C20.3681 26.7129 20.3769 26.7129 20.3812 26.7086L23.8769 23.5633C24.1612 23.3098 24.6075 23.327 24.8656 23.6063C25.1281 23.8856 25.1062 24.3196 24.8219 24.5774L23.68 25.6043L30.05 30.6832C30.1769 30.7864 30.2906 30.8981 30.3956 31.0141V22.6997L28.0069 20.3536C27.7487 20.0957 27.39 19.9497 27.0181 19.9497ZM31.8 22.7082V32.329C31.8 33.0895 32.4256 33.704 33.2 33.704H36V22.7082H31.8ZM8 33.6997H10.8C11.5744 33.6997 12.2 33.0852 12.2 32.3247V22.7082H8V33.6997ZM29.1706 31.7532L22.6388 26.5454L21.3263 27.727C20.0269 28.8915 18.0362 28.7797 16.8769 27.5379C15.7 26.2747 15.7919 24.3196 17.0694 23.168L20.6481 19.9497H16.9819C16.61 19.9497 16.2556 20.0957 15.9931 20.3536L13.6 22.6997V32.3204H14.4006L18.36 35.8395C19.5587 36.7977 21.3219 36.6172 22.2975 35.4399L22.3062 35.4313L23.0894 36.0973C23.785 36.6559 24.8131 36.5485 25.3775 35.8653L26.7512 34.2067L26.9875 34.3957C27.5869 34.8727 28.4706 34.7868 28.9562 34.1938L29.3719 33.6911C29.8619 33.0981 29.77 32.2344 29.1706 31.7532Z" fill="white"/>
-    <path d="M19.2612 43.3711L19.25 47.555C19.25 49.069 20.464 50.297 21.964 50.297H49.036C50.537 50.297 51.75 49.069 51.75 47.555V27.445C51.75 25.931 50.536 24.703 49.036 24.703H39.0229V27.445H48.697C48.7874 27.4458 48.8737 27.4823 48.9372 27.5466C49.0008 27.6109 49.0363 27.6976 49.036 27.788V31H39.0229V37.5H49.036V47.212C49.0363 47.3024 49.0008 47.3892 48.9372 47.4534C48.8737 47.5177 48.7874 47.5542 48.697 47.555H22.303C22.116 47.555 21.964 47.4 21.964 47.212V42.4767C20.9467 43.2767 20.0327 43.4848 19.2612 43.3711Z" fill="#41535E"/>
-    <path d="M14.423 55.642H15.459V58.474H16.219V55.642H17.256V55H14.423V55.642Z" fill="#41535E"/>
-    <path d="M18.492 55H17.422V58.474H18.133V56.036H18.143L18.991 58.474H19.577L20.424 56.012H20.434V58.474H21.145V55H20.075L19.311 57.389H19.301L18.492 55Z" fill="#41535E"/>
-    <path d="M19.2612 41.3711L19.25 45.555C19.25 47.069 20.464 48.297 21.964 48.297H49.036C50.537 48.297 51.75 47.069 51.75 45.555V25.445C51.75 23.931 50.536 22.703 49.036 22.703H39.0229V25.445H48.697C48.7874 25.4458 48.8737 25.4823 48.9372 25.5466C49.0008 25.6109 49.0363 25.6976 49.036 25.788V29H39.0229V35.5H49.036V45.212C49.0363 45.3024 49.0008 45.3892 48.9372 45.4534C48.8737 45.5177 48.7874 45.5542 48.697 45.555H22.303C22.116 45.555 21.964 45.4 21.964 45.212V40.4767C20.9467 41.2767 20.0327 41.4848 19.2612 41.3711Z" fill="white"/>
-    <path d="M14.423 53.642H15.459V56.474H16.219V53.642H17.256V53H14.423V53.642Z" fill="white"/>
-    <path d="M18.492 53H17.422V56.474H18.133V54.036H18.143L18.991 56.474H19.577L20.424 54.012H20.434V56.474H21.145V53H20.075L19.311 55.389H19.301L18.492 53Z" fill="white"/>
-    <defs>
-    <linearGradient id="paint0_linear_3_265" x1="70" y1="0" x2="0" y2="70" gradientUnits="userSpaceOnUse">
-    <stop stop-color="#94B6C8"/>
-    <stop offset="1" stop-color="#6A9EBA"/>
-    <stop offset="1" stop-color="#6A9EBA"/>
-    </linearGradient>
-    </defs>
-    </svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M43.105 4h.972V.818h1.108V0H42v.818h1.105V4Zm2.775 0h.858V1.453h.053L47.663 4h.555l.871-2.547h.056V4H50V0h-1.108l-.924 2.714h-.05L46.99 0h-1.11v4Z" fill="#D1D5DB"/><path d="M49 24.07C49 15.234 38.26 8 25 8S1 15.234 1 24.07V25c0 9.404 9.378 17 24 17 14.672 0 24-7.596 24-17v-.93Z" fill="#2D3277"/><path d="M48.143 24.07c0 8.32-10.337 15.089-23.042 15.089-12.706 0-23.042-6.77-23.042-15.088 0-8.32 10.336-15.089 23.042-15.089 12.706 0 23.042 6.77 23.042 15.089Z" fill="#52BAF9"/><path d="M17.437 19.317s-.252.258-.1.465c.352.465 1.462.723 2.621.465.656-.155 1.563-.878 2.37-1.55.908-.724 1.815-1.499 2.723-1.757.958-.31 1.563-.155 1.966-.052.454.155.958.465 1.815 1.085 1.563 1.189 7.916 6.873 9.026 7.855.857-.414 4.79-2.119 10.134-3.36-.454-2.893-2.168-5.58-4.79-7.75-3.63 1.55-8.118 2.377-12.504.207 0 0-2.37-1.137-4.74-1.085-3.479.103-4.94 1.601-6.554 3.255l-1.967 2.222Z" fill="#fff"/><path d="M37.605 26.447c-.05-.051-7.462-6.665-9.126-7.957-.958-.724-1.512-.93-2.067-1.034-.303-.051-.706 0-1.008.104-.757.206-1.816.93-2.723 1.653-.958.775-1.815 1.499-2.622 1.654-1.059.258-2.32-.052-2.874-.465a1.328 1.328 0 0 1-.504-.569c-.202-.516.201-.93.252-.981l2.017-2.274.706-.723c-.656.103-1.26.258-1.866.413-.756.207-1.462.413-2.168.413-.303 0-1.916-.258-2.219-.361-1.865-.517-3.479-1.034-5.899-2.17-2.874 2.221-4.84 4.96-5.395 8.008.404.104 1.11.31 1.362.362 6.554 1.499 8.571 3.049 8.974 3.359a2.074 2.074 0 0 1 1.614-.724 2.18 2.18 0 0 1 1.765.93c.353-.31.907-.568 1.563-.568.302 0 .605.052.958.155.756.258 1.109.775 1.31 1.24.253-.103.555-.206.908-.206s.706.103 1.11.258c1.21.517 1.411 1.757 1.31 2.687h.252c1.463 0 2.622 1.188 2.622 2.687 0 .465-.1.878-.302 1.24.403.207 1.361.723 2.269.62.706-.103.958-.31 1.058-.465.05-.103.152-.207.05-.31l-1.865-2.119s-.302-.31-.201-.413c.1-.103.302.052.454.155.957.827 2.067 2.015 2.067 2.015s.1.155.504.259c.353.051 1.008 0 1.462-.362.1-.103.252-.207.303-.31.453-.62-.05-1.24-.05-1.24l-2.169-2.48s-.302-.31-.202-.414c.101-.103.303.052.454.155.706.569 1.664 1.602 2.572 2.532.201.155 1.008.672 2.067-.052.655-.465.807-.981.756-1.395-.05-.516-.454-.93-.454-.93l-2.924-3.048s-.302-.259-.202-.414c.101-.103.303.052.454.155.958.827 3.48 3.204 3.48 3.204.05 0 .907.672 2.016-.052.403-.258.655-.62.655-1.085.05-.672-.504-1.137-.504-1.137Z" fill="#fff"/><path d="M23.336 30.323c-.454 0-.958.258-1.009.258-.05 0 0-.207.05-.31.051-.103.656-1.963-.806-2.635-1.11-.517-1.815.051-2.017.31-.05.051-.1.051-.1 0 0-.31-.152-1.24-1.16-1.55-1.412-.465-2.27.568-2.521.93-.101-.827-.756-1.447-1.614-1.447-.907 0-1.613.723-1.613 1.653s.706 1.654 1.613 1.654c.454 0 .807-.155 1.11-.465v.052c-.05.413-.202 1.911 1.31 2.48.606.258 1.11.052 1.564-.259.15-.103.15-.051.15.052-.05.362 0 1.188 1.16 1.654.858.361 1.362 0 1.664-.31.152-.156.202-.104.202.103.05 1.085.958 1.963 2.017 1.963 1.11 0 2.017-.93 2.017-2.067 0-1.136-.908-2.066-2.017-2.066Z" fill="#fff"/><path d="M37.907 25.672c-2.269-2.015-7.512-6.717-8.975-7.802-.806-.62-1.36-.982-1.865-1.085-.202-.052-.504-.155-.908-.155-.353 0-.756.052-1.16.207-.907.31-1.814 1.033-2.722 1.756l-.05.052c-.807.672-1.664 1.343-2.32 1.498-.302.052-.554.104-.857.104-.706 0-1.361-.207-1.613-.517-.05-.052 0-.155.1-.258l2.017-2.222c1.563-1.602 3.026-3.1 6.454-3.204h.151c2.118 0 4.236.982 4.488 1.085 2.017.982 4.033 1.499 6.1 1.499 2.169 0 4.387-.569 6.706-1.654-.252-.206-.554-.465-.806-.671-2.067.93-3.983 1.343-5.9 1.343-1.915 0-3.831-.465-5.697-1.395-.1-.052-2.42-1.188-4.89-1.188h-.202c-2.874.051-4.488 1.085-5.546 2.015-1.06 0-1.967.31-2.774.516-.706.207-1.361.362-1.966.362h-.756c-.706 0-4.236-.878-7.009-2.015-.302.207-.554.413-.857.62 2.924 1.24 6.504 2.17 7.614 2.274.302 0 .655.051 1.008.051.756 0 1.462-.207 2.218-.413.454-.104.908-.259 1.362-.362l-.404.413-2.016 2.274c-.152.155-.505.62-.303 1.137.1.206.303.413.555.62.504.31 1.361.568 2.168.568.302 0 .605-.051.857-.103.857-.207 1.765-.93 2.672-1.705.757-.62 1.815-1.395 2.622-1.654.252-.051.504-.103.756-.103h.202c.555.052 1.059.258 2.017.982 1.664 1.291 9.075 7.905 9.126 7.957 0 0 .454.414.454 1.137 0 .362-.252.723-.605.982a1.76 1.76 0 0 1-.958.31c-.505 0-.858-.259-.858-.259s-2.57-2.377-3.478-3.203c-.152-.155-.303-.259-.454-.259-.101 0-.152.052-.202.104-.151.206 0 .465.202.62l2.975 3.048s.352.362.403.827c0 .517-.202.93-.706 1.24a1.748 1.748 0 0 1-1.059.362c-.454 0-.756-.207-.857-.258l-.454-.414c-.756-.775-1.563-1.602-2.168-2.067-.151-.103-.302-.258-.454-.258-.05 0-.15 0-.201.103-.05.052-.101.207.05.465.05.104.151.155.151.155l2.168 2.48s.454.569.05 1.034l-.1.103-.202.207c-.353.31-.857.362-1.059.362h-.302c-.202-.052-.353-.103-.454-.207-.1-.155-1.21-1.24-2.117-2.015-.101-.103-.252-.207-.404-.207a.379.379 0 0 0-.201.104c-.152.206.1.516.201.62l1.866 2.067s0 .051-.05.155c-.051.103-.303.31-.959.413h-.252c-.706 0-1.412-.362-1.815-.569.151-.361.252-.774.252-1.188 0-1.55-1.21-2.79-2.722-2.79h-.101c.05-.724-.05-2.067-1.412-2.635-.403-.155-.756-.259-1.16-.259-.302 0-.554.052-.857.155-.302-.568-.756-.981-1.361-1.188a3.414 3.414 0 0 0-1.009-.155c-.554 0-1.058.155-1.512.516a2.298 2.298 0 0 0-3.429-.206c-.554-.465-2.823-1.912-8.924-3.359-.303-.052-.958-.258-1.361-.413-.05.31-.101.672-.152 1.033 0 0 1.11.259 1.362.31 6.201 1.395 8.268 2.894 8.621 3.152-.1.31-.15.62-.15.93 0 1.344 1.058 2.377 2.319 2.377.15 0 .302 0 .453-.051.202.981.807 1.705 1.765 2.066.302.104.555.155.807.155.151 0 .353 0 .554-.051.152.465.555 1.033 1.462 1.395.303.155.606.206.908.206.252 0 .504-.051.706-.154.403 1.033 1.412 1.756 2.521 1.756.756 0 1.462-.31 1.966-.878.454.258 1.362.723 2.32.723h.353c.958-.103 1.361-.516 1.563-.775.05-.051.05-.103.1-.155.202.052.454.104.757.104.504 0 1.008-.155 1.512-.569.505-.361.857-.878.857-1.343.152.051.354.051.505.051.504 0 1.059-.155 1.563-.516a2.32 2.32 0 0 0 1.109-2.015c.151.051.353.051.504.051a2.58 2.58 0 0 0 1.462-.465c.605-.413.958-.982 1.009-1.653.05-.465-.101-.93-.303-1.344 1.614-.723 5.244-2.067 9.58-3.1 0-.362-.05-.672-.151-1.034-5.193 1.137-9.076 2.842-10.034 3.307Zm-14.571 8.63c-1.009 0-1.815-.827-1.866-1.86 0-.104 0-.31-.201-.31-.101 0-.152.051-.252.103-.202.206-.505.413-.908.413a1.32 1.32 0 0 1-.605-.155c-1.059-.465-1.11-1.188-1.059-1.498 0-.104 0-.155-.05-.207l-.05-.052h-.051c-.05 0-.101 0-.202.104-.302.206-.605.31-.907.31-.152 0-.353-.052-.505-.104-1.411-.568-1.31-1.912-1.21-2.325 0-.103 0-.155-.05-.207l-.101-.103-.1.103c-.303.259-.656.414-1.01.414-.806 0-1.461-.672-1.461-1.499 0-.826.655-1.498 1.462-1.498.706 0 1.361.568 1.462 1.291l.05.414.202-.362c0-.052.605-.982 1.714-.93.202 0 .404.052.656.104.857.258 1.008 1.085 1.008 1.395 0 .206.151.206.151.206.05 0 .152-.051.152-.103a1.47 1.47 0 0 1 1.059-.465c.252 0 .504.052.806.207 1.362.62.757 2.377.757 2.428-.101.31-.152.413 0 .517h.1c.05 0 .152 0 .252-.052.202-.052.454-.155.706-.155 1.009 0 1.866.879 1.866 1.912.05 1.137-.807 1.964-1.815 1.964Z" fill="#2D3277"/></svg>
diff --git a/addons/payment_mollie/static/description/icon.png b/addons/payment_mollie/static/description/icon.png
index 49bbfb417c4..3bf9d9c3cda 100644
Binary files a/addons/payment_mollie/static/description/icon.png and b/addons/payment_mollie/static/description/icon.png differ
diff --git a/addons/payment_mollie/static/description/icon.svg b/addons/payment_mollie/static/description/icon.svg
index 37e4cd4fd7a..8cd7924642e 100644
--- a/addons/payment_mollie/static/description/icon.svg
+++ b/addons/payment_mollie/static/description/icon.svg
@@ -1,25 +1 @@
-<svg width="70" height="70" viewBox="0 0 70 70" fill="none" xmlns="http://www.w3.org/2000/svg">
-<mask id="mask0_10_298" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="70" height="70">
-<path d="M4 0H65C69 0 70 1 70 5V65C70 69 69 70 65 70H4C1 70 0 69 0 65V5C0 1 1 0 4 0Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_10_298)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H70V70H0V0Z" fill="url(#paint0_linear_10_298)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 1H65C67.667 1 69.333 1.667 70 3V0H0V3C0.667 1.667 2 1 4 1Z" fill="white" fill-opacity="0.383"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 69H65C67.667 69 69.333 68 70 66V70H0V66C0.667 68 2 69 4 69Z" fill="black" fill-opacity="0.383"/>
-</g>
-<path opacity="0.324" fill-rule="evenodd" clip-rule="evenodd" d="M4 69C2 69 0 68 0 65V33.916C0 33.916 11 24 12.5 23C14 22 15 22 16 22C17 22 21 25 21 25L26 22.5L37.25 22.703L48 23L51.576 24.968L51.34 46.978L39.224 69H4Z" fill="#393939"/>
-<path d="M8.57797 31.1558H8.58035C8.58035 27.3204 11.4955 24.1137 15.1952 24.0029C17.2714 23.9409 19.2616 24.8628 20.6017 26.5074C21.848 24.9821 23.7079 24.0066 25.7887 24.0066C29.5394 24.0066 32.578 27.1495 32.578 31.0365V40H29.4183V31.1558C29.4183 29.0881 27.7863 27.3463 25.791 27.366C23.8362 27.394 22.261 29.0351 22.2444 31.0611V39.9988H18.997V31.1373C18.997 29.0758 17.3685 27.3364 15.378 27.3537C13.4245 27.3769 11.8462 29.012 11.8231 31.0365V40H8.57797V31.1558Z" fill="#465C68"/>
-<path d="M8.57797 29.1558H8.58035C8.58035 25.3204 11.4955 22.1137 15.1952 22.0029C17.2714 21.9409 19.2616 22.8628 20.6017 24.5074C21.848 22.9821 23.7079 22.0066 25.7887 22.0066C29.5394 22.0066 32.578 25.1495 32.578 29.0365V38H29.4183V29.1558C29.4183 27.0881 27.7863 25.3463 25.791 25.366C23.8362 25.394 22.261 27.0351 22.2444 29.0611V37.9988H18.997V29.1373C18.997 27.0758 17.3685 25.3364 15.378 25.3537C13.4245 25.3769 11.8462 27.012 11.8231 29.0365V38H8.57797V29.1558Z" fill="white"/>
-<path d="M35 31V37.5H49.036V47.212C49.0363 47.3024 49.0008 47.3892 48.9372 47.4534C48.8737 47.5177 48.7873 47.5542 48.697 47.555H22.303C22.116 47.555 21.964 47.4 21.964 47.212V43H19.2622L19.25 47.555C19.25 49.069 20.464 50.297 21.964 50.297H49.036C50.537 50.297 51.75 49.069 51.75 47.555V27.445C51.75 25.931 50.536 24.703 49.036 24.703H33.1081C33.7772 25.4932 34.2966 26.423 34.6205 27.445H48.697C48.7873 27.4458 48.8737 27.4823 48.9372 27.5466C49.0008 27.6108 49.0363 27.6976 49.036 27.788V31H35Z" fill="#465C68"/>
-<path d="M14.423 55.642H15.459V58.474H16.219V55.642H17.256V55H14.423V55.642Z" fill="#465C68"/>
-<path d="M17.422 55H18.492L19.301 57.389H19.311L20.075 55H21.145V58.474H20.434V56.012H20.424L19.577 58.474H18.991L18.143 56.036H18.133V58.474H17.422V55Z" fill="#465C68"/>
-<path d="M35 29V35.5H49.036V45.212C49.0363 45.3024 49.0008 45.3892 48.9372 45.4534C48.8737 45.5177 48.7873 45.5542 48.697 45.555H22.303C22.116 45.555 21.964 45.4 21.964 45.212V41H19.2622L19.25 45.555C19.25 47.069 20.464 48.297 21.964 48.297H49.036C50.537 48.297 51.75 47.069 51.75 45.555V25.445C51.75 23.931 50.536 22.703 49.036 22.703H33.1081C33.7772 23.4932 34.2966 24.423 34.6205 25.445H48.697C48.7873 25.4458 48.8737 25.4823 48.9372 25.5466C49.0008 25.6108 49.0363 25.6976 49.036 25.788V29H35Z" fill="white"/>
-<path d="M14.423 53.642H15.459V56.474H16.219V53.642H17.256V53H14.423V53.642Z" fill="white"/>
-<path d="M17.422 53H18.492L19.301 55.389H19.311L20.075 53H21.145V56.474H20.434V54.012H20.424L19.577 56.474H18.991L18.143 54.036H18.133V56.474H17.422V53Z" fill="white"/>
-<defs>
-<linearGradient id="paint0_linear_10_298" x1="70" y1="0" x2="0" y2="70" gradientUnits="userSpaceOnUse">
-<stop stop-color="#797C79"/>
-<stop offset="1" stop-color="#545554"/>
-</linearGradient>
-</defs>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M37.694 20.15c.857 0 1.551-.705 1.551-1.575S38.551 17 37.694 17s-1.551.705-1.551 1.575.694 1.575 1.551 1.575Zm-16.546 1.748c-2.746 0-4.974 2.269-4.974 5.051 0 2.783 2.233 5.051 4.974 5.051 2.74 0 4.974-2.268 4.974-5.05 0-2.783-2.229-5.052-4.974-5.052Zm0 7.713c-1.443 0-2.616-1.192-2.616-2.657 0-1.464 1.173-2.656 2.616-2.656 1.442 0 2.616 1.192 2.616 2.657 0 1.464-1.174 2.656-2.616 2.656ZM10.61 21.888a4.22 4.22 0 0 1 3.196 1.45 4.523 4.523 0 0 1 1.132 2.997v5.46h-2.379v-5.528c-.005-1.087-.889-1.974-1.964-1.974-.062 0-.13.005-.197.01-.962.1-1.768 1.024-1.768 2.021v5.471H6.25v-5.513c-.005-1.092-.884-1.984-1.96-1.984-.061 0-.129.005-.196.01-.956.1-1.768 1.024-1.768 2.027v5.46H0v-5.528c0-2.415 1.939-4.379 4.317-4.379 1.19 0 2.322.504 3.14 1.38a4.29 4.29 0 0 1 3.153-1.38Zm19.173-4.652h-2.379v14.57h2.379v-14.57Zm2.172 0h2.378v14.57h-2.378v-14.57Zm6.928 4.904h-2.378v9.66h2.378v-9.66Zm9.736 1.176A4.872 4.872 0 0 1 50 26.724v1.107h-7.234a2.678 2.678 0 0 0 2.575 1.985c.947 0 1.8-.488 2.29-1.313l.099-.162 1.965.981-.114.195c-.894 1.527-2.534 2.478-4.281 2.478h-.005a4.896 4.896 0 0 1-3.532-1.507 5.054 5.054 0 0 1-1.442-3.607 5.075 5.075 0 0 1 1.453-3.512 4.895 4.895 0 0 1 3.453-1.481h.063c1.256 0 2.435.51 3.33 1.428Zm-1.023 2.52c-.342-1.029-1.314-1.753-2.4-1.753-1.085 0-2.057.724-2.393 1.753h4.793Z"/><path d="M43.105 4h.972V.818h1.108V0H42v.818h1.105V4Zm2.775 0h.858V1.453h.053L47.663 4h.555l.871-2.547h.056V4H50V0h-1.108l-.924 2.714h-.05L46.99 0h-1.11v4Z" fill="#D1D5DB"/></svg>
diff --git a/addons/payment_ogone/static/description/icon.png b/addons/payment_ogone/static/description/icon.png
index 1d0d993cba4..a3eee1c983e 100644
Binary files a/addons/payment_ogone/static/description/icon.png and b/addons/payment_ogone/static/description/icon.png differ
diff --git a/addons/payment_ogone/static/description/icon.svg b/addons/payment_ogone/static/description/icon.svg
index 46e660daab6..7837ac32607 100644
--- a/addons/payment_ogone/static/description/icon.svg
+++ b/addons/payment_ogone/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#94B6C8"/><stop offset="100%" stop-color="#6A9EBA"/></linearGradient><path id="d" d="M19.25 42h2.714v5.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V37.5H30.732c.389-3.667-.582-5.833-2.914-6.5h21.218v-3.212a.342.342 0 0 0-.339-.343H29.765c.361-1.01.57-1.924.627-2.742h18.644c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V42zm-3.79 13.642h-1.037V55h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 55h1.07l.809 2.389h.01L20.075 55h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V55zm17.403-34.99c.985.007-2.543 2.376-2.271 2.073h-5.692c.113.126.201.23.298.334 1.214 1.315 1.076 3.081.239 4.432-.597.965-1.488 1.586-2.49 2.049-1.103.518-2.277.747-3.475.909a85.771 85.771 0 0 0-3.555.56c-.274.046-.546.186-.782.34-.383.25-.375.645.047.811.595.23 1.216.411 1.843.532 1.768.343 3.567.532 5.295 1.073.842.265 1.651.598 2.341 1.182 1.138.972 1.222 2.65.013 3.726-.948.85-2.094 1.272-3.295 1.557-1.024.243-2.063.36-3.117.396-2.206.076-4.376-.11-6.481-.823-.77-.265-1.497-.614-2.09-1.2-.333-.322-.582-.69-.64-1.174-.08-.656.198-1.127.696-1.496.701-.517 1.51-.775 2.335-.97.797-.192 1.606-.33 2.345-.482-.471-.161-1.025-.314-1.546-.545-.407-.185-.812-.406-1.146-.7-.655-.571-.655-1.42-.049-2.06.442-.468.997-.76 1.586-.974.513-.192 1.041-.34 1.567-.51-.328-.148-.676-.29-1.004-.459-.748-.39-1.42-.886-1.821-1.658-.777-1.496-.475-2.903.467-4.197.908-1.243 2.204-1.916 3.634-2.345a9.62 9.62 0 0 1 2.742-.387c4.671 0 9.339-.013 14.006.007zM18.778 34.016c-1.03.185-2.057.453-3.064.787-.495.16-.972.475-1.405.82-.421.333-.405.865.006 1.224.269.235.58.424.893.553 1.223.505 2.505.489 4.007.601.526-.08 1.283-.165 2.03-.322.546-.114 1.073-.34 1.483-.845.381-.462.363-.962-.063-1.357a2.674 2.674 0 0 0-.689-.487 25.158 25.158 0 0 0-1.952-.725c-.408-.133-.846-.318-1.246-.249zm4.666-7.55c.368-.527.59-1.137.552-1.813-.061-1.064-.609-1.772-1.446-2.208a3.71 3.71 0 0 0-2.357-.396c-1.155.18-2.127.73-2.802 1.824-.64 1.036-.479 2.313.366 3.145.737.729 1.629.933 2.647.983.182-.02.438-.041.69-.08.94-.162 1.748-.606 2.35-1.455z"/><path id="e" d="M19.25 40h2.714v5.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V35.5H30.732c.389-3.667-.582-5.833-2.914-6.5h21.218v-3.212a.342.342 0 0 0-.339-.343H29.765c.361-1.01.57-1.924.627-2.742h18.644c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V40zm-3.79 13.642h-1.037V53h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 53h1.07l.809 2.389h.01L20.075 53h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V53zm17.403-34.99c.985.007-2.543 2.376-2.271 2.073h-5.692c.113.126.201.23.298.334 1.214 1.315 1.076 3.081.239 4.432-.597.965-1.488 1.586-2.49 2.049-1.103.518-2.277.747-3.475.909a85.771 85.771 0 0 0-3.555.56c-.274.046-.546.186-.782.34-.383.25-.375.645.047.811.595.23 1.216.411 1.843.532 1.768.343 3.567.532 5.295 1.073.842.265 1.651.598 2.341 1.182 1.138.972 1.222 2.65.013 3.726-.948.85-2.094 1.272-3.295 1.557-1.024.243-2.063.36-3.117.396-2.206.076-4.376-.11-6.481-.823-.77-.265-1.497-.614-2.09-1.2-.333-.322-.582-.69-.64-1.174-.08-.656.198-1.127.696-1.496.701-.517 1.51-.775 2.335-.97.797-.192 1.606-.33 2.345-.482-.471-.161-1.025-.314-1.546-.545-.407-.185-.812-.406-1.146-.7-.655-.571-.655-1.42-.049-2.06.442-.468.997-.76 1.586-.974.513-.192 1.041-.34 1.567-.51-.328-.148-.676-.29-1.004-.459-.748-.39-1.42-.886-1.821-1.658-.777-1.496-.475-2.903.467-4.197.908-1.243 2.204-1.916 3.634-2.345a9.62 9.62 0 0 1 2.742-.387c4.671 0 9.339-.013 14.006.007zM18.778 32.016c-1.03.185-2.057.453-3.064.787-.495.16-.972.475-1.405.82-.421.333-.405.865.006 1.224.269.235.58.424.893.553 1.223.505 2.505.489 4.007.601.526-.08 1.283-.165 2.03-.322.546-.114 1.073-.34 1.483-.845.381-.462.363-.962-.063-1.357a2.674 2.674 0 0 0-.689-.487 25.158 25.158 0 0 0-1.952-.725c-.408-.133-.846-.318-1.246-.249zm4.666-7.55c.368-.527.59-1.137.552-1.813-.061-1.064-.609-1.772-1.446-2.208a3.71 3.71 0 0 0-2.357-.396c-1.155.18-2.127.73-2.802 1.824-.64 1.036-.479 2.313.366 3.145.737.729 1.629.933 2.647.983.182-.02.438-.041.69-.08.94-.162 1.748-.606 2.35-1.455z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V33.916L15.591 19.5 34.912 18l-3.89 4.703h6.228L48 23l3.576 1.968-.236 22.01L39.224 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M9.241 22.46c-.204-1.014-.885-1.658-1.82-2.057-.789-.334-1.618-.422-2.473-.388-.95.04-1.853.246-2.674.718-1.498.861-2.34 2.112-2.27 3.866.044 1.094.562 1.906 1.534 2.436.79.427 1.651.55 2.546.594.472-.059.953-.09 1.418-.188 1.203-.253 2.236-.808 2.98-1.793.718-.951.993-2.023.76-3.189Zm-4.657 3.874c-.719.14-1.39.029-1.927-.512-.417-.424-.54-.952-.497-1.519.056-.699.273-1.349.699-1.918.586-.786 1.359-1.24 2.11-1.263 1.285 0 1.991.536 2.144 1.517.228 1.486-.6 3.323-2.529 3.695Zm35.046-3.666c-.28 1.38-.626 2.746-.942 4.118-.037.159-.07.317-.118.471-.017.047-.08.109-.121.109-.64.006-1.278.002-1.918 0-.016 0-.03-.017-.066-.034.055-.256.106-.518.166-.777.276-1.261.567-2.52.83-3.784a1.85 1.85 0 0 0-.002-.728c-.082-.424-.503-.72-.976-.756-.694-.05-1.323.172-1.9.507-.492.281-.945.621-1.411.948a.477.477 0 0 0-.156.262 487.61 487.61 0 0 0-.92 4.158c-.035.163-.104.217-.274.215-.547-.011-1.094-.005-1.642-.005-.065 0-.13-.011-.226-.018.072-.343.138-.664.207-.986.42-1.933.833-3.866 1.254-5.8.086-.396.009-.344.425-.346.526-.002 1.05.003 1.575 0 .139-.002.197.021.158.18-.087.345-.147.699-.229 1.082.196-.134.355-.251.524-.362.718-.487 1.497-.834 2.365-.955.79-.109 1.571-.096 2.303.272.876.445 1.278 1.32 1.094 2.229Zm10.354-.036c-.13-.968-.699-1.647-1.555-2.098-.797-.423-1.656-.555-2.558-.522a6.339 6.339 0 0 0-2.098.416c-1.084.428-1.975 1.093-2.48 2.152-.543 1.139-.54 2.282.19 3.354.487.715 1.21 1.123 2.033 1.377.902.278 1.83.316 2.772.243a8.802 8.802 0 0 0 2.515-.585c.274-.104.44-.243.476-.55.036-.307.129-.61.208-.962-.114.048-.175.075-.24.096-.569.212-1.128.453-1.71.628-.912.276-1.845.348-2.778.094-1.138-.31-1.898-1.099-1.679-2.368.03-.161.08-.234.27-.234 2.112.008 4.223.007 6.337.007.045 0 .095.014.133-.004.054-.025.13-.07.132-.11.026-.31.072-.626.032-.934Zm-2.254.078h-4.254c.485-.897 1.176-1.433 2.195-1.527.423-.039.83-.017 1.232.107.576.18.929.567 1.045 1.154.046.232.02.266-.218.266Zm-19.854-1.972c-1.151-.75-2.442-.838-3.76-.659-.542.075-1.078.151-1.628.148-2.608-.01-5.216-.003-7.826-.003-.52 0-1.034.066-1.532.208-.799.231-1.523.594-2.03 1.264-.527.697-.696 1.455-.262 2.262.224.416.6.683 1.018.893.183.092.378.168.56.248-.293.091-.588.171-.875.274-.329.116-.639.273-.886.525-.338.345-.338.803.028 1.111.186.158.413.277.64.377.29.124.6.207.864.294-.413.081-.865.156-1.31.26-.461.104-.913.243-1.305.522-.279.2-.434.453-.39.806.034.26.172.46.358.633.332.316.739.504 1.168.647 1.176.384 2.389.484 3.622.444a9.155 9.155 0 0 0 1.741-.214c.671-.154 1.312-.381 1.841-.84.676-.58.63-1.484-.007-2.007-.385-.315-.837-.495-1.308-.637-.965-.292-1.97-.394-2.959-.579a6.182 6.182 0 0 1-1.03-.286c-.235-.09-.24-.302-.026-.437.132-.084.284-.16.437-.183.66-.113 1.322-.218 1.986-.303.67-.087 1.326-.21 1.943-.49.56-.249 1.057-.583 1.39-1.104.468-.727.545-1.68-.133-2.388-.054-.056-.103-.112-.166-.18h3.18c-.152.163-.296.307-.426.46-.79.938-1.106 2.016-.908 3.212.18 1.077.844 1.801 1.86 2.194 1.319.511 2.673.511 4.024.132 1.914-.541 3.489-2.116 3.38-4.393-.047-.953-.477-1.695-1.274-2.211Zm-13.93 7.37c.23-.032.483.055.718.116.38.098.754.212 1.126.336.141.052.276.136.397.226.246.183.256.415.036.63-.236.234-.54.339-.855.392-.43.073-.867.112-1.17.15-.867-.053-1.606-.045-2.312-.28-.18-.06-.36-.147-.514-.256-.237-.167-.247-.413-.004-.568.25-.16.524-.306.81-.38a15.548 15.548 0 0 1 1.767-.365Zm2.407-4.483c-.347.429-.814.653-1.358.735-.146.02-.294.03-.399.04-.589-.025-1.105-.128-1.53-.496-.489-.42-.582-1.066-.212-1.59.39-.553.952-.831 1.62-.921.475-.066.93.001 1.363.2.483.22.8.578.835 1.116.023.34-.106.65-.319.916Zm9.616 1.924c-.566.551-1.267.819-1.845.831-1.179.002-1.91-.558-2.086-1.454-.12-.598-.004-1.182.224-1.739.39-.967 1.053-1.67 2.095-1.972.45-.128.909-.142 1.363-.006.714.21 1.13.704 1.23 1.407.156 1.125-.158 2.122-.981 2.933Z" fill="#2873B9"/></svg>
diff --git a/addons/payment_paypal/static/description/icon.png b/addons/payment_paypal/static/description/icon.png
index 443af9d40c7..8be816fa9f1 100644
Binary files a/addons/payment_paypal/static/description/icon.png and b/addons/payment_paypal/static/description/icon.png differ
diff --git a/addons/payment_paypal/static/description/icon.svg b/addons/payment_paypal/static/description/icon.svg
index 020f3296ce7..8c15c7eeff5 100644
--- a/addons/payment_paypal/static/description/icon.svg
+++ b/addons/payment_paypal/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#94B6C8"/><stop offset="100%" stop-color="#6A9EBA"/></linearGradient><path id="d" d="M35.363 37.5c1.129-2.152 1.841-4.318 2.137-6.5h11.536v-3.212a.342.342 0 0 0-.339-.343H37.5c-.109-.965-.34-1.879-.697-2.742h12.233c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742 2.258.007 3.907.022 5.137 0h24.31a.342.342 0 0 0 .339-.343V37.5H35.363zM15.46 55.642h-1.036V55h2.833v.642h-1.037v2.832h-.76v-2.832zM17.423 55h1.07l.809 2.389h.01L20.075 55h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V55zm4.765-36h4.547c2.803 0 6.062 2.167 5.09 6.933-.858 4.21-4.06 6.686-7.892 6.686h-2.496c-.549 0-.913.478-.999 1.047L19.334 41h-4.326c-.548 0-1.085-.479-.999-1.048l2.997-19.904c.086-.57.45-1.048 1-1.048h4.182zm11.656 10.987c-.76 3.915-3.604 6.218-7.006 6.218l-.81-.003-.488.003c-.488.003-.727.442-.803.97l-.053.363-.774 5.388c-.081.56-.416 1.036-.92 1.072L19.896 44c-.487 0-.963-.445-.887-.974l.015-.103h1.985l1.043-7.26.029.004.176-1.36h1.589c4.727 0 8.518-3.272 9.606-8.307.512 1.003.717 2.325.393 3.987z"/><path id="e" d="M35.363 35.5c1.129-2.152 1.841-4.318 2.137-6.5h11.536v-3.212a.342.342 0 0 0-.339-.343H37.5c-.109-.965-.34-1.879-.697-2.742h12.233c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742 2.258.007 3.907.022 5.137 0h24.31a.342.342 0 0 0 .339-.343V35.5H35.363zM15.46 53.642h-1.036V53h2.833v.642h-1.037v2.832h-.76v-2.832zM17.423 53h1.07l.809 2.389h.01L20.075 53h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V53zm4.765-36h4.547c2.803 0 6.062 2.167 5.09 6.933-.858 4.21-4.06 6.686-7.892 6.686h-2.496c-.549 0-.913.478-.999 1.047L19.334 39h-4.326c-.548 0-1.085-.479-.999-1.048l2.997-19.904c.086-.57.45-1.048 1-1.048h4.182zm11.656 10.987c-.76 3.915-3.604 6.218-7.006 6.218l-.81-.003-.488.003c-.488.003-.727.442-.803.97l-.053.363-.774 5.388c-.081.56-.416 1.036-.92 1.072L19.896 42c-.487 0-.963-.445-.887-.974l.015-.103h1.985l1.043-7.26.029.004.176-1.36h1.589c4.727 0 8.518-3.272 9.606-8.307.512 1.003.717 2.325.393 3.987z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V33.916L17.423 17.25H28l3.391 5.453h5.859L48 23l3.576 1.968-.236 22.01L39.224 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="m17.287 44.574.74-4.623-1.649-.038H8.5l5.475-34.116a.449.449 0 0 1 .445-.373h13.282c4.41 0 7.453.901 9.042 2.682.745.835 1.219 1.707 1.448 2.668.241 1.007.245 2.211.01 3.68l-.017.107v.94l.745.415c.627.327 1.126.702 1.508 1.13.637.714 1.05 1.622 1.224 2.698.18 1.106.12 2.423-.174 3.913-.34 1.715-.89 3.208-1.632 4.43a9.172 9.172 0 0 1-2.584 2.784c-.986.687-2.157 1.21-3.48 1.543-1.284.329-2.747.494-4.35.494h-1.035a3.17 3.17 0 0 0-2.02.73 3.063 3.063 0 0 0-1.054 1.85l-.078.415-1.308 8.15-.06.298c-.015.095-.042.142-.082.174a.221.221 0 0 1-.136.05h-6.382Z" fill="#253B80"/><path d="M39.638 14.671a23.1 23.1 0 0 1-.136.766c-1.752 8.839-7.744 11.892-15.398 11.892h-3.897c-.936 0-1.725.668-1.87 1.576L16.34 41.342l-.565 3.525A.986.986 0 0 0 16.76 46h6.912c.818 0 1.514-.585 1.642-1.378l.069-.345 1.3-8.117.084-.445a1.654 1.654 0 0 1 1.643-1.38h1.034c6.696 0 11.939-2.673 13.47-10.406.64-3.23.31-5.927-1.384-7.824-.513-.572-1.149-1.047-1.892-1.434Z" fill="#179BD7"/><path d="M37.804 13.953a13.964 13.964 0 0 0-1.704-.372 22.002 22.002 0 0 0-3.435-.246h-10.41c-.257 0-.5.057-.719.16-.48.227-.837.673-.923 1.22l-2.215 13.787-.064.402a1.883 1.883 0 0 1 1.871-1.575h3.897c7.654 0 13.647-3.055 15.398-11.893.053-.261.097-.516.136-.765a9.436 9.436 0 0 0-1.44-.597 12.1 12.1 0 0 0-.392-.121Z" fill="#222D65"/><path d="M20.614 14.715a1.63 1.63 0 0 1 .923-1.219c.22-.103.462-.16.718-.16h10.411c1.233 0 2.385.08 3.435.246a14.023 14.023 0 0 1 2.097.491c.517.169.998.368 1.44.598.522-3.267-.003-5.49-1.8-7.505C35.855 4.95 32.28 4 27.706 4H14.423c-.935 0-1.732.668-1.876 1.577L7.014 40.044a1.128 1.128 0 0 0 1.126 1.297h8.2l2.06-12.839 2.214-13.787Z" fill="#253B80"/></svg>
diff --git a/addons/payment_payulatam/static/description/icon.png b/addons/payment_payulatam/static/description/icon.png
index 16f02606e33..eab07e71244 100644
Binary files a/addons/payment_payulatam/static/description/icon.png and b/addons/payment_payulatam/static/description/icon.png differ
diff --git a/addons/payment_payulatam/static/description/icon.svg b/addons/payment_payulatam/static/description/icon.svg
index a23f55d03e3..cdbfb434b8f 100644
--- a/addons/payment_payulatam/static/description/icon.svg
+++ b/addons/payment_payulatam/static/description/icon.svg
@@ -1,47 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 70">
-  <defs>
-    <mask id="mask" x="0" y="0" width="70" height="70" maskUnits="userSpaceOnUse">
-      <g id="b">
-        <path id="a" d="M4,0H65c4,0,5,1,5,5V65c0,4-1,5-5,5H4c-3,0-4-1-4-5V5C0,1,1,0,4,0Z" fill="#fff" fill-rule="evenodd"/>
-      </g>
-    </mask>
-    <linearGradient id="linear-gradient" x1="-1438.5" y1="-4.39" x2="-1439.5" y2="-5.39" gradientTransform="matrix(70, 0, 0, -70, 100764.99, -307.17)" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#7cc098"/>
-      <stop offset="1" stop-color="#5f8a71"/>
-    </linearGradient>
-  </defs>
-  <g mask="url(#mask)">
-    <g>
-      <path d="M0,0H70V70H0Z" fill-rule="evenodd" fill="url(#linear-gradient)"/>
-      <path d="M4,1H65c2.67,0,4.33.67,5,2V0H0V3C.67,1.67,2,1,4,1Z" fill="#fff" fill-opacity="0.38" fill-rule="evenodd"/>
-      <path d="M4,69a3.66,3.66,0,0,1-4-4V37.35L16.62,20.8l3.49,3.38L34.74,9.61l3.68,2v1.7L39.69,12l4.41,4.32L33.82,26.52l.24,2.67,5.53-5.54L50.39,25l1.36,12.54-3.84,3.86c.66,5.52.62,13.53.44,22.08L42.8,69Z" fill="#393939" fill-rule="evenodd" opacity="0.32" style="isolation: isolate"/>
-      <path d="M4,69H65c2.67,0,4.33-1,5-3v4H0V66A3.92,3.92,0,0,0,4,69Z" fill-opacity="0.38" fill-rule="evenodd"/>
-      <g>
-        <g opacity="0.4">
-          <rect x="32.43" y="10.58" width="4" height="4" rx="1"/>
-          <path d="M47,39.5h2.71V27.44A2.73,2.73,0,0,0,47,24.7H37.5v2.74h9.2a.34.34,0,0,1,.34.34V31H36.5v6.5H47Z"/>
-          <rect x="37.43" y="13.58" width="5" height="5" rx="1"/>
-          <polygon points="17.31 57.39 17.3 57.39 16.5 55 15.43 55 15.43 58.47 16.14 58.47 16.14 56.03 16.15 56.03 16.99 58.47 17.58 58.47 18.43 56.01 18.44 56.01 18.44 58.47 19.15 58.47 19.15 55 18.08 55 17.31 57.39"/>
-          <path d="M40.22,47.53l-19.91,0a.34.34,0,0,1-.34-.34V46H17.25v1.55A2.73,2.73,0,0,0,20,50.29H40.18Z"/>
-          <path d="M23.1,43.48a9.9,9.9,0,0,0,6.72-2.12q2.43-2.11,2.43-6.46V23.58h3.18a1,1,0,0,0,1-1v-4a1,1,0,0,0-1-1h-4a1,1,0,0,0-1,1v3H27.54V34.9a5.34,5.34,0,0,1-1,3.52c-.64.75-1.8,1.13-3.48,1.13a5.39,5.39,0,0,1-2.29-.41,3.49,3.49,0,0,1-1.34-1,3.45,3.45,0,0,1-.63-1.48,9.71,9.71,0,0,1-.15-1.71V21.58H14V34.9q0,4.38,2.39,6.48A9.85,9.85,0,0,0,23.1,43.48Z"/>
-          <polygon points="12.43 55.64 13.46 55.64 13.46 58.47 14.22 58.47 14.22 55.64 15.26 55.64 15.26 55 12.43 55 12.43 55.64"/>
-          <g id="layer101">
-            <path d="M57.44,48.81c-.38-.79-2.25-1.85-3.79-2.13l-.46-.08L53,46.16a2.22,2.22,0,0,0-1.86-1.47c-.4,0-.42,0-.86-.47-.25-.25-.57-.55-.71-.68l-.25-.24-.55.06a2.81,2.81,0,0,1-1.56-.14,3.66,3.66,0,0,0-2-.16,1.2,1.2,0,0,0-.56.63s-.13,0-.27,0a.81.81,0,0,0-.55,0c-.29.11-.3.1-.41-.07a1.57,1.57,0,0,1-.14-.7,6,6,0,0,0-.06-.71c0-.2-.42-.43-.7-.43a.62.62,0,0,1-.26,0,.81.81,0,0,1,.07-.36,1.39,1.39,0,0,0,.07-.55,1.51,1.51,0,0,0-.34-.52,2.14,2.14,0,0,0-.94-.59A7.46,7.46,0,0,0,39,41.3c0,.29,0,.52,0,.58h0v0a.56.56,0,0,1,0,.12.85.85,0,0,1,0,.17,4,4,0,0,1,.56.76.37.37,0,0,1,.12.07,3.6,3.6,0,0,0,.61.31,2.49,2.49,0,0,1,1.27.88,3.48,3.48,0,0,0,2.11,1.24c.19,0,.28,0,.26.09a7.76,7.76,0,0,1-.45.73,4.64,4.64,0,0,0-.47.89,5.73,5.73,0,0,0,0,.89,2,2,0,0,0,.35,1.24c1.1,2,1.3,2.33,2,2.9a7.7,7.7,0,0,1,.62.53,5.13,5.13,0,0,1,0,1.84c0,.25-.24,1.07-.44,1.82-.61,2.21-.73,3.17-.47,3.67s.19.41-.11.69A1,1,0,0,0,44.72,62a6.27,6.27,0,0,1,.21.91,4.67,4.67,0,0,0,.21.86l.06.16,0,.07a10.3,10.3,0,0,0,.63,1.62l.34,0a7.83,7.83,0,0,0,1.15-1.21s-.09,0-.09,0a2.38,2.38,0,0,1,.21-.38,1.33,1.33,0,0,0,.21-.52.42.42,0,0,1,.11-.28,2.58,2.58,0,0,0,.59-1.35,2,2,0,0,1,.52-1.16,2.77,2.77,0,0,0,.67-1.2c0-.1,0-.14.17-.14a1.92,1.92,0,0,0,.89-.33,1.44,1.44,0,0,0,.56-.82c0-.05.14-.19.31-.28A4.49,4.49,0,0,0,53,56a7.8,7.8,0,0,1,.77-1.29,1.29,1.29,0,0,1,.79-.3c.55-.1.6-.12.88-.41a4.86,4.86,0,0,0,.86-2.29,2.11,2.11,0,0,1,.73-1.47,1.75,1.75,0,0,0,.54-1A1.28,1.28,0,0,0,57.44,48.81Z"/>
-          </g>
-        </g>
-        <g>
-          <rect x="34.42" y="8.58" width="4" height="4" rx="1" fill="#fff"/>
-          <path d="M49,37.5l2.71,0V25.45A2.73,2.73,0,0,0,49,22.7H39.5v2.75h9.2a.34.34,0,0,1,.34.34V29H38.5v6.5H49Z" fill="#fff"/>
-          <rect x="39.42" y="11.58" width="5" height="5" rx="1" fill="#fff"/>
-          <polygon points="19.31 55.39 19.3 55.39 18.49 53 17.42 53 17.42 56.47 18.13 56.47 18.13 54.04 18.14 54.04 18.99 56.47 19.58 56.47 20.42 54.01 20.43 54.01 20.43 56.47 21.14 56.47 21.14 53 20.07 53 19.31 55.39" fill="#fff"/>
-          <path d="M42.22,45.53l-19.92,0a.34.34,0,0,1-.34-.34V44H19.25v1.55A2.73,2.73,0,0,0,22,48.3H42.18Z" fill="#fff"/>
-          <path d="M25.1,41.48a9.85,9.85,0,0,0,6.72-2.12c1.62-1.4,2.43-3.56,2.43-6.46V21.58h3.17a1,1,0,0,0,1-1v-4a1,1,0,0,0-1-1h-4a1,1,0,0,0-1,1v3H29.54V32.9a5.34,5.34,0,0,1-1,3.52c-.64.75-1.8,1.13-3.48,1.13a5.65,5.65,0,0,1-2.3-.4,3.39,3.39,0,0,1-1.33-1.06,3.45,3.45,0,0,1-.63-1.48,9.71,9.71,0,0,1-.15-1.71V19.58H16V32.9c0,2.92.8,5.08,2.38,6.48A9.89,9.89,0,0,0,25.1,41.48Z" fill="#fff"/>
-          <polygon points="14.42 53.64 15.46 53.64 15.46 56.47 16.22 56.47 16.22 53.64 17.26 53.64 17.26 53 14.42 53 14.42 53.64" fill="#fff"/>
-          <g id="layer101-2" data-name="layer101">
-            <path d="M59.44,46.82c-.39-.8-2.25-1.85-3.79-2.13l-.46-.09L55,44.16a2.25,2.25,0,0,0-1.86-1.47c-.4,0-.43,0-.86-.47l-.71-.68-.25-.24-.55.06a2.86,2.86,0,0,1-1.57-.13,3.44,3.44,0,0,0-2-.16,1.18,1.18,0,0,0-.56.62s-.14,0-.27,0a.76.76,0,0,0-.55,0c-.29.1-.3.1-.41-.07a1.63,1.63,0,0,1-.14-.71,5.09,5.09,0,0,0-.07-.7.79.79,0,0,0-.7-.44.56.56,0,0,1-.25,0s0-.18.06-.36a1.21,1.21,0,0,0,.07-.55,1.42,1.42,0,0,0-.33-.52,2.17,2.17,0,0,0-.95-.59A7.28,7.28,0,0,0,41,39.31c0,.28,0,.52,0,.57h0v0s0,.07,0,.11,0,.11,0,.17a4.74,4.74,0,0,1,.56.77.24.24,0,0,1,.11.06,3.82,3.82,0,0,0,.62.31,2.52,2.52,0,0,1,1.26.88,3.48,3.48,0,0,0,2.11,1.24c.2,0,.29,0,.27.1s-.22.37-.46.73a4.12,4.12,0,0,0-.47.89,6,6,0,0,0,0,.89,2,2,0,0,0,.35,1.24c1.09,2,1.3,2.32,2,2.89a6.78,6.78,0,0,1,.63.53,5.38,5.38,0,0,1,0,1.84c0,.25-.24,1.07-.45,1.82-.61,2.21-.73,3.17-.46,3.67s.18.41-.11.69A1,1,0,0,0,46.72,60a5.3,5.3,0,0,1,.2.91,4.53,4.53,0,0,0,.22.86l.06.17,0,.06a10.93,10.93,0,0,0,.62,1.62l.35,0a7.83,7.83,0,0,0,1.14-1.22l-.09,0a2,2,0,0,1,.22-.38,1.37,1.37,0,0,0,.21-.52.35.35,0,0,1,.11-.27,2.71,2.71,0,0,0,.59-1.36,1.87,1.87,0,0,1,.52-1.15,2.85,2.85,0,0,0,.67-1.21c0-.1,0-.14.17-.14a1.89,1.89,0,0,0,.89-.33,1.48,1.48,0,0,0,.55-.81c0-.06.14-.19.31-.29A4.37,4.37,0,0,0,55,54a8.29,8.29,0,0,1,.76-1.3,1.43,1.43,0,0,1,.8-.3c.55-.09.6-.12.87-.41a4.76,4.76,0,0,0,.87-2.29,2,2,0,0,1,.73-1.46,1.81,1.81,0,0,0,.54-1A1.65,1.65,0,0,0,59.44,46.82Z" fill="#fff"/>
-          </g>
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M43.105 4h.972V.818h1.108V0H42v.818h1.105V4Zm2.775 0h.858V1.453h.053L47.663 4h.555l.871-2.547h.056V4H50V0h-1.108l-.924 2.714h-.05L46.99 0h-1.11v4Z" fill="#D1D5DB"/><path d="m46.325 18.237-2.978-.001a.59.59 0 0 0-.589.59v.416h.207c1.345 0 1.845.222 1.845 1.45v1.744h1.513a.589.589 0 0 0 .589-.588v-3.021a.589.589 0 0 0-.587-.59Zm-16.253 4.69c-.138-.172-.398-.196-.658-.196h-.196c-.649 0-.903.2-1.047.825l-1.804 7.513c-.225.923-.541 1.092-1.083 1.092-.662 0-.928-.158-1.192-1.096l-2.043-7.513c-.17-.63-.419-.821-1.068-.821h-.174c-.262 0-.523.024-.657.2-.134.174-.089.436-.02.694l2.065 7.578c.387 1.45.848 2.651 2.568 2.651.32 0 .618-.045.865-.128-.522 1.644-1.053 2.37-2.618 2.53-.317.027-.524.072-.639.227-.12.16-.092.39-.05.595l.044.194c.093.45.252.728.756.728.053 0 .11-.003.17-.008 2.337-.153 3.59-1.414 4.322-4.352l2.5-10.02c.06-.258.096-.52-.041-.692ZM17.496 28.7v1.517c0 1.236-.458 1.952-2.796 1.952-1.545 0-2.296-.56-2.296-1.713 0-1.263.754-1.756 2.687-1.756h2.405ZM14.7 22.412c-1.275 0-2.074.16-2.377.22-.536.118-.76.265-.76.877v.174c0 .24.035.405.11.522.089.136.232.205.424.205.094 0 .203-.016.333-.048.306-.077 1.286-.236 2.357-.236 1.924 0 2.709.534 2.709 1.844v1.168h-2.427c-3.119 0-4.572 1.054-4.572 3.318 0 2.196 1.5 3.406 4.225 3.406 3.237 0 4.68-1.104 4.68-3.58V25.97c0-2.394-1.538-3.558-4.702-3.558Zm-6.115 1.452c0 1.803-.46 2.78-2.883 2.78h-3.73v-4.653c0-.645.24-.885.883-.885h2.847c1.826 0 2.883.452 2.883 2.758ZM5.702 19.24H2.486C.766 19.24 0 20.007 0 21.73v11.065c0 .665.213.879.877.879h.218c.664 0 .877-.214.877-.88V28.49h3.73c3.312 0 4.855-1.47 4.855-4.625 0-3.155-1.543-4.625-4.855-4.625Zm40.913-4.12h-1.502a.297.297 0 0 1-.297-.298v-1.524c0-.164.134-.297.297-.297h1.502c.164 0 .297.134.297.298v1.524a.297.297 0 0 1-.297.297Zm2.947 3.12H47.35a.437.437 0 0 1-.436-.439v-2.244c0-.241.196-.437.437-.437h2.212c.241 0 .437.197.437.438v2.244a.437.437 0 0 1-.438.438Zm-6.217 4.197a.588.588 0 0 1-.587-.59v-2.604h-.217c-1.344 0-1.844.222-1.844 1.45v2.872l-.001.018v.63l-.002.064v4.013c0 .49-.094.88-.289 1.184-.366.566-1.092.823-2.254.825-1.16-.002-1.886-.259-2.253-.825-.195-.303-.29-.693-.29-1.184v-4.708l-.002-.017v-2.872c0-1.228-.5-1.45-1.845-1.45h-.423c-1.345 0-1.845.222-1.845 1.45v7.597c0 1.222.275 2.257.807 3.091 1.026 1.617 3.014 2.478 5.841 2.478h.02c2.828 0 4.816-.861 5.842-2.478.532-.834.807-1.869.807-3.09v-5.854h-1.465Z" fill="#A6C307"/></svg>
diff --git a/addons/payment_payumoney/static/description/icon.png b/addons/payment_payumoney/static/description/icon.png
index d67b26803d0..15c770d0185 100644
Binary files a/addons/payment_payumoney/static/description/icon.png and b/addons/payment_payumoney/static/description/icon.png differ
diff --git a/addons/payment_payumoney/static/description/icon.svg b/addons/payment_payumoney/static/description/icon.svg
index dce75643382..c8028dd8343 100644
--- a/addons/payment_payumoney/static/description/icon.svg
+++ b/addons/payment_payumoney/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#7CC098"/><stop offset="100%" stop-color="#5F8A71"/></linearGradient><path id="d" d="M32.423 21.58v-3a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1v4a1 1 0 0 1-1 1H34.25V34.9c0 2.9-.81 5.055-2.43 6.465-1.62 1.41-3.86 2.115-6.72 2.115-2.9 0-5.145-.7-6.735-2.1-1.59-1.4-2.385-3.56-2.385-6.48V21.58h4.71V34.9c0 .58.05 1.15.15 1.71.1.56.31 1.055.63 1.485.32.43.765.78 1.335 1.05s1.335.405 2.295.405c1.68 0 2.84-.375 3.48-1.125.64-.75.96-1.925.96-3.525V21.58h2.883zM19.25 46h2.714v1.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V37.5H38.5V31h10.536v-3.212a.342.342 0 0 0-.339-.343H39.5v-2.742h9.536c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V46zm-3.79 9.642h-1.037V55h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 55h1.07l.809 2.389h.01L20.075 55h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V55zm23-41.42h3a1 1 0 0 1 1 1v3a1 1 0 0 1-1 1h-3a1 1 0 0 1-1-1v-3a1 1 0 0 1 1-1zm-5-3h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1h-2a1 1 0 0 1-1-1v-2a1 1 0 0 1 1-1z"/><path id="e" d="M32.423 19.58v-3a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1v4a1 1 0 0 1-1 1H34.25V32.9c0 2.9-.81 5.055-2.43 6.465-1.62 1.41-3.86 2.115-6.72 2.115-2.9 0-5.145-.7-6.735-2.1-1.59-1.4-2.385-3.56-2.385-6.48V19.58h4.71V32.9c0 .58.05 1.15.15 1.71.1.56.31 1.055.63 1.485.32.43.765.78 1.335 1.05s1.335.405 2.295.405c1.68 0 2.84-.375 3.48-1.125.64-.75.96-1.925.96-3.525V19.58h2.883zM19.25 44h2.714v1.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V35.5H38.5V29h10.536v-3.212a.342.342 0 0 0-.339-.343H39.5v-2.742h9.536c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V44zm-3.79 9.642h-1.037V53h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 53h1.07l.809 2.389h.01L20.075 53h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V53zm23-41.42h3a1 1 0 0 1 1 1v3a1 1 0 0 1-1 1h-3a1 1 0 0 1-1-1v-3a1 1 0 0 1 1-1zm-5-3h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1h-2a1 1 0 0 1-1-1v-2a1 1 0 0 1 1-1z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V33.916L16 19.58l3.25.42L35 8.58 38 12l-.89 2 2.584-2 4.729 4-5.923 6.703L48 23l3.576 1.968-.236 22.01L39.224 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="m46.325 18.237-2.978-.001a.59.59 0 0 0-.589.59v.416h.207c1.345 0 1.845.222 1.845 1.45v1.744h1.513a.589.589 0 0 0 .589-.588v-3.021a.589.589 0 0 0-.587-.59Zm-16.253 4.69c-.138-.172-.398-.196-.658-.196h-.196c-.649 0-.903.2-1.047.825l-1.804 7.513c-.225.923-.541 1.092-1.083 1.092-.662 0-.928-.158-1.192-1.096l-2.043-7.513c-.17-.63-.419-.821-1.068-.821h-.174c-.262 0-.523.024-.657.2-.134.174-.089.436-.02.694l2.065 7.578c.387 1.45.848 2.651 2.568 2.651.32 0 .618-.045.865-.128-.522 1.644-1.053 2.37-2.618 2.53-.317.027-.524.072-.639.227-.12.16-.092.39-.05.595l.044.194c.093.45.252.728.756.728.053 0 .11-.003.17-.008 2.337-.153 3.59-1.414 4.322-4.352l2.5-10.02c.06-.258.096-.52-.041-.692ZM17.496 28.7v1.517c0 1.236-.458 1.952-2.796 1.952-1.545 0-2.296-.56-2.296-1.713 0-1.263.754-1.756 2.687-1.756h2.405ZM14.7 22.412c-1.275 0-2.074.16-2.377.22-.536.118-.76.265-.76.877v.174c0 .24.035.405.11.522.089.136.232.205.424.205.094 0 .203-.016.333-.048.306-.077 1.286-.236 2.357-.236 1.924 0 2.709.534 2.709 1.844v1.168h-2.427c-3.119 0-4.572 1.054-4.572 3.318 0 2.196 1.5 3.406 4.225 3.406 3.237 0 4.68-1.104 4.68-3.58V25.97c0-2.394-1.538-3.558-4.702-3.558Zm-6.115 1.452c0 1.803-.46 2.78-2.883 2.78h-3.73v-4.653c0-.645.24-.885.883-.885h2.847c1.826 0 2.883.452 2.883 2.758ZM5.702 19.24H2.486C.766 19.24 0 20.007 0 21.73v11.065c0 .665.213.879.877.879h.218c.664 0 .877-.214.877-.88V28.49h3.73c3.312 0 4.855-1.47 4.855-4.625 0-3.155-1.543-4.625-4.855-4.625Zm40.913-4.12h-1.502a.297.297 0 0 1-.297-.298v-1.524c0-.164.134-.297.297-.297h1.502c.164 0 .297.134.297.298v1.524a.297.297 0 0 1-.297.297Zm2.947 3.12H47.35a.437.437 0 0 1-.436-.439v-2.244c0-.241.196-.437.437-.437h2.212c.241 0 .437.197.437.438v2.244a.437.437 0 0 1-.438.438Zm-6.217 4.197a.588.588 0 0 1-.587-.59v-2.604h-.217c-1.344 0-1.844.222-1.844 1.45v2.872l-.001.018v.63l-.002.064v4.013c0 .49-.094.88-.289 1.184-.366.566-1.092.823-2.254.825-1.16-.002-1.886-.259-2.253-.825-.195-.303-.29-.693-.29-1.184v-4.708l-.002-.017v-2.872c0-1.228-.5-1.45-1.845-1.45h-.423c-1.345 0-1.845.222-1.845 1.45v7.597c0 1.222.275 2.257.807 3.091 1.026 1.617 3.014 2.478 5.841 2.478h.02c2.828 0 4.816-.861 5.842-2.478.532-.834.807-1.869.807-3.09v-5.854h-1.465Z" fill="#62CAC3"/><path d="M43.105 11h.972V7.818h1.108V7H42v.818h1.105V11Zm2.775 0h.858V8.453h.053L47.663 11h.555l.871-2.547h.056V11H50V7h-1.108l-.924 2.714h-.05L46.99 7h-1.11v4Z" fill="#D1D5DB"/></svg>
diff --git a/addons/payment_razorpay/static/description/icon.png b/addons/payment_razorpay/static/description/icon.png
index eea0cae79c8..8ba957dd4ec 100644
Binary files a/addons/payment_razorpay/static/description/icon.png and b/addons/payment_razorpay/static/description/icon.png differ
diff --git a/addons/payment_razorpay/static/description/icon.svg b/addons/payment_razorpay/static/description/icon.svg
index 5f9dea6e511..409df792692 100644
--- a/addons/payment_razorpay/static/description/icon.svg
+++ b/addons/payment_razorpay/static/description/icon.svg
@@ -1,27 +1 @@
-<svg width="70" height="70" viewBox="0 0 70 70" fill="none" xmlns="http://www.w3.org/2000/svg">
-<mask id="mask0_10_362" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="70" height="70">
-<path d="M4 0H65C69 0 70 1 70 5V65C70 69 69 70 65 70H4C1 70 0 69 0 65V5C0 1 1 0 4 0Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_10_362)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H70V70H0V0Z" fill="url(#paint0_linear_10_362)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 1H65C67.667 1 69.333 1.667 70 3V0H0V3C0.667 1.667 2 1 4 1Z" fill="white" fill-opacity="0.383"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 69H65C67.667 69 69.333 68 70 66V70H0V66C0.667 68 2 69 4 69Z" fill="black" fill-opacity="0.383"/>
-</g>
-<path opacity="0.324" fill-rule="evenodd" clip-rule="evenodd" d="M4 69C2 69 0 68 0 65V39.5C0 39.5 20 25.5 21.5 24.5L31 22.703H37.25L48 23L51.576 24.968L51.34 46.978L39.224 69H4Z" fill="#393939"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M21.5744 26.4129L20.4692 30.496L26.805 26.3918L22.6515 41.8793H26.8754L33 19" fill="#465C68"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.7459 35.3745L13 41.8793H21.6378L25.1718 28.6445L14.7529 35.3675" fill="#465C68"/>
-<path d="M32.8154 31L31.0904 37.5H49.036V47.212C49.0363 47.3024 49.0008 47.3892 48.9373 47.4534C48.8737 47.5177 48.7874 47.5542 48.697 47.555H22.303C22.116 47.555 21.964 47.4 21.964 47.212V45H19.2568L19.25 47.555C19.25 49.069 20.464 50.297 21.964 50.297H49.036C50.537 50.297 51.75 49.069 51.75 47.555V27.445C51.75 25.931 50.536 24.703 49.036 24.703H34.4865L33.7588 27.445H48.697C48.7874 27.4458 48.8737 27.4823 48.9373 27.5466C49.0008 27.6108 49.0363 27.6976 49.036 27.788V31H32.8154Z" fill="#465C68"/>
-<path d="M14.423 55.642H15.459V58.474H16.219V55.642H17.256V55H14.423V55.642Z" fill="#465C68"/>
-<path d="M18.492 55H17.422V58.474H18.133V56.036H18.143L18.991 58.474H19.577L20.424 56.012H20.434V58.474H21.145V55H20.075L19.311 57.389H19.301L18.492 55Z" fill="#465C68"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M21.5744 24.4129L20.4692 28.496L26.805 24.3918L22.6515 39.8793H26.8754L33 17" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.7459 33.3745L13 39.8793H21.6378L25.1718 26.6445L14.7529 33.3675" fill="white"/>
-<path d="M32.8154 29L31.0904 35.5H49.036V45.212C49.0363 45.3024 49.0008 45.3892 48.9373 45.4534C48.8737 45.5177 48.7874 45.5542 48.697 45.555H22.303C22.116 45.555 21.964 45.4 21.964 45.212V43H19.2568L19.25 45.555C19.25 47.069 20.464 48.297 21.964 48.297H49.036C50.537 48.297 51.75 47.069 51.75 45.555V25.445C51.75 23.931 50.536 22.703 49.036 22.703H34.4865L33.7588 25.445H48.697C48.7874 25.4458 48.8737 25.4823 48.9373 25.5466C49.0008 25.6108 49.0363 25.6976 49.036 25.788V29H32.8154Z" fill="white"/>
-<path d="M14.423 53.642H15.459V56.474H16.219V53.642H17.256V53H14.423V53.642Z" fill="white"/>
-<path d="M18.492 53H17.422V56.474H18.133V54.036H18.143L18.991 56.474H19.577L20.424 54.012H20.434V56.474H21.145V53H20.075L19.311 55.389H19.301L18.492 53Z" fill="white"/>
-<defs>
-<linearGradient id="paint0_linear_10_362" x1="70" y1="0" x2="0" y2="70" gradientUnits="userSpaceOnUse">
-<stop stop-color="#94B6C8"/>
-<stop offset="1" stop-color="#6A9EBA"/>
-</linearGradient>
-</defs>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="m22.43 17.6-1.995 7.494 11.418-7.537-7.467 28.436 7.583.007L43 4 22.43 17.6Z" fill="#3395FF"/><path fill-rule="evenodd" clip-rule="evenodd" d="M10.14 34.046 7 46h15.544l6.36-24.32-18.765 12.366Z" fill="#072654"/><path d="M43.105 4h.972V.818h1.108V0H42v.818h1.105V4Zm2.775 0h.858V1.453h.053L47.663 4h.555l.871-2.547h.056V4H50V0h-1.108l-.924 2.714h-.05L46.99 0h-1.11v4Z" fill="#D1D5DB"/></svg>
diff --git a/addons/payment_sips/static/description/icon.png b/addons/payment_sips/static/description/icon.png
index 4c03f77626d..b9254546788 100644
Binary files a/addons/payment_sips/static/description/icon.png and b/addons/payment_sips/static/description/icon.png differ
diff --git a/addons/payment_sips/static/description/icon.svg b/addons/payment_sips/static/description/icon.svg
index d8abf50becd..879cb2a5be8 100644
--- a/addons/payment_sips/static/description/icon.svg
+++ b/addons/payment_sips/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#94B6C8"/><stop offset="100%" stop-color="#6A9EBA"/></linearGradient><path id="d" d="M19.25 43h2.714v4.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V37.5H32.732c1.623-2.333 2.212-4.5 1.768-6.5h14.536v-3.212a.342.342 0 0 0-.339-.343h-14.79a15.663 15.663 0 0 0-1.215-2.742h16.344c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V43zm-3.79 12.642h-1.037V55h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 55h1.07l.809 2.389h.01L20.075 55h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V55zm-1.394-16.606C15 37.5 14.5 37.025 13.733 35.448c-.556-1.144-.908-2.315-1.026-3.6-.035-.377-.04-1.232-.01-1.572.127-1.427.479-2.634 1.124-3.861a9.868 9.868 0 0 1 4.994-4.507c.24-.096.63-.236.637-.229a.859.859 0 0 1-.071.132c-.633 1.046-1.176 3.203-1.275 5.059l-.018.353-.115.162a6.324 6.324 0 0 0-1.094 2.865 9.018 9.018 0 0 0 0 1.521 6.257 6.257 0 0 0 1.208 3.02c.836 1.112 2.034 1.88 3.332 2.14.426.086.53.095 1.082.094.445 0 .547-.005.751-.038a5.349 5.349 0 0 0 2.003-.723c.116-.07.23-.14.252-.158l.041-.031-.092-.039a15.055 15.055 0 0 1-1.08-.556 9.864 9.864 0 0 1-3.215-3.084 9.796 9.796 0 0 1-.613-9.633c.095-.196.236-.466.313-.6.152-.265.535-.852.586-.896.078-.07 1.26-.095 1.865-.041a9.844 9.844 0 0 1 8.65 7.201c.254.942.352 1.744.334 2.764a8.847 8.847 0 0 1-.301 2.261c-.715 2.785-2.654 5.138-5.278 6.405a9.795 9.795 0 0 1-3.547.946 16.36 16.36 0 0 1-1.405-.002 9.878 9.878 0 0 1-5.736-2.407zM27.92 32.69c.022-.079.065-.272.097-.43a6.412 6.412 0 0 0-.299-3.548c-.64-1.645-1.91-2.891-3.508-3.446a1.81 1.81 0 0 0-.196-.06c-.044 0-.192.682-.25 1.148-.029.237-.029 1.131 0 1.37.155 1.251.585 2.3 1.327 3.232.16.201.553.607.747.772.553.47 1.12.796 1.808 1.04.111.04.21.071.219.069a.487.487 0 0 0 .055-.147z"/><path id="e" d="M19.25 42h2.714v3.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V35.5H32.732c1.623-2.333 2.212-4.5 1.768-6.5h14.536v-3.212a.342.342 0 0 0-.339-.343h-14.79a15.663 15.663 0 0 0-1.215-2.742h16.344c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V42zm-3.79 11.642h-1.037V53h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 53h1.07l.809 2.389h.01L20.075 53h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V53zm-1.394-16.606C15 35.5 14.5 35.025 13.733 33.448c-.556-1.144-.908-2.315-1.026-3.6-.035-.377-.04-1.232-.01-1.572.127-1.427.479-2.634 1.124-3.861a9.868 9.868 0 0 1 4.994-4.507c.24-.096.63-.236.637-.229a.859.859 0 0 1-.071.132c-.633 1.046-1.176 3.203-1.275 5.059l-.018.353-.115.162a6.324 6.324 0 0 0-1.094 2.865 9.018 9.018 0 0 0 0 1.521 6.257 6.257 0 0 0 1.208 3.02c.836 1.112 2.034 1.88 3.332 2.14.426.086.53.095 1.082.094.445 0 .547-.005.751-.038a5.349 5.349 0 0 0 2.003-.723c.116-.07.23-.14.252-.158l.041-.031-.092-.039a15.055 15.055 0 0 1-1.08-.556 9.864 9.864 0 0 1-3.215-3.084 9.796 9.796 0 0 1-.613-9.633c.095-.196.236-.466.313-.6.152-.265.535-.852.586-.896.078-.07 1.26-.095 1.865-.041a9.844 9.844 0 0 1 8.65 7.201c.254.942.352 1.744.334 2.764a8.847 8.847 0 0 1-.301 2.261c-.715 2.785-2.654 5.138-5.278 6.405a9.795 9.795 0 0 1-3.547.946 16.36 16.36 0 0 1-1.405-.002 9.878 9.878 0 0 1-5.736-2.407zM27.92 30.69c.022-.079.065-.272.097-.43a6.412 6.412 0 0 0-.299-3.548c-.64-1.645-1.91-2.891-3.508-3.446a1.81 1.81 0 0 0-.196-.06c-.044 0-.192.682-.25 1.148-.029.237-.029 1.131 0 1.37.155 1.251.585 2.3 1.327 3.232.16.201.553.607.747.772.553.47 1.12.796 1.808 1.04.111.04.21.071.219.069a.487.487 0 0 0 .055-.147z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V33.916L16.034 21.5 18 21.197l3.6-1.697 7.4 3.203h8.25L48 23l3.576 1.968-.236 22.01L39.224 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M43.105 4h.972V.818h1.108V0H42v.818h1.105V4Zm2.775 0h.858V1.453h.053L47.663 4h.555l.871-2.547h.056V4H50V0h-1.108l-.924 2.714h-.05L46.99 0h-1.11v4Z" fill="#D1D5DB"/><path d="M8.5 15.976a25.287 25.287 0 0 0-2.51 2.576c3.759 3.831 6.471 9.677 7.384 16.446h3.616c-.729-5.964-2.747-11.473-5.862-15.866A25.981 25.981 0 0 0 8.5 15.976ZM4.094 21.11a25.45 25.45 0 0 0-1.843 3.373C4.403 27.205 5.987 30.854 6.709 35h3.63c-.686-4.454-2.268-8.557-4.628-11.878a21.782 21.782 0 0 0-1.617-2.013ZM0 35h3.64c-.524-2.525-1.437-4.874-2.698-6.908A25.664 25.664 0 0 0 0 35Zm39.508-20.525a24.706 24.706 0 0 0-1.452-.986c-.226.24-.45.48-.67.728-2.898 3.264-6.18 8.26-7.92 15.29a51.47 51.47 0 0 0-2.233-8.181c1.886-4.284 4.23-7.595 6.39-10.042a25.325 25.325 0 0 0-1.775-.594 40.475 40.475 0 0 0-5.487 8.422c-1.214-2.861-2.686-5.532-4.4-7.955-.28-.396-.564-.78-.853-1.157a24.419 24.419 0 0 0-3.864.933c2.992 3.512 5.433 7.964 7.105 13.04a45.547 45.547 0 0 0-1.565 5.779c-1.178-5.448-3.296-10.449-6.24-14.607a31.325 31.325 0 0 0-2.376-2.967 24.84 24.84 0 0 0-3.191 1.858c4.729 4.857 8.08 12.34 9.027 20.964h3.745c.28-2.923.794-5.6 1.475-8.043A51.214 51.214 0 0 1 26.616 35h3.618c1.07-9.432 5.028-15.783 8.43-19.615.28-.315.561-.617.843-.91Zm4.697 4.472a25.448 25.448 0 0 0-1.15-1.322c-3.842 3.993-7.055 9.786-8.058 17.373h1.738c1.026-7.365 4.18-12.37 6.905-15.437.187-.21.376-.414.565-.614ZM41.523 35h1.746c.823-4.566 2.675-7.912 4.479-10.22a24.954 24.954 0 0 0-.833-1.728c-2.503 2.967-4.55 6.95-5.392 11.947Zm8.127-4.09A18.584 18.584 0 0 0 48.11 35H50c0-1.393-.122-2.758-.351-4.09Z" fill="#33B6B4"/></svg>
diff --git a/addons/payment_stripe/static/description/icon.png b/addons/payment_stripe/static/description/icon.png
index 81bb12e9ed8..db3ff8a9771 100644
Binary files a/addons/payment_stripe/static/description/icon.png and b/addons/payment_stripe/static/description/icon.png differ
diff --git a/addons/payment_stripe/static/description/icon.svg b/addons/payment_stripe/static/description/icon.svg
index 70572e645e5..306fccd421d 100644
--- a/addons/payment_stripe/static/description/icon.svg
+++ b/addons/payment_stripe/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#94B6C8"/><stop offset="100%" stop-color="#6A9EBA"/></linearGradient><path id="d" d="M19.25 46h2.714v1.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V37.5H32.5c.333-3.333-.165-5.5-1.494-6.5h18.03v-3.212a.342.342 0 0 0-.339-.343H29.765c.361-1.01.57-1.924.627-2.742h18.644c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V46zm-3.79 9.642h-1.037V55h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 55h1.07l.809 2.389h.01L20.075 55h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V55zm5.66-27.992c4.256 1.523 6.896 3.327 6.896 7.649 0 2.612-.901 4.633-2.64 6.001-1.553 1.244-3.852 1.897-6.616 1.897-3.48 0-6.834-1.057-8.635-2.084l.932-5.814c2.112 1.244 5.342 2.207 7.299 2.207 1.584 0 2.454-.59 2.454-1.616 0-1.058-.901-1.742-3.603-2.706-4.193-1.523-6.771-3.327-6.771-7.556 0-2.332.838-4.26 2.453-5.597 1.553-1.275 3.728-1.959 6.337-1.959 3.696 0 6.367 1.027 7.671 1.649l-.931 5.752c-1.647-.808-4.038-1.71-6.368-1.71-1.273 0-1.988.497-1.988 1.368 0 1.026 1.243 1.68 3.51 2.519z"/><path id="e" d="M19.25 44h2.714v1.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V35.5H32.5c.333-3.333-.165-5.5-1.494-6.5h18.03v-3.212a.342.342 0 0 0-.339-.343H29.765c.361-1.01.57-1.924.627-2.742h18.644c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V44zm-3.79 9.642h-1.037V53h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 53h1.07l.809 2.389h.01L20.075 53h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V53zm5.66-27.992c4.256 1.523 6.896 3.327 6.896 7.649 0 2.612-.901 4.633-2.64 6.001-1.553 1.244-3.852 1.897-6.616 1.897-3.48 0-6.834-1.057-8.635-2.084l.932-5.814c2.112 1.244 5.342 2.207 7.299 2.207 1.584 0 2.454-.59 2.454-1.616 0-1.058-.901-1.742-3.603-2.706-4.193-1.523-6.771-3.327-6.771-7.556 0-2.332.838-4.26 2.453-5.597 1.553-1.275 3.728-1.959 6.337-1.959 3.696 0 6.367 1.027 7.671 1.649l-.931 5.752c-1.647-.808-4.038-1.71-6.368-1.71-1.273 0-1.988.497-1.988 1.368 0 1.026 1.243 1.68 3.51 2.519z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V33.916L14 17.5l13.818 5.203h9.432L48 23l3.576 1.968-.236 22.01L39.224 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M50 25.367c0-3.76-1.722-6.726-5.014-6.726-3.305 0-5.305 2.966-5.305 6.697 0 4.42 2.36 6.652 5.75 6.652 1.652 0 2.902-.396 3.847-.954v-2.937c-.945.499-2.028.807-3.403.807-1.347 0-2.542-.499-2.694-2.232h6.791c0-.19.028-.955.028-1.307Zm-6.861-1.395c0-1.66.958-2.35 1.833-2.35.847 0 1.75.69 1.75 2.35H43.14ZM34.32 18.64c-1.361 0-2.236.676-2.723 1.146l-.18-.91H28.36V36l3.473-.779.013-4.156c.5.382 1.236.925 2.459.925 2.486 0 4.75-2.114 4.75-6.77-.014-4.259-2.306-6.58-4.736-6.58Zm-.834 10.12c-.82 0-1.305-.309-1.639-.69l-.013-5.45c.36-.425.86-.719 1.652-.719 1.264 0 2.14 1.498 2.14 3.422 0 1.968-.862 3.436-2.14 3.436Zm-9.903-10.986 3.486-.793V14l-3.486.778v2.996Z" fill="#635BFF"/><path d="M27.07 18.89h-3.487v12.851h3.486v-12.85Z" fill="#635BFF"/><path fill-rule="evenodd" clip-rule="evenodd" d="m19.847 19.978-.222-1.087h-3v12.85h3.472v-8.708c.82-1.131 2.209-.926 2.64-.764V18.89c-.445-.176-2.07-.5-2.89 1.087Zm-6.944-4.274-3.39.764L9.5 28.232c0 2.173 1.542 3.774 3.597 3.774 1.14 0 1.972-.22 2.43-.485V28.54c-.444.19-2.638.866-2.638-1.307v-5.214h2.639v-3.128h-2.64l.015-3.187ZM3.514 22.62c0-.572.444-.793 1.18-.793 1.056 0 2.39.338 3.445.94v-3.45a8.72 8.72 0 0 0-3.445-.676C1.875 18.64 0 20.197 0 22.797c0 4.053 5.278 3.407 5.278 5.155 0 .675-.556.896-1.334.896-1.152 0-2.625-.5-3.791-1.175v3.495a9.182 9.182 0 0 0 3.791.837c2.89 0 4.875-1.513 4.875-4.141-.013-4.377-5.305-3.599-5.305-5.243Z" fill="#635BFF"/><path d="M43.105 4h.972V.818h1.108V0H42v.818h1.105V4Zm2.775 0h.858V1.453h.053L47.663 4h.555l.871-2.547h.056V4H50V0h-1.108l-.924 2.714h-.05L46.99 0h-1.11v4Z" fill="#D1D5DB"/></svg>
diff --git a/addons/phone_validation/views/phone_blacklist_views.xml b/addons/phone_validation/views/phone_blacklist_views.xml
index 13eadad6dd4..1a1f9df63f8 100644
--- a/addons/phone_validation/views/phone_blacklist_views.xml
+++ b/addons/phone_validation/views/phone_blacklist_views.xml
@@ -25,7 +25,7 @@
                         attrs="{'invisible': ['|', ('active', '=', True), ('number', '=', False)]}"/>
                 </header>
                 <sheet>
-                <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <group>
                         <group>
                             <field name="number"/>
diff --git a/addons/point_of_sale/static/description/icon.png b/addons/point_of_sale/static/description/icon.png
index 49034be0a37..ef7b4e26449 100644
Binary files a/addons/point_of_sale/static/description/icon.png and b/addons/point_of_sale/static/description/icon.png differ
diff --git a/addons/point_of_sale/static/description/icon.svg b/addons/point_of_sale/static/description/icon.svg
index bcc50ac6329..2fdb35d882f 100644
--- a/addons/point_of_sale/static/description/icon.svg
+++ b/addons/point_of_sale/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="98.616%"><stop offset="0%" stop-color="#797C79"/><stop offset="100%" stop-color="#545554"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M32.25 69H4c-2 0-4-1-4-4V39.181L19 20h32v6.208l1.992 12.632L51 41.123V50L32.25 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><path fill="#000" fill-opacity=".3" d="M51 22H19v3.75h32V22zm2 18.75V37l-2-9.375H19L17 37v3.75h2V52h20V40.75h8V52h4V40.75h2zm-18 7.5H23v-7.5h12v7.5z"/><path fill="#FFF" d="M51 20H19v3.75h32V20zm2 18.75V35l-2-9.375H19L17 35v3.75h2V50h20V38.75h8V50h4V38.75h2zm-18 7.5H23v-7.5h12v7.5z"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M9.5 8 6 36h6.019a6.5 6.5 0 0 0 12.962 0H25a6 6 0 0 0 12 0h.019a6.5 6.5 0 0 0 12.962 0H50v-1l-.045-.273a6.231 6.231 0 0 0-.058-.386l-.023-.118-.02-.1-3.797-22.78A4 4 0 0 0 42.112 8H9.5Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M9.5 8 6 36h6.019a6.5 6.5 0 0 0 12.962 0H25a6 6 0 0 0 12 0h.019a6.5 6.5 0 0 0 12.962 0H50v-1l-.045-.273a6.231 6.231 0 0 0-.058-.386l-.023-.118-.02-.1-3.797-22.78A4 4 0 0 0 42.112 8H9.5Z" fill="url(#o_icon_point_of_sale__a)" fill-opacity=".2"/><path d="m14 8-2 28a6 6 0 0 1-12 0v-1l3.494-23.586A4 4 0 0 1 7.451 8H14Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="m14 8-2 28a6 6 0 0 1-12 0v-1l3.494-23.586A4 4 0 0 1 7.451 8H14Z" fill="url(#o_icon_point_of_sale__b)" fill-opacity=".2"/><path d="m35 8 2 28a6 6 0 0 1-12 0V8h10Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="m35 8 2 28a6 6 0 0 1-12 0V8h10Z" fill="url(#o_icon_point_of_sale__c)" fill-opacity=".2"/><path d="M12 36a6 6 0 1 1-12 0h12Z" fill="var(--o-icons-yellow-yellow, #F77B09)"/><path d="M12 36a6 6 0 1 1-12 0h12Z" fill="url(#o_icon_point_of_sale__d)" fill-opacity=".2"/><path d="M37 36a6 6 0 0 1-12 0h12Z" fill="var(--o-icons-yellow-yellow, #F77B09)"/><path d="M37 36a6 6 0 0 1-12 0h12Z" fill="url(#o_icon_point_of_sale__e)" fill-opacity=".2"/><path d="M12.02 36a6.5 6.5 0 0 0 12.961 0H12.02Z" fill="var(--o-icons-purple-purple, #55103D)"/><path d="M12.02 36a6.5 6.5 0 0 0 12.961 0H12.02Z" fill="url(#o_icon_point_of_sale__f)" fill-opacity=".3"/><path d="M37.02 36a6.5 6.5 0 0 0 12.961 0H37.02Z" fill="var(--o-icons-purple-purple, #55103D)"/><path d="M37.02 36a6.5 6.5 0 0 0 12.961 0H37.02Z" fill="url(#o_icon_point_of_sale__g)" fill-opacity=".3"/><defs><linearGradient id="o_icon_point_of_sale__a" x1="6" y1="8" x2="55.789" y2="24.108" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_point_of_sale__b" x1="0" y1="8" x2="17.317" y2="9.783" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_point_of_sale__c" x1="25" y1="8" x2="39.884" y2="9.313" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_point_of_sale__d" x1="0" y1="36" x2="12" y2="42" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_point_of_sale__e" x1="25" y1="36" x2="37" y2="42" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_point_of_sale__f" x1="12.02" y1="36" x2="24.563" y2="42.775" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_point_of_sale__g" x1="37.02" y1="36" x2="49.563" y2="42.775" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/point_of_sale/static/src/scss/pos_variables_extra.scss b/addons/point_of_sale/static/src/scss/pos_variables_extra.scss
index 80494471b9a..ed4ca4c3331 100644
--- a/addons/point_of_sale/static/src/scss/pos_variables_extra.scss
+++ b/addons/point_of_sale/static/src/scss/pos_variables_extra.scss
@@ -12,11 +12,10 @@ $o-gray-800: #353840 !default;
 $o-gray-900: #212529 !default;
 
 $o-enterprise-color: #714B67 !default;
-$o-enterprise-primary-color: #017e84 !default;
-$o-enterprise-primary-color-light: scale-color($o-enterprise-primary-color, $lightness: 6%) !default;
+$o-enterprise-action-color: #017e84 !default;
 
 $o-brand-odoo: $o-enterprise-color !default;
-$o-brand-primary: $o-enterprise-primary-color !default;
+$o-brand-primary: $o-enterprise-action-color !default;
 $o-brand-secondary: #8f8f8f !default;
 $o-brand-lightsecondary: $o-gray-100 !default;
 
@@ -29,5 +28,5 @@ $o-btn-secondary-hover-bg: $o-gray-100 !default;
 $o-btn-secondary-hover-border: $o-gray-200 !default;
 
 // Duplicate variable from web_enterprise/static/src/webclient/navbar/navbar.variables.scss
-$o-navbar-badge-bg: $o-enterprise-primary-color-light !default;
+$o-navbar-badge-bg: $o-enterprise-action-color !default;
 
diff --git a/addons/point_of_sale/static/src/xml/Misc/SearchBar.xml b/addons/point_of_sale/static/src/xml/Misc/SearchBar.xml
index 64588631a56..ba15442b87b 100644
--- a/addons/point_of_sale/static/src/xml/Misc/SearchBar.xml
+++ b/addons/point_of_sale/static/src/xml/Misc/SearchBar.xml
@@ -27,7 +27,7 @@
             <div t-if="props.config.filter.show" class="filter radius-right"
                 t-on-click.stop="() => { state.showFilterOptions = !state.showFilterOptions }">
                 <span class="down-icon">
-                    <i class="fa fa-chevron-down" aria-hidden="true"></i>
+                    <i class="oi oi-chevron-down" aria-hidden="true"></i>
                 </span>
                 <span>
                     <t t-esc="props.config.filter.options.get(state.selectedFilter).text" />
diff --git a/addons/point_of_sale/static/src/xml/Screens/PaymentScreen/PaymentScreen.xml b/addons/point_of_sale/static/src/xml/Screens/PaymentScreen/PaymentScreen.xml
index 70354901593..78722a85af6 100644
--- a/addons/point_of_sale/static/src/xml/Screens/PaymentScreen/PaymentScreen.xml
+++ b/addons/point_of_sale/static/src/xml/Screens/PaymentScreen/PaymentScreen.xml
@@ -47,7 +47,7 @@
                         <div t-if="!env.isMobile" class="button next validation" t-att-class="{ highlight: currentOrder.is_paid() and currentOrder._isValidEmptyOrder() }"
                             t-on-click="() => this.validateOrder()">
                             <div class="pay-circle">
-                                <i class="fa fa-chevron-right" role="img" aria-label="Pay" title="Pay" />
+                                <i class="oi oi-chevron-right" role="img" aria-label="Pay" title="Pay" />
                             </div>
                             <span class="next_text">Validate</span>
                         </div>
diff --git a/addons/point_of_sale/static/src/xml/Screens/ProductScreen/ActionpadWidget.xml b/addons/point_of_sale/static/src/xml/Screens/ProductScreen/ActionpadWidget.xml
index 003f837bb65..d1b0f1b4106 100644
--- a/addons/point_of_sale/static/src/xml/Screens/ProductScreen/ActionpadWidget.xml
+++ b/addons/point_of_sale/static/src/xml/Screens/ProductScreen/ActionpadWidget.xml
@@ -15,7 +15,7 @@
             </button>
             <button class="button pay validation pay-order-button" t-on-click="props.actionToTrigger ? this.props.actionToTrigger : () => this.clickPay()">
                 <div class="pay-circle" t-att-class="{ 'highlight': this.highlightPay }">
-                    <i class="fa fa-chevron-right" role="img" aria-label="Pay" title="Pay" />
+                    <i class="oi oi-chevron-right" role="img" aria-label="Pay" title="Pay" />
                 </div>
                 <t t-esc="props.actionName" />
             </button>
diff --git a/addons/point_of_sale/static/src/xml/Screens/ProductScreen/ProductsWidgetControlPanel.xml b/addons/point_of_sale/static/src/xml/Screens/ProductScreen/ProductsWidgetControlPanel.xml
index e4b338d4829..e648fbbf982 100644
--- a/addons/point_of_sale/static/src/xml/Screens/ProductScreen/ProductsWidgetControlPanel.xml
+++ b/addons/point_of_sale/static/src/xml/Screens/ProductScreen/ProductsWidgetControlPanel.xml
@@ -6,7 +6,7 @@
             <div class="rightpane-header">
                 <div class="search-bar-container sb-product">
                     <span t-if="env.isMobile" class="oe_status oe_icon icon" t-on-click="toggleMobileSearchBar">
-                        <i t-attf-class="fa {{state.mobileSearchBarIsShown ? 'fa-arrow-left' : 'fa-search'}}"/>
+                        <i t-attf-class="fa oi {{state.mobileSearchBarIsShown ? 'oi-arrow-left' : 'fa-search'}}"/>
                     </span>
                     <t t-if="!env.isMobile || state.mobileSearchBarIsShown">
                         <div class="pos-search-bar">
diff --git a/addons/point_of_sale/static/src/xml/Screens/ReceiptScreen/ReceiptScreen.xml b/addons/point_of_sale/static/src/xml/Screens/ReceiptScreen/ReceiptScreen.xml
index fa0bb84fb89..51604a494cd 100644
--- a/addons/point_of_sale/static/src/xml/Screens/ReceiptScreen/ReceiptScreen.xml
+++ b/addons/point_of_sale/static/src/xml/Screens/ReceiptScreen/ReceiptScreen.xml
@@ -44,14 +44,14 @@
                     <div class="button next validation" t-att-class="{ highlight: !locked }"
                         t-on-click="orderDone" name="done">
                         <div class="pay-circle">
-                            <i class="fa fa-chevron-right" role="img" aria-label="Pay" title="Pay" />
+                            <i class="oi oi-chevron-right" role="img" aria-label="Pay" title="Pay" />
                         </div>
                         New Order
                     </div>
                     <div t-if="isResumeVisible()" class="button next validation" t-att-class="{ highlight: !locked }"
                         t-on-click="resumeOrder" name="resume">
                         <div class="pay-circle">
-                            <i class="fa fa-chevron-right" role="img" aria-label="Pay" title="Pay" />
+                            <i class="oi oi-chevron-right" role="img" aria-label="Pay" title="Pay" />
                         </div>
                         Resume Order
                     </div>
diff --git a/addons/point_of_sale/views/pos_config_view.xml b/addons/point_of_sale/views/pos_config_view.xml
index 13dd859587f..9f57757a755 100644
--- a/addons/point_of_sale/views/pos_config_view.xml
+++ b/addons/point_of_sale/views/pos_config_view.xml
@@ -7,7 +7,7 @@
         <field name="arch" type="xml">
             <form string="Point of Sale Configuration">
                 <sheet>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <field name="active" invisible="1"/>
                     <field name="company_has_template" invisible="1"/>
                     <field name="has_active_session" invisible="1"/>
diff --git a/addons/point_of_sale/views/pos_payment_method_views.xml b/addons/point_of_sale/views/pos_payment_method_views.xml
index 506e0f6f05c..ebe6e30974e 100644
--- a/addons/point_of_sale/views/pos_payment_method_views.xml
+++ b/addons/point_of_sale/views/pos_payment_method_views.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <form string="Payment Methods">
                 <sheet>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <field name="active" invisible="1"/>
                     <field name="type" invisible="1" />
                     <div class="oe_title">
diff --git a/addons/point_of_sale/views/res_config_settings_views.xml b/addons/point_of_sale/views/res_config_settings_views.xml
index f71c0806b7d..741a37be85d 100644
--- a/addons/point_of_sale/views/res_config_settings_views.xml
+++ b/addons/point_of_sale/views/res_config_settings_views.xml
@@ -70,7 +70,7 @@
                                     <field name="pos_iface_available_categ_ids" widget="many2many_tags" attrs="{'readonly': [('pos_has_active_session','=', True)]}"/>
                                 </div>
                                 <div class="content-group mt16" attrs="{'invisible': [('pos_limit_categories', '=', False)]}">
-                                    <button name="%(product_pos_category_action)d" icon="fa-arrow-right" type="action" string="PoS Product Categories" class="btn-link"/>
+                                    <button name="%(product_pos_category_action)d" icon="oi-arrow-right" type="action" string="PoS Product Categories" class="btn-link"/>
                                 </div>
                             </setting>
                             <setting help="Improve navigation for imprecise industrial touchscreens">
@@ -86,7 +86,7 @@
                                         <field name="pos_trusted_config_ids" widget="many2many_tags" options="{'no_create':'true'}" placeholder="Select PoS to start sharing orders"/>
                                     </div>
                                     <div>
-                                        <button name="%(point_of_sale.action_pos_config_tree)d" icon="fa-arrow-right" type="action" string="Point of Sales" class="btn-link"/>
+                                        <button name="%(point_of_sale.action_pos_config_tree)d" icon="oi-arrow-right" type="action" string="Point of Sales" class="btn-link"/>
                                     </div>
                                 </div>
                             </setting>
@@ -103,7 +103,7 @@
                                     <field name="sale_tax_id" colspan="4" nolabel="1" domain="[('type_tax_use', 'in', ('sale', 'all')), ('company_id', '=', company_id)]"/>
                                 </div>
                                 <div class="mt8">
-                                    <button name="%(account.action_tax_form)d" icon="fa-arrow-right" type="action" string="Taxes" class="btn-link"/>
+                                    <button name="%(account.action_tax_form)d" icon="oi-arrow-right" type="action" string="Taxes" class="btn-link"/>
                                 </div>
                             </setting>
                             <setting groups="account.group_account_readonly">
@@ -126,7 +126,7 @@
                                         <field name="pos_fiscal_position_ids" widget="many2many_tags" options="{'no_create': True}" domain="['|',('company_id', '=', company_id),('company_id', '=', False)]"/>
                                     </div>
                                     <div>
-                                        <button name="%(account.action_account_fiscal_position_form)d" icon="fa-arrow-right" type="action" string="Fiscal Positions" class="btn-link"/>
+                                        <button name="%(account.action_account_fiscal_position_form)d" icon="oi-arrow-right" type="action" string="Fiscal Positions" class="btn-link"/>
                                     </div>
                                 </div>
                             </setting>
@@ -164,7 +164,7 @@
                                         <field name="pos_pricelist_id" domain="[('id', 'in', pos_allowed_pricelist_ids)]" options="{'no_create': True}"/>
                                     </div>
                                     <div class="mt8">
-                                        <button name="%(product.product_pricelist_action2)d" icon="fa-arrow-right" type="action" string="Pricelists" groups="product.group_product_pricelist" class="btn-link"/>
+                                        <button name="%(product.product_pricelist_action2)d" icon="oi-arrow-right" type="action" string="Pricelists" groups="product.group_product_pricelist" class="btn-link"/>
                                     </div>
                                 </div>
                             </setting>
@@ -176,7 +176,7 @@
                                 <div class="content-group">
                                     <a attrs="{'invisible': [('pos_iface_tax_included', '!=', 'total')]}"
                                         href="https://www.odoo.com/documentation/master/applications/finance/accounting/taxation/taxes/B2B_B2C.html"
-                                        target="_blank" class="oe-link"><i class="fa fa-fw fa-arrow-right"/>How to manage tax-included prices</a>
+                                        target="_blank" class="oe-link"><i class="oi oi-fw oi-arrow-right"/>How to manage tax-included prices</a>
                                 </div>
                             </setting>
                             <setting help="Allow cashiers to set a discount per line">
@@ -232,7 +232,7 @@
                             <setting id="payment_methods_new" string="Payment Methods" help="Payment methods available">
                                 <field name="pos_payment_method_ids" colspan="4" widget="many2many_tags" attrs="{'readonly': [('pos_has_active_session','=', True)], 'required': [('pos_company_has_template', '=', True)]}" options="{'no_create': True}" />
                                 <div>
-                                    <button name="%(action_payment_methods_tree)d" icon="fa-arrow-right" type="action" string="Payment Methods" class="btn-link"/>
+                                    <button name="%(action_payment_methods_tree)d" icon="oi-arrow-right" type="action" string="Payment Methods" class="btn-link"/>
                                 </div>
                             </setting>
                             <setting string="Automatically validate order" help="Automatically validates orders paid with a payment terminal.">
@@ -251,7 +251,7 @@
                                     </div>
                                 </div>
                                 <div class="mt8">
-                                    <button name="%(account.rounding_list_action)d" icon="fa-arrow-right"
+                                    <button name="%(account.rounding_list_action)d" icon="oi-arrow-right"
                                             type="action" string="Cash Roundings" class="btn-link"
                                             attrs="{'invisible': [('group_cash_rounding', '=', False)]}"/>
                                 </div>
@@ -341,7 +341,7 @@
                                         <field name="pos_printer_ids" widget="many2many_tags"/>
                                     </div>
                                     <div>
-                                        <button name="%(point_of_sale.action_pos_printer_form)d" icon="fa-arrow-right" type="action" string="Printers" class="btn-link"/>
+                                        <button name="%(point_of_sale.action_pos_printer_form)d" icon="oi-arrow-right" type="action" string="Printers" class="btn-link"/>
                                     </div>
                                 </div>
                             </setting>
diff --git a/addons/portal/static/src/xml/portal_chatter.xml b/addons/portal/static/src/xml/portal_chatter.xml
index d7849f70925..f51ed85015f 100644
--- a/addons/portal/static/src/xml/portal_chatter.xml
+++ b/addons/portal/static/src/xml/portal_chatter.xml
@@ -121,7 +121,7 @@
             <t t-if="!_.isEmpty(widget.get('pager'))">
                 <ul class="pagination" t-if="widget.get('pager')['pages'].length &gt; 1">
                     <li t-if="widget.get('pager')['page'] != widget.get('pager')['page_previous']" t-att-data-page="widget.get('pager')['page_previous']" class="page-item o_portal_chatter_pager_btn">
-                        <a href="#" class="page-link"><i class="fa fa-chevron-left" role="img" aria-label="Previous" title="Previous"/></a>
+                        <a href="#" class="page-link"><i class="oi oi-chevron-left" role="img" aria-label="Previous" title="Previous"/></a>
                     </li>
                     <t t-foreach="widget.get('pager')['pages']" t-as="page">
                         <li t-att-data-page="page" t-attf-class="page-item #{page == widget.get('pager')['page'] ? 'o_portal_chatter_pager_btn active' : 'o_portal_chatter_pager_btn'}">
@@ -129,7 +129,7 @@
                         </li>
                     </t>
                     <li t-if="widget.get('pager')['page'] != widget.get('pager')['page_next']" t-att-data-page="widget.get('pager')['page_next']" class="page-item o_portal_chatter_pager_btn">
-                        <a href="#" class="page-link"><i class="fa fa-chevron-right" role="img" aria-label="Next" title="Next"/></a>
+                        <a href="#" class="page-link"><i class="oi oi-chevron-right" role="img" aria-label="Next" title="Next"/></a>
                     </li>
                 </ul>
             </t>
diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml
index ee28f736cc3..2d0ffc47e06 100644
--- a/addons/portal/views/portal_templates.xml
+++ b/addons/portal/views/portal_templates.xml
@@ -117,7 +117,7 @@
         <div t-ignore="true" class="text-center">
             <t t-if="custom_html" t-out="custom_html"/>
             <t t-else="">This is a preview of the customer portal.</t>
-            <a t-att-href="backend_url"><i class="fa fa-arrow-right me-1"/>Back to edit mode</a>
+            <a t-att-href="backend_url"><i class="oi oi-arrow-right me-1"/>Back to edit mode</a>
         </div>
         <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
     </template>
@@ -631,8 +631,8 @@
     <template id="record_pager" name="Portal Record Pager">
         <t t-if='prev_record or next_record'>
             <div class="record_pager btn-group" role="group">
-                <a role="button" t-att-class="'btn btn-link %s' % ('disabled' if not prev_record else '')" t-att-href="prev_record or '#'" ><i class="fa fa-chevron-left" role="img" aria-label="Previous" title="Previous"></i></a>
-                <a role="button" t-att-class="'btn btn-link %s' % ('disabled' if not next_record else '')" t-att-href="next_record or '#'" ><i class="fa fa-chevron-right" role="img" aria-label="Next" title="Next"></i></a>
+                <a role="button" t-att-class="'btn btn-link %s' % ('disabled' if not prev_record else '')" t-att-href="prev_record or '#'" ><i class="oi oi-chevron-left" role="img" aria-label="Previous" title="Previous"></i></a>
+                <a role="button" t-att-class="'btn btn-link %s' % ('disabled' if not next_record else '')" t-att-href="next_record or '#'" ><i class="oi oi-chevron-right" role="img" aria-label="Next" title="Next"></i></a>
             </div>
         </t>
     </template>
diff --git a/addons/pos_loyalty/views/res_config_settings_view.xml b/addons/pos_loyalty/views/res_config_settings_view.xml
index 47d5a10c50b..1e4960e237c 100644
--- a/addons/pos_loyalty/views/res_config_settings_view.xml
+++ b/addons/pos_loyalty/views/res_config_settings_view.xml
@@ -11,10 +11,10 @@
                         <field name="pos_gift_card_settings" colspan="4" nolabel="1" widget="radio"/>
                     </div>
                     <div class="mt8">
-                        <button name="%(loyalty.loyalty_program_discount_loyalty_action)d" icon="fa-arrow-right" type="action" string="Discount &amp; Loyalty" class="btn-link"/>
+                        <button name="%(loyalty.loyalty_program_discount_loyalty_action)d" icon="oi-arrow-right" type="action" string="Discount &amp; Loyalty" class="btn-link"/>
                     </div>
                     <div class="mt8">
-                        <button name="%(loyalty.loyalty_program_gift_ewallet_action)d" icon="fa-arrow-right" type="action" string="Gift cards &amp; eWallet" class="btn-link"/>
+                        <button name="%(loyalty.loyalty_program_gift_ewallet_action)d" icon="oi-arrow-right" type="action" string="Gift cards &amp; eWallet" class="btn-link"/>
                     </div>
                 </div>
             </xpath>
diff --git a/addons/pos_mercury/views/pos_config_setting_views.xml b/addons/pos_mercury/views/pos_config_setting_views.xml
index 82b57a6a607..c4a95634b61 100644
--- a/addons/pos_mercury/views/pos_config_setting_views.xml
+++ b/addons/pos_mercury/views/pos_config_setting_views.xml
@@ -7,10 +7,10 @@
         <field name="arch" type="xml">
             <div id="btn_use_pos_mercury" position="replace">
                 <div class="mt16">
-                    <button name="%(pos_mercury.action_configuration_form)d" icon="fa-arrow-right" type="action" string="Vantiv Accounts" class="btn-link"/>
+                    <button name="%(pos_mercury.action_configuration_form)d" icon="oi-arrow-right" type="action" string="Vantiv Accounts" class="btn-link"/>
                 </div>
                 <div>
-                    <a href="https://www.odoo.com/app/point-of-sale-hardware#part_8" target="_blank"><i class="fa fa-fw fa-arrow-right"/>Buy a card reader</a>
+                    <a href="https://www.odoo.com/app/point-of-sale-hardware#part_8" target="_blank"><i class="oi oi-fw oi-arrow-right"/>Buy a card reader</a>
                 </div>
             </div>
         </field>
diff --git a/addons/pos_restaurant/static/src/xml/Screens/ProductScreen/ActionpadWidget.xml b/addons/pos_restaurant/static/src/xml/Screens/ProductScreen/ActionpadWidget.xml
index 6ab196ef9d6..b590e28ebb9 100644
--- a/addons/pos_restaurant/static/src/xml/Screens/ProductScreen/ActionpadWidget.xml
+++ b/addons/pos_restaurant/static/src/xml/Screens/ProductScreen/ActionpadWidget.xml
@@ -26,7 +26,7 @@
         <!-- Replace the customer button by the payment button, the customer button will be added in the mixins -->
         <xpath expr="//button[hasclass('set-partner')]" position="after">
             <button t-on-click="clickPay" class="button pay-order-button" t-att-class="{ 'highlight': this.highlightPay }" t-if="this.swapButton">
-                <i class="fa fa-chevron-right" role="img" aria-label="Pay" title="Pay" />
+                <i class="oi oi-chevron-right" role="img" aria-label="Pay" title="Pay" />
                 Payment
             </button>
         </xpath>
diff --git a/addons/pos_restaurant/static/src/xml/Screens/ProductScreen/ControlButtons/TransferOrderButton.xml b/addons/pos_restaurant/static/src/xml/Screens/ProductScreen/ControlButtons/TransferOrderButton.xml
index 4096e7c26ab..97bc4c3c872 100644
--- a/addons/pos_restaurant/static/src/xml/Screens/ProductScreen/ControlButtons/TransferOrderButton.xml
+++ b/addons/pos_restaurant/static/src/xml/Screens/ProductScreen/ControlButtons/TransferOrderButton.xml
@@ -3,7 +3,7 @@
 
     <t t-name="TransferOrderButton" owl="1">
         <div class="control-button" t-on-click="() => this.click()">
-            <i class="fa fa-arrow-right" />
+            <i class="oi oi-arrow-right" />
             <span> </span>
             <span>Transfer</span>
         </div>
diff --git a/addons/pos_restaurant/static/src/xml/Screens/SplitBillScreen/SplitBillScreen.xml b/addons/pos_restaurant/static/src/xml/Screens/SplitBillScreen/SplitBillScreen.xml
index 5f8d444bfed..998d4f99195 100644
--- a/addons/pos_restaurant/static/src/xml/Screens/SplitBillScreen/SplitBillScreen.xml
+++ b/addons/pos_restaurant/static/src/xml/Screens/SplitBillScreen/SplitBillScreen.xml
@@ -35,7 +35,7 @@
                         </div>
                         <div class="pay-button">
                             <div class="button" t-on-click="proceed">
-                                <i class="fa fa-chevron-right" />
+                                <i class="oi oi-chevron-right" />
                                 <span> </span>
                                 <span>Payment</span>
                             </div>
diff --git a/addons/pos_restaurant/views/pos_restaurant_views.xml b/addons/pos_restaurant/views/pos_restaurant_views.xml
index 3c0c769a5b2..11fbe6bc44f 100644
--- a/addons/pos_restaurant/views/pos_restaurant_views.xml
+++ b/addons/pos_restaurant/views/pos_restaurant_views.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Restaurant Floor">
                     <sheet>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <field name="active" invisible="1"/>
                         <group col="4">
                             <field name="name" />
diff --git a/addons/pos_restaurant/views/res_config_settings_views.xml b/addons/pos_restaurant/views/res_config_settings_views.xml
index 995d14dd4f7..b741f5f049d 100644
--- a/addons/pos_restaurant/views/res_config_settings_views.xml
+++ b/addons/pos_restaurant/views/res_config_settings_views.xml
@@ -15,7 +15,7 @@
                                 <field name="pos_floor_ids" widget="many2many_tags" attrs="{'readonly': [('pos_has_active_session','=', True)]}" />
                             </div>
                             <div>
-                                <button name="%(pos_restaurant.action_restaurant_floor_form)d" icon="fa-arrow-right" type="action" string="Floors" class="btn-link"/>
+                                <button name="%(pos_restaurant.action_restaurant_floor_form)d" icon="oi-arrow-right" type="action" string="Floors" class="btn-link"/>
                             </div>
                         </div>
                     </setting>
diff --git a/addons/pos_self_order/static/src/NavBar/NavBar.xml b/addons/pos_self_order/static/src/NavBar/NavBar.xml
index d38481f3b6a..cbdf787f67f 100644
--- a/addons/pos_self_order/static/src/NavBar/NavBar.xml
+++ b/addons/pos_self_order/static/src/NavBar/NavBar.xml
@@ -5,7 +5,7 @@
             <t t-if="props.previousPage">
                 <button class="btn btn-link text-dark"
                         t-on-click="() => env.navigate(props.previousPage)">
-                    <i class="fa fa-fw fa-chevron-left">
+                    <i class="oi oi-fw oi-chevron-left">
                 </button>
             </t>
             <div class="mx-auto overflow-hidden">
diff --git a/addons/pos_stripe/views/pos_payment_method_views.xml b/addons/pos_stripe/views/pos_payment_method_views.xml
index b8081fe6d5d..c16ec017a5c 100644
--- a/addons/pos_stripe/views/pos_payment_method_views.xml
+++ b/addons/pos_stripe/views/pos_payment_method_views.xml
@@ -9,7 +9,7 @@
                 <!-- Stripe -->
                 <field name="stripe_serial_number" attrs="{'invisible': [('use_payment_terminal', '!=', 'stripe')], 'required': [('use_payment_terminal', '=', 'stripe')]}"/>
                 <div colspan="2" class="mt16" attrs="{'invisible': [('use_payment_terminal', '!=', 'stripe')], 'required': [('use_payment_terminal', '=', 'stripe')]}">
-                    <button name="action_stripe_key" type="object" icon="fa-arrow-right" string="Don't forget to complete Stripe connect before using this payment method." class="btn-link"/>
+                    <button name="action_stripe_key" type="object" icon="oi-arrow-right" string="Don't forget to complete Stripe connect before using this payment method." class="btn-link"/>
                 </div>
             </xpath>
         </field>
diff --git a/addons/product/static/description/icon.png b/addons/product/static/description/icon.png
index 2079879b777..2b058daa2c2 100644
Binary files a/addons/product/static/description/icon.png and b/addons/product/static/description/icon.png differ
diff --git a/addons/product/static/description/icon.svg b/addons/product/static/description/icon.svg
index 2b0b6824ca2..57fb2f1163e 100644
--- a/addons/product/static/description/icon.svg
+++ b/addons/product/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#B06161"/><stop offset="45.785%" stop-color="#984E4E"/><stop offset="100%" stop-color="#7C3838"/></linearGradient><path id="d" d="M48.466 42.033c0 .837-.277 1.548-.831 2.133L36.606 55.823c-.584.585-1.265.877-2.044.877-.793 0-1.467-.292-2.021-.877l-16.06-16.965c-.569-.585-1.051-1.382-1.448-2.393s-.595-1.935-.595-2.773v-9.857c0-.821.284-1.532.853-2.132.569-.6 1.243-.9 2.021-.9h9.344c.794 0 1.67.209 2.628.627.959.419 1.722.928 2.291 1.528l16.06 16.919c.554.616.83 1.335.83 2.156zM24.5 28.385c0-.838-.28-1.552-.842-2.145-.562-.592-1.24-.888-2.033-.888-.794 0-1.471.296-2.033.888-.561.593-.842 1.307-.842 2.145 0 .837.28 1.552.842 2.144.562.592 1.24.889 2.033.889.794 0 1.471-.297 2.033-.889.561-.592.842-1.307.842-2.144zm32.59 13.648c0 .837-.276 1.548-.83 2.133L45.23 55.823c-.584.585-1.265.877-2.044.877-.539 0-.98-.11-1.325-.332-.344-.22-.74-.576-1.19-1.066l10.557-11.136c.554-.585.83-1.296.83-2.133 0-.821-.276-1.54-.83-2.156l-16.06-16.919c-.57-.6-1.333-1.11-2.291-1.528-.958-.418-1.834-.628-2.628-.628h5.031c.794 0 1.67.21 2.628.628.959.419 1.722.928 2.291 1.528l16.06 16.919c.554.616.83 1.335.83 2.156z"/><path id="e" d="M48.466 40.033c0 .837-.277 1.548-.831 2.133L36.606 53.823c-.584.585-1.265.877-2.044.877-.793 0-1.467-.292-2.021-.877l-16.06-16.965c-.569-.585-1.051-1.382-1.448-2.393s-.595-1.935-.595-2.773v-9.857c0-.821.284-1.532.853-2.132.569-.6 1.243-.9 2.021-.9h9.344c.794 0 1.67.209 2.628.627.959.419 1.722.928 2.291 1.528l16.06 16.919c.554.616.83 1.335.83 2.156zM24.5 26.385c0-.838-.28-1.552-.842-2.145-.562-.592-1.24-.888-2.033-.888-.794 0-1.471.296-2.033.888-.561.593-.842 1.307-.842 2.145 0 .837.28 1.552.842 2.144.562.592 1.24.889 2.033.889.794 0 1.471-.297 2.033-.889.561-.592.842-1.307.842-2.144zm32.59 13.648c0 .837-.276 1.548-.83 2.133L45.23 53.823c-.584.585-1.265.877-2.044.877-.539 0-.98-.11-1.325-.332-.344-.22-.74-.576-1.19-1.066l10.557-11.136c.554-.585.83-1.296.83-2.133 0-.821-.276-1.54-.83-2.156l-16.06-16.919c-.57-.6-1.333-1.11-2.291-1.528-.958-.418-1.834-.628-2.628-.628h5.031c.794 0 1.67.21 2.628.628.959.419 1.722.928 2.291 1.528l16.06 16.919c.554.616.83 1.335.83 2.156z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V33.916L16.402 19h19.682L56.79 41 39.224 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M28.236 7.243a6.487 6.487 0 0 0-7.242 2.822l-3.885 6.253a2.418 2.418 0 0 0-.197 2.158L26.914 44l17.025-6.636a3.228 3.228 0 0 0 1.838-4.186l-8.822-22.514a2.427 2.427 0 0 0-1.613-1.453l-7.106-1.968Zm-1.092 7.864a1.787 1.787 0 0 0 1.017-2.316 1.795 1.795 0 0 0-2.323-1.015 1.787 1.787 0 0 0-1.017 2.317c.36.92 1.4 1.374 2.323 1.014Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M28.236 7.243a6.487 6.487 0 0 0-7.242 2.822l-3.885 6.253a2.418 2.418 0 0 0-.197 2.158L26.914 44l17.025-6.636a3.228 3.228 0 0 0 1.838-4.186l-8.822-22.514a2.427 2.427 0 0 0-1.613-1.453l-7.106-1.968Zm-1.092 7.864a1.787 1.787 0 0 0 1.017-2.316 1.795 1.795 0 0 0-2.323-1.015 1.787 1.787 0 0 0-1.017 2.317c.36.92 1.4 1.374 2.323 1.014Z" fill="url(#o_icon_product__a)" fill-opacity=".2"/><path fill-rule="evenodd" clip-rule="evenodd" d="M32.423 10.924a6.482 6.482 0 0 0-6.734-3.878l-7.322.88a2.43 2.43 0 0 0-1.814 1.194L4.435 30.055a3.226 3.226 0 0 0 1.185 4.413l15.831 9.115L35.19 19.851c.382-.66.43-1.462.13-2.163l-2.897-6.764Zm-6.84 4.061a1.797 1.797 0 0 0 2.45-.654 1.786 1.786 0 0 0-.657-2.443 1.796 1.796 0 0 0-2.45.654 1.786 1.786 0 0 0 .657 2.443Z" fill="var(--o-icons-purple-pure, #93407D)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M32.423 10.924a6.482 6.482 0 0 0-6.734-3.878l-7.322.88a2.43 2.43 0 0 0-1.814 1.194L4.435 30.055a3.226 3.226 0 0 0 1.185 4.413l15.831 9.115L35.19 19.851c.382-.66.43-1.462.13-2.163l-2.897-6.764Zm-6.84 4.061a1.797 1.797 0 0 0 2.45-.654 1.786 1.786 0 0 0-.657-2.443 1.796 1.796 0 0 0-2.45.654 1.786 1.786 0 0 0 .657 2.443Z" fill="url(#o_icon_product__b)" fill-opacity=".2"/><path fill-rule="evenodd" clip-rule="evenodd" d="M27.781 7.134a6.476 6.476 0 0 1 4.642 3.79l2.898 6.764c.3.701.252 1.503-.13 2.163L24.61 38.125l-7.7-19.649a2.418 2.418 0 0 1 .198-2.158l3.885-6.253a6.487 6.487 0 0 1 6.787-2.93Zm-2.028 7.938a1.791 1.791 0 0 1-.826-2.53 1.796 1.796 0 0 1 2.321-.721 1.787 1.787 0 0 1-.105 3.287 1.792 1.792 0 0 1-1.39-.036Z" fill="var(--o-icons-purple-cyan, #102E7A)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M27.781 7.134a6.476 6.476 0 0 1 4.642 3.79l2.898 6.764c.3.701.252 1.503-.13 2.163L24.61 38.125l-7.7-19.649a2.418 2.418 0 0 1 .198-2.158l3.885-6.253a6.487 6.487 0 0 1 6.787-2.93Zm-2.028 7.938a1.791 1.791 0 0 1-.826-2.53 1.796 1.796 0 0 1 2.321-.721 1.787 1.787 0 0 1-.105 3.287 1.792 1.792 0 0 1-1.39-.036Z" fill="url(#o_icon_product__c)" fill-opacity=".3"/><defs><linearGradient id="o_icon_product__a" x1="16.745" y1="7.007" x2="51.939" y2="13.965" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_product__b" x1="4" y1="7" x2="41.648" y2="15.108" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_product__c" x1="16.745" y1="7.007" x2="39.687" y2="10.466" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/product/static/src/js/pricelist_report/product_pricelist_report.xml b/addons/product/static/src/js/pricelist_report/product_pricelist_report.xml
index c7d76191cfb..69ba59d5993 100644
--- a/addons/product/static/src/js/pricelist_report/product_pricelist_report.xml
+++ b/addons/product/static/src/js/pricelist_report/product_pricelist_report.xml
@@ -5,16 +5,16 @@
     <t t-name="product.ProductPricelistReport" owl="1">
         <div class="o_action">
             <Layout display="{ controlPanel: { 'bottom-right': false } }">
-                <t t-set-slot="control-panel-bottom-left">
+                <t t-set-slot="control-panel-always-buttons">
                     <button t-on-click="onClickPrint" type="button" class="btn btn-primary" title="Print">Print</button>
                 </t>
-                <t t-set-slot="control-panel-top-right">
-                    <form class="o_pricelist_report_form d-flex flex-column ">
-                        <div class="d-flex align-items-center gap-3 w-100 ">
-                            <div class="d-flex align-items-center">
-                                <label class="fw-bold">Pricelist:</label>
-                                <div class="o_select_dropdown">
-                                    <select name="pricelists"
+                <t t-set-slot="layout-actions">
+                    <form class="o_pricelist_report_form d-flex flex-column gap-1">
+                        <div class="d-flex align-items-center gap-3 w-100">
+                            <label class="visually-hidden" for="pricelists">Username</label>
+                            <div class="input-group w-auto">
+                                <div class="input-group-text fw-bold">Pricelist</div>
+                                <select name="pricelists"
                                             id="pricelists"
                                             class="o_select form-select border-0"
                                             t-on-change="onSelectPricelist">
@@ -25,20 +25,20 @@
                                             </t>
                                     </t>
                                     </select>
-                                </div>
                             </div>
-                            <div class="form-check m-0 p-0">
+                            <div class="form-check w-auto">
                                 <input class="o_display_pricelist_title form-check-input ms-0 me-2"
+                                    id="display_pricelist_title"
                                     type="checkbox"
                                     t-att-checked="displayPricelistTitle"
                                     t-on-click="onToggleDisplayPricelist"/>
-                                <label class="form-check-label">Display Pricelist</label>
+                                <label for="display_pricelist_title" class="form-check-label">Display Pricelist</label>
                             </div>
                         </div>
                         <div class="d-flex align-items-center gap-3 w-100">
                             <div class="input-group d-flex flex-nowrap w-50" style="min-width:210px;">
                                 <span class="input-group-text fw-bold"> 
-                                    Quantities:
+                                    Quantities
                                 </span>
                                 <input type="number"
                                     class="form-control add-quantity-input"
diff --git a/addons/product/views/product_pricelist_views.xml b/addons/product/views/product_pricelist_views.xml
index 2a04b727233..62bdd8cfb66 100644
--- a/addons/product/views/product_pricelist_views.xml
+++ b/addons/product/views/product_pricelist_views.xml
@@ -59,7 +59,7 @@
         <field name="arch" type="xml">
             <form string="Products Price List">
                 <sheet>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="oe_title">
                         <h1><field name="name" placeholder="e.g. USD Retailers"/></h1>
                     </div>
diff --git a/addons/product/views/product_views.xml b/addons/product/views/product_views.xml
index 748407828e4..73045a4df80 100644
--- a/addons/product/views/product_views.xml
+++ b/addons/product/views/product_views.xml
@@ -27,16 +27,16 @@
                                     <span class="o_stat_value">
                                         <field name="pricelist_item_count"/>
                                     </span>
-                                    <span attrs="{'invisible': [('pricelist_item_count', '=', 1)]}">
+                                    <span class="o_stat_text" attrs="{'invisible': [('pricelist_item_count', '=', 1)]}">
                                         Extra Prices
                                     </span>
-                                    <span attrs="{'invisible': [('pricelist_item_count', '!=', 1)]}">
+                                    <span class="o_stat_text" attrs="{'invisible': [('pricelist_item_count', '!=', 1)]}">
                                         Extra Price
                                     </span>
                                </div>
                         </button>
                     </div>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <field name="id" invisible="True"/>
                     <field name="image_1920" widget="image" class="oe_avatar" options="{'preview_image': 'image_128'}"/>
                     <div class="oe_title">
@@ -235,7 +235,7 @@
                     </header>
                     <sheet>
                         <div class="oe_button_box" name="button_box"/>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <field name="active" invisible="1"/>
                         <field name="id" invisible="1"/>
                         <field name="company_id" invisible="1"/>
diff --git a/addons/project/__manifest__.py b/addons/project/__manifest__.py
index 6f23cbb3e07..ecee52dbfb9 100644
--- a/addons/project/__manifest__.py
+++ b/addons/project/__manifest__.py
@@ -99,7 +99,7 @@
             'web/static/src/scss/pre_variables.scss',
             'web/static/lib/bootstrap/scss/_variables.scss',
 
-            ('include', 'web._assets_bootstrap'),
+            ('include', 'web._assets_bootstrap_backend'),
 
             'base/static/src/css/modules.css',
 
diff --git a/addons/project/static/description/icon.png b/addons/project/static/description/icon.png
index 03b587e6038..3e926ea75b9 100644
Binary files a/addons/project/static/description/icon.png and b/addons/project/static/description/icon.png differ
diff --git a/addons/project/static/description/icon.svg b/addons/project/static/description/icon.svg
index 7fd6ba946ff..c88079374dd 100644
--- a/addons/project/static/description/icon.svg
+++ b/addons/project/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="98.162%" x2="0%" y1="1.838%" y2="100%"><stop offset="0%" stop-color="#797DA5"/><stop offset="50.799%" stop-color="#6D7194"/><stop offset="100%" stop-color="#626584"/></linearGradient><path id="d" d="M55.253 36.993c-3.23 0-4.629 2.41-6.384 2.41-4.666 0-.419-13.45-.419-13.45s-15.27 6.106-15.27-.251c0-2.735 2.822-3.53 2.822-6.563 0-2.709-2.187-4.176-4.781-4.176-2.696 0-5.163 1.442-5.163 4.3 0 3.158 2.467 4.525 2.467 6.24 0 5.313-13.684 2.187-13.684 2.187v25.432s13.898 3.133 13.898-2.187c0-1.715-3.112-3.061-3.112-6.218 0-2.859 2.275-4.3 4.946-4.3 2.62 0 4.807 1.466 4.807 4.176 0 3.032-2.823 3.828-2.823 6.562 0 4.64 10.088 1.963 14.1 1.963 0 0-2.702-9.165 2.009-9.165 2.797 0 3.611 2.759 6.714 2.759 2.773 0 4.273-2.138 4.273-4.698 0-2.61-1.475-5.021-4.4-5.021z"/><path id="e" d="M55.253 34.993c-3.23 0-4.629 2.41-6.384 2.41-4.666 0 1.522-11.755-.419-13.45-1.94-1.695-15.27 6.106-15.27-.251 0-2.735 2.822-3.53 2.822-6.563 0-2.709-2.187-4.176-4.781-4.176-2.696 0-5.163 1.442-5.163 4.3 0 3.158 2.467 4.525 2.467 6.24 0 5.313-13.684 2.187-13.684 2.187v25.432s13.898 3.133 13.898-2.187c0-1.715-3.112-3.061-3.112-6.218 0-2.859 2.275-4.3 4.946-4.3 2.62 0 4.807 1.466 4.807 4.176 0 3.032-2.823 3.828-2.823 6.562 0 4.64 12.677 2.6 14.1 1.963 1.422-.636-2.702-9.165 2.009-9.165 2.797 0 3.611 2.759 6.714 2.759 2.773 0 4.273-2.138 4.273-4.698 0-2.61-1.475-5.021-4.4-5.021z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 70c-2 0-4-.148-4-4.15V39.197L27 15l11 24.84 6 .066 11.113-.066 4.21 2.112L42.511 70H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="m30.842 34.612-8.105 10.387L5.452 31.37a3.862 3.862 0 0 1-.616-5.417l5.748-7.243 20.258 15.903Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="m30.842 34.612-8.105 10.387L5.452 31.37a3.862 3.862 0 0 1-.616-5.417l5.748-7.243 20.258 15.903Z" fill="url(#o_icon_project__a)" fill-opacity=".2"/><path d="m22.622 44.909-10.455-8.335 8.127-10.242 10.548 8.28L22.737 45l-.115-.091Z" fill="var(--o-icons-purple-teal, #003458)"/><path d="m22.622 44.909-10.455-8.335 8.127-10.242 10.548 8.28L22.737 45l-.115-.091Z" fill="url(#o_icon_project__b)" fill-opacity=".3"/><path d="m22.593 44.886.144.114 22.447-28.767a3.862 3.862 0 0 0-.636-5.393L37.223 5 20.296 26.332l10.547 8.28-8.105 10.387-.144-.113Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path d="m22.593 44.886.144.114 22.447-28.767a3.862 3.862 0 0 0-.636-5.393L37.223 5 20.296 26.332l10.547 8.28-8.105 10.387-.144-.113Z" fill="url(#o_icon_project__c)" fill-opacity=".2"/><defs><linearGradient id="o_icon_project__a" x1="4" y1="18.709" x2="35.5" y2="26.749" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_project__b" x1="12.167" y1="26.332" x2="34.137" y2="31.827" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_project__c" x1="20.295" y1="5" x2="51.618" y2="10.032" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/project/static/src/components/project_control_panel/project_control_panel.xml b/addons/project/static/src/components/project_control_panel/project_control_panel.xml
index 0d4555ec9ac..b38d58e35c8 100644
--- a/addons/project/static/src/components/project_control_panel/project_control_panel.xml
+++ b/addons/project/static/src/components/project_control_panel/project_control_panel.xml
@@ -10,45 +10,18 @@
 
     <t t-name="project.ProjectControlPanelContent" owl="1">
         <t t-if="showProjectUpdate">
-            <li t-if="isProjectUser" class="o_project_updates_breadcrumb ps-3" t-on-click="onStatusClick">
+            <div t-if="isProjectUser" class="o_project_updates_breadcrumb z-index-1" t-on-click="onStatusClick">
                 <t t-call="project.ProjectControlPanelContentBadge"></t>
-            </li>
-            <li t-else="" class="o_project_updates_breadcrumb ps-3">
+            </div>
+            <div t-else="" class="o_project_updates_breadcrumb z-index-1">
                 <t t-call="project.ProjectControlPanelContentBadge"></t>
-            </li>
+            </div>
         </t>
     </t>
 
-    <t t-name="project.Breadcrumbs" t-inherit="web.Breadcrumbs" t-inherit-mode="primary" owl="1">
-        <xpath expr="//ol" position="inside">
-            <t t-call="project.ProjectControlPanelContent"/>
-        </xpath>
-    </t>
-
-    <t t-name="project.Breadcrumbs.Small" t-inherit="web.Breadcrumbs.Small" t-inherit-mode="primary" owl="1">
-        <xpath expr="//ol" position="inside">
-            <t t-call="project.ProjectControlPanelContent"/>
-        </xpath>
-    </t>
-
-    <t t-name="project.ProjectControlPanel.Regular" t-inherit="web.ControlPanel.Regular" t-inherit-mode="primary" owl="1">
-        <xpath expr="//t[@t-call='web.Breadcrumbs']" position="replace">
-            <t t-call="project.Breadcrumbs"/>
-        </xpath>
-    </t>
-
-    <t t-name="project.ProjectControlPanel.Small" t-inherit="web.ControlPanel.Small" t-inherit-mode="primary" owl="1">
-        <xpath expr="//t[@t-call='web.Breadcrumbs.Small']" position="replace">
-            <t t-call="project.Breadcrumbs.Small"/>
-        </xpath>
-    </t>
-
     <t t-name="project.ProjectControlPanel" t-inherit="web.ControlPanel" t-inherit-mode="primary" owl="1">
-        <xpath expr="//t[@t-call='web.ControlPanel.Regular']" position="replace">
-            <t t-call="project.ProjectControlPanel.Regular"/>
-        </xpath>
-        <xpath expr="//t[@t-call='web.ControlPanel.Small']" position="replace">
-            <t t-call="project.ProjectControlPanel.Small"/>
+        <xpath expr="//t[@t-call='web.Breadcrumbs']" position="after">
+            <t t-call="project.ProjectControlPanelContent"/>
         </xpath>
     </t>
 
diff --git a/addons/project/static/src/components/project_right_side_panel/project_right_side_panel.scss b/addons/project/static/src/components/project_right_side_panel/project_right_side_panel.scss
index 67a50c78b92..6d8dc794341 100644
--- a/addons/project/static/src/components/project_right_side_panel/project_right_side_panel.scss
+++ b/addons/project/static/src/components/project_right_side_panel/project_right_side_panel.scss
@@ -37,9 +37,11 @@ $o-rightpanel-p-tiny: $o-rightpanel-p-small*0.5;
         .o_form_view {
             .oe_button_box {
                 margin: -1px (-$o-rightpanel-p) 0;
+                box-shadow: inset 0 -1px 0 $border-color;
 
                 .oe_stat_button {
                     flex-basis: 25%;
+                    margin: 0;
 
                     &:nth-child(4n):not(:last-child) {
                         border-right-width: 0;
diff --git a/addons/project/static/src/components/project_right_side_panel/project_right_side_panel.xml b/addons/project/static/src/components/project_right_side_panel/project_right_side_panel.xml
index e6e772049b5..2b6b130ead8 100644
--- a/addons/project/static/src/components/project_right_side_panel/project_right_side_panel.xml
+++ b/addons/project/static/src/components/project_right_side_panel/project_right_side_panel.xml
@@ -14,7 +14,7 @@
                             <ViewButton
                                 t-if="button.show"
                                 defaultRank="'oe_stat_button'"
-                                className="'h-auto py-2 border border-start-0 border-top-0 text-start'"
+                                className="'flex-grow-0 h-auto py-2 border border-start-0 border-top-0 text-start rounded-0'"
                                 icon="`fa-${button.icon}`"
                                 title="button.text"
                                 clickParams="_getStatButtonClickParams(button)"
diff --git a/addons/project/static/src/components/project_status_with_color_selection/project_status_with_color_selection_field.xml b/addons/project/static/src/components/project_status_with_color_selection/project_status_with_color_selection_field.xml
index 46f605cee97..8c9adb223b1 100644
--- a/addons/project/static/src/components/project_status_with_color_selection/project_status_with_color_selection_field.xml
+++ b/addons/project/static/src/components/project_status_with_color_selection/project_status_with_color_selection_field.xml
@@ -8,8 +8,8 @@
                     <span t-attf-class="o_status {{ statusColor(currentValue) }} d-inline-block"/>
                 </div>
                 <div class="ps-2">
-                    <div class="" t-out="string" t-att-raw-value="value"/>
-                    <div class="fw-normal" t-if="this.props.statusLabel" t-out="this.props.statusLabel"/>
+                    <div class="o_stat_text" t-if="this.props.statusLabel" t-out="this.props.statusLabel"/>
+                    <div class="o_stat_value" t-out="string" t-att-raw-value="value"/>
                 </div>
             </div>
         </xpath>
diff --git a/addons/project/static/src/components/project_task_state_selection/project_task_state_selection.js b/addons/project/static/src/components/project_task_state_selection/project_task_state_selection.js
index 51584f5ba61..0f7f5d03b98 100644
--- a/addons/project/static/src/components/project_task_state_selection/project_task_state_selection.js
+++ b/addons/project/static/src/components/project_task_state_selection/project_task_state_selection.js
@@ -33,12 +33,12 @@ export class ProjectTaskStateSelection extends StateSelectionField {
             "04_waiting_normal": "",
         };
         this.colorButton = {
-            "01_in_progress": "btn-light border-2 border-dark",
-            "03_approved": "btn-light border-2 border-success",
-            "02_changes_requested": "btn-light border-2 border-warning",
-            "1_done": "btn-success",
-            "1_canceled": "btn-danger",
-            "04_waiting_normal": "btn-light border-2 border-dark",
+            "01_in_progress": "btn-outline-secondary",
+            "03_approved": "btn-outline-success",
+            "02_changes_requested": "btn-outline-warning",
+            "1_done": "btn-outline-success",
+            "1_canceled": "btn-outline-danger",
+            "04_waiting_normal": "btn-outline-secondary",
         };
         if (this.props.viewType != 'form') {
             super.setup();
diff --git a/addons/project/static/src/components/project_task_state_selection/project_task_state_selection.xml b/addons/project/static/src/components/project_task_state_selection/project_task_state_selection.xml
index 300c4e78559..7e4e65ceb2f 100644
--- a/addons/project/static/src/components/project_task_state_selection/project_task_state_selection.xml
+++ b/addons/project/static/src/components/project_task_state_selection/project_task_state_selection.xml
@@ -27,7 +27,8 @@
                     <i t-attf-class="{{ stateIcon(currentValue) }} {{ statusColor(currentValue) }} {{ ['1_done', '1_canceled'].includes(currentValue) and isView(['kanban']) ? 'opacity-50' : '' }}"></i>
                 </button>
                 <button t-else="" class="o_state_button btn oe_highlight rounded-pill" style="white-space: nowrap;" tabindex="-1"
-                    t-att-class="currentValue == '1_done' ? 'btn-success' : 'btn-light border-2 border-dark'"
+                    t-attf-class="#{currentValue == '1_done' ? 'btn-success' : 'btn-outline-secondary'}"
+                    t-att-class="{'bg-view border' : state.isStateButtonHighlighted}"
                     t-on-click="toggleState" t-on-mouseenter="onMouseEnterStateButton"
                     t-on-mouseleave="onMouseLeaveStateButton">
                     <div class="d-flex align-items-center">
@@ -61,7 +62,7 @@
                     </span>
                 </t>
                 <t t-elif="currentValue != '1_done' and currentValue != '1_canceled'">
-                    <span t-attf-class="{{ statusColor(currentValue) }} o_status_label" t-out="label"/>
+                    <span t-attf-class="o_status_label" t-out="label"/>
                 </t>
                 <t t-else="">
                     <span class="o_status_label" t-out="label"/>
diff --git a/addons/project/static/src/js/tours/project.js b/addons/project/static/src/js/tours/project.js
index 1e7830b0193..9bf40892772 100644
--- a/addons/project/static/src/js/tours/project.js
+++ b/addons/project/static/src/js/tours/project.js
@@ -38,7 +38,7 @@ registry.category("web_tour.tours").add('project_tour', {
         actions.auto('.modal:visible .btn.btn-primary');
     },
 }, {
-    trigger: ".o_kanban_project_tasks .o_column_quick_create .input-group .o_input",
+    trigger: ".o_kanban_project_tasks .o_column_quick_create .o_kanban_header input",
     content: Markup(_t("Add columns to organize your tasks into <b>stages</b> <i>e.g. New - In Progress - Done</i>.")),
     position: 'bottom',
     run: "text Test",
@@ -46,7 +46,7 @@ registry.category("web_tour.tours").add('project_tour', {
     trigger: ".o_kanban_project_tasks .o_column_quick_create .o_kanban_add",
     position: 'right',
 }, {
-    trigger: ".o_kanban_project_tasks .o_column_quick_create .input-group .o_input",
+    trigger: ".o_kanban_project_tasks .o_column_quick_create .o_kanban_header input",
     extra_trigger: '.o_kanban_group',
     content: Markup(_t("Add columns to organize your tasks into <b>stages</b> <i>e.g. New - In Progress - Done</i>.")),
     position: 'bottom',
diff --git a/addons/project/static/src/project_sharing/components/chatter/chatter_pager.xml b/addons/project/static/src/project_sharing/components/chatter/chatter_pager.xml
index 85b478d61de..5bc7785c22c 100644
--- a/addons/project/static/src/project_sharing/components/chatter/chatter_pager.xml
+++ b/addons/project/static/src/project_sharing/components/chatter/chatter_pager.xml
@@ -4,7 +4,7 @@
         <div class="d-flex justify-content-center">
             <ul class="pagination mb-0 pb-4" t-if="state.pages.length &gt; 1">
                 <li t-if="props.page != props.page_previous" t-att-data-page="state.pagePrevious" class="page-item o_portal_chatter_pager_btn">
-                    <a t-on-click="() => this.onPageChanged(state.pagePrevious)" class="page-link"><i class="fa fa-chevron-left" role="img" aria-label="Previous" title="Previous"/></a>
+                    <a t-on-click="() => this.onPageChanged(state.pagePrevious)" class="page-link"><i class="oi oi-chevron-left" role="img" aria-label="Previous" title="Previous"/></a>
                 </li>
                 <t t-foreach="state.pages" t-as="page" t-key="page_index">
                     <li t-att-data-page="page" t-attf-class="page-item #{page == props.page ? 'o_portal_chatter_pager_btn active' : 'o_portal_chatter_pager_btn'}">
@@ -12,7 +12,7 @@
                     </li>
                 </t>
                 <li t-if="props.page != state.pageNext" t-att-data-page="state.pageNext" class="page-item o_portal_chatter_pager_btn">
-                    <a t-on-click="() => this.onPageChanged(state.pageNext)" class="page-link"><i class="fa fa-chevron-right" role="img" aria-label="Next" title="Next"/></a>
+                    <a t-on-click="() => this.onPageChanged(state.pageNext)" class="page-link"><i class="oi oi-chevron-right" role="img" aria-label="Next" title="Next"/></a>
                 </li>
             </ul>
         </div>
diff --git a/addons/project/static/tests/burndown_chart_tests.js b/addons/project/static/tests/burndown_chart_tests.js
index a4d658dec98..1da286af8e0 100644
--- a/addons/project/static/tests/burndown_chart_tests.js
+++ b/addons/project/static/tests/burndown_chart_tests.js
@@ -2,7 +2,7 @@
 
 import { browser } from "@web/core/browser/browser";
 import { click, getFixture, patchWithCleanup } from "@web/../tests/helpers/utils";
-import { setupControlPanelServiceRegistry, toggleGroupByMenu, toggleMenuItem, toggleMenuItemOption } from "@web/../tests/search/helpers";
+import { setupControlPanelServiceRegistry, toggleSearchBarMenu, toggleMenuItem, toggleMenuItemOption } from "@web/../tests/search/helpers";
 import { makeView } from "@web/../tests/views/helpers";
 import { registry } from "@web/core/registry";
 import { makeFakeNotificationService, fakeCookieService } from "@web/../tests/helpers/mock_services";
@@ -133,7 +133,7 @@ QUnit.module("Project", {}, () => {
         }
 
         async function openGroupByMainMenu(target) {
-            await toggleGroupByMenu(target);
+            await toggleSearchBarMenu(target);
         }
 
         async function openGroupByDateMenu(target) {
@@ -164,12 +164,8 @@ QUnit.module("Project", {}, () => {
         QUnit.test("check that removing the group by 'Date: Month > Stage' in the search bar triggers a notification", async function (assert) {
 
             const stepsTriggeringNotification = async () => {
-                const removeFilterXpath = `//div[contains(@class, 'o_searchview_facet')]
-                                                [.//span[@class='o_facet_value']
-                                                [contains(., 'Date: Month')]]
-                                            /i[contains(@class, 'o_facet_remove')]`;
-                const removeFilterElement = getFirstElementForXpath(target, removeFilterXpath);
-                await click(removeFilterElement);
+                // There's only one possibility here
+                await click(target, ".o_facet_remove");
             };
             await testBurnDownChartWithSearchView(stepsTriggeringNotification, assert);
         });
@@ -216,7 +212,7 @@ QUnit.module("Project", {}, () => {
 
         function checkGroupByOrder(assert) {
             const dateSearchFacetXpath = `//div[contains(@class, 'o_searchview_facet')]
-                                            [.//span[@class='o_facet_value']
+                                            [.//small[@class='o_facet_value']
                                             [contains(., 'Date: Month')]]`;
             const dateSearchFacetElement = getFirstElementForXpath(target, dateSearchFacetXpath);
             const dateSearchFacetParts = dateSearchFacetElement.querySelectorAll('.o_facet_value');
diff --git a/addons/project/static/tests/tours/personal_stage_tour.js b/addons/project/static/tests/tours/personal_stage_tour.js
index 25cdb4ecb6b..e3b6799c48e 100644
--- a/addons/project/static/tests/tours/personal_stage_tour.js
+++ b/addons/project/static/tests/tours/personal_stage_tour.js
@@ -35,7 +35,7 @@ registry.category("web_tour.tours").add('personal_stage_tour', {
     trigger: '.o_column_quick_create .o_quick_create_folded'
 }, {
     content: "Create a new personal stage",
-    trigger: 'input.form-control.o_input',
+    trigger: 'input.form-control',
     run: 'text Never',
 }, {
     content: "Confirm create",
diff --git a/addons/project/static/tests/tours/project_burndown_chart_tour.js b/addons/project/static/tests/tours/project_burndown_chart_tour.js
index af3b2ac549e..ba38e91c718 100644
--- a/addons/project/static/tests/tours/project_burndown_chart_tour.js
+++ b/addons/project/static/tests/tours/project_burndown_chart_tour.js
@@ -16,7 +16,7 @@ registry.category("web_tour.tours").add('burndown_chart_tour', {
     trigger: '.o_kanban_record:contains("Burndown Chart Test") .o_kanban_manage_reporting div[role="menuitem"] a:contains("Burndown Chart")',
 }, {
     content: 'The sort buttons are not rendered',
-    trigger: '.o_cp_bottom_left:not(:has(.btn-group[role=toolbar][aria-label="Sort graph"]))',
+    trigger: '.o_graph_renderer:not(:has(.btn-group[role=toolbar][aria-label="Sort graph"]))',
     extra_trigger: '.o_graph_renderer',
 }, {
     content: 'Remove the project search "Burndown Chart Test"',
@@ -35,8 +35,8 @@ registry.category("web_tour.tours").add('burndown_chart_tour', {
     content: 'A "The Burndown Chart must be grouped by Date and Stage" notification is shown when trying to remove the group by "Date: Month > Stage"',
     trigger: '.o_notification_manager .o_notification:contains("The Burndown Chart must be grouped by Date and Stage") button.o_notification_close',
 }, {
-    content: 'Open the group by menu',
-    trigger: '.o_group_by_menu button',
+    content: 'Open the search panel menu',
+    trigger: '.o_control_panel .o_searchview_dropdown_toggler',
 }, {
     content: 'The Stage group menu item is invisible',
     trigger: '.o_group_by_menu:not(:has(.o_menu_item:contains("Stage")))',
@@ -56,8 +56,8 @@ registry.category("web_tour.tours").add('burndown_chart_tour', {
     content: 'A "The Burndown Chart must be grouped by Date" notification is shown when trying to remove the group by "Date: Month > Stage"',
     trigger: '.o_notification_manager .o_notification:contains("The Burndown Chart must be grouped by Date") button.o_notification_close',
 }, {
-    content: 'Open the filter menu',
-    trigger: '.o_filter_menu button',
+    content: 'Open the search panel menu',
+    trigger: '.o_control_panel .o_searchview_dropdown_toggler',
 }, {
     content: 'Open the Date filter sub menu',
     trigger: '.o_filter_menu button.o_menu_item:contains("Date")',
@@ -73,7 +73,10 @@ registry.category("web_tour.tours").add('burndown_chart_tour', {
 }, {
     content: 'Close the Date filter menu',
     trigger: '.o_graph_renderer',
+}, {
+    content: 'Open the search panel menu',
+    trigger: '.o_control_panel .o_searchview_dropdown_toggler',
 }, {
     content: 'The comparison menu is not rendered',
-    trigger: '.o_search_options:not(:has(.o_comparison_menu))',
+    trigger: ':not(:has(.o_comparison_menu))',
 }]});
diff --git a/addons/project/static/tests/tours/project_sharing_tour.js b/addons/project/static/tests/tours/project_sharing_tour.js
index fbe50508cf4..7dbaaafa75b 100644
--- a/addons/project/static/tests/tours/project_sharing_tour.js
+++ b/addons/project/static/tests/tours/project_sharing_tour.js
@@ -62,38 +62,23 @@ const projectSharingSteps = [...stepUtils.goToAppSteps("project.menu_main_pm", '
     trigger: 'iframe ol.breadcrumb > li.o_back_button > a:contains(Project Sharing)',
     content: 'Go back to the kanban view',
 }, {
-    trigger: 'iframe .o_filter_menu > button',
-    content: 'click on filter menu in the search view',
+    trigger: 'iframe .o_searchview_dropdown_toggler',
+    content: 'open the search panel menu',
 }, {
-    trigger: 'iframe .o_filter_menu > .dropdown-menu > .dropdown-item:first-child',
+    trigger: 'iframe .o_filter_menu .dropdown-item:first-child',
     content: 'click on the first item in the filter menu',
 }, {
-    trigger: 'iframe .o_group_by_menu > button',
-    content: 'click on group by menu in the search view',
-}, {
-    trigger: 'iframe .o_group_by_menu > .dropdown-menu > .dropdown-item:first-child',
+    trigger: 'iframe .o_group_by_menu .dropdown-item:first-child',
     content: 'click on the first item in the group by menu',
-}, {
-    trigger: 'iframe .o_favorite_menu > button',
-    content: 'click on the favorite menu in the search view',
 }, {
     trigger: 'iframe .o_favorite_menu .o_add_favorite > button',
     content: 'click to "save current search" button in favorite menu',
 }, {
-    trigger: 'iframe .o_filter_menu > button',
-    content: 'click on filter menu in the search view',
-}, {
-    trigger: 'iframe .o_filter_menu > .dropdown-menu > .dropdown-item:first-child',
+    trigger: 'iframe .o_filter_menu .dropdown-item:first-child',
     content: 'click on the first item in the filter menu',
 }, {
-    trigger: 'iframe .o_group_by_menu > button',
-    content: 'click on group by menu in the search view',
-}, {
-    trigger: 'iframe .o_group_by_menu > .dropdown-menu > .dropdown-item:first-child',
+    trigger: 'iframe .o_group_by_menu .dropdown-item:first-child',
     content: 'click on the first item in the group by menu',
-}, {
-    trigger: 'iframe .o_favorite_menu > button',
-    content: 'click on the favorite menu in the search view',
 }, {
     trigger: 'iframe .o_favorite_menu .o_add_favorite > button',
     content: 'click to "save current search" button in favorite menu',
diff --git a/addons/project/views/project_project_stage_views.xml b/addons/project/views/project_project_stage_views.xml
index c6fd9f145b5..782948275f7 100644
--- a/addons/project/views/project_project_stage_views.xml
+++ b/addons/project/views/project_project_stage_views.xml
@@ -33,7 +33,7 @@
         <field name="arch" type="xml">
             <form delete="0">
                 <sheet>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <h1><field name="name" placeholder="New"/></h1>
                     <group>
                         <group>
diff --git a/addons/project/views/project_project_views.xml b/addons/project/views/project_project_views.xml
index be775f590e4..e96c85131e4 100644
--- a/addons/project/views/project_project_views.xml
+++ b/addons/project/views/project_project_views.xml
@@ -29,8 +29,8 @@
                 <sheet string="Project">
                     <div class="oe_button_box" name="button_box" groups="base.group_user">
                         <button class="oe_stat_button" name="project_update_all_action" type="object" groups="project.group_project_manager">
-                            <div>
-                                <field name="last_update_color" invisible="1"/>
+                            <field name="last_update_color" invisible="1"/>
+                            <div class="o_stat_info">
                                 <field name="last_update_status" readonly="1" widget="status_with_color" status_label="Project Status"/>
                             </div>
                         </button>
@@ -51,7 +51,7 @@
                             </div>
                         </button>
                     </div>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="oe_title">
                         <h1 class="d-flex flex-row">
                             <field name="is_favorite" nolabel="1" widget="boolean_favorite" class="me-2"/>
@@ -134,7 +134,7 @@
                                                 </div>
                                                 <div class="content-group">
                                                     <div class="mt8">
-                                                        <button name="%(project.open_task_type_form_domain)d" context="{'project_id':id}" icon="fa-arrow-right" type="action" string="Set a Rating Email Template on Stages" class="btn-link"/>
+                                                        <button name="%(project.open_task_type_form_domain)d" context="{'project_id':id}" icon="oi-arrow-right" type="action" string="Set a Rating Email Template on Stages" class="btn-link"/>
                                                     </div>
                                                 </div>
                                             </div>
@@ -486,7 +486,7 @@
                                         <field name="activity_ids" widget="kanban_activity"/>
                                     </div>
                                     <div class="oe_kanban_bottom_right">
-                                        <field name="user_id" widget="many2one_avatar_user" domain="[('share', '=', False)]" style="padding-right: 4px;"/>
+                                        <field name="user_id" widget="many2one_avatar_user" domain="[('share', '=', False)]"/>
                                         <field t-if="record.last_update_status.value &amp;&amp; widget.editable" name="last_update_status" widget="project_state_selection"/>
                                         <span t-if="record.last_update_status.value &amp;&amp; !widget.editable" t-att-class="'o_status_bubble mx-0 o_color_bubble_' + record.last_update_color.value" t-att-title="record.last_update_status.value"></span>
                                     </div>
diff --git a/addons/project/views/project_sharing_project_task_views.xml b/addons/project/views/project_sharing_project_task_views.xml
index d9f490483ba..22a67e601ad 100644
--- a/addons/project/views/project_sharing_project_task_views.xml
+++ b/addons/project/views/project_sharing_project_task_views.xml
@@ -129,7 +129,7 @@
                 </header>
                 <div groups="base.group_user" role="status" class="alert alert-info alert-dismissible rounded-0 fade show d-print-none css_editable_mode_hidden">
                     <div class="text-center">This is a preview of how the project will look when it's shared with customers and they have editing access.
-                        <a name="action_redirect_to_project_task_form" type="object"><i class="fa fa-arrow-right me-1"/>Back to edit mode</a>
+                        <a name="action_redirect_to_project_task_form" type="object"><i class="oi oi-arrow-right me-1"/>Back to edit mode</a>
                     </div>
                 </div>
                 <sheet string="Task">
@@ -146,7 +146,7 @@
                             </div>
                         </button>
                     </div>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="oe_title pe-0">
                         <h1 class="d-flex flex-row justify-content-between">
                             <field name="priority" widget="priority" class="me-3"/>
diff --git a/addons/project/views/project_task_type_views.xml b/addons/project/views/project_task_type_views.xml
index 9052a00f875..47a11a15ce2 100644
--- a/addons/project/views/project_task_type_views.xml
+++ b/addons/project/views/project_task_type_views.xml
@@ -21,7 +21,7 @@
                 <form string="Task Stage" delete="0">
                     <field name="active" invisible="1" />
                     <sheet>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}" />
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}" />
                         <group>
                             <group>
                                 <field name="name"/>
@@ -51,7 +51,7 @@
                 <form string="Task Stage" delete="0">
                     <field name="active" invisible="1" />
                     <sheet>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}" />
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}" />
                         <group>
                             <group>
                                 <field name="name"/>
diff --git a/addons/project/views/project_task_views.xml b/addons/project/views/project_task_views.xml
index 17a794ad7c3..62416bcf1e1 100644
--- a/addons/project/views/project_task_views.xml
+++ b/addons/project/views/project_task_views.xml
@@ -278,11 +278,10 @@
                         <button name="action_open_parent_task" type="object" class="oe_stat_button" icon="fa-tasks" string="Parent Task" attrs="{'invisible': [('parent_id', '=', False)]}"/>
                         <button name="action_recurring_tasks" type="object" attrs="{'invisible': ['|', ('active', '=', False), ('recurrence_id', '=', False)]}" class="oe_stat_button" icon="fa-repeat" groups="project.group_project_recurring_tasks">
                             <div class="o_field_widget o_stat_info">
+                                <span class="o_stat_text">Recurring Tasks</span>
                                 <span class="o_stat_value">
                                     <field name="recurring_count" widget="statinfo" nolabel="1" />
-                                    Tasks
                                 </span>
-                                <span class="o_stat_text">in Recurrence</span>
                             </div>
                         </button>
                         <button name="%(project_task_action_sub_task)d" type="action" class="oe_stat_button" icon="fa-tasks"
@@ -306,7 +305,7 @@
                         <!-- Dummy tag used to organize buttons -->
                         <span id="end_button_box" invisible="1"/>
                     </div>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="oe_title pe-0">
                         <h1 class="d-flex justify-content-between align-items-center">
                             <div class="d-flex w-100">
diff --git a/addons/project/views/res_config_settings_views.xml b/addons/project/views/res_config_settings_views.xml
index cceae04851b..68e435360b9 100644
--- a/addons/project/views/res_config_settings_views.xml
+++ b/addons/project/views/res_config_settings_views.xml
@@ -19,7 +19,7 @@
                                 <field name="group_project_stages"/>
                                 <div class="content-group" attrs="{'invisible': [('group_project_stages', '=', False)]}">
                                     <div class="mt8">
-                                        <button name="%(project.project_project_stage_configure)d" icon="fa-arrow-right" type="action" string="Configure Stages" class="btn-link"/>
+                                        <button name="%(project.project_project_stage_configure)d" icon="oi-arrow-right" type="action" string="Configure Stages" class="btn-link"/>
                                     </div>
                                 </div>
                             </setting>
@@ -40,7 +40,7 @@
                                 <field name="group_project_rating"/>
                                 <div class="content-group" attrs="{'invisible': [('group_project_rating', '=', False)]}">
                                     <div class="mt16">
-                                        <button name="%(project.open_task_type_form)d" context="{'project_id':id}" icon="fa-arrow-right" type="action" string="Set a Rating Email Template on Stages" class="btn-link"/>
+                                        <button name="%(project.open_task_type_form)d" context="{'project_id':id}" icon="oi-arrow-right" type="action" string="Set a Rating Email Template on Stages" class="btn-link"/>
                                     </div>
                                 </div>
                             </setting>
diff --git a/addons/purchase/static/description/icon.png b/addons/purchase/static/description/icon.png
index 119affb4d5a..48de8fec2a8 100644
Binary files a/addons/purchase/static/description/icon.png and b/addons/purchase/static/description/icon.png differ
diff --git a/addons/purchase/static/description/icon.svg b/addons/purchase/static/description/icon.svg
index 89c7ef89829..15476b47229 100644
--- a/addons/purchase/static/description/icon.svg
+++ b/addons/purchase/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#94B6C8"/><stop offset="100%" stop-color="#6A9EBA"/></linearGradient><path id="d" d="M53.551 19.955H16.223c-2.07 0-3.742 1.64-3.742 3.663v26.864c0 2.022 1.673 3.663 3.742 3.663h37.328c2.07 0 3.742-1.64 3.742-3.663V23.618c0-2.023-1.672-3.663-3.742-3.663zm-36.86 3.663h36.393c.257 0 .467.206.467.458v3.205H16.223v-3.205c0-.252.21-.458.467-.458zm36.393 26.864H16.69a.464.464 0 0 1-.467-.458V37.05h37.328v12.974c0 .252-.21.458-.467.458zM27.42 42.85v3.053c0 .503-.42.916-.934.916h-5.601a.928.928 0 0 1-.934-.916V42.85c0-.504.42-.916.934-.916h5.601c.514 0 .934.412.934.916zm14.937 0v3.053c0 .503-.42.916-.934.916h-10.58a.928.928 0 0 1-.934-.916V42.85c0-.504.42-.916.934-.916h10.58c.514 0 .934.412.934.916z"/><path id="e" d="M53.551 17.955H16.223c-2.07 0-3.742 1.64-3.742 3.663v26.864c0 2.022 1.673 3.663 3.742 3.663h37.328c2.07 0 3.742-1.64 3.742-3.663V21.618c0-2.023-1.672-3.663-3.742-3.663zm-36.86 3.663h36.393c.257 0 .467.206.467.458v3.205H16.223v-3.205c0-.252.21-.458.467-.458zm36.393 26.864H16.69a.464.464 0 0 1-.467-.458V35.05h37.328v12.974c0 .252-.21.458-.467.458zM27.42 40.85v3.053c0 .503-.42.916-.934.916h-5.601a.928.928 0 0 1-.934-.916V40.85c0-.504.42-.916.934-.916h5.601c.514 0 .934.412.934.916zm14.937 0v3.053c0 .503-.42.916-.934.916h-10.58a.928.928 0 0 1-.934-.916V40.85c0-.504.42-.916.934-.916h10.58c.514 0 .934.412.934.916z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M43.95 70H4c-2 0-4-.149-4-4.163V38.095l13.403-18.86L56 20.04l1.006 29.996L43.95 70z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-opacity=".3" fill-rule="nonzero" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M0 12h50v26a4 4 0 0 1-4 4H0V12Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M0 12h50v26a4 4 0 0 1-4 4H0V12Z" fill="url(#o_icon_purchase__a)" fill-opacity=".2"/><path d="M4 21a4 4 0 0 1-4-4v-5a4 4 0 0 1 4-4h46v9a4 4 0 0 1-4 4H4Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path d="M4 21a4 4 0 0 1-4-4v-5a4 4 0 0 1 4-4h46v9a4 4 0 0 1-4 4H4Z" fill="url(#o_icon_purchase__b)" fill-opacity=".2"/><path d="M0 16h50v4a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4v-4Z" fill="var(--o-icons-purple-teal, #003458)"/><path d="M0 16h50v4a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4v-4Z" fill="url(#o_icon_purchase__c)" fill-opacity=".3"/><defs><linearGradient id="o_icon_purchase__a" x1="0" y1="12" x2="53.254" y2="34.189" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_purchase__b" x1="0" y1="8" x2="32.475" y2="39.226" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_purchase__c" x1="0" y1="16" x2="18.161" y2="44.377" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/purchase/views/product_views.xml b/addons/purchase/views/product_views.xml
index 638f3c75b10..de2a4601af1 100644
--- a/addons/purchase/views/product_views.xml
+++ b/addons/purchase/views/product_views.xml
@@ -90,9 +90,9 @@
                         groups="purchase.group_purchase_user"
                         type="object" icon="fa-credit-card" attrs="{'invisible': [('purchase_ok', '=', False)]}" help="Purchased in the last 365 days">
                         <div class="o_field_widget o_stat_info">
-                            <span class="o_stat_value">
-                                <field name="purchased_product_qty" widget="statinfo" nolabel="1" class="mr4"/>
-                                <field name="uom_name"/>
+                            <span class="o_stat_value d-flex gap-1">
+                                <field name="purchased_product_qty" widget="statinfo" nolabel="1" class="oe_inline"/>
+                                <field name="uom_name"  class="oe_inline"/>
                             </span>
                             <span class="o_stat_text">Purchased</span>
                         </div>
@@ -111,9 +111,9 @@
                         groups="purchase.group_purchase_user"
                         type="object" icon="fa-credit-card" attrs="{'invisible': [('purchase_ok', '=', False)]}" help="Purchased in the last 365 days">
                         <div class="o_field_widget o_stat_info">
-                            <span class="o_stat_value">
-                                <field name="purchased_product_qty" widget="statinfo" nolabel="1" class="mr4"/>
-                                <field name="uom_name"/>
+                            <span class="o_stat_value d-flex gap-1">
+                                <field name="purchased_product_qty" widget="statinfo" nolabel="1" class="oe_inline"/>
+                                <field name="uom_name"  class="oe_inline"/>
                             </span>
                             <span class="o_stat_text">Purchased</span>
                         </div>
diff --git a/addons/purchase/views/res_config_settings_views.xml b/addons/purchase/views/res_config_settings_views.xml
index be91bf06890..3f46a4d7582 100644
--- a/addons/purchase/views/res_config_settings_views.xml
+++ b/addons/purchase/views/res_config_settings_views.xml
@@ -51,7 +51,7 @@
                             <field name="group_product_variant"/>
                             <div class="content-group" attrs="{'invisible': [('group_product_variant','=',False)]}">
                                 <div class="mt8">
-                                    <button name="%(product.attribute_action)d" icon="fa-arrow-right" type="action" string="Attributes" class="btn-link"/>
+                                    <button name="%(product.attribute_action)d" icon="oi-arrow-right" type="action" string="Attributes" class="btn-link"/>
                                 </div>
                             </div>
                         </setting>
@@ -66,7 +66,7 @@
                             <field name="group_uom"/>
                             <div class="content-group">
                                 <div class="mt8" attrs="{'invisible': [('group_uom', '=', False)]}">
-                                    <button name="%(uom.product_uom_categ_form_action)d" icon="fa-arrow-right"
+                                    <button name="%(uom.product_uom_categ_form_action)d" icon="oi-arrow-right"
                                             type="action" string="Units Of Measure" class="btn-link"/>
                                 </div>
                             </div>
diff --git a/addons/purchase_requisition/views/purchase_requisition_views.xml b/addons/purchase_requisition/views/purchase_requisition_views.xml
index 5dfab9d3bfa..9e0cd14e6eb 100644
--- a/addons/purchase_requisition/views/purchase_requisition_views.xml
+++ b/addons/purchase_requisition/views/purchase_requisition_views.xml
@@ -44,7 +44,7 @@
         <field name="arch" type="xml">
             <form string="Purchase Agreement Types">
             <sheet>
-                <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                 <group>
                     <group string="Agreement Type">
                         <field name="name"/>
diff --git a/addons/purchase_stock/static/src/js/tours/purchase_stock.js b/addons/purchase_stock/static/src/js/tours/purchase_stock.js
index 6f626b25add..52f6344eff1 100644
--- a/addons/purchase_stock/static/src/js/tours/purchase_stock.js
+++ b/addons/purchase_stock/static/src/js/tours/purchase_stock.js
@@ -14,8 +14,8 @@ PurchaseAdditionalTourSteps.include({
     _get_purchase_stock_steps: function () {
         this._super.apply(this, arguments);
         return [{
-            trigger: ".oe_button_box button[name='action_view_picking']",
-            extra_trigger: ".oe_button_box button[name='action_view_picking']",
+            trigger: ".o-form-buttonbox button[name='action_view_picking']",
+            extra_trigger: ".o-form-buttonbox button[name='action_view_picking']",
             content: _t("Receive the ordered products."),
             position: "bottom",
             run: 'click',
diff --git a/addons/repair/static/description/icon.png b/addons/repair/static/description/icon.png
index 1e5cd99cfb9..a74845efe33 100644
Binary files a/addons/repair/static/description/icon.png and b/addons/repair/static/description/icon.png differ
diff --git a/addons/repair/static/description/icon.svg b/addons/repair/static/description/icon.svg
index b2ad0dfd013..4b3d4afd13a 100644
--- a/addons/repair/static/description/icon.svg
+++ b/addons/repair/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#7CC098"/><stop offset="100%" stop-color="#5F8A71"/></linearGradient><path id="d" d="M18.952 29.454h8.316l3.163-4.327-3.163-4.327h-8.316c-.74 0-1.192-.791-.81-1.411C20.135 16.159 23.76 14 27.9 14c6.283 0 11.426 5.059 11.387 11.198-.04 6.112-5.122 11.055-11.387 11.055-4.145 0-7.773-2.164-9.764-5.399-.38-.616.08-1.4.816-1.4zm14.994 8.574l-1.42-1.388c3.258-1.25 5.88-3.81 7.157-6.993l15.835 15.472a4.866 4.866 0 0 1 0 6.994c-1.977 1.931-5.181 1.931-7.157 0l-2.487-2.43c-.735-6.3-5.734-11.243-11.928-11.655zm14.83 9.352c0 1.024.85 1.854 1.898 1.854s1.898-.83 1.898-1.854-.85-1.854-1.898-1.854-1.898.83-1.898 1.854zm-21.772 3.937a7.262 7.262 0 0 1 0-2.634l-1.6-.924a.451.451 0 0 1-.205-.525 9.294 9.294 0 0 1 2.053-3.55.451.451 0 0 1 .556-.084l1.599.923a7.19 7.19 0 0 1 2.28-1.319v-1.846c0-.21.147-.393.353-.44a9.382 9.382 0 0 1 4.1 0 .45.45 0 0 1 .351.44v1.846a7.19 7.19 0 0 1 2.28 1.319l1.6-.923a.451.451 0 0 1 .556.084 9.294 9.294 0 0 1 2.053 3.55.451.451 0 0 1-.205.525l-1.6.924c.16.87.16 1.763 0 2.634l1.6.924a.451.451 0 0 1 .205.525 9.294 9.294 0 0 1-2.053 3.55.451.451 0 0 1-.557.084l-1.598-.923a7.19 7.19 0 0 1-2.28 1.319v1.846a.451.451 0 0 1-.353.44 9.382 9.382 0 0 1-4.1 0 .45.45 0 0 1-.352-.44v-1.846a7.19 7.19 0 0 1-2.28-1.319l-1.598.923a.451.451 0 0 1-.557-.084 9.294 9.294 0 0 1-2.053-3.55.451.451 0 0 1 .205-.525l1.6-.924zM31 50a3.129 3.129 0 0 0 3.125 3.125A3.129 3.129 0 0 0 37.25 50a3.129 3.129 0 0 0-3.125-3.125A3.129 3.129 0 0 0 31 50z"/><path id="e" d="M18.952 27.454h8.316l3.163-4.327-3.163-4.327h-8.316c-.74 0-1.192-.791-.81-1.411C20.135 14.159 23.76 12 27.9 12c6.283 0 11.426 5.059 11.387 11.198-.04 6.112-5.122 11.055-11.387 11.055-4.145 0-7.773-2.164-9.764-5.399-.38-.616.08-1.4.816-1.4zm14.994 8.574l-1.42-1.388c3.258-1.25 5.88-3.81 7.157-6.993l15.835 15.472a4.866 4.866 0 0 1 0 6.994c-1.977 1.931-5.181 1.931-7.157 0l-2.487-2.43c-.735-6.3-5.734-11.243-11.928-11.655zm14.83 9.352c0 1.024.85 1.854 1.898 1.854s1.898-.83 1.898-1.854-.85-1.854-1.898-1.854-1.898.83-1.898 1.854zm-21.772 3.937a7.262 7.262 0 0 1 0-2.634l-1.6-.924a.451.451 0 0 1-.205-.525 9.294 9.294 0 0 1 2.053-3.55.451.451 0 0 1 .556-.084l1.599.923a7.19 7.19 0 0 1 2.28-1.319v-1.846c0-.21.147-.393.353-.44a9.382 9.382 0 0 1 4.1 0 .45.45 0 0 1 .351.44v1.846a7.19 7.19 0 0 1 2.28 1.319l1.6-.923a.451.451 0 0 1 .556.084 9.294 9.294 0 0 1 2.053 3.55.451.451 0 0 1-.205.525l-1.6.924c.16.87.16 1.763 0 2.634l1.6.924a.451.451 0 0 1 .205.525 9.294 9.294 0 0 1-2.053 3.55.451.451 0 0 1-.557.084l-1.598-.923a7.19 7.19 0 0 1-2.28 1.319v1.846a.451.451 0 0 1-.353.44 9.382 9.382 0 0 1-4.1 0 .45.45 0 0 1-.352-.44v-1.846a7.19 7.19 0 0 1-2.28-1.319l-1.598.923a.451.451 0 0 1-.557-.084 9.294 9.294 0 0 1-2.053-3.55.451.451 0 0 1 .205-.525l1.6-.924zM31 48a3.129 3.129 0 0 0 3.125 3.125A3.129 3.129 0 0 0 37.25 48a3.129 3.129 0 0 0-3.125-3.125A3.129 3.129 0 0 0 31 48z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V38.984l18.987-22.726L24 13l31 30 1.03 6.473L42.838 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M29.319 6.862c3.816-3.816 10.003-3.816 13.819 0 3.816 3.816 3.816 10.003 0 13.82L20.68 43.137c-3.816 3.816-10.003 3.816-13.819 0-3.816-3.816-3.816-10.003 0-13.82L29.32 6.863Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M29.319 6.862c3.816-3.816 10.003-3.816 13.819 0 3.816 3.816 3.816 10.003 0 13.82L20.68 43.137c-3.816 3.816-10.003 3.816-13.819 0-3.816-3.816-3.816-10.003 0-13.82L29.32 6.863Z" fill="url(#o_icon_repair__a)" fill-opacity=".2"/><path d="M43.138 29.319c3.816 3.816 3.816 10.003 0 13.819-3.816 3.816-10.003 3.816-13.82 0L6.863 20.68c-3.816-3.816-3.816-10.003 0-13.819 3.816-3.816 10.003-3.816 13.82 0L43.138 29.32Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path d="M43.138 29.319c3.816 3.816 3.816 10.003 0 13.819-3.816 3.816-10.003 3.816-13.82 0L6.863 20.68c-3.816-3.816-3.816-10.003 0-13.819 3.816-3.816 10.003-3.816 13.82 0L43.138 29.32Z" fill="url(#o_icon_repair__b)" fill-opacity=".2"/><path d="M25 11.18 11.18 25 25 38.82 38.82 25 25 11.18Z" fill="var(--o-icons-red-teal, #006158)"/><path d="M25 11.18 11.18 25 25 38.82 38.82 25 25 11.18Z" fill="url(#o_icon_repair__c)" fill-opacity=".2"/><defs><linearGradient id="o_icon_repair__a" x1="4" y1="4" x2="53.412" y2="16.353" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_repair__b" x1="4" y1="4" x2="53.412" y2="16.353" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_repair__c" x1="11.181" y1="11.181" x2="43.697" y2="19.309" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/repair/views/repair_views.xml b/addons/repair/views/repair_views.xml
index dc9ddab2193..0cbab6b6c70 100644
--- a/addons/repair/views/repair_views.xml
+++ b/addons/repair/views/repair_views.xml
@@ -51,7 +51,11 @@
                <sheet string="Repairs order">
                     <div class="oe_button_box" name="button_box">
                         <field name="invoice_id" invisible="1"/>
-                        <button name="%(action_repair_move_lines)d" type="action" string="Product Moves" class="oe_stat_button" icon="fa-exchange" attrs="{'invisible': [('state', 'not in', ['done', 'cancel'])]}"/>
+                        <button name="%(action_repair_move_lines)d" type="action" string="Product Moves" class="oe_stat_button" icon="fa-exchange" attrs="{'invisible': [('state', 'not in', ['done', 'cancel'])]}">
+                            <div class="o_stat_info">
+                                <span class="o_stat_text">Product Moves</span>
+                            </div>
+                        </button>
                         <button name="action_created_invoice"
                             type="object"
                             class="oe_stat_button"
diff --git a/addons/resource/views/resource_calendar_views.xml b/addons/resource/views/resource_calendar_views.xml
index 53b5f52c312..62ef8ff8767 100644
--- a/addons/resource/views/resource_calendar_views.xml
+++ b/addons/resource/views/resource_calendar_views.xml
@@ -24,16 +24,24 @@
                     <button name="switch_calendar_type" attrs="{'invisible':[('two_weeks_calendar', '=', False)]}" string="Switch to 1 week calendar" type="object" confirm="Are you sure you want to switch this calendar to 1 week calendar? All entries will be lost"/>
                 </header>
                 <sheet string="Working Time">
-                    <widget name="web_ribbon" text="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="oe_button_box" name="button_box">
                         <button name="%(resource_calendar_leaves_action_from_calendar)d" type="action"
-                                string="Time Off" icon="fa-plane"
+                                icon="fa-plane"
                                 class="oe_stat_button"
-                                groups="base.group_no_one"/>
+                                groups="base.group_no_one">
+                                <div class="o_field_widget o_stat_info">
+                                    <span class="o_stat_text">Time Off</span>
+                                </div>
+                        </button>
                         <button name="%(resource_resource_action_from_calendar)d" type="action"
-                                string="Work Resources" icon="fa-cogs"
+                                icon="fa-cogs"
                                 class="oe_stat_button"
-                                groups="base.group_user"/>
+                                groups="base.group_user">
+                                <div class="o_field_widget o_stat_info">
+                                    <span class="o_stat_text">Work Resources</span>
+                                </div>
+                        </button>
                     </div>
                     <h1>
                         <field name="name"/>
diff --git a/addons/resource/views/resource_resource_views.xml b/addons/resource/views/resource_resource_views.xml
index b54ac282f28..17738022ef3 100644
--- a/addons/resource/views/resource_resource_views.xml
+++ b/addons/resource/views/resource_resource_views.xml
@@ -34,7 +34,7 @@
             <sheet>
                 <field name="active" invisible="1" />
                 <field name="company_id" invisible="1"/>
-                <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                 <group>
                     <group name="user_details">
                         <field name="name"/>
diff --git a/addons/sale/static/description/icon.png b/addons/sale/static/description/icon.png
index 99a498c2a04..fdcf881d078 100644
Binary files a/addons/sale/static/description/icon.png and b/addons/sale/static/description/icon.png differ
diff --git a/addons/sale/static/description/icon.svg b/addons/sale/static/description/icon.svg
index 97a19c021dc..1906cf8649b 100644
--- a/addons/sale/static/description/icon.svg
+++ b/addons/sale/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#DA956B"/><stop offset="100%" stop-color="#CC7039"/></linearGradient><path id="d" d="M56.243 52.279c.578 0 1.05.537 1.05 1.193v.978c0 .656-.472 1.194-1.05 1.194H13.532c-.578 0-1.05-.538-1.05-1.194v-35.8c0-.657.472-1.194 1.05-1.194h1.5c.578 0 1.05.537 1.05 1.194v33.629h40.161zM39 23.025l4.981 4.963-6.302 7.25-4.866-5.53c-.411-.467-1.068-.467-1.48 0L20.92 41.423a1.31 1.31 0 0 0-.018 1.68l2.494 2.924c.412.477 1.086.487 1.497.01l7.186-8.165 4.857 5.52a.965.965 0 0 0 1.488 0l9.558-10.86L53 37.664 55 20l-16 3.025z"/><path id="e" d="M56.243 50.279c.578 0 1.05.537 1.05 1.193v.978c0 .656-.472 1.194-1.05 1.194H13.532c-.578 0-1.05-.538-1.05-1.194v-35.8c0-.657.472-1.194 1.05-1.194h1.5c.578 0 1.05.537 1.05 1.194v33.629h40.161zM39 21.025l4.981 4.963-6.302 7.25-4.866-5.53c-.411-.467-1.068-.467-1.48 0L20.92 39.423a1.31 1.31 0 0 0-.018 1.68l2.494 2.924c.412.477 1.086.487 1.497.01l7.186-8.165 4.857 5.52a.965.965 0 0 0 1.488 0l9.558-10.86L53 35.664 55 18l-16 3.025z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M45.243 69H4c-2 0-4-.146-4-4.077V35.315L13 16h3v26.5l15-14.27.974.024L40 21.096l13 14.27-18 18.346h22L45.243 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M4 25a4 4 0 0 1 4-4h7v25H4V25Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M4 25a4 4 0 0 1 4-4h7v25H4V25Z" fill="url(#o_icon_sale_management__a)" fill-opacity=".2"/><path d="M26 8c0-2.21 1.876-4 4.19-4H46v38c0 2.21-1.876 4-4.19 4H26V8Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M26 8c0-2.21 1.876-4 4.19-4H46v38c0 2.21-1.876 4-4.19 4H26V8Z" fill="url(#o_icon_sale_management__b)" fill-opacity=".2"/><path d="M15 17.067C15 14.821 16.876 13 19.19 13H35v28.933C35 44.179 33.124 46 30.81 46H15V17.067Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M15 17.067C15 14.821 16.876 13 19.19 13H35v28.933C35 44.179 33.124 46 30.81 46H15V17.067Z" fill="url(#o_icon_sale_management__c)" fill-opacity=".2"/><path d="M26 46h4.81c2.314 0 4.19-1.821 4.19-4.067V13h-9v33Z" fill="var(--o-icons-red-yellow, #F85318)"/><path d="M26 46h4.81c2.314 0 4.19-1.821 4.19-4.067V13h-9v33Z" fill="url(#o_icon_sale_management__d)" fill-opacity=".2"/><path d="m15 46 4.995-.002A4.005 4.005 0 0 0 24 41.995V21h-9v25Z" fill="var(--o-icons-purple-red, #911E3D)"/><path d="m15 46 4.995-.002A4.005 4.005 0 0 0 24 41.995V21h-9v25Z" fill="url(#o_icon_sale_management__e)" fill-opacity=".2"/><defs><linearGradient id="o_icon_sale_management__a" x1="4" y1="21" x2="17.586" y2="22.494" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_sale_management__b" x1="26" y1="4" x2="50.651" y2="6.935" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_sale_management__c" x1="15" y1="13" x2="39.439" y2="16.703" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_sale_management__d" x1="26" y1="13" x2="37.198" y2="13.764" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_sale_management__e" x1="15" y1="21" x2="26.16" y2="22.004" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/sale/static/src/js/tours/sale.js b/addons/sale/static/src/js/tours/sale.js
index b3401d500b1..925da54e32b 100644
--- a/addons/sale/static/src/js/tours/sale.js
+++ b/addons/sale/static/src/js/tours/sale.js
@@ -128,7 +128,7 @@ registry.category("web_tour.tours").add("sale_quote_tour", {
         auto: true,
     }, {
         trigger: ".o_field_widget[name='price_unit'] input",
-        extra_trigger: ".fa-arrow-right",  // Wait for product creation
+        extra_trigger: ".oi-arrow-right",  // Wait for product creation
         content: Markup(_t("<b>Set a price</b>.")),
         position: "right",
         run: "text 10.0"
diff --git a/addons/sale/views/product_views.xml b/addons/sale/views/product_views.xml
index 8572622b0f5..05ca54c1f94 100644
--- a/addons/sale/views/product_views.xml
+++ b/addons/sale/views/product_views.xml
@@ -49,9 +49,9 @@
                     groups="sales_team.group_sale_salesman"
                     attrs="{'invisible': [('sale_ok', '=', False)]}">
                     <div class="o_field_widget o_stat_info">
-                        <span class="o_stat_value">
-                            <field name="sales_count" widget="statinfo" nolabel="1" class="mr4"/>
-                            <field name="uom_name"/>
+                        <span class="o_stat_value d-flex gap-1">
+                            <field name="sales_count" widget="statinfo" nolabel="1" class="oe_inline"/>
+                            <field name="uom_name" class="oe_inline"/>
                         </span>
                         <span class="o_stat_text">Sold</span>
                     </div>
@@ -82,9 +82,9 @@
                     groups="sales_team.group_sale_salesman"
                     attrs="{'invisible': [('sale_ok', '=', False)]}">
                     <div class="o_field_widget o_stat_info">
-                        <span class="o_stat_value">
-                            <field name="sales_count" widget="statinfo" nolabel="1" class="mr4"/>
-                            <field name="uom_name"/>
+                        <span class="o_stat_value d-flex gap-1">
+                            <field name="sales_count" widget="statinfo" nolabel="1" class="oe_inline"/>
+                            <field name="uom_name" class="oe_inline"/>
                         </span>
                         <span class="o_stat_text">Sold</span>
                     </div>
diff --git a/addons/sale/views/sale_onboarding_views.xml b/addons/sale/views/sale_onboarding_views.xml
index e23dc534ba4..0eaced09d0d 100644
--- a/addons/sale/views/sale_onboarding_views.xml
+++ b/addons/sale/views/sale_onboarding_views.xml
@@ -5,6 +5,8 @@
         <t t-call="base.onboarding_step">
             <t t-set="title">Quotation Layout</t>
             <t t-set="description">Customize the look of your quotations.</t>
+            <t t-set="image" t-value="'/base/static/img/onboarding_quotation-layout.png'"/>
+            <t t-set="alt" t-value="'Onboarding Quotation Layout'"/>
             <t t-set="done_icon" t-value="'fa-star'" />
             <t t-set="done_text">Looks great!</t>
             <t t-set="btn_text">Customize</t>
@@ -17,6 +19,8 @@
         <t t-call="base.onboarding_step">
             <t t-set="title">Order Confirmation</t>
             <t t-set="description">Choose between electronic signatures or online payments.</t>
+            <t t-set="image" t-value="'/base/static/img/onboarding_order-confirmation.png'"/>
+            <t t-set="alt" t-value="'Onboarding Quotation Layout'"/>
             <t t-set="btn_text">Set payments</t>
             <t t-set="method" t-value="'action_open_sale_onboarding_payment_provider'" />
             <t t-set="model" t-value="'res.company'" />
@@ -27,6 +31,8 @@
         <t t-call="base.onboarding_step">
             <t t-set="title">Sample Quotation</t>
             <t t-set="description">Send a quotation to test the customer portal.</t>
+            <t t-set="image" t-value="'/base/static/img/onboarding_sample-quotation.png'"/>
+            <t t-set="alt" t-value="'Onboarding Quotation Layout'"/>
             <t t-set="btn_text">Send sample</t>
             <t t-set="method" t-value="'action_open_sale_onboarding_sample_quotation'" />
             <t t-set="model" t-value="'res.company'" />
@@ -37,8 +43,6 @@
     <!-- ONBOARDING PANEL-->
     <template id="sale_quotation_onboarding_panel" name="sale.quotation.onboarding.panel">
         <t t-call="base.onboarding_container">
-            <t t-set="classes" t-value="'o_onboarding_violet'" />
-            <t t-set="bg_image" t-value="'/sale/static/src/img/sale_quotation_onboarding_bg.jpg'"/>
             <t t-set="close_method" t-value="'action_close_sale_quotation_onboarding'" />
             <t t-set="close_model" t-value="'res.company'" />
             <t t-call="base.onboarding_company_step" name="company_step" />
diff --git a/addons/sale/wizard/res_config_settings_views.xml b/addons/sale/wizard/res_config_settings_views.xml
index b17d62fd1c3..ef86051c298 100644
--- a/addons/sale/wizard/res_config_settings_views.xml
+++ b/addons/sale/wizard/res_config_settings_views.xml
@@ -14,7 +14,7 @@
                             <field name="group_product_variant"/>
                             <div class="content-group" attrs="{'invisible': [('group_product_variant','=',False)]}">
                                 <div class="mt8">
-                                    <button name="%(product.attribute_action)d" icon="fa-arrow-right" type="action" string="Attributes" class="btn-link"/>
+                                    <button name="%(product.attribute_action)d" icon="oi-arrow-right" type="action" string="Attributes" class="btn-link"/>
                                 </div>
                             </div>
                         </setting>
@@ -25,7 +25,7 @@
                             <field name="group_uom"/>
                             <div class="content-group" attrs="{'invisible': [('group_uom','=',False)]}">
                                 <div class="mt8">
-                                    <button name="%(uom.product_uom_categ_form_action)d" icon="fa-arrow-right" type="action" string="Units of Measure" class="btn-link"/>
+                                    <button name="%(uom.product_uom_categ_form_action)d" icon="oi-arrow-right" type="action" string="Units of Measure" class="btn-link"/>
                                 </div>
                             </div>
                         </setting>
@@ -51,7 +51,7 @@
                                     <field name="product_pricelist_setting" widget="radio" class="o_light_label"/>
                                 </div>
                                 <div class="mt8">
-                                    <button name="%(product.product_pricelist_action2)d" icon="fa-arrow-right" type="action" string="Pricelists" groups="product.group_product_pricelist" class="btn-link"/>
+                                    <button name="%(product.product_pricelist_action2)d" icon="oi-arrow-right" type="action" string="Pricelists" groups="product.group_product_pricelist" class="btn-link"/>
                                 </div>
                             </div>
                         </setting>
@@ -91,7 +91,7 @@
                                     Request an online payment to confirm orders
                                 </div>
                                 <div class="mt8" attrs="{'invisible': [('portal_confirmation_pay', '=', False)]}">
-                                    <button name='%(payment.action_payment_provider)d' icon="fa-arrow-right" type="action" string="Payment Providers" class="btn-link"/>
+                                    <button name='%(payment.action_payment_provider)d' icon="oi-arrow-right" type="action" string="Payment Providers" class="btn-link"/>
                                 </div>
                                 <div class="mt16" title="Days between quotation proposal and expiration. 0 days means automatic expiration is disabled">
                                     <label for="quotation_validity_days"/>
diff --git a/addons/sale_loyalty/views/sale_order_views.xml b/addons/sale_loyalty/views/sale_order_views.xml
index 2e88bf40dd9..88ebb18fd9d 100644
--- a/addons/sale_loyalty/views/sale_order_views.xml
+++ b/addons/sale_loyalty/views/sale_order_views.xml
@@ -8,7 +8,7 @@
         <field name="priority">10</field>
         <field name="arch" type="xml">
             <group name="note_group" position="before">
-                <div class="oe_right">
+                <div class="oe_right d-flex gap-1 mb-2 ms-1">
                     <button name="%(sale_loyalty.sale_loyalty_coupon_wizard_action)d" class="btn btn-secondary"
                         string="Coupon Code" type="action" states="draft,sent,sale"/>
                     <button name="action_open_reward_wizard" class="btn btn-secondary"
diff --git a/addons/sale_management/static/description/icon.png b/addons/sale_management/static/description/icon.png
index 99a498c2a04..fdcf881d078 100644
Binary files a/addons/sale_management/static/description/icon.png and b/addons/sale_management/static/description/icon.png differ
diff --git a/addons/sale_management/static/description/icon.svg b/addons/sale_management/static/description/icon.svg
index 97a19c021dc..1906cf8649b 100644
--- a/addons/sale_management/static/description/icon.svg
+++ b/addons/sale_management/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#DA956B"/><stop offset="100%" stop-color="#CC7039"/></linearGradient><path id="d" d="M56.243 52.279c.578 0 1.05.537 1.05 1.193v.978c0 .656-.472 1.194-1.05 1.194H13.532c-.578 0-1.05-.538-1.05-1.194v-35.8c0-.657.472-1.194 1.05-1.194h1.5c.578 0 1.05.537 1.05 1.194v33.629h40.161zM39 23.025l4.981 4.963-6.302 7.25-4.866-5.53c-.411-.467-1.068-.467-1.48 0L20.92 41.423a1.31 1.31 0 0 0-.018 1.68l2.494 2.924c.412.477 1.086.487 1.497.01l7.186-8.165 4.857 5.52a.965.965 0 0 0 1.488 0l9.558-10.86L53 37.664 55 20l-16 3.025z"/><path id="e" d="M56.243 50.279c.578 0 1.05.537 1.05 1.193v.978c0 .656-.472 1.194-1.05 1.194H13.532c-.578 0-1.05-.538-1.05-1.194v-35.8c0-.657.472-1.194 1.05-1.194h1.5c.578 0 1.05.537 1.05 1.194v33.629h40.161zM39 21.025l4.981 4.963-6.302 7.25-4.866-5.53c-.411-.467-1.068-.467-1.48 0L20.92 39.423a1.31 1.31 0 0 0-.018 1.68l2.494 2.924c.412.477 1.086.487 1.497.01l7.186-8.165 4.857 5.52a.965.965 0 0 0 1.488 0l9.558-10.86L53 35.664 55 18l-16 3.025z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M45.243 69H4c-2 0-4-.146-4-4.077V35.315L13 16h3v26.5l15-14.27.974.024L40 21.096l13 14.27-18 18.346h22L45.243 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M4 25a4 4 0 0 1 4-4h7v25H4V25Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M4 25a4 4 0 0 1 4-4h7v25H4V25Z" fill="url(#o_icon_sale_management__a)" fill-opacity=".2"/><path d="M26 8c0-2.21 1.876-4 4.19-4H46v38c0 2.21-1.876 4-4.19 4H26V8Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M26 8c0-2.21 1.876-4 4.19-4H46v38c0 2.21-1.876 4-4.19 4H26V8Z" fill="url(#o_icon_sale_management__b)" fill-opacity=".2"/><path d="M15 17.067C15 14.821 16.876 13 19.19 13H35v28.933C35 44.179 33.124 46 30.81 46H15V17.067Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M15 17.067C15 14.821 16.876 13 19.19 13H35v28.933C35 44.179 33.124 46 30.81 46H15V17.067Z" fill="url(#o_icon_sale_management__c)" fill-opacity=".2"/><path d="M26 46h4.81c2.314 0 4.19-1.821 4.19-4.067V13h-9v33Z" fill="var(--o-icons-red-yellow, #F85318)"/><path d="M26 46h4.81c2.314 0 4.19-1.821 4.19-4.067V13h-9v33Z" fill="url(#o_icon_sale_management__d)" fill-opacity=".2"/><path d="m15 46 4.995-.002A4.005 4.005 0 0 0 24 41.995V21h-9v25Z" fill="var(--o-icons-purple-red, #911E3D)"/><path d="m15 46 4.995-.002A4.005 4.005 0 0 0 24 41.995V21h-9v25Z" fill="url(#o_icon_sale_management__e)" fill-opacity=".2"/><defs><linearGradient id="o_icon_sale_management__a" x1="4" y1="21" x2="17.586" y2="22.494" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_sale_management__b" x1="26" y1="4" x2="50.651" y2="6.935" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_sale_management__c" x1="15" y1="13" x2="39.439" y2="16.703" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_sale_management__d" x1="26" y1="13" x2="37.198" y2="13.764" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_sale_management__e" x1="15" y1="21" x2="26.16" y2="22.004" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/sale_management/views/res_config_settings_views.xml b/addons/sale_management/views/res_config_settings_views.xml
index bf8bbe8607d..bea73239368 100644
--- a/addons/sale_management/views/res_config_settings_views.xml
+++ b/addons/sale_management/views/res_config_settings_views.xml
@@ -18,7 +18,7 @@
                                groups="base.group_multi_company"/>
                         </div>
                         <div class="mt8">
-                            <button name="%(sale_management.sale_order_template_action)d" icon="fa-arrow-right" type="action" string="Quotation Templates" class="btn-link"/>
+                            <button name="%(sale_management.sale_order_template_action)d" icon="oi-arrow-right" type="action" string="Quotation Templates" class="btn-link"/>
                         </div>
                     </div>
                     <div class="mt16 oe_inline"
diff --git a/addons/sale_management/views/sale_order_template_views.xml b/addons/sale_management/views/sale_order_template_views.xml
index 065215a69aa..4e232df061d 100644
--- a/addons/sale_management/views/sale_order_template_views.xml
+++ b/addons/sale_management/views/sale_order_template_views.xml
@@ -21,7 +21,7 @@
             <form string="Quotation Template">
                 <sheet>
                     <div name="button_box" class="oe_button_box"/>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="oe_title" name="sale_order_template_title">
                         <label for="name" id="sale_order_template_title"/>
                         <h1>
diff --git a/addons/sale_project/views/project_sharing_views.xml b/addons/sale_project/views/project_sharing_views.xml
index 96bfb1e1e1d..e2759df3d4e 100644
--- a/addons/sale_project/views/project_sharing_views.xml
+++ b/addons/sale_project/views/project_sharing_views.xml
@@ -12,8 +12,11 @@
                 <field name="allow_billable" invisible="1"/>
                 <button class="oe_stat_button"
                         type="object" name="action_project_sharing_view_so" icon="fa-dollar"
-                        attrs="{'invisible': [('display_sale_order_button', '=', False)]}"
-                        string="Sales Order"/>
+                        attrs="{'invisible': [('display_sale_order_button', '=', False)]}">
+                        <div class="o_stat_info">
+                            <span class="o_stat_text">Sales Order</span>
+                        </div>
+                </button>
             </div>
             <xpath expr="//field[@name='partner_id']" position="attributes">
                 <attribute name="attrs">{'invisible': [('allow_billable', '=', False)]}</attribute>
diff --git a/addons/sale_project/views/project_task_views.xml b/addons/sale_project/views/project_task_views.xml
index 4df21573200..7d0658757f4 100644
--- a/addons/sale_project/views/project_task_views.xml
+++ b/addons/sale_project/views/project_task_views.xml
@@ -78,8 +78,11 @@
                 <button class="oe_stat_button"
                         type="object" name="action_view_so" icon="fa-dollar"
                         attrs="{'invisible': [('sale_order_id', '=', False)]}"
-                        string="Sales Order"
-                        groups="sales_team.group_sale_salesman_all_leads"/>
+                        groups="sales_team.group_sale_salesman_all_leads">
+                        <div class="o_stat_info">
+                            <span class="o_stat_text">Sales Order</span>
+                        </div>
+                </button>
             </xpath>
             <xpath expr="//field[@name='partner_id']" position="attributes">
                 <attribute name="options">{'always_reload': True}</attribute>
diff --git a/addons/sale_stock/static/src/widgets/qty_at_date_widget.xml b/addons/sale_stock/static/src/widgets/qty_at_date_widget.xml
index 2443fb9d3a2..74b13c937fb 100644
--- a/addons/sale_stock/static/src/widgets/qty_at_date_widget.xml
+++ b/addons/sale_stock/static/src/widgets/qty_at_date_widget.xml
@@ -63,7 +63,7 @@
         </table>
         <button t-if="!props.record.data.is_mto" class="text-start btn btn-link"
             type="button" t-on-click="openForecast">
-            <i class="fa fa-fw o_button_icon fa-arrow-right"></i>
+            <i class="oi oi-fw o_button_icon oi-arrow-right"></i>
             View Forecast
         </button>
         </div>
diff --git a/addons/sale_stock/views/res_config_settings_views.xml b/addons/sale_stock/views/res_config_settings_views.xml
index 518f05de367..2a8f87b3899 100644
--- a/addons/sale_stock/views/res_config_settings_views.xml
+++ b/addons/sale_stock/views/res_config_settings_views.xml
@@ -11,7 +11,7 @@
                     <field name="group_display_incoterm"/>
                     <div class="content-group" attrs="{'invisible': [('group_display_incoterm','=',False)]}">
                         <div class="mt8">
-                            <button name="%(account.action_incoterms_tree)d" icon="fa-arrow-right" type="action" string="Incoterms" class="btn-link"/>
+                            <button name="%(account.action_incoterms_tree)d" icon="oi-arrow-right" type="action" string="Incoterms" class="btn-link"/>
                         </div>
                     </div>
                 </setting>
diff --git a/addons/sale_timesheet/static/description/icon.png b/addons/sale_timesheet/static/description/icon.png
index 705b70c9985..a6cd770b1ac 100644
Binary files a/addons/sale_timesheet/static/description/icon.png and b/addons/sale_timesheet/static/description/icon.png differ
diff --git a/addons/sale_timesheet/static/description/icon.svg b/addons/sale_timesheet/static/description/icon.svg
index 26a75b6f922..fbf560388cf 100644
--- a/addons/sale_timesheet/static/description/icon.svg
+++ b/addons/sale_timesheet/static/description/icon.svg
@@ -1,33 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 70">
-  <defs>
-    <mask id="mask" x="0" y="0" width="70" height="70" maskUnits="userSpaceOnUse">
-      <g id="b">
-        <path id="a" d="M4,0H65c4,0,5,1,5,5V65c0,4-1,5-5,5H4c-3,0-4-1-4-5V5C0,1,1,0,4,0Z" fill="#fff" fill-rule="evenodd"/>
-      </g>
-    </mask>
-    <linearGradient id="linear-gradient" x1="-1349.79" y1="477.94" x2="-1350.79" y2="476.94" gradientTransform="matrix(70, 0, 0, -70, 94554.99, 33455.73)" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#da956b"/>
-      <stop offset="1" stop-color="#cc7039"/>
-    </linearGradient>
-  </defs>
-  <g mask="url(#mask)">
-    <g>
-      <path d="M0,0H70V70H0Z" fill-rule="evenodd" fill="url(#linear-gradient)"/>
-      <path d="M4,1H65c2.67,0,4.33.67,5,2V0H0V3C.67,1.67,2,1,4,1Z" fill="#fff" fill-opacity="0.38" fill-rule="evenodd"/>
-      <path d="M44.25,69H4c-2,0-4-.15-4-4.08V29L13,16h3V43L31.33,27.71,32,28l7-7,10.86,1.83L53,35.66,36.2,52.47l-.1.7L47.93,41.34l4.19,1.57L51,44c2.55.46,2.8,1.59,4.33,3.57a14.92,14.92,0,0,0,3-.14l-1.22,1.21L53.94,59.32Z" fill="#393939" fill-rule="evenodd" opacity="0.32" style="isolation: isolate"/>
-      <path d="M4,69H65c2.67,0,4.33-1,5-3v4H0V66A3.92,3.92,0,0,0,4,69Z" fill-opacity="0.38" fill-rule="evenodd"/>
-      <g>
-        <g opacity="0.4">
-          <path d="M21.4,46a1,1,0,0,0,1.49,0l7.19-8.17,4.86,5.52a1,1,0,0,0,1.35.13.53.53,0,0,0,.13-.13L46,32.53l5,5.13L53,20,37,23l5,5-6.3,7.25-4.87-5.53a1,1,0,0,0-1.48,0L18.92,41.42a1.31,1.31,0,0,0,0,1.68Z"/>
-          <path d="M34.24,54.91a12.79,12.79,0,0,1,.17-2.63H14.08V18.65A1.12,1.12,0,0,0,13,17.46h-1.5a1.12,1.12,0,0,0-1,1.19v35.8a1.12,1.12,0,0,0,1,1.19H34.31C34.28,55.4,34.25,55.16,34.24,54.91Z"/>
-          <path d="M49.15,50.29v4.85a.34.34,0,0,1-.1.25.33.33,0,0,1-.25.1H45.33a.32.32,0,0,1-.25-.1.3.3,0,0,1-.1-.25v-.69a.33.33,0,0,1,.1-.25.36.36,0,0,1,.25-.1h2.43V50.29a.34.34,0,0,1,.35-.35h.69a.33.33,0,0,1,.25.1A.34.34,0,0,1,49.15,50.29Zm4.51,3.81a5.86,5.86,0,0,0-.79-3A6,6,0,0,0,50.72,49a5.94,5.94,0,0,0-5.92,0,5.91,5.91,0,0,0-2.15,2.15,5.94,5.94,0,0,0,0,5.92,5.84,5.84,0,0,0,2.15,2.15,5.94,5.94,0,0,0,5.92,0,5.91,5.91,0,0,0,2.15-2.15A5.83,5.83,0,0,0,53.66,54.1Zm.41-5.44,1.08-.82a.42.42,0,0,1,.57.08l.73,1a.4.4,0,0,1-.08.57l-1.17.88A8.35,8.35,0,0,1,55,58.28a8.26,8.26,0,0,1-7.21,4.15,8.17,8.17,0,0,1-4.18-1.11,8.26,8.26,0,0,1-3-3,8.36,8.36,0,0,1,0-8.36,8.31,8.31,0,0,1,3-3,8.11,8.11,0,0,1,3.16-1.06V45h-.81a.41.41,0,0,1-.41-.41v-.81a.41.41,0,0,1,.41-.4H50a.4.4,0,0,1,.41.4v.81A.41.41,0,0,1,50,45h-.81v.93a8.19,8.19,0,0,1,2.76,1A8.31,8.31,0,0,1,54.07,48.66Z" fill-rule="evenodd"/>
-        </g>
-        <g>
-          <path d="M23.4,44a1,1,0,0,0,1.49,0l7.19-8.17,4.86,5.52a1,1,0,0,0,1.35.13.53.53,0,0,0,.13-.13L48,30.53l5,5.13L55,18,39,21l5,5-6.3,7.25-4.87-5.53a1,1,0,0,0-1.48,0L20.92,39.42a1.31,1.31,0,0,0,0,1.68Z" fill="#fff"/>
-          <path d="M36.24,52.91a12.79,12.79,0,0,1,.17-2.63H16.08V16.65a1.12,1.12,0,0,0-1-1.19h-1.5a1.12,1.12,0,0,0-1,1.19v35.8a1.12,1.12,0,0,0,1,1.19H36.31C36.28,53.4,36.25,53.16,36.24,52.91Z" fill="#fff"/>
-          <path d="M51.15,48.29v4.85a.34.34,0,0,1-.1.25.33.33,0,0,1-.25.1H47.33a.32.32,0,0,1-.25-.1.3.3,0,0,1-.1-.25v-.69a.33.33,0,0,1,.1-.25.36.36,0,0,1,.25-.1h2.43V48.29a.34.34,0,0,1,.35-.35h.69a.33.33,0,0,1,.25.1A.34.34,0,0,1,51.15,48.29Zm4.51,3.81a5.86,5.86,0,0,0-.79-3A6,6,0,0,0,52.72,47a5.94,5.94,0,0,0-5.92,0,5.91,5.91,0,0,0-2.15,2.15,5.94,5.94,0,0,0,0,5.92,5.84,5.84,0,0,0,2.15,2.15,5.94,5.94,0,0,0,5.92,0,5.91,5.91,0,0,0,2.15-2.15A5.83,5.83,0,0,0,55.66,52.1Zm.41-5.44,1.08-.82a.42.42,0,0,1,.57.08l.73,1a.4.4,0,0,1-.08.57l-1.17.88A8.35,8.35,0,0,1,57,56.28a8.26,8.26,0,0,1-7.21,4.15,8.17,8.17,0,0,1-4.18-1.11,8.26,8.26,0,0,1-3-3,8.36,8.36,0,0,1,0-8.36,8.31,8.31,0,0,1,3-3,8.11,8.11,0,0,1,3.16-1.06V43h-.81a.41.41,0,0,1-.41-.41v-.81a.41.41,0,0,1,.41-.4H52a.4.4,0,0,1,.41.4v.81A.41.41,0,0,1,52,43h-.81v.93a8.19,8.19,0,0,1,2.76,1A8.31,8.31,0,0,1,56.07,46.66Z" fill="#fff" fill-rule="evenodd"/>
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M45.445 23.222A22.222 22.222 0 1 0 12.11 42.467l11.111-19.245h22.223Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M45.445 23.222A22.222 22.222 0 1 0 12.11 42.467l11.111-19.245h22.223Z" fill="url(#o_icon_sale_timesheet__a)" fill-opacity=".2"/><path d="M5.313 32.53A22.223 22.223 0 1 0 37.889 7.532L26.778 26.778 5.313 32.53Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M5.313 32.53A22.223 22.223 0 1 0 37.889 7.532L26.778 26.778 5.313 32.53Z" fill="url(#o_icon_sale_timesheet__b)" fill-opacity=".2"/><path d="M23.222 45.445c12.273 0 22.223-9.95 22.223-22.223 0-5.23-1.807-10.039-4.831-13.835a22.128 22.128 0 0 0-13.836-4.831c-12.273 0-22.222 9.949-22.222 22.222 0 5.23 1.807 10.04 4.83 13.836a22.128 22.128 0 0 0 13.836 4.83Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M23.222 45.445c12.273 0 22.223-9.95 22.223-22.223 0-5.23-1.807-10.039-4.831-13.835a22.128 22.128 0 0 0-13.836-4.831c-12.273 0-22.222 9.949-22.222 22.222 0 5.23 1.807 10.04 4.83 13.836a22.128 22.128 0 0 0 13.836 4.83Z" fill="url(#o_icon_sale_timesheet__c)" fill-opacity=".2"/><path d="M7.718 7.302c.646-.63 1.33-1.22 2.05-1.768.227.056.445.161.638.316L26.58 18.795c1.82 1.456 1.946 4.193.297 5.84-1.649 1.647-4.388 1.521-5.845-.297L8.074 8.18a1.651 1.651 0 0 1-.356-.878Z" fill="var(--o-icons-white, #FFFFFF)"/><defs><linearGradient id="o_icon_sale_timesheet__a" x1="1" y1="1" x2="52.834" y2="14.889" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_sale_timesheet__b" x1="5.313" y1="7.533" x2="56.379" y2="20.983" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_sale_timesheet__c" x1="4.556" y1="4.556" x2="52.66" y2="16.582" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js b/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js
index 10468ab7063..f402185ad4c 100644
--- a/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js
+++ b/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js
@@ -185,7 +185,7 @@ registry.category("web_tour.tours").add('sale_timesheet_tour', {
     content: 'Set Project name',
     run: 'text Project with employee mapping',
 }, {
-    trigger: '.dropdown-item[data-menu-xmlid="project.menu_main_pm"]',
+    trigger: '[data-menu-xmlid="project.menu_projects"]',
     content: 'Select Project main menu',
 }, {
     trigger: '.o_kanban_record:contains("Project for Freeman") .o_dropdown_kanban .dropdown-toggle',
@@ -231,7 +231,7 @@ registry.category("web_tour.tours").add('sale_timesheet_tour', {
     // timer: 300,
     isCheck: true,
 }, {
-    trigger: ".o_rightpanel_section .oe_button_box .o_stat_text:contains('Sales Orders')",
+    trigger: ".o_rightpanel_section .o-form-buttonbox .o_stat_text:contains('Sales Orders')",
     content: 'Check the user sees Sales Orders Stat Button',
     isCheck: true,
 }, {
diff --git a/addons/sale_timesheet/views/res_config_settings_views.xml b/addons/sale_timesheet/views/res_config_settings_views.xml
index 04fccadad33..ef843a0c9a5 100644
--- a/addons/sale_timesheet/views/res_config_settings_views.xml
+++ b/addons/sale_timesheet/views/res_config_settings_views.xml
@@ -10,7 +10,7 @@
             <xpath expr="//div[@name='section_leaves']" position="before">
                 <block title="Billing">
                     <setting string="Time Billing" help="Sell services and invoice time spent" id="time_billing_setting">
-                        <button name="%(sale_timesheet.product_template_action_default_services)d" string="Configure your services" type="action" class="btn-link" icon="fa-arrow-right"/>
+                        <button name="%(sale_timesheet.product_template_action_default_services)d" string="Configure your services" type="action" class="btn-link" icon="oi-arrow-right"/>
                     </setting>
                     <setting help="Timesheets taken into account when invoicing your time" name="invoice_policy">
                         <field name="invoice_policy" widget="upgrade_boolean"/>
diff --git a/addons/sale_timesheet/views/sale_order_views.xml b/addons/sale_timesheet/views/sale_order_views.xml
index 83ef7f5c77c..5b24b766823 100644
--- a/addons/sale_timesheet/views/sale_order_views.xml
+++ b/addons/sale_timesheet/views/sale_order_views.xml
@@ -14,13 +14,13 @@
                            icon="fa-clock-o"
                            attrs="{'invisible': [('timesheet_count', '=', 0)]}"
                            groups="hr_timesheet.group_hr_timesheet_user">
-                            <div class="o_field_widget o_stat_info">
-                                <span class="o_stat_value">
-                                    <field name="timesheet_total_duration" class="mr4" widget="statinfo" nolabel="1"/>
+                           <div class="o_stat_info">
+                               <span class="o_stat_value">
+                                    <field name="timesheet_total_duration" class="mr4"/>
                                     <field name="timesheet_encode_uom_id" options="{'no_open': True}"/>
                                 </span>
                                 <span class="o_stat_text">Recorded</span>
-                            </div>
+                           </div>
                         </button>
                     </xpath>
                 </data>
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 760712cd31e..73f55c96ba3 100644
--- a/addons/sales_team/static/src/scss/crm_team_views.scss
+++ b/addons/sales_team/static/src/scss/crm_team_views.scss
@@ -14,22 +14,6 @@
         }
     }
     .ribbon {
-        &::before, &::after {
-            display: none;
-        }
-
-        span {
-            padding: 5px;
-            font-size: small;
-            height: auto;
-        }
-    }
-    .ribbon-top-right {
-        margin-top: -$o-kanban-dashboard-vpadding;
-
-        span {
-            left: 0px;
-            right: 30px;
-        }
+        --Ribbon-wrapper-width: 6rem;
     }
 }
diff --git a/addons/sales_team/views/crm_team_member_views.xml b/addons/sales_team/views/crm_team_member_views.xml
index 9386b4eb905..23e04ca736e 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-odoo">Archived</span>
+                                <span class="text-bg-danger">Archived</span>
                             </div>
                             <div class="o_kanban_card_content d-flex">
                                 <div>
@@ -105,7 +105,7 @@
                         attrs="{'invisible': [('member_warning', '=', False)]}">
                         <field name="member_warning"/>
                     </div>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <field name="image_1920" widget='image' class="oe_avatar"
                         attrs="{'invisible': [('user_id', '=', False)]}"
                         options='{"preview_image": "image_128"}'/>
diff --git a/addons/sales_team/views/crm_team_views.xml b/addons/sales_team/views/crm_team_views.xml
index 2f760ffd99b..8839ca37d12 100644
--- a/addons/sales_team/views/crm_team_views.xml
+++ b/addons/sales_team/views/crm_team_views.xml
@@ -29,7 +29,7 @@
                 </div>
                 <sheet>
                     <div class="oe_button_box" name="button_box"/>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="oe_title">
                         <label for="name" string="Sales Team"/>
                         <h1>
diff --git a/addons/sms/static/description/icon.png b/addons/sms/static/description/icon.png
index 8950ef93521..7332117f308 100644
Binary files a/addons/sms/static/description/icon.png and b/addons/sms/static/description/icon.png differ
diff --git a/addons/sms/static/description/icon.svg b/addons/sms/static/description/icon.svg
index f4164700755..e3aaa15f7cc 100644
--- a/addons/sms/static/description/icon.svg
+++ b/addons/sms/static/description/icon.svg
@@ -1,41 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 70">
-  <defs>
-    <mask id="mask" x="0" y="0" width="70" height="70" maskUnits="userSpaceOnUse">
-      <g id="b">
-        <path id="a" d="M4,0H65c4,0,5,1,5,5V65c0,4-1,5-5,5H4c-3,0-4-1-4-5V5C0,1,1,0,4,0Z" fill="#fff" fill-rule="evenodd"/>
-      </g>
-    </mask>
-    <linearGradient id="linear-gradient" x1="-1172.36" y1="477.94" x2="-1173.36" y2="476.94" gradientTransform="matrix(70, 0, 0, -70, 82134.99, 33455.73)" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#7cc098"/>
-      <stop offset="1" stop-color="#5f8a71"/>
-    </linearGradient>
-  </defs>
-  <g mask="url(#mask)">
-    <g>
-      <path d="M0,0H70V70H0Z" fill-rule="evenodd" fill="url(#linear-gradient)"/>
-      <path d="M4,1H65c2.67,0,4.33.67,5,2V0H0V3C.67,1.67,2,1,4,1Z" fill="#fff" fill-opacity="0.38" fill-rule="evenodd"/>
-      <path d="M4,69H65c2.67,0,4.33-1,5-3v4H0V66A3.92,3.92,0,0,0,4,69Z" fill-opacity="0.38" fill-rule="evenodd"/>
-      <path d="M4,69a3.66,3.66,0,0,1-4-4V34.17L20.65,13.52l24.78-.66,2,3.78v9.44l-6.11,6.11,2.41,2.11-1.09,1.09,1.31,2L47.32,34l1.52,0,3.8-3.83,1.87,12-7.08,7.1-.56,7.6L34.81,69Z" fill-opacity="0.15" fill-rule="evenodd"/>
-      <g>
-        <g opacity="0.4" style="isolation: isolate">
-          <path d="M21.59,39.06,23,39a2.29,2.29,0,0,0,.49,1,1.5,1.5,0,0,0,1.05.33,1.87,1.87,0,0,0,1-.27.87.87,0,0,0,.33-.66A.64.64,0,0,0,25.7,39a1.88,1.88,0,0,0-.49-.33l-1.15-.33a4.49,4.49,0,0,1-1.59-.71,1.82,1.82,0,0,1-.66-1.42,1.52,1.52,0,0,1,.33-1,1.83,1.83,0,0,1,.88-.71,3.31,3.31,0,0,1,1.37-.22,3.2,3.2,0,0,1,2,.6,2.05,2.05,0,0,1,.72,1.54l-1.43,0a1.3,1.3,0,0,0-.38-.77,1.44,1.44,0,0,0-.88-.22,1.73,1.73,0,0,0-1,.28.51.51,0,0,0-.22.44.52.52,0,0,0,.22.44,3.47,3.47,0,0,0,1.32.49,7.23,7.23,0,0,1,1.53.49,2,2,0,0,1,.77.71,2.34,2.34,0,0,1,.27,1.16A2.3,2.3,0,0,1,27,40.6a2.08,2.08,0,0,1-.94.76,4.1,4.1,0,0,1-1.53.28A3.3,3.3,0,0,1,22.47,41,3.1,3.1,0,0,1,21.59,39.06Z"/>
-          <path d="M28.39,41.36V34.29h2.13l1.26,4.83L33,34.29h2.14v7.07H33.87V35.83L32.5,41.36H31.13l-1.37-5.53v5.53Z"/>
-          <path d="M36.17,39.06,37.54,39A2.29,2.29,0,0,0,38,40a1.56,1.56,0,0,0,1,.28,1.77,1.77,0,0,0,1-.28.83.83,0,0,0,.33-.65.61.61,0,0,0-.16-.44,2.07,2.07,0,0,0-.49-.33c-.17-.06-.55-.17-1.16-.33A3.37,3.37,0,0,1,37,37.53a1.88,1.88,0,0,1-.65-1.43,1.51,1.51,0,0,1,.33-1,1.93,1.93,0,0,1,.87-.72A3.52,3.52,0,0,1,39,34.18a3.15,3.15,0,0,1,2,.61,2,2,0,0,1,.71,1.53l-1.42.06a1.25,1.25,0,0,0-.39-.77,1.33,1.33,0,0,0-.87-.22,1.81,1.81,0,0,0-1,.27.52.52,0,0,0-.22.44.51.51,0,0,0,.22.44,3.09,3.09,0,0,0,1.32.49,7.13,7.13,0,0,1,1.53.5,2,2,0,0,1,.77.71,2.44,2.44,0,0,1,.27,1.15,2.29,2.29,0,0,1-.33,1.15,1.8,1.8,0,0,1-.93.77,4.36,4.36,0,0,1-1.53.27A3.42,3.42,0,0,1,37,41,3,3,0,0,1,36.17,39.06Z"/>
-          <path d="M57.14,37.2l-4.55-4.93a1.37,1.37,0,0,0-2.36,1.06v2.74H45.3v4h4.93v3a1.37,1.37,0,0,0,2.36,1.06l4.55-4.93A1.54,1.54,0,0,0,57.14,37.2Z"/>
-          <path d="M18.09,36.07H10a1.78,1.78,0,0,0-1.69,1.34,2,2,0,0,0,1.62,2.66h8.18Z"/>
-          <path d="M43.41,14.88H20.11a2,2,0,0,0-2,2V28.09h2.3V21.28a.27.27,0,0,1,.3-.3h22.1a.27.27,0,0,1,.3.3v6.81h2.3V16.88A2,2,0,0,0,43.41,14.88Zm-8.5,4.7h-6.1a.47.47,0,0,1-.5-.5c0-.3.1-.5.4-.5h6.1a.47.47,0,0,1,.5.5A.46.46,0,0,1,34.91,19.58Z"/>
-          <path d="M43.11,47.38v6.9a.27.27,0,0,1-.3.3H20.71a.27.27,0,0,1-.3-.3v-6.9h-2.3v10.2a2,2,0,0,0,2,2h23.3a2,2,0,0,0,2-2V47.38Zm-11.3,11.1a1.5,1.5,0,1,1,1.5-1.5A1.47,1.47,0,0,1,31.81,58.48Z"/>
-        </g>
-        <g style="isolation: isolate">
-          <path d="M23.61,37,25,36.93a2.3,2.3,0,0,0,.5,1,1.48,1.48,0,0,0,1,.33,1.85,1.85,0,0,0,1-.27.87.87,0,0,0,.33-.66.62.62,0,0,0-.17-.44,1.88,1.88,0,0,0-.49-.33l-1.15-.33a5,5,0,0,1-1.59-.71,1.84,1.84,0,0,1-.66-1.43,1.51,1.51,0,0,1,.33-1,1.87,1.87,0,0,1,.88-.71,3.31,3.31,0,0,1,1.37-.22,3.23,3.23,0,0,1,2,.6,2.06,2.06,0,0,1,.71,1.53l-1.43.06a1.27,1.27,0,0,0-.38-.77,1.42,1.42,0,0,0-.88-.22,1.7,1.7,0,0,0-1,.28.48.48,0,0,0-.22.43.48.48,0,0,0,.22.44,3.13,3.13,0,0,0,1.31.5,6.81,6.81,0,0,1,1.54.49,1.87,1.87,0,0,1,.76.71,2.33,2.33,0,0,1,.28,1.15A2.27,2.27,0,0,1,29,38.57a2.13,2.13,0,0,1-.93.77,4.37,4.37,0,0,1-1.54.27,3.32,3.32,0,0,1-2.08-.6A3.15,3.15,0,0,1,23.61,37Z" fill="#fff"/>
-          <path d="M30.41,39.34V32.27h2.14l1.26,4.82,1.26-4.82H37.2v7.07H35.89V33.81l-1.37,5.53H33.15l-1.37-5.53v5.53Z" fill="#fff"/>
-          <path d="M38.19,37l1.37-.11a2.4,2.4,0,0,0,.49,1,1.57,1.57,0,0,0,1.05.27,1.87,1.87,0,0,0,1-.27.85.85,0,0,0,.33-.66.64.64,0,0,0-.17-.44,1.66,1.66,0,0,0-.49-.32c-.17-.06-.55-.17-1.15-.33a3.27,3.27,0,0,1-1.59-.72,1.82,1.82,0,0,1-.66-1.42,1.55,1.55,0,0,1,.33-1,1.83,1.83,0,0,1,.88-.71A3.48,3.48,0,0,1,41,32.16a3.2,3.2,0,0,1,2,.6,2.07,2.07,0,0,1,.72,1.54l-1.43.05a1.24,1.24,0,0,0-.38-.76,1.37,1.37,0,0,0-.88-.22,1.81,1.81,0,0,0-1,.27.5.5,0,0,0-.21.44.51.51,0,0,0,.21.44,3.3,3.3,0,0,0,1.32.49,7.64,7.64,0,0,1,1.53.49,1.92,1.92,0,0,1,.77.72,2.32,2.32,0,0,1-.05,2.3,1.89,1.89,0,0,1-.93.77,4.42,4.42,0,0,1-1.54.27,3.36,3.36,0,0,1-2.08-.6A3,3,0,0,1,38.19,37Z" fill="#fff"/>
-          <path d="M59.16,35.18l-4.54-4.93a1.37,1.37,0,0,0-2.36,1.06V34H47.32v4h4.94v3a1.37,1.37,0,0,0,2.36,1.06l4.54-4.93A1.54,1.54,0,0,0,59.16,35.18Z" fill="#fff"/>
-          <path d="M20.11,34H12a1.79,1.79,0,0,0-1.7,1.35A2,2,0,0,0,11.94,38h8.17Z" fill="#fff"/>
-          <path d="M45.43,12.86H22.13a2,2,0,0,0-2,2V26.07h2.3V19.26a.27.27,0,0,1,.3-.3h22.1a.27.27,0,0,1,.3.3v6.81h2.3V14.86A2,2,0,0,0,45.43,12.86Zm-8.5,4.7h-6.1a.47.47,0,0,1-.5-.5c0-.3.1-.5.4-.5h6.1a.47.47,0,0,1,.5.5A.46.46,0,0,1,36.93,17.56Z" fill="#fff"/>
-          <path d="M45.13,45.35v6.91a.27.27,0,0,1-.3.3H22.73a.27.27,0,0,1-.3-.3V45.35h-2.3V55.56a2,2,0,0,0,2,2h23.3a2,2,0,0,0,2-2V45.35ZM33.83,56.46a1.5,1.5,0,1,1,1.5-1.5A1.47,1.47,0,0,1,33.83,56.46Z" fill="#fff"/>
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M13 8a4 4 0 0 1 4-4h16a4 4 0 0 1 4 4v34a4 4 0 0 1-4 4H17a4 4 0 0 1-4-4V8Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path d="M13 8a4 4 0 0 1 4-4h16a4 4 0 0 1 4 4v34a4 4 0 0 1-4 4H17a4 4 0 0 1-4-4V8Z" fill="url(#o_icon_mass_mailing_sms__a)" fill-opacity=".2"/><path d="M37 19v18a9 9 0 1 1 0-18Z" fill="var(--o-icons-red-teal, #006158)"/><path d="M37 19v18a9 9 0 1 1 0-18Z" fill="url(#o_icon_mass_mailing_sms__b)" fill-opacity=".2"/><path d="M13 31V13a9 9 0 1 1 0 18Z" fill="var(--o-icons-purple-teal, #003458)"/><path d="M13 31V13a9 9 0 1 1 0 18Z" fill="url(#o_icon_mass_mailing_sms__c)" fill-opacity=".3"/><path d="M13 13H4v9a9 9 0 0 0 9 9V13Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M13 13H4v9a9 9 0 0 0 9 9V13Z" fill="url(#o_icon_mass_mailing_sms__d)" fill-opacity=".2"/><path d="M37 37h9v-9a9 9 0 0 0-9-9v18Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M37 37h9v-9a9 9 0 0 0-9-9v18Z" fill="url(#o_icon_mass_mailing_sms__e)" fill-opacity=".2"/><defs><linearGradient id="o_icon_mass_mailing_sms__a" x1="13" y1="4" x2="42.4" y2="8.2" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_mass_mailing_sms__b" x1="28" y1="19" x2="39.077" y2="20.385" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_mass_mailing_sms__c" x1="13" y1="13" x2="24.077" y2="14.385" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_mass_mailing_sms__d" x1="4" y1="13" x2="15.077" y2="14.385" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_mass_mailing_sms__e" x1="37" y1="19" x2="48.077" y2="20.385" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/sms/views/sms_template_views.xml b/addons/sms/views/sms_template_views.xml
index 4db7924832e..376ec993b73 100644
--- a/addons/sms/views/sms_template_views.xml
+++ b/addons/sms/views/sms_template_views.xml
@@ -35,7 +35,11 @@
                                 <span class="o_stat_text">Context Action</span>
                             </div>
                         </button>
-                        <button class="oe_stat_button" name="%(sms_template_preview_action)d" icon="fa-search-plus" string="Preview" type="action" target="new"/>
+                        <button class="oe_stat_button" name="%(sms_template_preview_action)d" icon="fa-search-plus" type="action" target="new">
+                            <div class="o_field_widget o_stat_info">
+                                <span class="o_stat_text">Preview</span>
+                            </div>
+                        </button>
                     </div>
                     <div class="oe_title">
                         <label for="name" string="SMS Template"/>
diff --git a/addons/snailmail/static/description/icon.png b/addons/snailmail/static/description/icon.png
index 80889c3de3a..622357beb01 100644
Binary files a/addons/snailmail/static/description/icon.png and b/addons/snailmail/static/description/icon.png differ
diff --git a/addons/snailmail/static/description/icon.svg b/addons/snailmail/static/description/icon.svg
index c0402964ed5..814d96a0648 100644
--- a/addons/snailmail/static/description/icon.svg
+++ b/addons/snailmail/static/description/icon.svg
@@ -1,35 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 70">
-  <defs>
-    <mask id="mask" x="0" y="0" width="70" height="70" maskUnits="userSpaceOnUse">
-      <g id="b">
-        <path id="a" d="M4,0H65c4,0,5,1,5,5V65c0,4-1,5-5,5H4c-3,0-4-1-4-5V5C0,1,1,0,4,0Z" fill="#fff" fill-rule="evenodd"/>
-      </g>
-    </mask>
-    <linearGradient id="linear-gradient" x1="-1438.5" y1="477.94" x2="-1439.5" y2="476.94" gradientTransform="matrix(70, 0, 0, -70, 100764.99, 33455.73)" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#cd7690"/>
-      <stop offset="1" stop-color="#ca5377"/>
-    </linearGradient>
-  </defs>
-  <g mask="url(#mask)">
-    <g>
-      <path d="M0,0H70V70H0Z" fill-rule="evenodd" fill="url(#linear-gradient)"/>
-      <path d="M4,1H65c2.67,0,4.33.67,5,2V0H0V3C.67,1.67,2,1,4,1Z" fill="#fff" fill-opacity="0.38" fill-rule="evenodd"/>
-      <path d="M34.48,69H4c-2,0-4-.15-4-4.08V41.77L16.94,24.83l6.56-2.94,15-15,.71,2.26,11.87-.16-3.77,7.15L40,23.42v1.49l3-3h3c3.89-.06,8.64,27,8.64,27Z" fill="#393939" fill-rule="evenodd" opacity="0.32" style="isolation: isolate"/>
-      <path d="M4,69H65c2.67,0,4.33-1,5-3v4H0V66A3.92,3.92,0,0,0,4,69Z" fill-opacity="0.38" fill-rule="evenodd"/>
-      <g>
-        <g opacity="0.4">
-          <path d="M36.52,36.47A1.5,1.5,0,0,1,35,35V10.37a1.5,1.5,0,1,1,3,0V35A1.5,1.5,0,0,1,36.52,36.47Z"/>
-          <path d="M44.45,18.62H36.52V10.37H48.17a1,1,0,0,1,.88,1.56l-3.72,6.19A1,1,0,0,1,44.45,18.62Z" fill-rule="evenodd"/>
-          <path d="M33,63.89a1.51,1.51,0,0,1-1.5-1.5V49.92a1.5,1.5,0,0,1,3,0V62.39A1.5,1.5,0,0,1,33,63.89Z"/>
-          <path d="M45.57,23.91H41V35a4.5,4.5,0,0,1-9,0V23.91H20.11a7.3,7.3,0,0,0-7.19,7.4v19a1,1,0,0,0,1,1H51.78a1,1,0,0,0,1-1v-19A7.31,7.31,0,0,0,45.57,23.91ZM26.65,49.32H14.92v-18a5.32,5.32,0,0,1,4.92-5.39,6.68,6.68,0,0,1,6.81,6.39Z" fill-rule="evenodd"/>
-        </g>
-        <g>
-          <path d="M38.54,34.45A1.5,1.5,0,0,1,37,33V8.34a1.5,1.5,0,1,1,3,0V33A1.5,1.5,0,0,1,38.54,34.45Z" fill="#fff"/>
-          <path d="M46.47,16.59H38.54V8.34H50.19a1,1,0,0,1,.88,1.57l-3.72,6.18A1,1,0,0,1,46.47,16.59Z" fill="#fff" fill-rule="evenodd"/>
-          <path d="M35,61.86a1.5,1.5,0,0,1-1.5-1.5V47.89a1.5,1.5,0,0,1,3,0V60.36A1.5,1.5,0,0,1,35,61.86Z" fill="#fff"/>
-          <path d="M47.59,21.89H43V33a4.5,4.5,0,0,1-9,0V21.89H22.14a7.31,7.31,0,0,0-7.2,7.4v19a1,1,0,0,0,1,1H53.8a1,1,0,0,0,1-1v-19A7.31,7.31,0,0,0,47.59,21.89ZM28.67,47.3H16.94v-18a5.31,5.31,0,0,1,4.92-5.39,6.66,6.66,0,0,1,6.81,6.39Z" fill="#fff" fill-rule="evenodd"/>
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M0 42V8l25 17L0 42Z" fill="var(--o-icons-red-red, #F9383D)"/><path d="M0 42V8l25 17L0 42Z" fill="url(#o_icon_snailmail__a)" fill-opacity=".2"/><path d="M25 25 0 8h50L25 25Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M25 25 0 8h50L25 25Z" fill="url(#o_icon_snailmail__b)" fill-opacity=".2"/><path d="M50 8 0 42h46a4 4 0 0 0 4-4V8Z" fill="var(--o-icons-purple-red, #911E3D)"/><path d="M50 8 0 42h46a4 4 0 0 0 4-4V8Z" fill="url(#o_icon_snailmail__c)" fill-opacity=".2"/><defs><linearGradient id="o_icon_snailmail__a" x1="0" y1="8" x2="30.229" y2="13.557" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_snailmail__b" x1="0" y1="8" x2="40.567" y2="37.829" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_snailmail__c" x1="0" y1="8" x2="55.058" y2="28.242" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/snailmail/static/src/core_ui/snailmail_error.xml b/addons/snailmail/static/src/core_ui/snailmail_error.xml
index 4fdeb3d822a..701f17736d1 100644
--- a/addons/snailmail/static/src/core_ui/snailmail_error.xml
+++ b/addons/snailmail/static/src/core_ui/snailmail_error.xml
@@ -9,7 +9,7 @@
                 </p>
                 <div t-if="snailmailCreditsUrl" class="text-end mx-3 mb-3">
                     <a class="btn btn-link" t-att-href="snailmailCreditsUrl" target="_blank">
-                        <i class="fa fa-arrow-right"/> Buy credits
+                        <i class="oi oi-arrow-right"/> Buy credits
                     </a>
                 </div>
             </t>
@@ -19,7 +19,7 @@
                 </p>
                 <div t-if="snailmailCreditsUrlTrial" class="text-end mx-3 mb-3">
                     <a class="btn btn-link" t-att-href="snailmailCreditsUrlTrial">
-                        <i class="fa fa-arrow-right"/> Buy credits
+                        <i class="oi oi-arrow-right"/> Buy credits
                     </a>
                 </div>
             </t>
diff --git a/addons/spreadsheet_dashboard/static/description/icon.png b/addons/spreadsheet_dashboard/static/description/icon.png
index f13f852a626..d59bfb3a859 100644
Binary files a/addons/spreadsheet_dashboard/static/description/icon.png and b/addons/spreadsheet_dashboard/static/description/icon.png differ
diff --git a/addons/spreadsheet_dashboard/static/description/icon.svg b/addons/spreadsheet_dashboard/static/description/icon.svg
index ebd019e66b3..bfe8db35652 100644
--- a/addons/spreadsheet_dashboard/static/description/icon.svg
+++ b/addons/spreadsheet_dashboard/static/description/icon.svg
@@ -1,23 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70">
-    <defs>
-        <path id="icon-a" d="M4,5.35309892e-14 C36.4160122,9.87060235e-15 58.0836068,-3.97961823e-14 65,5.07020818e-14 C69,6.733808e-14 70,1 70,5 C70,43.0488877 70,62.4235458 70,65 C70,69 69,70 65,70 C61,70 9,70 4,70 C1,70 7.10542736e-15,69 7.10542736e-15,65 C7.25721566e-15,62.4676575 3.83358709e-14,41.8005206 3.60818146e-14,5 C-1.13686838e-13,1 1,5.75716207e-14 4,5.35309892e-14 Z"/>
-        <linearGradient id="icon-c" x1="100%" x2="0%" y1="0%" y2="100%">
-            <stop offset="0%" stop-color="#CD7690"/>
-            <stop offset="100%" stop-color="#CA5377"/>
-        </linearGradient>
-        <path id="icon-d" d="M18.0450069,57.225 C16.6239398,57.2249541 15.319401,56.4292666 14.6550625,55.1573449 C12.9601701,51.9125391 12,48.2137078 12,44.2875 C12,31.4261695 22.2974514,21 35,21 C47.7025486,21 58,31.4261695 58,44.2875 C58,48.2137078 57.0398299,51.9125391 55.3449375,55.1573449 C54.6806259,56.4292924 53.3760701,57.2249902 51.9549931,57.225 L18.0450069,57.225 Z M52.8888889,41.7 C51.4775035,41.7 50.3333333,42.8584723 50.3333333,44.2875 C50.3333333,45.7165277 51.4775035,46.875 52.8888889,46.875 C54.3002743,46.875 55.4444444,45.7165277 55.4444444,44.2875 C55.4444444,42.8584723 54.3002743,41.7 52.8888889,41.7 Z M35,28.7625 C36.4113854,28.7625 37.5555556,27.6040277 37.5555556,26.175 C37.5555556,24.7459723 36.4113854,23.5875 35,23.5875 C33.5886146,23.5875 32.4444444,24.7459723 32.4444444,26.175 C32.4444444,27.6040277 33.5886146,28.7625 35,28.7625 Z M17.1111111,41.7 C15.6997257,41.7 14.5555556,42.8584723 14.5555556,44.2875 C14.5555556,45.7165277 15.6997257,46.875 17.1111111,46.875 C18.5224965,46.875 19.6666667,45.7165277 19.6666667,44.2875 C19.6666667,42.8584723 18.5224965,41.7 17.1111111,41.7 Z M22.3506389,28.8925219 C20.9392535,28.8925219 19.7950833,30.0509941 19.7950833,31.4800219 C19.7950833,32.9090496 20.9392535,34.0675219 22.3506389,34.0675219 C23.7620243,34.0675219 24.9061944,32.9090496 24.9061944,31.4800219 C24.9061944,30.0509941 23.7620243,28.8925219 22.3506389,28.8925219 Z M47.6493611,28.8925219 C46.2379757,28.8925219 45.0938056,30.0509941 45.0938056,31.4800219 C45.0938056,32.9090496 46.2379757,34.0675219 47.6493611,34.0675219 C49.0607465,34.0675219 50.2049167,32.9090496 50.2049167,31.4800219 C50.2049167,30.0509941 49.0607465,28.8925219 47.6493611,28.8925219 Z M40.6952153,31.4423414 C39.686809,31.1156695 38.6082049,31.6784508 38.285566,32.6992195 L34.6181042,44.3034293 C31.9739028,44.501373 29.8888889,46.7346281 29.8888889,49.4625 C29.8888889,52.3205555 32.1772292,54.6375 35,54.6375 C37.8227708,54.6375 40.1111111,52.3205555 40.1111111,49.4625 C40.1111111,47.8636676 39.3946771,46.434559 38.269434,45.4852699 L41.9365764,33.8821113 C42.2591354,32.8612617 41.7033819,31.7690133 40.6952153,31.4423414 Z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <mask id="icon-b" fill="#fff">
-            <use xlink:href="#icon-a"/>
-        </mask>
-        <g mask="url(#icon-b)">
-            <rect width="70" height="70" fill="url(#icon-c)"/>
-            <path fill="#FFF" fill-opacity=".383" d="M4,1.8 L65,1.8 C67.6666667,1.8 69.3333333,1.13333333 70,-0.2 C70,2.46666667 70,3.46666667 70,2.8 L1.10547097e-14,2.8 C-1.65952376e-14,3.46666667 -2.9161925e-14,2.46666667 -2.66453526e-14,-0.2 C0.666666667,1.13333333 2,1.8 4,1.8 Z" transform="matrix(1 0 0 -1 0 2.8)"/>
-            <path fill="#393939" d="M4,50 C2,50 -7.10542736e-15,49.851312 0,45.8367347 L0,26.3942795 L16.3536575,8.86200565 C29.4512192,-0.488174988 39.6666667,-2.3877551 47,3.16326531 C54.3333333,8.71428571 58,14.9591837 58,21.8979592 C55.8677728,29.7827578 54.7719047,33.7755585 54.7123959,33.8763613 C54.6528871,33.9771642 49.9857922,39.3517104 40.7111111,50 L4,50 Z" opacity=".324" transform="translate(0 20)"/>
-            <path fill="#000" fill-opacity=".383" d="M4,4 L65,4 C67.6666667,4 69.3333333,3 70,1 C70,3.66666667 70,5 70,5 L1.77635684e-15,5 C1.77635684e-15,5 1.77635684e-15,3.66666667 1.77635684e-15,1 C0.666666667,3 2,4 4,4 Z" transform="translate(0 65)"/>
-            <use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#icon-d"/>
-            <path fill="#FFF" fill-rule="nonzero" d="M18.0450069,55.225 C16.6239398,55.2249541 15.319401,54.4292666 14.6550625,53.1573449 C12.9601701,49.9125391 12,46.2137078 12,42.2875 C12,29.4261695 22.2974514,19 35,19 C47.7025486,19 58,29.4261695 58,42.2875 C58,46.2137078 57.0398299,49.9125391 55.3449375,53.1573449 C54.6806259,54.4292924 53.3760701,55.2249902 51.9549931,55.225 L18.0450069,55.225 Z M52.8888889,39.7 C51.4775035,39.7 50.3333333,40.8584723 50.3333333,42.2875 C50.3333333,43.7165277 51.4775035,44.875 52.8888889,44.875 C54.3002743,44.875 55.4444444,43.7165277 55.4444444,42.2875 C55.4444444,40.8584723 54.3002743,39.7 52.8888889,39.7 Z M35,26.7625 C36.4113854,26.7625 37.5555556,25.6040277 37.5555556,24.175 C37.5555556,22.7459723 36.4113854,21.5875 35,21.5875 C33.5886146,21.5875 32.4444444,22.7459723 32.4444444,24.175 C32.4444444,25.6040277 33.5886146,26.7625 35,26.7625 Z M17.1111111,39.7 C15.6997257,39.7 14.5555556,40.8584723 14.5555556,42.2875 C14.5555556,43.7165277 15.6997257,44.875 17.1111111,44.875 C18.5224965,44.875 19.6666667,43.7165277 19.6666667,42.2875 C19.6666667,40.8584723 18.5224965,39.7 17.1111111,39.7 Z M22.3506389,26.8925219 C20.9392535,26.8925219 19.7950833,28.0509941 19.7950833,29.4800219 C19.7950833,30.9090496 20.9392535,32.0675219 22.3506389,32.0675219 C23.7620243,32.0675219 24.9061944,30.9090496 24.9061944,29.4800219 C24.9061944,28.0509941 23.7620243,26.8925219 22.3506389,26.8925219 Z M47.6493611,26.8925219 C46.2379757,26.8925219 45.0938056,28.0509941 45.0938056,29.4800219 C45.0938056,30.9090496 46.2379757,32.0675219 47.6493611,32.0675219 C49.0607465,32.0675219 50.2049167,30.9090496 50.2049167,29.4800219 C50.2049167,28.0509941 49.0607465,26.8925219 47.6493611,26.8925219 Z M40.6952153,29.4423414 C39.686809,29.1156695 38.6082049,29.6784508 38.285566,30.6992195 L34.6181042,42.3034293 C31.9739028,42.501373 29.8888889,44.7346281 29.8888889,47.4625 C29.8888889,50.3205555 32.1772292,52.6375 35,52.6375 C37.8227708,52.6375 40.1111111,50.3205555 40.1111111,47.4625 C40.1111111,45.8636676 39.3946771,44.434559 38.269434,43.4852699 L41.9365764,31.8821113 C42.2591354,30.8612617 41.7033819,29.7690133 40.6952153,29.4423414 Z"/>
-        </g>
-    </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M4 8a4 4 0 0 1 4-4h17v17a4 4 0 0 1-4 4H4V8Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M4 8a4 4 0 0 1 4-4h17v17a4 4 0 0 1-4 4H4V8Z" fill="url(#o_icon_spreadsheet_dashboard__a)" fill-opacity=".2"/><path d="M4 35a4 4 0 0 1 4-4h11v11a4 4 0 0 1-4 4H4V35Z" fill="var(--o-icons-cyan-cyan, #0382F3)"/><path d="M4 35a4 4 0 0 1 4-4h11v11a4 4 0 0 1-4 4H4V35Z" fill="url(#o_icon_spreadsheet_dashboard__b)" fill-opacity=".2"/><path d="M25 46h4a4 4 0 0 0 4-4V31h-4a4 4 0 0 0-4 4v11Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path d="M25 46h4a4 4 0 0 0 4-4V31h-4a4 4 0 0 0-4 4v11Z" fill="url(#o_icon_spreadsheet_dashboard__c)" fill-opacity=".2"/><path d="M31 17v4a4 4 0 0 0 4 4h11v-4a4 4 0 0 0-4-4H31Z" fill="var(--o-icons-red-red, #F9383D)"/><path d="M31 17v4a4 4 0 0 0 4 4h11v-4a4 4 0 0 0-4-4H31Z" fill="url(#o_icon_spreadsheet_dashboard__d)" fill-opacity=".2"/><path d="M31 4v4a4 4 0 0 0 4 4h11V8a4 4 0 0 0-4-4H31Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M31 4v4a4 4 0 0 0 4 4h11V8a4 4 0 0 0-4-4H31Z" fill="url(#o_icon_spreadsheet_dashboard__e)" fill-opacity=".2"/><path d="M38 46h4a4 4 0 0 0 4-4V31h-4a4 4 0 0 0-4 4v11Z" fill="var(--o-icons-teal-teal, #00A079)"/><path d="M38 46h4a4 4 0 0 0 4-4V31h-4a4 4 0 0 0-4 4v11Z" fill="url(#o_icon_spreadsheet_dashboard__f)" fill-opacity=".2"/><defs><linearGradient id="o_icon_spreadsheet_dashboard__a" x1="4" y1="4" x2="28.706" y2="10.177" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_spreadsheet_dashboard__b" x1="4" y1="31" x2="21.647" y2="35.412" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_spreadsheet_dashboard__c" x1="25" y1="31" x2="34.825" y2="32.31" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_spreadsheet_dashboard__d" x1="31" y1="17" x2="46.372" y2="24.206" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_spreadsheet_dashboard__e" x1="31" y1="4" x2="46.372" y2="11.206" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_spreadsheet_dashboard__f" x1="38" y1="31" x2="47.825" y2="32.31" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/dashboard_action.js b/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/dashboard_action.js
index cdccf0f7e43..a3eb8ce5292 100644
--- a/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/dashboard_action.js
+++ b/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/dashboard_action.js
@@ -17,12 +17,7 @@ import { Component, onWillStart, useState, useEffect } from "@odoo/owl";
 export class SpreadsheetDashboardAction extends Component {
     setup() {
         this.Status = Status;
-        this.controlPanelDisplay = {
-            "top-left": true,
-            "top-right": true,
-            "bottom-left": false,
-            "bottom-right": false,
-        };
+        this.controlPanelDisplay = {};
         this.orm = useService("orm");
         this.router = useService("router");
         // Use the non-protected orm service (`this.env.services.orm` instead of `useService("orm")`)
diff --git a/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/dashboard_action.xml b/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/dashboard_action.xml
index 1bc9c12af4b..3b1a729ef1b 100644
--- a/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/dashboard_action.xml
+++ b/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/dashboard_action.xml
@@ -2,7 +2,7 @@
 <templates>
     <div t-name="spreadsheet_dashboard.DashboardAction" owl="1" class="o_action o_spreadsheet_dashboard_action o_field_highlight">
         <ControlPanel display="controlPanelDisplay">
-            <t t-set-slot="control-panel-top-right">
+            <t t-set-slot="layout-actions">
                 <t t-set="status" t-value="state.activeDashboard and state.activeDashboard.status"/>
                 <FilterValue
                     t-if="status === Status.Loaded"
diff --git a/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/mobile_search_panel/mobile_search_panel.xml b/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/mobile_search_panel/mobile_search_panel.xml
index f76c6f53b6a..19ebfc91119 100644
--- a/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/mobile_search_panel/mobile_search_panel.xml
+++ b/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/mobile_search_panel/mobile_search_panel.xml
@@ -6,7 +6,7 @@
                 <div class="o_spreadsheet_dashboard_search_panel o_search_panel o_searchview o_mobile_search">
                     <div class="o_mobile_search_header">
                         <button type="button" class="o_mobile_search_button btn" t-on-click="() => this.state.isOpen = false">
-                            <i class="fa fa-arrow-left" />
+                            <i class="oi oi-arrow-left" />
                             <strong class="ml8">BACK</strong>
                         </button>
                     </div>
diff --git a/addons/spreadsheet_dashboard/static/tests/dashboard/dashboard_action_test.js b/addons/spreadsheet_dashboard/static/tests/dashboard/dashboard_action_test.js
index fdb2caac705..5412856eb83 100644
--- a/addons/spreadsheet_dashboard/static/tests/dashboard/dashboard_action_test.js
+++ b/addons/spreadsheet_dashboard/static/tests/dashboard/dashboard_action_test.js
@@ -174,7 +174,7 @@ QUnit.test(
         const serverData = getServerData(spreadsheetData);
         const fixture = getFixture();
         await createSpreadsheetDashboard({ serverData });
-        const year = fixture.querySelector(".o_cp_top_right input.o_datetime_input");
+        const year = fixture.querySelector(".o_control_panel_actions input.o_datetime_input");
         const this_year = luxon.DateTime.local().year;
         assert.equal(year.value, String(this_year));
         const input = fixture.querySelector("input.o_datetime_input");
@@ -183,10 +183,10 @@ QUnit.test(
         await nextTick();
 
         assert.equal(year.value, String(this_year - 1));
-        assert.containsOnce(fixture, ".o_cp_top_right .fa-times");
-        await click(fixture.querySelector(".o_cp_top_right .fa-times"));
+        assert.containsOnce(fixture, ".o_control_panel_actions .fa-times");
+        await click(fixture.querySelector(".o_control_panel_actions .fa-times"));
 
-        assert.containsNone(fixture, ".o_cp_top_right .fa-times");
+        assert.containsNone(fixture, ".o_control_panel_actions .fa-times");
         assert.equal(year.placeholder, "Select year...");
     }
 );
diff --git a/addons/stock/static/description/icon.png b/addons/stock/static/description/icon.png
index a004d506f75..3f2239eb610 100644
Binary files a/addons/stock/static/description/icon.png and b/addons/stock/static/description/icon.png differ
diff --git a/addons/stock/static/description/icon.svg b/addons/stock/static/description/icon.svg
index 834a8e1f5fc..fdba579b4cc 100644
--- a/addons/stock/static/description/icon.svg
+++ b/addons/stock/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#B06161"/><stop offset="45.785%" stop-color="#984E4E"/><stop offset="100%" stop-color="#7C3838"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M32.44 69H4c-2 0-4-1-4-4V42.15l15.632-16.68L36 21l16 4 7.943 5.353L55 36v8.576L32.44 69z" opacity=".33"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><path fill="#000" fill-rule="nonzero" d="M54.85 36.807a.36.36 0 0 1 .15.293v9.393a.36.36 0 0 1-.222.333l-17.28 7.147a.357.357 0 0 1-.338-.034.36.36 0 0 1-.16-.3V36.36a.36.36 0 0 1 .64-.226l3.85 4.76s.182.243.462.146c.334-.115 12.572-4.281 12.572-4.281a.36.36 0 0 1 .326.048zm5.075-4.873a.345.345 0 0 1 .058.322.369.369 0 0 1-.24.233l-17.035 5.487a.387.387 0 0 1-.415-.114l-4.769-5.578-1.413.37-.021.004a.396.396 0 0 1-.2 0l-1.414-.369-4.769 5.578a.387.387 0 0 1-.415.114l-17.035-5.487a.369.369 0 0 1-.24-.233.344.344 0 0 1 .058-.322l3.466-4.395a.379.379 0 0 1 .2-.13l20.146-5.398a.484.484 0 0 1 .226-.005L56.26 27.41c.08.021.15.067.2.13l3.466 4.395zM36.01 31.13l14.426-3.75-14.426-3.844-14.447 3.849L36.01 31.13zm-1.264 4.89c.152.052.253.188.253.34v17.28c0 .12-.063.232-.169.3a.394.394 0 0 1-.356.033l-18.24-7.147a.36.36 0 0 1-.235-.333V37.1c0-.116.059-.225.159-.293a.398.398 0 0 1 .343-.048s12.918 4.166 13.27 4.281c.297.097.488-.146.488-.146l4.065-4.76a.393.393 0 0 1 .422-.113z" opacity=".3"/><path fill="#FFF" fill-rule="nonzero" d="M54.85 34.807a.36.36 0 0 1 .15.293v9.393a.36.36 0 0 1-.222.333l-17.28 7.147a.357.357 0 0 1-.338-.034.36.36 0 0 1-.16-.3V34.36a.36.36 0 0 1 .64-.226l3.85 4.76s.182.243.462.146c.334-.115 12.572-4.281 12.572-4.281a.36.36 0 0 1 .326.048zm5.075-4.873a.345.345 0 0 1 .058.322.369.369 0 0 1-.24.233l-17.035 5.487a.387.387 0 0 1-.415-.114l-4.769-5.578-1.413.37-.021.004a.396.396 0 0 1-.2 0l-1.414-.369-4.769 5.578a.387.387 0 0 1-.415.114l-17.035-5.487a.369.369 0 0 1-.24-.233.344.344 0 0 1 .058-.322l3.466-4.395a.379.379 0 0 1 .2-.13l20.146-5.398a.484.484 0 0 1 .226-.005L56.26 25.41c.08.021.15.067.2.13l3.466 4.395zM36.01 29.13l14.426-3.75-14.426-3.844-14.447 3.849L36.01 29.13zm-1.264 4.89c.152.052.253.188.253.34v17.28c0 .12-.063.232-.169.3a.394.394 0 0 1-.356.033l-18.24-7.147a.36.36 0 0 1-.235-.333V35.1c0-.116.059-.225.159-.293a.398.398 0 0 1 .343-.048s12.918 4.166 13.27 4.281c.297.097.488-.146.488-.146l4.065-4.76a.393.393 0 0 1 .422-.113z"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="m25 4 6.857 4L15.5 19v16l.5 5.75-9-5.25v-21L25 4Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="m25 4 6.857 4L15.5 19v16l.5 5.75-9-5.25v-21L25 4Z" fill="url(#o_icon_stock__a)" fill-opacity=".2"/><path d="m18.086 41.967-6.138-3.58V17.5L30.046 6.943l6.282 3.665L22 23.5l-3.914 18.467Z" fill="var(--o-icons-red-yellow, #F85318)"/><path d="m18.086 41.967-6.138-3.58V17.5L30.046 6.943l6.282 3.665L22 23.5l-3.914 18.467Z" fill="url(#o_icon_stock__b)" fill-opacity=".2"/><path d="M36.328 10.608 43 14.5v21L25 46l-6.914-4.033V21.25l18.242-10.642Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M36.328 10.608 43 14.5v21L25 46l-6.914-4.033V21.25l18.242-10.642Z" fill="url(#o_icon_stock__c)" fill-opacity=".2"/><defs><linearGradient id="o_icon_stock__a" x1="7" y1="4" x2="37.208" y2="9.108" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_stock__b" x1="11.948" y1="6.943" x2="41.528" y2="12.091" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_stock__c" x1="18.086" y1="10.608" x2="48.293" y2="15.924" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/stock/static/src/client_actions/stock_traceability_report_backend.js b/addons/stock/static/src/client_actions/stock_traceability_report_backend.js
index d86818eac2f..6d800be21e9 100644
--- a/addons/stock/static/src/client_actions/stock_traceability_report_backend.js
+++ b/addons/stock/static/src/client_actions/stock_traceability_report_backend.js
@@ -63,7 +63,7 @@ export class TraceabilityReport extends Component {
         });
 
         this.display = {
-            controlPanel: { "top-right": false, "bottom-right": false },
+            controlPanel: {},
             searchPanel: false,
         };
     }
diff --git a/addons/stock/static/src/components/reception_report_main/stock_reception_report_main.js b/addons/stock/static/src/components/reception_report_main/stock_reception_report_main.js
index d017274736a..c42c12a7197 100644
--- a/addons/stock/static/src/components/reception_report_main/stock_reception_report_main.js
+++ b/addons/stock/static/src/components/reception_report_main/stock_reception_report_main.js
@@ -9,10 +9,7 @@ const { Component, onWillStart, useState } = owl;
 
 export class ReceptionReportMain extends Component {
     setup() {
-        this.controlPanelDisplay = {
-            "top-right": false,
-            "bottom-right": false,
-        };
+        this.controlPanelDisplay = {};
         this.ormService = useService("orm");
         this.actionService = useService("action");
         this.reportName = "stock.report_reception";
diff --git a/addons/stock/static/src/components/reception_report_main/stock_reception_report_main.xml b/addons/stock/static/src/components/reception_report_main/stock_reception_report_main.xml
index e9c042982cd..9b64d8ab937 100644
--- a/addons/stock/static/src/components/reception_report_main/stock_reception_report_main.xml
+++ b/addons/stock/static/src/components/reception_report_main/stock_reception_report_main.xml
@@ -3,7 +3,7 @@
 
     <div t-name="stock.ReceptionReportMain" class="o_action" owl="1">
         <ControlPanel display="controlPanelDisplay">
-            <t t-set-slot="control-panel-bottom-left-buttons">
+            <t t-set-slot="control-panel-always-buttons">
                 <div class="o_cp_buttons" role="toolbar" aria-label="Control panel buttons">
                     <div class="d-inline-block">
                         <button t-on-click="onClickPrint" type="button" class="btn btn-primary" title="Print">Print</button>
diff --git a/addons/stock/static/src/stock_forecasted/stock_forecasted.xml b/addons/stock/static/src/stock_forecasted/stock_forecasted.xml
index 1651474cd2a..f427b13e794 100644
--- a/addons/stock/static/src/stock_forecasted/stock_forecasted.xml
+++ b/addons/stock/static/src/stock_forecasted/stock_forecasted.xml
@@ -2,10 +2,10 @@
 <templates id="template" xml:space="preserve">
     <div t-name="stock.Forecasted" class="o_action" owl="1">
         <ControlPanel display="{ 'top-right' : false }">
-            <t t-set-slot="control-panel-bottom-left-buttons">
+            <t t-set-slot="layout-buttons">
                 <ForecastedButtons action="props.action" reloadReport.bind="reloadReport" resModel="resModel"/>
             </t>
-            <t t-set-slot="control-panel-bottom-right">
+            <t t-set-slot="layout-actions">
                 <div class="btn-group o_search_options position-static" role="search">
                     <ForecastedWarehouseFilter action="props.action" warehouses="warehouses" setWarehouseInContext.bind="updateWarehouse"/>
                 </div>
diff --git a/addons/stock/static/src/views/list/inventory_report_list.xml b/addons/stock/static/src/views/list/inventory_report_list.xml
index 81eb95d6f97..2763c591e03 100644
--- a/addons/stock/static/src/views/list/inventory_report_list.xml
+++ b/addons/stock/static/src/views/list/inventory_report_list.xml
@@ -2,7 +2,7 @@
 <templates id="template" xml:space="preserve">
 
 <t t-name="InventoryReport.Buttons" t-inherit="web.ListView.Buttons" t-inherit-mode="primary" owl="1">
-    <xpath expr="(//div/*)[last()]" position="after">
+    <xpath expr="//div[hasclass('o_list_buttons')]" position="inside">
         <button t-if="props.context.inventory_mode and !props.context.inventory_report_mode and nbSelected == 0"
             class="btn btn-secondary" type="button" t-on-click="onClickApplyAll">
             Apply All
diff --git a/addons/stock/static/src/views/stock_orderpoint_list_buttons.xml b/addons/stock/static/src/views/stock_orderpoint_list_buttons.xml
index b44962b4a5b..fe964494e40 100644
--- a/addons/stock/static/src/views/stock_orderpoint_list_buttons.xml
+++ b/addons/stock/static/src/views/stock_orderpoint_list_buttons.xml
@@ -2,10 +2,7 @@
 <templates id="template" xml:space="preserve">
 
     <t t-name="stock.StockOrderpoint.Buttons" t-inherit="web.ListView.Buttons" owl="1">
-        <xpath expr="//button[hasclass('o_list_button_add')]" position="attributes">
-            <attribute name="class">btn btn-secondary o_list_button_add</attribute>
-        </xpath>
-        <xpath expr="//t[@t-if='props.showButtons']" position="before">
+        <xpath expr="//div[hasclass('o_list_buttons')]" position="inside">
             <button t-if="nbSelected" type="button" t-on-click="onClickOrder"
                     class="o_button_order btn btn-primary me-1">
                 Order
diff --git a/addons/stock/static/tests/inventory_report_list_tests.js b/addons/stock/static/tests/inventory_report_list_tests.js
index 3b34c8ae4ca..6aa23fbdfc0 100644
--- a/addons/stock/static/tests/inventory_report_list_tests.js
+++ b/addons/stock/static/tests/inventory_report_list_tests.js
@@ -88,10 +88,10 @@ QUnit.module(
         assert.containsN(target, '.o_data_row', 3, "should have 3 records");
 
         // Create a new line...
-        await click(target.querySelector(".o_list_button_add"));
+        await click(target.querySelector(".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_add"));
         await editInput(target, "[name=name] input", 'Bilou');
         await editInput(target, "[name=age] input", '24');
-        await click(target.querySelector(".o_list_button_save"));
+        await click(target.querySelector(".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_save"));
 
         // Check new record is in the list
         assert.containsN(target, '.o_data_row', 4, "should now have 4 records");
@@ -117,10 +117,10 @@ QUnit.module(
 
         // Create a new line for an existing record...
         let name = serverData.models.person.records[2].name, age = '72';
-        await click(target.querySelector(".o_list_button_add"));
+        await click(target.querySelector(".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_add"));
         await editInput(target, "[name=name] input", name);
         await editInput(target, "[name=age] input", age);
-        await click(target.querySelector(".o_list_button_save"));
+        await click(target.querySelector(".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_save"));
 
         // Check we still have 3 records...
         assert.containsN(target, '.o_data_row', 3, "should still have 3 records");
@@ -157,7 +157,7 @@ QUnit.module(
         await click(target, ".o_group_field_row_add a");
         await editInput(target, "[name=name] input", name);
         await editInput(target, "[name=age] input", age);
-        await click(target.querySelector(".o_list_button_save"));
+        await click(target.querySelector(".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_save"));
         // Check we have 2 records...
         assert.containsN(target, '.o_data_row', 2, "should have 2 records");
 
@@ -167,7 +167,7 @@ QUnit.module(
         await click(target, ".o_group_field_row_add a");
         await editInput(target, "[name=name] input", name);
         await editInput(target, "[name=age] input", age);
-        await click(target.querySelector(".o_list_button_save"));
+        await click(target.querySelector(".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_save"));
         // Check we still have 2 records...
         assert.containsN(target, '.o_data_row', 2, "should still have 2 records");
 
@@ -177,7 +177,7 @@ QUnit.module(
         await editInput(target, "[name=name] input", name);
         await editInput(target, "[name=age] input", age);
         await editInput(target, "[name=job] input", "Soldier"); // let it in its original group
-        await click(target.querySelector(".o_list_button_save"));
+        await click(target.querySelector(".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_save"));
         // Check we have 3 records...
         assert.containsN(target, '.o_data_row', 3, "should have 3 records");
 
diff --git a/addons/stock/static/tests/tours/stock_report_tests.js b/addons/stock/static/tests/tours/stock_report_tests.js
index c08aced29f2..bdc6986b342 100644
--- a/addons/stock/static/tests/tours/stock_report_tests.js
+++ b/addons/stock/static/tests/tours/stock_report_tests.js
@@ -7,7 +7,7 @@
         steps: [
     {
         trigger: '.o_kanban_record',
-        extra_trigger:'.breadcrumb',
+        extra_trigger: '.o_breadcrumb',
     },
     {
         trigger: '.nav-item > a:contains("Inventory")',
diff --git a/addons/stock/views/product_views.xml b/addons/stock/views/product_views.xml
index 141bdc3079b..ec5fea79b57 100644
--- a/addons/stock/views/product_views.xml
+++ b/addons/stock/views/product_views.xml
@@ -115,7 +115,7 @@
                         <label for="route_ids" attrs="{'invisible': [('type', '=', 'service')]}"/>
                         <div>
                             <field name="route_ids" class="mb-0" widget="many2many_checkboxes" attrs="{'invisible': ['|', ('has_available_route_ids', '=', False), ('type', '=', 'service')]}"/>
-                            <button id="stock.view_diagram_button" string="View Diagram" type="action" name="%(action_open_routes)d" icon="fa-arrow-right"
+                            <button id="stock.view_diagram_button" string="View Diagram" type="action" name="%(action_open_routes)d" icon="oi-arrow-right"
                                  attrs="{'invisible':[('type', 'not in', ['product', 'consu'])]}"
                                  class="btn btn-link pt-0" context="{'default_product_tmpl_id': id}"/>
                         </div>
@@ -263,9 +263,9 @@
                                 type="object"
                                 attrs="{'invisible':[('show_on_hand_qty_status_button', '=', False)]}">
                                 <div class="o_field_widget o_stat_info">
-                                        <span class="o_stat_value">
-                                            <field name="qty_available" widget="statinfo" nolabel="1" class="mr4"/>
-                                            <field name="uom_name"/>
+                                        <span class="o_stat_value d-flex gap-1">
+                                            <field name="qty_available" widget="statinfo" nolabel="1" class="oe_inline"/>
+                                            <field name="uom_name" class="oe_inline"/>
                                         </span>
                                         <span class="o_stat_text">On Hand</span>
                                 </div>
@@ -276,9 +276,9 @@
                                 context="{'default_product_id': id, 'active_model': 'product.template'}"
                                 class="oe_stat_button" icon="fa-cubes">
                                 <div class="o_field_widget o_stat_info">
-                                    <span class="o_stat_value">
-                                        <field name="virtual_available" widget="statinfo" nolabel="1" class="mr4"/>
-                                        <field name="uom_name"/>
+                                    <span class="o_stat_value d-flex gap-1">
+                                        <field name="virtual_available" widget="statinfo" nolabel="1" class="oe_inline"/>
+                                        <field name="uom_name" class="oe_inline"/>
                                     </span>
                                     <span class="o_stat_text">Forecasted</span>
                                 </div>
@@ -288,25 +288,29 @@
                                 attrs="{'invisible':[('type', 'not in', ['product', 'consu'])]}"
                                 class="oe_stat_button" icon="fa-exchange"
                                 groups="stock.group_stock_user">
-                                <div class="o_field_widget o_stat_info mr4">
-                                    <span class="o_stat_text">In:</span>
-                                    <span class="o_stat_text">Out:</span>
-                                </div>
-                                <div class="o_field_widget o_stat_info">
-                                    <span class="o_stat_value"><field name="nbr_moves_in"/></span>
-                                    <span class="o_stat_value"><field name="nbr_moves_out"/></span>
+                                <div class="d-flex flex-column">
+                                    <div class="o_field_widget o_stat_info align-items-baseline flex-row gap-1 me-1">
+                                        <span class="o_stat_text">In:</span>
+                                        <span class="o_stat_value"><field name="nbr_moves_in"/></span>
+                                    </div>
+                                    <div class="o_field_widget o_stat_info align-items-baseline flex-row gap-1 me-1">
+                                        <span class="o_stat_text">Out:</span>
+                                        <span class="o_stat_value"><field name="nbr_moves_out"/></span>
+                                    </div>
                                 </div>
                             </button>
                             <button name="action_view_orderpoints" type="object"
                                 attrs="{'invisible':['|',('type', 'not in', ['product', 'consu']),('nbr_reordering_rules', '!=', 1)]}"
                                 class="oe_stat_button" icon="fa-refresh">
-                                <div class="o_field_widget o_stat_info mr4">
-                                    <span class="o_stat_text">Min:</span>
-                                    <span class="o_stat_text">Max:</span>
-                                </div>
-                                <div class="o_field_widget o_stat_info">
-                                    <span class="o_stat_value"><field name="reordering_min_qty"/></span>
-                                    <span class="o_stat_value"><field name="reordering_max_qty"/></span>
+                                <div class="d-flex flex-column">
+                                    <div class="o_field_widget o_stat_info align-items-baseline flex-row gap-1 me-1">
+                                        <span class="o_stat_text">Min:</span>
+                                        <span class="o_stat_value"><field name="reordering_min_qty"/></span>
+                                    </div>
+                                    <div class="o_field_widget o_stat_info align-items-baseline flex-row gap-1 me-1">
+                                        <span class="o_stat_text">Max:</span>
+                                        <span class="o_stat_value"><field name="reordering_max_qty"/></span>
+                                    </div>
                                 </div>
                             </button>
                             <button type="object"
@@ -370,9 +374,9 @@
                                 attrs="{'invisible':[('show_on_hand_qty_status_button', '=', False)]}"
                                 class="oe_stat_button" icon="fa-cubes">
                                 <div class="o_field_widget o_stat_info">
-                                    <span class="o_stat_value" widget="statinfo">
-                                        <field name="qty_available" widget="statinfo" nolabel="1" class="mr4"/>
-                                        <field name="uom_name"/>
+                                    <span class="o_stat_value d-flex gap-1">
+                                        <field name="qty_available" widget="statinfo" nolabel="1" class="oe_inline"/>
+                                        <field name="uom_name" class="oe_inline"/>
                                     </span>
                                     <span class="o_stat_text">On Hand</span>
                                 </div>
@@ -383,9 +387,9 @@
                                 context="{'default_product_tmpl_id': id}"
                                 class="oe_stat_button" icon="fa-cubes">
                                 <div class="o_field_widget o_stat_info">
-                                    <span class="o_stat_value">
-                                        <field name="virtual_available" widget="statinfo" nolabel="1" class="mr4"/>
-                                        <field name="uom_name"/>
+                                    <span class="o_stat_value d-flex gap-1">
+                                        <field name="virtual_available" widget="statinfo" nolabel="1" class="oe_inline"/>
+                                        <field name="uom_name" class="oe_inline"/>
                                     </span>
                                     <span class="o_stat_text">Forecasted</span>
                                 </div>
@@ -395,26 +399,30 @@
                                 attrs="{'invisible':[('type', 'not in', ['product', 'consu'])]}"
                                 class="oe_stat_button" icon="fa-exchange"
                                 groups="stock.group_stock_user">
-                                <div class="o_field_widget o_stat_info mr4">
-                                    <span class="o_stat_text">In:</span>
-                                    <span class="o_stat_text">Out:</span>
-                                </div>
-                                <div class="o_field_widget o_stat_info">
-                                    <span class="o_stat_value"><field name="nbr_moves_in"/></span>
-                                    <span class="o_stat_value"><field name="nbr_moves_out"/></span>
+                                <div class="d-flex flex-column">
+                                    <div class="o_field_widget o_stat_info align-items-baseline flex-row gap-1 me-1">
+                                        <span class="o_stat_text">In:</span>
+                                        <span class="o_stat_value"><field name="nbr_moves_in"/></span>
+                                    </div>
+                                    <div class="o_field_widget o_stat_info align-items-baseline flex-row gap-1 me-1">
+                                        <span class="o_stat_text">Out:</span>
+                                        <span class="o_stat_value"><field name="nbr_moves_out"/></span>
+                                    </div>
                                 </div>
                             </button>
                             <button type="object"
                                 name="action_view_orderpoints"
                                 attrs="{'invisible':['|',('type', '!=', 'product'),('nbr_reordering_rules', '!=', 1)]}"
                                 class="oe_stat_button" icon="fa-refresh">
-                                <div class="o_field_widget o_stat_info mr4">
-                                    <span class="o_stat_text">Min:</span>
-                                    <span class="o_stat_text">Max:</span>
-                                </div>
-                                <div class="o_field_widget o_stat_info">
-                                    <span class="o_stat_value"><field name="reordering_min_qty"/></span>
-                                    <span class="o_stat_value"><field name="reordering_max_qty"/></span>
+                                <div class="d-flex flex-column">
+                                    <div class="o_field_widget o_stat_info align-items-baseline flex-row gap-1 me-1">
+                                        <span class="o_stat_text">Min:</span>
+                                        <span class="o_stat_value"><field name="reordering_min_qty"/></span>
+                                    </div>
+                                    <div class="o_field_widget o_stat_info align-items-baseline flex-row gap-1 me-1">
+                                        <span class="o_stat_text">Max:</span>
+                                        <span class="o_stat_value"><field name="reordering_max_qty"/></span>
+                                    </div>
                                 </div>
                             </button>
                             <button type="object"
@@ -424,24 +432,36 @@
                                 icon="fa-refresh">
                                 <field name="nbr_reordering_rules" widget="statinfo"/>
                             </button>
-                            <button string="Lot/Serial Numbers" type="object"
+                            <button type="object"
                                 name="action_open_product_lot"
                                 attrs="{'invisible': [('tracking', '=', 'none')]}"
-                                class="oe_stat_button" icon="fa-bars" groups="stock.group_production_lot"/>
-                            <button string="Putaway Rules" type="object"
+                                class="oe_stat_button" icon="fa-bars" groups="stock.group_production_lot">
+                                <div class="o_stat_info">
+                                    <span class="o_stat_text">Lot/Serial Numbers</span>
+                                </div>
+                            </button>
+                            <button type="object"
                                 name="action_view_related_putaway_rules"
                                 class="oe_stat_button" icon="fa-random" groups="stock.group_stock_multi_locations"
                                 attrs="{'invisible': [('type', '=', 'service')]}"
                                 context="{
                                     'invisible_handle': True,
                                     'single_product': product_variant_count == 1,
-                                }"/>
-                            <button type="object" string="Storage Capacities"
+                                }">
+                                    <div class="o_stat_info">
+                                        <span class="o_stat_text">Putaway Rules</span>
+                                    </div>
+                             </button>
+                            <button type="object"
                                 name="action_view_storage_category_capacity"
                                 groups="stock.group_stock_storage_categories"
                                 attrs="{'invisible':[('type', '=', 'service')]}"
                                 class="oe_stat_button"
-                                icon="fa-cubes"/>
+                                icon="fa-cubes">
+                                <div class="o_stat_info">
+                                    <span class="o_stat_text">Storage Capacities</span>
+                                </div>
+                            </button>
                         </t>
                     </div>
 
diff --git a/addons/stock/views/res_config_settings_views.xml b/addons/stock/views/res_config_settings_views.xml
index 118afe0f1aa..19a217fb790 100644
--- a/addons/stock/views/res_config_settings_views.xml
+++ b/addons/stock/views/res_config_settings_views.xml
@@ -98,7 +98,7 @@
                                 <field name="group_product_variant"/>
                                 <div class="content-group">
                                     <div class="mt8" attrs="{'invisible': [('group_product_variant', '=', False)]}">
-                                        <button name="%(product.attribute_action)d" icon="fa-arrow-right" type="action" string="Attributes" class="btn-link"/>
+                                        <button name="%(product.attribute_action)d" icon="oi-arrow-right" type="action" string="Attributes" class="btn-link"/>
                                     </div>
                                 </div>
                             </setting>
@@ -106,7 +106,7 @@
                                 <field name="group_uom"/>
                                 <div class="content-group">
                                     <div class="mt8" attrs="{'invisible': [('group_uom', '=', False)]}">
-                                        <button name="%(uom.product_uom_categ_form_action)d" icon="fa-arrow-right" type="action" string="Units Of Measure" class="btn-link"/>
+                                        <button name="%(uom.product_uom_categ_form_action)d" icon="oi-arrow-right" type="action" string="Units Of Measure" class="btn-link"/>
                                     </div>
                                 </div>
                             </setting>
@@ -114,7 +114,7 @@
                                 <field name="group_stock_packaging"/>
                                 <div class="content-group">
                                     <div class="mt8" attrs="{'invisible': [('group_stock_packaging', '=', False)]}">
-                                        <button name="%(product.action_packaging_view)d" icon="fa-arrow-right" type="action" string="Product Packagings" class="btn-link"/>
+                                        <button name="%(product.action_packaging_view)d" icon="oi-arrow-right" type="action" string="Product Packagings" class="btn-link"/>
                                     </div>
                                 </div>
                             </setting>
@@ -146,8 +146,8 @@
                                 <field name="group_stock_multi_locations"/>
                                 <div class="content-group">
                                     <div class="mt8" attrs="{'invisible': [('group_stock_multi_locations', '=', False)]}">
-                                        <button name="%(stock.action_location_form)d" icon="fa-arrow-right" type="action" string="Locations" class="btn-link"/><br/>
-                                        <button name="stock.action_putaway_tree" icon="fa-arrow-right" type="action" string="Putaway Rules" class="btn-link"/>
+                                        <button name="%(stock.action_location_form)d" icon="oi-arrow-right" type="action" string="Locations" class="btn-link"/><br/>
+                                        <button name="stock.action_putaway_tree" icon="oi-arrow-right" type="action" string="Putaway Rules" class="btn-link"/>
                                     </div>
                                 </div>
                             </setting>
@@ -155,7 +155,7 @@
                                 <field name="group_stock_adv_location"/>
                                 <div class="content-group">
                                     <div class="mt8" attrs="{'invisible': [('group_stock_adv_location', '=', False)]}">
-                                        <button name="%(stock.action_warehouse_form)d" icon="fa-arrow-right" type="action" string="Set Warehouse Routes" class="btn-link"/>
+                                        <button name="%(stock.action_warehouse_form)d" icon="oi-arrow-right" type="action" string="Set Warehouse Routes" class="btn-link"/>
                                     </div>
                                 </div>
                             </setting>
@@ -163,10 +163,10 @@
                                 <field name="group_stock_storage_categories"/>
                                 <div class="content-group" attrs="{'invisible': [('group_stock_storage_categories', '=', False)]}">
                                     <div class="mt8">
-                                        <button name="%(stock.action_storage_category)d" icon="fa-arrow-right" type="action" string="Storage Categories" class="btn-link"/>
+                                        <button name="%(stock.action_storage_category)d" icon="oi-arrow-right" type="action" string="Storage Categories" class="btn-link"/>
                                     </div>
                                     <div class="mt4" groups="base.group_no_one">
-                                        <button name="%(stock.action_storage_category_capacity)d" icon="fa-arrow-right" type="action" string="Storage Category Capacity" class="btn-link"/>
+                                        <button name="%(stock.action_storage_category_capacity)d" icon="oi-arrow-right" type="action" string="Storage Category Capacity" class="btn-link"/>
                                     </div>
                                 </div>
                             </setting>
diff --git a/addons/stock/views/stock_location_views.xml b/addons/stock/views/stock_location_views.xml
index 52f442d3023..01dc80d0d0a 100644
--- a/addons/stock/views/stock_location_views.xml
+++ b/addons/stock/views/stock_location_views.xml
@@ -26,7 +26,7 @@
                                 class="oe_stat_button"
                                 icon="fa-cubes" name="%(location_open_quants)d" type="action"/>
                     </div>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <label for="name"/>
                     <h1><field name="name" placeholder="e.g. Spare Stock"/></h1>
                     <label for="location_id"/>
@@ -179,7 +179,7 @@
                 <form string="Route">
                     <field name="company_id" invisible="1"/>
                     <sheet>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <div class="oe_title">
                             <label for="name"/>
                             <h1><field name="name" placeholder="e.g. Two-steps reception"/></h1>
diff --git a/addons/stock/views/stock_lot_views.xml b/addons/stock/views/stock_lot_views.xml
index df48460269e..ed02f1aee50 100644
--- a/addons/stock/views/stock_lot_views.xml
+++ b/addons/stock/views/stock_lot_views.xml
@@ -21,8 +21,16 @@
                                 <span class="o_stat_text">Transfers</span>
                             </div>
                         </button>
-                        <button name="action_lot_open_quants" icon="fa-arrows" class="oe_stat_button" string="Location" type="object"/>
-                        <button name="%(action_stock_report)d" icon="fa-arrow-up" class="oe_stat_button" string="Traceability" type="action"/>
+                        <button name="action_lot_open_quants" icon="fa-arrows" class="oe_stat_button" type="object">
+                            <div class="o_stat_info">
+                                <span class="o_stat_text">Location</span>
+                            </div>
+                        </button>
+                        <button name="%(action_stock_report)d" icon="oi-arrow-up" class="oe_stat_button" type="action">
+                            <div class="o_stat_info">
+                                <span class="o_stat_text">Traceability</span>
+                            </div>
+                        </button>
                 </div>
                 <div class="oe_title">
                     <label for="name"/>
diff --git a/addons/stock/views/stock_orderpoint_views.xml b/addons/stock/views/stock_orderpoint_views.xml
index af72498f734..1ebab25da85 100644
--- a/addons/stock/views/stock_orderpoint_views.xml
+++ b/addons/stock/views/stock_orderpoint_views.xml
@@ -134,7 +134,7 @@
                     <a style="cursor: pointer" class="alert-link o_form_uri" type="action" name="%(action_procurement_compute)d">Run the scheduler</a> manually to trigger the reordering rules right now.
                 </div>
                 <sheet>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="oe_title">
                         <h1>
                             <field name="name"/>
diff --git a/addons/stock/views/stock_picking_type_views.xml b/addons/stock/views/stock_picking_type_views.xml
index 769efa49474..debd48bd17b 100644
--- a/addons/stock/views/stock_picking_type_views.xml
+++ b/addons/stock/views/stock_picking_type_views.xml
@@ -75,7 +75,7 @@
         <field name="arch" type="xml">
             <form string="Operation Types">
                 <sheet>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <label for="name"/>
                     <h1><field name="name" placeholder="e.g. Receptions"/></h1>
                     <group name="first">
diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index 30056099ad8..bacfabf450e 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -155,21 +155,29 @@
                         <field name="has_scrap_move" invisible="True"/>
                         <field name="has_tracking" invisible="True"/>
                         <button name="action_see_move_scrap" string="Scraps" type="object"
-                            class="oe_stat_button" icon="fa-arrows-v"
+                            class="oe_stat_button" icon="oi-arrows-v"
                             attrs="{'invisible': [('has_scrap_move', '=', False)]}"/>
                         <button name="action_see_packages" string="Packages" type="object"
                             class="oe_stat_button" icon="fa-cubes"
                             attrs="{'invisible': [('has_packages', '=', False)]}"/>
-                        <button name="%(action_stock_report)d" icon="fa-arrow-up" class="oe_stat_button" string="Traceability" type="action" attrs="{'invisible': ['|', ('state', '!=', 'done'), ('has_tracking', '=', False)]}" groups="stock.group_production_lot"/>
-                        <button name="action_view_reception_report" string="Allocation" type="object"
+                        <button name="%(action_stock_report)d" icon="oi-arrow-up" class="oe_stat_button" type="action" attrs="{'invisible': ['|', ('state', '!=', 'done'), ('has_tracking', '=', False)]}" groups="stock.group_production_lot">
+                            <div class="o_stat_info">
+                                <span class="o_stat_text">Traceability</span>
+                            </div>
+                        </button>
+                        <button name="action_view_reception_report" type="object"
                             context="{'default_picking_ids': [id]}"
                             class="oe_stat_button" icon="fa-list"
                             attrs="{'invisible': [('show_allocation', '=', False)]}"
-                            groups="stock.group_reception_report"/>
+                            groups="stock.group_reception_report">
+                            <div class="o_stat_info">
+                                <span class="o_stat_text">Allocation</span>
+                            </div>
+                        </button>
                         <!-- Use the following button to avoid onchange on one2many -->
                         <button name="action_picking_move_tree"
                             class="oe_stat_button"
-                            icon="fa-arrows-v"
+                            icon="oi-arrows-v"
                             type="object"
                             help="List view of operations"
                             groups="base.group_no_one"
diff --git a/addons/stock/views/stock_quant_views.xml b/addons/stock/views/stock_quant_views.xml
index 778f18ea79b..370d1ccca83 100644
--- a/addons/stock/views/stock_quant_views.xml
+++ b/addons/stock/views/stock_quant_views.xml
@@ -259,7 +259,7 @@
                     <div class="oe_button_box" name="button_box">
                         <button class="oe_stat_button" name="action_view_picking"
                         string="Package Transfers" type="object"
-                        widget="statinfo" icon="fa-arrows-v"/>
+                        widget="statinfo" icon="oi-arrows-v"/>
                     </div>
                     <div class="oe_title">
                         <label for="name" string="Package Reference"/>
diff --git a/addons/stock/views/stock_rule_views.xml b/addons/stock/views/stock_rule_views.xml
index ab1be7d6bfa..7bd2fdbd196 100644
--- a/addons/stock/views/stock_rule_views.xml
+++ b/addons/stock/views/stock_rule_views.xml
@@ -61,7 +61,7 @@
             <field name="arch" type="xml">
                 <form string="Rules">
                     <sheet>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <div class="oe_title">
                             <label for="name"/>
                             <h1><field name="name"/></h1>
diff --git a/addons/stock/views/stock_scrap_views.xml b/addons/stock/views/stock_scrap_views.xml
index fa730f3dc95..97f862422c5 100644
--- a/addons/stock/views/stock_scrap_views.xml
+++ b/addons/stock/views/stock_scrap_views.xml
@@ -37,8 +37,12 @@
                                     attrs="{'invisible':[('picking_id','=',False)]}" icon="fa-cogs"/>
                             <field name="picking_id" invisible="1"/>
                             <button class="oe_stat_button" name="action_get_stock_move_lines"
-                                    string="Product Moves" type="object"
-                                    attrs="{'invisible':[('move_id','=',False)]}" icon="fa-exchange"/>
+                                    type="object"
+                                    attrs="{'invisible':[('move_id','=',False)]}" icon="fa-exchange">
+                                    <div class="o_stat_info">
+                                        <span class="o_stat_text">Product Moves</span>
+                                    </div>
+                            </button>
                             <field name="move_id" invisible="1"/>
                         </div>
                         <div class="oe_title">
diff --git a/addons/stock/views/stock_storage_category_views.xml b/addons/stock/views/stock_storage_category_views.xml
index 7abd91c8dc5..dec5adb7a73 100644
--- a/addons/stock/views/stock_storage_category_views.xml
+++ b/addons/stock/views/stock_storage_category_views.xml
@@ -8,7 +8,7 @@
                 <field name="company_id" invisible="1"/>
                 <sheet>
                     <div class="oe_button_box" name="button_box">
-                        <button name="%(action_storage_category_locations)d" string="Locations" type="action" class="oe_stat_button" icon="fa-arrows-v"/>
+                        <button name="%(action_storage_category_locations)d" string="Locations" type="action" class="oe_stat_button" icon="oi-arrows-v"/>
                     </div>
                     <group>
                         <group>
diff --git a/addons/stock/views/stock_warehouse_views.xml b/addons/stock/views/stock_warehouse_views.xml
index e5d1681827c..c9cdcff9ca3 100644
--- a/addons/stock/views/stock_warehouse_views.xml
+++ b/addons/stock/views/stock_warehouse_views.xml
@@ -12,9 +12,13 @@
                                     string="Routes"
                                     icon="fa-refresh"
                                     class="oe_stat_button"
-                                    type="object"/>
+                                    type="object">
+                                    <div class="o_stat_info">
+                                        <span class="o_stat_text">Routes</span>
+                                    </div>
+                            </button>
                         </div>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <label for="name"/>
                         <h1><field name="name" placeholder="e.g. Central Warehouse"/></h1>
                         <group>
diff --git a/addons/stock_account/views/stock_valuation_layer_views.xml b/addons/stock_account/views/stock_valuation_layer_views.xml
index 0e9d791682c..a6c7bd69caf 100644
--- a/addons/stock_account/views/stock_valuation_layer_views.xml
+++ b/addons/stock_account/views/stock_valuation_layer_views.xml
@@ -52,7 +52,7 @@
                 </header>
                 <field name="create_date" string="Date" />
                 <field name="reference"/>
-                <button name="action_open_layer" icon="fa-arrow-right" title="Open Valuation Layer" type="object"/>
+                <button name="action_open_layer" icon="oi-arrow-right" title="Open Valuation Layer" type="object"/>
                 <field name="product_id" />
                 <field name="company_id" groups="base.group_multi_company"/>
                 <field name="quantity" string="Moved Quantity"/>
@@ -158,10 +158,14 @@
         <field name="inherit_id" ref="stock.view_picking_form" />
         <field name="arch" type="xml">
             <xpath expr="//div[@name='button_box']" position="inside">
-                <button string="Valuation" type="object"
+                <button type="object"
                     name="action_view_stock_valuation_layers"
                     class="oe_stat_button" icon="fa-dollar" groups="base.group_no_one"
-                    attrs="{'invisible': [('state', 'not in', ['done'])]}" />
+                    attrs="{'invisible': [('state', 'not in', ['done'])]}" >
+                    <div class="o_stat_info">
+                        <span class="o_stat_text">Valuation</span>
+                    </div>
+                </button>
             </xpath>
         </field>
     </record>
diff --git a/addons/stock_delivery/views/delivery_view.xml b/addons/stock_delivery/views/delivery_view.xml
index 3080955f5f2..4ba7c49f1e1 100644
--- a/addons/stock_delivery/views/delivery_view.xml
+++ b/addons/stock_delivery/views/delivery_view.xml
@@ -15,7 +15,7 @@
                         <label for="carrier_tracking_ref"/>
                         <div name="tracking">
                             <field name="carrier_tracking_ref" class="oe_inline" attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"/>
-                            <button type='object' class="fa fa-arrow-right oe_link" confirm="Cancelling a delivery may not be undoable. Are you sure you want to continue?" name="cancel_shipment" string="Cancel" attrs="{'invisible':['|','|','|',('carrier_tracking_ref','=',False),('delivery_type','in', ['fixed', 'base_on_rule']),('delivery_type','=',False),('state','not in',('done'))]}"/>
+                            <button type='object' class="oi oi-arrow-right oe_link" confirm="Cancelling a delivery may not be undoable. Are you sure you want to continue?" name="cancel_shipment" string="Cancel" attrs="{'invisible':['|','|','|',('carrier_tracking_ref','=',False),('delivery_type','in', ['fixed', 'base_on_rule']),('delivery_type','=',False),('state','not in',('done'))]}"/>
                         </div>
                         <label for="weight" string="Weight"/>
                         <div>
diff --git a/addons/stock_landed_costs/views/stock_landed_cost_views.xml b/addons/stock_landed_costs/views/stock_landed_cost_views.xml
index 44136890c44..07f68026fd9 100644
--- a/addons/stock_landed_costs/views/stock_landed_cost_views.xml
+++ b/addons/stock_landed_costs/views/stock_landed_cost_views.xml
@@ -16,10 +16,14 @@
                     </header>
                     <sheet>
                         <div class="oe_button_box" name="button_box">
-                            <button string="Valuation" type="object"
+                            <button type="object"
                                 name="action_view_stock_valuation_layers"
                                 class="oe_stat_button" icon="fa-dollar" groups="stock.group_stock_manager"
-                                attrs="{'invisible': ['|' , ('state', 'not in', ['done']), ('stock_valuation_layer_ids', '=', [])]}"/>
+                                attrs="{'invisible': ['|' , ('state', 'not in', ['done']), ('stock_valuation_layer_ids', '=', [])]}">
+                                <div class="o_stat_info">
+                                    <span class="o_stat_text">Valuation</span>
+                                </div>
+                            </button>
                         </div>
                         <div class="oe_title">
                             <label for="name" string="Landed Cost"/>
diff --git a/addons/survey/static/description/icon.png b/addons/survey/static/description/icon.png
index d0e1127b5ea..89730d808c9 100644
Binary files a/addons/survey/static/description/icon.png and b/addons/survey/static/description/icon.png differ
diff --git a/addons/survey/static/description/icon.svg b/addons/survey/static/description/icon.svg
index 5576e9b62fc..d7223a4095f 100644
--- a/addons/survey/static/description/icon.svg
+++ b/addons/survey/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#DA956B"/><stop offset="100%" stop-color="#CC7039"/></linearGradient><path id="d" d="M48 30l-2 1.882V22H20v32h26v-5.647l2-1.882V54a2 2 0 0 1-2 2H20a2 2 0 0 1-2-2V16a2 2 0 0 1 2-2h6v-2h4v2h6v-2h4l.03 2H46a2 2 0 0 1 2 2v14zM20 16v4h26v-4h-6v2h-4v-2h-6v2h-4v-2h-6zm5 23h12a1 1 0 0 1 1 1v10a1 1 0 0 1-1 1H25a1 1 0 0 1-1-1V40a1 1 0 0 1 1-1zm1 1.984V49h10v-8.016H26zm3.687 7.327l-2.571-2.806a.46.46 0 0 1 0-.61l.56-.61a.373.373 0 0 1 .559 0l1.732 1.89 3.71-4.049a.373.373 0 0 1 .56 0l.56.61a.46.46 0 0 1 0 .611l-4.55 4.964a.373.373 0 0 1-.56 0zM25 25h12a1 1 0 0 1 1 1v9a1 1 0 0 1-1 1H25a1 1 0 0 1-1-1v-9a1 1 0 0 1 1-1zm1 2v7h10v-7H26zm35.5 2.95l-1.914 2.053a.517.517 0 0 1-.731.025l-4.942-4.608a.517.517 0 0 1-.026-.731l1.914-2.052a2.07 2.07 0 0 1 2.921-.102l2.676 2.495c.837.776.883 2.083.102 2.92zm-9.575-1.805l-10.903 11.69-.73 5.259c-.1.71.537 1.299 1.238 1.154l5.195-1.099 10.903-11.69a.517.517 0 0 0-.026-.732l-4.942-4.608a.522.522 0 0 0-.735.026zm-6.45 10.572a.6.6 0 0 1-.03-.852l6.394-6.856a.6.6 0 0 1 .852-.03.6.6 0 0 1 .03.852l-6.395 6.856a.6.6 0 0 1-.851.03zm-1.687 3.492l2.065-.072.055 1.561-2.758.583-1.385-1.291.39-2.792 1.56-.054.073 2.065z"/><path id="e" d="M48 28l-2 1.882V20H20v32h26v-5.647l2-1.882V52a2 2 0 0 1-2 2H20a2 2 0 0 1-2-2V14a2 2 0 0 1 2-2h6v-2h4v2h6v-2h4l.03 2H46a2 2 0 0 1 2 2v14zM20 14v4h26v-4h-6v1h-4v-1h-6v1h-4v-1h-6zm5 23h12a1 1 0 0 1 1 1v10a1 1 0 0 1-1 1H25a1 1 0 0 1-1-1V38a1 1 0 0 1 1-1zm1 1.984V47h10v-8.016H26zm3.687 7.327l-2.571-2.806a.46.46 0 0 1 0-.61l.56-.61a.373.373 0 0 1 .559 0l1.732 1.89 3.71-4.049a.373.373 0 0 1 .56 0l.56.61a.46.46 0 0 1 0 .611l-4.55 4.964a.373.373 0 0 1-.56 0zM25 23h12a1 1 0 0 1 1 1v9a1 1 0 0 1-1 1H25a1 1 0 0 1-1-1v-9a1 1 0 0 1 1-1zm1 2v7h10v-7H26zm35.5 2.95l-1.914 2.053a.517.517 0 0 1-.731.025l-4.942-4.608a.517.517 0 0 1-.026-.731l1.914-2.052a2.07 2.07 0 0 1 2.921-.102l2.676 2.495c.837.776.883 2.083.102 2.92zm-9.575-1.805l-10.903 11.69-.73 5.259c-.1.71.537 1.299 1.238 1.154l5.195-1.099 10.903-11.69a.517.517 0 0 0-.026-.732l-4.942-4.608a.522.522 0 0 0-.735.026zm-6.45 10.572a.6.6 0 0 1-.03-.852l6.394-6.856a.6.6 0 0 1 .852-.03.6.6 0 0 1 .03.852l-6.395 6.856a.6.6 0 0 1-.851.03zm-1.687 3.492l2.065-.072.055 1.561-2.758.583-1.385-1.291.39-2.792 1.56-.054.073 2.065z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M32.889 69H4c-2 0-4-.145-4-4.073v-33.6L20 12h20l8 2V31.327l6-6.109 5 5.091-11 11.2-.245 11.542L32.889 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M15 15.5a7.5 7.5 0 1 1-15 0 7.5 7.5 0 0 1 15 0Z" fill="var(--o-icons-cyan-cyan, #0382F3)"/><path d="M15 15.5a7.5 7.5 0 1 1-15 0 7.5 7.5 0 0 1 15 0Z" fill="url(#o_icon_survey__a)" fill-opacity=".2"/><path d="M19 12a4 4 0 0 1 4-4h27v11a4 4 0 0 1-4 4H19V12Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path d="M19 12a4 4 0 0 1 4-4h27v11a4 4 0 0 1-4 4H19V12Z" fill="url(#o_icon_survey__b)" fill-opacity=".2"/><path d="M0 34.5a7.5 7.5 0 1 1 15 0 7.5 7.5 0 0 1-15 0Z" fill="var(--o-icons-red-red, #F9383D)"/><path d="M0 34.5a7.5 7.5 0 1 1 15 0 7.5 7.5 0 0 1-15 0Z" fill="url(#o_icon_survey__c)" fill-opacity=".2"/><path d="M19 42h19a4 4 0 0 0 4-4V27H23a4 4 0 0 0-4 4v11Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M19 42h19a4 4 0 0 0 4-4V27H23a4 4 0 0 0-4 4v11Z" fill="url(#o_icon_survey__d)" fill-opacity=".2"/><defs><linearGradient id="o_icon_survey__a" x1="0" y1="8" x2="17.647" y2="12.412" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_survey__b" x1="19" y1="8" x2="49.585" y2="23.802" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_survey__c" x1="0" y1="27" x2="17.647" y2="31.412" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_survey__d" x1="19" y1="42" x2="44.067" y2="32.391" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/survey/static/src/js/survey_form.js b/addons/survey/static/src/js/survey_form.js
index 9050e3d9a3e..64f3b2ae913 100644
--- a/addons/survey/static/src/js/survey_form.js
+++ b/addons/survey/static/src/js/survey_form.js
@@ -1048,10 +1048,10 @@ publicWidget.registry.SurveyFormWidget = publicWidget.Widget.extend(SurveyPreloa
             icons: {
                 time: 'fa fa-clock-o',
                 date: 'fa fa-calendar',
-                next: 'fa fa-chevron-right',
-                previous: 'fa fa-chevron-left',
-                up: 'fa fa-chevron-up',
-                down: 'fa fa-chevron-down',
+                next: 'oi oi-chevron-right',
+                previous: 'oi oi-chevron-left',
+                up: 'oi oi-chevron-up',
+                down: 'oi oi-chevron-down',
             },
             locale: moment.locale(),
             allowInputToggle: true,
diff --git a/addons/survey/static/src/scss/survey_survey_views.scss b/addons/survey/static/src/scss/survey_survey_views.scss
index 79bf3eabd0f..3edfe258a75 100644
--- a/addons/survey/static/src/scss/survey_survey_views.scss
+++ b/addons/survey/static/src/scss/survey_survey_views.scss
@@ -30,6 +30,9 @@
         .o_kanban_record {
             width: 100%;
             margin: 0px;
+        }
+
+        .o_survey_kanban_card {
             border-top: 0px !important;
         }
     }
@@ -78,54 +81,10 @@
     // Ungrouped specific
     .o_survey_kanban_card_ungrouped {
         .ribbon {
-            // Desktop: finishes on next kanban card line
-            height: 77px;
-            width: 130px;
+            --Ribbon-wrapper-width: 6rem;
 
-            // Mobile: is in a corner, takes more place
             @include media-breakpoint-down(md) {
-                height: 100px;
-                width: 100px;
-            }
-
-            &-top-right {
-                margin-top: -$o-kanban-inside-vgutter;
-                right: 0;
-
-                & span {
-                    left: -8px;
-                    top: 24px;
-                }
-            }
-
-            & span {
-                font-size: 1rem;
-                width: 150px;
-                height: 32px;
-            }
-        }
-    }
-    // Grouped specific
-    .o_survey_kanban_card_grouped {
-        .ribbon {
-            height: 90px;
-            width: 98px;
-
-            &-top-right {
-                margin-top: -$o-kanban-inside-vgutter;
-                right: 0;
-
-                & span {
-                    left: -8px;
-                    top: 16px;
-                }
-            }
-
-            & span {
-                font-size: 1rem;
-                width: 150px;
-                height: 32px;
-                padding: 0 8px;
+                --Ribbon-wrapper-width: 6.5rem;
             }
         }
     }
@@ -137,7 +96,7 @@
     background-color: var(--SurveyForm__section-background-color, #DDD);
     border-top: 1px solid #BBB;
     border-bottom: 1px solid #BBB;
-    
+
     > td {
         background: transparent;
     }
diff --git a/addons/survey/static/tests/tours/survey_form.js b/addons/survey/static/tests/tours/survey_form.js
index 3d815570038..6c15780f1d2 100644
--- a/addons/survey/static/tests/tours/survey_form.js
+++ b/addons/survey/static/tests/tours/survey_form.js
@@ -205,7 +205,7 @@ registry.category("web_tour.tours").add('survey_tour_test_survey_form_triggers',
         run: () => {}, // it's a check
     }, {
         content: 'Go back to Kanban View',
-        trigger: 'a[data-menu-xmlid="survey.menu_surveys"]',
+        trigger: '[data-menu-xmlid="survey.menu_survey_form"]',
     }, {
         content: "Check that we arrived on the kanban view",
         trigger: ".o-kanban-button-new",
diff --git a/addons/survey/views/survey_survey_views.xml b/addons/survey/views/survey_survey_views.xml
index 0afcc91ab75..63c172584a5 100644
--- a/addons/survey/views/survey_survey_views.xml
+++ b/addons/survey/views/survey_survey_views.xml
@@ -47,7 +47,7 @@
                             <field string="Participations" name="answer_done_count" widget="statinfo"/>
                         </button>
                     </div>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <field name="background_image" widget="image" class="oe_avatar"/>
                     <field name="survey_type" widget="radio" options="{'horizontal': True}"/>
                     <div class="oe_title" style="width: 100%;">
@@ -241,13 +241,16 @@
                                       o_survey_kanban_card #{record.certification.raw_value ? 'o_survey_kanban_card_certification' : ''}">
                         <!-- displayed in ungrouped mode -->
                         <div class="o_survey_kanban_card_ungrouped row mx-0">
+                            <widget name="web_ribbon" title="Archived"
+                                bg_color="text-bg-danger"
+                                attrs="{'invisible': [('active', '=', True)]}"/>
                             <div class="col-lg-2 col-sm-8 py-0 my-2 my-lg-0 col-12">
                                 <div class="d-flex flex-grow-1 flex-column my-0 my-lg-2">
                                     <span class="fw-bold"><field name="title"/></span>
-                                    <span t-if="!selection_mode">
+                                    <span t-if="!selection_mode" class="d-flex align-items-center">
                                         <field name="user_id" widget="many2one_avatar_user"
                                             options="{'display_avatar_name': True}"/>
-                                        -
+                                            <span class="mx-1">-</span>
                                         <t t-esc="luxon.DateTime.fromISO(record.create_date.raw_value).toFormat('MMM yyyy')"/>
                                     </span>
                                 </div>
@@ -292,46 +295,43 @@
                                     <span class="text-muted" t-else="">Certified</span>
                                 </a>
                             </div>
-                            <div t-if="!selection_mode" class="col-lg-3 col-sm-12 d-none d-sm-block py-0 my-2 pb-lg-3 ms-auto text-lg-end">
+                            <div t-if="!selection_mode" class="col-lg-3 col-sm-12 d-none d-sm-flex justify-content-end gap-2 my-2 ms-auto pb-lg-3 py-0">
                                 <button name="action_send_survey"
                                         string="Share" type="object"
-                                        class="btn btn-secondary border"
+                                        class="btn btn-secondary"
                                         attrs="{'invisible': [('active', '=', False)]}">
                                     Share
                                 </button>
                                 <button name="action_test_survey"
                                         string="Test" type="object"
-                                        class="btn btn-secondary border"
+                                        class="btn btn-secondary"
                                         attrs="{'invisible': [('active', '=', False)]}">
                                     Test
                                 </button>
                                 <button name="action_result_survey"
                                         string="See results" type="object"
-                                        class="btn btn-secondary border"
+                                        class="btn btn-secondary"
                                         attrs="{'invisible': [('active', '=', False)]}">
                                     See results
                                 </button>
                                 <button name="action_start_session"
                                         string="Start Live Session" type="object"
-                                        class="btn btn-secondary border"
+                                        class="btn btn-secondary"
                                         attrs="{'invisible': ['|', '|', ('session_state', '!=', False), ('certification', '=', True), ('active', '=', False)]}">
                                     Start Live Session
                                 </button>
                                 <button name="action_end_session"
                                         string="End Live Session" type="object"
-                                        class="btn btn-secondary border"
+                                        class="btn btn-secondary"
                                         attrs="{'invisible': ['|', ('session_state', 'not in', ['ready', 'in_progress']), ('active', '=', False)]}">
                                     End Live Session
                                 </button>
                             </div>
-                            <widget name="web_ribbon" title="Archived"
-                                bg_color="bg-danger"
-                                attrs="{'invisible': [('active', '=', True)]}"/>
                         </div>
                         <!-- displayed in grouped mode -->
                         <div class="o_survey_kanban_card_grouped">
                             <widget name="web_ribbon" title="Archived"
-                                bg_color="bg-danger"
+                                bg_color="text-bg-danger"
                                 attrs="{'invisible': [('active', '=', True)]}"/>
                             <div class="o_kanban_record_top">
                                 <h4 class="o_kanban_record_title p-0 mb4"><field name="title" /></h4>
@@ -356,7 +356,7 @@
                                                 <a name="action_survey_user_input_certified" type="object" class="d-flex flex-column align-items-center">
                                                     <span class="fw-bold"> <t t-esc="Math.round(record.success_ratio.raw_value)"></t> %</span>
                                                     <span class="text-muted" >Success</span>
-                                                </a> 
+                                                </a>
                                             </div>
                                         </div>
                                     </div>
diff --git a/addons/survey/views/survey_templates_management.xml b/addons/survey/views/survey_templates_management.xml
index 99b820863ca..6714149c720 100644
--- a/addons/survey/views/survey_templates_management.xml
+++ b/addons/survey/views/survey_templates_management.xml
@@ -80,7 +80,7 @@
     <template id="survey_button_form_view" name="Survey: back to form view">
         <div groups="survey.group_survey_manager" t-ignore="true" class="alert alert-info alert-dismissible rounded-0 fade show d-print-none css_editable_mode_hidden mb-0">
             <div t-ignore="true" class="text-center">
-                <a t-attf-href="/web#view_type=form&amp;model=survey.survey&amp;id=#{survey.id}&amp;action=survey.action_survey_form"><span t-if="answer and answer.test_entry">This is a Test Survey. </span><i class="fa fa-fw fa-arrow-right"/>Edit Survey</a>
+                <a t-attf-href="/web#view_type=form&amp;model=survey.survey&amp;id=#{survey.id}&amp;action=survey.action_survey_form"><span t-if="answer and answer.test_entry">This is a Test Survey. </span><i class="oi oi-fw oi-arrow-right"/>Edit Survey</a>
             </div>
             <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
         </div>
@@ -146,14 +146,14 @@
                 t-if="survey and survey.users_can_go_back"
                 t-att-disabled="not can_go_back"
                 type="submit" class="btn border-start p-0 shadow-none o_survey_navigation_submit" name="button_submit" value="previous" t-att-data-previous-page-id="previous_page_id">
-                <i class="fa fa-chevron-left p-2" />
+                <i class="oi oi-chevron-left p-2" />
             </button>
             <t t-set="can_go_forward"
                 t-value="survey and survey.questions_layout in ['page_per_question', 'page_per_section'] and answer and answer.state != 'done' and not answer.is_session_answer"/>
             <button
                 t-att-disabled="not can_go_forward"
                 type="submit" class="btn border-start p-0 shadow-none o_survey_navigation_submit" t-att-value="'next' if not survey_last else 'finish'">
-                <i class="fa fa-chevron-right p-2" />
+                <i class="oi oi-chevron-right p-2" />
             </button>
         </div>
     </template>
diff --git a/addons/survey/views/survey_templates_user_input_session.xml b/addons/survey/views/survey_templates_user_input_session.xml
index dcab4ec4fbd..8143540f60b 100644
--- a/addons/survey/views/survey_templates_user_input_session.xml
+++ b/addons/survey/views/survey_templates_user_input_session.xml
@@ -48,7 +48,7 @@
                     <a role="button"
                         class="o_survey_session_navigation o_survey_session_navigation_next p-2">
                         <span class="o_survey_session_navigation_next_label me-2 fw-bold">Start</span>
-                        <i class="fw-bold fa fa-chevron-right"/>
+                        <i class="fw-bold oi oi-chevron-right"/>
                     </a>
                 </div>
             </div>
@@ -115,10 +115,10 @@
                 <a role="button"
                     class="o_survey_session_navigation o_survey_session_navigation_next p-2">
                     <span class="o_survey_session_navigation_next_label me-2 fw-bold"/>
-                    <i class="fw-bold fa fa-chevron-right"/>
+                    <i class="fw-bold oi oi-chevron-right"/>
                 </a>
                 <a role="button"
-                    class="fw-bold fa fa-chevron-left o_survey_session_navigation o_survey_session_navigation_previous p-3" />
+                    class="fw-bold oi oi-chevron-left o_survey_session_navigation o_survey_session_navigation_previous p-3" />
                 <div class="o_survey_session_results flex-column flex-grow-1 mx-5">
                     <div class="row">
                         <div class="col-lg-12"><h1 t-esc="question.title"></h1></div>
diff --git a/addons/survey/views/survey_user_views.xml b/addons/survey/views/survey_user_views.xml
index 45f3b19ef39..4f9726f81bc 100644
--- a/addons/survey/views/survey_user_views.xml
+++ b/addons/survey/views/survey_user_views.xml
@@ -53,9 +53,9 @@
                         </button>
                     </div>
                     <field name="test_entry" invisible="1"/>
-                    <widget name="web_ribbon" title="Test Entry" bg_color="bg-info"
+                    <widget name="web_ribbon" title="Test Entry" bg_color="text-bg-info"
                         attrs="{'invisible': [('test_entry', '!=', True)]}"/>
-                    <widget name="web_ribbon" title="Failed" bg_color="bg-danger"
+                    <widget name="web_ribbon" title="Failed" bg_color="text-bg-danger"
                         attrs="{'invisible': ['|', '|', ('test_entry', '=', True), ('scoring_type', '=', 'no_scoring'), ('scoring_success', '=', True)]}"/>
                     <widget name="web_ribbon" title="Passed"
                         attrs="{'invisible': ['|', '|', ('test_entry', '=', True), ('scoring_type', '=', 'no_scoring'), ('scoring_success', '=', False)]}"/>
diff --git a/addons/test_mail/static/tests/activity_tests.js b/addons/test_mail/static/tests/activity_tests.js
index b68d32b47db..999bc6e9bad 100644
--- a/addons/test_mail/static/tests/activity_tests.js
+++ b/addons/test_mail/static/tests/activity_tests.js
@@ -14,6 +14,7 @@ import {
 } from "@web/../tests/helpers/utils";
 import { doAction } from "@web/../tests/webclient/helpers";
 import { session } from "@web/session";
+import { toggleSearchBarMenu } from "@web/../tests/search/helpers";
 
 let serverData;
 let pyEnv;
@@ -511,19 +512,19 @@ QUnit.module("test_mail", {}, function () {
         const { webClient } = await start({ serverData, mockRPC });
 
         await doAction(webClient, 1);
-
+        await toggleSearchBarMenu(document);
         assert.containsN(
             document.body,
-            ".o_search_options .dropdown button:visible",
+            ".o_cp_searchview .o_dropdown_container",
             2,
             "only two elements should be available in view search"
         );
         assert.isVisible(
-            document.querySelector(".o_search_options .dropdown.o_filter_menu > button"),
+            document.querySelector(".o_cp_searchview .o_dropdown_container.o_filter_menu"),
             "filter should be available in view search"
         );
         assert.isVisible(
-            document.querySelector(".o_search_options .dropdown.o_favorite_menu > button"),
+            document.querySelector(".o_cp_searchview .o_dropdown_container.o_favorite_menu"),
             "favorites should be available in view search"
         );
     });
diff --git a/addons/test_mail/static/tests/mobile/activity_tests.js b/addons/test_mail/static/tests/mobile/activity_tests.js
index 64b9b68cb62..c6622887069 100644
--- a/addons/test_mail/static/tests/mobile/activity_tests.js
+++ b/addons/test_mail/static/tests/mobile/activity_tests.js
@@ -15,7 +15,7 @@ QUnit.test(
         const o_view_controller = document.querySelector(".o_view_controller");
         const o_content = o_view_controller.querySelector(".o_content");
         const o_cp_item = o_view_controller.querySelector(
-            ".o_control_panel .breadcrumb-item.active"
+            ".o_control_panel .o_breadcrumb .active"
         );
         const initialXCpItem = o_cp_item.getBoundingClientRect().x;
         const o_header_cell = o_content.querySelector(".o_activity_type_cell");
diff --git a/addons/transifex/static/description/icon.png b/addons/transifex/static/description/icon.png
index 9e6c9556004..30dcd35d705 100644
Binary files a/addons/transifex/static/description/icon.png and b/addons/transifex/static/description/icon.png differ
diff --git a/addons/transifex/static/description/icon.svg b/addons/transifex/static/description/icon.svg
index a1c957930b5..73e1ae8af97 100644
--- a/addons/transifex/static/description/icon.svg
+++ b/addons/transifex/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="98.616%"><stop offset="0%" stop-color="#797C79"/><stop offset="100%" stop-color="#545554"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V36.095L18.936 13l5.025 8H30.5L41 28l7.5-7-5.564 10.127L55.577 49 36 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><path fill="#000" fill-rule="nonzero" d="M19.077 15h5.5v8h4v5h-4v18h4v5H23.54c-3.026 0-4.513-1.667-4.462-5V28h-4.452v-5h4.452v-8zm11.5 36l9-14-9.5-14h7l5.5 9 6-9h7l-9.5 14 9.5 14h-7l-5.5-8.445-5.5 8.445h-7zm-15.54 2.642H14V53h2.833v.642h-1.037v2.832h-.76v-2.832zM17 53h1.07l.809 2.389h.01L19.652 53h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438H17V53z" opacity=".3"/><path fill="#FFF" fill-rule="nonzero" d="M19.077 13h5.5v8h4v5h-4v18h4v5H23.54c-3.026 0-4.513-1.667-4.462-5V26h-4.452v-5h4.452v-8zm11.5 36l9-14-9.5-14h7l5.5 9 6-9h7l-9.5 14 9.5 14h-7l-5.5-8.445-5.5 8.445h-7zm-15.54 2.642H14V51h2.833v.642h-1.037v2.832h-.76v-2.832zM17 51h1.07l.809 2.389h.01L19.652 51h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438H17V51z"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M3.484 23.012H2.81a.19.19 0 0 1-.195-.187v-1.733a.192.192 0 0 0-.195-.187H1.367a.192.192 0 0 0-.196.187v1.733a.19.19 0 0 1-.195.187h-.78a.191.191 0 0 0-.196.186v.827c0 .103.088.187.195.187h.78a.19.19 0 0 1 .196.186v3.816c0 1.103.744 1.703 1.75 1.703h.563a.192.192 0 0 0 .195-.188v-.923a.178.178 0 0 0-.178-.173H3.14c-.365 0-.525-.293-.525-.67v-3.565a.19.19 0 0 1 .195-.186h.674a.191.191 0 0 0 .195-.187v-.827a.191.191 0 0 0-.195-.186Zm46.479 6.58-2.17-3.089a.2.2 0 0 1 0-.232l2.069-2.95c.097-.137-.007-.323-.181-.323H48.49a.22.22 0 0 0-.186.098l-1.209 1.874a.223.223 0 0 1-.37 0l-1.209-1.873a.218.218 0 0 0-.185-.1H44.14c-.174 0-.278.187-.18.325l2.067 2.95a.2.2 0 0 1 0 .231l-2.17 3.089c-.096.139.007.325.181.325h1.193a.222.222 0 0 0 .184-.096l1.312-1.96a.223.223 0 0 1 .367 0l1.312 1.96a.22.22 0 0 0 .183.095h1.193c.174 0 .278-.185.18-.324Zm-8.236-3.735h-2.633c-.127 0-.233-.106-.217-.226.12-.928.73-1.42 1.541-1.42.811 0 1.41.492 1.527 1.42.016.12-.09.226-.218.226Zm-1.309-2.93c-1.4 0-3.003.866-3.003 3.558 0 2.832 1.735 3.515 3.222 3.515.865 0 1.668-.252 2.338-.834a.204.204 0 0 0 .013-.294l-.632-.67a.224.224 0 0 0-.304-.014c-.426.343-.94.529-1.444.529-.627 0-1.195-.251-1.502-.74a1.699 1.699 0 0 1-.24-.804.214.214 0 0 1 .216-.228h4.108c.12 0 .217-.093.217-.207v-.77c0-1.896-1.385-3.04-2.989-3.04Zm-3.72-2.719h-.72c-1.123 0-1.968.586-1.968 1.869v.73a.208.208 0 0 1-.213.205h-.746a.208.208 0 0 0-.213.203v.793a.21.21 0 0 0 .213.204h.745c.118 0 .214.09.214.203v5.297a.21.21 0 0 0 .212.204h1.017a.209.209 0 0 0 .214-.204v-5.297c0-.112.095-.203.213-.203h1.032a.209.209 0 0 0 .213-.204v-.793a.208.208 0 0 0-.213-.203h-1.032a.209.209 0 0 1-.213-.204v-.591c0-.433.16-.726.641-.726h.604a.208.208 0 0 0 .213-.204v-.875a.208.208 0 0 0-.213-.204ZM31.304 20h-.019c-.514 0-.931.4-.931.892s.417.89.931.89h.019c.515 0 .932-.398.932-.89 0-.493-.417-.892-.932-.892Zm.432 3.012h-.882c-.155 0-.28.12-.28.268v6.368c0 .148.125.268.28.268h.882c.154 0 .28-.12.28-.268V23.28a.275.275 0 0 0-.28-.268Zm-3.968 2.915c-.277-.07-.568-.098-.904-.14-.306-.041-.612-.041-.947-.055-.744-.042-.977-.349-.977-.67 0-.488.32-.85 1.268-.85.712 0 1.24.197 1.758.515a.25.25 0 0 0 .331-.059l.519-.707a.223.223 0 0 0-.05-.317c-.661-.46-1.44-.716-2.557-.716-1.517 0-2.712.711-2.712 2.12 0 1.06.714 1.702 1.763 1.91.525.099 1.065.029 1.59.113.51.083.933.223.933.739 0 .6-.613.907-1.444.907-.893 0-1.538-.238-2.116-.724a.251.251 0 0 0-.35.02l-.573.665a.228.228 0 0 0 .032.329 4.596 4.596 0 0 0 2.89.993c1.692 0 3.004-.795 3.004-2.12 0-1.228-.627-1.73-1.458-1.953Zm-7.795-3c-.801 0-1.435.259-1.895.81-.02.024-.043.03-.043 0v-.489a.256.256 0 0 0-.262-.25h-.92a.256.256 0 0 0-.262.25v6.418c0 .138.117.25.262.25h.92a.256.256 0 0 0 .262-.25V25.8c0-.962.627-1.506 1.458-1.506.83 0 1.458.544 1.458 1.506v3.865c0 .138.117.25.26.25h.92a.256.256 0 0 0 .263-.25v-4.353c0-1.563-1.298-2.385-2.42-2.385Zm-5.92 4.562c0 .405-.088.698-.278.879-.233.237-.7.349-1.385.349-.991 0-1.4-.405-1.4-.893 0-.516.409-.851 1.284-.851h1.779v.516Zm.597-4.073c-.524-.348-1.268-.488-2.186-.488-.935 0-1.655.238-2.173.715a.219.219 0 0 0 .006.32l.618.582a.244.244 0 0 0 .327.002c.263-.231.67-.335 1.294-.335 1.05 0 1.517.223 1.517.892v.753h-2.057c-1.559 0-2.347.92-2.347 2.037 0 .711.322 1.31.92 1.687.422.265.976.419 1.632.419.99 0 1.592-.362 1.793-.698.027-.044.059-.026.059 0v.387c0 .126.105.227.237.227h.954a.232.232 0 0 0 .237-.227v-4.515c0-.837-.306-1.381-.83-1.758Zm-5.124-.17a2.341 2.341 0 0 0-1.204-.318c-.802 0-1.429.265-1.895.809h-.044v-.54c0-.11-.093-.2-.21-.2H5.15c-.116 0-.21.09-.21.2v6.52c0 .11.094.2.21.2h1.025c.116 0 .21-.09.21-.2V25.76c0-1.047.713-1.465 1.428-1.465.328 0 .544.048.801.218.093.06.22.036.285-.052l.685-.931a.195.195 0 0 0-.057-.285Z" fill="#223657"/><path d="M43.105 4h.972V.818h1.108V0H42v.818h1.105V4Zm2.775 0h.858V1.453h.053L47.663 4h.555l.871-2.547h.056V4H50V0h-1.108l-.924 2.714h-.05L46.99 0h-1.11v4Z" fill="#D1D5DB"/></svg>
diff --git a/addons/transifex/static/src/views/reload_code_translations_views.xml b/addons/transifex/static/src/views/reload_code_translations_views.xml
index b109b4b2d32..ad5ff8727af 100644
--- a/addons/transifex/static/src/views/reload_code_translations_views.xml
+++ b/addons/transifex/static/src/views/reload_code_translations_views.xml
@@ -2,8 +2,7 @@
 
 <templates>
     <t t-name="transifex.CodeTranslationListView.Buttons" t-inherit="web.ListView.Buttons" t-inherit-mode="primary" owl="1">
-        <!-- Before the export button -->
-        <xpath expr="//t[contains(@t-if, 'isExportEnable')]" position="before">
+        <xpath expr="//div[hasclass('o_list_buttons')]" position="inside">
             <button type="button" class="btn btn-primary" t-on-click="onClickReloadCodeTranslations">Reload</button>
         </xpath>
     </t>
diff --git a/addons/utm/static/description/icon.png b/addons/utm/static/description/icon.png
index a6854b2a8a7..44f13e11355 100644
Binary files a/addons/utm/static/description/icon.png and b/addons/utm/static/description/icon.png differ
diff --git a/addons/utm/static/description/icon.svg b/addons/utm/static/description/icon.svg
index 78a17762619..71a4759aa9e 100644
--- a/addons/utm/static/description/icon.svg
+++ b/addons/utm/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="98.616%"><stop offset="0%" stop-color="#797C79"/><stop offset="100%" stop-color="#545554"/></linearGradient><path id="d" d="M39.922 32.578c4.376 4.381 4.316 11.404.026 15.717a.908.908 0 0 1-.026.028L35 53.244c-4.341 4.341-11.404 4.34-15.744 0-4.341-4.34-4.341-11.403 0-15.744l2.718-2.717c.72-.721 1.961-.242 1.999.776.047 1.298.28 2.602.71 3.862.145.426.04.898-.278 1.216l-.958.959c-2.053 2.053-2.117 5.395-.085 7.468a5.28 5.28 0 0 0 7.495.037l4.921-4.921a5.272 5.272 0 0 0-.757-8.086 1.175 1.175 0 0 1-.509-.923 2.917 2.917 0 0 1 .857-2.183l1.542-1.542a1.177 1.177 0 0 1 1.508-.127c.537.375 1.04.796 1.503 1.26zm10.322-10.322c-4.34-4.34-11.403-4.341-15.744 0l-4.922 4.921a.908.908 0 0 0-.026.028c-4.29 4.313-4.35 11.336.026 15.717.463.463.966.884 1.503 1.259a1.177 1.177 0 0 0 1.508-.127l1.542-1.542c.611-.611.886-1.409.857-2.183a1.175 1.175 0 0 0-.51-.923 5.272 5.272 0 0 1-.757-8.086l4.922-4.921a5.28 5.28 0 0 1 7.495.037c2.032 2.073 1.968 5.415-.085 7.468l-.958.958c-.319.319-.423.79-.277 1.217.43 1.26.662 2.564.71 3.862.037 1.018 1.278 1.497 1.998.776L50.244 38c4.341-4.34 4.341-11.404 0-15.744z"/><path id="e" d="M39.922 30.578c4.376 4.381 4.316 11.404.026 15.717a.908.908 0 0 1-.026.028L35 51.244c-4.341 4.341-11.404 4.34-15.744 0-4.341-4.34-4.341-11.403 0-15.744l2.718-2.717c.72-.721 1.961-.242 1.999.776.047 1.298.28 2.602.71 3.862.145.426.04.898-.278 1.216l-.958.959c-2.053 2.053-2.117 5.395-.085 7.468a5.28 5.28 0 0 0 7.495.037l4.921-4.921a5.272 5.272 0 0 0-.757-8.086 1.175 1.175 0 0 1-.509-.923 2.917 2.917 0 0 1 .857-2.183l1.542-1.542a1.177 1.177 0 0 1 1.508-.127c.537.375 1.04.796 1.503 1.26zm10.322-10.322c-4.34-4.34-11.403-4.341-15.744 0l-4.922 4.921a.908.908 0 0 0-.026.028c-4.29 4.313-4.35 11.336.026 15.717.463.463.966.884 1.503 1.259a1.177 1.177 0 0 0 1.508-.127l1.542-1.542c.611-.611.886-1.409.857-2.183a1.175 1.175 0 0 0-.51-.923 5.272 5.272 0 0 1-.757-8.086l4.922-4.921a5.28 5.28 0 0 1 7.495.037c2.032 2.073 1.968 5.415-.085 7.468l-.958.958c-.319.319-.423.79-.277 1.217.43 1.26.662 2.564.71 3.862.037 1.018 1.278 1.497 1.998.776L50.244 36c4.341-4.34 4.341-11.404 0-15.744z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M34.664 69H4c-2 0-4-1-4-4V39.037L18.936 20.71 25 18l18 17-.457 1.673L46 33l6 16-17.336 20z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" transform="matrix(-1 0 0 1 69.5 0)" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" transform="matrix(-1 0 0 1 69.5 0)" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M.983 23.814a3.356 3.356 0 0 1 0-4.746L11.068 8.983a3.356 3.356 0 0 1 4.746 0l17.203 17.203a3.356 3.356 0 0 1 0 4.746L22.932 41.017a3.356 3.356 0 0 1-4.746 0L.983 23.814Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M.983 23.814a3.356 3.356 0 0 1 0-4.746L11.068 8.983a3.356 3.356 0 0 1 4.746 0l17.203 17.203a3.356 3.356 0 0 1 0 4.746L22.932 41.017a3.356 3.356 0 0 1-4.746 0L.983 23.814Z" fill="url(#o_icon_utm__a)" fill-opacity=".2"/><path d="M16.983 19.068a3.356 3.356 0 0 0 0 4.746l4.53 4.53 7.063-6.598 4.441 4.44a3.356 3.356 0 0 1 0 4.747L28.56 35.39l5.627 5.627a3.356 3.356 0 0 0 4.746 0l10.085-10.085a3.356 3.356 0 0 0 0-4.746L31.814 8.983a3.356 3.356 0 0 0-4.746 0L16.983 19.068Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M16.983 19.068a3.356 3.356 0 0 0 0 4.746l4.53 4.53 7.063-6.598 4.441 4.44a3.356 3.356 0 0 1 0 4.747L28.56 35.39l5.627 5.627a3.356 3.356 0 0 0 4.746 0l10.085-10.085a3.356 3.356 0 0 0 0-4.746L31.814 8.983a3.356 3.356 0 0 0-4.746 0L16.983 19.068Z" fill="url(#o_icon_utm__b)" fill-opacity=".2"/><defs><linearGradient id="o_icon_utm__a" x1="0" y1="8" x2="40" y2="18" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_utm__b" x1="16" y1="8" x2="56" y2="18" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/utm/views/utm_campaign_views.xml b/addons/utm/views/utm_campaign_views.xml
index ed945e9f1b0..7be1f74e163 100644
--- a/addons/utm/views/utm_campaign_views.xml
+++ b/addons/utm/views/utm_campaign_views.xml
@@ -36,7 +36,7 @@
                 <sheet>
                     <div class="oe_button_box d-flex justify-content-end" name="button_box">
                     </div>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <group id="top-group">
                         <field name="active" invisible="1"/>
                         <field class="text-break" name="title" string="Campaign Name" placeholder="e.g. Black Friday"/>
diff --git a/addons/web/__manifest__.py b/addons/web/__manifest__.py
index 528806989b3..a981ba95414 100644
--- a/addons/web/__manifest__.py
+++ b/addons/web/__manifest__.py
@@ -172,7 +172,7 @@ This module provides the core of the Odoo Web Client.
             'web/static/src/scss/pre_variables.scss',
             'web/static/lib/bootstrap/scss/_variables.scss',
 
-            ('include', 'web._assets_bootstrap'),
+            ('include', 'web._assets_bootstrap_backend'),
 
             'base/static/src/css/modules.css',
 
@@ -278,7 +278,7 @@ This module provides the core of the Odoo Web Client.
             'web/static/lib/bootstrap/scss/_variables.scss',
             'web/static/lib/luxon/luxon.js',
 
-            ('include', 'web._assets_bootstrap'),
+            ('include', 'web._assets_bootstrap_frontend'),
 
             'web/static/src/legacy/scss/tempusdominus_overridden.scss',
             'web/static/lib/tempusdominus/tempusdominus.scss',
@@ -448,7 +448,7 @@ This module provides the core of the Odoo Web Client.
             'web/static/src/scss/pre_variables.scss',
             'web/static/lib/bootstrap/scss/_variables.scss',
 
-            ('include', 'web._assets_bootstrap'),
+            ('include', 'web._assets_bootstrap_backend'),
 
             'base/static/src/css/description.css',
             'web/static/src/libs/fontawesome/css/font-awesome.css',
@@ -515,6 +515,7 @@ This module provides the core of the Odoo Web Client.
         'web._assets_helpers': [
             'web/static/lib/bootstrap/scss/_functions.scss',
             'web/static/lib/bootstrap/scss/_mixins.scss',
+            'web/static/src/scss/functions.scss',
             'web/static/src/scss/mixins_forwardport.scss',
             'web/static/src/scss/bs_mixins_overrides.scss',
             'web/static/src/legacy/scss/utils.scss',
@@ -529,6 +530,15 @@ This module provides the core of the Odoo Web Client.
             'web/static/lib/bootstrap/scss/utilities/_api.scss',
             'web/static/src/scss/bootstrap_review.scss',
         ],
+        'web._assets_bootstrap_backend': [
+            ('include', 'web._assets_bootstrap'),
+            ('after', 'web/static/src/scss/utilities_custom.scss', 'web/static/src/scss/utilities_custom_backend.scss'),
+            'web/static/src/scss/bootstrap_review_backend.scss',
+        ],
+        'web._assets_bootstrap_frontend': [
+            ('include', 'web._assets_bootstrap'),
+            'web/static/src/scss/bootstrap_review_frontend.scss',
+        ],
         'web._assets_backend_helpers': [
             'web/static/src/scss/bootstrap_overridden.scss',
             'web/static/src/scss/bs_mixins_overrides_backend.scss',
diff --git a/addons/web/static/lib/fullcalendar/bootstrap/main.js b/addons/web/static/lib/fullcalendar/bootstrap/main.js
index 5f966890cf7..9b910771f21 100644
--- a/addons/web/static/lib/fullcalendar/bootstrap/main.js
+++ b/addons/web/static/lib/fullcalendar/bootstrap/main.js
@@ -69,8 +69,8 @@ Docs & License: https://fullcalendar.io/
     BootstrapTheme.prototype.baseIconClass = 'fa';
     BootstrapTheme.prototype.iconClasses = {
         close: 'fa-times',
-        prev: 'fa-chevron-left',
-        next: 'fa-chevron-right',
+        prev: 'oi-chevron-left',
+        next: 'oi-chevron-right',
         prevYear: 'fa-angle-double-left',
         nextYear: 'fa-angle-double-right'
     };
diff --git a/addons/web/static/lib/odoo_ui_icons/fonts/odoo_ui_icons.woff b/addons/web/static/lib/odoo_ui_icons/fonts/odoo_ui_icons.woff
index cb7f1df8fdd..111cb8b2da8 100644
Binary files a/addons/web/static/lib/odoo_ui_icons/fonts/odoo_ui_icons.woff and b/addons/web/static/lib/odoo_ui_icons/fonts/odoo_ui_icons.woff differ
diff --git a/addons/web/static/lib/odoo_ui_icons/fonts/odoo_ui_icons.woff2 b/addons/web/static/lib/odoo_ui_icons/fonts/odoo_ui_icons.woff2
index 80cbce6c99c..21253deaa78 100644
Binary files a/addons/web/static/lib/odoo_ui_icons/fonts/odoo_ui_icons.woff2 and b/addons/web/static/lib/odoo_ui_icons/fonts/odoo_ui_icons.woff2 differ
diff --git a/addons/web/static/lib/odoo_ui_icons/style.css b/addons/web/static/lib/odoo_ui_icons/style.css
index 5435c0a471a..db3443d0df0 100644
--- a/addons/web/static/lib/odoo_ui_icons/style.css
+++ b/addons/web/static/lib/odoo_ui_icons/style.css
@@ -42,3 +42,19 @@
 .oi-text-wrap:before { content: '\e815'; }
 .oi-view-cohort:before { content: '\e816'; }
 .oi-view-list:before { content: '\e817'; }
+.oi-gif-picker:before { content: '\e82e'; }
+.oi-chevron-down:before { content: '\e839'; }
+.oi-chevron-left:before { content: '\e83a'; }
+.oi-chevron-right:before { content: '\e83b'; }
+.oi-chevron-up:before { content: '\e83c'; }
+.oi-arrows-h:before { content: '\e83d'; }
+.oi-arrows-v:before { content: '\e83e'; }
+.oi-arrow-down-left:before { content: '\e83f'; }
+.oi-arrow-down-right:before { content: '\e840'; }
+.oi-arrow-down:before { content: '\e841'; }
+.oi-arrow-left:before { content: '\e842'; }
+.oi-arrow-right:before { content: '\e843'; }
+.oi-arrow-up-left:before { content: '\e844'; }
+.oi-arrow-up-right:before { content: '\e845'; }
+.oi-arrow-up:before { content: '\e846'; }
+.oi-draggable:before { content: '\e847'; }
diff --git a/addons/web/static/lib/tempusdominus/tempusdominus.js b/addons/web/static/lib/tempusdominus/tempusdominus.js
index bcda3437db2..0b4265a7869 100644
--- a/addons/web/static/lib/tempusdominus/tempusdominus.js
+++ b/addons/web/static/lib/tempusdominus/tempusdominus.js
@@ -139,10 +139,10 @@ var DateTimePicker = function ($, moment) {
         icons: {
             time: 'fa fa-clock-o',
             date: 'fa fa-calendar',
-            up: 'fa fa-arrow-up',
-            down: 'fa fa-arrow-down',
-            previous: 'fa fa-chevron-left',
-            next: 'fa fa-chevron-right',
+            up: 'oi oi-arrow-up',
+            down: 'oi oi-arrow-down',
+            previous: 'oi oi-chevron-left',
+            next: 'oi oi-chevron-right',
             today: 'fa fa-calendar-check-o',
             clear: 'fa fa-trash',
             close: 'fa fa-times'
diff --git a/addons/web/static/src/core/avatar/avatar.scss b/addons/web/static/src/core/avatar/avatar.scss
new file mode 100644
index 00000000000..3ad16deec51
--- /dev/null
+++ b/addons/web/static/src/core/avatar/avatar.scss
@@ -0,0 +1,12 @@
+// Avatar
+.o_avatar img,
+.o_avatar .o_avatar_empty,
+img.o_avatar {
+    height: var(--Avatar-size, #{$o-avatar-size});
+    aspect-ratio: 1;
+}
+
+.o_avatar_empty {
+    background: $o-black;
+    opacity: .1;
+}
\ No newline at end of file
diff --git a/addons/web/static/src/core/avatar/avatar.variables.scss b/addons/web/static/src/core/avatar/avatar.variables.scss
new file mode 100644
index 00000000000..bed7155a1e2
--- /dev/null
+++ b/addons/web/static/src/core/avatar/avatar.variables.scss
@@ -0,0 +1 @@
+$o-avatar-size: 1.7145em !default;
diff --git a/addons/web/static/src/core/colorlist/colorlist.js b/addons/web/static/src/core/colorlist/colorlist.js
index 1c3ba27d9e7..830cf649f0b 100644
--- a/addons/web/static/src/core/colorlist/colorlist.js
+++ b/addons/web/static/src/core/colorlist/colorlist.js
@@ -40,14 +40,14 @@ ColorList.COLORS = [
     _lt("Red"),
     _lt("Orange"),
     _lt("Yellow"),
-    _lt("Light blue"),
-    _lt("Dark purple"),
-    _lt("Salmon pink"),
-    _lt("Medium blue"),
-    _lt("Dark blue"),
-    _lt("Fuchsia"),
-    _lt("Green"),
+    _lt("Cyan"),
     _lt("Purple"),
+    _lt("Almond"),
+    _lt("Teal"),
+    _lt("Blue"),
+    _lt("Raspberry"),
+    _lt("Green"),
+    _lt("Violet"),
 ];
 ColorList.template = "web.ColorList";
 ColorList.defaultProps = {
diff --git a/addons/web/static/src/core/colorlist/colorlist.scss b/addons/web/static/src/core/colorlist/colorlist.scss
index cd28f4e57ab..2e7f864f845 100644
--- a/addons/web/static/src/core/colorlist/colorlist.scss
+++ b/addons/web/static/src/core/colorlist/colorlist.scss
@@ -1,6 +1,6 @@
 .o_colorlist {
     button {
-        border: 1px solid $white;
+        border: 1px solid $dropdown-bg;
         box-shadow: 0 0 0 1px $gray-500;
         width: 22px;
         height: 17px;
@@ -13,23 +13,12 @@
 // Set all the colors but the "no-color" one
 @for $size from 2 through length($o-colors) {
     .o_colorlist_item_color_#{$size - 1} {
-        background-color: nth($o-colors, $size);
+        $-bg: adjust-color(nth($o-colors, $size), $lightness: 25%, $saturation: 15%);
+        @include o-print-color($-bg, background-color, bg-opacity);
     }
 }
 
 // Set the "no-color", a red bar on white background
 .o_colorlist_item_color_0 {
-    position: relative;
-    &::before {
-        content: "";
-        @include o-position-absolute(-2px, $left: 10px);
-        display: block;
-        width: 1px;
-        height: 19px;
-        transform: rotate(45deg);
-        background-color: red;
-    }
-    &::after {
-        background-color: white;
-    }
+    background: linear-gradient(45deg, rgba($dropdown-bg, 0) 0%, rgba($dropdown-bg, 0) 48%, $danger 48%, $danger 52%, rgba($dropdown-bg, 0) 52%, rgba($dropdown-bg, 0) 100%);
 }
diff --git a/addons/web/static/src/core/colorlist/colorlist.xml b/addons/web/static/src/core/colorlist/colorlist.xml
index 724596e6353..04c7f119063 100644
--- a/addons/web/static/src/core/colorlist/colorlist.xml
+++ b/addons/web/static/src/core/colorlist/colorlist.xml
@@ -4,10 +4,10 @@
     <t t-name="web.ColorList" owl="1">
         <div class="o_colorlist d-flex flex-wrap align-items-center mw-100 gap-2" aria-atomic="true" t-ref="colorlist">
             <t t-if="!props.forceExpanded and !state.isExpanded">
-                <button t-on-click="onToggle" role="menuitem" t-att-title="colors[props.selectedColor]" t-att-data-color="props.selectedColor" t-att-aria-label="colors[props.selectedColor]" t-attf-class="btn p-0 o_colorlist_toggler o_colorlist_item_color_{{ props.selectedColor }}"/>
+                <button t-on-click="onToggle" role="menuitem" t-att-title="colors[props.selectedColor]" t-att-data-color="props.selectedColor" t-att-aria-label="colors[props.selectedColor]" t-attf-class="btn p-0 rounded-0 o_colorlist_toggler o_colorlist_item_color_{{ props.selectedColor }}"/>
             </t>
             <t t-else="" t-foreach="props.colors" t-as="colorId" t-key="colorId">
-                <button t-on-click.prevent.stop="() => this.onColorSelected(colorId)" role="menuitem" t-att-title="colors[colorId]" t-att-data-color="colorId" t-att-aria-label="colors[colorId]" t-attf-class="btn p-0 o_colorlist_item_color_{{ colorId }} {{ colorId === props.selectedColor ? 'o_colorlist_selected' : '' }}"/>
+                <button t-on-click.prevent.stop="() => this.onColorSelected(colorId)" role="menuitem" t-att-title="colors[colorId]" t-att-data-color="colorId" t-att-aria-label="colors[colorId]" t-attf-class="btn p-0 rounded-0 o_colorlist_item_color_{{ colorId }} {{ colorId === props.selectedColor ? 'o_colorlist_selected' : '' }}"/>
             </t>
         </div>
     </t>
diff --git a/addons/web/static/src/core/commands/command_palette.scss b/addons/web/static/src/core/commands/command_palette.scss
index f2210a9873b..33ae91051cd 100644
--- a/addons/web/static/src/core/commands/command_palette.scss
+++ b/addons/web/static/src/core/commands/command_palette.scss
@@ -10,7 +10,7 @@
 
         .o_command {
             &.focused {
-                background: rgba($o-brand-primary, 0.25);
+                background: rgba($o-action, 0.25);
             }
 
             &_hotkey {
diff --git a/addons/web/static/src/core/commands/command_palette.xml b/addons/web/static/src/core/commands/command_palette.xml
index 4b9f69e0833..8838bd23dbf 100644
--- a/addons/web/static/src/core/commands/command_palette.xml
+++ b/addons/web/static/src/core/commands/command_palette.xml
@@ -46,7 +46,7 @@
           </t>
         </div>
 
-        <div t-if="state.FooterComponent" class="o_command_palette_footer mt-2 px-4 py-2 border-top bg-100 text-muted">
+        <div t-if="state.FooterComponent" class="o_command_palette_footer mt-2 px-4 py-2 border-top rounded-bottom bg-100 text-muted">
           <t t-component="state.FooterComponent" switchNamespace="(namespace) => this.debounceSearch(namespace.concat(this.state.searchValue))"/>
         </div>
       </div>
diff --git a/addons/web/static/src/core/datetime/datetime_picker.xml b/addons/web/static/src/core/datetime/datetime_picker.xml
index 305f2a47441..49e793ac2d0 100644
--- a/addons/web/static/src/core/datetime/datetime_picker.xml
+++ b/addons/web/static/src/core/datetime/datetime_picker.xml
@@ -122,7 +122,7 @@
         >
             <nav class="o_datetime_picker_header btn-group">
                 <button class="o_previous btn btn-secondary flex-grow-0" t-on-click="previous">
-                    <span class="fa fa-chevron-left" t-att-title="activePrecisionLevel.prevTitle" />
+                    <span class="oi oi-chevron-left" t-att-title="activePrecisionLevel.prevTitle" />
                 </button>
                 <button
                     class="o_zoom_out o_datetime_button btn d-flex align-items-center justify-content-around text-truncate opacity-100"
@@ -136,7 +136,7 @@
                 </button>
                 <button class="o_next btn btn-secondary flex-grow-0" t-on-click="next">
                     <span
-                        class="fa fa-chevron-right"
+                        class="oi oi-chevron-right"
                         t-att-title="activePrecisionLevel.nextTitle"
                     />
                 </button>
diff --git a/addons/web/static/src/core/dialog/dialog.xml b/addons/web/static/src/core/dialog/dialog.xml
index d58da7bd02c..e3f56e2428a 100644
--- a/addons/web/static/src/core/dialog/dialog.xml
+++ b/addons/web/static/src/core/dialog/dialog.xml
@@ -38,7 +38,7 @@
 
     <t t-name="web.Dialog.header" owl="1">
         <t t-if="fullscreen">
-            <button class="btn fa fa-arrow-left" data-bs-dismiss="modal" aria-label="Close" t-on-click="close" />
+            <button class="btn oi oi-arrow-left" data-bs-dismiss="modal" aria-label="Close" t-on-click="close" />
         </t>
         <h4 class="modal-title text-break" t-att-class="{ 'me-auto': fullscreen }">
             <t t-esc="props.title"/>
diff --git a/addons/web/static/src/core/dropdown/dropdown.xml b/addons/web/static/src/core/dropdown/dropdown.xml
index dbdb86bc844..dbcd24aff1b 100644
--- a/addons/web/static/src/core/dropdown/dropdown.xml
+++ b/addons/web/static/src/core/dropdown/dropdown.xml
@@ -29,7 +29,7 @@
         t-att-aria-expanded="state.open ? 'true' : 'false'"
         t-ref="togglerRef"
       >
-        <t t-slot="toggler" />
+        <t t-slot="toggler" open="state.open"/>
       </button>
       <div
         t-if="state.open"
diff --git a/addons/web/static/src/core/dropdown/dropdown_navigation_hook.js b/addons/web/static/src/core/dropdown/dropdown_navigation_hook.js
index 254420a0601..db4a3a8c26f 100644
--- a/addons/web/static/src/core/dropdown/dropdown_navigation_hook.js
+++ b/addons/web/static/src/core/dropdown/dropdown_navigation_hook.js
@@ -21,7 +21,12 @@ import { useComponent, useEffect, useRef } from "@odoo/owl";
  */
 
 const ACTIVE_MENU_ELEMENT_CLASS = "focus";
-const MENU_ELEMENTS_SELECTORS = [":scope > .dropdown-item", ":scope > .dropdown"];
+const MENU_ELEMENTS_SELECTORS = [
+    ":scope > .dropdown-item",
+    ":scope > .dropdown",
+    ":scope > .o_dropdown_container > .dropdown-item",
+    ":scope > .o_dropdown_container > .dropdown",
+];
 const NEXT_ACTIVE_INDEX_FNS = {
     FIRST: () => 0,
     LAST: (list) => list.length - 1,
diff --git a/addons/web/static/src/core/model_field_selector/model_field_selector.xml b/addons/web/static/src/core/model_field_selector/model_field_selector.xml
index 10f59b95726..c6cebfe5d0b 100644
--- a/addons/web/static/src/core/model_field_selector/model_field_selector.xml
+++ b/addons/web/static/src/core/model_field_selector/model_field_selector.xml
@@ -6,7 +6,7 @@
             <div class="o_model_field_selector_value flex-grow-1 h-100" tabindex="0" t-att-data-tooltip="state.displayNames.join(' > ')" data-tooltip-position="top">
                 <t t-foreach="state.displayNames" t-as="displayName" t-key="displayName_index">
                     <t t-if="!displayName_first">
-                        <i class="fa fa-chevron-right m-1" role="img" aria-label="Followed by" title="Followed by" />
+                        <i class="oi oi-chevron-right m-1" role="img" aria-label="Followed by" title="Followed by" />
                     </t>
                     <span class="o_model_field_selector_chain_part p-1 mb-1">
                         <t t-esc="displayName" />
diff --git a/addons/web/static/src/core/model_field_selector/model_field_selector_popover.xml b/addons/web/static/src/core/model_field_selector/model_field_selector_popover.xml
index fffc9b258c5..6d119ee940c 100644
--- a/addons/web/static/src/core/model_field_selector/model_field_selector_popover.xml
+++ b/addons/web/static/src/core/model_field_selector/model_field_selector_popover.xml
@@ -5,7 +5,7 @@
         <div class="o_model_field_selector_popover" tabindex="0" t-ref="root" t-on-keydown="onInputKeydown">
             <div class="o_model_field_selector_popover_header text-center">
                 <t t-if="state.page.previousPage">
-                    <i class="fa fa-arrow-left o_model_field_selector_popover_option o_model_field_selector_popover_prev_page"
+                    <i class="oi oi-arrow-left o_model_field_selector_popover_option o_model_field_selector_popover_prev_page"
                        title="Previous"
                        role="img"
                        aria-label="Previous"
@@ -43,7 +43,7 @@
                             </button>
                             <t t-if="(!fieldDef.is_property and fieldDef.relation and props.followRelations) or fieldDef.type === 'properties'">
                                 <button class="o_model_field_selector_popover_item_relation btn btn-link" t-on-click.stop="() => this.followRelation(fieldDef)">
-                                    <i class="fa fa-chevron-right o_model_field_selector_popover_relation_icon" role="img" aria-label="Relation to follow" title="Relation to follow" />
+                                    <i class="oi oi-chevron-right o_model_field_selector_popover_relation_icon" role="img" aria-label="Relation to follow" title="Relation to follow" />
                                 </button>
                             </t>
                         </li>
diff --git a/addons/web/static/src/core/pager/pager.xml b/addons/web/static/src/core/pager/pager.xml
index c93c719a2f1..c2b6df648e5 100644
--- a/addons/web/static/src/core/pager/pager.xml
+++ b/addons/web/static/src/core/pager/pager.xml
@@ -18,10 +18,10 @@
                     <span class="o_pager_limit" t-esc="props.total"/>
                 </t>
             </span>
-            <span class="btn-group" aria-atomic="true">
+            <span class="btn-group d-print-none" aria-atomic="true">
                 <!-- accesskeys not wanted in X2Many widgets -->
-                <button type="button" class="fa fa-chevron-left btn btn-secondary o_pager_previous px-2 rounded-start" aria-label="Previous" data-tooltip="Previous" tabindex="-1" t-att-data-hotkey="props.withAccessKey ? 'p' : false" t-att-disabled="state.isDisabled or isSinglePage" t-on-click.stop="() => this.navigate(-1)" />
-                <button type="button" class="fa fa-chevron-right btn btn-secondary o_pager_next px-2 rounded-end" aria-label="Next" data-tooltip="Next" tabindex="-1" t-att-data-hotkey="props.withAccessKey ? 'n' : false" t-att-disabled="state.isDisabled or isSinglePage" t-on-click.stop="() => this.navigate(1)" />
+                <button type="button" class="oi oi-chevron-left btn btn-secondary o_pager_previous px-2 rounded-start" aria-label="Previous" data-tooltip="Previous" tabindex="-1" t-att-data-hotkey="props.withAccessKey ? 'p' : false" t-att-disabled="state.isDisabled or isSinglePage" t-on-click.stop="() => this.navigate(-1)" />
+                <button type="button" class="oi oi-chevron-right btn btn-secondary o_pager_next px-2 rounded-end" aria-label="Next" data-tooltip="Next" tabindex="-1" t-att-data-hotkey="props.withAccessKey ? 'n' : false" t-att-disabled="state.isDisabled or isSinglePage" t-on-click.stop="() => this.navigate(1)" />
             </span>
         </nav>
     </t>
diff --git a/addons/web/static/src/core/popover/popover.js b/addons/web/static/src/core/popover/popover.js
index d0ceea0cb5e..7f472b50d07 100644
--- a/addons/web/static/src/core/popover/popover.js
+++ b/addons/web/static/src/core/popover/popover.js
@@ -34,7 +34,7 @@ export class Popover extends Component {
         }
 
         // reset all arrow classes
-        const arrowEl = el.firstElementChild;
+        const arrowEl = el.querySelector(".popover-arrow");
         arrowEl.className = "popover-arrow";
         switch (position) {
             case "tm": // top-middle
diff --git a/addons/web/static/src/core/popover/popover.xml b/addons/web/static/src/core/popover/popover.xml
index 939442d2bf9..54260c258ae 100644
--- a/addons/web/static/src/core/popover/popover.xml
+++ b/addons/web/static/src/core/popover/popover.xml
@@ -2,7 +2,7 @@
 <templates xml:space="preserve">
 
     <t t-name="web.PopoverWowl" owl="1">
-        <div role="tooltip" class="o_popover popover mw-100 shadow-sm" t-att-class="props.class" t-ref="ref">
+        <div role="tooltip" class="o_popover popover mw-100" t-att-class="props.class" t-ref="ref">
             <div class="popover-arrow"/>
             <t t-slot="default" />
         </div>
diff --git a/addons/web/static/src/core/tags_list/tags_list.js b/addons/web/static/src/core/tags_list/tags_list.js
index b939fa8b7d2..61e4b267851 100644
--- a/addons/web/static/src/core/tags_list/tags_list.js
+++ b/addons/web/static/src/core/tags_list/tags_list.js
@@ -9,6 +9,7 @@ export class TagsList extends Component {
         displayText: true,
     };
     static props = {
+        className: { type: String, optional: true },
         displayBadge: { type: Boolean, optional: true },
         displayText: { type: Boolean, optional: true },
         itemsVisible: { type: Number, optional: true },
diff --git a/addons/web/static/src/core/tags_list/tags_list.scss b/addons/web/static/src/core/tags_list/tags_list.scss
index e259b6236e1..a76a4d0f321 100644
--- a/addons/web/static/src/core/tags_list/tags_list.scss
+++ b/addons/web/static/src/core/tags_list/tags_list.scss
@@ -1,63 +1,24 @@
 .o_tag {
-    user-select: none;
+    font-size: var(--Tag-font-size, #{$font-size-sm});
+    max-width: var(--Tag-max-width, 100%);
 
     .o_badge_text, a {
-        color: inherit;
         line-height: 1.1;
     }
 
-    .o_tag_badge_text {
-        font-size: 12px;
-    }
-
-    img {
-        height: 1.6em;
-        aspect-ratio: 1/1;
-
-        + .o_tag_badge_text {
-            padding: 0.25em 0;
-        }
+    a {
+        color: inherit;
     }
 
     @for $size from 1 through length($o-colors) {
         &.o_tag_color_#{$size - 1} {
-            @if $size == 1 {
-                & {
-                    background-color: $o-view-background-color;
-                    color: nth($o-colors, $size);
-                    box-shadow: inset 0 0 0 1px;
-                }
-                &:focus-within {
-                    color: darken(nth($o-colors, $size), 40%) ;
-                }
-                &::after {
-                    background-color: nth($o-colors, $size);
-                }
-            } @else {
-                &, &::after {
-                    background-color: nth($o-colors, $size);
-                    color: color-contrast(nth($o-colors, $size));
-                }
+            $-bg: adjust-color(nth($o-colors, $size), $lightness: 25%, $saturation: 15%);
+            $-color: adjust-color(nth($o-colors, $size), $lightness: -40%, $saturation: -15%);
+
+            &, &::after {
+                @include o-print-color($-bg, background-color, bg-opacity);
+                @include o-print-color($-color, color, text-opacity);
             }
         }
     }
-}
-
-.o_kanban_view .o_kanban_record .o_tag {
-    display: inline-block;
-    margin-right: 4px;
-    font-size: 11px;
-    font-weight: 500;
-    background-color: transparent;
-    color: inherit;
-    box-shadow: none;
-    @include o-kanban-tag-color;
-
-    span {
-        display: inline-block;
-        width: 6px;
-        height: 6px;
-        margin-right: 4px;
-        border-radius: 100%;
-    }
-}
+}
\ No newline at end of file
diff --git a/addons/web/static/src/core/tags_list/tags_list.xml b/addons/web/static/src/core/tags_list/tags_list.xml
index 7e0d688cdfd..3283cd2ced1 100644
--- a/addons/web/static/src/core/tags_list/tags_list.xml
+++ b/addons/web/static/src/core/tags_list/tags_list.xml
@@ -3,15 +3,23 @@
 
     <t t-name="web.TagsList" owl="1">
         <t t-foreach="visibleTags" t-as="tag" t-key="tag.id or tag_index">
-            <span t-attf-class="{{`o_tag_color_${ tag.colorIndex or 0 } ${props.displayBadge ? 'badge rounded-pill' : ''}`}} o_tag d-inline-flex align-items-center" t-att-class="tag.className" tabindex="-1" t-att-data-color="tag.colorIndex" t-att-title="tag.text" t-on-click="(ev) => tag.onClick and tag.onClick(ev)" t-on-keydown="tag.onKeydown">
-                <img t-if="tag.img" t-att-src="tag.img" class="o_m2m_avatar rounded-circle" t-att-class="tag.imageClass"/>
-                <i t-if="tag.icon" t-attf-class="p-1 fa {{ tag.icon }}"/>
-                <div t-if="props.displayBadge and props.displayText" class="o_tag_badge_text px-1" t-esc="tag.text" />
-                <t t-elif="props.displayText">
-                    <span />
-                    <div t-esc="tag.text" />
-                </t>
-                <a tabIndex="-1" t-if="tag.onDelete" t-on-click.stop.prevent="(ev) => tag.onDelete and tag.onDelete(ev)" href="#" class="fa fa-times o_delete pe-1" title="Delete" aria-label="Delete"></a>
+            <span
+                class="o_tag position-relative d-inline-flex align-items-center user-select-none"
+                t-att-class="{
+                    'o_avatar opacity-trigger-hover' : tag.img,
+                    'o_badge badge rounded-pill': !tag.img,
+                }"
+                t-attf-class="{{ !tag.img ? 'o_tag_color_' + (tag.colorIndex ? tag.colorIndex : '0') : '' }}"
+                tabindex="-1"
+                t-att-data-color="tag.colorIndex"
+                t-att-title="tag.text"
+                t-on-click="(ev) => tag.onClick and tag.onClick(ev)"
+                t-on-keydown="tag.onKeydown">
+
+                <img t-if="tag.img" t-att-src="tag.img" class="o_avatar o_m2m_avatar rounded" t-att-class="tag.imageClass"/>
+                <i t-if="tag.icon" t-attf-class="p-1 fa {{ tag.icon }}" t-att-class="tag.className"/>
+                <div t-if="props.displayText" class="o_tag_badge_text" t-att-class="{'ms-1' : tag.img}" t-esc="tag.text" />
+                <a tabIndex="-1" t-if="tag.onDelete" t-on-click.stop.prevent="(ev) => tag.onDelete and tag.onDelete(ev)" href="#" class="o_delete oi oi-close ps-1" title="Delete" aria-label="Delete"/>
             </span>
         </t>
         <span t-if="props.tags and otherTags.length" class="o_m2m_avatar_empty rounded-circle text-center fw-bold" data-tooltip-template="web.TagsList.Tooltip" data-tooltip-position="right" t-att-data-tooltip-info="tooltipInfo">
diff --git a/addons/web/static/src/core/tooltip/tooltip.scss b/addons/web/static/src/core/tooltip/tooltip.scss
index c43145ebe31..df6d24190f1 100644
--- a/addons/web/static/src/core/tooltip/tooltip.scss
+++ b/addons/web/static/src/core/tooltip/tooltip.scss
@@ -1,29 +1,49 @@
 .o-tooltip {
-    font-size: small;
-    max-width: 400px;
+    @include reset-text();
+    @include font-size($tooltip-font-size);
 
-    .o-tooltip--string {
-        background-color: $o-tooltip-title-background-color;
-        font-weight: bold;
-        padding: 5px 8px;
+    // Note: Not cross-browser but not such a big deal since it's
+    // needed for minor aesthetic adaptations only.
+    &:has(.o-tooltip--technical) {
+        max-width: $tooltip-max-width * 2;
+
+        .o-tooltip--help {
+            background-color: $info;
+            color: color-contrast($info);
+        }
+
+        .o-tooltip--string, .o-tooltip--help {
+            max-width: MIN($tooltip-max-width, 100%);
+        }
+    }
+
+    .o-tooltip--string, .o-tooltip--technical--title {
+        padding:  map-get($spacers, 1) 0;
+        color: color-contrast($tooltip-bg);
+        font-weight: $font-weight-bold;
+    }
+
+    .o-tooltip--help, .o-tooltip--technical {
+        margin: map-get($spacers, 1) map-get($spacers, 2) map-get($spacers, 2);
     }
 
     .o-tooltip--help {
-        font-size: smaller;
         white-space: pre-line;
-        padding: 8px;
-        margin-bottom: 0px;
+        padding: 0 map-get($spacers, 2);
     }
 
     .o-tooltip--technical {
-        font-size: smaller;
-        padding: 8px;
-        margin: 0 0 0 15px;
-        list-style-type: circle;
+        padding-left: 1.3em;
+        font-family: $o-font-family-monospace;
+        font-size: $o-font-size-base-smaller;
+        list-style-type: disc;
 
         .o-tooltip--technical--title {
-            font-weight: bold;
-            margin-right: 4px;
+            margin-right: map-get($spacers, 1);
         }
     }
+
+    + .popover-arrow {
+        --popover-arrow-color: #{$tooltip-arrow-color};
+    }
 }
diff --git a/addons/web/static/src/core/tooltip/tooltip.xml b/addons/web/static/src/core/tooltip/tooltip.xml
index 8eb108ae901..922d8200eda 100644
--- a/addons/web/static/src/core/tooltip/tooltip.xml
+++ b/addons/web/static/src/core/tooltip/tooltip.xml
@@ -2,9 +2,9 @@
 <templates xml:space="preserve">
 
     <t t-name="web.Tooltip" owl="1">
-        <div class="o-tooltip px-2 py-1">
+        <div class="o-tooltip tooltip-inner text-start">
             <t t-if="props.template" t-call="{{props.template}}" t-call-context="{ env, ...props.info }"/>
-            <small t-else="" t-esc="props.tooltip"/>
+            <span t-else="" t-esc="props.tooltip"/>
         </div>
     </t>
 
diff --git a/addons/web/static/src/core/ui/block_ui.js b/addons/web/static/src/core/ui/block_ui.js
index e3edb79ac5d..baf9d7d0385 100644
--- a/addons/web/static/src/core/ui/block_ui.js
+++ b/addons/web/static/src/core/ui/block_ui.js
@@ -74,7 +74,7 @@ BlockUI.props = {
 };
 
 BlockUI.template = xml`
-    <div t-att-class="state.blockUI ? 'o_blockUI fixed-top d-flex justify-content-center align-items-center flex-column vh-100 bg-black-50' : ''">
+    <div t-att-class="state.blockUI ? 'o_blockUI fixed-top d-flex justify-content-center align-items-center flex-column vh-100' : ''">
       <t t-if="state.blockUI">
         <div class="o_spinner mb-4">
             <img src="/web/static/img/spin.svg" alt="Loading..."/>
diff --git a/addons/web/static/src/core/ui/block_ui.scss b/addons/web/static/src/core/ui/block_ui.scss
index ec783a3f460..c0b6636b5a3 100644
--- a/addons/web/static/src/core/ui/block_ui.scss
+++ b/addons/web/static/src/core/ui/block_ui.scss
@@ -2,6 +2,8 @@
 	cursor: wait;
 	-webkit-backdrop-filter: blur(2px);
 	backdrop-filter: blur(2px);
+	background: rgba(#000, .5);
+	color: #fff;
 	// NOTE: The value of the z-index below mirrors the $zindex-tooltip one
 	z-index: 1070 !important;
 }
diff --git a/addons/web/static/src/legacy/js/components/datepicker.js b/addons/web/static/src/legacy/js/components/datepicker.js
index 9cfb8489ef9..2e15fafcecb 100644
--- a/addons/web/static/src/legacy/js/components/datepicker.js
+++ b/addons/web/static/src/legacy/js/components/datepicker.js
@@ -196,12 +196,12 @@
             clear: 'fa fa-delete',
             close: 'fa fa-check primary',
             date: 'fa fa-calendar',
-            down: 'fa fa-chevron-down',
-            next: 'fa fa-chevron-right',
-            previous: 'fa fa-chevron-left',
+            down: 'oi oi-chevron-down',
+            next: 'oi oi-chevron-right',
+            previous: 'oi oi-chevron-left',
             time: 'fa fa-clock-o',
             today: 'fa fa-calendar-check-o',
-            up: 'fa fa-chevron-up',
+            up: 'oi oi-chevron-up',
         },
         get locale() {return moment.locale();},
         maxDate: moment({ y: 9999, M: 11, d: 31 }),
diff --git a/addons/web/static/src/legacy/js/control_panel/comparison_menu.js b/addons/web/static/src/legacy/js/control_panel/comparison_menu.js
index eb7103c42d6..ad6463c4c9e 100644
--- a/addons/web/static/src/legacy/js/control_panel/comparison_menu.js
+++ b/addons/web/static/src/legacy/js/control_panel/comparison_menu.js
@@ -27,7 +27,7 @@
             this.model.dispatch("toggleComparison", itemId);
         }
     }
-    ComparisonMenu.template = "web.ComparisonMenu";
+    ComparisonMenu.template = "web.legacy.ComparisonMenu";
     ComparisonMenu.components = { Dropdown, SearchDropdownItem };
 
     export default ComparisonMenu;
diff --git a/addons/web/static/src/legacy/js/control_panel/groupby_menu.js b/addons/web/static/src/legacy/js/control_panel/groupby_menu.js
index 087adf2f487..8b27f4af044 100644
--- a/addons/web/static/src/legacy/js/control_panel/groupby_menu.js
+++ b/addons/web/static/src/legacy/js/control_panel/groupby_menu.js
@@ -2,7 +2,7 @@
     
     import { Dropdown } from "@web/core/dropdown/dropdown";
     import { SearchDropdownItem } from "@web/search/search_dropdown_item/search_dropdown_item";
-    import { CustomGroupByItem } from "@web/search/group_by_menu/custom_group_by_item";
+    import { CustomGroupByItem } from "@web/search/custom_group_by_item/custom_group_by_item";
     import { FACET_ICONS, GROUPABLE_TYPES } from "web.searchUtils";
     import { useModel } from "web.Model";
     import { LegacyComponent } from "@web/legacy/legacy_component";
@@ -71,6 +71,6 @@
 
     GroupByMenu.components = { CustomGroupByItem, Dropdown, SearchDropdownItem };
     GroupByMenu.props = { fields: Object };
-    GroupByMenu.template = "web.GroupByMenu";
+    GroupByMenu.template = "web.legacy.GroupByMenu";
 
     export default GroupByMenu;
diff --git a/addons/web/static/src/legacy/js/widgets/date_picker.js b/addons/web/static/src/legacy/js/widgets/date_picker.js
index 0fcffd50aab..5374564c176 100644
--- a/addons/web/static/src/legacy/js/widgets/date_picker.js
+++ b/addons/web/static/src/legacy/js/widgets/date_picker.js
@@ -38,10 +38,10 @@ var DateWidget = Widget.extend({
             icons: {
                 time: 'fa fa-clock-o',
                 date: 'fa fa-calendar',
-                up: 'fa fa-chevron-up',
-                down: 'fa fa-chevron-down',
-                previous: 'fa fa-chevron-left',
-                next: 'fa fa-chevron-right',
+                up: 'oi oi-chevron-up',
+                down: 'oi oi-chevron-down',
+                previous: 'oi oi-chevron-left',
+                next: 'oi oi-chevron-right',
                 today: 'fa fa-calendar-check-o',
                 clear: 'fa fa-trash',
                 close: 'fa fa-check primary',
diff --git a/addons/web/static/src/legacy/scss/fields.scss b/addons/web/static/src/legacy/scss/fields.scss
index 5050947b2e6..37a484acb6c 100644
--- a/addons/web/static/src/legacy/scss/fields.scss
+++ b/addons/web/static/src/legacy/scss/fields.scss
@@ -18,8 +18,8 @@
 }
 
 .o_field_widget:focus-within {
-    @include print-variable(o-input-border-color, $o-brand-primary);
-    @include print-variable(o-caret-color, $o-brand-primary);
+    @include print-variable(o-input-border-color, $o-action);
+    @include print-variable(o-caret-color, $o-action);
 }
 
 .o_field_invalid {
@@ -35,7 +35,7 @@
     border:$input-border-width solid var(--o-input-border-color);
     border-width: 0 0 $input-border-width 0;
     padding: $o-input-padding-y $o-input-padding-x;
-    background-color: var(--o-input-background-color, #{$input-bg});
+    background-color: var(--o-input-background-color, #{$o-view-background-color});
 
     // -- Nested o_input(s)
     .o_input {
@@ -153,22 +153,6 @@
         padding-bottom: 0;
     }
 
-    // Many2OneAvatar
-    &.o_field_many2one_avatar {
-        .o_m2o_avatar > img, .o_m2o_avatar > .o_m2o_avatar_empty {
-            border-radius: 50%;
-            width: 19px;
-            height: 19px;
-            object-fit: cover;
-            margin-right: 4px;
-        }
-        .o_m2o_avatar_empty {
-            display: block;
-            background: $o-black;
-            opacity: .1;
-        }
-    }
-
     // Many2many tags
     &.o_field_many2manytags {
         flex-flow: row wrap;
@@ -370,24 +354,6 @@
         }
     }
 
-    &.o_field_selection_badge {
-        .o_selection_badge {
-            display: inline-block;
-            margin: 0px 0px 4px 4px;
-            padding: 1px 6px;
-            color: $o-main-color-muted;
-            border: 1px solid map-get($grays, '300');
-            cursor: pointer;
-            &.active {
-                color: $o-brand-primary;
-                border-color: $o-brand-primary;
-            }
-            &:hover:not(.active) {
-                color: $o-gray-600;
-                border-color: $o-gray-600;
-            }
-        }
-    }
     // Radio buttons
     &.o_field_radio {
         @include media-breakpoint-down(md) {
@@ -418,46 +384,6 @@
     // Percent pie
     &.o_field_percent_pie {
         align-items: center;
-
-        > .o_pie {
-            position: relative;
-            display: inline-block;
-            vertical-align: middle;
-            margin-right: 10px;
-            border-radius: 100%;
-            overflow: hidden;
-            background-color: $o-brand-primary;
-
-            &:after { // Outside pie border to go over border-radius irregularities
-                content: " ";
-                @include o-position-absolute(0, 0);
-                width: 100%;
-                height: 100%;
-                border-radius: 100%;
-            }
-
-            .o_mask {
-                @include o-position-absolute(0, 0);
-                transform-origin: 0;
-                width: 50%;
-                height: 100%;
-                background-color: $o-view-background-color;
-                &.o_full {
-                    background-color: inherit;
-                }
-            }
-
-            .o_pie_value {
-                display: flex;
-                justify-content: center;
-                align-items: center;
-
-                border-radius: 100%;
-
-                font-weight: 700;
-                color: $o-brand-odoo;
-            }
-        }
     }
 
     // Ace editor
diff --git a/addons/web/static/src/legacy/scss/name_and_signature.scss b/addons/web/static/src/legacy/scss/name_and_signature.scss
index 687d9f48161..cf9e3c04fa8 100644
--- a/addons/web/static/src/legacy/scss/name_and_signature.scss
+++ b/addons/web/static/src/legacy/scss/name_and_signature.scss
@@ -55,7 +55,7 @@
 }
 .o_form_editable {
     .o_signature:hover {
-        outline: 3px solid $o-enterprise-primary-color;
+        outline: 3px solid $o-enterprise-action-color;
         cursor: pointer;
     }
 }
diff --git a/addons/web/static/src/legacy/scss/tooltip.scss b/addons/web/static/src/legacy/scss/tooltip.scss
index 68d6e721d89..daffe8aa897 100644
--- a/addons/web/static/src/legacy/scss/tooltip.scss
+++ b/addons/web/static/src/legacy/scss/tooltip.scss
@@ -1,3 +1,9 @@
+$o-tooltip-background-color: $o-view-background-color !default;
+$o-tooltip-color: $o-main-text-color !default;
+$o-tooltip-arrow-color: white !default;
+$o-tooltip-text-color: $o-main-text-color !default;
+$o-tooltip-title-text-color: $o-main-headings-color !default;
+$o-tooltip-title-background-color: $o-view-background-color !default;
 
 .tooltip {
     $arrow-size: 6px;
diff --git a/addons/web/static/src/legacy/scss/utils.scss b/addons/web/static/src/legacy/scss/utils.scss
index fce07479e5a..5f93a5d0e90 100644
--- a/addons/web/static/src/legacy/scss/utils.scss
+++ b/addons/web/static/src/legacy/scss/utils.scss
@@ -261,18 +261,10 @@
             border-left-color: nth($o-colors, $size);
             &:after {
                 background-color: nth($o-colors, $size);
-                outline: 1px solid nth($o-colors, $size);
             }
         }
     }
 }
-@mixin o-kanban-slim-col {
-    position: relative;
-    flex: 0 0 auto;
-    margin: 0;
-    padding: 0 floor($o-kanban-group-padding * 0.7);
-    cursor: pointer;
-}
 @mixin o-kanban-header-title {
     display: flex;
     align-items: center;
@@ -280,15 +272,9 @@
     line-height: 2.2;
     color: $headings-color;
 }
-@mixin o-kanban-v-title {
-    @include o-position-absolute($o-kanban-inside-vgutter * 2, $left: floor(-$o-kanban-inside-vgutter * 1.2));
-    transform-origin: left bottom 0;
-    transform: rotate(90deg);
-    overflow: visible;
-}
 
 // ------- Kanban records mixins -------
-@mixin o-kanban-record-title($font-size) {
+@mixin o-kanban-record-title($font-size: $h5-font-size) {
     color: $headings-color;
     font-size: $font-size;
     font-weight: 500;
@@ -296,10 +282,8 @@
     margin-top: 0;
 }
 @mixin o-kanban-dropdown($padding-base: $o-kanban-inside-vgutter) {
-    margin: -1px -1px 1px;
+    margin: 1px 1px 0 0;
     padding: if(type-of($padding-base) == 'string', calc(#{$padding-base}/2) $padding-base, $padding-base/2 $padding-base);
-    border: 1px solid transparent;
-    border-bottom: none;
     vertical-align: top;
     @include o-hover-text-color($body-color, $headings-color);
 
@@ -311,8 +295,14 @@
 @mixin o-kanban-dropdown-open {
     position: relative;
     background: $dropdown-bg;
-    border-color: $border-color;
     z-index: $zindex-dropdown + 1;
+
+    &:before {
+        @include o-position-absolute(100%, 0, auto, 0);
+        height: $dropdown-border-radius;
+        background-color: $dropdown-bg;
+        content: "";
+    }
 }
 @mixin o-kanban-colorpicker {
     max-width: 150px;
@@ -336,20 +326,8 @@
         }
 
         // No Color
-        &:first-child > a {
-            position: relative;
-            &::before {
-                content: "";
-                @include o-position-absolute(-2px, $left: 10px);
-                display: block;
-                width: 1px;
-                height: 20px;
-                transform: rotate(45deg);
-                background-color: red;
-            }
-            &::after {
-                background-color: white;
-            }
+        &:first-child > a:after {
+            background: linear-gradient(45deg, rgba($dropdown-bg, 0) 0%, rgba($dropdown-bg, 0) 48%, $danger 48%, $danger 52%, rgba($dropdown-bg, 0) 52%, rgba($dropdown-bg, 0) 100%);
         }
     }
 }
@@ -383,12 +361,12 @@
     padding: 15px;
     z-index: 1000;
     text-align: center;
-    color: $o-tooltip-text-color;
+    color: $body-color;
     font-size: 115%;
 
     > p:first-of-type {
         margin-top: 0;
-        color: $o-tooltip-title-text-color;
+        color: $headings-color;
         font-weight: bold;
         font-size: 125%;
     }
diff --git a/addons/web/static/src/legacy/xml/base.xml b/addons/web/static/src/legacy/xml/base.xml
index a6ca0c51c53..3b4e3b22bca 100644
--- a/addons/web/static/src/legacy/xml/base.xml
+++ b/addons/web/static/src/legacy/xml/base.xml
@@ -4,8 +4,8 @@
 <!-- Owl Templates -->
 
 <t t-name="web.Legacy.ControlPanel" owl="1">
-    <div class="o_control_panel" data-command-category="actions">
-        <div class="o_cp_top">
+    <div class="o_control_panel px-3" data-command-category="actions">
+        <div class="o_cp_top mb-1">
             <div class="o_cp_top_left">
                 <ol t-if="props.withBreadcrumbs" class="breadcrumb" role="navigation">
                     <li t-foreach="props.breadcrumbs" t-as="bc" t-key="bc.controllerID"
@@ -285,7 +285,7 @@
         <span class="btn-group" aria-atomic="true">
             <!-- accesskeys not wanted in X2Many widgets -->
             <button type="button"
-                class="fa fa-chevron-left px-2 btn btn-secondary o_pager_previous rounded-start"
+                class="oi oi-chevron-left px-2 btn btn-secondary o_pager_previous rounded-start"
                 t-att-disabled="state.disabled || singlePage"
                 t-att-accesskey="props.withAccessKey ? 'p' : false"
                 aria-label="Previous page"
@@ -294,7 +294,7 @@
                 t-on-click="ev => this._changeSelection(-1, ev)"
             />
             <button type="button"
-                class="fa fa-chevron-right px-2 btn btn-secondary o_pager_next rounded-end"
+                class="oi oi-chevron-right px-2 btn btn-secondary o_pager_next rounded-end"
                 t-att-disabled="state.disabled || singlePage"
                 t-att-accesskey="props.withAccessKey ? 'n' : false"
                 aria-label="Next page"
@@ -778,7 +778,7 @@
 </div>
 <div  t-name="ModelFieldSelector.popover" class="o_field_selector_popover o_legacy_field_selector_popover d-none" tabindex="0">
     <div class="o_field_selector_popover_header text-center">
-        <i class="fa fa-arrow-left o_field_selector_popover_option o_field_selector_prev_page" title="Previous" role="img" aria-label="Previous"/>
+        <i class="oi oi-arrow-left o_field_selector_popover_option o_field_selector_prev_page" title="Previous" role="img" aria-label="Previous"/>
         <div class="o_field_selector_title"/>
         <i class="fa fa-times o_field_selector_popover_option o_field_selector_close" title="Close" role="img" aria-label="Close"/>
         <div t-if="widget.options.showSearchInput" class="o_field_selector_search mt-2">
@@ -798,7 +798,7 @@
 <t t-name="ModelFieldSelector.value">
     <t t-foreach="chain" t-as="fieldName" t-key="fieldName_index">
         <t t-if="fieldName_index > 0">
-            <i class="fa fa-chevron-right" role="img" aria-label="Followed by" title="Followed by"/>
+            <i class="oi oi-chevron-right" role="img" aria-label="Followed by" title="Followed by"/>
         </t>
         <span class="o_field_selector_chain_part">
             <t t-if="fieldName === '1'">
@@ -827,7 +827,7 @@
             t-att-data-name="line.name">
             <t t-esc="line.string"/>
             <div t-if="debug" class="text-muted o_field_selector_item_title"><t t-esc="line.name"/> (<t t-esc="line.type"/>)</div>
-            <i t-if="relationToFollow" class="fa fa-chevron-right o_field_selector_relation_icon" role="img" aria-label="Relation to follow" title="Relation to follow"/>
+            <i t-if="relationToFollow" class="oi oi-chevron-right o_field_selector_relation_icon" role="img" aria-label="Relation to follow" title="Relation to follow"/>
         </li>
     </t>
 </ul>
diff --git a/addons/web/static/src/legacy/xml/control_panel.xml b/addons/web/static/src/legacy/xml/control_panel.xml
index f0f8c57b871..2b4e7315d43 100644
--- a/addons/web/static/src/legacy/xml/control_panel.xml
+++ b/addons/web/static/src/legacy/xml/control_panel.xml
@@ -1,31 +1,170 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates id="template" xml:space="preserve">
 
-<t t-name="web.Legacy.FavoriteMenu" t-inherit="web.FavoriteMenu" t-inherit-mode="primary" owl="1">
-    <xpath expr="//t[@t-set-slot='toggler']" position="inside">
-        <Dialog t-if="state.deletedFavorite"
-            title="'Warning'"
-            size="'medium'"
-            onClosed="() => { state.deletedFavorite = false }"
-            >
-            <t t-if="state.deletedFavorite.userId">Are you sure that you want to remove this filter?</t>
-            <t t-else="">This filter is global and will be removed for everybody if you continue.</t>
-            <t t-set-slot="buttons">
-                <button type="button" class="btn btn-primary" t-on-click="_onRemoveFavorite">
-                    <t>Ok</t>
-                </button>
-                <button type="button" class="btn btn-secondary" t-on-click.stop="() => { state.deletedFavorite = false }">
-                    <t>Cancel</t>
-                </button>
+<t t-name="web.Legacy.FavoriteMenu" owl="1">
+    <Dropdown class="'o_favorite_menu btn-group'" togglerClass="'btn btn-light'">
+        <t t-set-slot="toggler">
+            <i class="me-1" t-att-class="icon"/>
+            <span class="o_dropdown_title">Favorites</span>
+            <Dialog t-if="state.deletedFavorite"
+                title="'Warning'"
+                size="'medium'"
+                onClosed="() => { state.deletedFavorite = false }"
+                >
+                <t t-if="state.deletedFavorite.userId">Are you sure that you want to remove this filter?</t>
+                <t t-else="">This filter is global and will be removed for everybody if you continue.</t>
+                <t t-set-slot="buttons">
+                    <button type="button" class="btn btn-primary" t-on-click="_onRemoveFavorite">
+                        <t>Ok</t>
+                    </button>
+                    <button type="button" class="btn btn-secondary" t-on-click.stop="() => { state.deletedFavorite = false }">
+                        <t>Cancel</t>
+                    </button>
+                </t>
+            </Dialog>
+        </t>
+        <t t-set="currentGroup" t-value="null"/>
+        <t t-foreach="this.items" t-as="item" t-key="item.id or item.key">
+            <t t-if="currentGroup !== null and currentGroup !== item.groupNumber">
+                <div role="separator" class="dropdown-divider"/>
             </t>
-        </Dialog>
-    </xpath>
+            <t t-if="item.type ==='favorite'">
+                <SearchDropdownItem class="{ o_menu_item: true, selected: item.isActive }"
+                    checked="item.isActive"
+                    parentClosingMode="'none'"
+                    onSelected="() => this.onFavoriteSelected(item.id)"
+                    >
+                    <span class="d-flex p-0 align-items-center justify-content-between">
+                        <t t-esc="item.description"/>
+                        <i class="ms-1 o_icon_right fa fa-trash-o"
+                            title="Delete item"
+                            t-on-click.stop="() => this.openConfirmationDialog(item.id)"
+                        />
+                    </span>
+                </SearchDropdownItem>
+            </t>
+            <t t-else="">
+                <t t-component="item.Component" t-props="item.props"/>
+            </t>
+            <t t-set="currentGroup" t-value="item.groupNumber"/>
+        </t>
+    </Dropdown>
 </t>
 
-<t t-name="web.legacy.FilterMenu" t-inherit="web.FilterMenu" t-inherit-mode="primary" owl="1">
-    <xpath expr="//DropdownItem" position="replace">
+<t t-name="web.legacy.FilterMenu" owl="1">
+    <Dropdown class="'o_filter_menu btn-group ' + props.class" togglerClass="'btn btn-light'">
+        <t t-set-slot="toggler">
+            <i class="me-1" t-att-class="icon"/>
+            <span class="o_dropdown_title">Filters</span>
+        </t>
+        <t t-set="currentGroup" t-value="null"/>
+        <t t-foreach="items" t-as="item" t-key="item.id">
+            <t t-if="currentGroup !== null and currentGroup !== item.groupNumber">
+                <div class="dropdown-divider" role="separator"/>
+            </t>
+            <t t-if="item.options">
+                <Dropdown togglerClass="'o_menu_item' + (item.isActive ? ' selected' : '')">
+                    <t t-set-slot="toggler">
+                        <t t-esc="item.description"/>
+                    </t>
+                    <t t-set="subGroup" t-value="null"/>
+                    <t t-foreach="item.options" t-as="option" t-key="option.id">
+                        <t t-if="subGroup !== null and subGroup !== option.groupNumber">
+                            <div class="dropdown-divider" role="separator"/>
+                        </t>
+                        <SearchDropdownItem class="{ o_item_option: true, selected: option.isActive }"
+                            t-esc="option.description"
+                            checked="option.isActive"
+                            parentClosingMode="'none'"
+                            onSelected="() => this.onFilterSelected({ itemId: item.id, optionId: option.id })"
+                        />
+                        <t t-set="subGroup" t-value="option.groupNumber"/>
+                    </t>
+                </Dropdown>
+            </t>
+            <t t-else="">
+                <SearchDropdownItem class="{ o_menu_item: true, selected: item.isActive }"
+                    checked="item.isActive"
+                    parentClosingMode="'none'"
+                    t-esc="item.description"
+                    onSelected="() => this.onFilterSelected({ itemId: item.id })"
+                />
+            </t>
+            <t t-set="currentGroup" t-value="item.groupNumber"/>
+        </t>
+        <t t-if="items.length">
+            <div role="separator" class="dropdown-divider"/>
+        </t>
         <CustomFilterItem fields="props.fields"/>
-    </xpath>
+    </Dropdown>
+</t>
+
+<t t-name="web.legacy.ComparisonMenu" owl="1">
+    <Dropdown class="'o_comparison_menu btn-group'" togglerClass="'btn btn-light'">
+        <t t-set-slot="toggler">
+            <i class="me-1" t-att-class="icon"/>
+            <span class="o_dropdown_title">Comparison</span>
+        </t>
+        <t t-foreach="items" t-as="item" t-key="item.id">
+            <SearchDropdownItem class="{ o_menu_item: true, selected: item.isActive }"
+                checked="item.isActive"
+                parentClosingMode="'none'"
+                t-esc="item.description"
+                onSelected="() => this.onComparisonSelected(item.id)"
+            />
+        </t>
+    </Dropdown>
+</t>
+
+<t t-name="web.legacy.GroupByMenu" owl="1">
+    <Dropdown class="'o_group_by_menu btn-group'"
+        togglerClass="'btn btn-light'"
+        t-props="dropdownProps"
+    >
+        <t t-set-slot="toggler">
+            <i class="me-1" t-att-class="icon"/>
+            <span class="o_dropdown_title">Group By<t t-if="props.showCaretDown"> <i class="fa fa-caret-down ms-1"/></t></span>
+        </t>
+        <t t-set="currentGroup" t-value="null"/>
+        <t t-foreach="items" t-as="item" t-key="item.id">
+            <t t-if="currentGroup !== null and currentGroup !== item.groupNumber">
+                <div class="dropdown-divider" role="separator"/>
+            </t>
+            <t t-if="item.options">
+                <Dropdown togglerClass="'o_menu_item' + (item.isActive ? ' selected' : '')">
+                    <t t-set-slot="toggler">
+                        <t t-esc="item.description"/>
+                    </t>
+                    <t t-set="subGroup" t-value="null"/>
+                    <t t-foreach="item.options" t-as="option" t-key="option.id">
+                        <t t-if="subGroup !== null and subGroup !== option.groupNumber">
+                            <div class="dropdown-divider" role="separator"/>
+                        </t>
+                        <SearchDropdownItem class="{ o_item_option: true, selected: option.isActive }"
+                            checked="option.isActive ? true : false"
+                            parentClosingMode="'none'"
+                            t-esc="option.description"
+                            onSelected="() => this.onGroupBySelected({ itemId: item.id, optionId: option.id})"
+                        />
+                        <t t-set="subGroup" t-value="option.groupNumber"/>
+                    </t>
+                </Dropdown>
+            </t>
+            <t t-else="">
+                <SearchDropdownItem class="{ o_menu_item: true, selected: item.isActive }"
+                    checked="item.isActive"
+                    parentClosingMode="'none'"
+                    t-esc="item.description"
+                    onSelected="() => this.onGroupBySelected({ itemId: item.id })"
+                />
+            </t>
+            <t t-set="currentGroup" t-value="item.groupNumber"/>
+        </t>
+        <t t-if="!hideCustomGroupBy and fields.length">
+            <div t-if="items.length" role="separator" class="dropdown-divider"/>
+            <CustomGroupByItem fields="fields" onAddCustomGroup.bind="onAddCustomGroup"/>
+        </t>
+    </Dropdown>
 </t>
 
 </templates>
diff --git a/addons/web/static/src/scss/bootstrap_overridden.scss b/addons/web/static/src/scss/bootstrap_overridden.scss
index 29ed9a31a16..cd50f991fdd 100644
--- a/addons/web/static/src/scss/bootstrap_overridden.scss
+++ b/addons/web/static/src/scss/bootstrap_overridden.scss
@@ -29,7 +29,7 @@ $gray-900: $o-gray-900 !default;
 $black:    $o-black !default;
 
 $primary: $o-brand-primary !default;
-$secondary: $white !default;
+$secondary: $gray-300 !default;
 $dark: $o-gray-900 !default;
 
 $success: $o-success !default;
@@ -37,13 +37,6 @@ $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
-);
 
 // The contrast ratio to reach against white, to determine if color changes from "light" to "dark". Acceptable values for WCAG 2.0 are 3, 4.5 and 7.
 // See https://www.w3.org/TR/WCAG20/#visual-audio-contrast-contrast
@@ -64,7 +57,7 @@ $enable-negative-margins: true !default;
 $enable-cssgrid: true !default;
 
 // Spacing
-$spacer: 1rem !default;
+$spacer: $o-spacer !default;
 
 // Body
 //
@@ -105,8 +98,8 @@ $border-radius-sm: $o-border-radius-sm !default;
 $border-radius-lg: $o-border-radius-lg !default;
 $border-color: $o-gray-300 !default;
 
-$component-active-color: $o-brand-primary !default;
-$component-active-bg: $gray-200 !default;
+$component-active-color: $o-component-active-color !default;
+$component-active-bg: $o-component-active-bg !default;
 
 $caret-width: 4px !default;
 
@@ -121,6 +114,9 @@ $font-weight-bolder: 700 !default;
 $font-family-sans-serif: $o-font-family-sans-serif !default;
 
 $font-size-base: $o-font-size-base !default;
+$font-size-sm: $o-font-size-base-small !default;
+$small-font-size: $font-size-sm !default;
+
 $line-height-base: $o-line-height-base !default;
 
 $h1-font-size: $font-size-base * 2.0 !default;
@@ -137,10 +133,11 @@ $headings-color: $o-main-headings-color !default;
 //
 // Customizes the `.table` component with basic values, each used across all table variations.
 
+$table-bg: transparent !default;
 $table-striped-color: inherit !default;
-$table-striped-bg-factor: .01 !default;
+$table-striped-bg-factor: 0.01 !default;
 $table-hover-bg-factor: .055 !default;
-$table-border-color: $gray-200 !default;
+$table-border-color: $border-color !default;
 $table-group-separator-color: $gray-200 !default;
 $table-cell-padding-x: .75rem !default;
 $table-cell-padding-y: .75rem !default;
@@ -152,8 +149,22 @@ $table-active-bg-factor: .05 !default;
 $table-active-color: $headings-color !default;
 $table-th-font-weight: $headings-font-weight !default;
 
+// Buttons + Forms
+//
+// Shared variables that are reassigned to `$input-` and `$btn-` specific variables.
+
+$input-btn-padding-y: o-to-rem(5) !default;
+$input-btn-padding-x: o-to-rem(10) !default;
+
+$input-btn-padding-y-sm: o-to-rem(3) !default;
+$input-btn-padding-x-sm: o-to-rem(8) !default;
+
+$input-btn-padding-y-lg: o-to-rem(6) !default;
+$input-btn-padding-x-lg: o-to-rem(12) !default;
+
 // Buttons
 //
+// For each of Bootstrap's buttons, define text, background, and border color.
 
 $btn-font-weight: $font-weight-bold !default;
 $btn-disabled-opacity: $o-opacity-disabled !default;
@@ -179,6 +190,9 @@ $dropdown-item-padding-x: $o-dropdown-hpadding !default;
 
 // List group
 
+$list-group-bg: $o-view-background-color !default;
+$list-group-hover-bg: $dropdown-link-hover-bg !default;
+
 $list-group-active-color: $o-list-group-active-color !default;
 $list-group-active-bg: $o-list-group-active-bg !default;
 $list-group-action-hover-color: $gray-900 !default;
@@ -209,9 +223,19 @@ $nav-pills-border-radius: 0 !default;
 $nav-pills-link-active-color: $white !default;
 $nav-pills-link-active-bg: $o-brand-primary !default;
 
+// Tooltips
+
+$tooltip-font-size: $font-size-sm !default;
+$tooltip-max-width: 400px !default;
+$tooltip-color: $o-gray-200 !default;
+$tooltip-opacity: 1 !default;
+
 // Popovers
 
+$popover-bg: $white !default;
+$popover-border-width: 0 !default;
 $popover-border-radius: $border-radius !default;
+$popover-arrow-color: var(--popover-arrow-color, #{$popover-bg}) !default;
 
 // Toasts
 
@@ -262,13 +286,14 @@ $form-check-input-checked-border-color: $o-brand-primary !default;
 $form-check-input-checked-bg-color: $o-brand-primary !default;
 $form-switch-checked-color: $input-bg !default;
 $form-switch-circle-bg-color: $input-bg !default;
+$form-switch-focus-color: mix($o-success, $input-bg) !default;
 
 $form-range-thumb-bg: $primary !default;
 
 // Badge
 $badge-color: inherit !default;
 $badge-padding-y: 0.25em !default;
-$badge-padding-x: 0.4em !default;
+$badge-padding-x: 0.82em !default;
 
 // Placeholder color 
 $input-placeholder-color: $gray-300 !default;
diff --git a/addons/web/static/src/scss/bootstrap_review.scss b/addons/web/static/src/scss/bootstrap_review.scss
index bd37b1bd68f..280fa12f915 100644
--- a/addons/web/static/src/scss/bootstrap_review.scss
+++ b/addons/web/static/src/scss/bootstrap_review.scss
@@ -9,25 +9,16 @@
     clear: both;
 }
 
-// Extend bootstrap to create background and text utilities for gray colors too
-// Note: the card-body rule below needs those grays utilities to be defined
-// before so that the related o-bg-color text-muted rules work.
-@each $color, $value in $grays {
-    @include bg-variant(".bg-#{$color}", $value);
-    @include text-emphasis-variant(".text-#{$color}", $value);
-}
-
-// Restore text-X from BS4 that use text-emphasis-variant
-@each $color, $value in $theme-colors {
-    @include text-emphasis-variant(".text-#{$color}", $value);
-}
-
-
-.card-body {
+%-card-body-reviewed {
     // BS4 colored cards do not have a very popular design. This will reset them
     // to a BS3-like one: only the header and footer are colored and the body
     // will use the color of a default card background with a light opacity.
     // Limitation: bg-* utilities cannot be used on card-body elements anymore.
+    // Note: these rules need grays utilities to be defined before so that the
+    // related o-bg-color text-muted rules work. Since backend and fronted
+    // generate these classes differently, this pseudo-class is called in the
+    // respective 'bootstrap_review_x' file immediately after gray classes
+    // generation.
     @include o-bg-color(rgba($card-bg, $o-card-body-bg-opacity));
 
     &:first-child {
@@ -130,68 +121,3 @@
         }
     }
 }
-
-// Generating bootstrap color buttons was disabled (see import_bootstrap.scss).
-// We do it ourself here with a tweak: we introduce btn-fill-* (working as the
-// normal btn-* classes (in opposition to btn-outline-* classes). We then map
-// the btn-* classes to either btn-fill-* or btn-outline-* classes depending on
-// the configuration. We also allow to define a border-color different than the
-// background color.
-$o-btn-bg-colors: () !default;
-$o-btn-border-colors: () !default;
-@each $color, $value in $theme-colors {
-    $-bg-color: map-get($o-btn-bg-colors, $color) or $value;
-    $-border-color: map-get($o-btn-border-colors, $color) or $-bg-color;
-    .btn-fill-#{$color} {
-        @include button-variant($-bg-color, $-border-color);
-    }
-}
-@each $color, $value in $theme-colors {
-    $-bg-color: map-get($o-btn-bg-colors, $color) or $value;
-    $-border-color: map-get($o-btn-border-colors, $color) or $-bg-color;
-    .btn-outline-#{$color} {
-        @include button-outline-variant($-border-color);
-    }
-}
-$o-btn-outline-defaults: () !default;
-@each $color, $value in $theme-colors {
-    .btn-#{$color} {
-        @if index($o-btn-outline-defaults, $color) {
-            @extend .btn-outline-#{$color};
-        } @else {
-            @extend .btn-fill-#{$color};
-        }
-    }
-}
-
-// Compensate navbar brand padding if no visible border
-@if alpha($navbar-dark-toggler-border-color) < 0.001 {
-    .navbar-dark .navbar-toggler {
-        padding-left: 0;
-        padding-right: 0;
-    }
-}
-@if alpha($navbar-light-toggler-border-color) < 0.001 {
-    .navbar-light .navbar-toggler {
-        padding-left: 0;
-        padding-right: 0;
-    }
-}
-
-// Review bootstrap navbar to work with different nav styles
-$o-navbar-nav-pills-link-padding-x: $nav-link-padding-x !default;
-$o-navbar-nav-pills-link-border-radius: $nav-pills-border-radius !default;
-.navbar-nav.nav-pills .nav-link {
-    // The rules is needed so that the padding is not reset to 0 in mobile.
-    // Also use default nav-link paddings instead of navbar ones.
-    padding-right: $o-navbar-nav-pills-link-padding-x;
-    padding-left: $o-navbar-nav-pills-link-padding-x;
-
-    @if $o-navbar-nav-pills-link-border-radius != $nav-pills-border-radius {
-        @include border-radius($o-navbar-nav-pills-link-border-radius);
-    }
-}
-
-.carousel-control-next .visually-hidden {
-    left: 50%; // Avoid horizontal scrollbar in Chrome
-}
diff --git a/addons/web/static/src/scss/bootstrap_review_backend.scss b/addons/web/static/src/scss/bootstrap_review_backend.scss
new file mode 100644
index 00000000000..e56fcb33b7f
--- /dev/null
+++ b/addons/web/static/src/scss/bootstrap_review_backend.scss
@@ -0,0 +1,300 @@
+///
+/// This file regroups the CSS rules made to fix/extend bootstrap in the backend
+/// ==============================================================================
+
+
+// Buttons
+// ============================================================================
+// Generating bootstrap color buttons was disabled (see import_bootstrap.scss).
+// We do it ourself here generating each btn design type individually.
+
+// 1. Render buttons defined in '$o-btns-bs-override' and '$o-btns-bs-outline-override'
+//    maps.
+@each $-name, $-value in $o-btns-bs-override {
+    .btn-#{$-name} {
+        @include button-variant(
+            o-safe-get($-value, background),
+            o-safe-get($-value, border),
+            o-safe-get($-value, color),
+            o-safe-get($-value, hover-background),
+            o-safe-get($-value, hover-border),
+            o-safe-get($-value, hover-color),
+            o-safe-get($-value, active-background),
+            o-safe-get($-value, active-border),
+            o-safe-get($-value, active-color),
+        );
+    }
+}
+
+@each $-name, $-value in $o-btns-bs-outline-override {
+    .btn-outline-#{$-name} {
+        @include button-variant(
+            o-safe-get($-value, background),
+            o-safe-get($-value, border),
+            o-safe-get($-value, color),
+            o-safe-get($-value, hover-background),
+            o-safe-get($-value, hover-border),
+            o-safe-get($-value, hover-color),
+            o-safe-get($-value, active-background),
+            o-safe-get($-value, active-border),
+            o-safe-get($-value, active-color),
+        );
+    }
+}
+
+// 2. Render '$theme-colors' buttons excluding the ones already generated
+//    using the custom maps.
+@each $-name, $-color in $theme-colors {
+    @if (not map-get($o-btns-bs-override, $-name)) {
+        .btn-#{$-name} {
+            @include button-variant($-color, $-color);
+        }
+    }
+    @if (not map-get($o-btns-bs-outline-override, $-name)) {
+        .btn-outline-#{$-name} {
+            @include button-outline-variant($-color);
+        }
+    }
+}
+
+// 3. Render custom buttons.
+@each $-name, $-color in $o-btn-custom {
+    .btn-#{$-name} {
+        @include button-variant($-color, $-color);
+    }
+}
+
+// Button group
+// ============================================================================
+.btn-group {
+    > .btn, .btn-group {
+        // Ensure that active buttons will always be rendered on top, including
+        // hovered ones.
+        &:active, &.active, &:active:hover, &.active:hover {
+            z-index: 2;
+        }
+
+        &:not(:first-child) {
+            margin-left: $btn-border-width;
+        }
+    }
+}
+
+// Bootstrap '$theme-colors' text-x and bg-x classes generation
+// ============================================================================
+// Bootstrap's default behavior is to generate classes directly from its
+// '$theme-colors' map. However, we have disabled this to allow our own
+// approach.
+
+// 'text-x' classes
+// ----------------------------------------------------------------------------
+// 1. To comply with WCAG standards, we need to use text-colors that are
+//    different from the ones in the '$theme-colors' map. We achieve this by
+//    creating a temporary map that overrides uncompliant colors with
+//    '$o-theme-text-colors' ones.
+$-o-theme-text-colors: map-merge($theme-colors, $o-theme-text-colors);
+
+// 2. Use different colors for links and buttons when in conjunction with
+//    'text-x' classes to keep consistency with previous versions of Bootstrap.
+//    To do so we pass the values through the 'text-emphasis-variant' mixin.
+@each $-name, $-value in $-o-theme-text-colors {
+    @include text-emphasis-variant(".text-#{$-name}", $-value);
+}
+
+// 3. Adapt the behaviour of .btn-link buttons when in conjuction with contextual
+//    classes (eg. text-warning). 'muted' is set as default text color, while
+//    the contextual-class color will be used on ':hover'.
+//    Note: For the custom classes, this is duplicated below where the classes are
+//    generated with the o-gray
+.btn-link {
+    font-weight: $btn-font-weight;
+
+    @each $-name, $-color in $-o-theme-text-colors{
+        &.btn-#{$-name}, &.text-#{$-name} {
+            @include o-btn-link-variant($o-main-color-muted!important, o-text-color($-name) or $-color!important);
+        }
+    }
+}
+
+// 3. Cleanup temporary map
+$-o-theme-text-colors: null;
+
+// 'bg-x' classes
+// ----------------------------------------------------------------------------
+// 1. Generate $theme-colors classes using 'o-print-color()' mixin in order to
+//    assign the color and print relative CSS variables as well. Note that
+//    'black' and 'white' are not included in the map, we'll generate these
+//    classes later in conjunction with legacy 'bg-white-x' and 'bg-black-x'
+//    ones.
+@each $-name, $-color in $theme-colors {
+    .bg-#{$-name} {
+        @include o-print-color($-color, background-color, bg-opacity);
+    }
+}
+
+
+// Bootstrap black/white text-x and bg-x classes + legacy opacity ones
+// ============================================================================
+
+// 1. Define placeholder-selectors (aka pseudo-classes) for both white and
+//    black. We'll then extend placeholder rather than classes to avoid
+//    performance issues during SCSS compilation.
+%-text-white {
+    @include o-print-color($o-white, color, text-opacity);
+}
+
+%-text-black {
+    @include o-print-color($o-black, color, text-opacity);
+}
+
+%-bg-white {
+    @include o-print-color($o-white, background-color, bg-opacity);
+}
+
+%-bg-black {
+    @include o-print-color($o-black, background-color, bg-opacity);
+}
+
+.text-white {
+    @extend %-text-white;
+}
+
+.text-black {
+    @extend %-text-black;
+}
+
+.bg-white {
+    @extend %-bg-white;
+}
+
+.bg-black {
+    @extend %-bg-black;
+}
+
+// 2. Generate legacy opacity-variations classes for both white and black. We
+//    don't specifically assign colors here, we just extend placeholder
+//    selectors. To control opacity we act on the '--X-opacity' Bootstrap
+//    default CSS variables.
+$-o-grayscale-opacities: map-remove($o-opacities, 0, 100);
+@each $-name, $-value in $-o-grayscale-opacities {
+    .bg-white-#{$-name} {
+        --bg-opacity: #{$-value};
+        @extend %-bg-white;
+    }
+
+    .bg-black-#{$-name} {
+        --bg-opacity: #{$-value};
+        @extend %-bg-black;
+    }
+}
+
+@each $-name, $-value in $-o-grayscale-opacities {
+    .text-white-#{$-name} {
+        --text-opacity: #{$-value};
+        @extend %-text-white;
+    }
+
+    .text-black-#{$-name} {
+        --text-opacity: #{$-value};
+        @extend %-text-black;
+    }
+}
+
+// 3. Cleanup temporary map
+$-o-grayscale-opacities: null;
+
+
+// Odoo custom text/bg colors classes generation
+// ============================================================================
+
+// 1. Extend odoo's custom colors maps adding Bootstrap's grays.
+//    Note: the card-body rule below needs those grays utilities to be defined
+//    before, so that the related o-bg-color text-muted rules work.
+$-o-text-colors-custom: map-merge($o-text-colors-custom, $o-grays);
+$-o-bg-colors-custom: map-merge($o-bg-colors-custom, $o-grays);
+
+// 2. Generate custom 'text-x' contextual classes
+@each $-name, $-color in $-o-text-colors-custom {
+    @include text-emphasis-variant(".text-#{$-name}", $-color);
+}
+
+// 3. Generate custom 'bg-x' and 'text-bg-x' contextual classes
+@each $-name, $-color in map-merge($-o-bg-colors-custom, $o-grays) {
+    .bg-#{$-name}, .text-bg-#{$-name}  {
+        @include o-print-color($-color, background-color, bg-opacity);
+    }
+
+    .text-bg-#{$-name} {
+        @include o-print-color(color-contrast($-color), color, text-opacity);
+    }
+}
+
+// 4. Cleanup temporary maps
+$-o-text-colors-custom: null;
+$-o-bg-colors-custom: null;
+
+// 5. Adapt the behaviour of .btn-link buttons when in conjuction with the custom
+//    contextual classes (eg. text-action). 'muted' is set as default text color,
+//    while the contextual-class color will be used on ':hover'.
+//    Note: the same is done above for the '$theme-colors'. Here on the
+//    '$o-text-colors-custom' because we don't want it to apply on the '$o-grays'.
+.btn-link {
+    @each $-name, $-color in $o-text-colors-custom{
+        &.btn-#{$-name}, &.text-#{$-name} {
+            @include o-btn-link-variant($o-main-color-muted!important, o-text-color($-name) or $-color!important);
+        }
+    }
+}
+
+// Cards
+// ============================================================================
+.card-body {
+    @extend %-card-body-reviewed; // See bootstrap_review.scss
+}
+
+// Forms
+// ==============================================================================
+.form-control:hover {
+    background-color: $input-focus-bg;
+    border-color: $o-input-hover-border-color;
+}
+
+// Switches
+// ============================================================================
+.form-switch {
+    .form-check-input:checked {
+        background-color: $o-success;
+        border-color: $o-success;
+    }
+
+    .form-check-input:focus {
+        border-color: $o-success;
+    }
+
+    &:hover .form-check-input:not(:disabled) {
+        border-color: $o-success;
+    }
+
+    // Creating a different styling for toggle switches with a purpose of switching
+    // from A to B (eg. switching between month and year) rather than ON/OFF.
+    // The 'o_switch_toggle' class should be use in addition to the default
+    // 'form-switch' Bootstrap class.
+    &.o_switch_toggle {
+        .form-check-input, .form-check-input:checked {
+            border-color: $o-action;
+            background-color: $o-view-background-color;
+            
+            &, &:focus, &:checked {
+                background-image: escape-svg(url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'><circle r='3' fill='#{$o-action}'/></svg>"));
+            }
+        }
+        
+        &:hover .form-check-input:not(:disabled) {
+            border-color: $o-action;
+        }
+    }
+
+    &:disabled, &.disabled, &[disabled] {
+        opacity: $o-opacity-disabled;
+    }
+}
diff --git a/addons/web/static/src/scss/bootstrap_review_frontend.scss b/addons/web/static/src/scss/bootstrap_review_frontend.scss
new file mode 100644
index 00000000000..977df6b5f8b
--- /dev/null
+++ b/addons/web/static/src/scss/bootstrap_review_frontend.scss
@@ -0,0 +1,86 @@
+///
+/// This file regroups the CSS rules made to fix/extend bootstrap in frontend
+/// ==============================================================================
+
+// Extend bootstrap to create background and text utilities for gray colors too
+// Note: the card-body rule below needs those grays utilities to be defined
+// before so that the related o-bg-color text-muted rules work.
+@each $color, $value in $grays {
+    @include bg-variant(".bg-#{$color}", $value);
+    @include text-emphasis-variant(".text-#{$color}", $value);
+}
+
+// Restore text-X from BS4 that use text-emphasis-variant
+@each $color, $value in $theme-colors {
+    @include text-emphasis-variant(".text-#{$color}", $value);
+}
+
+// Cards
+.card-body {
+    @extend %-card-body-reviewed; // See bootstrap_review.scss
+}
+
+// Generating bootstrap color buttons was disabled (see import_bootstrap.scss).
+// We do it ourself here with a tweak: we introduce btn-fill-* (working as the
+// normal btn-* classes (in opposition to btn-outline-* classes). We then map
+// the btn-* classes to either btn-fill-* or btn-outline-* classes depending on
+// the configuration. We also allow to define a border-color different than the
+// background color.
+$o-btn-bg-colors: () !default;
+$o-btn-border-colors: () !default;
+@each $color, $value in $theme-colors {
+    $-bg-color: map-get($o-btn-bg-colors, $color) or $value;
+    $-border-color: map-get($o-btn-border-colors, $color) or $-bg-color;
+    .btn-fill-#{$color} {
+        @include button-variant($-bg-color, $-border-color);
+    }
+}
+@each $color, $value in $theme-colors {
+    $-bg-color: map-get($o-btn-bg-colors, $color) or $value;
+    $-border-color: map-get($o-btn-border-colors, $color) or $-bg-color;
+    .btn-outline-#{$color} {
+        @include button-outline-variant($-border-color);
+    }
+}
+$o-btn-outline-defaults: () !default;
+@each $color, $value in $theme-colors {
+    .btn-#{$color} {
+        @if index($o-btn-outline-defaults, $color) {
+            @extend .btn-outline-#{$color};
+        } @else {
+            @extend .btn-fill-#{$color};
+        }
+    }
+}
+
+// Compensate navbar brand padding if no visible border
+@if alpha($navbar-dark-toggler-border-color) < 0.001 {
+    .navbar-dark .navbar-toggler {
+        padding-left: 0;
+        padding-right: 0;
+    }
+}
+@if alpha($navbar-light-toggler-border-color) < 0.001 {
+    .navbar-light .navbar-toggler {
+        padding-left: 0;
+        padding-right: 0;
+    }
+}
+
+// Review bootstrap navbar to work with different nav styles
+$o-navbar-nav-pills-link-padding-x: $nav-link-padding-x !default;
+$o-navbar-nav-pills-link-border-radius: $nav-pills-border-radius !default;
+.navbar-nav.nav-pills .nav-link {
+    // The rules is needed so that the padding is not reset to 0 in mobile.
+    // Also use default nav-link paddings instead of navbar ones.
+    padding-right: $o-navbar-nav-pills-link-padding-x;
+    padding-left: $o-navbar-nav-pills-link-padding-x;
+
+    @if $o-navbar-nav-pills-link-border-radius != $nav-pills-border-radius {
+        @include border-radius($o-navbar-nav-pills-link-border-radius);
+    }
+}
+
+.carousel-control-next .visually-hidden {
+    left: 50%; // Avoid horizontal scrollbar in Chrome
+}
diff --git a/addons/web/static/src/scss/bs_mixins_overrides_backend.scss b/addons/web/static/src/scss/bs_mixins_overrides_backend.scss
index 793c3ebb7ee..9c36b006845 100644
--- a/addons/web/static/src/scss/bs_mixins_overrides_backend.scss
+++ b/addons/web/static/src/scss/bs_mixins_overrides_backend.scss
@@ -1,63 +1,33 @@
-//==============================================================================
+//=============================================================================
 // Bootstrap Mixins and Functions Extensions
 // Those will affect how bootstrap is generated in the backend only
-//==============================================================================
+//=============================================================================
 
 
-// Function used to retrive a text color prioritizing our finetuned ones.
-//------------------------------------------------------------------------------
+// Function used to retrieve a text color prioritizing our fine-tuned ones.
+// ----------------------------------------------------------------------------
 @function o-text-color($key) {
-  $-all-text-colors: map-merge($theme-colors, $o-theme-text-colors);
+    $-all-text-colors: map-merge($theme-colors, $o-theme-text-colors);
 
-  @if map-has-key($-all-text-colors, $key) {
-    @return map-get($-all-text-colors, $key);
-  }
+    @if map-has-key($-all-text-colors, $key) {
+        @return map-get($-all-text-colors, $key);
+    }
 
-  @return false;
+    @return false;
 }
 
-
-// Customize boostrap 'text-emphasis-variant' mixin allowing text colors other
+// Customize Bootstrap 'text-emphasis-variant' mixin allowing text colors other
 // than the '$theme-colors' ones.
 // It prioritizes the '$o-theme-text-colors' map and fallbacks to default.
-//------------------------------------------------------------------------------
-@mixin text-emphasis-variant($parent, $color) {
-  $-hover: $link-shade-percentage;
-
-  // Check for the color name in '$theme-colors'.
-  $color-name: null;
-  @each $-name, $-value in $theme-colors {
-    @if $-value == $color {
-      $color-name: $-name;
-    }
-  }
-
-  // Retrive the finetuned text color or fallback to default.
-  $color-value: o-text-color($color-name) or $color;
-
-  #{$parent} {
-    color: $color-value!important;
-  }
-
-  a#{$parent}, button#{$parent} {
-    &:hover, &:focus {
-      color: darken($color-value, $-hover) !important;
-    }
-  }
-
-  // Handle a very specific exception for the 'fa-circle' class when used in
-  // conjunction with contextual classes to achieve "status" graphical elements.
-  // Ideally any '.fa-circle.text-x'occurrency should be replaced with the
-  // 'o_status' component that uses background-color rather than text-color.
-  @if map-has-key($o-theme-text-colors, $color-name) {
-    #{$parent}.fa-circle {
-      color: $color!important;
+// ----------------------------------------------------------------------------
+@mixin text-emphasis-variant($-parent, $-color) {
+    #{$-parent} {
+        @include o-print-color($-color, color, text-opacity);
     }
 
-    a#{$parent}.fa-circle, button#{$parent}.fa-circle {
-      &:hover, &:focus {
-        color: darken($color, $-hover) !important;
-      }
+    a#{$-parent}, button#{$-parent} {
+        &:hover, &:focus, &:active, &.active {
+            @include o-print-color(darken($-color, $link-shade-percentage), color, text-opacity);
+        }
     }
-  }
 }
diff --git a/addons/web/static/src/scss/functions.scss b/addons/web/static/src/scss/functions.scss
new file mode 100644
index 00000000000..ca6fedddc21
--- /dev/null
+++ b/addons/web/static/src/scss/functions.scss
@@ -0,0 +1,51 @@
+///============================================================================
+/// Odoo SCSS Functions
+///
+/// Regroup functions that can be used at any stage of the compilation process.
+///============================================================================
+
+
+/// Remove the unit of a length
+/// ---------------------------------------------------------------------------
+/// @param {Number} $-value
+///     Number to remove unit from
+/// @return {$-value}
+///     Unitless number
+@function o-strip-unit($-value) {
+    @if type-of($-value) == 'number' and not unitless($-value) {
+        @return $-value / ($-value * 0 + 1);
+    }
+
+    @return $-value;
+}
+
+/// Converts px to rem.
+/// ---------------------------------------------------------------------------
+/// @param {number or px value} $-px-value
+///     The value to convert.
+/// @param {number or px value } $-base
+///     The base font-size
+/// @return {number}
+///    `$-px-value` converted in rem units
+@function o-to-rem($-px-value, $-base: 16) {
+    @return (o-strip-unit($-px-value) / o-strip-unit($-base)) * 1rem;
+}
+
+
+/// Mixins
+/// ===========================================================================
+
+/// Generate Bootstrap, BS-legacy and custom text/bg classes in a consistent
+/// way. It applies the desired color to a specified rule using CSS variables.
+/// ---------------------------------------------------------------------------
+/// @param {color} $-color
+///     Desidered color
+/// @param {string} $-rule
+///     CSS property to be affected
+/// @param {string} $-css-opacity-var
+///     CSS varible defining the opacity
+/// ---------------------------------------------------------------------------
+@mixin o-print-color($-color, $-rule, $-css-opacity-var) {
+    --#{$-rule}: RGBA(#{to-rgb($-color)}, var(--#{$-css-opacity-var}, 1));
+    #{$-rule}: var(--#{$-rule}) !important;
+}
diff --git a/addons/web/static/src/scss/primary_variables.scss b/addons/web/static/src/scss/primary_variables.scss
index afad06533a7..e3b91a71c83 100644
--- a/addons/web/static/src/scss/primary_variables.scss
+++ b/addons/web/static/src/scss/primary_variables.scss
@@ -7,9 +7,11 @@
 $o-webclient-color-scheme: bright !default;
 
 // Font sizes
-$o-root-font-size: 12px !default;
-$o-font-size-base: 13rem * (1px / $o-root-font-size) !default;
-$o-font-size-base-touch: 15px !default;
+$o-root-font-size: 1rem !default;
+$o-font-size-base: o-to-rem(14px) !default;
+$o-font-size-base-touch: o-to-rem(16px) !default;
+$o-font-size-base-small: o-to-rem(13px) !default;
+$o-font-size-base-smaller: o-to-rem(12px) !default;
 $o-line-height-base: 1.5 !default; // This is BS default
 
 // Global sans-serif fonts stack, defined here as we need to process
@@ -34,9 +36,21 @@ $o-gray-700: #495057 !default;
 $o-gray-800: #343a40 !default;
 $o-gray-900: #212529 !default;
 
+$o-grays: (
+    100: $o-gray-100,
+    200: $o-gray-200,
+    300: $o-gray-300,
+    400: $o-gray-400,
+    500: $o-gray-500,
+    600: $o-gray-600,
+    700: $o-gray-700,
+    800: $o-gray-800,
+    900: $o-gray-900,
+) !default;
+
 $o-community-color: #71639e !default;
 $o-enterprise-color: #714B67 !default;
-$o-enterprise-primary-color: #017e84 !default;
+$o-enterprise-action-color: #017e84 !default;
 
 $o-brand-odoo: $o-community-color !default;
 $o-brand-primary: $o-community-color !default;
@@ -44,28 +58,43 @@ $o-brand-primary: $o-community-color !default;
 $o-brand-secondary: #8f8f8f !default;
 $o-brand-lightsecondary: $o-gray-100 !default;
 
+$o-action: $o-brand-primary !default;
 $o-success: #28a745 !default;
 $o-info: #17a2b8 !default;
 $o-warning: #ffac00 !default;
 $o-danger: #dc3545 !default;
 
 // Fine-tune contextual text colors.
+// Overrides $theme-colors generated 'text-x' classes only.
+// Custom colors are set by $o-text-colors-custom
 $o-theme-text-colors: (
     "success": #008818,
     "info": #0180a5,
     "warning": #9a6b01,
     "danger": #d23f3a,
-    "odoo": $o-brand-odoo,
 )!default;
 
+// Opacities
 $o-opacity-disabled: .5 !default;
 $o-opacity-muted: .76 !default;
 
+$o-opacities: (
+    0: 0,
+    25: .25,
+    50: .5,
+    75: .75,
+    100: 1,
+    disabled: $o-opacity-disabled,
+    muted: $o-opacity-muted,
+) !default;
+
+// Font families
 $o-font-family-sans-serif: o-add-unicode-support-font($o-system-fonts) !default;
 $o-font-family-monospace: o-add-unicode-support-font((SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace)) !default;
 
 $o-headings-font-family: o-add-unicode-support-font(("SF Pro Display", $o-system-fonts)) !default;
 
+// Font colors
 $o-main-text-color: $o-gray-700 !default;
 $o-main-bg-color: #f0eeee !default;
 $o-main-color-muted: rgba($o-main-text-color, $o-opacity-muted) !default;
@@ -74,20 +103,34 @@ $o-main-link-color: darken($o-brand-primary, 5%) !default;
 $o-main-favorite-color: #f3cc00 !default;
 $o-main-code-color: #d2317b !default;
 
+// Components colors
+$o-component-active-color:  $o-gray-900 !default;
+$o-component-active-bg: mix($o-action, $o-gray-100, 20%) !default;
+$o-component-active-border: $o-action !default;
+
 $o-view-background-color: white !default;
 $o-shadow-color: #303030 !default;
 
 $o-form-lightsecondary: #ccc !default;
 
-$o-list-footer-bg-color: #eee !default;
+$o-list-footer-bg-color: transparent !default;
 $o-list-footer-font-weight: bold !default;
 
-$o-tooltip-background-color: $o-view-background-color !default;
-$o-tooltip-color: $o-main-text-color !default;
-$o-tooltip-arrow-color: white !default;
-$o-tooltip-text-color: $o-main-text-color !default;
-$o-tooltip-title-text-color: $o-main-headings-color !default;
-$o-tooltip-title-background-color: $o-view-background-color !default;
+// Custom colors generation maps
+$o-text-colors-custom: (
+    "action": $o-action,
+    "favourite": $o-main-favorite-color,
+) !default;
+
+$o-bg-colors-custom: (
+    "action": $o-action,
+    "view": $o-view-background-color,
+    "favourite": $o-main-favorite-color,
+) !default;
+
+$o-btn-custom: (
+    "favourite": $o-main-favorite-color,
+) !default;
 
 // Components (BS)
 
@@ -100,6 +143,7 @@ $o-input-padding-y: 2px !default;
 $o-input-padding-x: 4px !default;
 
 $o-input-border-required: $o-brand-primary !default;
+$o-input-hover-border-color: $o-gray-300 !default;
 
 // Layout
 //
@@ -117,9 +161,10 @@ $o-extra-grid-breakpoints: (
     xl: 1200px,
     xxl: 1534px,
 ) !default;
+$o-spacer: 16px !default; // = 1rem
 $o-form-group-cols: 12 !default;
 $o-form-spacing-unit: 5px !default;
-$o-horizontal-padding: 16px !default;
+$o-horizontal-padding: $o-spacer !default;
 $o-innergroup-rpadding: 45px !default;
 $o-dropdown-hpadding: 20px !default;
 $o-dropdown-vpadding: 3px !default;
@@ -138,8 +183,6 @@ $o-modal-md: 650px !default;
 // Different required cancel paddings between web and web_enterprise
 $o-sheet-cancel-tpadding: 0px !default;
 
-$o-avatar-size: 90px !default;
-
 $o-statusbar-height: 33px !default;
 
 $o-label-font-size-factor: 0.8 !default;
@@ -154,7 +197,7 @@ $o-list-group-active-bg: lighten(saturate(adjust-hue($o-info, 15), 1.8), 50) !de
 // == Badges
 
 // Define a minimum width. This value is arbitrary and strictly font-related.
-$o-badge-min-width: 2.5ch !default;
+$o-badge-min-width: 3ch !default;
 
 $o-nb-calendar-colors: 24 !default;
 
@@ -171,18 +214,59 @@ $o-card-body-bg-opacity: 0.9 !default;
 
 // Border-radius
 
-$o-border-radius: .25rem !default;
-$o-border-radius-lg: .6rem !default;
-$o-border-radius-sm: .2rem !default;
+$o-border-radius: o-to-rem(4px) !default;
+$o-border-radius-sm: o-to-rem(3px) !default;
+$o-border-radius-lg: o-to-rem(6px) !default;
 
 // touch
 $o-touch-btn-padding: 7px 14px !default;
 
-// Buttons
-$o-btn-secondary-bg: $o-white !default;
-$o-btn-secondary-hover-bg: $o-gray-100 !default;
-$o-btn-secondary-hover-border: $o-gray-200 !default;
+// == Buttons
+// Map of customized values for each button. If a button's design is defined
+// here, the relative values will take priority over default BS ones.
+// Notice: each map's entry is passed directly to the Bootstrap mixin, meaning
+// that all states must be defined, there can't be omissions.
+$o-btns-bs-override: () !default;
+$o-btns-bs-override: map-merge((
+    "primary": (
+        background: $o-brand-primary,
+        border: $o-brand-primary,
+        color: $o-white,
 
-$o-btn-light-bg: $o-white !default;
-$o-btn-light-border: $o-btn-light-bg !default;
-$o-btn-light-background-hover: $o-gray-100 !default;
+        hover-background: darken($o-brand-primary, 10%),
+        hover-border: darken($o-brand-primary, 20%),
+        hover-color: $o-white,
+
+        active-background: darken($o-brand-primary, 20%),
+        active-border: darken($o-brand-primary, 20%),
+        active-color: $o-white,
+    ),
+    "secondary": (
+        background: $o-gray-300,
+        border: $o-gray-300,
+        color: $o-gray-800,
+
+        hover-background: $o-gray-400,
+        hover-border: $o-gray-400,
+        hover-color: $o-gray-900,
+
+        active-background: $o-component-active-bg,
+        active-border:  $o-component-active-border,
+        active-color: $o-component-active-color,
+    ),
+    "light": (
+        background: $o-white,
+        border: $o-white,
+        color: $o-gray-700,
+
+        hover-background: $o-gray-100,
+        hover-border: $o-gray-100,
+        hover-color: $o-gray-900,
+
+        active-background: $o-component-active-bg,
+        active-border:  $o-component-active-border,
+        active-color: $o-component-active-color,
+    ),
+), $o-btns-bs-override);
+
+$o-btns-bs-outline-override: () !default;
diff --git a/addons/web/static/src/scss/secondary_variables.scss b/addons/web/static/src/scss/secondary_variables.scss
index 04309feb61d..7a083dbe025 100644
--- a/addons/web/static/src/scss/secondary_variables.scss
+++ b/addons/web/static/src/scss/secondary_variables.scss
@@ -5,8 +5,8 @@ $o-list-group-header-color: lighten($o-brand-lightsecondary, 10%) !default;
 
 // UI custom colors for tags, kanban records' colors, ...)
 // Note: the first value is the old BS3 gray-light value
-$o-colors: lighten(#000, 46.7%), #F06050, #F4A460, #F7CD1F, #6CC1ED, #814968,
-              #EB7E7F, #2C8397, #475577, #D6145F, #30C381, #9365B8 !default;
+$o-colors: #a2a2a2, #ee2d2d, #dc8534, #e8bb1d, #5794dd, #9f628f, #db8865,
+           #41a9a2, #304be0, #ee2f8a, #61c36e, #9872e6 !default;
 
 $o-colors-secondary: #aa4b6b, #30C381, #97743a, #F7CD1F, #4285F4, #8E24AA,
                      #D6145F, #173e43, #348F50, #AA3A38, #795548, #5e0231,
@@ -26,7 +26,6 @@ $o-colors-complete: join(
 $o-sheet-cancel-hpadding: $o-horizontal-padding !default;
 $o-sheet-cancel-bpadding: $o-horizontal-padding !default;
 
-$o-statusbar-arrow-width: $o-statusbar-height / 3 !default;
 $o-statusbar-disabled-bg: lighten($o-brand-lightsecondary, 7%) !default;
 
 $o-datepicker-week-bg-color: lighten($o-datepicker-week-color, 30%) !default;
diff --git a/addons/web/static/src/scss/utilities_custom.scss b/addons/web/static/src/scss/utilities_custom.scss
index 44c17479ed3..6028e3cdecf 100644
--- a/addons/web/static/src/scss/utilities_custom.scss
+++ b/addons/web/static/src/scss/utilities_custom.scss
@@ -15,17 +15,7 @@ $rounded-sizes: map-merge(
 );
 
 $utilities-opacity: () !default;
-$utilities-opacity: map-merge(
-    $utilities-opacity,
-    (
-        0: 0,
-        25: .25,
-        50: .5,
-        75: .75,
-        100: 1,
-        disabled: $o-opacity-disabled,
-    )
-);
+$utilities-opacity: map-merge($utilities-opacity, $o-opacities);
 
 $utilities-sizes: () !default;
 $utilities-sizes: map-merge(
@@ -74,17 +64,6 @@ $utilities: map-merge(
                 values: $utilities-opacity,
             ),
         ),
-        "background-color": map-merge(
-            map-get($utilities, "background-color"),
-            (
-                values: map-merge(
-                    map-get(map-get($utilities, "background-color"), "values"),
-                    (
-                        "view": $o-view-background-color,
-                    )
-                )
-            )
-        ),
         "border-color":  map-merge(
             map-get($utilities, "border-color"),
             (
@@ -206,31 +185,6 @@ $utilities: map-merge(
     )
 );
 
-// Restore text-X from BS4 that use text-emphasis-variant
-// we don't merge $utilities-text-colors into $utilities
-// to avoid same utilises classes generated twice.
-// See bootstrap_review.scss
-$utilities: map-merge(
-    $utilities,
-    (
-        "color": (
-            property: color,
-            class: text,
-            local-vars: (
-                "text-opacity": 1
-            ),
-            values: (
-                "body": $body-color,
-                "black": $black,
-                "white": $white,
-                "muted": $text-muted,
-                "black-50": rgba($black, .5), // deprecated
-                "white-50": rgba($white, .5), // deprecated
-                "reset": inherit,
-            ),
-        ),
-    )
-);
 
 // Define opacity:hover classes while defining the triggerer behavior.
 // Use'.opacity-trigger-hover' class to allow hovered parents to
@@ -242,3 +196,13 @@ $utilities: map-merge(
         }
     }
 }
+
+// Hide empty elements
+.d-empty-none:empty {
+    display: none !important;
+}
+
+// Define a smaller font-size
+.smaller {
+    font-size: $o-font-size-base-smaller;
+}
diff --git a/addons/web/static/src/scss/utilities_custom_backend.scss b/addons/web/static/src/scss/utilities_custom_backend.scss
new file mode 100644
index 00000000000..1f8df33b04c
--- /dev/null
+++ b/addons/web/static/src/scss/utilities_custom_backend.scss
@@ -0,0 +1,28 @@
+///
+/// Backend Custom Utility Classes
+/// ==============================================================================
+
+$utilities: map-merge(
+    $utilities,
+    (
+        // Limit 'text-X' classes generation.
+        // See bootstrap_review_backend.scss
+        "color": (
+            property: color,
+            class: text,
+            local-vars: (
+                "text-opacity": 1
+            ),
+            values: (
+                "body": $body-color,
+                "muted": $text-muted,
+                "reset": inherit,
+            ),
+        ),
+
+        // Disable 'bg-X' classes generation.
+        // See bootstrap_review_backend.scss
+        "background-color": null
+    )
+);
+
diff --git a/addons/web/static/src/search/action_menus/action_menus.xml b/addons/web/static/src/search/action_menus/action_menus.xml
index 16c26803c0c..141c0ea4a1c 100644
--- a/addons/web/static/src/search/action_menus/action_menus.xml
+++ b/addons/web/static/src/search/action_menus/action_menus.xml
@@ -2,8 +2,8 @@
 <templates xml:space="preserve">
 
     <t t-name="web.ActionMenus" owl="1">
-        <div class="o_cp_action_menus pe-2">
-            <Dropdown t-if="printItems.length" class="'d-inline-block'" togglerClass="'btn btn-light'" hotkey="'shift+u'">
+        <div class="o_cp_action_menus d-flex pe-2 gap-1">
+            <Dropdown t-if="printItems.length" class="'d-inline-block'" togglerClass="'btn btn-secondary'" hotkey="'shift+u'">
                 <t t-set-slot="toggler">
                     <i class="me-md-1 fa fa-print"/>
                     <span class="o_dropdown_title">Print</span>
@@ -15,7 +15,7 @@
                 </t>
             </Dropdown>
 
-            <Dropdown t-if="actionItems.length" class="'d-inline-block'" togglerClass="'btn btn-light'" hotkey="'u'">
+            <Dropdown t-if="actionItems.length" class="'d-inline-block'" togglerClass="'btn btn-secondary'" hotkey="'u'">
                 <t t-set-slot="toggler">
                     <i class="me-md-1 fa fa-cog"/>
                     <span class="o_dropdown_title">Action</span>
diff --git a/addons/web/static/src/search/cog_menu/action_menus_items.js b/addons/web/static/src/search/cog_menu/action_menus_items.js
new file mode 100644
index 00000000000..1dc0406c531
--- /dev/null
+++ b/addons/web/static/src/search/cog_menu/action_menus_items.js
@@ -0,0 +1,20 @@
+/** @odoo-module **/
+
+import { ActionMenus } from "@web/search/action_menus/action_menus";
+
+
+/**
+ * Combined Action menus (or Action/Print bar, previously called 'Sidebar')
+ *
+ * This is a variation of the ActionMenus, combined into a single DropDown.
+ *
+ * The side bar is the group of dropdown menus located on the left side of the
+ * control panel. Its role is to display a list of items depending on the view
+ * type and selected records and to execute a set of actions on active records.
+ * It is made out of 2 dropdown: Print and Action.
+ *
+ * @extends Component
+ */
+export class ActionMenusItems extends ActionMenus {
+    static template = "web.ActionMenusItems";
+}
diff --git a/addons/web/static/src/search/cog_menu/action_menus_items.xml b/addons/web/static/src/search/cog_menu/action_menus_items.xml
new file mode 100644
index 00000000000..b38bada3f18
--- /dev/null
+++ b/addons/web/static/src/search/cog_menu/action_menus_items.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+
+    <t t-name="web.ActionMenusItems" owl="1">
+        <t t-if="printItems.length">
+            <div class="dropdown-menu_group dropdown-header">
+                <i class="me-md-1 fa fa-print"/>
+                Print
+            </div>
+            <t t-foreach="printItems" t-as="item" t-key="item.key">
+                <DropdownItem class="'o_menu_item'" onSelected="() => this.onItemSelected(item)">
+                    <t t-esc="item.description"/>
+                </DropdownItem>
+            </t>
+        </t>
+        <t t-if="actionItems.length">
+            <div class="dropdown-menu_group dropdown-header">
+                <i class="me-md-1 fa fa-cog"/>
+                Action
+            </div>
+            <t t-foreach="actionItems" t-as="item" t-key="item.key">
+                <t t-if="item.Component" t-component="item.Component" t-props="item.props" />
+                <DropdownItem t-else="" class="'o_menu_item'" onSelected="() => this.onItemSelected(item)">
+                    <t t-esc="item.description"/>
+                </DropdownItem>
+            </t>
+        </t>
+    </t>
+
+</templates>
diff --git a/addons/web/static/src/search/cog_menu/cog_menu.js b/addons/web/static/src/search/cog_menu/cog_menu.js
new file mode 100644
index 00000000000..282604bb688
--- /dev/null
+++ b/addons/web/static/src/search/cog_menu/cog_menu.js
@@ -0,0 +1,48 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+import { Dropdown } from "@web/core/dropdown/dropdown";
+
+import { Component } from "@odoo/owl";
+
+const cogMenuRegistry = registry.category("cogMenu");
+
+/**
+ * Combined Action menus (or Action/Print bar, previously called 'Sidebar')
+ *
+ * This is a variation of the ActionMenus, combined into a single DropDown.
+ *
+ * The side bar is the group of dropdown menus located on the left side of the
+ * control panel. Its role is to display a list of items depending on the view
+ * type and selected records and to execute a set of actions on active records.
+ * It is made out of 2 dropdown: Print and Action.
+ *
+ * @extends Component
+ */
+export class CogMenu extends Component {
+    static template = "web.CogMenu";
+    static components = {
+        Dropdown,
+    };
+    static props = {
+        slots: { type: Object, optional: true },
+    };
+
+    get hasItems() {
+        return this.cogItems.length || !!this.props.slots?.default;
+    }
+
+    get cogItems() {
+        const registryMenus = [];
+        for (const item of cogMenuRegistry.getAll()) {
+            if ("isDisplayed" in item ? item.isDisplayed(this.env) : true) {
+                registryMenus.push({
+                    Component: item.Component,
+                    groupNumber: item.groupNumber,
+                    key: item.Component.name,
+                });
+            }
+        }
+        return registryMenus;
+    }
+}
diff --git a/addons/web/static/src/search/cog_menu/cog_menu.xml b/addons/web/static/src/search/cog_menu/cog_menu.xml
new file mode 100644
index 00000000000..6fa1fff0a94
--- /dev/null
+++ b/addons/web/static/src/search/cog_menu/cog_menu.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+
+    <t t-name="web.CogMenu" owl="1">
+        <div t-if="hasItems" class="o_cp_action_menus d-flex align-items-center pe-2 gap-1">
+            <Dropdown class="'lh-1'" togglerClass="'d-print-none btn p-0 ms-1 lh-sm border-0'" menuClass="'lh-base'">
+                <t t-set-slot="toggler">
+                    <i class="fa fa-cog"/>
+                </t>
+                <t t-foreach="cogItems" t-as="item" t-key="item.id or item.key">
+                    <t t-if="currentGroup !== null and currentGroup !== item.groupNumber">
+                        <div role="separator" class="dropdown-divider"/>
+                    </t>
+                    <t t-component="item.Component"/>
+                    <t t-set="currentGroup" t-value="item.groupNumber"/>
+                </t>
+                <t t-slot="default"/>
+            </Dropdown>
+        </div>
+    </t>
+
+</templates>
diff --git a/addons/web/static/src/search/comparison_menu/comparison_menu.js b/addons/web/static/src/search/comparison_menu/comparison_menu.js
deleted file mode 100644
index 71924ece06a..00000000000
--- a/addons/web/static/src/search/comparison_menu/comparison_menu.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/** @odoo-module **/
-
-import { Dropdown } from "@web/core/dropdown/dropdown";
-import { SearchDropdownItem } from "@web/search/search_dropdown_item/search_dropdown_item";
-import { FACET_ICONS } from "../utils/misc";
-import { useBus } from "@web/core/utils/hooks";
-
-import { Component } from "@odoo/owl";
-
-export class ComparisonMenu extends Component {
-    setup() {
-        this.icon = FACET_ICONS.comparison;
-
-        useBus(this.env.searchModel, "update", this.render);
-    }
-
-    /**
-     * @returns {Object[]}
-     */
-    get items() {
-        return this.env.searchModel.getSearchItems(
-            (searchItem) => searchItem.type === "comparison"
-        );
-    }
-
-    /**
-     * @param {number} itemId
-     */
-    onComparisonSelected(itemId) {
-        this.env.searchModel.toggleSearchItem(itemId);
-    }
-}
-ComparisonMenu.template = "web.ComparisonMenu";
-ComparisonMenu.components = { Dropdown, SearchDropdownItem };
diff --git a/addons/web/static/src/search/comparison_menu/comparison_menu.xml b/addons/web/static/src/search/comparison_menu/comparison_menu.xml
deleted file mode 100644
index 7ab987a806e..00000000000
--- a/addons/web/static/src/search/comparison_menu/comparison_menu.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates xml:space="preserve">
-
-    <t t-name="web.ComparisonMenu" owl="1">
-        <Dropdown class="'o_comparison_menu btn-group'" togglerClass="'btn btn-light'">
-            <t t-set-slot="toggler">
-                <i class="me-1" t-att-class="icon"/>
-                <span class="o_dropdown_title">Comparison</span>
-            </t>
-            <t t-foreach="items" t-as="item" t-key="item.id">
-                <SearchDropdownItem class="{ o_menu_item: true, selected: item.isActive }"
-                    checked="item.isActive"
-                    parentClosingMode="'none'"
-                    t-esc="item.description"
-                    onSelected="() => this.onComparisonSelected(item.id)"
-                />
-            </t>
-        </Dropdown>
-    </t>
-
-</templates>
diff --git a/addons/web/static/src/search/control_panel/control_panel.js b/addons/web/static/src/search/control_panel/control_panel.js
index f6f47b29911..6b3aef48a31 100644
--- a/addons/web/static/src/search/control_panel/control_panel.js
+++ b/addons/web/static/src/search/control_panel/control_panel.js
@@ -4,48 +4,19 @@ import { browser } from "@web/core/browser/browser";
 import { getActiveHotkey } from "@web/core/hotkeys/hotkey_service";
 import { Pager } from "@web/core/pager/pager";
 import { useService } from "@web/core/utils/hooks";
-import { ComparisonMenu } from "../comparison_menu/comparison_menu";
-import { FavoriteMenu } from "../favorite_menu/favorite_menu";
-import { FilterMenu } from "../filter_menu/filter_menu";
-import { GroupByMenu } from "../group_by_menu/group_by_menu";
 import { SearchBar } from "../search_bar/search_bar";
 import { Dropdown } from "@web/core/dropdown/dropdown";
 import { useCommand } from "@web/core/commands/command_hook";
 import { sprintf } from "@web/core/utils/strings";
-import { Dialog } from "@web/core/dialog/dialog";
+import { DropdownItem } from "@web/core/dropdown/dropdown_item";
 
-import {
-    Component,
-    useState,
-    onMounted,
-    useExternalListener,
-    useRef,
-    useEffect,
-    useSubEnv,
-} from "@odoo/owl";
-
-const MAPPING = {
-    filter: FilterMenu,
-    groupBy: GroupByMenu,
-    comparison: ComparisonMenu,
-    favorite: FavoriteMenu,
-};
+import { Component, useState, onMounted, useExternalListener, useRef, useEffect } from "@odoo/owl";
 
 const STICKY_CLASS = "o_mobile_sticky";
 
-export class ControlPanelSearchDialog extends Component {
-    setup() {
-        useSubEnv(this.props.env);
-    }
-}
-ControlPanelSearchDialog.template = "web.ControlPanelSearchDialog";
-ControlPanelSearchDialog.props = ["close", "slots?", "display", "env", "searchMenus"];
-ControlPanelSearchDialog.components = { Dialog, SearchBar };
-
 export class ControlPanel extends Component {
     setup() {
         this.actionService = useService("action");
-        this.dialog = useService("dialog");
         this.pagerProps = this.env.config.pagerProps
             ? useState(this.env.config.pagerProps)
             : undefined;
@@ -55,6 +26,7 @@ export class ControlPanel extends Component {
 
         this.state = useState({
             showSearchBar: false,
+            showMobileSearch: false,
             showViewSwitcher: false,
         });
 
@@ -98,6 +70,32 @@ export class ControlPanel extends Component {
             this.lastScrollTop = 0;
             this.initialScrollTop = this.getScrollingElement().scrollTop;
         });
+
+        this.mainButtons = useRef("mainButtons");
+
+        useEffect(() => {
+            // on small screen, clean-up the dropdown elements
+            const dropdownButtons = this.mainButtons.el.querySelectorAll(
+                ".o_control_panel_collapsed_create.dropdown-menu button"
+            );
+            if (!dropdownButtons.length) {
+                this.mainButtons.el
+                    .querySelectorAll(
+                        ".o_control_panel_collapsed_create.dropdown-menu, .o_control_panel_collapsed_create.dropdown-toggle"
+                    )
+                    .forEach((el) => el.classList.add("d-none"));
+                this.mainButtons.el
+                    .querySelectorAll(".o_control_panel_collapsed_create.btn-group")
+                    .forEach((el) => el.classList.remove("btn-group"));
+                return;
+            }
+            for (const button of dropdownButtons) {
+                for (const cl of Array.from(button.classList)) {
+                    button.classList.toggle(cl, !cl.startsWith("btn-"));
+                }
+                button.classList.add("dropdown-item", "btn", "btn-link");
+            }
+        });
     }
 
     getScrollingElement() {
@@ -110,6 +108,7 @@ export class ControlPanel extends Component {
     resetSearchState() {
         Object.assign(this.state, {
             showSearchBar: false,
+            showMobileSearch: false,
             showViewSwitcher: false,
         });
     }
@@ -118,49 +117,10 @@ export class ControlPanel extends Component {
      * @returns {Object}
      */
     get display() {
-        const display = Object.assign(
-            {
-                "top-left": true,
-                "top-right": true,
-                "bottom-left": true,
-                "bottom-left-buttons": true,
-                "bottom-right": true,
-            },
-            this.props.display
-        );
-        display.top = display["top-left"] || display["top-right"];
-        display.bottom = display["bottom-left"] || display["bottom-right"];
-        return display;
-    }
-
-    /**
-     * @returns {Component[]}
-     */
-    get searchMenus() {
-        const searchMenus = [];
-        for (const key of this.env.searchModel.searchMenuTypes) {
-            // look in display instead?
-            if (
-                key === "comparison" &&
-                this.env.searchModel.getSearchItems((i) => i.type === "comparison").length === 0
-            ) {
-                continue;
-            }
-            searchMenus.push({ Component: MAPPING[key], key });
-        }
-        return searchMenus;
-    }
-
-    openSearchDialog() {
-        this.dialog.add(ControlPanelSearchDialog, {
-            slots: this.props.slots,
-            display: this.display,
-            searchMenus: this.searchMenus,
-            env: {
-                searchModel: this.env.searchModel,
-                config: this.env.config,
-            },
-        });
+        return {
+            layoutActions: true,
+            ...this.props.display,
+        };
     }
 
     /**
@@ -234,7 +194,7 @@ export class ControlPanel extends Component {
     /**
      * @param {KeyboardEvent} ev
      */
-    onBottomLeftKeydown(ev) {
+    onMainButtonsKeydown(ev) {
         const hotkey = getActiveHotkey(ev);
         if (hotkey === "arrowdown") {
             this.env.searchModel.trigger("focus-view");
@@ -245,10 +205,10 @@ export class ControlPanel extends Component {
 }
 
 ControlPanel.components = {
-    ...Object.values(MAPPING),
     Pager,
     SearchBar,
     Dropdown,
+    DropdownItem,
 };
 ControlPanel.template = "web.ControlPanel";
 ControlPanel.props = {
diff --git a/addons/web/static/src/search/control_panel/control_panel.scss b/addons/web/static/src/search/control_panel/control_panel.scss
index 1b474fe66b9..9cd30f4d331 100644
--- a/addons/web/static/src/search/control_panel/control_panel.scss
+++ b/addons/web/static/src/search/control_panel/control_panel.scss
@@ -1,211 +1,31 @@
 .o_control_panel {
-    border-bottom: 1px solid $border-color;
-    @include o-webclient-padding($top: map-get($spacers, 2), $bottom: map-get($spacers, 2));
+    border-bottom: var(--ControlPanel-border-bottom, #{$o-control-panel-border-bottom});
     background-color: $o-control-panel-background-color;
 
-    > div {
-        display: flex;
-        min-height: $o-statusbar-height;
-    }
-
-    @include media-breakpoint-up(md) {
-        .o_cp_top_left, .o_cp_top_right,
-        .o_cp_bottom_left, .o_cp_bottom_right {
-            width: 50%;
-        }
+    .o_control_panel_breadcrumbs {
+        min-width: 200px;
     }
 
     @include media-breakpoint-down(md) {
-        > div.o_cp_bottom {
-            justify-content: space-between;
-            min-height: auto;
-        }
-
         &.o_mobile_sticky {
             @include o-position-sticky();
             z-index: 10;
         }
+    }
 
-        .o_cp_action_menus {
-            .o_dropdown_title {
-                @include visually-hidden;
-            }
-
-            .o_dropdown_chevron, .o_dropdown_caret {
-                display: none;
-            }
+    @include media-breakpoint-up(lg) {
+        .o_control_panel_breadcrumbs, .o_control_panel_navigation {
+            flex: 1
         }
 
-        .o_cp_searchview {
-            min-height: 35px;
-
-            &.o_searchview_quick {
-                display: flex;
-                align-items: flex-start;
-                width: 100%;
-
-                > .o_searchview {
-                    display: flex;
-                    flex: 1 1 auto;
-                    align-items: center;
-                    border-bottom: 1px solid $o-brand-secondary;
-
-                    > .o_searchview_input_container {
-                        flex: 1 1 auto;
-                    }
-                    > .o_enable_searchview {
-                        margin: 0;
-                        padding-left: 0;
-                        &, &:hover {
-                            color: $gray-600;
-                        }
-                    }
-                }
-            }
-        }
-
-        .o_cp_switch_buttons {
-            &.show > .dropdown-menu {
-                display: inline-flex;
-                min-width: 0px;
-            }
+        .o_control_panel_actions {
+            min-width: MIN(500px, 33%);
         }
     }
 
-    .breadcrumb {
-        font-size: 18px;
-        min-width: 0;
-
-        > li {
-            @include o-text-overflow();
-        }
-
-        @include media-breakpoint-down(md) {
-            width: 100%;
-            overflow: hidden;
-            flex-wrap: nowrap;
-
-            > li {
-                margin: 0;
-
-                &:before {
-                    display: none;
-                }
-
-                &.o_back_button {
-                    flex-shrink: 0;
-                    &, & ~ li {
-                        margin: auto 0;
-                    }
-
-                    &:before {
-                        font-family: FontAwesome;
-                        content: ""; // fa-arrow-left
-                        display: inline-block;
-
-                        padding: 0; // override bootstrap
-                        color: inherit;
-                    }
-
-                    &.btn {
-                        padding: $o-cp-button-sm-no-border-padding;
-                    }
-
-                    > a {
-                        display: none;
-                    }
-                }
-            }
-        }
-    }
-
-    .o_cp_top_right {
-        min-height: $o-cp-breadcrumb-height;
-    }
-
-    .o_cp_bottom_left {
-        display: flex;
-        flex-wrap: wrap;
-        gap: map-get($spacers, 3) map-get($spacers, 2);
-
-        > .o_cp_action_menus {
-            margin-left: auto;
-            padding-right: 0;
-
-            @include media-breakpoint-up(md) {
-                padding-right: 10px;
-            }
-
-            @include media-breakpoint-up(sm) {
-                display: flex;
-                padding-right: 25px;
-
-                > .btn-group {
-                    margin: auto 0;
-                    display: block;
-                }
-
-                .dropdown-toggle {
-                    margin-right: 0;
-                }
-            }
-
-            .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: $o-brand-primary;
-                }
-                .o_form_binary_form:hover {
-                    background-color: $table-hover-bg;
-                }
-            }
-            .o_sidebar_delete_attachment {
-                padding: 0px;
-                position: absolute;
-                top: 5px;
-                right: 10px;
-            }
-            .dropdown-toggle {
-                margin-right: 0;
-
-                @include media-breakpoint-up(md) {
-                    margin-right: 15px;
-                }
-            }
-        }
-    }
-
-    .o_cp_bottom_right {
-        display: flex;
-        flex-wrap: wrap;
-
-        @include media-breakpoint-up(md) {
-            column-gap: $o-horizontal-padding;
-        }
-
-        > .o_form_status_indicator {
-            @include media-breakpoint-down(md) {
-                .o_form_status_indicator_buttons > .btn {
-                    padding: $o-cp-button-sm-no-border-padding;
-                }
-            }
-        }
-
-        > .o_cp_pager {
-            padding-left: 5px;
-            text-align: center;
-            user-select: none;
-            .o_pager_limit_fetch:not(.disabled), .o_pager_value {
-                cursor: pointer;
-            }
+    @include media-breakpoint-up(xl) {
+        .o_control_panel_actions {
+            min-width: MIN(600px, 33%);
         }
     }
 }
@@ -217,7 +37,6 @@
     .o_cp_buttons {
         display: flex;
         margin-right: auto;
-        margin-left: $o-kanban-record-margin;
     }
     .o_cp_pager {
         display: flex;
diff --git a/addons/web/static/src/search/control_panel/control_panel.variables.scss b/addons/web/static/src/search/control_panel/control_panel.variables.scss
index 2ab3d1c8d9c..a5e50207b6b 100644
--- a/addons/web/static/src/search/control_panel/control_panel.variables.scss
+++ b/addons/web/static/src/search/control_panel/control_panel.variables.scss
@@ -1,2 +1,2 @@
 $o-control-panel-background-color: $o-view-background-color !default;
-
+$o-control-panel-border-bottom: 1px solid $o-gray-300 !default;
\ No newline at end of file
diff --git a/addons/web/static/src/search/control_panel/control_panel.xml b/addons/web/static/src/search/control_panel/control_panel.xml
index 32a168153cb..4ba3c7fcd9f 100644
--- a/addons/web/static/src/search/control_panel/control_panel.xml
+++ b/addons/web/static/src/search/control_panel/control_panel.xml
@@ -2,206 +2,139 @@
 <templates xml:space="preserve">
 
     <t t-name="web.ControlPanel" owl="1">
-        <div class="o_control_panel" t-ref="root">
-            <t t-if="env.isSmall">
-                <t t-call="web.ControlPanel.Small" />
-            </t>
-            <t t-else="">
-                <t t-call="web.ControlPanel.Regular" />
-            </t>
-        </div>
-    </t>
-
-    <t t-name="web.ControlPanel.Regular" owl="1">
-        <div t-if="display['top']" class="o_cp_top">
-            <div class="o_cp_top_left">
-                <t t-slot="control-panel-top-left" t-if="display['top-left']">
-                    <t t-call="web.Breadcrumbs" t-if="!env.config.noBreadcrumbs"/>
-                </t>
-            </div>
-            <div class="o_cp_top_right">
-                <t t-slot="control-panel-top-right" t-if="display['top-right']">
-                    <SearchBar/>
-                </t>
-            </div>
-        </div>
-        <div t-if="display['bottom']" class="o_cp_bottom">
-            <div class="o_cp_bottom_left" t-on-keydown="onBottomLeftKeydown">
-                <t t-slot="control-panel-bottom-left-buttons" t-if="display['bottom-left'] and display['bottom-left-buttons']" />
-                <t t-slot="control-panel-bottom-left" t-if="display['bottom-left']"/>
-            </div>
-            <div t-if="display['bottom-right']" class="o_cp_bottom_right">
-                <t t-slot="control-panel-bottom-right">
-                    <div class="btn-group o_search_options position-static" role="search">
-                        <t t-foreach="searchMenus" t-as="menu" t-key="menu.key">
-                            <t t-component="menu.Component"/>
-                        </t>
+        <div class="o_control_panel d-flex flex-column gap-3 gap-lg-1 px-3 pt-2 pb-3" t-ref="root">
+            <div class="o_control_panel_main d-flex flex-wrap flex-lg-nowrap justify-content-between align-items-lg-start gap-3 flex-grow-1">
+                <div class="o_control_panel_breadcrumbs d-flex align-items-center gap-1 order-0 h-lg-100">
+                    <div class="o_control_panel_main_buttons d-flex gap-1 d-empty-none d-print-none" t-ref="mainButtons" t-on-keydown="onMainButtonsKeydown">
+                        <div class="btn-group d-xl-none o_control_panel_collapsed_create">
+                            <t t-slot="control-panel-create-button"/>
+                            <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split o_control_panel_collapsed_create" data-bs-toggle="dropdown" aria-expanded="false">
+                                 <span class="visually-hidden">Toggle Dropdown</span>
+                            </button>
+                            <ul class="dropdown-menu o_control_panel_collapsed_create">
+                                <t t-slot="layout-buttons"/>
+                                <t t-slot="control-panel-always-buttons"/>
+                            </ul>
+                        </div>
+                        <div class="d-none d-xl-inline-flex gap-1">
+                            <t t-slot="control-panel-create-button"/>
+                            <t t-slot="layout-buttons"/>
+                            <t t-slot="control-panel-always-buttons"/>
+                        </div>
                     </div>
-                </t>
-
-                <div t-if="pagerProps and pagerProps.total > 0" class="o_cp_pager" role="search">
-                    <Pager t-props="pagerProps"/>
-                </div>
-
-                <t t-if="env.config.viewSwitcherEntries and env.config.viewSwitcherEntries.length > 1">
-                    <nav class="btn-group o_cp_switch_buttons ms-auto">
-                        <t t-foreach="env.config.viewSwitcherEntries" t-as="view" t-key="view.type">
-                            <button class="btn btn-light o_switch_view "
-                                t-attf-class="o_{{view.type}} {{view.icon}} {{view.active ? 'active' : ''}}"
-                                t-att-data-tooltip="view.name"
-                                t-on-click="() => this.onViewClicked(view.type)"
-                                />
-                        </t>
-                    </nav>
-                </t>
-            </div>
-        </div>
-    </t>
-
-    <t t-name="web.ControlPanel.Small" owl="1">
-        <div t-if="display['top']" class="o_cp_top">
-            <t t-if="display['top-left'] and !state.showSearchBar">
-                <t t-slot="control-panel-top-left">
-                    <t t-call="web.Breadcrumbs.Small" />
-                </t>
-            </t>
-            <t t-if="display['top-right']">
-                <button type="button" class="o_enable_searchview btn btn-link"
-                    t-att-class="state.showSearchBar ? 'fa fa-arrow-left' : 'oi oi-search'"
-                    t-on-click="() => state.showSearchBar = !state.showSearchBar"
-                />
-                <t t-if="state.showSearchBar or !display['top-left']">
-                    <t t-slot="control-panel-top-right">
-                        <SearchBar />
-                        <button
-                            type="button"
-                            class="o_toggle_searchview_full btn fa fa-filter"
-                            t-on-click="() => this.openSearchDialog()"
-                        />
+                    <t t-if="env.config.noBreadcrumbs">
+                        <section class="o_control_panel_breadcrumbs_actions d-contents">
+                            <t t-slot="control-panel-additional-actions"/>
+                            <t t-slot="control-panel-status-indicator" />
+                        </section>
                     </t>
-                </t>
-            </t>
-        </div>
-        <div t-if="display['bottom']" class="o_cp_bottom">
-            <div t-if="display['bottom-left']" class="o_cp_bottom_left">
-                <t t-slot="control-panel-bottom-left-buttons" t-if="display['bottom-left-buttons']"/>
-                <t t-slot="control-panel-bottom-left"/>
-            </div>
-            <div t-if="display['bottom-right']" class="o_cp_bottom_right">
-                <div t-if="pagerProps and pagerProps.total > 0" class="o_cp_pager" role="search">
-                    <Pager t-props="pagerProps"/>
+                    <t t-else="">
+                        <t t-slot="control-panel-breadcrumb">
+                            <t t-call="web.Breadcrumbs"/>
+                        </t>
+                    </t>
+                    <span class="d-none d-xl-block me-auto"/> <!-- Spacer -->
                 </div>
 
-                <t t-if="env.config.viewSwitcherEntries and env.config.viewSwitcherEntries.length > 1">
-                    <nav class="btn-group o_cp_switch_buttons">
-                        <t t-set="view" t-value="env.config.viewSwitcherEntries.find((v) => v.active)" />
+                <div class="o_control_panel_actions d-empty-none d-flex align-items-center justify-content-start order-2 order-lg-1 w-100 w-lg-auto">
+                    <t t-if="display.layoutActions" t-slot="layout-actions"/>
+                    <t t-slot="control-panel-selection-actions"/>
+                </div>
 
-                        <Dropdown
-                            position="'bottom-end'"
-                            menuClass="'d-inline-flex'"
-                            togglerClass="'btn btn-link'"
-                        >
+                <div class="o_control_panel_navigation d-flex flex-wrap flex-md-nowrap align-items-center justify-content-end gap-3 gap-lg-1 gap-xl-3 order-1 order-lg-2 flex-grow-1">
+                    <div t-if="pagerProps and pagerProps.total > 0" class="o_cp_pager text-nowrap " role="search">
+                        <Pager t-props="pagerProps"/>
+                    </div>
+                    <t t-if="env.config.viewSwitcherEntries?.length > 1">
+                        <Dropdown class="'o_cp_switch_buttons d-xl-none btn-group'" togglerClass="'btn btn-secondary'" showCaret="true">
                             <t t-set-slot="toggler">
-                                <i
-                                    class="fa-lg o_switch_view"
-                                    t-attf-class="o_{{view.type}} {{view.icon}} {{view.active ? 'active' : ''}}"
-                                />
+                                <t t-set="activeView" t-value="env.config.viewSwitcherEntries.find((view) => view.active)"/>
+                                <i class="oi-fw" t-att-class="activeView.icon"/>
                             </t>
                             <t t-foreach="env.config.viewSwitcherEntries" t-as="view" t-key="view.type">
-                                <button class="btn btn-light fa-lg o_switch_view"
+                                <DropdownItem onSelected="() => this.onViewClicked(view.type)" class="view.active ? 'selected' : ''">
+                                    <i class="oi-fw" t-att-class="view.icon"/>
+                                    <span class="ms-1" t-out="view.name"/>
+                                </DropdownItem>
+                            </t>
+                        </Dropdown>
+                        <nav class="o_cp_switch_buttons d-print-none d-none d-xl-inline-flex btn-group">
+                            <t t-foreach="env.config.viewSwitcherEntries" t-as="view" t-key="view.type">
+                                <button class="btn btn-secondary o_switch_view "
                                     t-attf-class="o_{{view.type}} {{view.icon}} {{view.active ? 'active' : ''}}"
                                     t-att-data-tooltip="view.name"
                                     t-on-click="() => this.onViewClicked(view.type)"
-                                />
+                                    />
                             </t>
-                        </Dropdown>
-                    </nav>
-                </t>
-                <t t-slot="control-panel-bottom-right"/>
+                        </nav>
+                    </t>
+                    <t t-slot="control-panel-navigation-additional"/>
+                </div>
             </div>
         </div>
     </t>
 
-    <t t-name="web.ControlPanelSearchDialog" owl="1">
-        <Dialog>
-            <div class="o_searchview o_mobile_search">
-                <div class="o_mobile_search_header">
-                    <button
-                        type="button"
-                        class="o_mobile_search_button btn"
-                        t-on-click="() => this.props.close()"
-                    >
-                        <i class="fa fa-arrow-left"/>
-                        <strong class="ms-2">FILTER</strong>
-                    </button>
-                    <button
-                        type="button"
-                        class="o_mobile_search_button btn"
-                        t-on-click="() => env.searchModel.clearQuery()"
-                    >
-                        CLEAR
-                    </button>
-                </div>
-                <div class="o_mobile_search_content">
-                    <t t-if="props.display['top-right']">
-                        <t t-slot="control-panel-top-right">
-                            <SearchBar/>
-                        </t>
-                    </t>
-                    <t t-if="props.display['bottom-right']">
-                        <t t-slot="control-panel-bottom-right">
-                            <div class="o_mobile_search_filter o_search_options">
-                                <t t-foreach="props.searchMenus" t-as="menu" t-key="menu.key">
-                                    <t t-component="menu.Component"/>
-                                </t>
-                            </div>
-                        </t>
-                    </t>
-                </div>
-                <button
-                    type="button"
-                    class="btn btn-primary o_mobile_search_footer"
-                    t-on-click="() => this.props.close()"
-                >
-                    SEE RESULT
-                </button>
-            </div>
-        </Dialog>
-    </t>
-
     <t t-name="web.Breadcrumbs" owl="1">
-        <ol class="breadcrumb">
-            <t t-foreach="breadcrumbs" t-as="breadcrumb" t-key="breadcrumb.jsId">
-                <t t-set="isPenultimate" t-value="breadcrumb_index === breadcrumbs.length - 2"/>
-                <li t-if="!breadcrumb_last" class="breadcrumb-item" t-att-data-hotkey="isPenultimate and 'b'" t-att-class="{ o_back_button: isPenultimate}" t-on-click.prevent="() => this.onBreadcrumbClicked(breadcrumb.jsId)">
-                    <a href="#">
-                        <t t-if="breadcrumb.name" t-esc="breadcrumb.name"/>
-                        <em t-else="" class="text-warning">Unnamed</em>
-                    </a>
-                </li>
-                <li t-else="" class="breadcrumb-item active d-flex align-items-center">
-                    <span class="text-truncate" t-if="breadcrumb.name" t-esc="breadcrumb.name"/>
-                    <em t-else="" class="text-warning">Unnamed</em>
-                    <t t-slot="control-panel-status-indicator" />
-                </li>
+        <t t-set="currentBreadcrumbs" t-value="breadcrumbs.slice(-1)"/>
+        <t t-set="visiblePathBreadcrumbs" t-value="breadcrumbs.slice(-3, -1)"/>
+        <t t-set="collapsedBreadcrumbs" t-value="breadcrumbs.slice(0, -3).reverse()"/>
+        <t t-set="breadcrumb" t-value="currentBreadcrumbs[0] || {}"/>
+
+        <div t-if="collapsedBreadcrumbs.length || visiblePathBreadcrumbs.length" class="o_breadcrumb d-flex flex-row flex-md-column align-self-stretch justify-content-between min-w-0">
+            <t t-if="env.isSmall">
+                <t t-set="previousBreadcrumb" t-value="visiblePathBreadcrumbs.slice(-1)"/>
+                <button class="o_back_button btn btn-link px-1" t-on-click.prevent="() => this.onBreadcrumbClicked(previousBreadcrumb.jsId)">
+                    <i class="oi oi-fw oi-arrow-left"/>
+                </button>
             </t>
-        </ol>
+            <t t-else="">
+                <ol class="breadcrumb flex-nowrap text-nowrap small lh-1">
+                    <li t-if="collapsedBreadcrumbs.length" class="breadcrumb-item d-inline-flex min-w-0">
+                        <Dropdown togglerClass="'btn btn-light btn-sm p-0'">
+                            <t t-set-slot="toggler">
+                                <i class="fa fa-ellipsis-h"/>
+                            </t>
+                            <t t-foreach="collapsedBreadcrumbs" t-as="breadcrumb" t-key="breadcrumb.jsId">
+                                <DropdownItem onSelected="() => this.onBreadcrumbClicked(breadcrumb.jsId)">
+                                    <t t-call="web.Breadcrumb.Name"/>
+                                </DropdownItem>
+                            </t>
+                        </Dropdown>
+                    </li>
+                    <t t-foreach="visiblePathBreadcrumbs" t-as="breadcrumb" t-key="breadcrumb.jsId">
+                        <li class="breadcrumb-item d-inline-flex min-w-0" t-att-class="{ o_back_button: breadcrumb_last }" t-att-data-hotkey="breadcrumb_last and 'b'" t-on-click.prevent="() => this.onBreadcrumbClicked(breadcrumb.jsId)">
+                            <a href="#" class="fw-bold text-truncate" t-att-data-tooltip="'Back to &quot;' + breadcrumb.name + '&quot;'"><t t-call="web.Breadcrumb.Name"/></a>
+                        </li>
+                    </t>
+                </ol>
+            </t>
+            <div class="d-flex gap-1">
+                <div class="o_last_breadcrumb_item active d-flex gap-2 align-items-center min-w-0 lh-sm">
+                    <span class="min-w-0 text-truncate" t-call="web.Breadcrumb.Name"/>
+                </div>
+                <t t-call="web.Breadcrumb.Actions"/>
+            </div>
+        </div>
+
+        <div t-else="" class="o_breadcrumb d-flex gap-1">
+            <div class="o_last_breadcrumb_item active d-flex fs-4 min-w-0 align-items-center">
+                <span class="min-w-0 text-truncate" t-call="web.Breadcrumb.Name"/>
+            </div>
+            <t t-call="web.Breadcrumb.Actions"/>
+        </div>
+
+        <t t-slot="control-panel-status-indicator" />
     </t>
 
-    <t t-name="web.Breadcrumbs.Small" owl="1">
-        <ol class="breadcrumb">
-            <t t-if="breadcrumbs.length > 1">
-                <t t-set="breadcrumb" t-value="breadcrumbs[breadcrumbs.length - 2]" />
-                <li class="breadcrumb-item o_back_button btn btn-secondary"
-                    t-on-click.prevent="() => this.onBreadcrumbClicked(breadcrumb.jsId)"
-                />
-            </t>
-            <li t-if="breadcrumbs.length > 0" class="breadcrumb-item active">
-                <t t-set="breadcrumb" t-value="breadcrumbs[breadcrumbs.length - 1]" />
-                <t t-if="breadcrumb.name" t-esc="breadcrumb.name"/>
-                <em t-else="" class="text-warning">Unnamed</em>
-            </li>
-        </ol>
+    <t t-name="web.Breadcrumb.Actions" owl="1">
+        <div class="o_control_panel_breadcrumbs_actions d-inline-flex">
+            <t t-slot="control-panel-additional-actions"/>
+        </div>
+    </t>
+
+    <t t-name="web.Breadcrumb.Name" owl="1">
+        <t t-if="breadcrumb.name" t-out="breadcrumb.name"/>
+        <em t-else="" class="text-warning">Unnamed</em>
     </t>
 
 </templates>
diff --git a/addons/web/static/src/search/favorite_menu/custom_favorite_item.js b/addons/web/static/src/search/custom_favorite_item/custom_favorite_item.js
similarity index 100%
rename from addons/web/static/src/search/favorite_menu/custom_favorite_item.js
rename to addons/web/static/src/search/custom_favorite_item/custom_favorite_item.js
diff --git a/addons/web/static/src/search/favorite_menu/custom_favorite_item.xml b/addons/web/static/src/search/custom_favorite_item/custom_favorite_item.xml
similarity index 100%
rename from addons/web/static/src/search/favorite_menu/custom_favorite_item.xml
rename to addons/web/static/src/search/custom_favorite_item/custom_favorite_item.xml
diff --git a/addons/web/static/src/search/group_by_menu/custom_group_by_item.js b/addons/web/static/src/search/custom_group_by_item/custom_group_by_item.js
similarity index 100%
rename from addons/web/static/src/search/group_by_menu/custom_group_by_item.js
rename to addons/web/static/src/search/custom_group_by_item/custom_group_by_item.js
diff --git a/addons/web/static/src/search/group_by_menu/custom_group_by_item.xml b/addons/web/static/src/search/custom_group_by_item/custom_group_by_item.xml
similarity index 100%
rename from addons/web/static/src/search/group_by_menu/custom_group_by_item.xml
rename to addons/web/static/src/search/custom_group_by_item/custom_group_by_item.xml
diff --git a/addons/web/static/src/search/favorite_menu/favorite_menu.js b/addons/web/static/src/search/favorite_menu/favorite_menu.js
deleted file mode 100644
index f5e667887da..00000000000
--- a/addons/web/static/src/search/favorite_menu/favorite_menu.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/** @odoo-module **/
-
-import { Dropdown } from "@web/core/dropdown/dropdown";
-import { SearchDropdownItem } from "@web/search/search_dropdown_item/search_dropdown_item";
-import { ConfirmationDialog } from "@web/core/confirmation_dialog/confirmation_dialog";
-import { FACET_ICONS } from "../utils/misc";
-import { registry } from "@web/core/registry";
-import { useBus, useService } from "@web/core/utils/hooks";
-
-import { Component } from "@odoo/owl";
-const favoriteMenuRegistry = registry.category("favoriteMenu");
-
-export class FavoriteMenu extends Component {
-    setup() {
-        this.icon = FACET_ICONS.favorite;
-        this.dialogService = useService("dialog");
-
-        useBus(this.env.searchModel, "update", this.render);
-    }
-
-    /**
-     * @returns {Array}
-     */
-    get items() {
-        const favorites = this.env.searchModel.getSearchItems(
-            (searchItem) => searchItem.type === "favorite"
-        );
-        const registryMenus = [];
-        for (const item of favoriteMenuRegistry.getAll()) {
-            if ("isDisplayed" in item ? item.isDisplayed(this.env) : true) {
-                registryMenus.push({
-                    Component: item.Component,
-                    groupNumber: item.groupNumber,
-                    key: item.Component.name,
-                });
-            }
-        }
-        return [...favorites, ...registryMenus];
-    }
-
-    /**
-     * @param {number} itemId
-     */
-    onFavoriteSelected(itemId) {
-        this.env.searchModel.toggleSearchItem(itemId);
-    }
-
-    /**
-     * @param {number} itemId
-     */
-    openConfirmationDialog(itemId) {
-        const { userId } = this.items.find((item) => item.id === itemId);
-        const dialogProps = {
-            title: this.env._t("Warning"),
-            body: userId
-                ? this.env._t("Are you sure that you want to remove this filter?")
-                : this.env._t(
-                      "This filter is global and will be removed for everybody if you continue."
-                  ),
-            confirm: () => this.env.searchModel.deleteFavorite(itemId),
-            cancel: () => {},
-        };
-        this.dialogService.add(ConfirmationDialog, dialogProps);
-    }
-}
-FavoriteMenu.template = "web.FavoriteMenu";
-FavoriteMenu.components = { Dropdown, SearchDropdownItem };
-FavoriteMenu.props = {};
diff --git a/addons/web/static/src/search/favorite_menu/favorite_menu.xml b/addons/web/static/src/search/favorite_menu/favorite_menu.xml
deleted file mode 100644
index ff15b986a16..00000000000
--- a/addons/web/static/src/search/favorite_menu/favorite_menu.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates xml:space="preserve">
-
-    <t t-name="web.FavoriteMenu" owl="1">
-        <Dropdown class="'o_favorite_menu btn-group'" togglerClass="'btn btn-light'">
-            <t t-set-slot="toggler">
-                <i class="me-1" t-att-class="icon"/>
-                <span class="o_dropdown_title">Favorites</span>
-            </t>
-            <t t-set="currentGroup" t-value="null"/>
-            <t t-foreach="this.items" t-as="item" t-key="item.id or item.key">
-                <t t-if="currentGroup !== null and currentGroup !== item.groupNumber">
-                    <div role="separator" class="dropdown-divider"/>
-                </t>
-                <t t-if="item.type ==='favorite'">
-                    <SearchDropdownItem class="{ o_menu_item: true, selected: item.isActive }"
-                        checked="item.isActive"
-                        parentClosingMode="'none'"
-                        onSelected="() => this.onFavoriteSelected(item.id)"
-                        >
-                        <span class="d-flex p-0 align-items-center justify-content-between">
-                            <t t-esc="item.description"/>
-                            <i class="ms-1 o_icon_right fa fa-trash-o"
-                                title="Delete item"
-                                t-on-click.stop="() => this.openConfirmationDialog(item.id)"
-                            />
-                        </span>
-                    </SearchDropdownItem>
-                </t>
-                <t t-else="">
-                    <t t-component="item.Component" t-props="item.props"/>
-                </t>
-                <t t-set="currentGroup" t-value="item.groupNumber"/>
-            </t>
-        </Dropdown>
-    </t>
-
-</templates>
diff --git a/addons/web/static/src/search/filter_menu/filter_menu.js b/addons/web/static/src/search/filter_menu/filter_menu.js
deleted file mode 100644
index 103bdb77d69..00000000000
--- a/addons/web/static/src/search/filter_menu/filter_menu.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/** @odoo-module **/
-
-import { Component } from "@odoo/owl";
-import { DomainSelectorDialog } from "../../core/domain_selector_dialog/domain_selector_dialog";
-import { Dropdown } from "@web/core/dropdown/dropdown";
-import { DropdownItem } from "@web/core/dropdown/dropdown_item";
-import { SearchDropdownItem } from "@web/search/search_dropdown_item/search_dropdown_item";
-import { FACET_ICONS } from "../utils/misc";
-import { useBus, useService } from "@web/core/utils/hooks";
-import { useGetDefaultLeafDomain } from "@web/core/domain_selector/utils";
-import { _t } from "@web/core/l10n/translation";
-
-export class FilterMenu extends Component {
-    setup() {
-        this.icon = FACET_ICONS.filter;
-        this.dialogService = useService("dialog");
-        this.getDefaultLeafDomain = useGetDefaultLeafDomain();
-        useBus(this.env.searchModel, "update", this.render);
-    }
-
-    /**
-     * @returns {Object[]}
-     */
-    get items() {
-        return this.env.searchModel.getSearchItems((searchItem) =>
-            ["filter", "dateFilter"].includes(searchItem.type)
-        );
-    }
-
-    async onAddCustomFilterClick() {
-        const { domainEvalContext: context, resModel } = this.env.searchModel;
-        const domain = await this.getDefaultLeafDomain(resModel);
-        this.dialogService.add(DomainSelectorDialog, {
-            resModel,
-            defaultConnector: "|",
-            domain,
-            context,
-            onConfirm: (domain) => this.env.searchModel.splitAndAddDomain(domain),
-            disableConfirmButton: (domain) => domain === `[]`,
-            title: _t("Add Custom Filter"),
-            confirmButtonText: _t("Add"),
-            discardButtonText: _t("Cancel"),
-            isDebugMode: !!this.env.debug,
-        });
-    }
-
-    /**
-     * @param {Object} param0
-     * @param {number} param0.itemId
-     * @param {number} [param0.optionId]
-     */
-    onFilterSelected({ itemId, optionId }) {
-        if (optionId) {
-            this.env.searchModel.toggleDateFilter(itemId, optionId);
-        } else {
-            this.env.searchModel.toggleSearchItem(itemId);
-        }
-    }
-}
-
-FilterMenu.components = { Dropdown, DropdownItem, SearchDropdownItem };
-FilterMenu.template = "web.FilterMenu";
-FilterMenu.props = {
-    class: { type: String, optional: true },
-};
diff --git a/addons/web/static/src/search/filter_menu/filter_menu.xml b/addons/web/static/src/search/filter_menu/filter_menu.xml
deleted file mode 100644
index fa925693e08..00000000000
--- a/addons/web/static/src/search/filter_menu/filter_menu.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates xml:space="preserve">
-
-    <t t-name="web.FilterMenu" owl="1">
-        <Dropdown class="'o_filter_menu btn-group ' + props.class" togglerClass="'btn btn-light'">
-            <t t-set-slot="toggler">
-                <i class="me-1" t-att-class="icon"/>
-                <span class="o_dropdown_title">Filters</span>
-            </t>
-            <t t-set="currentGroup" t-value="null"/>
-            <t t-foreach="items" t-as="item" t-key="item.id">
-                <t t-if="currentGroup !== null and currentGroup !== item.groupNumber">
-                    <div class="dropdown-divider" role="separator"/>
-                </t>
-                <t t-if="item.options">
-                    <Dropdown togglerClass="'o_menu_item' + (item.isActive ? ' selected' : '')">
-                        <t t-set-slot="toggler">
-                            <t t-esc="item.description"/>
-                        </t>
-                        <t t-set="subGroup" t-value="null"/>
-                        <t t-foreach="item.options" t-as="option" t-key="option.id">
-                            <t t-if="subGroup !== null and subGroup !== option.groupNumber">
-                                <div class="dropdown-divider" role="separator"/>
-                            </t>
-                            <SearchDropdownItem class="{ o_item_option: true, selected: option.isActive }"
-                                t-esc="option.description"
-                                checked="option.isActive"
-                                parentClosingMode="'none'"
-                                onSelected="() => this.onFilterSelected({ itemId: item.id, optionId: option.id })"
-                            />
-                            <t t-set="subGroup" t-value="option.groupNumber"/>
-                        </t>
-                    </Dropdown>
-                </t>
-                <t t-else="">
-                    <SearchDropdownItem class="{ o_menu_item: true, selected: item.isActive }"
-                        checked="item.isActive"
-                        parentClosingMode="'none'"
-                        t-esc="item.description"
-                        onSelected="() => this.onFilterSelected({ itemId: item.id })"
-                    />
-                </t>
-                <t t-set="currentGroup" t-value="item.groupNumber"/>
-            </t>
-            <t t-if="items.length">
-                <div role="separator" class="dropdown-divider"/>
-            </t>
-            <DropdownItem onSelected.bind="onAddCustomFilterClick">Add Custom Filter</DropdownItem>
-        </Dropdown>
-    </t>
-
-</templates>
diff --git a/addons/web/static/src/search/group_by_menu/group_by_menu.js b/addons/web/static/src/search/group_by_menu/group_by_menu.js
deleted file mode 100644
index 18d82420368..00000000000
--- a/addons/web/static/src/search/group_by_menu/group_by_menu.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/** @odoo-module **/
-
-import { Dropdown } from "@web/core/dropdown/dropdown";
-import { SearchDropdownItem } from "@web/search/search_dropdown_item/search_dropdown_item";
-import { CustomGroupByItem } from "./custom_group_by_item";
-import { FACET_ICONS, GROUPABLE_TYPES } from "../utils/misc";
-import { sortBy } from "@web/core/utils/arrays";
-import { useBus } from "@web/core/utils/hooks";
-
-import { Component } from "@odoo/owl";
-
-export class GroupByMenu extends Component {
-    setup() {
-        this.icon = FACET_ICONS.groupBy;
-        this.dropdownProps = Object.keys(this.props)
-            .filter((key) => key in Dropdown.props)
-            .reduce((obj, key) => ({ ...obj, [key]: this.props[key] }), {});
-        const fields = [];
-        for (const [fieldName, field] of Object.entries(this.env.searchModel.searchViewFields)) {
-            if (this.validateField(fieldName, field)) {
-                fields.push(Object.assign({ name: fieldName }, field));
-            }
-        }
-        this.fields = sortBy(fields, "string");
-
-        useBus(this.env.searchModel, "update", this.render);
-    }
-
-    /**
-     * @returns {boolean}
-     */
-    get hideCustomGroupBy() {
-        return this.env.searchModel.hideCustomGroupBy || false;
-    }
-
-    /**
-     * @returns {Object[]}
-     */
-    get items() {
-        return this.env.searchModel.getSearchItems((searchItem) =>
-            ["groupBy", "dateGroupBy"].includes(searchItem.type)
-        );
-    }
-
-    /**
-     * @param {string} fieldName
-     * @param {Object} field
-     * @returns {boolean}
-     */
-    validateField(fieldName, field) {
-        const { sortable, store, type } = field;
-        return (
-            (type === "many2many" ? store : sortable) &&
-            fieldName !== "id" &&
-            GROUPABLE_TYPES.includes(type)
-        );
-    }
-
-    /**
-     * @param {Object} param0
-     * @param {number} param0.itemId
-     * @param {number} [param0.optionId]
-     */
-    onGroupBySelected({ itemId, optionId }) {
-        if (optionId) {
-            this.env.searchModel.toggleDateGroupBy(itemId, optionId);
-        } else {
-            this.env.searchModel.toggleSearchItem(itemId);
-        }
-    }
-
-    /**
-     * @param {string} fieldName
-     */
-    onAddCustomGroup(fieldName) {
-        this.env.searchModel.createNewGroupBy(fieldName);
-    }
-}
-
-GroupByMenu.components = { CustomGroupByItem, Dropdown, SearchDropdownItem };
-GroupByMenu.template = "web.GroupByMenu";
-GroupByMenu.defaultProps = {
-    showCaretDown: false,
-};
-GroupByMenu.props = {
-    ...Dropdown.props,
-    showCaretDown: { type: Boolean, optional: true },
-};
diff --git a/addons/web/static/src/search/layout.js b/addons/web/static/src/search/layout.js
index 53db5b820c1..4703959384e 100644
--- a/addons/web/static/src/search/layout.js
+++ b/addons/web/static/src/search/layout.js
@@ -26,8 +26,6 @@ export class Layout extends Component {
     }
     get controlPanelSlots() {
         const slots = { ...this.props.slots };
-        slots["control-panel-bottom-left-buttons"] = slots["layout-buttons"];
-        delete slots["layout-buttons"];
         delete slots.default;
         return slots;
     }
@@ -38,11 +36,7 @@ export class Layout extends Component {
         }
         return {
             ...this.props.display,
-            controlPanel: {
-                ...controlPanel,
-                "top-left": false,
-                "bottom-left-buttons": false,
-            },
+            controlPanel,
         };
     }
 }
diff --git a/addons/web/static/src/search/layout.xml b/addons/web/static/src/search/layout.xml
index 703cc31fa4e..0fb06748c83 100644
--- a/addons/web/static/src/search/layout.xml
+++ b/addons/web/static/src/search/layout.xml
@@ -7,7 +7,7 @@
         </t>
         <t t-component="components.ControlPanel" slots="controlPanelSlots" t-if="display.controlPanel" display="display.controlPanel"/>
         <t t-component="components.Banner" t-if="display.banner"/>
-        <div t-ref="content" class="o_content" t-attf-class="{{props.className}}" t-att-class="{ o_component_with_search_panel: display.searchPanel }">
+        <div t-ref="content" class="o_content" t-attf-class="{{props.className}}" t-att-class="{ 'o_component_with_search_panel bg-200': display.searchPanel }">
             <t t-component="components.SearchPanel" t-if="display.searchPanel"/>
             <t t-slot="default" contentRef="contentRef" />
         </div>
diff --git a/addons/web/static/src/search/search_bar/search_bar.js b/addons/web/static/src/search/search_bar/search_bar.js
index cfef3d9bb32..a2ed1ec39bf 100644
--- a/addons/web/static/src/search/search_bar/search_bar.js
+++ b/addons/web/static/src/search/search_bar/search_bar.js
@@ -8,6 +8,7 @@ import { useAutofocus, useBus, useService } from "@web/core/utils/hooks";
 import { DomainSelectorDialog } from "@web/core/domain_selector_dialog/domain_selector_dialog";
 import { fuzzyTest } from "@web/core/utils/search";
 import { _t } from "@web/core/l10n/translation";
+import { SearchBarMenu } from "../search_bar_menu/search_bar_menu";
 
 import { Component, useExternalListener, useRef, useState } from "@odoo/owl";
 const parsers = registry.category("parsers");
@@ -23,6 +24,7 @@ export class SearchBar extends Component {
         this.fields = this.env.searchModel.searchViewFields;
         this.searchItemsFields = this.env.searchModel.getSearchItems((f) => f.type === "field");
         this.root = useRef("root");
+        this.ui = useService("ui");
 
         // core state
         this.state = useState({
@@ -363,9 +365,9 @@ export class SearchBar extends Component {
     // Handlers
     //---------------------------------------------------------------------
 
-    onFacetClick(target, facet) {
+    onFacetLabelClick(target, facet) {
         const { domain, groupId } = facet;
-        if (!target.classList.contains("o_searchview_facet_label") || !domain) {
+        if (!domain) {
             return;
         }
         const { resModel } = this.env.searchModel;
@@ -543,6 +545,10 @@ export class SearchBar extends Component {
         }
     }
 
+    onToggleSearchBar() {
+        this.state.showSearchBar = !this.state.showSearchBar;
+    }
+
     /**
      * @param {MouseEvent} ev
      */
@@ -563,4 +569,7 @@ export class SearchBar extends Component {
 }
 
 SearchBar.template = "web.SearchBar";
+SearchBar.components = {
+    SearchBarMenu,
+};
 SearchBar.props = {};
diff --git a/addons/web/static/src/search/search_bar/search_bar.scss b/addons/web/static/src/search/search_bar/search_bar.scss
index b0004d41cea..9a7151d97da 100644
--- a/addons/web/static/src/search/search_bar/search_bar.scss
+++ b/addons/web/static/src/search/search_bar/search_bar.scss
@@ -2,16 +2,12 @@
 // ============================================================================
 
 .o_searchview_facet {
-    cursor: default;
-    .o_facet_values {
-        border: $border-width solid var(--SearchBar-facet-background, #{$o-brand-odoo});
+    @keyframes animate {
+        from {
+            opacity: .5;
+            transform: translateY(20%);
+        }
     }
-    .o_searchview_facet_label {
-        background: var(--SearchBar-facet-background, #{$o-brand-odoo});
-        color: var(--SearchBar-facet-color, #{$o-white});
-    }
-    &.o_facet_with_domain:hover .o_searchview_facet_label {
-        cursor: pointer;
-        background: var(--SearchBar-facet-background, $primary);
-    }
-}
+
+    animation: animate .25s ease-out;
+}
\ No newline at end of file
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 d1ddfe33ba1..5b271093783 100644
--- a/addons/web/static/src/search/search_bar/search_bar.xml
+++ b/addons/web/static/src/search/search_bar/search_bar.xml
@@ -3,41 +3,45 @@
 
     <t t-name="web.SearchBar.Facets" owl="1">
         <t t-foreach="env.searchModel.facets" t-as="facet" t-key="facet_index">
-            <div class="o_searchview_facet"
+            <div class="o_searchview_facet d-inline-flex align-items-stretch text-nowrap position-relative"
                 t-att-class="{o_facet_with_domain: facet.domain }"
-                role="img"
+                role="listitem"
                 aria-label="search"
                 tabindex="0"
                 t-on-keydown="ev => this.onFacetKeydown(facet, facet_index, ev)"
-                t-on-click="(ev) => this.onFacetClick(ev.target, facet)"
                 >
-                <t t-if="facet.icon">
-                    <span t-attf-class="o_searchview_facet_label {{ facet.icon }}"/>
-                </t>
-                <t t-else="">
-                    <span class="o_searchview_facet_label" t-esc="facet.title"/>
-                </t>
-                <div class="o_facet_values border-start-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"/>
-                        </t>
-                        <span class="o_facet_value" t-esc="facetValue"/>
-                    </t>
+                <div class="o_searchview_facet_label rounded-start-2"
+                    t-on-click="(ev) => this.onFacetLabelClick(ev.target, facet)"
+                    t-att-role="facet.type != 'groupBy' ? 'button' : 'img'"
+                    t-att-class="{
+                        'text-bg-action d-flex align-items-center': facet.type == 'groupBy',
+                        'btn btn-primary rounded-end-0 p-0': facet.type == 'field' || facet.type == 'filter',
+                        'btn btn-favourite rounded-end-0 p-0': facet.type == 'favorite'
+                    }"
+                    >
+                    <i t-if="facet.icon" class="px-1 small" t-att-class="facet.icon" role="image"/>
+                    <small t-else="" class="px-2" t-esc="facet.title"/>
+                </div>
+
+                <div class="o_facet_values d-flex align-items-center ps-2 bg-200 rounded-end-2">
+                    <t t-foreach="facet.values" t-as="facetValue" t-key="facetValue_index">
+                        <em t-if="!facetValue_first" class="o_facet_values_sep small fw-bold mx-1 opacity-50" t-esc="facet.separator"/>
+                        <small class="o_facet_value" t-esc="facetValue"/>
+                    </t>
+                    <button class="o_facet_remove oi oi-close btn btn-link py-0 px-2 opacity-50 opacity-100-hover text-900"
+                        role="button"
+                        aria-label="Remove"
+                        title="Remove"
+                        t-on-click="() => this.onFacetRemove(facet)"
+                    />
                 </div>
-                <i class="o_facet_remove oi oi-close btn btn-link opacity-50 opacity-100-hover text-900"
-                    role="img"
-                    aria-label="Remove"
-                    title="Remove"
-                    t-on-click="() => this.onFacetRemove(facet)"
-                />
             </div>
         </t>
     </t>
 
     <t t-name="web.SearchBar.Input" owl="1">
         <input type="text"
-            class="o_searchview_input"
+            class="o_searchview_input d-print-none flex-grow-1 w-auto border-0"
             accesskey="Q"
             placeholder="Search..."
             role="searchbox"
@@ -76,14 +80,14 @@
     </t>
 
     <t t-name="web.SearchBar" owl="1">
-        <div class="o_cp_searchview d-flex flex-grow-1" role="search" t-ref="root">
-            <div class="o_searchview pb-1 align-self-center border-bottom flex-grow-1" role="search" aria-autocomplete="list">
-                <i class="o_searchview_icon oi oi-search"
+        <div class="o_cp_searchview d-flex input-group" role="search" t-ref="root">
+            <div class="o_searchview form-control d-print-contents d-flex align-items-center py-1 border-end-0" role="search" aria-autocomplete="list">
+                <i class="o_searchview_icon d-print-none oi oi-search me-2"
                     role="img"
                     aria-label="Search..."
                     title="Search..."
                 />
-                <div class="o_searchview_input_container">
+                <div class="o_searchview_input_container d-flex flex-grow-1 flex-wrap gap-1">
                     <t t-call="web.SearchBar.Facets"/>
                     <t t-call="web.SearchBar.Input"/>
                     <t t-if="items.length">
@@ -91,6 +95,7 @@
                     </t>
                 </div>
             </div>
+            <SearchBarMenu/>
         </div>
     </t>
 
diff --git a/addons/web/static/src/search/search_bar/search_bar_toggler.js b/addons/web/static/src/search/search_bar/search_bar_toggler.js
new file mode 100644
index 00000000000..92629f8a34c
--- /dev/null
+++ b/addons/web/static/src/search/search_bar/search_bar_toggler.js
@@ -0,0 +1,55 @@
+/** @odoo-module **/
+
+import { Component, useEffect, useState } from "@odoo/owl";
+import { browser } from "@web/core/browser/browser";
+import { useService } from "@web/core/utils/hooks";
+import { useDebounced } from "@web/core/utils/timing";
+
+export class SearchBarToggler extends Component {}
+SearchBarToggler.template = "web.SearchBar.Toggler";
+SearchBarToggler.props = {
+    isSmall: Boolean,
+    showSearchBar: Boolean,
+    toggleSearchBar: Function,
+};
+
+export function useSearchBarToggler() {
+    const ui = useService("ui");
+
+    let isToggled = false;
+    const state = useState({
+        isSmall: ui.isSmall,
+        showSearchBar: false,
+    });
+    const updateState = () => {
+        state.isSmall = ui.isSmall;
+        state.showSearchBar = !ui.isSmall || isToggled;
+    };
+    updateState();
+
+    function toggleSearchBar() {
+        isToggled = !isToggled;
+        updateState();
+    }
+
+    const onResize = useDebounced(updateState, 200);
+    useEffect(
+        () => {
+            browser.addEventListener("resize", onResize);
+            return () => browser.removeEventListener("resize", onResize);
+        },
+        () => []
+    );
+
+    return {
+        state,
+        component: SearchBarToggler,
+        get props() {
+            return {
+                isSmall: state.isSmall,
+                showSearchBar: state.showSearchBar,
+                toggleSearchBar,
+            };
+        },
+    };
+}
diff --git a/addons/web/static/src/search/search_bar/search_bar_toggler.xml b/addons/web/static/src/search/search_bar/search_bar_toggler.xml
new file mode 100644
index 00000000000..4c43f9884e9
--- /dev/null
+++ b/addons/web/static/src/search/search_bar/search_bar_toggler.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+
+    <t t-name="web.SearchBar.Toggler" owl="1">
+        <button t-if="props.isSmall" t-attf-class="btn btn-secondary {{ props.showSearchBar ? 'active' : '' }}" t-on-click="props.toggleSearchBar">
+            <i class="fa fa-fw fa-search"/>
+        </button>
+    </t>
+
+</templates>
diff --git a/addons/web/static/src/search/search_bar_menu/search_bar_menu.js b/addons/web/static/src/search/search_bar_menu/search_bar_menu.js
new file mode 100644
index 00000000000..b1aade8e3f3
--- /dev/null
+++ b/addons/web/static/src/search/search_bar_menu/search_bar_menu.js
@@ -0,0 +1,201 @@
+/** @odoo-module **/
+
+import { Component } from "@odoo/owl";
+import { ConfirmationDialog } from "@web/core/confirmation_dialog/confirmation_dialog";
+import { DomainSelectorDialog } from "../../core/domain_selector_dialog/domain_selector_dialog";
+import { Dropdown } from "@web/core/dropdown/dropdown";
+import { DropdownItem } from "@web/core/dropdown/dropdown_item";
+import { registry } from "@web/core/registry";
+import { sortBy } from "@web/core/utils/arrays";
+import { useBus, useService } from "@web/core/utils/hooks";
+import { CustomGroupByItem } from "@web/search/custom_group_by_item/custom_group_by_item";
+import { SearchDropdownItem } from "@web/search/search_dropdown_item/search_dropdown_item";
+import { FACET_ICONS, GROUPABLE_TYPES } from "@web/search/utils/misc";
+import { useGetDefaultLeafDomain } from "@web/core/domain_selector/utils";
+import { _t } from "@web/core/l10n/translation";
+
+const favoriteMenuRegistry = registry.category("favoriteMenu");
+
+export class SearchBarMenu extends Component {
+    static template = "web.SearchBarMenu";
+    static components = {
+        Dropdown,
+        DropdownItem,
+        SearchDropdownItem,
+        CustomGroupByItem,
+    };
+    static props = {};
+
+    setup() {
+        this.facet_icons = FACET_ICONS;
+        // Filter
+        this.dialogService = useService("dialog");
+        this.getDefaultLeafDomain = useGetDefaultLeafDomain();
+        // GroupBy
+        const fields = [];
+        for (const [fieldName, field] of Object.entries(this.env.searchModel.searchViewFields)) {
+            if (this.validateField(fieldName, field)) {
+                fields.push(Object.assign({ name: fieldName }, field));
+            }
+        }
+        this.fields = sortBy(fields, "string");
+        // Favorite
+        this.dialogService = useService("dialog");
+
+        useBus(this.env.searchModel, "update", this.render);
+    }
+
+    // Filter Panel
+    get filterItems() {
+        return this.env.searchModel.getSearchItems((searchItem) =>
+            ["filter", "dateFilter"].includes(searchItem.type)
+        );
+    }
+
+    async onAddCustomFilterClick() {
+        const { domainEvalContext: context, resModel } = this.env.searchModel;
+        const domain = await this.getDefaultLeafDomain(resModel);
+        this.dialogService.add(DomainSelectorDialog, {
+            resModel,
+            defaultConnector: "|",
+            domain,
+            context,
+            onConfirm: (domain) => this.env.searchModel.splitAndAddDomain(domain),
+            disableConfirmButton: (domain) => domain === `[]`,
+            title: _t("Add Custom Filter"),
+            confirmButtonText: _t("Add"),
+            discardButtonText: _t("Cancel"),
+            isDebugMode: !!this.env.debug,
+        });
+    }
+
+    /**
+     * @param {Object} param0
+     * @param {number} param0.itemId
+     * @param {number} [param0.optionId]
+     */
+    onFilterSelected({ itemId, optionId }) {
+        if (optionId) {
+            this.env.searchModel.toggleDateFilter(itemId, optionId);
+        } else {
+            this.env.searchModel.toggleSearchItem(itemId);
+        }
+    }
+
+    // GroupBy Panel
+    /**
+     * @returns {boolean}
+     */
+    get hideCustomGroupBy() {
+        return this.env.searchModel.hideCustomGroupBy || false;
+    }
+
+    /**
+     * @returns {Object[]}
+     */
+    get groupByItems() {
+        return this.env.searchModel.getSearchItems((searchItem) =>
+            ["groupBy", "dateGroupBy"].includes(searchItem.type)
+        );
+    }
+
+    /**
+     * @param {string} fieldName
+     * @param {Object} field
+     * @returns {boolean}
+     */
+    validateField(fieldName, field) {
+        const { sortable, store, type } = field;
+        return (
+            (type === "many2many" ? store : sortable) &&
+            fieldName !== "id" &&
+            GROUPABLE_TYPES.includes(type)
+        );
+    }
+
+    /**
+     * @param {Object} param0
+     * @param {number} param0.itemId
+     * @param {number} [param0.optionId]
+     */
+    onGroupBySelected({ itemId, optionId }) {
+        if (optionId) {
+            this.env.searchModel.toggleDateGroupBy(itemId, optionId);
+        } else {
+            this.env.searchModel.toggleSearchItem(itemId);
+        }
+    }
+
+    /**
+     * @param {string} fieldName
+     */
+    onAddCustomGroup(fieldName) {
+        this.env.searchModel.createNewGroupBy(fieldName);
+    }
+
+    // Comparison Panel
+    get showComparisonMenu() {
+        return (
+            this.env.searchModel.searchMenuTypes.has("comparison") &&
+            this.env.searchModel.getSearchItems((i) => i.type === "comparison").length > 0
+        );
+    }
+    get comparisonItems() {
+        return this.env.searchModel.getSearchItems(
+            (searchItem) => searchItem.type === "comparison"
+        );
+    }
+
+    /**
+     * @param {number} itemId
+     */
+    onComparisonSelected(itemId) {
+        this.env.searchModel.toggleSearchItem(itemId);
+    }
+
+    // Favorite Panel
+    /**
+     * @returns {Array}
+     */
+    get favoriteItems() {
+        const favorites = this.env.searchModel.getSearchItems(
+            (searchItem) => searchItem.type === "favorite"
+        );
+        const registryMenus = [];
+        for (const item of favoriteMenuRegistry.getAll()) {
+            if ("isDisplayed" in item ? item.isDisplayed(this.env) : true) {
+                registryMenus.push({
+                    Component: item.Component,
+                    groupNumber: item.groupNumber,
+                    key: item.Component.name,
+                });
+            }
+        }
+        return [...favorites, ...registryMenus];
+    }
+
+    /**
+     * @param {number} itemId
+     */
+    onFavoriteSelected(itemId) {
+        this.env.searchModel.toggleSearchItem(itemId);
+    }
+
+    /**
+     * @param {number} itemId
+     */
+    openConfirmationDialog(itemId) {
+        const { userId } = this.favoriteItems.find((item) => item.id === itemId);
+        const dialogProps = {
+            title: this.env._t("Warning"),
+            body: userId
+                ? this.env._t("Are you sure that you want to remove this filter?")
+                : this.env._t(
+                      "This filter is global and will be removed for everybody if you continue."
+                  ),
+            confirm: () => this.env.searchModel.deleteFavorite(itemId),
+            cancel: () => {},
+        };
+        this.dialogService.add(ConfirmationDialog, dialogProps);
+    }
+}
diff --git a/addons/web/static/src/search/search_bar_menu/search_bar_menu.scss b/addons/web/static/src/search/search_bar_menu/search_bar_menu.scss
new file mode 100644
index 00000000000..a5d076f9ca5
--- /dev/null
+++ b/addons/web/static/src/search/search_bar_menu/search_bar_menu.scss
@@ -0,0 +1,7 @@
+// SearchBar Menu
+// ============================================================================
+.o_search_bar_menu {
+    .o_dropdown_container {
+        border-color: $dropdown-divider-bg !important;
+    }
+}
\ No newline at end of file
diff --git a/addons/web/static/src/search/search_bar_menu/search_bar_menu.xml b/addons/web/static/src/search/search_bar_menu/search_bar_menu.xml
new file mode 100644
index 00000000000..4e45b4085de
--- /dev/null
+++ b/addons/web/static/src/search/search_bar_menu/search_bar_menu.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+
+    <t t-name="web.SearchBarMenu" owl="1">
+        <Dropdown togglerClass="'o_searchview_dropdown_toggler d-print-none btn btn-outline-secondary o-no-caret rounded-start-0 h-100'"
+                  menuClass="'o_search_bar_menu d-flex flex-wrap flex-lg-nowrap mt-2 py-3'"
+                  position="'bottom-end'"
+                  t-if="this.env.searchModel.searchMenuTypes.size">
+            <t t-set-slot="toggler" t-slot-scope="scope">
+                <i class="fa fa-caret-down" aria-hidden="true" data-hotkey="shift+q"/>
+            </t>
+            <!-- Filter -->
+            <t t-if="this.env.searchModel.searchMenuTypes.has('filter')">
+                <div class="o_dropdown_container o_filter_menu w-100 w-lg-auto px-3 mb-4 mb-lg-0 border-end">
+                    <div class="px-3 fs-5 mb-2">
+                        <i class="me-2 text-primary" t-att-class="facet_icons.filter"/>
+                        <h5 class="o_dropdown_title d-inline">Filters</h5>
+                    </div>
+                    <t t-set="currentGroup" t-value="null"/>
+                    <t t-foreach="filterItems" t-as="item" t-key="item.id">
+                        <t t-if="currentGroup !== null and currentGroup !== item.groupNumber">
+                            <div class="dropdown-divider" role="separator"/>
+                        </t>
+                        <t t-if="item.options">
+                            <Dropdown togglerClass="'o_menu_item' + (item.isActive ? ' selected' : '')">
+                                <t t-set-slot="toggler">
+                                    <t t-esc="item.description"/>
+                                </t>
+                                <t t-set="subGroup" t-value="null"/>
+                                <t t-foreach="item.options" t-as="option" t-key="option.id">
+                                    <t t-if="subGroup !== null and subGroup !== option.groupNumber">
+                                        <div class="dropdown-divider" role="separator"/>
+                                    </t>
+                                    <SearchDropdownItem class="{ o_item_option: true, selected: option.isActive }"
+                                                        t-esc="option.description"
+                                                        checked="option.isActive"
+                                                        parentClosingMode="'none'"
+                                                        onSelected="() => this.onFilterSelected({ itemId: item.id, optionId: option.id })"
+                                    />
+                                    <t t-set="subGroup" t-value="option.groupNumber"/>
+                                </t>
+                            </Dropdown>
+                        </t>
+                        <t t-else="">
+                            <SearchDropdownItem class="{ o_menu_item: true, selected: item.isActive }"
+                                                checked="item.isActive"
+                                                parentClosingMode="'none'"
+                                                t-esc="item.description"
+                                                onSelected="() => this.onFilterSelected({ itemId: item.id })"
+                            />
+                        </t>
+                        <t t-set="currentGroup" t-value="item.groupNumber"/>
+                    </t>
+                    <t t-if="filterItems.length">
+                        <div role="separator" class="dropdown-divider"/>
+                    </t>
+                    <DropdownItem onSelected.bind="onAddCustomFilterClick">Add Custom Filter</DropdownItem>
+                </div>
+            </t>
+            <!-- GroupBy -->
+            <t t-if="this.env.searchModel.searchMenuTypes.has('groupBy')">
+                <div class="o_dropdown_container o_group_by_menu w-100 w-lg-auto px-3 mb-4 mb-lg-0 border-end">
+                    <div class="px-3 fs-5 mb-2">
+                        <i class="me-2 text-action" t-att-class="facet_icons.groupBy"/>
+                        <h5 class="o_dropdown_title d-inline">Group By</h5>
+                    </div>
+                    <t t-set="currentGroup" t-value="null"/>
+                    <t t-foreach="groupByItems" t-as="item" t-key="item.id">
+                        <t t-if="currentGroup !== null and currentGroup !== item.groupNumber">
+                            <div class="dropdown-divider" role="separator"/>
+                        </t>
+                        <t t-if="item.options">
+                            <Dropdown togglerClass="'o_menu_item' + (item.isActive ? ' selected' : '')">
+                                <t t-set-slot="toggler">
+                                    <t t-esc="item.description"/>
+                                </t>
+                                <t t-set="subGroup" t-value="null"/>
+                                <t t-foreach="item.options" t-as="option" t-key="option.id">
+                                    <t t-if="subGroup !== null and subGroup !== option.groupNumber">
+                                        <div class="dropdown-divider" role="separator"/>
+                                    </t>
+                                    <SearchDropdownItem class="{ o_item_option: true, selected: option.isActive }"
+                                                        checked="option.isActive ? true : false"
+                                                        parentClosingMode="'none'"
+                                                        t-esc="option.description"
+                                                        onSelected="() => this.onGroupBySelected({ itemId: item.id, optionId: option.id})"
+                                    />
+                                    <t t-set="subGroup" t-value="option.groupNumber"/>
+                                </t>
+                            </Dropdown>
+                        </t>
+                        <t t-else="">
+                            <SearchDropdownItem class="{ o_menu_item: true, selected: item.isActive }"
+                                                checked="item.isActive"
+                                                parentClosingMode="'none'"
+                                                t-esc="item.description"
+                                                onSelected="() => this.onGroupBySelected({ itemId: item.id })"
+                            />
+                        </t>
+                        <t t-set="currentGroup" t-value="item.groupNumber"/>
+                    </t>
+                    <t t-if="!hideCustomGroupBy and fields.length">
+                        <div t-if="groupByItems.length" role="separator" class="dropdown-divider"/>
+                        <CustomGroupByItem fields="fields" onAddCustomGroup.bind="onAddCustomGroup"/>
+                    </t>
+                </div>
+            </t>
+            <!-- Comparison -->
+            <t t-if="showComparisonMenu">
+                <div class="o_dropdown_container o_comparison_menu w-100 w-lg-auto px-3 border-end">
+                    <div class="px-3 fs-5 mb-2">
+                        <i class="me-2 text-danger" t-att-class="facet_icons.comparison"/>
+                        <h5 class="o_dropdown_title d-inline">Comparison</h5>
+                    </div>
+                    <t t-foreach="comparisonItems" t-as="item" t-key="item.id">
+                        <SearchDropdownItem class="{ o_menu_item: true, selected: item.isActive }"
+                                            checked="item.isActive"
+                                            parentClosingMode="'none'"
+                                            t-esc="item.description"
+                                            onSelected="() => this.onComparisonSelected(item.id)"
+                        />
+                    </t>
+                </div>
+            </t>
+            <!-- Favorite -->
+            <t t-if="this.env.searchModel.searchMenuTypes.has('favorite')">
+                <div class="o_dropdown_container o_favorite_menu w-100 w-lg-auto px-3">
+                    <div class="px-3 fs-5 mb-2">
+                        <i class="me-2 text-favourite" t-att-class="facet_icons.favorite"/>
+                        <h5 class="o_dropdown_title d-inline">Favorites</h5>
+                    </div>
+                    <t t-set="currentGroup" t-value="null"/>
+                    <t t-foreach="favoriteItems" t-as="item" t-key="item.id or item.key">
+                        <t t-if="currentGroup !== null and currentGroup !== item.groupNumber">
+                            <div role="separator" class="dropdown-divider"/>
+                        </t>
+                        <t t-if="item.type ==='favorite'">
+                            <SearchDropdownItem class="{ o_menu_item: true, selected: item.isActive }"
+                                                checked="item.isActive"
+                                                parentClosingMode="'none'"
+                                                onSelected="() => this.onFavoriteSelected(item.id)"
+                            >
+                                <span class="d-flex p-0 align-items-center justify-content-between">
+                                    <t t-esc="item.description"/>
+                                    <i class="ms-1 o_icon_right fa fa-trash-o"
+                                       title="Delete item"
+                                       t-on-click.stop="() => this.openConfirmationDialog(item.id)"
+                                    />
+                                </span>
+                            </SearchDropdownItem>
+                        </t>
+                        <t t-else="">
+                            <t t-component="item.Component"/>
+                        </t>
+                        <t t-set="currentGroup" t-value="item.groupNumber"/>
+                    </t>
+                </div>
+            </t>
+        </Dropdown>
+    </t>
+
+</templates>
diff --git a/addons/web/static/src/search/search_model.js b/addons/web/static/src/search/search_model.js
index 843ad1505a9..ce31a5d1918 100644
--- a/addons/web/static/src/search/search_model.js
+++ b/addons/web/static/src/search/search_model.js
@@ -16,7 +16,8 @@ import {
     rankInterval,
     yearSelected,
 } from "./utils/dates";
-import { FACET_ICONS } from "./utils/misc";
+import { FACET_ICONS, FACET_COLORS } from "./utils/misc";
+
 import { EventBus, toRaw } from "@odoo/owl";
 import { toDomain, toTree } from "@web/core/domain_tree";
 import { extractPathsFromDomain } from "@web/core/domain_selector/utils";
@@ -1752,6 +1753,7 @@ export class SearchModel extends EventBus {
                 facet.title = title;
             } else {
                 facet.icon = FACET_ICONS[type];
+                facet.color = FACET_COLORS[type];
             }
             if (groupActiveItemDomains.length) {
                 facet.domain = Domain.or(groupActiveItemDomains).toString();
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 93d848ab09d..7e5dd5ad550 100644
--- a/addons/web/static/src/search/search_panel/search_panel.scss
+++ b/addons/web/static/src/search/search_panel/search_panel.scss
@@ -23,6 +23,10 @@
 .o_search_panel {
     width: var(--SearchPanel-width, #{$o-search-panel-width});
     font-size: var(--SearchPanel-fontSize, #{$o-search-panel-font-size});
+    
+    @include media-breakpoint-up(md) {
+        border-right: $border-width solid $border-color;
+    }
 
     .o_search_panel_category_value,
     .o_search_panel_filter_value input,
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 efb17b4a4f7..170c5387acc 100644
--- a/addons/web/static/src/search/search_panel/search_panel.xml
+++ b/addons/web/static/src/search/search_panel/search_panel.xml
@@ -11,7 +11,7 @@
 </t>
 
 <t t-name="web.SearchPanelContent" owl="1">
-    <div class="o_search_panel flex-grow-0 flex-shrink-0 border-end pe-2 pb-5 ps-4 h-100 bg-view overflow-auto" t-att-class="env.searchModel.searchPanelInfo.className" t-ref="root">
+    <div class="o_search_panel flex-grow-0 flex-shrink-0 pe-2 pb-5 ps-4 h-100 bg-view overflow-auto" t-att-class="env.searchModel.searchPanelInfo.className" t-ref="root">
         <div t-if="!sections or sections.length === 0" class="o_search_panel_empty_state me-3">
             <p class="mt-3 small text-muted">No quick filter available.</p>
             <p class="small text-muted">Update the filters in the search bar to display more records.</p>
@@ -102,7 +102,7 @@
                         class="o_mobile_search_button btn"
                         t-on-click="() => state.showMobileSearch = false"
                     >
-                        <i class="fa fa-arrow-left" />
+                        <i class="oi oi-arrow-left" />
                         <strong class="ms-2">FILTER</strong>
                     </button>
                 </div>
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 a0da52111d9..06e34c83ee4 100644
--- a/addons/web/static/src/search/search_panel/search_view.scss
+++ b/addons/web/static/src/search/search_panel/search_view.scss
@@ -1,80 +1,28 @@
 .o_searchview {
-    align-items: flex-end;
-    padding: 0 20px 1px 0;
-    position: relative;
+    background-color: $input-focus-bg;
+    border: $input-border-width solid $border-color;
 
-    @include media-breakpoint-up(md) {
-        border-bottom: 1px solid $border-color;
-        padding-bottom: 3px;
+    &:focus-within {
+        background-color: $input-focus-bg;
+        border-color: $input-focus-border-color;
+        color: $input-focus-color;
 
-        &:focus-within {
-            border-bottom-color: $primary;
-        }
-    }
-
-    @include media-breakpoint-down(md) {
-        margin-right: 5px; // o_switch_view_button_icon alignment
-        padding-right: 0;
-    }
-
-    .o_searchview_input_container {
-        display: flex;
-        flex-flow: row wrap;
-        position: relative;
-    }
-
-    .o_searchview_facet {
-        display: flex;
-        flex: 0 0 auto;
-        margin: 1px 3px 0 0;
-        max-width: 100%;
-        position: relative;
-        $o-searchview-facet-remove-width: 18px;
-
-        @include media-breakpoint-down(md) {
-            flex-flow: row wrap;
-        }
-
-        .o_searchview_facet_label {
-            align-items: center;
-            flex: 0 0 auto;
-            padding: 0 3px;
-            @include o-text-overflow($display: flex);
-        }
-
-        .o_facet_values {
-            direction: ltr#{"/*rtl:ignore*/"};
-            padding: 0 $o-searchview-facet-remove-width 0 5px;
-
-            .o_facet_values_sep {
-                font-style: italic;
-                margin: 0 0.3rem;
-            }
-        }
-
-        .o_facet_remove {
-            align-items: center;
-            cursor: pointer;
-            display: flex;
-            flex: 0 0 auto;
-            justify-content: center;
-            width: $o-searchview-facet-remove-width;
-            @include o-position-absolute(0, 0, 0);
-            @include o-hover-text-color($text-muted, $o-brand-odoo);
+        + .o-dropdown .o_searchview_dropdown_toggler {
+            border-top-color: $input-focus-border-color;
+            border-right-color: $input-focus-border-color;
+            border-bottom-color: $input-focus-border-color;
         }
     }
 
     .o_searchview_input {
-        flex: 1 0 auto;
-        width: 75px;
-        border: none;
-        outline: none;
-        background-color: var(--o-input-background-color, #{$input-bg});
+        appearance: none;
+        color: inherit;
+        background: inherit;
     }
 
     .o_searchview_autocomplete {
+        @include o-position-absolute(calc(100% + #{$border-width * 3}), 0);
         width: 100%;
-        @include o-position-absolute(100%, $left: auto);
 
         .o_menu_item {
             align-items: center;
@@ -97,10 +45,6 @@
             }
         }
     }
-
-    .o_searchview_icon {
-        @include o-position-absolute($top: 4px, $right: 0);
-    }
 }
 
 .o_search_options {
diff --git a/addons/web/static/src/search/utils/misc.js b/addons/web/static/src/search/utils/misc.js
index 73441e06e4b..b6c747537a9 100644
--- a/addons/web/static/src/search/utils/misc.js
+++ b/addons/web/static/src/search/utils/misc.js
@@ -7,6 +7,13 @@ export const FACET_ICONS = {
     comparison: "fa fa-adjust",
 };
 
+export const FACET_COLORS = {
+    filter: "primary",
+    groupBy: "action",
+    favorite: "warning",
+    comparison: "danger",
+};
+
 export const GROUPABLE_TYPES = [
     "boolean",
     "char",
diff --git a/addons/web/static/src/views/calendar/calendar_common/calendar_common_renderer.js b/addons/web/static/src/views/calendar/calendar_common/calendar_common_renderer.js
index 4925f6b87a2..d8db042ed2d 100644
--- a/addons/web/static/src/views/calendar/calendar_common/calendar_common_renderer.js
+++ b/addons/web/static/src/views/calendar/calendar_common/calendar_common_renderer.js
@@ -49,13 +49,6 @@ export class CalendarCommonRenderer extends Component {
         useEffect(() => {
             this.updateSize();
         });
-
-        useEffect(
-            (view) => {
-                this.env.config.setDisplayName(`${this.props.displayName} (${view.title})`);
-            },
-            () => [this.fc.api.view]
-        );
     }
 
     get options() {
diff --git a/addons/web/static/src/views/calendar/calendar_controller.js b/addons/web/static/src/views/calendar/calendar_controller.js
index 1e34b5bc224..dd7aa9f322f 100644
--- a/addons/web/static/src/views/calendar/calendar_controller.js
+++ b/addons/web/static/src/views/calendar/calendar_controller.js
@@ -1,18 +1,21 @@
 /** @odoo-module **/
 
 import { ConfirmationDialog } from "@web/core/confirmation_dialog/confirmation_dialog";
-import { _lt, _t } from "@web/core/l10n/translation";
+import { _t, _lt } from "@web/core/l10n/translation";
 import { useOwnedDialogs, useService } from "@web/core/utils/hooks";
 import { sprintf } from "@web/core/utils/strings";
 import { Layout } from "@web/search/layout";
 import { useModel } from "@web/views/model";
-import { ViewScaleSelector } from "@web/views/view_components/view_scale_selector";
 import { FormViewDialog } from "@web/views/view_dialogs/form_view_dialog";
 import { useSetupView } from "@web/views/view_hook";
 import { CalendarDatePicker } from "./date_picker/calendar_date_picker";
 import { CalendarFilterPanel } from "./filter_panel/calendar_filter_panel";
 import { CalendarMobileFilterPanel } from "./mobile_filter_panel/calendar_mobile_filter_panel";
 import { CalendarQuickCreate } from "./quick_create/calendar_quick_create";
+import { SearchBar } from "@web/search/search_bar/search_bar";
+import { useSearchBarToggler } from "@web/search/search_bar/search_bar_toggler";
+import { ViewScaleSelector } from "@web/views/view_components/view_scale_selector";
+import { CogMenu } from "@web/search/cog_menu/cog_menu";
 
 import { Component, useState } from "@odoo/owl";
 
@@ -55,6 +58,8 @@ export class CalendarController extends Component {
         this.state = useState({
             showSideBar: !this.env.isSmall,
         });
+
+        this.searchBarToggler = useSearchBarToggler();
     }
 
     get rendererProps() {
@@ -89,11 +94,7 @@ export class CalendarController extends Component {
             toggleSideBar: () => (this.state.showSideBar = !this.state.showSideBar),
         };
     }
-    get scales() {
-        return Object.fromEntries(
-            this.model.scales.map((s) => [s, { description: SCALE_LABELS[s] }])
-        );
-    }
+
     get showCalendar() {
         return !this.env.isSmall || !this.state.showSideBar;
     }
@@ -106,29 +107,6 @@ export class CalendarController extends Component {
         return this.props.className;
     }
 
-    getTodayDay() {
-        return luxon.DateTime.local().day;
-    }
-
-    async setDate(move) {
-        let date = null;
-        switch (move) {
-            case "next":
-                date = this.model.date.plus({ [`${this.model.scale}s`]: 1 });
-                break;
-            case "previous":
-                date = this.model.date.minus({ [`${this.model.scale}s`]: 1 });
-                break;
-            case "today":
-                date = luxon.DateTime.local().startOf("day");
-                break;
-        }
-        await this.model.load({ date });
-    }
-    async setScale(scale) {
-        await this.model.load({ scale });
-    }
-
     getQuickCreateProps(record) {
         return {
             record,
@@ -213,6 +191,31 @@ export class CalendarController extends Component {
             },
         });
     }
+    async setDate(move) {
+        let date = null;
+        switch (move) {
+            case "next":
+                date = this.model.date.plus({ [`${this.model.scale}s`]: 1 });
+                break;
+            case "previous":
+                date = this.model.date.minus({ [`${this.model.scale}s`]: 1 });
+                break;
+            case "today":
+                date = luxon.DateTime.local().startOf("day");
+                break;
+        }
+        await this.model.load({ date });
+    }
+
+    get scales() {
+        return Object.fromEntries(
+            this.model.scales.map((s) => [s, { description: SCALE_LABELS[s] }])
+        );
+    }
+
+    async setScale(scale) {
+        await this.model.load({ scale });
+    }
 }
 CalendarController.components = {
     DatePicker: CalendarDatePicker,
@@ -220,6 +223,8 @@ CalendarController.components = {
     MobileFilterPanel: CalendarMobileFilterPanel,
     QuickCreate: CalendarQuickCreate,
     Layout,
+    SearchBar,
     ViewScaleSelector,
+    CogMenu,
 };
 CalendarController.template = "web.CalendarController";
diff --git a/addons/web/static/src/views/calendar/calendar_controller.scss b/addons/web/static/src/views/calendar/calendar_controller.scss
index be2d006784e..9ad08edb9ce 100644
--- a/addons/web/static/src/views/calendar/calendar_controller.scss
+++ b/addons/web/static/src/views/calendar/calendar_controller.scss
@@ -1,5 +1,5 @@
 // Variables
-$o-cw-color-today-accent: #fc3d39;
+$o-cw-color-today-accent: #fe3b30;
 $o-cw-filter-avatar-size: 20px;
 
 // Animations
@@ -66,32 +66,39 @@ $o-cw-filter-avatar-size: 20px;
 
             a,
             span {
-                padding: 5px 0;
+                display: flex;
+                width: 100%;
+                align-items: center;
+                justify-content: center;
+                aspect-ratio: 4/3;
                 background: none;
-                text-align: center;
-                vertical-align: middle;
-                font-size: 1.2rem;
-                color: map-get($grays, "900");
-                font-weight: 400;
+                color: $headings-color;
+                line-height: 1;
             }
 
-            &.ui-datepicker-current-day a {
-                background: $info;
-                color: color-contrast($info);
-                font-weight: bold;
+            &.ui-datepicker-today, &.ui-datepicker-current-day {
+                &, a {
+                    position: relative;
+                    color: var(--ui-datepicker-badge-color, #{$o-component-active-color});
+                }
+
+                &:before {
+                    @include o-position-absolute(0, $left: 50%);
+                    display: block;
+                    height: 100%;
+                    aspect-ratio: 1;
+                    border-radius: 100%;
+                    border: var(--ui-datepicker-badge-border, 1px solid #{$o-component-active-border});
+                    background: var(--ui-datepicker-badge-background, #{$o-component-active-bg});
+                    transform: translateX(-50%);
+                    content: "";
+                }
             }
 
-            &.ui-datepicker-today a {
-                margin: auto;
-                border-radius: 100%;
-                padding: 0.1em;
-                width: 25px;
-                background: mix($o-cw-color-today-accent, white, 80%);
-                color: white;
-            }
-
-            &.ui-datepicker-current-day.ui-datepicker-today a {
-                background: $o-cw-color-today-accent;
+            &.ui-datepicker-today {
+                --ui-datepicker-badge-border: 1px solid #{$o-cw-color-today-accent};
+                --ui-datepicker-badge-background: #{$o-cw-color-today-accent};
+                --ui-datepicker-badge-color: #{color-contrast($o-cw-color-today-accent)};
             }
         }
 
diff --git a/addons/web/static/src/views/calendar/calendar_controller.xml b/addons/web/static/src/views/calendar/calendar_controller.xml
index a08bc12f2d5..371743a0df7 100644
--- a/addons/web/static/src/views/calendar/calendar_controller.xml
+++ b/addons/web/static/src/views/calendar/calendar_controller.xml
@@ -4,13 +4,30 @@
     <t t-name="web.CalendarController" owl="1">
         <div t-att-class="className" t-ref="root">
             <Layout className="model.useSampleModel ? 'o_view_sample_data' : ''" display="props.display">
+                <t t-set-slot="control-panel-additional-actions">
+                    <CogMenu/>
+                </t>
                 <t t-set-slot="layout-buttons">
                     <t t-call="{{ props.buttonTemplate }}"/>
                 </t>
-
+                <t t-set-slot="layout-actions">
+                    <SearchBar t-if="searchBarToggler.state.showSearchBar"/>
+                </t>
+                <t t-set-slot="control-panel-navigation-additional">
+                    <t t-component="searchBarToggler.component" t-props="searchBarToggler.props"/>
+                </t>
                 <div class="o_calendar_container">
                     <MobileFilterPanel t-if="env.isSmall" t-props="mobileFilterPanelProps" />
                     <div t-if="showSideBar" class="o_calendar_sidebar_container d-md-block">
+                        <div class="d-flex justify-content-between">
+                            <button
+                                class="btn btn-secondary mx-1 o_calendar_button_today"
+                                t-on-click.stop="() => this.setDate('today')"
+                            >
+                                Today
+                            </button>
+                            <ViewScaleSelector scales="scales" currentScale="model.scale" setScale.bind="setScale" />
+                        </div>
                         <div class="o_calendar_sidebar">
                             <DatePicker t-if="!env.isSmall" t-props="datePickerProps" />
                             <FilterPanel t-props="filterPanelProps" />
@@ -22,40 +39,6 @@
         </div>
     </t>
 
-    <t t-name="web.CalendarController.controlButtons" owl="1">
-        <div class="o_calendar_buttons">
-            <span t-if="!env.isSmall" class="o_calendar_navigation_buttons me-1">
-                <button
-                    class="btn btn-primary o_calendar_button_prev"
-                    title="Previous"
-                    aria-label="Previous"
-                    t-on-click.stop="() => this.setDate('previous')"
-                >
-                    <i class="fa fa-arrow-left" />
-                </button>
-                <button
-                    class="btn btn-primary mx-1 o_calendar_button_today"
-                    t-on-click.stop="() => this.setDate('today')"
-                >
-                    Today
-                </button>
-                <button
-                    class="btn btn-primary o_calendar_button_next"
-                    title="Next"
-                    aria-label="Next"
-                    t-on-click.stop="() => this.setDate('next')"
-                >
-                    <i class="fa fa-arrow-right" />
-                </button>
-            </span>
-            <ViewScaleSelector scales="scales" currentScale="model.scale" setScale.bind="setScale" />
-            <button t-if="env.isSmall" class="o_cp_today_button btn btn-sm btn-link" t-on-click="() => this.setDate('today')">
-                <span class="fa-stack o_calendar_button_today">
-                    <i class="fa fa-calendar-o fa-stack-2x" role="img" aria-label="Today" title="Today" />
-                    <strong class="o_calendar_text fa-stack-1x" t-esc="getTodayDay()" />
-                </span>
-            </button>
-        </div>
-    </t>
+    <t t-name="web.CalendarController.controlButtons" owl="1"/>
 
 </templates>
diff --git a/addons/web/static/src/views/calendar/calendar_renderer.scss b/addons/web/static/src/views/calendar/calendar_renderer.scss
index 3301bf2c5b7..8bba046ed78 100644
--- a/addons/web/static/src/views/calendar/calendar_renderer.scss
+++ b/addons/web/static/src/views/calendar/calendar_renderer.scss
@@ -413,7 +413,6 @@
 
                 @include media-breakpoint-down(md) {
                     width: 50%;
-                    min-width: 12rem;
                 }
 
                 > .fc-month {
diff --git a/addons/web/static/src/views/calendar/calendar_year/calendar_year_renderer.js b/addons/web/static/src/views/calendar/calendar_year/calendar_year_renderer.js
index cc298a597b3..46fb79f3aae 100644
--- a/addons/web/static/src/views/calendar/calendar_year/calendar_year_renderer.js
+++ b/addons/web/static/src/views/calendar/calendar_year/calendar_year_renderer.js
@@ -1,13 +1,12 @@
 /** @odoo-module **/
 
-import { formatDate } from "@web/core/l10n/dates";
 import { localization } from "@web/core/l10n/localization";
 import { useDebounced } from "@web/core/utils/timing";
 import { getColor } from "../colors";
 import { useCalendarPopover, useFullCalendar } from "../hooks";
 import { CalendarYearPopover } from "./calendar_year_popover";
 
-import { Component, useEffect, useRef, onRendered } from "@odoo/owl";
+import { Component, useEffect, useRef } from "@odoo/owl";
 
 export class CalendarYearRenderer extends Component {
     setup() {
@@ -26,11 +25,6 @@ export class CalendarYearRenderer extends Component {
         useEffect(() => {
             this.updateSize();
         });
-
-        onRendered(() => {
-            const year = formatDate(this.props.model.date, { format: "yyyy" });
-            this.env.config.setDisplayName(`${this.props.displayName} (${year})`);
-        });
     }
 
     get options() {
diff --git a/addons/web/static/src/views/fields/badge_selection/badge_selection_field.xml b/addons/web/static/src/views/fields/badge_selection/badge_selection_field.xml
index 452fd430380..851a64d114d 100644
--- a/addons/web/static/src/views/fields/badge_selection/badge_selection_field.xml
+++ b/addons/web/static/src/views/fields/badge_selection/badge_selection_field.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
 
-    <t t-name="web.BadgeSelectionField" owl="1">
+    <div t-name="web.BadgeSelectionField" owl="1" class="d-flex flex-wrap gap-1 mb-3">
         <t t-if="props.readonly">
             <span t-esc="string" t-att-raw-value="value" />
         </t>
         <t t-else="">
             <t t-foreach="options" t-as="option" t-key="option[0]">
                 <span
-                    class="o_selection_badge"
+                    class="o_selection_badge btn btn-secondary mb-1"
                     t-att-class="{ active: value === option[0] }"
                     t-att-value="stringify(option[0])"
                     t-esc="option[1]"
@@ -16,6 +16,6 @@
                 />
             </t>
         </t>
-    </t>
+    </div>
 
 </templates>
diff --git a/addons/web/static/src/views/fields/domain/domain_field.xml b/addons/web/static/src/views/fields/domain/domain_field.xml
index e9e6ea73572..405de98d836 100644
--- a/addons/web/static/src/views/fields/domain/domain_field.xml
+++ b/addons/web/static/src/views/fields/domain/domain_field.xml
@@ -13,14 +13,14 @@
                     isDebugMode="!!env.debug"
                     className="props.readonly ? 'o_read_mode' : 'o_edit_mode'"
                 />
-                <div class="o_field_domain_panel" style="height:22px;">
-                    <i class="fa fa-arrow-right" role="img" aria-label="Domain" title="Domain" />
+                <div class="o_field_domain_panel d-flex align-items-center gap-2 mt-1">
+                    <i class="oi oi-arrow-right" role="img" aria-label="Domain" title="Domain" />
                     <t t-if="state.isValid === null and state.recordCount === null">
                         <i class="fa fa-circle-o-notch fa-spin ms-2" role="img" aria-label="Loading" title="Loading" />
                     </t>
                     <t t-else="">
                         <t t-if="state.isValid">
-                            <button class="btn btn-sm btn-secondary o_domain_show_selection_button" type="button" t-on-click.stop="onButtonClick">
+                            <button class="btn btn-sm btn-link o_domain_show_selection_button" type="button" t-on-click.stop="onButtonClick">
                                 <t t-esc="state.recordCount" /> record(s)
                             </button>
                         </t>
diff --git a/addons/web/static/src/views/fields/fields.scss b/addons/web/static/src/views/fields/fields.scss
index 24324b616fa..0e1681242b9 100644
--- a/addons/web/static/src/views/fields/fields.scss
+++ b/addons/web/static/src/views/fields/fields.scss
@@ -18,10 +18,3 @@
         color: inherit;
     }
 }
-
-.o_avatar_many2x_autocomplete > img{
-    width: 19px;
-    height: 19px;
-    object-fit: cover;
-    margin-right: 4px;
-}
diff --git a/addons/web/static/src/views/fields/handle/handle_field.xml b/addons/web/static/src/views/fields/handle/handle_field.xml
index 7091e381da3..cb1dad7b186 100644
--- a/addons/web/static/src/views/fields/handle/handle_field.xml
+++ b/addons/web/static/src/views/fields/handle/handle_field.xml
@@ -2,7 +2,7 @@
 <templates xml:space="preserve">
 
     <t t-name="web.HandleField" owl="1">
-        <span class="o_row_handle fa fa-sort ui-sortable-handle" t-on-click.stop="" />
+        <span class="o_row_handle oi oi-draggable ui-sortable-handle" t-on-click.stop="" />
     </t>
 
 </templates>
diff --git a/addons/web/static/src/views/fields/many2many_tags/kanban_many2many_tags_field.xml b/addons/web/static/src/views/fields/many2many_tags/kanban_many2many_tags_field.xml
index c1a1c8faa96..123a2a31b5e 100644
--- a/addons/web/static/src/views/fields/many2many_tags/kanban_many2many_tags_field.xml
+++ b/addons/web/static/src/views/fields/many2many_tags/kanban_many2many_tags_field.xml
@@ -2,6 +2,8 @@
 <templates xml:space="preserve">
 
     <t t-name="web.KanbanMany2ManyTagsField" owl="1">
-        <TagsList tags="tags" displayBadge="false" />
+        <div class="d-flex flex-wrap gap-1">
+            <TagsList className="'o_kanban_tags'" tags="tags" displayBadge="false"/>
+        </div>
     </t>
 </templates>
diff --git a/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.js b/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.js
index a89b7f5a73d..e93882a9e24 100644
--- a/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.js
+++ b/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.js
@@ -158,7 +158,7 @@ export class Many2ManyTagsField extends Component {
 
     focusTag(index) {
         const autoCompleteParent = this.autoCompleteRef.el.parentElement;
-        const tags = autoCompleteParent.getElementsByClassName("badge");
+        const tags = autoCompleteParent.getElementsByClassName("o_tag");
         if (tags.length) {
             if (index === undefined) {
                 tags[tags.length - 1].focus();
@@ -219,8 +219,8 @@ export class Many2ManyTagsField extends Component {
         }
         const hotkey = getActiveHotkey(ev);
         const autoCompleteParent = this.autoCompleteRef.el.parentElement;
-        const tags = [...autoCompleteParent.getElementsByClassName("badge")];
-        const closestTag = ev.target.closest(".badge");
+        const tags = [...autoCompleteParent.getElementsByClassName("o_tag")];
+        const closestTag = ev.target.closest(".o_tag");
         const tagIndex = tags.indexOf(closestTag);
         const input = this.autoCompleteRef.el.querySelector(".o-autocomplete--input");
         switch (hotkey) {
diff --git a/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.scss b/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.scss
index 03da097806a..5b275a29794 100644
--- a/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.scss
+++ b/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.scss
@@ -11,11 +11,6 @@
 
     .o_tags_input {
         padding: 1px 0;
-
-        .o_tag {
-            padding-left: 0.6em;
-            padding-right: 0.6em;
-        }
     }
 
     .o_field_many2many_selection {
@@ -29,12 +24,7 @@
 
     .badge {
         flex: 0 0 auto;
-        margin: 1px 2px 1px 0;
-        border: none;
-        font-size: 12px;
-        user-select: none;
         display: flex;
-        max-width: 100%;
 
         &.dropdown {
             cursor: pointer;
@@ -47,15 +37,6 @@
         .o_badge_text, .o_tag_badge_text {
             @include o-text-overflow(inline-block);
             max-width: 200px;
-            color: inherit;
-            line-height: 1.1;
-        }
-
-        .o_delete {
-            color: inherit;
-            cursor: pointer;
-            padding-left: 4px;
-            line-height: 1;
         }
     }
 }
diff --git a/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.xml b/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.xml
index 62ea1c44999..1a350617272 100644
--- a/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.xml
+++ b/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.xml
@@ -3,7 +3,7 @@
 
     <t t-name="web.Many2ManyTagsField" owl="1">
         <div
-            class="o_field_tags d-inline-flex flex-wrap"
+            class="o_field_tags d-inline-flex flex-wrap gap-1"
             t-att-class="{'o_tags_input o_input': !props.readonly}"
         >
             <TagsList tags="tags"/>
diff --git a/addons/web/static/src/views/fields/many2many_tags_avatar/many2many_tags_avatar_field.scss b/addons/web/static/src/views/fields/many2many_tags_avatar/many2many_tags_avatar_field.scss
index 8f44c546db1..0c94e0262a4 100644
--- a/addons/web/static/src/views/fields/many2many_tags_avatar/many2many_tags_avatar_field.scss
+++ b/addons/web/static/src/views/fields/many2many_tags_avatar/many2many_tags_avatar_field.scss
@@ -1,74 +1,22 @@
 .o_field_widget.o_field_many2many_tags_avatar {
-    flex-flow: row wrap;
+    $-text-spacing-v: $o-line-height-base * 1em;
+    --img-text-gap-v: calc(var(--Avatar-size, #{$o-avatar-size}) - #{$-text-spacing-v});
 
-    .o_tags_input {
-        padding: 1px 0;
-    }
+    flex-flow: row wrap;
+    margin-top: calc(var(--img-text-gap-v) * -0.5); // using transform conflicts with dropdown position
 
     .o_field_many2many_selection {
         flex: 1 0 50px;
 
-        .o_input {
+        .o-autocomplete, .o_input {
             height: 100%;
+        }
+
+        .o_input {
             border: none;
         }
     }
 
-    .o_dropdown_button {
-        top: $o-input-padding-y;
-    }
-
-    .badge {
-        flex: 0 0 auto;
-        margin: 1px 2px 1px 0;
-        border: none;
-        font-size: 12px;
-        user-select: none;
-        display: flex;
-        max-width: 100%;
-        align-items: center;
-        padding: 0;
-        padding-right: 0.6rem;
-        box-shadow: inset 0 0 0 1px;
-
-        &.dropdown {
-            cursor: pointer;
-        }
-
-        a {
-            color: inherit;
-        }
-
-        .o_badge_text {
-            @include o-text-overflow(inline-block);
-            max-width: 200px;
-            color: inherit;
-            line-height: 1.1;
-        }
-
-        .o_delete {
-            color: inherit;
-            cursor: pointer;
-            padding-left: 4px;
-            line-height: 1;
-        }
-
-        img {
-            height: 1.4em;
-            width: 1.4em;
-            object-fit: cover;
-        }
-
-        .o_badge_text, .o_delete {
-            padding-top: 0.25em;
-            padding-bottom: 0.25em;
-        }
-
-        .o_tag_badge_text {
-            padding-left:2px;
-        }
-    }
-
 }
 
 .o_kanban_record  {
@@ -85,10 +33,7 @@
 }
 
 .o_list_view .o_field_widget.o_field_many2many_tags_avatar {
-    .o_tags_input {
-        border: 0;
-        padding: 0;
-    }
+    --img-text-gap-v: 0;
 
     .o_field_many2many_selection {
         flex-basis: 40px;
@@ -117,4 +62,7 @@
         padding-bottom: 0.25rem;
         background-color: var(--o-input-background-color, transparent);
     }
+    &.o_field_widget.o_field_many2many_tags_avatar .o_field_many2many_selection .o-autocomplete {
+        height: inherit;
+    }
 }
diff --git a/addons/web/static/src/views/fields/many2many_tags_avatar/many2many_tags_avatar_field.xml b/addons/web/static/src/views/fields/many2many_tags_avatar/many2many_tags_avatar_field.xml
index 6315101a947..6e71e9fc3e1 100644
--- a/addons/web/static/src/views/fields/many2many_tags_avatar/many2many_tags_avatar_field.xml
+++ b/addons/web/static/src/views/fields/many2many_tags_avatar/many2many_tags_avatar_field.xml
@@ -3,7 +3,7 @@
 
     <t t-name="web.Many2ManyTagsAvatarField" owl="1">
         <div
-            class="many2many_tags_avatar_field_container o_field_tags d-inline-flex flex-wrap mw-100"
+            class="many2many_tags_avatar_field_container o_field_tags d-inline-flex flex-wrap mw-100 gap-1"
             t-att-class="{'o_tags_input o_input': !props.readonly}"
         >
             <TagsList tags="tags" itemsVisible="itemsVisible"/>
diff --git a/addons/web/static/src/views/fields/many2one/many2one_field.xml b/addons/web/static/src/views/fields/many2one/many2one_field.xml
index 89067067251..12c67904ece 100644
--- a/addons/web/static/src/views/fields/many2one/many2one_field.xml
+++ b/addons/web/static/src/views/fields/many2one/many2one_field.xml
@@ -45,8 +45,8 @@
                 <t t-if="hasExternalButton">
                     <button
                         type="button"
-                        class="btn btn-secondary fa o_external_button"
-                        t-att-class="env.inDialog ? 'fa-external-link' : 'fa-arrow-right'"
+                        class="btn btn-link text-action oi o_external_button"
+                        t-att-class="env.inDialog ? 'oi-launch' : 'oi-arrow-right'"
                         tabindex="-1"
                         draggable="false"
                         aria-label="Internal link"
diff --git a/addons/web/static/src/views/fields/many2one_avatar/many2one_avatar_field.scss b/addons/web/static/src/views/fields/many2one_avatar/many2one_avatar_field.scss
index 3e798c84a42..9fed749e3a9 100644
--- a/addons/web/static/src/views/fields/many2one_avatar/many2one_avatar_field.scss
+++ b/addons/web/static/src/views/fields/many2one_avatar/many2one_avatar_field.scss
@@ -1,3 +1,10 @@
+.o_field_many2one_avatar {
+    img:hover {
+        cursor: context-menu;
+        outline: $border-width solid $o-action;
+    }
+}
+
 .o_kanban_record  {
     @include media-breakpoint-up(sm) {
         .o_field_widget.o_field_many2one_avatar_user .o_quick_assign {
diff --git a/addons/web/static/src/views/fields/many2one_avatar/many2one_avatar_field.xml b/addons/web/static/src/views/fields/many2one_avatar/many2one_avatar_field.xml
index 0bc027726c5..ee6aa64575d 100644
--- a/addons/web/static/src/views/fields/many2one_avatar/many2one_avatar_field.xml
+++ b/addons/web/static/src/views/fields/many2one_avatar/many2one_avatar_field.xml
@@ -2,10 +2,13 @@
 <templates xml:space="preserve">
 
     <t t-name="web.Many2OneAvatarField" owl="1">
-        <div class="d-flex" t-att-data-tooltip="props.record.data[props.name][1]">
-            <span class="o_m2o_avatar">
-                <span t-if="props.record.data[props.name] === false and !props.readonly" class="o_m2o_avatar_empty"></span>
-                <img t-if="props.record.data[props.name] !== false" t-attf-src="/web/image/{{relation}}/{{props.record.data[props.name][0]}}/avatar_128" />
+        <div class="d-flex align-items-center gap-1" t-att-data-tooltip="props.record.data[props.name][1]">
+            <span class="o_avatar o_m2o_avatar">
+                <span t-if="props.record.data[props.name] === false and !props.readonly" class="o_avatar_empty o_m2o_avatar_empty"></span>
+                <img t-if="props.record.data[props.name] !== false"
+                     t-attf-src="/web/image/{{relation}}/{{props.record.data[props.name][0]}}/avatar_128"
+                     class="rounded"
+                />
             </span>
             <Many2OneField t-props="many2OneProps" canOpen="!props.readonly"/>
         </div>
diff --git a/addons/web/static/src/views/fields/percent_pie/percent_pie_field.js b/addons/web/static/src/views/fields/percent_pie/percent_pie_field.js
index 1012abde1e7..eafbf0e0238 100644
--- a/addons/web/static/src/views/fields/percent_pie/percent_pie_field.js
+++ b/addons/web/static/src/views/fields/percent_pie/percent_pie_field.js
@@ -12,15 +12,6 @@ export class PercentPieField extends Component {
         ...standardFieldProps,
         string: { type: String, optional: true },
     };
-
-    get transform() {
-        const rotateDeg = (360 * this.props.record.data[this.props.name]) / 100;
-        return {
-            left: rotateDeg < 180 ? 180 : rotateDeg,
-            right: rotateDeg < 180 ? rotateDeg : 0,
-            value: rotateDeg,
-        };
-    }
 }
 
 export const percentPieField = {
diff --git a/addons/web/static/src/views/fields/percent_pie/percent_pie_field.scss b/addons/web/static/src/views/fields/percent_pie/percent_pie_field.scss
index f78d938fd3e..1fd2a8d70ad 100644
--- a/addons/web/static/src/views/fields/percent_pie/percent_pie_field.scss
+++ b/addons/web/static/src/views/fields/percent_pie/percent_pie_field.scss
@@ -1,19 +1,10 @@
-.o_field_percent_pie .o_pie {
-    $pie-dimension: $o-statbutton-height - 2 * $o-statbutton-vpadding;
-    $pie-ring-width: 4px;
+.o_field_percent_pie {
+    .o_pie {
+        --PercentPieField-color-active: #{$o-action};
+        --PercentPieField-color-static: #{rgba(#000, .15)};
 
-    width: $pie-dimension;
-    height: $pie-dimension;
-
-    &:after { // Outside pie border to go over border-radius irregularities
-        border: 1px solid $o-brand-secondary;
-    }
-
-    .o_pie_value {
-        @include 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 $o-brand-secondary;
-        background-color: $o-brand-lightsecondary;
+        height: var(--PercentPieField-size, #{$font-size-lg});
+        aspect-ratio: 1;
+        margin-right: var(--PercentPieField-gap, #{map-get($spacers, 2) });
     }
 }
diff --git a/addons/web/static/src/views/fields/percent_pie/percent_pie_field.xml b/addons/web/static/src/views/fields/percent_pie/percent_pie_field.xml
index 7bd283a28fe..68a3a68fecf 100644
--- a/addons/web/static/src/views/fields/percent_pie/percent_pie_field.xml
+++ b/addons/web/static/src/views/fields/percent_pie/percent_pie_field.xml
@@ -2,14 +2,17 @@
 <templates xml:space="preserve">
 
     <t t-name="web.PercentPieField" owl="1">
-        <div class="o_pie">
-            <div class="o_mask" t-attf-class="{{transform.value >= 360 ? 'o_full' : ''}}" t-attf-style="transform: rotate({{transform.left}}deg)"/>
-            <div class="o_mask" t-attf-class="{{transform.value >= 180 ? 'o_full' : ''}}" t-attf-style="transform: rotate({{transform.right}}deg)"/>
-            <div class="o_pie_value">
-                <span t-esc="props.record.data[props.name] + '%'"/>
-            </div>
+        <figure class="o_pie mb-0 rounded-circle"
+                t-attf-style="background: conic-gradient(
+                    var(--PercentPieField-color-active) 0% {{props.record.data[props.name]}}%,
+                    var(--PercentPieField-color-static) 0% 100%
+                )"
+        />
+
+        <div class="o_pie_info">
+            <span class="o_pie_value" t-esc="props.record.data[props.name] + '%'"/>
+            <span class="o_pie_text" t-esc="props.string"/>
         </div>
-        <span t-esc="props.string"/>
     </t>
 
 </templates>
diff --git a/addons/web/static/src/views/fields/properties/property_definition.xml b/addons/web/static/src/views/fields/properties/property_definition.xml
index cabc008a102..f2b5117b6e6 100644
--- a/addons/web/static/src/views/fields/properties/property_definition.xml
+++ b/addons/web/static/src/views/fields/properties/property_definition.xml
@@ -18,12 +18,12 @@
                     <button
                         t-attf-class="btn btn-link p-0 m-0 me-2 {{this.isFirst ? 'disabled' : ''}}"
                         t-on-click="() => this.onPropertyMove('up')">
-                        <i class="fa fa-chevron-up"/>
+                        <i class="oi oi-chevron-up"/>
                     </button>
                     <button
                         t-attf-class="btn btn-link p-0 m-0 {{this.isLast ? 'disabled' : ''}}"
                         t-on-click="() => this.onPropertyMove('down')">
-                        <i class="fa fa-chevron-down"/>
+                        <i class="oi oi-chevron-down"/>
                     </button>
                     <button
                         t-if="!props.readonly and props.canChangeDefinition"
@@ -140,7 +140,7 @@
                             className="'d-inline-block me-2'"
                         />
                         <div t-if="state.matchingRecordsCount !== undefined" class="d-inline-block">
-                            <i class="fa fa-arrow-right" role="img" title="Domain"/>
+                            <i class="oi oi-arrow-right" role="img" title="Domain"/>
                             <button class="btn btn-sm btn-secondary" type="button"
                                 t-on-click.stop="onButtonDomainClick">
                                 <t t-out="state.matchingRecordsCount"/> record(s)
diff --git a/addons/web/static/src/views/fields/properties/property_tags.xml b/addons/web/static/src/views/fields/properties/property_tags.xml
index dfe6456c5ec..a333989336b 100644
--- a/addons/web/static/src/views/fields/properties/property_tags.xml
+++ b/addons/web/static/src/views/fields/properties/property_tags.xml
@@ -5,7 +5,8 @@
         <div t-attf-class="o_field_property_tag o_field_widget o_field_many2many_tags d-flex align-items-center {{props.readonly ? 'readonly' : ''}}">
             <TagsList
                 tags="tagListItems"
-                displayBadge="displayBadge"/>
+                displayBadge="displayBadge"
+                className="props.canChangeTags ? '' : 'o_field_property_tag_readonly'"/>
             <div
                 t-if="!props.readonly"
                 class="o_field_property_dropdown_menu o_input_dropdown mt-2">
diff --git a/addons/web/static/src/views/fields/properties/property_value.xml b/addons/web/static/src/views/fields/properties/property_value.xml
index 65cbc2e677b..e9599f52642 100644
--- a/addons/web/static/src/views/fields/properties/property_value.xml
+++ b/addons/web/static/src/views/fields/properties/property_value.xml
@@ -102,7 +102,7 @@
                     <button
                         t-if="!props.readonly and propertyValue and propertyValue[0] and hasAccess"
                         type="button"
-                        class="btn btn-secondary fa fa-arrow-right o_external_button o_properties_external_button py-0"
+                        class="btn btn-secondary oi oi-arrow-right o_external_button o_properties_external_button py-0"
                         tabindex="-1"
                         draggable="false"
                         aria-label="Internal link"
diff --git a/addons/web/static/src/views/fields/relational_utils.xml b/addons/web/static/src/views/fields/relational_utils.xml
index 7cc94422b87..230830f0d47 100644
--- a/addons/web/static/src/views/fields/relational_utils.xml
+++ b/addons/web/static/src/views/fields/relational_utils.xml
@@ -60,8 +60,8 @@
 </t>
 
 <t t-name="web.AvatarMany2XAutocomplete" owl="1">
-    <span class="o_avatar_many2x_autocomplete">
-        <img t-if="option.value" class="rounded-circle"
+    <span class="o_avatar_many2x_autocomplete o_avatar d-flex align-items-center">
+        <img t-if="option.value" class="rounded me-1"
              t-attf-src="/web/image/{{option.resModel}}/{{option.value}}/avatar_128" />
         <t t-esc="option.label" />
     </span>
diff --git a/addons/web/static/src/views/fields/statusbar/statusbar_field.js b/addons/web/static/src/views/fields/statusbar/statusbar_field.js
index 91dafb49aac..bc4ab17acbe 100644
--- a/addons/web/static/src/views/fields/statusbar/statusbar_field.js
+++ b/addons/web/static/src/views/fields/statusbar/statusbar_field.js
@@ -130,11 +130,10 @@ export class StatusBarField extends Component {
     }
 
     getDropdownItemClassNames(item) {
-        const classNames = [
-            "btn",
-            item.isSelected ? "btn-primary" : "btn-secondary",
-            "o_arrow_button",
-        ];
+        const classNames = [];
+        if (item.isSelected) {
+            classNames.push("active");
+        }
         if (item.isSelected || this.props.isDisabled) {
             classNames.push("disabled");
         }
diff --git a/addons/web/static/src/views/fields/statusbar/statusbar_field.scss b/addons/web/static/src/views/fields/statusbar/statusbar_field.scss
index 013d7282a2f..75816704612 100644
--- a/addons/web/static/src/views/fields/statusbar/statusbar_field.scss
+++ b/addons/web/static/src/views/fields/statusbar/statusbar_field.scss
@@ -1,4 +1,6 @@
 .o_field_statusbar {
+    $-btn-secondary-design: map-get($o-btns-bs-override, "secondary");
+
     > .o_statusbar_status {
         display: flex;
         align-content: space-around;
@@ -8,36 +10,42 @@
         align-items: stretch;
 
         > .o_arrow_button {
-            min-height: $o-statusbar-height;
             position: relative;
-            padding-left: $o-statusbar-arrow-width*2;
-            border-width: 0;
-            font-size: $font-size-sm;
+            padding-left: $o-statusbar-arrow-width * 1.5;
+            border-radius: 0;
 
             &:first-child {
+                @include border-end-radius($border-radius);
                 padding-right: $o-horizontal-padding; // Compensate container padding
                 overflow-x: hidden; // to prevent horizontal scroll due to last arrow
             }
+
             &:last-child {
-                padding-left: $o-horizontal-padding - 1;
-                border-left: $border-width solid $border-color;
+                @include border-start-radius($border-radius);
+                padding-left: $o-horizontal-padding;
             }
 
-            &:not(:first-child):before, &:not(:first-child):after {
-                content: " ";
-                display: block;
-                @include o-position-absolute(0, -$o-statusbar-arrow-width + 1);
+            &:not(:first-child) {
+                &:before, &:after {
+                    @include o-position-absolute(-$border-width, -$o-statusbar-arrow-width);
+                    display: block;
 
-                border-top: floor($o-statusbar-height/2) solid transparent;
-                border-bottom: ceil($o-statusbar-height/2) solid transparent;
-                border-right: none;
-                border-left: $o-statusbar-arrow-width solid $o-view-background-color;
-                -moz-transform: scale(0.9999); // Smooth the triangle on firefox
-            }
+                    border-top: floor($o-statusbar-height/2) solid transparent;
+                    border-bottom: ceil($o-statusbar-height/2) solid transparent;
+                    border-right: none;
+                    border-left: $o-statusbar-arrow-width solid map-get($-btn-secondary-design, background);
+                    -moz-transform: scale(0.9999); // Smooth the triangle on firefox
+                    content: " ";
+                }
 
-            &:not(:first-child):before {
-                right: -$o-statusbar-arrow-width;
-                border-left-color: $border-color!important;
+                &:before {
+                    right: calc(-#{$o-statusbar-arrow-width} - #{$border-width});
+                    border-left-color: $o-view-background-color;
+                }
+
+                &:hover:after {
+                    border-left-color: map-get($-btn-secondary-design, hover-background);
+                }
             }
 
             &.disabled {
@@ -51,12 +59,19 @@
                 }
             }
 
-            &.o_arrow_button_current.disabled {
-                background-color: $o-brand-odoo;
-                color: color-contrast($o-brand-odoo);
+            &.o_arrow_button_current.disabled, &:active:not(:first-child) {
+                background-color: map-get($-btn-secondary-design, active-background);
+                border-color: map-get($-btn-secondary-design, active-border);
+                color: map-get($-btn-secondary-design, active-color);
 
-                &:after, &:before {
-                    border-left-color: $o-brand-odoo;
+                &:after {
+                    border-left-color: map-get($-btn-secondary-design, active-background);
+                }
+
+                &, & + .btn {
+                    &:before {
+                        border-left-color: map-get($-btn-secondary-design, active-border);
+                    }
                 }
             }
         }
diff --git a/addons/web/static/src/views/fields/statusbar/statusbar_field.variables.scss b/addons/web/static/src/views/fields/statusbar/statusbar_field.variables.scss
new file mode 100644
index 00000000000..7a83478e728
--- /dev/null
+++ b/addons/web/static/src/views/fields/statusbar/statusbar_field.variables.scss
@@ -0,0 +1 @@
+$o-statusbar-arrow-width: 1em;
\ No newline at end of file
diff --git a/addons/web/static/src/views/fields/statusbar/statusbar_field.xml b/addons/web/static/src/views/fields/statusbar/statusbar_field.xml
index a8302e83dca..ecf907bab8e 100644
--- a/addons/web/static/src/views/fields/statusbar/statusbar_field.xml
+++ b/addons/web/static/src/views/fields/statusbar/statusbar_field.xml
@@ -6,7 +6,7 @@
             <t t-set="items" t-value="computeItems()" />
 
             <t t-if="items.folded.length">
-                <button type="button" class="btn dropdown-toggle text-uppercase" t-att-class="{ 'o_arrow_button': !env.isSmall, 'btn-primary': env.isSmall }">
+                <button type="button" class="btn btn-secondary dropdown-toggle" t-att-class="{ 'o_arrow_button': !env.isSmall, 'btn-primary': env.isSmall }">
                     <Dropdown toggler="'parent'">
                         <t t-foreach="items.folded" t-as="item" t-key="item.id">
                             <DropdownItem class="getDropdownItemClassNames(item)" onSelected="() => this.selectItem(item)">
@@ -25,7 +25,7 @@
                 <t t-if="item.isSelected">
                     <button
                         type="button"
-                        class="btn o_arrow_button_current o_arrow_button disabled text-uppercase"
+                        class="btn btn-secondary o_arrow_button_current o_arrow_button disabled"
                         disabled="disabled"
                         role="radio"
                         aria-label="Current state"
@@ -39,7 +39,7 @@
                 <t t-elif="props.isDisabled">
                     <button
                         type="button"
-                        class="btn o_arrow_button disabled text-uppercase"
+                        class="btn btn-secondary o_arrow_button disabled"
                         disabled="disabled"
                         role="radio"
                         aria-label="Not active state"
@@ -52,7 +52,7 @@
                 <t t-else="">
                     <button
                         type="button"
-                        class="btn o_arrow_button text-uppercase"
+                        class="btn btn-secondary o_arrow_button"
                         role="radio"
                         aria-label="Not active state, click to change it"
                         aria-checked="false"
diff --git a/addons/web/static/src/views/fields/x2many/x2many_field.xml b/addons/web/static/src/views/fields/x2many/x2many_field.xml
index 2d0f243ce40..fcc8c892d81 100644
--- a/addons/web/static/src/views/fields/x2many/x2many_field.xml
+++ b/addons/web/static/src/views/fields/x2many/x2many_field.xml
@@ -3,7 +3,7 @@
 
     <t t-name="web.X2ManyField" owl="1">
         <div t-att-class="className">
-            <div class="o_x2m_control_panel">
+            <div class="o_x2m_control_panel d-empty-none mb-2">
                 <t t-if="displayControlPanelButtons">
                     <div class="o_cp_buttons" role="toolbar" aria-label="Control panel buttons" t-ref="buttons">
                         <t t-foreach="creates" t-as="create" t-key="create_index">
@@ -28,8 +28,8 @@
                         </t>
                     </div>
                 </t>
-                <div class="o_cp_pager" role="search">
-                    <Pager t-if="props.record.data[props.name].count > props.record.data[props.name].limit" t-props="pagerProps"/>
+                <div t-if="props.record.data[props.name].count > props.record.data[props.name].limit" class="o_cp_pager" role="search">
+                    <Pager t-props="pagerProps"/>
                 </div>
             </div>
             <ListRenderer t-if="props.viewMode === 'list'" t-props="rendererProps" />
diff --git a/addons/web/static/src/views/form/button_box/button_box.js b/addons/web/static/src/views/form/button_box/button_box.js
index 0dd1184ca2b..9bbfd7803cf 100644
--- a/addons/web/static/src/views/form/button_box/button_box.js
+++ b/addons/web/static/src/views/form/button_box/button_box.js
@@ -8,7 +8,7 @@ import { Component } from "@odoo/owl";
 export class ButtonBox extends Component {
     setup() {
         const ui = useService("ui");
-        this.getMaxButtons = () => [2, 2, 2, 4][ui.size] || 7;
+        this.getMaxButtons = () => [3, 3, 3, 7, 3, 4, 7][ui.size] || 7;
     }
 
     getButtons() {
diff --git a/addons/web/static/src/views/form/button_box/button_box.scss b/addons/web/static/src/views/form/button_box/button_box.scss
index c3015e265ee..0b0a692da8d 100644
--- a/addons/web/static/src/views/form/button_box/button_box.scss
+++ b/addons/web/static/src/views/form/button_box/button_box.scss
@@ -1,77 +1,74 @@
 .o-form-buttonbox {
-    --o-input-border-color: #{map-get($grays, '600')};
-    margin-bottom: $o-sheet-vpadding;
-    margin-top: -$o-sheet-vpadding;
-    @include o-form-sheet-negative-margin;
-    // Use box-shadow instead of border-bottom because some button boxes are
-    // empty in some cases and we do not want to see a floating border in
-    // that cases.
-    box-shadow: inset 0 -1px 0 $border-color;
+    // Compute the expected oe_stat_button's height according to the default btn size.
+    $-stat-button-inner-size: ($btn-padding-y * 2) + ($btn-font-size * $btn-line-height);
+    $-stat-button-height: $-stat-button-inner-size + o-to-rem($btn-border-width * 2);
 
-    .btn.oe_stat_button, > .o_field_widget {
-        flex: 0 0 auto;
-        width: percentage(1/3); // Adapt the number of visible buttons for each screen width
-        @include media-breakpoint-up(md) {
-            width: percentage(1/5);
-        }
-        @include media-breakpoint-up(lg) {
-            width: percentage(1/7);
-        }
-        @include media-breakpoint-up(xl) {
-            width: percentage(1/8);
-        }
+    $-stat-button-icon-size: 1.5em;
+    $-stat-button-icon-margin-end: $btn-padding-x * 0.5;
+
+    %-stat-button-container {
+        display: flex;
+        flex-direction: column;
+        max-width: 100%;
+        text-align: left;
+        font-weight: $font-weight-normal;
+        line-height: 1;
     }
 
-    &.o_full > *:first-child {
-        border-left: none !important;
-        box-shadow: -1px 0 0 $border-color;
+    %-stat-button-text {
+        @include o-text-overflow(block);
+        order: 1;
+        font-size: $o-font-size-base-smaller;
+        line-height: $line-height-sm;
     }
-    
-    .btn.oe_stat_button {
-        height: $o-statbutton-height;
 
-        > .o_button_icon {
-            display: inline-block;
-            vertical-align: middle;
-            line-height: $o-statbutton-height;
-            width: 30%;
+    %-stat-button-value {
+        order: 2;
+        font-weight: $font-weight-bold;
+        color: $o-brand-primary;
+        font-size: $o-font-size-base-smaller;
+    }
+
+    %-stat-button-figure-offset {
+        margin-left: $btn-padding-x * -0.33;
+    }
+
+    .oe_stat_button {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        flex-grow: 1;
+        padding-top: 0;
+        padding-bottom: 0;
+        height: $-stat-button-height;
+
+        .o_button_icon {
+            font-size: $-stat-button-icon-size;
+            color: $primary;
 
             &:before {
-                font-size: 22px;
-                vertical-align: middle;
+                margin-right: $-stat-button-icon-margin-end;
             }
         }
 
-        > .o_field_percent_pie {
-            margin-left: $o-statbutton-spacing; // To create the button padding left (firefox bug)
-        }
-
         // Some buttons only display text without using StatInfo template
         > span {
             @include o-text-overflow(block);
             white-space: normal; // text on several lines if needed
         }
 
-        > .o_stat_info, > span, > .o_field_statinfo { // contains the value and text
-            display: inline-block;
-            vertical-align: middle;
-            font-weight: $font-weight-normal;
+        .o_stat_info, > span, .o_field_statinfo {
+            @extend %-stat-button-container;
 
-            max-width: 70%;
-            padding-right: $o-statbutton-spacing;
-            line-height: 1.3;
-
-            > .o_stat_value, > .o_stat_text {
-                @include o-text-overflow(block);
-                line-height: 1.2;
+            .o_stat_text {
+                @extend %-stat-button-text;
             }
 
             .o_stat_value {
-                font-weight: $font-weight-bold;
-                color: map-get($o-theme-text-colors, 'odoo');
+                @extend %-stat-button-value;
             }
 
-            .o_stat_text .o_field_empty {
+            .o_field_empty {
                 display: none;
             }
         }
@@ -82,18 +79,37 @@
             }
         }
 
+        &:not(:first-child) .o_button_icon {
+            @extend %-stat-button-figure-offset;
+        }
+
         &:not(:hover) .o_stat_info > .o_hover {
             display: none !important;
         }
         &:hover .o_stat_info > .o_not_hover {
             display: none !important
         }
+        &.btn-outline-secondary:disabled {
+            opacity: 1;
+            color:inherit;
+
+        }
     }
-    .oe_stat_button {
-        border-left: 1px solid $border-color;
+
+    > * + * {
+        margin-left: -$border-width;
     }
-    &.o_full > .oe_stat_button:first-child {
-        border-left: none;
+
+    .oe_stat_button, > div > button {
+        border-radius: 0;
+    }
+
+    .oe_stat_button:first-child, div:first-child > button {
+        @include border-start-radius($border-radius);
+    }
+
+    .oe_stat_button:last-child, div:last-child > button {
+        @include border-end-radius($border-radius);
     }
 
     // "More" button and dropdown
@@ -101,25 +117,43 @@
         > .o_button_more {
             width: 100%;
             height: 100%;
+
             &:after {
                 margin-left: 5px;
                 @include o-caret-down;
             }
         }
-        &.show > .o_button_more {
-            &:after {
-                @include o-caret-up;
-            }
-        }
 
         .o_dropdown_more {
             width: 150px;
-            > .dropdown-item {
-                .oe_stat_button {
-                    border: none;
-                    width: 100%;
-                }
+
+            .oe_stat_button {
+                height: auto;
+                width: 100%;
+                border: none;
+                padding-top: map-get($spacers, 2);
+                padding-bottom: map-get($spacers, 2);
             }
         }
     }
+
+    // Piechart
+    --PercentPieField-size: #{$-stat-button-icon-size};
+    --PercentPieField-gap: #{$-stat-button-icon-margin-end};
+
+    .oe_stat_button:not(:first-child) .o_pie {
+        @extend %-stat-button-figure-offset;
+    }
+
+    .o_pie_info {
+        @extend %-stat-button-container;
+    }
+
+    .o_pie_text {
+        @extend %-stat-button-text;
+    }
+
+    .o_pie_value {
+        @extend %-stat-button-value;
+    }
 }
diff --git a/addons/web/static/src/views/form/button_box/button_box.xml b/addons/web/static/src/views/form/button_box/button_box.xml
index 23d92169b46..8e9e4781022 100644
--- a/addons/web/static/src/views/form/button_box/button_box.xml
+++ b/addons/web/static/src/views/form/button_box/button_box.xml
@@ -5,10 +5,10 @@
     <t t-set="allButtons" t-value="getButtons()" />
     <t t-set="visibleButtons" t-value="allButtons['visible']" />
     <t t-set="additionalButtons" t-value="allButtons['additional']" />
-    <div class="o-form-buttonbox oe_button_box position-relative text-end" t-attf-class="{{ visibleButtons.length >= getMaxButtons() ? 'o_full' : 'o_not_full'}} {{this.props.class}}">
+    <div class="o-form-buttonbox position-relative d-flex w-md-auto" t-attf-class="{{ visibleButtons.length >= getMaxButtons() ? 'o_full w-100' : 'o_not_full'}} {{this.props.class}}">
         <t t-slot="{{ button_value }}" t-foreach="visibleButtons" t-as="button" t-key="button_value"/>
         <t t-if="additionalButtons.length" >
-            <Dropdown togglerClass="'btn btn-light o_button_more border-0 border-start border-bottom'" menuClass="'o_dropdown_more position-absolute start-0 top-100 w-100 p-0 border-0'" class="'oe_stat_button btn position-relative p-0 border-0'">
+            <Dropdown position="'bottom-end'" togglerClass="'o_button_more btn btn-outline-secondary'" menuClass="'o_dropdown_more position-absolute top-100 w-100 p-0 border-0'" class="'oe_stat_button btn position-relative p-0 border-0'">
                 <t t-set-slot="toggler"><span>More</span></t>
                 <DropdownItem t-foreach="additionalButtons" t-as="button" t-key="button_value" class="'d-flex flex-column p-0'">
                     <t t-slot="{{ button_value }}" />
diff --git a/addons/web/static/src/views/form/control_panel/form_control_panel.js b/addons/web/static/src/views/form/control_panel/form_control_panel.js
deleted file mode 100644
index b4ec4b5ead3..00000000000
--- a/addons/web/static/src/views/form/control_panel/form_control_panel.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/** @odoo-module **/
-
-import { ControlPanel } from "@web/search/control_panel/control_panel";
-
-export class FormControlPanel extends ControlPanel {}
-FormControlPanel.template = "web.FormControlPanel";
diff --git a/addons/web/static/src/views/form/control_panel/form_control_panel.xml b/addons/web/static/src/views/form/control_panel/form_control_panel.xml
deleted file mode 100644
index 410e1a97615..00000000000
--- a/addons/web/static/src/views/form/control_panel/form_control_panel.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates xml:space="preserve">
-
-    <t t-name="web.FormControlPanel" owl="1">
-        <div class="o_control_panel" t-ref="root">
-            <div t-if="display['top']" class="o_cp_top" t-att-class="{ 'flex-wrap': env.isSmall }">
-                <div class="o_cp_top_left d-flex flex-grow-1 align-items-center" t-att-class="{ 'w-100': env.isSmall }">
-                    <t t-if="display['top-left']">
-                        <t t-slot="control-panel-breadcrumb">
-                            <t t-if="env.isSmall">
-                                <t t-call="web.Breadcrumbs.Small" t-if="!env.config.noBreadcrumbs"/>
-                            </t>
-                            <t t-else="">
-                                <t t-call="web.Breadcrumbs" t-if="!env.config.noBreadcrumbs"/>
-                            </t>
-                        </t>
-                    </t>
-                </div>
-                <div class="o_cp_bottom_right w-auto flex-shrink-0 justify-content-between align-items-center"
-                     t-att-class="{ 'flex-grow-1' : env.isSmall }">
-                    <t t-if="env.isSmall">
-                        <t t-slot="control-panel-status-indicator" />
-                    </t>
-                    <t t-slot="control-panel-action-menu" t-if="display['bottom-left']"/>
-                    <div t-if="pagerProps and pagerProps.total > 0" class="o_cp_pager" role="search">
-                        <Pager t-props="pagerProps"/>
-                    </div>
-                    <t t-slot="control-panel-create-button" />
-                </div>
-            </div>
-        </div>
-    </t>
-
-</templates>
diff --git a/addons/web/static/src/views/form/form.variables.scss b/addons/web/static/src/views/form/form.variables.scss
index 7682d757047..5cc83e52448 100644
--- a/addons/web/static/src/views/form/form.variables.scss
+++ b/addons/web/static/src/views/form/form.variables.scss
@@ -1 +1,2 @@
-$o-form-view-sheet-max-width: 1140px !default;
+$o-form-view-sheet-max-width: 1534px !default;
+$o-form-picture-size: 90px !default;
diff --git a/addons/web/static/src/views/form/form_compiler.js b/addons/web/static/src/views/form/form_compiler.js
index 2c010c370e2..bd1fd9b72e5 100644
--- a/addons/web/static/src/views/form/form_compiler.js
+++ b/addons/web/static/src/views/form/form_compiler.js
@@ -63,9 +63,11 @@ export class FormCompiler extends ViewCompiler {
         );
     }
 
-    compile() {
+    compile(key, params = {}) {
         const compiled = super.compile(...arguments);
-        compiled.children[0].setAttribute("t-ref", "compiled_view_root");
+        if (!params.isSubView) {
+            compiled.children[0].setAttribute("t-ref", "compiled_view_root");
+        }
         return compiled;
     }
 
@@ -151,17 +153,10 @@ export class FormCompiler extends ViewCompiler {
             if (child.tagName === "button" || child.children.tagName === "button") {
                 child.classList.add(
                     "oe_stat_button",
-                    "btn-light",
-                    "flex-shrink-0",
-                    "mb-0",
-                    "py-0",
-                    "border-0",
-                    "border-start",
-                    "border-bottom",
-                    "rounded-0",
-                    "text-start",
-                    "text-nowrap",
-                    "text-capitalize"
+                    "btn",
+                    "btn-outline-secondary",
+                    "flex-grow-1",
+                    "flex-lg-grow-0"
                 );
             }
             if (child.tagName === "field") {
@@ -175,10 +170,7 @@ export class FormCompiler extends ViewCompiler {
     }
 
     compileButton(el, params) {
-        const compiled = super.compileButton(el, params);
-        compiled.setAttribute("disable", "__comp__.props.disableViewButtons");
-        compiled.setAttribute("enable", "__comp__.props.enableViewButtons");
-        return compiled;
+        return super.compileButton(el, params);
     }
 
     /**
@@ -230,7 +222,11 @@ export class FormCompiler extends ViewCompiler {
         });
         if (!sheetNode) {
             for (const child of el.childNodes) {
-                append(form, this.compileNode(child, params));
+                // ButtonBox are already compiled for the control panel and should not
+                // be recompiled for the renderer of the view
+                if (child.attributes?.name?.value !== "button_box") {
+                    append(form, this.compileNode(child, params));
+                }
             }
             form.classList.add("o_form_nosheet");
         } else {
@@ -407,7 +403,7 @@ export class FormCompiler extends ViewCompiler {
     compileHeader(el, params) {
         const statusBar = createElement("div");
         statusBar.className =
-            "o_form_statusbar position-relative d-flex justify-content-between border-bottom";
+            "o_form_statusbar position-relative d-flex justify-content-between mb-2 px-3 pb-2 pb-md-0 px-md-0";
         const buttons = [];
         const others = [];
         for (const child of el.childNodes) {
@@ -644,7 +640,7 @@ export class FormCompiler extends ViewCompiler {
         sheetBG.className = "o_form_sheet_bg";
 
         const sheetFG = createElement("div");
-        sheetFG.className = "o_form_sheet position-relative clearfix";
+        sheetFG.className = "o_form_sheet position-relative";
 
         append(sheetBG, sheetFG);
         for (const child of el.childNodes) {
@@ -652,6 +648,9 @@ export class FormCompiler extends ViewCompiler {
             if (!compiled) {
                 continue;
             }
+            if (compiled.nodeName === "ButtonBox") {
+                compiled.setAttribute("t-if", "__comp__.env.inDialog");
+            }
             if (getTag(child, true) === "field") {
                 compiled.setAttribute("showTooltip", true);
             }
diff --git a/addons/web/static/src/views/form/form_controller.js b/addons/web/static/src/views/form/form_controller.js
index 40f8d14cd43..f493455342d 100644
--- a/addons/web/static/src/views/form/form_controller.js
+++ b/addons/web/static/src/views/form/form_controller.js
@@ -9,7 +9,6 @@ import { SIZES } from "@web/core/ui/ui_service";
 import { useBus, useService } from "@web/core/utils/hooks";
 import { omit } from "@web/core/utils/objects";
 import { createElement } from "@web/core/utils/xml";
-import { ActionMenus } from "@web/search/action_menus/action_menus";
 import { Layout } from "@web/search/layout";
 import { usePager } from "@web/search/pager_hook";
 import { useModel } from "@web/views/model";
@@ -18,8 +17,16 @@ import { isX2Many } from "@web/views/utils";
 import { useViewButtons } from "@web/views/view_button/view_button_hook";
 import { useSetupView } from "@web/views/view_hook";
 import { FormStatusIndicator } from "./form_status_indicator/form_status_indicator";
+import { ButtonBox } from "./button_box/button_box";
+import { ViewButton } from "@web/views/view_button/view_button";
+import { Field } from "@web/views/fields/field";
+import { CogMenu } from "@web/search/cog_menu/cog_menu";
+import { ActionMenusItems } from "@web/search/cog_menu/action_menus_items";
 
-import { Component, onRendered, useEffect, useRef, useState } from "@odoo/owl";
+import { Component, onRendered, useEffect, useRef } from "@odoo/owl";
+import { useViewCompiler } from "../view_compiler";
+import { FormCompiler } from "./form_compiler";
+import { evalDomain } from "../utils";
 
 const viewRegistry = registry.category("views");
 
@@ -101,9 +108,6 @@ export class FormController extends Component {
         this.user = useService("user");
         this.viewService = useService("view");
         this.ui = useService("ui");
-        this.state = useState({
-            isDisabled: false,
-        });
         useBus(this.ui.bus, "resize", this.render);
 
         this.archInfo = this.props.archInfo;
@@ -113,6 +117,8 @@ export class FormController extends Component {
         this.canCreate = create && !this.props.preventCreate;
         this.canEdit = edit && !this.props.preventEdit;
 
+        this.disabledButtons = null;
+
         let mode = this.props.mode || "edit";
         if (!this.canEdit) {
             mode = "readonly";
@@ -180,8 +186,19 @@ export class FormController extends Component {
             this.archInfo.arch = this.archInfo.xmlDoc.outerHTML;
         }
 
-        const rootRef = useRef("root");
-        useViewButtons(this.model, rootRef, {
+        const xmlDocButtonBox = this.archInfo.xmlDoc.querySelector("div[name='button_box']");
+        if (xmlDocButtonBox) {
+            const buttonBoxTemplates = useViewCompiler(
+                this.props.Compiler || FormCompiler,
+                xmlDocButtonBox.outerHTML,
+                { ButtonBox: xmlDocButtonBox },
+                { isSubView: true }
+            );
+            this.buttonBoxTemplate = buttonBoxTemplates.ButtonBox;
+        }
+
+        this.rootRef = useRef("root");
+        useViewButtons(this.model, this.rootRef, {
             beforeExecuteAction: this.beforeExecuteActionButton.bind(this),
             afterExecuteAction: this.afterExecuteActionButton.bind(this),
         });
@@ -195,7 +212,7 @@ export class FormController extends Component {
         };
 
         useSetupView({
-            rootRef,
+            rootRef: this.rootRef,
             beforeLeave: () => this.beforeLeave(),
             beforeUnload: (ev) => this.beforeUnload(ev),
             getLocalState: () => {
@@ -230,9 +247,11 @@ export class FormController extends Component {
                 (isInEdition) => {
                     if (
                         !isInEdition &&
-                        !rootRef.el.querySelector(".o_content").contains(document.activeElement)
+                        !this.rootRef.el
+                            .querySelector(".o_content")
+                            .contains(document.activeElement)
                     ) {
-                        const elementToFocus = rootRef.el.querySelector(
+                        const elementToFocus = this.rootRef.el.querySelector(
                             ".o_content button.btn-primary"
                         );
                         if (elementToFocus) {
@@ -380,11 +399,18 @@ export class FormController extends Component {
     }
 
     disableButtons() {
-        this.state.isDisabled = true;
+        const btns = [...this.rootRef.el.querySelectorAll("button:not([disabled])")];
+        for (const btn of btns) {
+            btn.setAttribute("disabled", "1");
+        }
+        this.disabledButtons = btns;
     }
 
     enableButtons() {
-        this.state.isDisabled = false;
+        for (const btn of this.disabledButtons) {
+            btn.removeAttribute("disabled");
+        }
+        this.disabledButtons = null;
     }
 
     async beforeExecuteActionButton(clickParams) {
@@ -471,10 +497,22 @@ export class FormController extends Component {
         result["o_field_highlight"] = size < SIZES.SM || hasTouch();
         return result;
     }
+
+    evalDomainFromRecord(record, expr) {
+        return evalDomain(expr, record.evalContext);
+    }
 }
 
 FormController.template = `web.FormView`;
-FormController.components = { ActionMenus, FormStatusIndicator, Layout };
+FormController.components = {
+    FormStatusIndicator,
+    Layout,
+    ButtonBox,
+    ViewButton,
+    Field,
+    CogMenu,
+    ActionMenusItems,
+};
 FormController.props = {
     ...standardViewProps,
     discardRecord: { type: Function, optional: true },
diff --git a/addons/web/static/src/views/form/form_controller.scss b/addons/web/static/src/views/form/form_controller.scss
index 6978c418851..01d45cdee4b 100644
--- a/addons/web/static/src/views/form/form_controller.scss
+++ b/addons/web/static/src/views/form/form_controller.scss
@@ -16,16 +16,12 @@
 }
 // Compensate margins
 @mixin o-form-sheet-negative-margin {
-    margin-left: -$o-horizontal-padding;
-    margin-right: -$o-horizontal-padding;
-    @include media-breakpoint-up(lg, $o-extra-grid-breakpoints) {
-        margin-left: -$o-horizontal-padding*2;
-        margin-right: -$o-horizontal-padding*2;
-    }
+    margin-left: calc(var(--formView-sheet-padding-x) * -1);
+    margin-right: calc(var(--formView-sheet-padding-x) * -1);
 }
 @mixin o-form-nosheet-negative-margin {
-    margin-left: -$o-horizontal-padding;
-    margin-right: -$o-horizontal-padding;
+    margin-left: calc(var(--formView-sheet-padding-x) * -1);
+    margin-right: calc(var(--formView-sheet-padding-x) * -1);
 }
 
 // XXS form view specific rules
@@ -66,7 +62,18 @@
 }
 
 .o_form_view {
-    background-color: $o-view-background-color;
+    // Component custom properties
+    --formView-sheetBg-padding-top: #{map-get($spacers, 2)};
+    --formView-sheetBg-padding-x: #{map-get($spacers, 3)};
+
+    --formView-sheet-padding-y: #{map-get($spacers, 3)};
+    --formView-sheet-padding-x: #{map-get($spacers, 3)};
+    --formView-sheet-padding-y-xxl: #{map-get($spacers, 4)};
+    --formView-sheet-padding-x-xxl: #{map-get($spacers, 4)};
+    --formView-sheet-border-color: #{$border-color};
+    --formView-sheet-border-width: #{$border-width};
+    --formView-sheet-border-radius: #{$border-radius};
+    --formView-sheet-background: #{$o-view-background-color};
 
     @include media-breakpoint-up(md) {
         display: flex;
@@ -242,9 +249,6 @@
         }
 
         .o_notebook {
-            --notebook-margin-x: -#{$o-horizontal-padding};
-            --notebook-padding-x: #{$o-horizontal-padding};
-
             > .tab-content > .tab-pane > :first-child:not(.o_group) {
                 // These elements will appear attached to the tabs
                 &.o_field_x2many.o_field_x2many_list {
@@ -254,45 +258,49 @@
         }
     }
 
-    // Sheet
+    // Sheet BG
     .o_form_sheet_bg {
-        position: relative;
-        flex: 1 0 auto;
-        background-color: $o-webclient-background-color;
-        border-bottom: 1px solid $border-color;
+        padding-top: var(--formView-sheetBg-padding-top);
+        padding-left: var(--formView-sheetBg-padding-left, var(--formView-sheetBg-padding-x));
+        padding-right: var(--formView-sheetBg-padding-right, var(--formView-sheetBg-padding-x));
+        width: 100%;
+        max-width: $o-form-view-sheet-max-width;
+        margin-right: auto; // Always align to le left
 
-        > .o_form_sheet {
-            @include make-container();
-            @include make-container-max-widths();
+        @include media-breakpoint-down(md) {
+            --formView-sheetBg-padding-x: var(--formView-sheetBg-padding-x-sm, 0);
+        }
+    }
 
-            background-color: $o-view-background-color;
-            box-shadow: 0 5px 20px -15px rgba(#000, 0.4);
-            margin: $o-sheet-vpadding*0.2 auto;
-            @include media-breakpoint-up(md) {
-                margin: $o-sheet-vpadding*0.5 auto;
-            }
-            padding: $o-sheet-vpadding;
-            @include o-form-sheet-inner-right-padding;
-            @include o-form-sheet-inner-left-padding;
+    // Sheet
+    .o_form_sheet {
+        padding: var(--formView-sheet-padding-y) var(--formView-sheet-padding-x);
+        border-style: solid;
+        border-color: var(--formView-sheet-border-color);
+        border-width: var(--formView-sheet-border-width);
+        border-radius: var(--formView-sheet-border-radius);
+        background-color: var(--formView-sheet-background);
 
-            @include media-breakpoint-up(sm) {
-                border: 1px solid $border-color;
-            }
+        @include media-breakpoint-down(md) {
+            --formView-sheet-padding-y: #{map-get($spacers, 4)};
+            --formView-sheet-padding-x: #{map-get($spacers, 3)};
+            --formView-sheet-border-width: 0 0 1px 0;
+            --formView-sheet-border-radius: 0;
+        }
 
-            // Selection
-            > .o_selection {
-                float: right;
-            }
+        @include media-breakpoint-up(xxl, $o-extra-grid-breakpoints) {
+            --formView-sheet-padding-y: var(--formView-sheet-padding-y-xxl);
+            --formView-sheet-padding-x: var(--formView-sheet-padding-x-xxl);
+        }
+
+        // Selection
+        > .o_selection {
+            float: right;
         }
     }
 
     // Statusbar
     .o_form_statusbar {
-        @include media-breakpoint-up(md) {
-            padding-left: $o-horizontal-padding;
-        }
-        background-color: $o-view-background-color;
-
         > .o_statusbar_status {
             display: flex;
             align-items: center;
@@ -313,56 +321,8 @@
             margin-bottom: 0px;
         }
 
-        > .o_statusbar_buttons {
-            > .btn, .o_widget > .btn {
-                $o-statusbar-buttons-vmargin: 4px;
-                min-height: $o-statusbar-height - 2 * $o-statusbar-buttons-vmargin;
-                margin: $o-statusbar-buttons-vmargin 3px $o-statusbar-buttons-vmargin 0;
-                padding-top: 2px;
-                padding-bottom: 2px;
-
-                > .o_button_icon {
-                    margin-right: $o-statbutton-spacing;
-                }
-            }
-        }
-
-        // Touch device mode
-        > .o_statusbar_buttons > .btn-group, > .o_statusbar_status {
-            > .dropdown-toggle {
-                &:after {
-                    @include o-caret-down;
-                    margin-left: $o-form-spacing-unit;
-                }
-            }
-
-            > .dropdown-menu {
-                min-width: 0;
-
-                .dropdown-item.btn {
-                    min-width: 100%;
-                    margin-bottom: 3px;
-                    opacity: 1;
-                }
-            }
-        }
-
-        // Match the status bar button styles with rest of the buttons in touch device
         @include media-breakpoint-down(md) {
-            > .o_statusbar_buttons > .btn {
-                margin: 0;
-                padding: $o-touch-btn-padding;
-            }
-        }
-    }
-
-    .o_statusbar_status .o_arrow_button:not(.disabled) {
-        @extend .btn-light;
-
-        &:hover, &:focus, &:active {
-            &:after {
-                border-left-color: $o-btn-light-background-hover;
-            }
+            border-bottom: $border-width solid $border-color;
         }
     }
 
@@ -401,15 +361,15 @@
         margin-bottom: 10px;
 
         .img {
-            max-width: $o-avatar-size;
-            max-height: $o-avatar-size;
+            max-width: $o-form-picture-size;
+            max-height: $o-form-picture-size;
             vertical-align: top;
             border: 1px solid $o-gray-300;
         }
 
         @include media-breakpoint-down(sm) {
             + .oe_title {
-                max-width: calc(100% - #{$o-avatar-size} - #{map-get($spacers, 2)});
+                max-width: calc(100% - #{$o-form-picture-size} - #{map-get($spacers, 2)});
             }
         }
     }
@@ -422,6 +382,8 @@
 
     // Groups
     .o_group {
+        justify-content: space-between;
+
         .o_form_label {
             font-weight: $font-weight-normal;
         }
@@ -464,6 +426,7 @@
         --columns: 1;
         gap: map-get($spacers, 2) $o-horizontal-padding;
         margin-bottom: map-get($spacers, 2);
+        max-width: 700px;
 
         span, .o_field_boolean, .oe_avatar, .o_form_uri {
             &.o_field_widget {
@@ -517,19 +480,22 @@
         }
     }
 
+    // Contextual adaptation
+    .o_kanban_renderer {
+        --Kanban-background: transparent;
+        --Kanban-gap: #{map-get($spacers, 2)};
+        --KanbanRecord-margin-v: 0;
+        --KanbanRecord-margin-h: 0;
+    }
+
     // Notebooks
     .o_notebook {
+        --notebook-margin-x: calc(var(--formView-sheet-padding-x) * -1);
+        --notebook-padding-x: var(--formView-sheet-padding-x);
+
         clear: both; // For the notebook not to have alongside floating elements
         margin-top: $o-form-spacing-unit * 2;
 
-        --notebook-margin-x: -#{$o-horizontal-padding};
-        --notebook-padding-x: #{$o-horizontal-padding};
-
-        @include media-breakpoint-up(lg, $o-extra-grid-breakpoints) {
-            --notebook-margin-x: -#{$o-horizontal-padding * 2};
-            --notebook-padding-x: #{$o-horizontal-padding * 2};
-        }
-
         > .tab-content {
             border-bottom: 1px solid $border-color;
 
@@ -917,6 +883,9 @@
 
     // One2Many List views
     .o_field_widget .o_list_renderer {
+        --ListRenderer-thead-bg-color:  #{$o-view-background-color};
+        --ListRenderer-tfoot-bg-color: #{$o-view-background-color};
+
         margin-bottom: 10px;
 
         > tfoot > tr > td {
@@ -962,16 +931,6 @@
             }
         }
 
-        .o_form_sheet {
-            padding: 16px;
-        }
-
-        .o_form_sheet_bg > .o_form_sheet {
-            border-top: 0;
-            border-bottom: 0;
-            margin: 0 auto;
-        }
-
         .o_form_label:not(.o_invisible_modifier) {
             padding-bottom: 4px;
         }
@@ -1056,7 +1015,15 @@
         }
 
         .o_form_sheet_bg {
-            padding: 0;
+            /**
+             * Reset all paddings and margins to 0.
+             * Make the view fill all available room.
+             */
+            --formView-sheetBg-padding-top: 0;
+            --formView-sheetBg-padding-x: 0;
+            --formView-sheet-padding: 0;
+            --formView-sheet-border-radius: 0;
+
             width: 100%;
 
             > .o_form_statusbar, > .alert {
@@ -1129,24 +1096,14 @@
     flex-flow: row nowrap !important;
 
     .o_form_view_container {
-        width: $o-form-sheet-min-width + 2 * $o-horizontal-padding;
+        width: 1px; // List view needs a width value to recompute the size correctly
     }
 
     .o_form_sheet_bg {
-        flex: 1 1 auto; // Side chatter is disabled if this has to shrink but this was added for safety
-        padding: 0 $o-horizontal-padding;
         overflow: auto;
-        border-bottom: none;
-
-        > .o_form_statusbar, > .alert {
-            margin-left: -$o-horizontal-padding;
-            margin-right: -$o-horizontal-padding;
-        }
-
-        > .o_form_sheet {
-            width: 100%;
-            max-width: map-get($container-max-widths, xxl);
-        }
+        display: flex;
+        flex-direction: column;
+        flex: 1 1 $o-form-sheet-min-width; // Side chatter is disabled if this has to shrink but this was added for safety
     }
 }
 
diff --git a/addons/web/static/src/views/form/form_controller.xml b/addons/web/static/src/views/form/form_controller.xml
index cfd58b23c5b..eb11532e4c8 100644
--- a/addons/web/static/src/views/form/form_controller.xml
+++ b/addons/web/static/src/views/form/form_controller.xml
@@ -5,47 +5,65 @@
         <div t-att-class="className" t-ref="root">
             <div class="o_form_view_container">
                 <Layout className="model.useSampleModel ? 'o_view_sample_data' : ''" display="display">
+                    <t t-set-slot="control-panel-create-button">
+                        <t t-if="canCreate">
+                            <button type="button" class="btn btn-secondary o_form_button_create" data-hotkey="c" t-on-click.stop="create">New</button>
+                        </t>
+                    </t>
+
                     <t t-set-slot="layout-buttons">
-                        <t t-if="footerArchInfo and env.inDialog">
-                            <t t-component="props.Renderer" record="model.root" Compiler="props.Compiler" archInfo="footerArchInfo" enableViewButtons.bind="enableButtons" disableViewButtons.bind="disableButtons"/>
-                        </t>
-                        <t t-else="">
-                            <t t-call="{{ props.buttonTemplate }}"/>
+                        <t t-if="env.inDialog">
+                            <t t-if="footerArchInfo">
+                                <t t-component="props.Renderer" record="model.root" Compiler="props.Compiler" archInfo="footerArchInfo" />
+                            </t>
+                            <t t-else="">
+                                <t t-call="{{ props.buttonTemplate }}"/>
+                            </t>
                         </t>
                     </t>
-                    <t t-set-slot="control-panel-action-menu">
+
+                    <t t-set-slot="layout-actions">
+                        <t t-if="buttonBoxTemplate">
+                            <t t-call="{{ buttonBoxTemplate }}" t-call-context="{ __comp__: Object.assign(Object.create(this), { this, props: { ...this.props, record: this.model.root } }) }"/>
+                        </t>
+                    </t>
+
+                    <t t-set-slot="control-panel-additional-actions">
                         <t t-if="props.info.actionMenus">
-                            <ActionMenus
-                                getActiveIds="() => model.root.isNew ? [] : [model.root.resId]"
-                                context="props.context"
-                                items="actionMenuItems"
-                                isDomainSelected="model.root.isDomainSelected"
-                                resModel="model.root.resModel"
-                                domain="props.domain"
-                                onActionExecuted="() => model.load({ resId: model.root.resId, resIds: model.root.resIds })"
-                                shouldExecuteAction.bind="shouldExecuteAction"
-                            />
+                            <CogMenu>
+                                <ActionMenusItems
+                                    getActiveIds="() => model.root.isNew ? [] : [model.root.resId]"
+                                    context="props.context"
+                                    items="actionMenuItems"
+                                    isDomainSelected="model.root.isDomainSelected"
+                                    resModel="model.root.resModel"
+                                    domain="props.domain"
+                                    onActionExecuted="() => model.load({ resId: model.root.resId, resIds: model.root.resIds })"
+                                    shouldExecuteAction.bind="shouldExecuteAction"
+                                />
+                            </CogMenu>
                         </t>
                     </t>
+
                     <t t-set-slot="control-panel-status-indicator">
                         <t t-if="canEdit">
-                            <FormStatusIndicator model="model" discard.bind="discard" save.bind="saveButtonClicked" isDisabled="state.isDisabled" />
+                            <FormStatusIndicator model="model" discard.bind="discard" save.bind="saveButtonClicked" />
                         </t>
                     </t>
                     <t t-set-slot="control-panel-create-button">
                         <t t-if="canCreate">
-                            <button type="button" class="btn btn-outline-primary o_form_button_create" data-hotkey="c" t-on-click.stop="create" t-att-disabled="state.isDisabled">New</button>
+                            <button type="button" class="btn btn-outline-primary o_form_button_create" data-hotkey="c" t-on-click.stop="create">New</button>
                         </t>
                     </t>
-                    <t t-component="props.Renderer" record="model.root" Compiler="props.Compiler" archInfo="archInfo" enableViewButtons.bind="enableButtons" disableViewButtons.bind="disableButtons" onNotebookPageChange.bind="onNotebookPageChange" activeNotebookPages="props.state and props.state.activeNotebookPages"/>
+                    <t t-component="props.Renderer" record="model.root" Compiler="props.Compiler" archInfo="archInfo" translateAlert="translateAlert" onNotebookPageChange.bind="onNotebookPageChange" activeNotebookPages="props.state and props.state.activeNotebookPages"/>
                 </Layout>
             </div>
         </div>
     </t>
 
     <t t-name="web.FormView.Buttons" owl="1">
-        <div class="o_cp_buttons" role="toolbar" aria-label="Main actions" t-ref="cpButtons">
-            <div t-if="model.root.isInEdition" class="o_form_buttons_edit">
+        <div class="o_cp_buttons d-flex align-items-baseline" role="toolbar" aria-label="Main actions" t-ref="cpButtons">
+            <div t-if="model.root.isInEdition" class="o_form_buttons_edit d-flex gap-1">
                 <button type="button" class="btn btn-primary o_form_button_save" data-hotkey="s" t-on-click.stop="() => this.saveButtonClicked({closable: true})">
                     Save
                 </button>
diff --git a/addons/web/static/src/views/form/form_renderer.js b/addons/web/static/src/views/form/form_renderer.js
index c36596a4910..b1f58ce66f3 100644
--- a/addons/web/static/src/views/form/form_renderer.js
+++ b/addons/web/static/src/views/form/form_renderer.js
@@ -114,8 +114,6 @@ FormRenderer.props = {
     // Template props : added by the FormCompiler
     class: { type: String, optional: 1 },
     translateAlert: { type: [Object, { value: null }], optional: true },
-    enableViewButtons: { type: Function, optional: true },
-    disableViewButtons: { type: Function, optional: true },
     onNotebookPageChange: { type: Function, optional: true },
     activeNotebookPages: { type: Object, optional: true },
     setFieldAsDirty: { type: Function, optional: true },
@@ -123,6 +121,4 @@ FormRenderer.props = {
 FormRenderer.defaultProps = {
     activeNotebookPages: {},
     onNotebookPageChange: () => {},
-    enableViewButtons: () => {},
-    disableViewButtons: () => {},
 };
diff --git a/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.js b/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.js
index 658e43dc34e..54585d78468 100644
--- a/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.js
+++ b/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { Component, useState } from "@odoo/owl";
+import { Component, useEffect, useRef, useState } from "@odoo/owl";
 import { useBus } from "@web/core/utils/hooks";
 
 export class FormStatusIndicator extends Component {
@@ -13,6 +13,18 @@ export class FormStatusIndicator extends Component {
             "FIELD_IS_DIRTY",
             (ev) => (this.state.fieldIsDirty = ev.detail)
         );
+        useEffect(
+            () => {
+                if (!this.props.model.root.isNew && this.indicatorMode === "invalid") {
+                    this.saveButton.el.setAttribute("disabled", "1");
+                } else {
+                    this.saveButton.el.removeAttribute("disabled");
+                }
+            },
+            () => [this.props.model.root.isValid]
+        );
+
+        this.saveButton = useRef("save");
     }
 
     get displayButtons() {
@@ -43,5 +55,4 @@ FormStatusIndicator.props = {
     model: Object,
     save: Function,
     discard: Function,
-    isDisabled: Boolean,
 };
diff --git a/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.xml b/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.xml
index aeebcfb3f8d..e5fbfd60129 100644
--- a/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.xml
+++ b/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.xml
@@ -2,22 +2,21 @@
 <templates xml:space="preserve">
 
     <t t-name="web.FormStatusIndicator" owl="1">
-        <div class="o_form_status_indicator d-md-flex ms-md-1" t-att-class="{ o_form_status_indicator_new_record: props.model.root.isNew }">
+        <div class="o_form_status_indicator d-md-flex align-items-center align-self-md-end me-auto" t-att-class="{ o_form_status_indicator_new_record: props.model.root.isNew }">
             <div class="o_form_status_indicator_buttons d-flex" t-att-class="{ invisible: !(props.model.root.isNew or displayButtons) }">
                 <button
                     type="button"
-                    class="o_form_button_save btn btn-light py-0"
-                    t-att-disabled="props.isDisabled"
+                    class="o_form_button_save btn btn-light px-1 py-0 lh-sm"
                     data-hotkey="s"
                     t-on-click.stop="save"
                     data-tooltip="Save manually"
-                    aria-label="Save manually">
+                    aria-label="Save manually"
+                    t-ref="save">
                     <i class="fa fa-cloud-upload fa-fw" />
                 </button>
                 <button
                     type="button"
-                    class="o_form_button_cancel btn btn-light py-0"
-                    t-att-disabled="props.isDisabled"
+                    class="o_form_button_cancel btn btn-light px-1 py-0 lh-sm"
                     data-hotkey="j"
                     t-on-click.stop="discard"
                     data-tooltip="Discard changes"
@@ -28,9 +27,8 @@
             <span
                 t-if="!props.model.root.isNew and indicatorMode === 'invalid'"
                 class="text-danger small ms-2"
-                data-tooltip="Correct issues to save, or discard changes">
+                data-tooltip="Unable to save. Correct the issue or discard changes">
                 <i class="fa fa-warning" />
-                Unable to save
             </span>
         </div>
     </t>
diff --git a/addons/web/static/src/views/form/form_view.js b/addons/web/static/src/views/form/form_view.js
index 271add520b6..edcbbff784a 100644
--- a/addons/web/static/src/views/form/form_view.js
+++ b/addons/web/static/src/views/form/form_view.js
@@ -6,14 +6,12 @@ import { RelationalModel } from "../basic_relational_model";
 import { FormArchParser } from "./form_arch_parser";
 import { FormController } from "./form_controller";
 import { FormCompiler } from "./form_compiler";
-import { FormControlPanel } from "./control_panel/form_control_panel";
 
 export const formView = {
     type: "form",
     display_name: "Form",
     multiRecord: false,
     searchMenuTypes: [],
-    ControlPanel: FormControlPanel,
     Controller: FormController,
     Renderer: FormRenderer,
     ArchParser: FormArchParser,
diff --git a/addons/web/static/src/views/form/status_bar_buttons/status_bar_buttons.xml b/addons/web/static/src/views/form/status_bar_buttons/status_bar_buttons.xml
index a775d91404f..210c11b0465 100644
--- a/addons/web/static/src/views/form/status_bar_buttons/status_bar_buttons.xml
+++ b/addons/web/static/src/views/form/status_bar_buttons/status_bar_buttons.xml
@@ -2,7 +2,7 @@
 <templates xml:space="preserve">
 
     <t t-name="web.StatusBarButtons" owl="1">
-        <div class="o_statusbar_buttons d-flex align-items-center align-content-around flex-wrap">
+        <div class="o_statusbar_buttons d-flex align-items-center align-content-around flex-wrap gap-1">
             <t t-set="slots" t-value="visibleSlotNames" />
             <t t-if="env.isSmall and slots.length > 1">
                 <Dropdown togglerClass="'btn btn-primary'" showCaret="true">
diff --git a/addons/web/static/src/views/graph/graph_controller.js b/addons/web/static/src/views/graph/graph_controller.js
index f434967bfbc..7744c8436f4 100644
--- a/addons/web/static/src/views/graph/graph_controller.js
+++ b/addons/web/static/src/views/graph/graph_controller.js
@@ -1,18 +1,17 @@
 /** @odoo-module **/
 
-import { Dropdown } from "@web/core/dropdown/dropdown";
-import { DropdownItem } from "@web/core/dropdown/dropdown_item";
-import { useService } from "@web/core/utils/hooks";
 import { Layout } from "@web/search/layout";
 import { useModel } from "@web/views/model";
 import { standardViewProps } from "@web/views/standard_view_props";
 import { useSetupView } from "@web/views/view_hook";
+import { SearchBar } from "@web/search/search_bar/search_bar";
+import { useSearchBarToggler } from "@web/search/search_bar/search_bar_toggler";
+import { CogMenu } from "@web/search/cog_menu/cog_menu";
 
 import { Component, useRef } from "@odoo/owl";
 
 export class GraphController extends Component {
     setup() {
-        this.actionService = useService("action");
         this.model = useModel(this.props.Model, this.props.modelParams);
 
         useSetupView({
@@ -22,6 +21,7 @@ export class GraphController extends Component {
             },
             getContext: () => this.getContext(),
         });
+        this.searchBarToggler = useSearchBarToggler();
     }
 
     /**
@@ -44,90 +44,10 @@ export class GraphController extends Component {
         }
         return context;
     }
-
-    /**
-     * Execute the action to open the view on the current model.
-     *
-     * @param {Array} domain
-     * @param {Array} views
-     * @param {Object} context
-     */
-    openView(domain, views, context) {
-        this.actionService.doAction(
-            {
-                context,
-                domain,
-                name: this.model.metaData.title,
-                res_model: this.model.metaData.resModel,
-                target: "current",
-                type: "ir.actions.act_window",
-                views,
-            },
-            {
-                viewType: "list",
-            }
-        );
-    }
-    /**
-     * @param {string} domain the domain of the clicked area
-     */
-    onGraphClicked(domain) {
-        const { context } = this.model.metaData;
-
-        Object.keys(context).forEach((x) => {
-            if (x === "group_by" || x.startsWith("search_default_")) {
-                delete context[x];
-            }
-        });
-
-        const views = {};
-        for (const [viewId, viewType] of this.env.config.views || []) {
-            views[viewType] = viewId;
-        }
-        function getView(viewType) {
-            return [views[viewType] || false, viewType];
-        }
-        const actionViews = [getView("list"), getView("form")];
-        this.openView(domain, actionViews, context);
-    }
-
-    /**
-     * @param {Object} param0
-     * @param {string} param0.measure
-     */
-    onMeasureSelected({ measure }) {
-        this.model.updateMetaData({ measure });
-    }
-
-    /**
-     * @param {"bar"|"line"|"pie"} mode
-     */
-    onModeSelected(mode) {
-        this.model.updateMetaData({ mode });
-    }
-
-    /**
-     * @param {"ASC"|"DESC"} order
-     */
-    toggleOrder(order) {
-        const { order: currentOrder } = this.model.metaData;
-        const nextOrder = currentOrder === order ? null : order;
-        this.model.updateMetaData({ order: nextOrder });
-    }
-
-    toggleStacked() {
-        const { stacked } = this.model.metaData;
-        this.model.updateMetaData({ stacked: !stacked });
-    }
-
-    toggleCumulated() {
-        const { cumulated } = this.model.metaData;
-        this.model.updateMetaData({ cumulated: !cumulated });
-    }
 }
 
 GraphController.template = "web.GraphView";
-GraphController.components = { Dropdown, DropdownItem, Layout };
+GraphController.components = { Layout, SearchBar, CogMenu };
 
 GraphController.props = {
     ...standardViewProps,
diff --git a/addons/web/static/src/views/graph/graph_controller.xml b/addons/web/static/src/views/graph/graph_controller.xml
index 41e34c64423..91c11812b52 100644
--- a/addons/web/static/src/views/graph/graph_controller.xml
+++ b/addons/web/static/src/views/graph/graph_controller.xml
@@ -9,41 +9,41 @@
             </t>
         </div>
         <div class="btn-group" role="toolbar" aria-label="Change graph">
-            <button class="btn btn-light fa fa-bar-chart o_graph_button" data-tooltip="Bar Chart" aria-label="Bar Chart" data-mode="bar"
+            <button class="btn btn-secondary fa fa-bar-chart o_graph_button" data-tooltip="Bar Chart" aria-label="Bar Chart" data-mode="bar"
                 t-on-click="() => this.onModeSelected('bar')"
                 t-att-class="{ active: model.metaData.mode === 'bar' }"
             />
-            <button class="btn btn-light fa fa-line-chart o_graph_button" data-tooltip="Line Chart" aria-label="Line Chart" data-mode="line"
+            <button class="btn btn-secondary fa fa-line-chart o_graph_button" data-tooltip="Line Chart" aria-label="Line Chart" data-mode="line"
                 t-on-click="() => this.onModeSelected('line')"
                 t-att-class="{ active: model.metaData.mode === 'line' }"
             />
-            <button class="btn btn-light fa fa-pie-chart o_graph_button" data-tooltip="Pie Chart" aria-label="Pie Chart" data-mode="pie"
+            <button class="btn btn-secondary fa fa-pie-chart o_graph_button" data-tooltip="Pie Chart" aria-label="Pie Chart" data-mode="pie"
                 t-on-click="() => this.onModeSelected('pie')"
                 t-att-class="{ active: model.metaData.mode === 'pie' }"
             />
         </div>
         <div t-if="model.metaData.mode === 'bar'" class="btn-group" role="toolbar" aria-label="Change graph">
-            <button class="btn btn-light fa fa-database o_graph_button" data-tooltip="Stacked" aria-label="Stacked"
+            <button class="btn btn-secondary fa fa-database o_graph_button" data-tooltip="Stacked" aria-label="Stacked"
                 t-on-click="toggleStacked"
                 t-att-class="{ active: model.metaData.stacked }"
             />
         </div>
         <div t-if="model.metaData.mode === 'line'" class="btn-group" role="toolbar" aria-label="Change graph">
-            <button class="btn btn-light fa fa-database o_graph_button" data-tooltip="Stacked" aria-label="Stacked"
+            <button class="btn btn-secondary fa fa-database o_graph_button" data-tooltip="Stacked" aria-label="Stacked"
                 t-on-click="toggleStacked"
                 t-att-class="{ active: model.metaData.stacked }"
             />
-            <button class="btn btn-light fa fa-signal o_graph_button" data-tooltip="Cumulative" aria-label="Cumulative"
+            <button class="btn btn-secondary fa fa-signal o_graph_button" data-tooltip="Cumulative" aria-label="Cumulative"
                 t-on-click="toggleCumulated"
                 t-att-class="{ active: model.metaData.cumulated }"
             />
         </div>
         <div t-if="model.metaData.mode !== 'pie' and model.metaData.domains.length === 1" class="btn-group" role="toolbar" aria-label="Sort graph" name="toggleOrderToolbar">
-            <button class="btn btn-light fa fa-sort-amount-desc o_graph_button" data-tooltip="Descending" aria-label="Descending"
+            <button class="btn btn-secondary fa fa-sort-amount-desc o_graph_button" data-tooltip="Descending" aria-label="Descending"
                 t-on-click="() => this.toggleOrder('DESC')"
                 t-att-class="{ active: model.metaData.order === 'DESC' }"
             />
-            <button class="btn btn-light fa fa-sort-amount-asc o_graph_button" data-tooltip="Ascending" aria-label="Ascending"
+            <button class="btn btn-secondary fa fa-sort-amount-asc o_graph_button" data-tooltip="Ascending" aria-label="Ascending"
                 t-on-click="() => this.toggleOrder('ASC')"
                 t-att-class="{ active: model.metaData.order === 'ASC' }"
             />
@@ -53,14 +53,20 @@
     <t t-name="web.GraphView" owl="1">
         <div t-att-class="props.className" t-ref="root">
             <Layout className="model.useSampleModel ? 'o_view_sample_data' : ''" display="props.display">
-                <t t-set-slot="layout-buttons">
-                    <t t-call="{{ props.buttonTemplate }}"/>
+                <t t-set-slot="control-panel-additional-actions">
+                    <CogMenu/>
+                </t>
+                <t t-set-slot="layout-actions">
+                    <SearchBar t-if="searchBarToggler.state.showSearchBar"/>
+                </t>
+                <t t-set-slot="control-panel-navigation-additional">
+                    <t t-component="searchBarToggler.component" t-props="searchBarToggler.props"/>
                 </t>
                 <t t-if="model.data">
                     <t t-if="model.useSampleModel and props.info.noContentHelp" t-call="web.ActionHelper">
                         <t t-set="noContentHelp" t-value="props.info.noContentHelp"/>
                     </t>
-                    <t t-component="props.Renderer" model="model" onGraphClicked.bind="onGraphClicked" />
+                    <t t-component="props.Renderer" model="model" buttonTemplate="props.buttonTemplate" />
                 </t>
                 <t t-else="" t-call="web.NoContentHelper">
                     <t t-set="title">Invalid data</t>
diff --git a/addons/web/static/src/views/graph/graph_renderer.js b/addons/web/static/src/views/graph/graph_renderer.js
index 98c0b1d227a..4aeec4c868f 100644
--- a/addons/web/static/src/views/graph/graph_renderer.js
+++ b/addons/web/static/src/views/graph/graph_renderer.js
@@ -10,6 +10,8 @@ import { renderToString } from "@web/core/utils/render";
 import { useService } from "@web/core/utils/hooks";
 
 import { Component, onWillUnmount, useEffect, useRef, onWillStart } from "@odoo/owl";
+import { Dropdown } from "@web/core/dropdown/dropdown";
+import { DropdownItem } from "@web/core/dropdown/dropdown_item";
 
 const NO_DATA = _lt("No data");
 
@@ -49,6 +51,7 @@ export class GraphRenderer extends Component {
         this.canvasRef = useRef("canvas");
         this.containerRef = useRef("container");
         this.cookies = useService("cookie");
+        this.actionService = useService("action");
 
         this.chart = null;
         this.tooltip = null;
@@ -450,15 +453,8 @@ export class GraphRenderer extends Component {
      * @returns {Object}
      */
     getScaleOptions() {
-        const {
-            allIntegers,
-            fields,
-            groupBy,
-            measure,
-            measures,
-            mode,
-            stacked,
-        } = this.model.metaData;
+        const { allIntegers, fields, groupBy, measure, measures, mode, stacked } =
+            this.model.metaData;
         if (mode === "pie") {
             return {};
         }
@@ -558,7 +554,7 @@ export class GraphRenderer extends Component {
         const { _datasetIndex, _index } = activeElement;
         const { domains } = this.chart.data.datasets[_datasetIndex];
         if (domains) {
-            this.props.onGraphClicked(domains[_index]);
+            this.onGraphClickedFinal(domains[_index]);
         }
     }
 
@@ -674,7 +670,88 @@ export class GraphRenderer extends Component {
         // advancing the animation service.
         Chart.animationService.advance();
     }
+
+    /**
+     * Execute the action to open the view on the current model.
+     *
+     * @param {Array} domain
+     * @param {Array} views
+     * @param {Object} context
+     */
+    openView(domain, views, context) {
+        this.actionService.doAction(
+            {
+                context,
+                domain,
+                name: this.model.metaData.title,
+                res_model: this.model.metaData.resModel,
+                target: "current",
+                type: "ir.actions.act_window",
+                views,
+            },
+            {
+                viewType: "list",
+            }
+        );
+    }
+    /**
+     * @param {string} domain the domain of the clicked area
+     */
+    onGraphClickedFinal(domain) {
+        const { context } = this.model.metaData;
+
+        Object.keys(context).forEach((x) => {
+            if (x === "group_by" || x.startsWith("search_default_")) {
+                delete context[x];
+            }
+        });
+
+        const views = {};
+        for (const [viewId, viewType] of this.env.config.views || []) {
+            views[viewType] = viewId;
+        }
+        function getView(viewType) {
+            return [views[viewType] || false, viewType];
+        }
+        const actionViews = [getView("list"), getView("form")];
+        this.openView(domain, actionViews, context);
+    }
+
+    /**
+     * @param {Object} param0
+     * @param {string} param0.measure
+     */
+    onMeasureSelected({ measure }) {
+        this.model.updateMetaData({ measure });
+    }
+
+    /**
+     * @param {"bar"|"line"|"pie"} mode
+     */
+    onModeSelected(mode) {
+        this.model.updateMetaData({ mode });
+    }
+
+    /**
+     * @param {"ASC"|"DESC"} order
+     */
+    toggleOrder(order) {
+        const { order: currentOrder } = this.model.metaData;
+        const nextOrder = currentOrder === order ? null : order;
+        this.model.updateMetaData({ order: nextOrder });
+    }
+
+    toggleStacked() {
+        const { stacked } = this.model.metaData;
+        this.model.updateMetaData({ stacked: !stacked });
+    }
+
+    toggleCumulated() {
+        const { cumulated } = this.model.metaData;
+        this.model.updateMetaData({ cumulated: !cumulated });
+    }
 }
 
 GraphRenderer.template = "web.GraphRenderer";
-GraphRenderer.props = ["class?", "model", "onGraphClicked"];
+GraphRenderer.components = { Dropdown, DropdownItem };
+GraphRenderer.props = ["class?", "model", "buttonTemplate"];
diff --git a/addons/web/static/src/views/graph/graph_renderer.xml b/addons/web/static/src/views/graph/graph_renderer.xml
index ea324d3e947..6bb1f82e27f 100644
--- a/addons/web/static/src/views/graph/graph_renderer.xml
+++ b/addons/web/static/src/views/graph/graph_renderer.xml
@@ -28,8 +28,11 @@
     </t>
 
     <t t-name="web.GraphRenderer" owl="1">
-        <div t-att-class="'o_graph_renderer o_renderer h-100 ' + props.class" t-ref="root">
-            <div class="o_graph_canvas_container h-100 position-relative" t-ref="container">
+        <div t-att-class="'o_graph_renderer o_renderer h-100 d-flex flex-column border-top ' + props.class" t-ref="root">
+            <div class="d-flex gap-1 mt-2 mx-3 mb-3">
+                <t t-call="{{ props.buttonTemplate }}"/>
+            </div>
+            <div class="o_graph_canvas_container flex-grow-1 position-relative" t-ref="container">
                 <canvas t-ref="canvas" />
             </div>
         </div>
diff --git a/addons/web/static/src/views/graph/graph_view.scss b/addons/web/static/src/views/graph/graph_view.scss
index 007585c03ef..c6664629f78 100644
--- a/addons/web/static/src/views/graph/graph_view.scss
+++ b/addons/web/static/src/views/graph/graph_view.scss
@@ -1,6 +1,10 @@
 // ------- Graph renderer -------
-.o_graph_renderer canvas {
-    background-color: $o-view-background-color;
+.o_graph_view {
+    --ControlPanel-border-bottom: none;
+
+    .o_graph_renderer canvas {
+        background-color: $o-view-background-color;
+    }
 }
 
 .o_graph_view {
diff --git a/addons/web/static/src/views/kanban/kanban.variables.scss b/addons/web/static/src/views/kanban/kanban.variables.scss
index 71d7f0eb0bd..339e9ce2d33 100644
--- a/addons/web/static/src/views/kanban/kanban.variables.scss
+++ b/addons/web/static/src/views/kanban/kanban.variables.scss
@@ -1,11 +1,12 @@
-$o-kanban-default-record-width: 300px !default;
-$o-kanban-small-record-width: 240px !default;
+$o-kanban-background: $o-gray-100 !default;
+$o-kanban-default-record-width: 320px !default;
+$o-kanban-small-record-width: 300px !default;
 $o-kanban-header-title-height: 50px !default;
 $o-kanban-image-width: 64px !default;
 $o-kanban-image-fill-width: 95px !default;
-$o-kanban-inside-vgutter: 8px !default;
-$o-kanban-inside-hgutter: 8px !default;
-$o-kanban-color-border-width: 2px !default;
+$o-kanban-inside-vgutter: $o-spacer * 0.5 !default;
+$o-kanban-inside-hgutter: $o-spacer * 0.5 !default;
+$o-kanban-color-border-width: 3px !default;
 $o-kanban-inner-hmargin: 5px !default;
 $o-kanban-progressbar-height: 20px !default;
 $o-kanban-mobile-tabs-height: 40px !default;
diff --git a/addons/web/static/src/views/kanban/kanban_column_progressbar.scss b/addons/web/static/src/views/kanban/kanban_column_progressbar.scss
index a47ac2f166c..775fc8c8337 100644
--- a/addons/web/static/src/views/kanban/kanban_column_progressbar.scss
+++ b/addons/web/static/src/views/kanban/kanban_column_progressbar.scss
@@ -1,14 +1,10 @@
 @mixin o-kanban-css-filter($class, $accent-color) {
     // Provide CSS reordering and highlight
     &.o_kanban_group_show_#{$class} {
-        $mix-soft: mix($accent-color, $o-webclient-background-color, 5%);
-        $mix-full: mix($accent-color, $o-webclient-background-color);
+        --KanbanGroup-background: #{mix($accent-color, $o-kanban-background, 5%)};
 
-        &,
-        .o_kanban_header {
-            background-color: $mix-soft;
-            border-color: $mix-full;
-        }
+        outline: $border-width solid $o-view-background-color;
+        box-shadow: inset 2px 0 0 $accent-color, inset -2px 0 0 $accent-color;
 
         .oe_kanban_card_#{$class} {
             order: 1;
@@ -22,7 +18,6 @@
         .o_kanban_record:not(.oe_kanban_card_#{$class}) {
             order: 3;
             @include o-hover-opacity(0.5);
-            box-shadow: none;
         }
     }
 }
@@ -34,6 +29,10 @@
 
         > .o_column_progress {
             height: $font-size-sm;
+
+            .bg-200 {
+                --background-color: RGBA(#{to-rgb($o-gray-300)}, var(--bg-opacity, 1))
+            }
         }
     }
 
@@ -43,5 +42,6 @@
         @include o-kanban-css-filter(danger, map-get($theme-colors, "danger"));
         @include o-kanban-css-filter(muted, map-get($theme-colors, "dark"));
         @include o-kanban-css-filter(info, map-get($theme-colors, "info"));
+        @include o-kanban-css-filter(purple, purple);
     }
 }
diff --git a/addons/web/static/src/views/kanban/kanban_column_quick_create.xml b/addons/web/static/src/views/kanban/kanban_column_quick_create.xml
index 4b3b6d9dce8..e49b4352c26 100644
--- a/addons/web/static/src/views/kanban/kanban_column_quick_create.xml
+++ b/addons/web/static/src/views/kanban/kanban_column_quick_create.xml
@@ -3,36 +3,34 @@
 
     <t t-name="web.KanbanColumnQuickCreate" owl="1">
         <div class="o_column_quick_create flex-shrink-0 flex-grow-1 flex-md-grow-0" t-ref="root">
-            <div t-if="props.folded" class="o_quick_create_folded m-3 text-nowrap fw-bold opacity-75 opacity-100-hover" t-on-click="unfold">
-                <button class="o_kanban_add_column btn btn-outline-secondary w-100">
-                    <i class="fa fa-plus me-2" role="img" aria-label="Add column" title="Add column"/><t t-out="relatedFieldName"/>
+            <div t-if="props.folded" class="o_quick_create_folded position-sticky z-index-1 my-3 text-nowrap" t-on-click="unfold">
+                <button class="o_kanban_add_column btn btn-light w-100" aria-label="Add column" data-tooltip="Add column">
+                    <i class="fa fa-plus me-2" role="img"/><t t-out="relatedFieldName"/>
                 </button>
             </div>
-            <div t-else="" class="o_quick_create_unfolded pt-3 px-2 pb-2">
+            <div t-else="" class="o_quick_create_unfolded pt-3 pb-2">
                 <div class="o_kanban_header top-0 pb-3">
-                    <div class="input-group">
+                    <div class="input-group mb-1">
                         <input type="text"
-                            class="form-control o_input bg-transparent fs-4"
+                            class="form-control bg-view"
                             t-attf-placeholder="{{ relatedFieldName }}..."
                             t-ref="autofocus"
                             t-model.trim="state.columnTitle"
                             t-on-focus="() => state.hasInputFocused = true"
                             t-on-blur="() => state.hasInputFocused = false"
                         />
-                        <span class="input-group-append">
-                            <button class="btn btn-primary o_kanban_add" type="button" t-on-click="validate">
-                                Add
-                            </button>
-                        </span>
+                        <button class="btn btn-primary o_kanban_add" type="button" t-on-click="validate">
+                            Add
+                        </button>
                     </div>
                     <small t-if="!env.isSmall and state.hasInputFocused" class="o_discard_msg text-muted float-end">
-                        Esc to discard
+                        Press <kbd>Esc</kbd> to discard
                     </small>
                     <t t-if="canShowExamples and !env.isSmall">
                         <button type="button" class="btn btn-link o_kanban_examples p-0" t-on-click="showExamples">See examples</button>
                     </t>
                 </div>
-                <div t-foreach="[,,,]" t-as="i" t-key="i_index" class="o_kanban_muted_record mt-3 py-5 bg-300" />
+                <div t-foreach="[,,,]" t-as="i" t-key="i_index" class="o_kanban_muted_record mb-2 py-5 bg-300 opacity-50" />
             </div>
         </div>
     </t>
diff --git a/addons/web/static/src/views/kanban/kanban_controller.js b/addons/web/static/src/views/kanban/kanban_controller.js
index 26387658bc9..37926cf9ce3 100644
--- a/addons/web/static/src/views/kanban/kanban_controller.js
+++ b/addons/web/static/src/views/kanban/kanban_controller.js
@@ -9,6 +9,9 @@ import { MultiRecordViewButton } from "@web/views/view_button/multi_record_view_
 import { useViewButtons } from "@web/views/view_button/view_button_hook";
 import { useSetupView } from "@web/views/view_hook";
 import { KanbanRenderer } from "./kanban_renderer";
+import { SearchBar } from "@web/search/search_bar/search_bar";
+import { useSearchBarToggler } from "@web/search/search_bar/search_bar_toggler";
+import { CogMenu } from "@web/search/cog_menu/cog_menu";
 
 import { Component, reactive, useRef } from "@odoo/owl";
 
@@ -76,6 +79,7 @@ export class KanbanController extends Component {
                 };
             }
         });
+        this.searchBarToggler = useSearchBarToggler();
     }
 
     get modelParams() {
@@ -174,7 +178,7 @@ export class KanbanController extends Component {
 }
 
 KanbanController.template = `web.KanbanView`;
-KanbanController.components = { Layout, KanbanRenderer, MultiRecordViewButton };
+KanbanController.components = { Layout, KanbanRenderer, MultiRecordViewButton, SearchBar, CogMenu };
 KanbanController.props = {
     ...standardViewProps,
     defaultGroupBy: { validate: (dgb) => !dgb || typeof dgb === "string", optional: true },
diff --git a/addons/web/static/src/views/kanban/kanban_controller.scss b/addons/web/static/src/views/kanban/kanban_controller.scss
index 1b182fbf4d0..be79f524f50 100644
--- a/addons/web/static/src/views/kanban/kanban_controller.scss
+++ b/addons/web/static/src/views/kanban/kanban_controller.scss
@@ -1,8 +1,20 @@
+// ------- Kanban View -------
+.o_kanban_view {
+    @include media-breakpoint-down(md) {
+        --ControlPanel-border-bottom: none;
+    }
+}
+
 // ------- Kanban renderer -------
 .o_kanban_renderer {
     // ----------------------------------------------------------------------------
     // Default KanbanView values
 
+    --Kanban-background: #{$o-kanban-background};
+    --Kanban-gap: unset;
+    --Kanban-padding: 0;
+
+    --KanbanGroup-background: var(--Kanban-background);
     --KanbanGroup-padding-h: #{$o-kanban-group-padding};
     --KanbanGroup-padding-bottom: #{$o-kanban-group-padding};
 
@@ -20,20 +32,35 @@
 
     --KanbanRecord__dropdown-gap: #{$border-width};
 
-    --KanbanColumn__highlight-background: #{rgba($o-info, 0.05)};
-    --KanbanColumn__highlight-border: #{$o-info};
+    --KanbanColumn__highlight-background: #{tint-color($o-action, 90%)};
+    --KanbanColumn__highlight-border: #{$o-action};
 
     --o-view-nocontent-zindex: 1;
+
     // ----------------------------------------------------------------------------
+    // Inner components contextual adaptations
+
+    --Ribbon-font-size: #{$font-size-sm};
+    --Ribbon-gap-top: calc(var(--KanbanRecord-padding-v) * -1 - #{$border-width});
+    --Ribbon-gap-right: 0;
+    --Ribbon-wrapper-width: 6.5rem;
+    --Ribbon-height:  calc(var(--Ribbon-font-size) * 2);
+    --Ribbon-z-index: 0;
+
+    // ----------------------------------------------------------------------------
+
+    border-top: $border-width solid var(--Kanban-background);
+    background: var(--Kanban-background);
+    padding: var(--Kanban-padding);
+    gap: var(--Kanban-gap);
 
     @include media-breakpoint-down(md) {
         --KanbanRecord-padding-h: #{$o-kanban-inside-hgutter * 2};
-        padding: 0px !important;
     }
 
     .o_kanban_record > div:not(.o_dropdown_kanban),
     .o_kanban_quick_create {
-        border: 1px solid $border-color;
+        border: $border-width solid $border-color;
         background-color: $o-view-background-color;
     }
 
@@ -50,7 +77,7 @@
     .o_kanban_record {
         position: relative;
         min-width: 150px;
-        margin: 0 0 -1px;
+        margin: 0 0 (-$border-width);
 
         > div:not(.o_dropdown_kanban) {
             padding: var(--KanbanRecord-padding-v) var(--KanbanRecord-padding-h);
@@ -58,16 +85,11 @@
             height: 100%;
         }
 
-        &:focus,
-        &:focus-within {
-            margin-bottom: 0; // show the shadow on top of the previous & next cards in grouped mode
-        }
-
         // ------- Kanban Record, v11 Layout -------
         // Records colours
         > div::after {
             content: "";
-            @include o-position-absolute($border-width * 2, auto, $border-width * 2, $border-width);
+            @include o-position-absolute(0, auto, 0, 0);
             width: $o-kanban-color-border-width;
         }
 
@@ -103,7 +125,7 @@
         }
 
         .o_kanban_record_title {
-            @include o-kanban-record-title($font-size: 13px);
+            @include o-kanban-record-title();
             overflow-wrap: break-word;
             word-wrap: break-word;
         }
@@ -124,6 +146,7 @@
                 display: flex;
                 align-items: center;
                 min-height: 20px;
+                gap: map-get($map: $spacers, $key: 1);
             }
             .oe_kanban_bottom_left {
                 flex: 1 1 auto;
@@ -144,17 +167,6 @@
             }
             .oe_kanban_bottom_right {
                 flex: 0 1 auto;
-
-                .oe_kanban_avatar {
-                    border-radius: 50%;
-                    object-fit: cover;
-                }
-                .oe_kanban_avatar,
-                .o_field_many2one_avatar > div > .o_m2o_avatar {
-                    width: 20px;
-                    height: 20px;
-                    margin-left: 6px;
-                }
             }
             .o_link_muted {
                 color: $body-color;
@@ -311,7 +323,6 @@
         .o_field_many2many_tags {
             display: block;
             margin-bottom: var(--KanbanRecord-gap-v);
-            line-height: 1.2;
             word-break: break-all;
 
             &.avatar {
@@ -323,22 +334,9 @@
             }
 
             .o_tag {
-                display: inline-block;
-                margin-right: 4px;
-                font-size: 11px;
-                font-weight: 500;
-                background-color: transparent;
-                color: inherit;
-                box-shadow: none;
+                --Tag-max-width: MAX(200px, 100%);
+                --Tag-font-size: #{$o-font-size-base-smaller};
                 @include o-kanban-tag-color;
-
-                span {
-                    display: inline-block;
-                    width: 6px;
-                    height: 6px;
-                    margin-right: 4px;
-                    border-radius: 100%;
-                }
             }
         }
 
@@ -384,10 +382,10 @@
             cursor: pointer;
         }
 
-        &:focus,
+        &:focus-visible,
         &:focus-within {
             @include global-click-selector {
-                outline: thin solid mix(map-get($theme-colors, "primary"), map-get($grays, "400"));
+                outline: thin solid mix($o-main-link-color, map-get($grays, "300"));
                 outline-offset: -1px;
 
                 &:after {
@@ -464,23 +462,29 @@
 
     // Kanban Grouped Layout
     &.o_kanban_grouped {
+        --KanbanGroup-width: calc(var(--KanbanRecord--small-width) + (2 * var(--KanbanGroup-padding-h)));
+
         min-height: 100%;
 
         @include media-breakpoint-down(md) {
+            --KanbanGroup-width: 90%; // don't take full width to give a hint of next/previous column on smaller screens
+
             min-height: initial;
             height: 100%;
             overflow: scroll hidden !important;
             scroll-snap-type: x mandatory;
         }
 
+        @include media-breakpoint-up(lg) {
+            --KanbanGroup-width: calc(var(--KanbanRecord-width) + (2 * var(--KanbanGroup-padding-h)));
+        }
+
         .o_kanban_record {
             width: 100%;
         }
 
-        --KanbanGroup-width: 90%; // don't take full width to give a hint of next/previous column on smaller screens
-
-        @include media-breakpoint-up(md) {
-            --KanbanGroup-width: calc(var(--KanbanRecord-width) + (2 * var(--KanbanGroup-padding-h)));
+        .o_kanban_group {
+            background: var(--KanbanGroup-background);
         }
 
         .o_kanban_group,
@@ -495,8 +499,6 @@
 
     // Kanban Grouped Layout - Column default
     .o_kanban_group {
-        padding: 0 var(--KanbanGroup-padding-h) var(--KanbanGroup-padding-bottom);
-
         .o_kanban_header > .o_kanban_header_title {
             &:hover .o_kanban_config,
             .o_kanban_config.show {
@@ -527,15 +529,15 @@
         }
     }
 
-    .o_kanban_group .o_kanban_header,
-    .o_quick_create_folded {
-        position: sticky; // keep it visible
-        z-index: 1;
+    .o_kanban_group, .o_column_quick_create {
+        padding: 0 var(--KanbanGroup-padding-h) var(--KanbanGroup-padding-bottom);
+    }
+
+    .o_kanban_group .o_kanban_header, .o_quick_create_folded {
+        background: inherit;
     }
 
     .o_kanban_group:not(.o_column_folded) .o_kanban_header {
-        background-color: $o-webclient-background-color;
-
         .dropdown-item {
             max-width: calc(var(--KanbanRecord-width) * 0.75);
             text-overflow: ellipsis;
@@ -544,7 +546,7 @@
     }
 
     .o_quick_create_folded {
-        top: 1rem;
+        top: map-get($spacers, 3);
     }
 
     .o_column_quick_create,
@@ -554,39 +556,58 @@
     }
 
     .o_group_draggable .o_column_title {
-        cursor: move;
+        cursor: grab;
+
+        &:active {
+            cursor: grabbing;
+        }
     }
 
     // Kanban Grouped Layout - Column Folded
     .o_kanban_group.o_column_folded {
+
         // don't fill the width of record for a folded column
         .o_kanban_record.o_draggable {
             display: none !important;
         }
         // don't visually fold on smaller screens (aka. mobile)
         @include media-breakpoint-up(md) {
-            @include o-kanban-slim-col;
+            --KanbanGroup-padding-h: 0;
 
-            background-color: var(--KanbanGroup-grouped-bg, #{$gray-200});
+            &, .o_column_unfold {
+                cursor: col-resize;
+            }
 
             & + .o_kanban_group.o_column_folded {
                 margin-left: 1px;
             }
 
-            .o_kanban_header_title {
-                opacity: 0.5;
+            .o_kanban_header {
+                padding: 0 floor($o-kanban-group-padding * 0.7);
+            }
 
-                .o_column_title {
-                    @include o-kanban-v-title;
+            button.o_column_unfold {
+                padding: 0 .15rem;
+
+                .fa-caret-left {
+                    margin-right: 0.2rem;
                 }
             }
 
-            &:hover,
-            &.o_kanban_hover {
-                .o_kanban_header_title {
-                    opacity: 1;
+            &:hover button.o_column_unfold {
+                padding: 0;
+
+                .fa-caret-left {
+                    margin-right: 0.5rem;
                 }
             }
+
+            .o_column_title {
+                @include o-position-absolute(map-get($spacers, 4));
+                transform-origin: left bottom 0;
+                transform: rotate(90deg);
+                overflow: visible;
+            }
         }
     }
 
@@ -601,14 +622,17 @@
     // Kanban UN-grouped Layout
     &.o_kanban_ungrouped {
         min-height: 100%;
-        padding: var(--KanbanRecord-margin-v) var(--KanbanRecord-margin-h);
+
+        @include media-breakpoint-up(md) {
+            --Kanban-padding:  var(--KanbanRecord-margin-v) var(--KanbanRecord-margin-h);
+        }
 
         .o_kanban_record {
             width: var(--KanbanRecord-width);
             margin: calc(var(--KanbanRecord-margin-v) * 0.5) var(--KanbanRecord-margin-h);
 
             @include media-breakpoint-down(md) {
-                margin: 0 0 -1px 0;
+                margin: 0 0 #{-$border-width};
                 flex-basis: 100%;
             }
 
diff --git a/addons/web/static/src/views/kanban/kanban_controller.xml b/addons/web/static/src/views/kanban/kanban_controller.xml
index 56a78a762cc..d948992be94 100644
--- a/addons/web/static/src/views/kanban/kanban_controller.xml
+++ b/addons/web/static/src/views/kanban/kanban_controller.xml
@@ -4,9 +4,40 @@
     <t t-name="web.KanbanView" owl="1">
         <div t-att-class="className" t-ref="root">
             <Layout className="model.useSampleModel ? 'o_view_sample_data' : ''" display="props.display">
+                <t t-set-slot="control-panel-create-button">
+                    <t t-if="canCreate">
+                        <button type="button" class="btn btn-primary o-kanban-button-new" accesskey="c" t-on-click="() => this.createRecord()" data-bounce-button="">
+                            New
+                        </button>
+                    </t>
+                </t>
                 <t t-set-slot="layout-buttons">
                     <t t-call="{{ props.buttonTemplate }}"/>
                 </t>
+                <t t-set-slot="control-panel-always-buttons">
+                    <t t-foreach="headerButtons" t-as="button" t-key="button.id">
+                        <MultiRecordViewButton
+                            t-if="button.display === 'always'"
+                            list="model.root"
+                            className="button.className"
+                            clickParams="button.clickParams"
+                            defaultRank="'btn-secondary'"
+                            domain="props.domain"
+                            icon="button.icon"
+                            string="button.string"
+                            title="button.title"
+                        />
+                    </t>
+                </t>
+                <t t-set-slot="control-panel-additional-actions">
+                    <CogMenu/>
+                </t>
+                <t t-set-slot="layout-actions">
+                    <SearchBar t-if="searchBarToggler.state.showSearchBar"/>
+                </t>
+                <t t-set-slot="control-panel-navigation-additional">
+                    <t t-component="searchBarToggler.component" t-props="searchBarToggler.props"/>
+                </t>
                 <t t-component="props.Renderer"
                     list="model.root"
                     archInfo="props.archInfo"
@@ -19,32 +50,12 @@
                     canQuickCreate="canQuickCreate"
                     quickCreateState="quickCreateState"
                 />
-
             </Layout>
         </div>
     </t>
 
     <t t-name="web.KanbanView.Buttons" owl="1">
-        <div t-if="props.showButtons" class="o_cp_buttons d-flex align-items-baseline" role="toolbar" aria-label="Main actions">
-            <t t-if="canCreate">
-                <button type="button" class="btn btn-primary o-kanban-button-new" accesskey="c" t-on-click="() => this.createRecord()" data-bounce-button="">
-                    New
-                </button>
-            </t>
-            <t t-foreach="headerButtons" t-as="button" t-key="button.id">
-                <MultiRecordViewButton
-                    t-if="button.display === 'always'"
-                    list="model.root"
-                    className="button.className"
-                    clickParams="button.clickParams"
-                    defaultRank="'btn-secondary'"
-                    domain="props.domain"
-                    icon="button.icon"
-                    string="button.string"
-                    title="button.title"
-                />
-            </t>
-        </div>
+        <div t-if="props.showButtons" class="o_cp_buttons d-empty-none d-flex align-items-baseline" role="toolbar" aria-label="Main actions"/>
     </t>
 
 </templates>
diff --git a/addons/web/static/src/views/kanban/kanban_header.js b/addons/web/static/src/views/kanban/kanban_header.js
index a48fcf7abc2..2e885ba6a4b 100644
--- a/addons/web/static/src/views/kanban/kanban_header.js
+++ b/addons/web/static/src/views/kanban/kanban_header.js
@@ -64,7 +64,7 @@ export class KanbanHeader extends Component {
     }
 
     get groupName() {
-        const { groupByField, count, displayName, isFolded } = this.group;
+        const { groupByField, displayName } = this.group;
         let name = displayName;
         if (groupByField.type === "boolean") {
             name = name ? this.env._t("Yes") : this.env._t("No");
@@ -78,7 +78,7 @@ export class KanbanHeader extends Component {
                 name = this.env._t("None");
             }
         }
-        return !this.env.isSmall && isFolded ? `${name} (${count})` : name;
+        return name;
     }
 
     get groupAggregate() {
diff --git a/addons/web/static/src/views/kanban/kanban_header.xml b/addons/web/static/src/views/kanban/kanban_header.xml
index d711a35a390..8c4005cd7bd 100644
--- a/addons/web/static/src/views/kanban/kanban_header.xml
+++ b/addons/web/static/src/views/kanban/kanban_header.xml
@@ -2,13 +2,20 @@
 <templates xml:space="preserve">
 
     <t t-name="web.KanbanHeader" owl="1">
-        <div class="o_kanban_header top-0" t-ref="root" t-attf-class="{{ !env.isSmall and group.isFolded ? 'pt-3' : 'py-3' }}">
-            <div class="o_kanban_header_title position-relative d-flex align-items-baseline lh-lg text-900" t-on-mouseenter="onTitleMouseEnter" t-on-mouseleave="onTitleMouseLeave">
-                <span class="o_column_title flex-grow-1 d-inline-block mw-100 text-truncate fs-4 fw-bold align-top" t-att-class="{ 'overflow-visible': !env.isSmall and group.isFolded }" t-esc="groupName"/>
+        <div class="o_kanban_header position-sticky top-0 z-index-1" t-ref="root" t-attf-class="{{ !env.isSmall and group.isFolded ? 'pt-2' : 'py-3' }}">
+            <div class="o_kanban_header_title position-relative d-flex lh-lg" t-on-mouseenter="onTitleMouseEnter" t-on-mouseleave="onTitleMouseLeave">
+                <div t-if="!env.isSmall and group.isFolded" class="o_column_title d-flex align-items-center pt-1 fs-4 lh-1 text-nowrap opacity-50 opacity-100-hover">
+                    <t t-esc="groupName"></t>
+                    <span class="badge text-bg-500 rounded-pill lh-1 ms-2" t-esc="group.count"></span>
+                </div>
+                <span t-if="!env.isSmall and !group.isFolded"
+                    t-esc="groupName"
+                    class="o_column_title flex-grow-1 d-inline-block mw-100 text-truncate fs-4 fw-bold align-top text-900"
+                    />
                 <t t-if="env.isSmall or !group.isFolded">
-                    <Dropdown class="'o_kanban_config'" togglerClass="'btn p-0 border-0'" position="'bottom-end'" container="() => this.rootRef.el">
+                    <Dropdown class="'o_kanban_config'" togglerClass="'btn px-2'" position="'bottom-end'" container="() => this.rootRef.el">
                         <t t-set-slot="toggler">
-                            <i class="fa fa-gear fa-stack d-block text-center text-700 small opacity-50 opacity-100-hover cursor-pointer" role="img" aria-label="Settings" title="Settings" />
+                            <i class="fa fa-gear opacity-50 opacity-100-hover" role="img" aria-label="Settings" title="Settings"/>
                         </t>
                         <DropdownItem t-if="!env.isSmall" class="{
                                 'o_kanban_toggle_fold': true,
@@ -35,12 +42,13 @@
                             </DropdownItem>
                         </t>
                     </Dropdown>
-                    <button t-if="canQuickCreate()" class="o_kanban_quick_add btn p-0 border-0 fs-6 shadow-none" t-on-click="() => this.quickCreate()">
-                        <i class="fa fa-plus fa-stack d-block small text-end text-700 opacity-50 opacity-100-hover cursor-pointer" role="img" aria-label="Quick add" title="Quick add" />
+                    <button t-if="canQuickCreate()" class="o_kanban_quick_add btn pe-2 me-n2" t-on-click="() => this.quickCreate()">
+                        <i class="fa fa-plus opacity-75 opacity-100-hover" role="img" aria-label="Quick add" title="Quick add"/>
                     </button>
                 </t>
-                <button t-else="" class="o_column_unfold btn btn-link d-block mt-0 mt-md-2 p-0 border-0 small text-center text-700 cursor-pointer">
-                    <i class="fa fa-arrows-h" role="img" aria-label="Unfold" title="Unfold" />
+                <button t-else="" class="o_column_unfold btn d-flex align-items-center justify-content-between flex-nowrap pt-2 pb-3 transition-base">
+                    <i class="fa fa-caret-left lh-lg transition-base" role="img" aria-label="Unfold" title="Unfold" />
+                    <i class="fa fa-caret-right lh-lg" role="img" aria-label="Unfold" title="Unfold" />
                 </button>
             </div>
             <div t-if="(env.isSmall or !group.isFolded) and group.progressBars.length" class="o_kanban_counter position-relative d-flex align-items-center justify-content-between" t-att-class="{ 'opacity-25': !group.count }">
diff --git a/addons/web/static/src/views/kanban/kanban_record.xml b/addons/web/static/src/views/kanban/kanban_record.xml
index f01614ca682..0dab261002a 100644
--- a/addons/web/static/src/views/kanban/kanban_record.xml
+++ b/addons/web/static/src/views/kanban/kanban_record.xml
@@ -17,7 +17,7 @@
         <t t-if="showMenu">
             <Dropdown class="'o_dropdown_kanban bg-transparent position-absolute end-0'"
                       menuClass="'dropdown-menu'"
-                      togglerClass="'btn o-no-caret mt-0'"
+                      togglerClass="'btn o-no-caret rounded-0'"
                       position="'bottom-end'"
                       title="'Dropdown menu'">
                 <t t-set-slot="toggler">
diff --git a/addons/web/static/src/views/kanban/kanban_record_quick_create.xml b/addons/web/static/src/views/kanban/kanban_record_quick_create.xml
index ccc3e465b27..482ef15142d 100644
--- a/addons/web/static/src/views/kanban/kanban_record_quick_create.xml
+++ b/addons/web/static/src/views/kanban/kanban_record_quick_create.xml
@@ -16,7 +16,7 @@
                 <button class="btn btn-primary o_kanban_add me-1" t-on-click="() => this.validate('add')">
                     Add
                 </button>
-                <button class="btn btn-primary o_kanban_edit me-1" t-on-click="() => this.validate('edit')">
+                <button class="btn btn-secondary o_kanban_edit me-1" t-on-click="() => this.validate('edit')">
                     Edit
                 </button>
                 <span class="flex-grow-1"></span>
diff --git a/addons/web/static/src/views/kanban/kanban_renderer.js b/addons/web/static/src/views/kanban/kanban_renderer.js
index f0bcfb29008..54ec4c84952 100644
--- a/addons/web/static/src/views/kanban/kanban_renderer.js
+++ b/addons/web/static/src/views/kanban/kanban_renderer.js
@@ -295,10 +295,7 @@ export class KanbanRenderer extends Component {
             classes.push("o_kanban_no_records");
         }
         if (!this.env.isSmall && group.isFolded) {
-            classes.push("o_column_folded");
-        }
-        if (!group.isFolded) {
-            classes.push("bg-100");
+            classes.push("o_column_folded", "flex-basis-0");
         }
         if (group.progressBars.length) {
             classes.push("o_kanban_has_progressbar");
diff --git a/addons/web/static/src/views/kanban/kanban_renderer.xml b/addons/web/static/src/views/kanban/kanban_renderer.xml
index 8b8af886f12..bc4c84414da 100644
--- a/addons/web/static/src/views/kanban/kanban_renderer.xml
+++ b/addons/web/static/src/views/kanban/kanban_renderer.xml
@@ -12,6 +12,7 @@
                     <t t-set="isGroupProcessing" t-value="isProcessing(group.id)" />
                     <div class="o_kanban_group flex-shrink-0 flex-grow-1 flex-md-grow-0"
                         t-att-class="getGroupClasses(group, isGroupProcessing)"
+                        t-attf-class="{{ !env.isSmall and group.isFolded ? 'opacity-trigger-hover' : '' }}"
                         t-att-data-id="group.id"
                         t-on-click="(ev) => this.onGroupClick(group, ev)"
                     >
diff --git a/addons/web/static/src/views/list/list_controller.js b/addons/web/static/src/views/list/list_controller.js
index 0fa08195d72..9929ee7d01c 100644
--- a/addons/web/static/src/views/list/list_controller.js
+++ b/addons/web/static/src/views/list/list_controller.js
@@ -20,6 +20,12 @@ import { useViewButtons } from "@web/views/view_button/view_button_hook";
 import { ExportDataDialog } from "@web/views/view_dialogs/export_data_dialog";
 import { useSetupView } from "@web/views/view_hook";
 import { ListConfirmationDialog } from "./list_confirmation_dialog";
+import { SearchBar } from "@web/search/search_bar/search_bar";
+import { useSearchBarToggler } from "@web/search/search_bar/search_bar_toggler";
+import { Dropdown } from "@web/core/dropdown/dropdown";
+import { DropdownItem } from "@web/core/dropdown/dropdown_item";
+import { CogMenu } from "@web/search/cog_menu/cog_menu";
+import { ActionMenusItems } from "@web/search/cog_menu/action_menus_items";
 
 import { Component, onMounted, onWillStart, useEffect, useRef, useSubEnv } from "@odoo/owl";
 
@@ -139,6 +145,7 @@ export class ListController extends Component {
             },
             () => [this.model.root.selection.length]
         );
+        this.searchBarToggler = useSearchBarToggler();
     }
 
     get modelParams() {
@@ -371,15 +378,15 @@ export class ListController extends Component {
     }
 
     get display() {
-        if (!this.env.isSmall) {
+        const { controlPanel } = this.props.display;
+        if (!controlPanel) {
             return this.props.display;
         }
-        const { controlPanel } = this.props.display;
         return {
             ...this.props.display,
             controlPanel: {
                 ...controlPanel,
-                "bottom-right": !this.nbSelected,
+                layoutActions: !this.nbSelected,
             },
         };
     }
@@ -589,7 +596,17 @@ export class ListController extends Component {
 }
 
 ListController.template = `web.ListView`;
-ListController.components = { ActionMenus, Layout, ViewButton, MultiRecordViewButton };
+ListController.components = {
+    ActionMenus,
+    Layout,
+    ViewButton,
+    MultiRecordViewButton,
+    SearchBar,
+    Dropdown,
+    DropdownItem,
+    CogMenu,
+    ActionMenusItems,
+};
 ListController.props = {
     ...standardViewProps,
     allowSelectors: { type: Boolean, optional: true },
diff --git a/addons/web/static/src/views/list/list_controller.xml b/addons/web/static/src/views/list/list_controller.xml
index 4832877f7d9..8c0a00f8558 100644
--- a/addons/web/static/src/views/list/list_controller.xml
+++ b/addons/web/static/src/views/list/list_controller.xml
@@ -4,84 +4,107 @@
     <t t-name="web.ListView" owl="1">
         <div t-att-class="className" t-ref="root">
             <Layout className="model.useSampleModel ? 'o_view_sample_data' : ''" display="display">
-                <t t-set-slot="layout-buttons">
-                    <t t-if="env.isSmall and nbSelected">
-                        <t t-call="web.ListView.Selection" />
-                    </t>
-                    <t t-else="">
-                        <div class="o_cp_buttons" role="toolbar" aria-label="Control panel buttons" t-ref="buttons">
-                            <t t-call="{{ props.buttonTemplate }}"/>
-                        </div>
+                <t t-set-slot="control-panel-create-button">
+                    <t t-if="!model.root.editedRecord and activeActions.create and (!model.root.isGrouped or !editable) and !env.inDialog">
+                        <button type="button" class="btn btn-primary o_list_button_add" data-hotkey="c" t-on-click="onClickCreate" data-bounce-button="">
+                            New
+                        </button>
                     </t>
                 </t>
-                <t t-set-slot="control-panel-bottom-left">
-                    <t t-if="props.info.actionMenus and model.root.selection.length">
-                        <ActionMenus
-                            getActiveIds="() => model.root.selection.map((r) => r.resId)"
-                            context="props.context"
+
+                <t t-set-slot="layout-buttons">
+                    <t t-call="{{ props.buttonTemplate }}"/>
+                </t>
+                <t t-set-slot="control-panel-always-buttons">
+                    <t t-foreach="archInfo.headerButtons" t-as="button" t-key="button.id">
+                        <MultiRecordViewButton
+                            t-if="button.display === 'always'"
+                            list="model.root"
+                            className="button.className"
+                            clickParams="button.clickParams"
+                            defaultRank="'btn-secondary'"
                             domain="props.domain"
-                            items="actionMenuItems"
-                            isDomainSelected="model.root.isDomainSelected"
-                            resModel="model.root.resModel"
-                            onActionExecuted="() => model.load()"/>
+                            icon="button.icon"
+                            string="button.string"
+                            title="button.title"
+                        />
                     </t>
                 </t>
+
+                <t t-set-slot="layout-actions">
+                    <SearchBar t-if="searchBarToggler.state.showSearchBar"/>
+                </t>
+                <t t-set-slot="control-panel-navigation-additional">
+                    <t t-component="searchBarToggler.component" t-props="searchBarToggler.props"/>
+                </t>
+
+                <t t-set-slot="control-panel-additional-actions">
+                    <CogMenu t-if="!nbSelected">
+                        <DropdownItem t-if="nbTotal and !nbSelected and activeActions.exportXlsx and isExportEnable" onSelected.bind="onDirectExportData">
+                            Export All
+                        </DropdownItem>
+                    </CogMenu>
+                </t>
+                <t t-set-slot="control-panel-selection-actions">
+                    <div t-if="nbSelected" class="d-flex gap-1">
+                        <t t-call="web.ListView.Selection"/>
+                        <t t-foreach="archInfo.headerButtons" t-as="button" t-key="button.id">
+                            <MultiRecordViewButton
+                                t-if="button.display !== 'always'"
+                                list="model.root"
+                                className="button.className"
+                                clickParams="button.clickParams"
+                                defaultRank="'btn-secondary'"
+                                domain="props.domain"
+                                icon="button.icon"
+                                string="button.string"
+                                title="button.title"
+                            />
+                        </t>
+                        <t t-if="props.info.actionMenus">
+                            <ActionMenus
+                                getActiveIds="() => model.root.selection.map((r) => r.resId)"
+                                context="props.context"
+                                domain="props.domain"
+                                items="actionMenuItems"
+                                isDomainSelected="model.root.isDomainSelected"
+                                resModel="model.root.resModel"
+                                onActionExecuted="() => model.load()"/>
+                        </t>
+                    </div>
+                </t>
                 <t t-component="props.Renderer" list="model.root" activeActions="activeActions" archInfo="archInfo" allowSelectors="props.allowSelectors" editable="editable" openRecord.bind="openRecord" noContentHelp="props.info.noContentHelp" onAdd.bind="createRecord"/>
             </Layout>
         </div>
     </t>
 
     <t t-name="web.ListView.Buttons" owl="1">
-        <div class="o_list_buttons d-flex flex-wrap" role="toolbar" aria-label="Main actions">
-            <t t-if="props.showButtons">
-                <t t-if="model.root.editedRecord">
-                    <button type="button" class="btn btn-primary o_list_button_save" data-hotkey="s" t-on-click.stop="onClickSave">
-                        Save
-                    </button>
-                    <button type="button" class="btn btn-secondary o_list_button_discard" data-hotkey="j" t-on-click="onClickDiscard" t-on-mousedown="onMouseDownDiscard">
-                        Discard
-                    </button>
-                </t>
-                <t t-elif="activeActions.create and (!model.root.isGrouped or !editable)">
-                    <button type="button" class="btn btn-primary o_list_button_add" data-hotkey="c" t-on-click="onClickCreate" data-bounce-button="">
-                        New
-                    </button>
-                </t>
-                <t t-foreach="archInfo.headerButtons" t-as="button" t-key="button.id">
-                    <MultiRecordViewButton
-                        t-if="nbSelected || (button.display === 'always')"
-                        list="model.root"
-                        className="button.className"
-                        clickParams="button.clickParams"
-                        defaultRank="'btn-secondary'"
-                        domain="props.domain"
-                        icon="button.icon"
-                        string="button.string"
-                        title="button.title"
-                    />
-                </t>
-                <t t-if="nbTotal and !nbSelected and activeActions.exportXlsx and isExportEnable and !env.isSmall">
-                    <button type="button" class="btn btn-secondary fa fa-download o_list_export_xlsx" data-tooltip="Export All" aria-label="Export All" t-on-click="onDirectExportData"/>
-                </t>
-            </t>
-            <t t-if="!env.isSmall and nbSelected">
-                <t t-call="web.ListView.Selection"/>
+        <div t-if="props.showButtons" class="o_list_buttons d-flex d-empty-none align-items-baseline" role="toolbar" aria-label="Main actions">
+            <t t-if="model.root.editedRecord">
+                <button type="button" class="btn btn-primary o_list_button_save" data-hotkey="s" t-on-click.stop="onClickSave">
+                    Save
+                </button>
+                <button type="button" class="btn btn-secondary o_list_button_discard" data-hotkey="j" t-on-click="onClickDiscard" t-on-mousedown="onMouseDownDiscard">
+                    Discard
+                </button>
             </t>
         </div>
     </t>
 
     <t t-name="web.ListView.Selection" owl="1">
-        <div class="o_list_selection_box alert alert-info d-inline-flex align-items-center p-1" role="alert">
-            <span t-if="isDomainSelected" class="p-1">All <t t-esc="nbTotal"/> selected</span>
-            <t t-else="">
-                <span class="me-1" t-esc="nbSelected"/> selected
-                <a t-if="isPageSelected and nbTotal > nbSelected" href="#" class="o_list_select_domain ms-2 btn btn-sm btn-info p-1 border-0 fw-normal" t-on-click="onSelectDomain">
-                    <i class="fa fa-fw fa-arrow-right"/> Select all <span t-esc="nbTotal"/>
+        <div class="o_list_selection_box list-group flex-row me-2" role="alert">
+            <span class="list-group-item active d-flex align-items-center alisgn-self-stretch pe-0 py-0 rounded-1 lh-1">
+                <span t-if="isDomainSelected">All <b t-esc="nbTotal"/> selected</span>
+                <t t-else="">
+                    <b class="me-1" t-esc="nbSelected"/> selected
+                    <a t-if="isPageSelected and nbTotal > nbSelected" href="#" class="o_list_select_domain ms-3 btn btn-sm btn-info p-1 me-n2 border-0 fw-normal" t-on-click="onSelectDomain">
+                        <i class="oi oi-fw oi-arrow-right"/> Select all <span t-esc="nbTotal"/>
+                    </a>
+                </t>
+                <a href="#" title="Unselect All" class="o_list_unselect_all btn btn-link py-0 ms-2" t-on-click="onUnselectAll">
+                    <i class="oi oi-close oi-large"/>
                 </a>
-            </t>
-            <a t-if="nbSelected > 1" href="#" class="o_list_unselect_all ms-2 btn btn-sm btn-info p-1 border-0 fw-normal" t-att-class="{'btn-link': env.isSmall}" t-on-click="onUnselectAll">
-                <i class="fa fa-fw fa-times"/><t t-if="!env.isSmall"> Unselect all</t>
-            </a>
+            </span>
         </div>
     </t>
 
diff --git a/addons/web/static/src/views/list/list_renderer.scss b/addons/web/static/src/views/list/list_renderer.scss
index ec4286ffe1b..9203717b0ce 100644
--- a/addons/web/static/src/views/list/list_renderer.scss
+++ b/addons/web/static/src/views/list/list_renderer.scss
@@ -1,11 +1,10 @@
 // ------- List renderer -------
 .o_list_renderer {
-    --ListRenderer-table-padding-h: #{$table-cell-padding-x-sm};
-
-    --ListRenderer-thead-padding-v: #{$table-cell-padding-y * 1.25};
-    --ListRenderer-thead-bg-color: #{$gray-200};
+    --ListRenderer-table-padding-y: #{$table-cell-padding-x-sm};
+    --ListRenderer-thead-padding-y: #{map-get($spacers, 4)};
+    --ListRenderer-thead-bg-color:  #{$o-webclient-background-color};
     --ListRenderer-thead-border-end-color: #{$border-color};
-    --ListRenderer-thead-shadow: linear-gradient(180deg, rgba(0, 0, 0, 0.08), transparent);
+    --ListRenderer-tfoot-bg-color: #{$o-list-footer-bg-color};
 
     // sticky header on desktop
     @include media-breakpoint-up(md) {
@@ -14,26 +13,23 @@
         .o_list_table thead {
             @include o-position-sticky(0);
             z-index: 1;
-
-            &:after {
-                @include o-position-absolute($left: 0, $right: 0);
-                height: map-get($spacers, 3);
-                border-top: $border-width solid $border-color;
-                background-image: var(--ListRenderer-thead-shadow);
-                transform: translateY(-#{$border-width}); // Compensate rendering misplacement
-                -moz-transform: translateY(0); // Firefox doesn't need rendering adjustments
-                pointer-events: none;
-                content: '';
-            }
         }
     }
 
+    th, td {
+        // This fixes a bug that was hidding part of cell borders on Firefox.
+        background-clip: padding-box;
+    }
+
     .o_list_view &  {
-        --ListRenderer-table-padding-h: #{$o-horizontal-padding};
+        --ListRenderer-thead-padding-y: #{$table-cell-padding-y-sm};
+        --ListRenderer-table-padding-y: #{$o-horizontal-padding};
     }
 
     .o_list_table {
-        background-color: $o-view-background-color;
+        --table-bg: #{$o-view-background-color};
+
+
         // We need this to be collapse because we want to add a border on the rows
         // for sale order/invoice lines of type section.
         border-collapse: collapse;
@@ -41,11 +37,11 @@
 
         > thead, > tbody, > tfoot {
             > tr > :first-child {
-                padding-left: var(--ListRenderer-table-padding-h);
+                padding-left: var(--ListRenderer-table-padding-y);
             }
 
             > tr > :last-child {
-                padding-right: var(--ListRenderer-table-padding-h);
+                padding-right: var(--ListRenderer-table-padding-y);
             }
 
             > tr > :empty {
@@ -53,16 +49,14 @@
             }
         }
 
-        :not(.o_field_x2many_list) > & thead, tfoot {
-            tr > :not(:empty) {
-                padding-top: var(--ListRenderer-thead-padding-v);
-                padding-bottom: var(--ListRenderer-thead-padding-v);
-            }
-        }
-
         thead {
             background-color: var(--ListRenderer-thead-bg-color);
-            color: $headings-color;
+
+            th {
+                padding-top: var(--ListRenderer-thead-padding-y);
+                background-color: transparent;
+                color: $headings-color;
+            }
         }
 
         // Override BS default
@@ -120,15 +114,10 @@
         }
 
         tfoot {
-            // cursor: default;
-            color: $o-list-footer-color;
-            background-color: $o-list-footer-bg-color;
-            font-weight: $o-list-footer-font-weight;
-            border-top: 1px solid $table-border-color;
-            border-bottom: 1px solid $table-border-color;
-
-
             > tr > td {
+                color: $o-list-footer-color;
+                background-color: $o-list-footer-bg-color;
+                font-weight: $o-list-footer-font-weight;
                 @include o-text-overflow(table-cell);
             }
         }
@@ -138,7 +127,7 @@
         }
 
         .o_list_record_selector {
-            width: 40px;
+            width: 40px !important; // Force to 40px regardless by the font-size
         }
 
         .o_list_record_remove, .o_handle_cell {
@@ -448,7 +437,7 @@
 
             // first-child will be hidden so add left padding to second child
             & + * {
-                padding-left: var(--ListRenderer-table-padding-h);
+                padding-left: var(--ListRenderer-table-padding-y);
             }
         }
     }
diff --git a/addons/web/static/src/views/list/list_renderer.xml b/addons/web/static/src/views/list/list_renderer.xml
index b3fb4845c77..56206fed12b 100644
--- a/addons/web/static/src/views/list/list_renderer.xml
+++ b/addons/web/static/src/views/list/list_renderer.xml
@@ -14,7 +14,7 @@
                 <thead>
                     <tr>
                         <th t-if="hasSelectors" class="o_list_record_selector o_list_controller align-middle pe-1 cursor-pointer" tabindex="-1" t-on-keydown.synthetic="(ev) => this.onCellKeydown(ev)" t-on-click.stop="toggleSelection">
-                            <CheckBox disabled="!!props.list.editedRecord or props.list.model.useSampleModel" value="selectAll" className="'d-flex'" onChange.bind="toggleSelection"/>
+                            <CheckBox disabled="!!props.list.editedRecord or props.list.model.useSampleModel" value="selectAll" className="'d-flex m-0'" onChange.bind="toggleSelection"/>
                         </th>
                         <t t-foreach="state.columns" t-as="column" t-key="column.id">
                             <th t-if="column.type === 'field'"
diff --git a/addons/web/static/src/views/pivot/pivot_controller.js b/addons/web/static/src/views/pivot/pivot_controller.js
index c271d8c4079..3086bbe3b00 100644
--- a/addons/web/static/src/views/pivot/pivot_controller.js
+++ b/addons/web/static/src/views/pivot/pivot_controller.js
@@ -1,19 +1,17 @@
 /** @odoo-module **/
 
-import { Dropdown } from "@web/core/dropdown/dropdown";
-import { DropdownItem } from "@web/core/dropdown/dropdown_item";
-import { download } from "@web/core/network/download";
-import { useService } from "@web/core/utils/hooks";
 import { Layout } from "@web/search/layout";
 import { useModel } from "@web/views/model";
 import { standardViewProps } from "@web/views/standard_view_props";
 import { useSetupView } from "@web/views/view_hook";
+import { SearchBar } from "@web/search/search_bar/search_bar";
+import { useSearchBarToggler } from "@web/search/search_bar/search_bar_toggler";
+import { CogMenu } from "@web/search/cog_menu/cog_menu";
 
 import { Component, useRef } from "@odoo/owl";
 
 export class PivotController extends Component {
     setup() {
-        this.actionService = useService("action");
         this.model = useModel(this.props.Model, this.props.modelParams);
 
         useSetupView({
@@ -24,6 +22,7 @@ export class PivotController extends Component {
             },
             getContext: () => this.getContext(),
         });
+        this.searchBarToggler = useSearchBarToggler();
     }
     /**
      * @returns {Object}
@@ -35,108 +34,14 @@ export class PivotController extends Component {
             pivot_row_groupby: this.model.metaData.fullRowGroupBys,
         };
     }
-
-    //--------------------------------------------------------------------------
-    // Handlers
-    //--------------------------------------------------------------------------
-
-    /**
-     * Exports the current pivot table data in a xls file. For this, we have to
-     * serialize the current state, then call the server /web/pivot/export_xlsx.
-     * Force a reload before exporting to ensure to export up-to-date data.
-     */
-    onDownloadButtonClicked() {
-        if (this.model.getTableWidth() > 16384) {
-            throw new Error(
-                this.env._t(
-                    "For Excel compatibility, data cannot be exported if there are more than 16384 columns.\n\nTip: try to flip axis, filter further or reduce the number of measures."
-                )
-            );
-        }
-        const table = this.model.exportData();
-        download({
-            url: "/web/pivot/export_xlsx",
-            data: { data: JSON.stringify(table) },
-        });
-    }
-    /**
-     * Expands all groups
-     */
-    onExpandButtonClicked() {
-        this.model.expandAll();
-    }
-    /**
-     * Flips axis
-     */
-    onFlipButtonClicked() {
-        this.model.flip();
-    }
-    /**
-     * Toggles the given measure
-     *
-     * @param {Object} param0
-     * @param {string} param0.measure
-     */
-    onMeasureSelected({ measure }) {
-        this.model.toggleMeasure(measure);
-    }
-    /**
-     * Execute the action to open the view on the current model.
-     *
-     * @param {Array} domain
-     * @param {Array} views
-     * @param {Object} context
-     */
-    openView(domain, views, context) {
-        this.actionService.doAction({
-            type: "ir.actions.act_window",
-            name: this.model.metaData.title,
-            res_model: this.props.resModel,
-            views: views,
-            view_mode: "list",
-            target: "current",
-            context,
-            domain,
-        });
-    }
-    /**
-     * @param {CustomEvent} ev
-     */
-    onOpenView(cell) {
-        if (cell.value === undefined || this.model.metaData.disableLinking) {
-            return;
-        }
-
-        const context = Object.assign({}, this.model.searchParams.context);
-        Object.keys(context).forEach((x) => {
-            if (x === "group_by" || x.startsWith("search_default_")) {
-                delete context[x];
-            }
-        });
-
-        // retrieve form and list view ids from the action
-        const { views = [] } = this.env.config;
-        this.views = ["list", "form"].map((viewType) => {
-            const view = views.find((view) => view[1] === viewType);
-            return [view ? view[0] : false, viewType];
-        });
-
-        const group = {
-            rowValues: cell.groupId[0],
-            colValues: cell.groupId[1],
-            originIndex: cell.originIndexes[0],
-        };
-        this.openView(this.model.getGroupDomain(group), this.views, context);
-    }
 }
 
 PivotController.template = "web.PivotView";
-PivotController.components = { Dropdown, DropdownItem, Layout };
+PivotController.components = { Layout, SearchBar, CogMenu };
 
 PivotController.props = {
     ...standardViewProps,
     Model: Function,
     modelParams: Object,
     Renderer: Function,
-    buttonTemplate: String,
 };
diff --git a/addons/web/static/src/views/pivot/pivot_controller.xml b/addons/web/static/src/views/pivot/pivot_controller.xml
index e7e806d14f9..9fa0c95bfe0 100644
--- a/addons/web/static/src/views/pivot/pivot_controller.xml
+++ b/addons/web/static/src/views/pivot/pivot_controller.xml
@@ -2,25 +2,33 @@
 <templates xml:space="preserve">
 
     <t t-name="web.PivotView.Buttons" owl="1">
-        <div class="btn-group" role="toolbar" aria-label="Main actions">
-            <t t-call="web.ReportViewMeasures">
-                <t t-set="measures" t-value="model.metaData.measures"/>
-                <t t-set="activeMeasures" t-value="model.metaData.activeMeasures"/>
-            </t>
-        </div>
-        <div class="btn-group" role="toolbar" aria-label="Pivot settings">
-            <t t-set="noDataDisplayed" t-value="!model.hasData() || !model.metaData.activeMeasures.length"/>
-            <button class="btn btn-secondary fa fa-exchange o_pivot_flip_button" t-on-click="onFlipButtonClicked" data-tooltip="Flip axis" aria-label="Flip axis" t-attf-disabled="{{noDataDisplayed ? 'disabled' : false}}"/>
-            <button class="btn btn-secondary fa fa-arrows o_pivot_expand_button" t-on-click="onExpandButtonClicked" data-tooltip="Expand all" aria-label="Expand all" t-attf-disabled="{{noDataDisplayed ? 'disabled' : false}}"/>
-            <button class="btn btn-secondary fa fa-download o_pivot_download" t-on-click="onDownloadButtonClicked" data-tooltip="Download xlsx" aria-label="Download xlsx" t-attf-disabled="{{noDataDisplayed ? 'disabled' : false}}"/>
+        <div class="o_pivot_buttons d-flex gap-1 mt-2 mx-3 mb-3">
+            <div class="btn-group" role="toolbar" aria-label="Main actions">
+                <t t-call="web.ReportViewMeasures">
+                    <t t-set="measures" t-value="model.metaData.measures"/>
+                    <t t-set="activeMeasures" t-value="model.metaData.activeMeasures"/>
+                </t>
+            </div>
+            <div class="btn-group" role="toolbar" aria-label="Pivot settings">
+                <t t-set="noDataDisplayed" t-value="!model.hasData() || !model.metaData.activeMeasures.length"/>
+                <button class="btn btn-secondary fa fa-exchange o_pivot_flip_button" t-on-click="onFlipButtonClicked" data-tooltip="Flip axis" aria-label="Flip axis" t-attf-disabled="{{noDataDisplayed ? 'disabled' : false}}"/>
+                <button class="btn btn-secondary fa fa-arrows o_pivot_expand_button" t-on-click="onExpandButtonClicked" data-tooltip="Expand all" aria-label="Expand all" t-attf-disabled="{{noDataDisplayed ? 'disabled' : false}}"/>
+                <button class="btn btn-secondary fa fa-download o_pivot_download" t-on-click="onDownloadButtonClicked" data-tooltip="Download xlsx" aria-label="Download xlsx" t-attf-disabled="{{noDataDisplayed ? 'disabled' : false}}"/>
+            </div>
         </div>
     </t>
 
     <t t-name="web.PivotView" owl="1">
         <div t-att-class="props.className" t-ref="root">
             <Layout className="model.useSampleModel ? 'o_view_sample_data' : ''" display="props.display">
-                <t t-set-slot="layout-buttons">
-                    <t t-call="{{ props.buttonTemplate }}"/>
+                <t t-set-slot="control-panel-additional-actions">
+                    <CogMenu/>
+                </t>
+                <t t-set-slot="layout-actions">
+                    <SearchBar t-if="searchBarToggler.state.showSearchBar"/>
+                </t>
+                <t t-set-slot="control-panel-navigation-additional">
+                    <t t-component="searchBarToggler.component" t-props="searchBarToggler.props"/>
                 </t>
                 <t t-set="displayNoContent" t-value="
                     props.info.noContentHelp !== false and (
@@ -34,9 +42,7 @@
                     </t>
                     <t t-else="" t-call="web.NoContentHelper"/>
                 </t>
-                <t t-if="model.hasData() and model.metaData.activeMeasures.length">
-                    <t t-component="props.Renderer" model="model" onCellClicked="cell => this.onOpenView(cell)"/>
-                </t>
+                <t t-component="props.Renderer" model="model"/>
             </Layout>
         </div>
     </t>
diff --git a/addons/web/static/src/views/pivot/pivot_group_by_menu.js b/addons/web/static/src/views/pivot/pivot_group_by_menu.js
index 6db12edad4f..dba07bb77ec 100644
--- a/addons/web/static/src/views/pivot/pivot_group_by_menu.js
+++ b/addons/web/static/src/views/pivot/pivot_group_by_menu.js
@@ -1,15 +1,47 @@
 /** @odoo-module */
 
-import { GroupByMenu } from "@web/search/group_by_menu/group_by_menu";
+import { Dropdown } from "@web/core/dropdown/dropdown";
+import { sortBy } from "@web/core/utils/arrays";
+import { useBus } from "@web/core/utils/hooks";
+import { CustomGroupByItem } from "@web/search/custom_group_by_item/custom_group_by_item";
+import { SearchDropdownItem } from "@web/search/search_dropdown_item/search_dropdown_item";
 import { getIntervalOptions } from "@web/search/utils/dates";
+import { FACET_ICONS, GROUPABLE_TYPES } from "@web/search/utils/misc";
+
+import { Component } from "@odoo/owl";
+
+export class PivotGroupByMenu extends Component {
+    setup() {
+        this.icon = FACET_ICONS.groupBy;
+        this.dropdownProps = Object.keys(this.props)
+            .filter((key) => key in Dropdown.props)
+            .reduce((obj, key) => ({ ...obj, [key]: this.props[key] }), {});
+        const fields = [];
+        for (const [fieldName, field] of Object.entries(this.env.searchModel.searchViewFields)) {
+            if (this.validateField(fieldName, field)) {
+                fields.push(Object.assign({ name: fieldName }, field));
+            }
+        }
+        this.fields = sortBy(fields, "string");
+
+        useBus(this.env.searchModel, "update", this.render);
+    }
+
+    /**
+     * @returns {boolean}
+     */
+    get hideCustomGroupBy() {
+        return this.env.searchModel.hideCustomGroupBy || false;
+    }
 
-export class PivotGroupByMenu extends GroupByMenu {
     /**
-     * @override
      * @returns {Object[]}
      */
     get items() {
-        let items = super.items.filter((i) => !i.custom);
+        let items = this.env.searchModel.getSearchItems((searchItem) =>
+            ["groupBy", "dateGroupBy"].includes(searchItem.type)
+        );
+        items = items.filter((i) => !i.custom);
         if (items.length === 0) {
             items = this.fields;
         }
@@ -32,13 +64,21 @@ export class PivotGroupByMenu extends GroupByMenu {
                     : undefined,
         }));
     }
+
     /**
-     * @override
      * @param {string} fieldName
+     * @param {Object} field
+     * @returns {boolean}
      */
-    onAddCustomGroup(fieldName) {
-        this.props.onAddCustomGroupBy(fieldName);
+    validateField(fieldName, field) {
+        const { sortable, store, type } = field;
+        return (
+            (type === "many2many" ? store : sortable) &&
+            fieldName !== "id" &&
+            GROUPABLE_TYPES.includes(type)
+        );
     }
+
     /**
      * @override
      * @param {Object} param0
@@ -57,9 +97,22 @@ export class PivotGroupByMenu extends GroupByMenu {
             groupId: this.props.cell.groupId,
         });
     }
+
+    /**
+     * @param {string} fieldName
+     */
+    onAddCustomGroup(fieldName) {
+        this.props.onAddCustomGroupBy(fieldName);
+    }
 }
+PivotGroupByMenu.components = { CustomGroupByItem, Dropdown, SearchDropdownItem };
+PivotGroupByMenu.template = "web.PivotGroupByMenu";
+PivotGroupByMenu.defaultProps = {
+    showCaretDown: false,
+};
 PivotGroupByMenu.props = {
-    ...GroupByMenu.props,
+    ...Dropdown.props,
+    showCaretDown: { type: Boolean, optional: true },
     cell: Object,
     customGroupBys: Object,
     onAddCustomGroupBy: Function,
diff --git a/addons/web/static/src/search/group_by_menu/group_by_menu.xml b/addons/web/static/src/views/pivot/pivot_group_by_menu.xml
similarity index 98%
rename from addons/web/static/src/search/group_by_menu/group_by_menu.xml
rename to addons/web/static/src/views/pivot/pivot_group_by_menu.xml
index 2e7a996e862..2be1966c782 100644
--- a/addons/web/static/src/search/group_by_menu/group_by_menu.xml
+++ b/addons/web/static/src/views/pivot/pivot_group_by_menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
 
-    <t t-name="web.GroupByMenu" owl="1">
+    <t t-name="web.PivotGroupByMenu" owl="1">
         <Dropdown class="'o_group_by_menu btn-group'"
             togglerClass="'btn btn-light'"
             t-props="dropdownProps"
diff --git a/addons/web/static/src/views/pivot/pivot_renderer.js b/addons/web/static/src/views/pivot/pivot_renderer.js
index 3ebb8ac5665..f472aa2352c 100644
--- a/addons/web/static/src/views/pivot/pivot_renderer.js
+++ b/addons/web/static/src/views/pivot/pivot_renderer.js
@@ -3,15 +3,20 @@
 import { CheckBox } from "@web/core/checkbox/checkbox";
 import { localization } from "@web/core/l10n/localization";
 import { registry } from "@web/core/registry";
+import { Dropdown } from "@web/core/dropdown/dropdown";
+import { DropdownItem } from "@web/core/dropdown/dropdown_item";
 import { formatPercentage } from "@web/views/fields/formatters";
 import { PivotGroupByMenu } from "@web/views/pivot/pivot_group_by_menu";
 import fieldUtils from "web.field_utils";
 
 import { Component, onWillUpdateProps, useRef } from "@odoo/owl";
+import { download } from "@web/core/network/download";
+import { useService } from "@web/core/utils/hooks";
 const formatters = registry.category("formatters");
 
 export class PivotRenderer extends Component {
     setup() {
+        this.actionService = useService("action");
         this.model = this.props.model;
         this.table = this.model.getTable();
         this.l10n = localization;
@@ -71,9 +76,6 @@ export class PivotRenderer extends Component {
     // Handlers
     //----------------------------------------------------------------------
 
-    onCellClicked(cell) {
-        this.props.onCellClicked(cell);
-    }
     /**
      * Handle the adding of a custom groupby (inside the view, not the searchview).
      *
@@ -148,7 +150,100 @@ export class PivotRenderer extends Component {
             .querySelectorAll(".o_cell_hover")
             .forEach((elt) => elt.classList.remove("o_cell_hover"));
     }
+
+    //--------------------------------------------------------------------------
+    // Handlers
+    //--------------------------------------------------------------------------
+
+    /**
+     * Exports the current pivot table data in a xls file. For this, we have to
+     * serialize the current state, then call the server /web/pivot/export_xlsx.
+     * Force a reload before exporting to ensure to export up-to-date data.
+     */
+    onDownloadButtonClicked() {
+        if (this.model.getTableWidth() > 16384) {
+            throw new Error(
+                this.env._t(
+                    "For Excel compatibility, data cannot be exported if there are more than 16384 columns.\n\nTip: try to flip axis, filter further or reduce the number of measures."
+                )
+            );
+        }
+        const table = this.model.exportData();
+        download({
+            url: "/web/pivot/export_xlsx",
+            data: { data: JSON.stringify(table) },
+        });
+    }
+    /**
+     * Expands all groups
+     */
+    onExpandButtonClicked() {
+        this.model.expandAll();
+    }
+    /**
+     * Flips axis
+     */
+    onFlipButtonClicked() {
+        this.model.flip();
+    }
+    /**
+     * Toggles the given measure
+     *
+     * @param {Object} param0
+     * @param {string} param0.measure
+     */
+    onMeasureSelected({ measure }) {
+        this.model.toggleMeasure(measure);
+    }
+    /**
+     * Execute the action to open the view on the current model.
+     *
+     * @param {Array} domain
+     * @param {Array} views
+     * @param {Object} context
+     */
+    openView(domain, views, context) {
+        this.actionService.doAction({
+            type: "ir.actions.act_window",
+            name: this.model.metaData.title,
+            res_model: this.model.metaData.resModel,
+            views: views,
+            view_mode: "list",
+            target: "current",
+            context,
+            domain,
+        });
+    }
+    /**
+     * @param {CustomEvent} ev
+     */
+    onOpenView(cell) {
+        if (cell.value === undefined || this.model.metaData.disableLinking) {
+            return;
+        }
+
+        const context = Object.assign({}, this.model.searchParams.context);
+        Object.keys(context).forEach((x) => {
+            if (x === "group_by" || x.startsWith("search_default_")) {
+                delete context[x];
+            }
+        });
+
+        // retrieve form and list view ids from the action
+        const { views = [] } = this.env.config;
+        this.views = ["list", "form"].map((viewType) => {
+            const view = views.find((view) => view[1] === viewType);
+            return [view ? view[0] : false, viewType];
+        });
+
+        const group = {
+            rowValues: cell.groupId[0],
+            colValues: cell.groupId[1],
+            originIndex: cell.originIndexes[0],
+        };
+        this.openView(this.model.getGroupDomain(group), this.views, context);
+    }
 }
 PivotRenderer.template = "web.PivotRenderer";
-PivotRenderer.components = { CheckBox, PivotGroupByMenu };
-PivotRenderer.props = ["model", "onCellClicked"];
+PivotRenderer.components = { Dropdown, DropdownItem, CheckBox, PivotGroupByMenu };
+PivotRenderer.props = ["model"];
diff --git a/addons/web/static/src/views/pivot/pivot_renderer.xml b/addons/web/static/src/views/pivot/pivot_renderer.xml
index 8f9b0a4095b..a13cc291fb4 100644
--- a/addons/web/static/src/views/pivot/pivot_renderer.xml
+++ b/addons/web/static/src/views/pivot/pivot_renderer.xml
@@ -2,8 +2,8 @@
 <templates xml:space="preserve">
 
     <t t-name="web.PivotRenderer" owl="1">
-        <div class="o_pivot table-responsive">
-
+        <t t-call="web.PivotView.Buttons"/>
+        <div t-if="model.hasData() and model.metaData.activeMeasures.length" class="o_pivot table-responsive mx-3">
             <table
                 class="table-hover table table-sm table-bordered table-borderless bg-view"
                 t-att-class="{ o_enable_linking: !model.metaData.disableLinking }"
@@ -15,8 +15,9 @@
                             <t t-if="cell.measure" t-call="web.PivotMeasure"/>
                             <t t-elif="cell.isLeaf !== undefined" t-call="web.PivotHeader">
                                 <t t-set="isXAxis" t-value="true"/>
+                                <t t-set="isInHead" t-value="true"/>
                             </t>
-                            <th t-else="" t-att-colspan="cell.width" t-att-rowspan="cell.height" class="fw-normal border-start-0"/>
+                            <th t-else="" t-att-colspan="cell.width" t-att-rowspan="cell.height" class="fw-normal border-start-0" t-att-class="{ 'border-top': cell_index != 0 }"/>
                         </t>
                     </tr>
                 </thead>
@@ -31,7 +32,7 @@
                                     o_empty: cell.value === undefined,
                                     'cursor-pointer': cell.value !== undefined,
                                     'fw-bold': cell.isBold,
-                                }" t-on-click="() => this.onCellClicked(cell)"
+                                }" t-on-click="() => this.onOpenView(cell)"
                                    t-on-mouseover="onMouseEnter" t-on-mouseout="onMouseLeave">
                                 <t t-if="cell.value !== undefined">
                                     <div t-if="cell.originIndexes.length > 1" class="o_variation" t-att-class="{
@@ -54,12 +55,13 @@
 
     <t t-name="web.PivotHeader" owl="1">
         <th
-            class="text-nowrap cursor-pointer fw-normal user-select-none border-start-0"
+            class="text-nowrap cursor-pointer fw-normal user-select-none"
             t-att-colspan="isXAxis ? cell.width : undefined"
             t-att-rowspan="isXAxis ? cell.height : undefined"
             t-att-class="{
                 o_pivot_header_cell_closed: cell.isLeaf,
                 o_pivot_header_cell_opened: !cell.isLeaf,
+                'border-top': isInHead,                
             }"
             t-attf-style="{{
                 isXAxis
diff --git a/addons/web/static/src/views/pivot/pivot_view.js b/addons/web/static/src/views/pivot/pivot_view.js
index 96daaa2885c..88e31ce9d69 100644
--- a/addons/web/static/src/views/pivot/pivot_view.js
+++ b/addons/web/static/src/views/pivot/pivot_view.js
@@ -21,7 +21,6 @@ export const pivotView = {
     ArchParser: PivotArchParser,
     SearchModel: PivotSearchModel,
     searchMenuTypes: ["filter", "groupBy", "comparison", "favorite"],
-    buttonTemplate: "web.PivotView.Buttons",
 
     props: (genericProps, view) => {
         const modelParams = {};
@@ -57,7 +56,6 @@ export const pivotView = {
             Model: view.Model,
             modelParams,
             Renderer: view.Renderer,
-            buttonTemplate: view.buttonTemplate,
         };
     },
 };
diff --git a/addons/web/static/src/views/view_button/view_button.js b/addons/web/static/src/views/view_button/view_button.js
index 2e187e74116..7e2dc92fd76 100644
--- a/addons/web/static/src/views/view_button/view_button.js
+++ b/addons/web/static/src/views/view_button/view_button.js
@@ -25,7 +25,10 @@ function iconFromString(iconString) {
     const icon = {};
     if (iconString.startsWith("fa-")) {
         icon.tag = "i";
-        icon.class = `fa fa-fw o_button_icon ${iconString}`;
+        icon.class = `o_button_icon fa ${iconString}`;
+    } else if (iconString.startsWith("oi-")) {
+        icon.tag = "i";
+        icon.class = `o_button_icon oi ${iconString}`;
     } else {
         icon.tag = "img";
         icon.src = iconString;
@@ -97,8 +100,6 @@ export class ViewButton extends Component {
                     this.env[DROPDOWN].close();
                 }
             },
-            disableAction: this.props.disable,
-            enableAction: this.props.enable,
         });
     }
 
@@ -140,9 +141,7 @@ ViewButton.props = [
     "clickParams?",
     "icon?",
     "defaultRank?",
-    "disable?",
     "disabled?",
-    "enable?",
     "size?",
     "tabindex?",
     "title?",
@@ -155,6 +154,4 @@ ViewButton.defaultProps = {
     tag: "button",
     className: "",
     clickParams: {},
-    disable: () => {},
-    enable: () => {},
 };
diff --git a/addons/web/static/src/views/view_button/view_button.xml b/addons/web/static/src/views/view_button/view_button.xml
index b06e58f4b94..a34ec31d9b6 100644
--- a/addons/web/static/src/views/view_button/view_button.xml
+++ b/addons/web/static/src/views/view_button/view_button.xml
@@ -18,7 +18,7 @@
         t-att-tabindex="props.tabindex"
         t-on-click.stop="onClick"
     >
-      <t t-if="icon" t-tag="icon.tag" t-att-class="icon.class" t-att-src="icon.src"/>
+      <t t-if="icon" t-tag="icon.tag" t-att-class="icon.class + (props.string ? ' me-1' : '')" t-att-src="icon.src"/>
       <t t-slot="contents"><span t-if="props.string" t-esc="props.string"/></t>
     </t>
   </t>
diff --git a/addons/web/static/src/views/view_button/view_button_hook.js b/addons/web/static/src/views/view_button/view_button_hook.js
index 06670df5e19..2117a614ec1 100644
--- a/addons/web/static/src/views/view_button/view_button_hook.js
+++ b/addons/web/static/src/views/view_button/view_button_hook.js
@@ -7,7 +7,6 @@ import { ConfirmationDialog } from "@web/core/confirmation_dialog/confirmation_d
 import { status, useEnv, useSubEnv } from "@odoo/owl";
 
 function disableButtons(el) {
-    // WOWL: can we do this non-imperatively?
     const btns = [...el.querySelectorAll("button:not([disabled])")];
     for (const btn of btns) {
         btn.setAttribute("disabled", "1");
@@ -15,15 +14,12 @@ function disableButtons(el) {
     return btns;
 }
 
-function enableButtons(el, manuallyDisabledButtons, enableAction) {
+function enableButtons(el, manuallyDisabledButtons) {
     if (el) {
         for (const btn of manuallyDisabledButtons) {
             btn.removeAttribute("disabled");
         }
     }
-    if (enableAction) {
-        enableAction();
-    }
 }
 
 function undefinedAsTrue(val) {
@@ -41,17 +37,8 @@ export function useViewButtons(model, ref, options = {}) {
         });
     const afterExecuteAction = options.afterExecuteAction || (() => {});
     useSubEnv({
-        async onClickViewButton({
-            clickParams,
-            getResParams,
-            beforeExecute,
-            disableAction,
-            enableAction,
-        }) {
+        async onClickViewButton({ clickParams, getResParams, beforeExecute }) {
             const manuallyDisabledButtons = disableButtons(getEl());
-            if (disableAction) {
-                disableAction();
-            }
 
             async function execute() {
                 let _continue = true;
@@ -61,7 +48,7 @@ export function useViewButtons(model, ref, options = {}) {
 
                 _continue = _continue && undefinedAsTrue(await beforeExecuteAction(clickParams));
                 if (!_continue) {
-                    enableButtons(getEl(), manuallyDisabledButtons, enableAction);
+                    enableButtons(getEl(), manuallyDisabledButtons);
                     return;
                 }
                 const closeDialog = clickParams.close && env.closeDialog;
@@ -103,7 +90,7 @@ export function useViewButtons(model, ref, options = {}) {
                 if (closeDialog) {
                     closeDialog();
                 }
-                enableButtons(getEl(), manuallyDisabledButtons, enableAction);
+                enableButtons(getEl(), manuallyDisabledButtons);
                 if (error) {
                     return Promise.reject(error);
                 }
@@ -124,7 +111,7 @@ export function useViewButtons(model, ref, options = {}) {
                     };
                     dialog.add(ConfirmationDialog, dialogProps, { onClose: resolve });
                 });
-                enableButtons(getEl(), manuallyDisabledButtons, enableAction);
+                enableButtons(getEl(), manuallyDisabledButtons);
             } else {
                 return execute();
             }
diff --git a/addons/web/static/src/views/view_components/animated_number.xml b/addons/web/static/src/views/view_components/animated_number.xml
index 23315e90289..789e638f47f 100644
--- a/addons/web/static/src/views/view_components/animated_number.xml
+++ b/addons/web/static/src/views/view_components/animated_number.xml
@@ -2,7 +2,7 @@
 <templates xml:space="preserve">
 
     <t t-name="web.AnimatedNumber" owl="1">
-        <div class="o_animated_number ms-2 text-900 text-nowrap" t-att-class="state.value !== props.value and props.animationClass" t-att-title="props.title">
+        <div class="o_animated_number ms-2 text-900 text-nowrap cursor-default" t-att-class="state.value !== props.value and props.animationClass" t-att-title="props.title">
             <t t-slot="prefix"/>
             <span t-if="props.currency and props.currency.position === 'before'" t-esc="props.currency.symbol" class="ms-1"/>
             <b t-esc="format(state.value)" />
diff --git a/addons/web/static/src/views/view_components/view_scale_selector.xml b/addons/web/static/src/views/view_components/view_scale_selector.xml
index a9e73db2aab..9262331f4f9 100644
--- a/addons/web/static/src/views/view_components/view_scale_selector.xml
+++ b/addons/web/static/src/views/view_components/view_scale_selector.xml
@@ -2,13 +2,13 @@
 <templates xml:space="preserve">
 
     <t t-name="web.ViewScaleSelector" owl="1">
-        <Dropdown t-if="Object.keys(props.scales).length > 1" class="'btn-group o_view_scale_selector'" togglerClass="'btn btn-secondary scale_button_selection text-uppercase'" hotkey="'v'" showCaret="true">
+        <Dropdown t-if="Object.keys(props.scales).length > 1" class="'btn-group o_view_scale_selector'" togglerClass="'btn btn-secondary scale_button_selection'" hotkey="'v'" showCaret="true">
             <t t-set-slot="toggler">
                 <t t-esc="props.scales[props.currentScale].description" />
             </t>
             <t t-foreach="scales" t-as="scale" t-key="scale.key">
                 <DropdownItem
-                    class="`o_scale_button_${scale.key} text-uppercase ${scale.key === props.currentScale ? 'active' : ''}`"
+                    class="`o_scale_button_${scale.key} ${scale.key === props.currentScale ? 'active' : ''}`"
                     hotkey="scale.hotkey or scale.key[0]"
                     onSelected="() => this.props.setScale(scale.key)"
                 >
diff --git a/addons/web/static/src/views/view_dialogs/export_data_dialog.xml b/addons/web/static/src/views/view_dialogs/export_data_dialog.xml
index e71056bbc61..4bf9a887320 100644
--- a/addons/web/static/src/views/view_dialogs/export_data_dialog.xml
+++ b/addons/web/static/src/views/view_dialogs/export_data_dialog.xml
@@ -14,7 +14,7 @@
     <t t-name="web.ExportDataItem" owl="1">
         <div t-att-data-field_id="props.field.id" t-attf-class="o_export_tree_item cursor-pointer position-relative ps-4 {{ state.isExpanded ? 'o_expanded mb-2' : '' }} {{ props.field.parent ? '' : 'pe-3'}}" role="treeitem" t-on-click.stop="() => this.loadExpandedContent(props.field.id)" t-on-dblclick="() => this.onDoubleClick(props.field.id)">
             <div t-attf-class="o_tree_column d-flex align-items-center {{ props.field.required ? 'fw-bolder' : ''}}">
-                <span t-if="props.isFieldExpandable(props.field.id)" t-attf-class="ms-n3 float-start o_expand_parent small fa {{ state.isExpanded ? 'fa-chevron-down' : 'fa-chevron-right' }}" role="img" aria-label="Show sub-fields" title="Show sub-fields" />
+                <span t-if="props.isFieldExpandable(props.field.id)" t-attf-class="ms-n3 float-start o_expand_parent small oi {{ state.isExpanded ? 'oi-chevron-down' : 'oi-chevron-right' }}" role="img" aria-label="Show sub-fields" title="Show sub-fields" />
                 <span t-if="props.isDebug and props.field.id" class="overflow-hidden w-100" t-esc="`${props.field.string} (${props.field.id})`" />
                 <span t-else="" class="overflow-hidden w-100" t-esc="props.field.string" />
                 <span title="Select field" t-attf-class="fa fa-plus float-end m-1 o_add_field {{ isFieldSelected(props.field.id) ? 'o_inactive opacity-25' : '' }}" t-on-click.stop="(ev) => !this.isFieldSelected(this.props.field.id) and this.props.onAdd(this.props.field.id)" />
@@ -109,7 +109,7 @@
                     <div class="o_right_field_panel h-100 px-2 overflow-auto border">
                         <ul class="o_fields_list list-unstyled" t-ref="draggable">
                             <t t-foreach="state.exportList" t-as="field" t-key="field.id">
-                                <li t-attf-class="o_export_field {{ state.isSmall ? '' : 'o_export_field_sortable' }}" t-att-data-field_id="field.id">
+                                <li t-attf-class="o_export_field d-inline-block w-100 {{ state.isSmall ? '' : 'o_export_field_sortable' }}" t-att-data-field_id="field.id">
                                     <span t-if="!state.isSmall" class="fa fa-sort o_sort_field mx-1" t-attf-style="opacity:{{ state.exportList.length === 1 ? 0 : 1 }}" />
                                     <span t-esc="isDebug and field.id ? `${field.string} (${field.id})` : field.string" />
                                     <span class="fa fa-trash m-1 pe-2 float-end o_remove_field cursor-pointer" t-att-title="removeFieldText" t-on-click.stop="() => this.onRemoveItemExportList(field.id)" />
diff --git a/addons/web/static/src/views/widgets/ribbon/ribbon.js b/addons/web/static/src/views/widgets/ribbon/ribbon.js
index 3b6440b45a3..91c34c55dfa 100644
--- a/addons/web/static/src/views/widgets/ribbon/ribbon.js
+++ b/addons/web/static/src/views/widgets/ribbon/ribbon.js
@@ -28,7 +28,7 @@ class RibbonWidget extends Component {
     };
     static defaultProps = {
         title: "",
-        bgClass: "bg-success",
+        bgClass: "text-bg-success",
     };
 
     get classes() {
diff --git a/addons/web/static/src/views/widgets/ribbon/ribbon.scss b/addons/web/static/src/views/widgets/ribbon/ribbon.scss
index 6837b0c7a13..9a87bbc3461 100644
--- a/addons/web/static/src/views/widgets/ribbon/ribbon.scss
+++ b/addons/web/static/src/views/widgets/ribbon/ribbon.scss
@@ -1,63 +1,57 @@
 .ribbon {
-    width: 150px;
-    height: 150px;
+    --Ribbon-wrapper-width-default: 10rem;
+    --Ribbon-wrapper-height: var(--Ribbon-wrapper-width, var(--Ribbon-wrapper-width-default));
+
+    width: var(--Ribbon-wrapper-width, var(--Ribbon-wrapper-width-default));
+    height: var(--Ribbon-wrapper-height);
     overflow: hidden;
     position: absolute;
 
-    &::before, &::after {
-        position: absolute;
-        z-index: -1;
-        content: '';
-        display: block;
-        border: 5px solid #2980b9;
-    }
-
     & span {
-        z-index: 1;
+        --Ribbon-font-size-default: #{$font-size-lg};
+        --Ribbon-height-default: calc(var(--Ribbon-font-size, var(--Ribbon-font-size-default)) * 2.5);
+        --Ribbon-shadow-distance: .25rem;
+        --Ribbon-shadow-blur: .5rem;
+        --Ribbon-z-index: 1;
+
+        z-index: var( --Ribbon-z-index);
         position: absolute;
-        display: grid;
-        align-items: center;
-        width: 225px;
-        height: 48px;
-        padding: 0 44px;
-        box-shadow: 0 5px 10px rgba(0, 0, 0, .1);
-        color: #fff;
-        font: 700 18px/1 'Lato', sans-serif;
+        width: 141.421%; //Square root of 2 to get the diagonal of the parent
+        height: var(--Ribbon-height, var(--Ribbon-height-default));
+        box-shadow: 0 var(--Ribbon-shadow-distance) var(--Ribbon-shadow-blur) rgba(0, 0, 0, .1);
+        color: $white;
+        font-size: var(--Ribbon-font-size, var(--Ribbon-font-size-default));
+        line-height: var(--Ribbon-height, var(--Ribbon-height-default));
+        font-weight: $font-weight-bolder;
+        font-family: 'Lato', sans-serif;
         text-shadow: 0 1px 1px rgba(0, 0, 0, .2);
         text-transform: uppercase;
         text-align: center;
         overflow: hidden;
         user-select: none;
+        transform-origin: left bottom;
+        pointer-events: none;
         &.o_small {
-            font-size: 12px;
+            font-size: $font-size-sm
         }
         &.o_medium {
-            font-size: 15px;
+            font-size: $font-size-base;
         }
     }
 
     &-top-right {
-        margin-top: -$o-sheet-vpadding;
-        right: 0;
+        --Ribbon-gap-top-default: calc(var(--formView-sheet-padding-y, 0) * -1 - #{$border-width});
+        --Ribbon-gap-right-default: -#{$border-width};
 
-        &::before, &::after {
-            border-top-color: black;
-            border-right-color: black;
-        }
-
-        &::before {
-            top: 0;
-            left: 0;
-        }
-
-        &::after {
-            bottom: 0;
-            right: 0;
-        }
+        margin-top: var(--Ribbon-gap-top, var(--Ribbon-gap-top-default));
+        right: var(--Ribbon-gap-right, var(--Ribbon-gap-right-default));
 
         & span {
-            left: -15px;
-            top: 30px;
+            --Ribbon-top-position-default: calc((var(--Ribbon-height-default) * -1));
+            --Ribbon-left-position-default: calc(var(--Ribbon-shadow-distance) + var(--Ribbon-shadow-blur));
+
+            left: var(--Ribbon-left-position, var(--Ribbon-left-position-default));
+            top: var(--Ribbon-top-position, var(--Ribbon-top-position-default));
             transform: rotate(45deg);
         }
     }
diff --git a/addons/web/static/src/webclient/actions/action_service.js b/addons/web/static/src/webclient/actions/action_service.js
index 434fa5981e2..9d1e0aec976 100644
--- a/addons/web/static/src/webclient/actions/action_service.js
+++ b/addons/web/static/src/webclient/actions/action_service.js
@@ -514,7 +514,8 @@ function makeActionManager(env) {
             viewProps.resId = action.res_id;
         }
 
-        viewProps.noBreadcrumbs = action.context.no_breadcrumbs;
+        viewProps.noBreadcrumbs =
+            "no_breadcrumbs" in action.context ? action.context.no_breadcrumbs : target === "new";
         delete action.context.no_breadcrumbs;
         return {
             props: viewProps,
diff --git a/addons/web/static/src/webclient/actions/reports/report_action.xml b/addons/web/static/src/webclient/actions/reports/report_action.xml
index e3a5e594b3d..8d236483128 100644
--- a/addons/web/static/src/webclient/actions/reports/report_action.xml
+++ b/addons/web/static/src/webclient/actions/reports/report_action.xml
@@ -4,7 +4,7 @@
     <t t-name="web.ReportAction" owl="1">
         <div class="o_action">
             <Layout display="{ controlPanel: { 'top-right' : false, 'bottom-right': false } }">
-                <t t-set-slot="control-panel-bottom-left">
+                <t t-set-slot="control-panel-create-button">
                     <button t-on-click="print" type="button" class="btn btn-primary" title="Print">Print</button>
                 </t>
                 <iframe t-ref="iframe" t-on-load="onIframeLoaded" class="h-100 w-100" t-att-src="reportUrl" />
diff --git a/addons/web/static/src/webclient/burger_menu/burger_menu.scss b/addons/web/static/src/webclient/burger_menu/burger_menu.scss
index 22eab2ffe23..f2cfe10e651 100644
--- a/addons/web/static/src/webclient/burger_menu/burger_menu.scss
+++ b/addons/web/static/src/webclient/burger_menu/burger_menu.scss
@@ -16,10 +16,11 @@
 
     // ====== Top-Bar
     .o_burger_menu_topbar {
-        min-height: $o-navbar-height-xs;
+        min-height: $o-navbar-height;
         background-color: $o-burger-topbar-bg;
         color: $o-burger-topbar-color;
-        line-height: $o-navbar-height-xs;
+        line-height: $o-navbar-height;
+        box-shadow: inset 0 -1px 0 $border-color;
 
         .dropdown-toggle, .o_burger_menu_close {
             padding: 0 $o-horizontal-padding;
@@ -28,15 +29,12 @@
 
     // ====== Menu content container (both App's and User's entries)
     .o_burger_menu_content {
-        &.o_burger_menu_dark {
-            background-color: darken($o-burger-base-bg, 5%);
+        &.o_burger_menu_app {
+            background-color: $o-burger-base-bg;
         }
 
         // Menu entries size and layout
         ul {
-            background-color: rgba(invert($o-burger-base-color), .1);
-            box-shadow: inset 0 -1px 0 rgba($o-burger-base-color, .1);
-
             li > div, li {
                 padding-left: $o-horizontal-padding;
             }
@@ -45,14 +43,18 @@
             li {
                 ul > li {
                     &, > div {
-                        text-indent: 2em;
+                        text-indent: .5em;
                     }
                     ul > li {
                         &, > div {
-                            text-indent: 3em;
+                            text-indent: 1em;
                         }
                     }
                 }
+
+                &:last-child {
+                    margin-bottom: map-get($map: $spacers, $key: 2);
+                }
             }
         }
 
diff --git a/addons/web/static/src/webclient/burger_menu/burger_menu.variables.scss b/addons/web/static/src/webclient/burger_menu/burger_menu.variables.scss
index 9711b398434..be6bb703367 100644
--- a/addons/web/static/src/webclient/burger_menu/burger_menu.variables.scss
+++ b/addons/web/static/src/webclient/burger_menu/burger_menu.variables.scss
@@ -1,7 +1,7 @@
 // = Burger Menu Variables
 // ============================================================================
-$o-burger-topbar-bg: $o-brand-odoo !default;
-$o-burger-topbar-color: $o-white !default;
+$o-burger-base-bg: $o-white !default;
+$o-burger-base-color: $o-gray-800 !default;
 
-$o-burger-base-bg: $o-burger-topbar-bg !default;
-$o-burger-base-color: $o-burger-topbar-color !default;
+$o-burger-topbar-bg: $o-gray-100 !default;
+$o-burger-topbar-color: $o-gray-900 !default;
\ No newline at end of file
diff --git a/addons/web/static/src/webclient/burger_menu/burger_menu.xml b/addons/web/static/src/webclient/burger_menu/burger_menu.xml
index 79a7c9edfe3..0aa68ce88b5 100644
--- a/addons/web/static/src/webclient/burger_menu/burger_menu.xml
+++ b/addons/web/static/src/webclient/burger_menu/burger_menu.xml
@@ -5,7 +5,7 @@
 
 <div t-name="web.BurgerMenu" owl="1">
     <button
-        class="o_mobile_menu_toggle o-no-caret d-md-none border-0"
+        class="o_mobile_menu_toggle o_nav_entry o-no-caret d-md-none border-0 pe-3"
         title="Toggle menu" aria-label="Toggle menu"
         t-on-click="_openBurger">
         <i class="oi oi-panel-right"/>
@@ -15,7 +15,7 @@
         <div class="o_burger_menu position-fixed top-0 bottom-0 start-100 d-flex flex-column flex-nowrap" t-att-class="transition.className" t-on-touchstart.stop="_onSwipeStart" t-on-touchend.stop="_onSwipeEnd">
           <div class="o_burger_menu_topbar d-flex align-items-center justify-content-between flex-shrink-0 py-0 fs-4"
               t-on-click.stop='_toggleUserMenu'>
-              <small class="o-no-caret dropdown-toggle d-flex align-items-center justify-content-between" t-att-class="{'active bg-view text-body': isUserMenuUnfolded }">
+              <small class="o-no-caret dropdown-toggle d-flex align-items-center justify-content-between" t-att-class="{'active bg-view text-body border-end': isUserMenuUnfolded }">
                   <img class="o_burger_menu_avatar o_image_24_cover rounded-circle" t-att-src="'/web/image?model=res.users&amp;field=avatar_128&amp;id=' + user.userId" alt="Menu"/>
                   <span class="o_burger_menu_username px-2"><t t-esc="user.name"/></span>
                   <i t-if="isUserMenuTogglable" class="fa" t-att-class="state.isUserMenuOpened ? 'fa-caret-down' : 'fa-caret-left'"/>
@@ -23,7 +23,7 @@
               <button class="o_burger_menu_close oi oi-close btn d-flex align-items-center h-100 bg-transparent border-0 fs-2 text-reset" aria-label="Close menu" title="Close menu" t-on-click.stop="_closeBurger"/>
           </div>
           <nav class="o_burger_menu_content flex-grow-1 flex-shrink-1 overflow-auto"
-              t-att-class="{o_burger_menu_dark: !isUserMenuUnfolded, 'bg-view': isUserMenuUnfolded}">
+              t-att-class="{o_burger_menu_app: !isUserMenuUnfolded, 'bg-view': isUserMenuUnfolded}">
               <!-- -->
               <t t-if="isUserMenuUnfolded">
                   <MobileSwitchCompanyMenu t-if="Object.values(company.availableCompanies).length > 1" />
@@ -48,7 +48,12 @@
 
 <t t-name="web.BurgerSection" owl="1">
     <li t-if="section.childrenTree.length" class="ps-0">
-        <div class="py-3 bg-transparent" t-att-class="{ 'fs-4': !isNested }"
+        <div class="bg-transparent"
+            t-att-class="{
+                'fw-bold text-900 pt-3 pb-2': !isNested,
+                'border-top': !isNested &amp;&amp; subMenu_index != 0,
+                'py-2': isNested,
+            }"
             t-att-data-menu-xmlid="section.xmlid" t-esc="section.name"/>
         <ul class="ps-0">
             <t t-foreach="section.childrenTree" t-as="subSection" t-key="subSection_index">
@@ -60,7 +65,11 @@
         </ul>
     </li>
     <li t-else="" t-on-click="() => this._onMenuClicked(section)"  t-att-data-menu-xmlid="section.xmlid"
-        class="py-3" t-att-class="{ 'fs-4': !isNested }">
+        t-att-class="{
+            'fw-bold text-900 py-3': !isNested,
+            'border-top': !isNested &amp;&amp; subMenu_index != 0,
+            'py-2': isNested,
+        }">
         <t t-esc="section.name"/>
     </li>
 </t>
diff --git a/addons/web/static/src/webclient/navbar/navbar.scss b/addons/web/static/src/webclient/navbar/navbar.scss
index 9e1952dfe7f..638a6c3e3b3 100644
--- a/addons/web/static/src/webclient/navbar/navbar.scss
+++ b/addons/web/static/src/webclient/navbar/navbar.scss
@@ -2,17 +2,16 @@
 // = Main Navbar
 // ============================================================================
 .o_main_navbar {
-    @include print-variable(o-navbar-height, $o-navbar-height-xs);
-
-    @include media-breakpoint-up(lg) {
-        @include print-variable(o-navbar-height, $o-navbar-height-lg);
-    }
+    @include print-variable(o-navbar-height, $o-navbar-height);
 
     display: flex;
     height: var(--o-navbar-height);
     min-width: min-content;
+    padding-top: $o-navbar-padding-v;
+    padding-bottom: $o-navbar-padding-v;
     border-bottom: $o-navbar-border-bottom;
     background: $o-navbar-background;
+    font-size: $o-navbar-font-size;
 
     // = Reset browsers defaults
     // --------------------------------------------------------------------------
@@ -24,27 +23,39 @@
 
     // = General components & behaviours
     // --------------------------------------------------------------------------
-    .dropdown.show > .dropdown-toggle {
-        @extend %-main-navbar-entry-active;
-    }
 
-    .o_nav_entry {
+    .o_nav_entry, .dropdown-toggle {
         @extend %-main-navbar-entry-base;
         @extend %-main-navbar-entry-spacing;
-        @extend %-main-navbar-entry-bg-hover;
-    }
-
-    .dropdown-toggle {
-        @extend %-main-navbar-entry-base;
-        @extend %-main-navbar-entry-spacing;
-        @extend %-main-navbar-entry-bg-hover;
         border: 0;
     }
 
+    .o_menu_sections {
+        .o_nav_entry, .dropdown-toggle {
+            @extend %-main-navbar-entry-bg-hover;
+        }
+
+        .dropdown.show > .dropdown-toggle {
+            @extend %-main-navbar-entry-active;
+        }
+    }
+
+    @if (not $o-navbar-use-pills) {
+        .o_menu_systray {
+            .o_nav_entry, .dropdown-toggle {
+                @extend %-main-navbar-entry-bg-hover;
+            }
+
+            .dropdown.show > .dropdown-toggle {
+                @extend %-main-navbar-entry-active;
+            }
+        }
+    }
+
     .dropdown-menu {
-        margin-top: 0;
         border-top: 0;
-        @include border-top-radius(0);
+        margin-top: $o-navbar-dropdown-menu-margin-top;
+        border-radius: $o-navbar-dropdown-menu-border-radius;
     }
 
     .o_dropdown_menu_group_entry.dropdown-item {
@@ -58,8 +69,9 @@
     // = Navbar Sections & Children
     // --------------------------------------------------------------------------
     .o_navbar_apps_menu .dropdown-toggle {
+        --NavBar-entry-padding-left: #{$o-horizontal-padding};
+
         @extend %-main-navbar-entry-base;
-        padding-left: $o-horizontal-padding;
         font-size: $o-navbar-brand-font-size;
     }
 
@@ -68,6 +80,7 @@
         @extend %-main-navbar-entry-spacing;
         padding-left: 0;
         font-size: $o-navbar-brand-font-size;
+        color: var(--NavBar-brand-color, #{$o-navbar-brand-color});
 
         &:hover {
             background: none;
@@ -75,8 +88,6 @@
     }
 
     .o_menu_sections {
-        width: 0;
-
         .o_more_dropdown_section_group {
             margin-top: .8em;
 
@@ -87,27 +98,16 @@
         }
     }
 
-    .o_menu_systray > * {
-        > a, > .dropdown > a, > button, > label { // <label> is required by website
-            @extend %-main-navbar-entry-base;
-            @extend %-main-navbar-entry-spacing;
-            @extend %-main-navbar-entry-bg-hover;
-
-            @include media-breakpoint-up(lg) {
-                padding: 0 $o-horizontal-padding * .6;
-            }
-
-            .badge {
-                margin-right: -.5em;
-                border: 0;
-                height: $o-navbar-badge-size + $o-navbar-badge-padding + $o-navbar-badge-size-adjust;
-                padding: ($o-navbar-badge-padding * .5) $o-navbar-badge-padding;
-                background-color: var(--o-navbar-badge-bg, #{$o-navbar-badge-bg});
-                font-size: $o-navbar-badge-size;
-                color: var(--o-navbar-badge-color, inherit);
-                text-shadow: var(--o-navbar-badge-text-shadow, #{1px 1px 0 rgba($black, .3)});
-                transform: translate(-10%, -30%);
-            }
+    .o_menu_systray {
+        .badge {
+            margin-right: -.5em;
+            border: 0;
+            padding: ($o-navbar-badge-padding * .5) $o-navbar-badge-padding;
+            background-color: var(--o-navbar-badge-bg, #{$o-navbar-badge-bg});
+            font-size: $o-navbar-badge-size;
+            color: var(--o-navbar-badge-color, $o-navbar-badge-color);
+            text-shadow: var(--o-navbar-badge-text-shadow, #{$o-navbar-badge-text-shadow});
+            transform: translate(-0.6em, -30%);
         }
     }
 }
diff --git a/addons/web/static/src/webclient/navbar/navbar.variables.scss b/addons/web/static/src/webclient/navbar/navbar.variables.scss
index 7f8d3020292..752ae879a86 100644
--- a/addons/web/static/src/webclient/navbar/navbar.variables.scss
+++ b/addons/web/static/src/webclient/navbar/navbar.variables.scss
@@ -1,23 +1,35 @@
 // = Main Navbar Variables
 // ============================================================================
-$o-navbar-height-xs: 46px !default;
-$o-navbar-height-lg: 40px !default;
-$o-navbar-height: $o-navbar-height-lg !default;
+$o-navbar-use-pills: false !default;
+$o-navbar-height: 46px !default;
+$o-navbar-padding-v: 0px !default;
+$o-navbar-font-size: $o-font-size-base !default;
 
 $o-navbar-background: $o-brand-odoo !default;
-
 $o-navbar-border-bottom: 1px solid darken($o-brand-odoo, 10%) !default;
 
-$o-navbar-entry-color: $o-white !default;
-$o-navbar-entry-font-size: $o-font-size-base !default;
+$o-navbar-entry-margin-h: 0 !default;
+$o-navbar-entry-padding-h: .63em !default;
+$o-navbar-entry-border-radius: 0 !default;
+$o-navbar-entry-color: rgba($o-white, .9) !default;
+$o-navbar-entry-color--hover: $o-white !default;
+$o-navbar-entry-font-size: 1em !default;
 $o-navbar-entry-bg--hover: rgba($o-black, .08) !default;
 
-$o-navbar-brand-font-size: $o-navbar-entry-font-size * 1.3 !default;
+$o-navbar-entry-color--active: $o-navbar-entry-color--hover !default;
+$o-navbar-entry-bg--active: $o-navbar-entry-bg--hover !default;
+
+$o-navbar-dropdown-menu-margin-top: 0px !default;
+$o-navbar-dropdown-menu-border-radius: 0 0 $o-border-radius $o-border-radius !default;
+
+$o-navbar-brand-font-size: 1.2em !default;
+$o-navbar-brand-color: $o-navbar-entry-color !default;
 
 $o-navbar-badge-size: 11px !default;
-$o-navbar-badge-size-adjust: 1px !default;
 $o-navbar-badge-padding: 4px !default;
 $o-navbar-badge-bg: $o-success !default;
+$o-navbar-badge-color: inherit !default;
+$o-navbar-badge-text-shadow: 1px 1px 0 rgba($o-black, .3) !default;
 
 // = % PseudoClasses
 //
@@ -28,28 +40,37 @@ $o-navbar-badge-bg: $o-success !default;
     display: flex;
     align-items: center;
     width: auto;
-    height: var(--o-navbar-height, #{$o-navbar-height});
+    height: calc(var(--o-navbar-height) - #{$o-navbar-padding-v * 2});
+    border-radius: $o-navbar-entry-border-radius;
     user-select: none;
     background: transparent;
     font-size: $o-navbar-entry-font-size;
 
-    @include o-hover-text-color(rgba($o-navbar-entry-color, .9), $o-navbar-entry-color);
+    @include o-hover-text-color(
+        var(--NavBar-entry-color, #{$o-navbar-entry-color}),
+        var(--NavBar-entry-color--hover, #{$o-navbar-entry-color--hover})
+    );
 }
 
 %-main-navbar-entry-spacing {
-    padding: 0 $o-horizontal-padding * .75;
-    line-height: var(--o-navbar-height);
+    margin: 0;
+    margin-left: var(--NavBar-entry-margin-left, #{$o-navbar-entry-margin-h});
+    margin-right: var(--NavBar-entry-margin-right, #{$o-navbar-entry-margin-h});
+    padding: 0;
+    padding-left: var(--NavBar-entry-padding-left, #{$o-navbar-entry-padding-h});
+    padding-right: var(--NavBar-entry-padding-right, #{$o-navbar-entry-padding-h});
+    line-height: calc(var(--o-navbar-height) - #{$o-navbar-padding-v * 2});
 }
 
 %-main-navbar-entry-bg-hover {
     &:hover {
-        background-color: $o-navbar-entry-bg--hover;
+        background-color: var(--NavBar-entry-backgroundColor--hover, #{$o-navbar-entry-bg--hover});
     }
 }
 
 %-main-navbar-entry-active {
     &, &:hover, &:focus {
-        background: $o-navbar-entry-bg--hover;
-        color: $o-navbar-entry-color;
+        background: var(--NavBar-entry-backgroundColor--active, #{$o-navbar-entry-bg--active});
+        color: var(--NavBar-entry-color--active, #{$o-navbar-entry-color--active});
     }
 }
diff --git a/addons/web/static/src/webclient/navbar/navbar.xml b/addons/web/static/src/webclient/navbar/navbar.xml
index a382786b820..cd2be93347f 100644
--- a/addons/web/static/src/webclient/navbar/navbar.xml
+++ b/addons/web/static/src/webclient/navbar/navbar.xml
@@ -17,7 +17,7 @@
           t-if="currentApp"
           href="getMenuItemHref(currentApp)"
           t-esc="currentApp.name"
-          class="'o_menu_brand d-none d-md-block'"
+          class="'o_menu_brand d-none d-md-flex'"
           dataset="{ menuXmlid: currentApp.xmlid, section: currentApp.id }"
           onSelected="() => this.onNavBarDropdownItemSelection(currentApp)"
         />
@@ -60,7 +60,7 @@
   </t>
 
   <t t-name="web.NavBar.SectionsMenu" owl="1">
-    <div class="o_menu_sections d-none d-md-flex flex-grow-1 flex-shrink-1" t-ref="appSubMenus" role="menu">
+    <div class="o_menu_sections d-none d-md-flex flex-grow-1 flex-shrink-1 w-0" t-ref="appSubMenus" role="menu">
 
       <t t-foreach="sections" t-as="section" t-key="section.id">
         <t
diff --git a/addons/web/static/src/webclient/settings_form_view/settings_form_controller.js b/addons/web/static/src/webclient/settings_form_view/settings_form_controller.js
index 7481545fe67..920b6403ad6 100644
--- a/addons/web/static/src/webclient/settings_form_view/settings_form_controller.js
+++ b/addons/web/static/src/webclient/settings_form_view/settings_form_controller.js
@@ -15,6 +15,7 @@ export class SettingsFormController extends formView.Controller {
         this.state = useState({ displayNoContent: false });
         this.searchState = useState({ value: "" });
         this.rootRef = useRef("root");
+        this.canCreate = false;
         useSubEnv({ searchState: this.searchState });
         useEffect(
             () => {
diff --git a/addons/web/static/src/webclient/settings_form_view/settings_form_view.xml b/addons/web/static/src/webclient/settings_form_view/settings_form_view.xml
index 8bc38404be3..d9c20b1987a 100644
--- a/addons/web/static/src/webclient/settings_form_view/settings_form_view.xml
+++ b/addons/web/static/src/webclient/settings_form_view/settings_form_view.xml
@@ -4,13 +4,13 @@
         <xpath expr="./div[@t-ref='root']" position="attributes">
             <attribute name="class">o-settings-form-view o_field_highlight</attribute>
         </xpath>
-        <xpath expr="//Layout" position="inside">
-            <t t-set-slot="control-panel-top-right">
-                <div class="o_cp_searchview d-flex flex-grow-1" role="search">
-                    <div class="o_searchview pb-1 align-self-center border-bottom flex-grow-1" role="search" aria-autocomplete="list">
-                        <i class="o_searchview_icon oi oi-search" role="img" aria-label="Search..." title="Search..." />
-                        <div class="o_searchview_input_container">
-                            <input type="text" class="o_searchview_input" accesskey="Q" placeholder="Search..." role="searchbox" t-model="searchState.value" t-ref="autofocus"/>
+        <xpath expr="//Layout/t[@t-set-slot='layout-actions']" position="replace">
+            <t t-set-slot="layout-actions">
+                <div class="o_cp_searchview d-flex w-100" role="search">
+                    <div class="o_searchview form-control d-flex align-items-center py-1" role="search" aria-autocomplete="list">
+                        <i class="o_searchview_icon oi oi-search me-2" role="img" aria-label="Search..." title="Search..." />
+                        <div class="o_searchview_input_container d-flex flex-grow-1 flex-wrap gap-1">
+                            <input type="text" class="o_searchview_input flex-grow-1 w-auto border-0" accesskey="Q" placeholder="Search..." role="searchbox" t-model="searchState.value" t-ref="autofocus"/>
                         </div>
                     </div>
                 </div>
@@ -28,6 +28,11 @@
                 </t>
             </t>
         </xpath>
+        <xpath expr="//Layout" position="inside">
+            <t t-set-slot="control-panel-status-indicator">
+                <t t-call="{{ props.buttonTemplate }}"/>
+            </t>
+        </xpath>
     </t>
 
     <t t-name="web.SettingsFormView.Buttons" t-inherit="web.FormView.Buttons" t-inherit-mode="primary" owl="1">
diff --git a/addons/web/static/src/webclient/user_menu/user_menu.scss b/addons/web/static/src/webclient/user_menu/user_menu.scss
index fc03e72993f..132afe3d1a7 100644
--- a/addons/web/static/src/webclient/user_menu/user_menu.scss
+++ b/addons/web/static/src/webclient/user_menu/user_menu.scss
@@ -1,3 +1,9 @@
 .o_user_menu .dropdown-toggle {
-    padding-right: $o-horizontal-padding;
+    --NavBar-entry-padding-right: 0;
+
+    margin-right: $o-horizontal-padding;
+
+    .o_user_avatar {
+        height: calc(var(--o-navbar-height) - 20px);
+    }
 }
diff --git a/addons/web/static/src/webclient/user_menu/user_menu.xml b/addons/web/static/src/webclient/user_menu/user_menu.xml
index 6fe52d2d9dd..0f19fecf16a 100644
--- a/addons/web/static/src/webclient/user_menu/user_menu.xml
+++ b/addons/web/static/src/webclient/user_menu/user_menu.xml
@@ -4,8 +4,13 @@
     <t t-name="web.UserMenu" owl="1">
         <Dropdown class="'o_user_menu d-none d-md-block pe-0'" togglerClass="'py-1 py-lg-0'">
             <t t-set-slot="toggler">
-                <img class="rounded-circle o_user_avatar h-75 py-1" t-att-src="source" alt="User"/>
-                <span class="oe_topbar_name d-none d-lg-block ms-1"><t t-esc="user.name"/><t t-if="env.debug" t-esc="' (' + user.db.name + ')'"/></span>
+                <img class="o_avatar o_user_avatar rounded" t-att-src="source" alt="User"/>
+                <small class="oe_topbar_name d-none ms-2 text-start smaller lh-1 text-truncate"  t-att-class="{'d-lg-inline-block' : env.debug}" style="max-width: 200px">
+                    <t t-esc="user.name"/>
+                    <mark class="d-block font-monospace text-truncate">
+                        <i class="fa fa-database oi-small me-1"/><t t-esc="user.db.name"/>
+                    </mark>
+                </small>
             </t>
             <t t-foreach="getElements()" t-as="element" t-key="element_index">
                 <t t-if="!element.hide">
diff --git a/addons/web/static/src/webclient/webclient.scss b/addons/web/static/src/webclient/webclient.scss
index 5c74d334277..35a2eb20f26 100644
--- a/addons/web/static/src/webclient/webclient.scss
+++ b/addons/web/static/src/webclient/webclient.scss
@@ -55,28 +55,7 @@ kbd {
 //== Badges
 .badge {
   min-width: $o-badge-min-width;
-}
-
-//== Btn-link
-.btn-link {
-  font-weight: $btn-font-weight;
-
-  // -- Btn-link variations
-  // Adapt the behavieur of .btn-link buttons when in conjuction with contextual
-  // classes (eg. text-warning). 'muted' is set as default text color, while
-  // the contextual-class color will be used on ':hover'.
-
-  // Apply all theme-colors variations except "secondary"
-  @each $-name, $-color in map-remove($theme-colors, "secondary") {
-    &.btn-#{$-name}, &.text-#{$-name} {
-      @include o-btn-link-variant($o-main-color-muted!important, o-text-color($-name) or $-color!important);
-    }
-  }
-
-  // Specific behavieur for "secondary"
-  &.btn-secondary {
-    @include o-btn-link-variant($body-color, $headings-color);
-  }
+  line-height: 1.1;
 }
 
 // Set position of our custom o-dropdown-menu (not bootstrap)
@@ -115,7 +94,7 @@ kbd {
         @include o-position-absolute(0);
         transform: translate(-1.5em, 90%);
         font: .7em/1em FontAwesome;
-        color: $primary;
+        color: $link-color;
         content: "\f00c";
       }
 
@@ -249,72 +228,6 @@ select {
   @include o-placeholder;
 }
 
-//------------------------------------------------------------------------------
-// Buttons
-//------------------------------------------------------------------------------
-// Bootstrap define buttons using just one base-color for each color variation
-// (eg.$primary), without control over text-color or border.
-// The following code define exceptions for buttons that needs a different
-// design by default or in specific scenarios.
-
-.btn-secondary {
-  // Customize the button design without overwrite the default '$secondary'
-  // variable that it's used by other components like list-groups, tables,
-  // badges...
-
-  @include button-variant(
-    $background: $o-btn-secondary-bg,
-    $border: $o-btn-secondary-bg,
-    $hover-background: $o-btn-secondary-hover-bg,
-    $hover-border: $o-btn-secondary-hover-border,
-    $active-background: $o-btn-secondary-hover-bg,
-    $active-border: $o-btn-secondary-hover-border
-  );
-
-  // By default, act like a .btn-link
-  @include o-hover-text-color($link-color, $link-hover-color);
-
-  &.disabled, &:disabled {
-    @include o-hover-text-color($o-gray-500, $o-gray-500);
-  }
-}
-
-.btn-outline-secondary {
-  // Slightly customize to act like an odoo custom btn-secondary with
-  // light gray border and $secondary text.
-  // Used for not prioritary actions ordropdown (eg. dashboard view).
-
-  @include button-variant(
-    $background: $o-btn-secondary-bg,
-    $border: $o-gray-200,
-    $hover-background: $o-btn-secondary-hover-bg,
-    $hover-border: $o-gray-300,
-    $active-background: $o-btn-secondary-hover-bg,
-    $active-border: $o-gray-300
-  );
-}
-
-.btn-light {
-  // Achieve "clickable text" elements that act like buttons once the
-  // the user interacts with (eg. control-panel dropdowns);
-  @include button-variant(
-    $background: $o-btn-light-bg,
-    $border: $o-btn-light-border,
-    $hover-background: $o-btn-light-background-hover,
-    $hover-border: $o-btn-light-background-hover,
-    $active-background: $o-btn-light-background-hover,
-    $active-border: $o-btn-light-background-hover
-  );
-}
-
-.btn-outline-secondary, .btn-light {
-  @include o-hover-text-color($o-main-text-color, $o-gray-900);
-
-  &.disabled, &:disabled {
-    @include o-hover-text-color($o-main-text-color, $o-main-text-color);
-  }
-}
-
 //------------------------------------------------------------------------------
 // Misc.
 //------------------------------------------------------------------------------
@@ -364,14 +277,6 @@ b, strong {
 
 //== Buttons
 
-// Uppercase primary and secondary except when secondary is used as a dropdown
-// toggler.
-.btn-primary,
-.btn-secondary:not(.dropdown-toggle):not(.dropdown-item),
-.btn-secondary.o_arrow_button:not(.dropdown-item) {
-  text-transform: uppercase;
-}
-
 // Disable unnecessary box-shadows on mouse hover
 .btn:focus:hover {
   box-shadow: none;
diff --git a/addons/web/static/tests/core/colorlist_tests.js b/addons/web/static/tests/core/colorlist_tests.js
index cd9d318dfce..f3d63e22ba7 100644
--- a/addons/web/static/tests/core/colorlist_tests.js
+++ b/addons/web/static/tests/core/colorlist_tests.js
@@ -48,8 +48,8 @@ QUnit.module("Components", () => {
         const secondBtn = target.querySelectorAll(".o_colorlist button")[1];
         assert.strictEqual(
             secondBtn.attributes.title.value,
-            "Fuchsia",
-            "second button color is Fuchsia"
+            "Raspberry",
+            "second button color is Raspberry"
         );
         assert.hasClass(
             secondBtn,
diff --git a/addons/web/static/tests/core/debug/debug_manager_tests.js b/addons/web/static/tests/core/debug/debug_manager_tests.js
index f26df5affef..0a0760530e1 100644
--- a/addons/web/static/tests/core/debug/debug_manager_tests.js
+++ b/addons/web/static/tests/core/debug/debug_manager_tests.js
@@ -379,17 +379,15 @@ QUnit.module("DebugMenu", (hooks) => {
         await doAction(webClient, 1234);
         await click(target.querySelector(".o_debug_manager button"));
         await click(target.querySelector(".o_debug_manager .dropdown-item"));
-        assert.containsN(target, ".breadcrumb-item", 2);
-        assert.strictEqual(
-            target.querySelector(".breadcrumb-item.active").textContent,
-            "Edit view"
-        );
+        assert.containsOnce(target, ".breadcrumb-item");
+        assert.containsOnce(target, ".o_breadcrumb .active");
+        assert.strictEqual(target.querySelector(".o_breadcrumb .active").textContent, "Edit view");
         assert.strictEqual(target.querySelector(".o_field_widget[name=id] input").value, "18");
 
         await click(target, ".breadcrumb .o_back_button");
-        assert.containsOnce(target, ".breadcrumb-item");
+        assert.containsOnce(target, ".o_breadcrumb .active");
         assert.strictEqual(
-            target.querySelector(".breadcrumb-item.active").textContent,
+            target.querySelector(".o_breadcrumb .active").textContent,
             "Reporting Ponies"
         );
     });
@@ -425,11 +423,9 @@ QUnit.module("DebugMenu", (hooks) => {
         await click(target.querySelector(".o_debug_manager button"));
         await click(target.querySelector(".o_debug_manager .dropdown-item"));
         await legacyExtraNextTick();
-        assert.containsN(target, ".breadcrumb-item", 2);
-        assert.strictEqual(
-            target.querySelector(".breadcrumb-item.active").textContent,
-            "Edit view"
-        );
+        assert.containsOnce(target, ".breadcrumb-item");
+        assert.containsOnce(target, ".o_breadcrumb .active");
+        assert.strictEqual(target.querySelector(".o_breadcrumb .active").textContent, "Edit view");
         assert.strictEqual(target.querySelector(".o_field_widget[name=id] input").value, "293");
     });
 
@@ -490,11 +486,9 @@ QUnit.module("DebugMenu", (hooks) => {
         await click(target.querySelector(".o_debug_manager button"));
         await click(target.querySelector(".o_debug_manager .dropdown-item"));
         await legacyExtraNextTick();
-        assert.containsN(target, ".breadcrumb-item", 2);
-        assert.strictEqual(
-            target.querySelector(".breadcrumb-item.active").textContent,
-            "Edit view"
-        );
+        assert.containsOnce(target, ".breadcrumb-item");
+        assert.containsOnce(target, ".o_breadcrumb .active");
+        assert.strictEqual(target.querySelector(".o_breadcrumb .active").textContent, "Edit view");
         assert.strictEqual(target.querySelector(".o_field_widget[name=id] input").value, "293");
     });
 
diff --git a/addons/web/static/tests/helpers/utils.js b/addons/web/static/tests/helpers/utils.js
index 4d1cab367f4..84ee4e3a048 100644
--- a/addons/web/static/tests/helpers/utils.js
+++ b/addons/web/static/tests/helpers/utils.js
@@ -384,10 +384,24 @@ export function click(el, selector, skipVisibilityCheck = false) {
 }
 
 export function clickCreate(htmlElement) {
-    if (htmlElement.querySelectorAll(".o_form_button_create").length) {
-        return click(htmlElement, ".o_form_button_create");
-    } else if (htmlElement.querySelectorAll(".o_list_button_create").length) {
-        return click(htmlElement, ".o_list_button_create");
+    if (
+        htmlElement.querySelectorAll(
+            ".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_form_button_create"
+        ).length
+    ) {
+        return click(
+            htmlElement,
+            ".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_form_button_create"
+        );
+    } else if (
+        htmlElement.querySelectorAll(
+            ".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_create"
+        ).length
+    ) {
+        return click(
+            htmlElement,
+            ".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_create"
+        );
     } else {
         throw new Error("No edit button found to be clicked.");
     }
@@ -407,8 +421,10 @@ export async function clickSave(htmlElement) {
     }
     if (htmlElement.querySelectorAll(".o_form_button_save").length) {
         return click(htmlElement, ".o_form_button_save");
-    } else if (htmlElement.querySelectorAll(".o_list_button_save").length) {
-        return click(htmlElement, ".o_list_button_save");
+    }
+    const listSaveButtons = htmlElement.querySelectorAll(".o_list_button_save");
+    if (listSaveButtons.length) {
+        return listSaveButtons.length >= 2 ? click(listSaveButtons[1]) : click(listSaveButtons[0]);
     } else {
         throw new Error("No save button found to be clicked.");
     }
@@ -420,8 +436,8 @@ export async function clickDiscard(htmlElement) {
     }
     if (htmlElement.querySelectorAll(".o_form_button_cancel").length) {
         return click(htmlElement, ".o_form_button_cancel");
-    } else if (htmlElement.querySelectorAll(".o_list_button_discard").length) {
-        return click(htmlElement, ".o_list_button_discard");
+    } else if ($(htmlElement).find(".o_list_button_discard:visible").length) {
+        return click($(htmlElement).find(".o_list_button_discard:visible").get(0));
     } else {
         throw new Error("No discard button found to be clicked.");
     }
diff --git a/addons/web/static/tests/legacy/control_panel/comparison_menu_tests.js b/addons/web/static/tests/legacy/control_panel/comparison_menu_tests.js
deleted file mode 100644
index 6c4887e7c67..00000000000
--- a/addons/web/static/tests/legacy/control_panel/comparison_menu_tests.js
+++ /dev/null
@@ -1,167 +0,0 @@
-/** @odoo-module **/
-    
-    import { browser } from "@web/core/browser/browser";
-    import { patchWithCleanup } from "@web/../tests/helpers/utils";
-    import * as cpHelpers from "@web/../tests/search/helpers";
-    import {
-        createControlPanel,
-        mock,
-    } from "web.test_utils";
-
-    const { patchDate } = mock;
-    const searchMenuTypes = ['filter', 'comparison'];
-
-    QUnit.module('Components', {
-        beforeEach() {
-            this.fields = {
-                birthday: { string: "Birthday", type: "date", store: true, sortable: true },
-                date_field: { string: "Date", type: "date", store: true, sortable: true },
-                float_field: { string: "Float", type: "float", group_operator: 'sum' },
-                foo: { string: "Foo", type: "char", store: true, sortable: true },
-            };
-            this.cpModelConfig = {
-                arch: `
-                    <search>
-                        <filter name="birthday" date="birthday"/>
-                        <filter name="date_field" date="date_field"/>
-                    </search>`,
-                fields: this.fields,
-                searchMenuTypes,
-            };
-            patchWithCleanup(browser, {
-                setTimeout: (fn) => fn(),
-            });
-        },
-    }, function () {
-
-        QUnit.module('ComparisonMenu (legacy)');
-
-        QUnit.test('simple rendering', async function (assert) {
-            const unpatchDate = patchDate(1997, 0, 9, 12, 0, 0);
-            const params = {
-                cpModelConfig: this.cpModelConfig,
-                cpProps: { fields: this.fields, searchMenuTypes },
-            };
-            const controlPanel = await createControlPanel(params);
-
-            assert.containsOnce(controlPanel, ".dropdown.o_filter_menu");
-            assert.containsNone(controlPanel, ".dropdown.o_comparison_menu");
-
-            await cpHelpers.toggleFilterMenu(controlPanel);
-            await cpHelpers.toggleMenuItem(controlPanel, "Birthday");
-            await cpHelpers.toggleMenuItemOption(controlPanel, "Birthday", "January");
-
-            assert.containsOnce(controlPanel, 'div.o_comparison_menu > button i.fa.fa-adjust');
-            assert.strictEqual(controlPanel.el.querySelector('div.o_comparison_menu > button span').innerText.trim(), "Comparison");
-
-            await cpHelpers.toggleComparisonMenu(controlPanel);
-            assert.containsN(controlPanel.el, ".o_comparison_menu .dropdown-item", 2);
-            assert.containsN(
-                controlPanel.el,
-                ".o_comparison_menu .dropdown-item[role=menuitemcheckbox]",
-                2
-            );
-
-            const comparisonOptions = [...controlPanel.el.querySelectorAll(
-                '.o_comparison_menu .o_menu_item'
-            )];
-            assert.strictEqual(comparisonOptions.length, 2);
-            assert.deepEqual(
-                comparisonOptions.map(e => e.innerText),
-                ["Birthday: Previous Period", "Birthday: Previous Year"]
-            );
-            assert.deepEqual(
-                comparisonOptions.map((e) => e.ariaChecked),
-                ["false", "false"]
-            );
-
-            unpatchDate();
-        });
-
-        QUnit.test('activate a comparison works', async function (assert) {
-            const unpatchDate = patchDate(1997, 0, 9, 12, 0, 0);
-            const params = {
-                cpModelConfig: this.cpModelConfig,
-                cpProps: { fields: this.fields, searchMenuTypes },
-            };
-            const controlPanel = await createControlPanel(params);
-
-            await cpHelpers.toggleFilterMenu(controlPanel);
-            await cpHelpers.toggleMenuItem(controlPanel, "Birthday");
-            await cpHelpers.toggleMenuItemOption(controlPanel, "Birthday", "January");
-            await cpHelpers.toggleComparisonMenu(controlPanel);
-            await cpHelpers.toggleMenuItem(controlPanel, "Birthday: Previous Period");
-
-            assert.deepEqual(cpHelpers.getFacetTexts(controlPanel), [
-                "Birthday: January 1997",
-                "Birthday: Previous Period",
-            ]);
-
-            await cpHelpers.toggleFilterMenu(controlPanel);
-            await cpHelpers.toggleMenuItem(controlPanel, "Date");
-            await cpHelpers.toggleMenuItemOption(controlPanel, "Date", "December");
-            await cpHelpers.toggleComparisonMenu(controlPanel);
-            await cpHelpers.toggleMenuItem(controlPanel, "Date: Previous Year");
-
-            assert.deepEqual(cpHelpers.getFacetTexts(controlPanel), [
-                ["Birthday: January 1997", "Date: December 1996"].join("or"),
-                "Date: Previous Year",
-            ]);
-
-            await cpHelpers.toggleFilterMenu(controlPanel);
-            await cpHelpers.toggleMenuItem(controlPanel, "Date");
-            await cpHelpers.toggleMenuItemOption(controlPanel, "Date", "1996");
-
-            assert.deepEqual(cpHelpers.getFacetTexts(controlPanel), [
-                "Birthday: January 1997",
-            ]);
-
-            await cpHelpers.toggleComparisonMenu(controlPanel);
-            await cpHelpers.toggleMenuItem(controlPanel, "Birthday: Previous Year");
-            assert.containsN(controlPanel.el, ".o_comparison_menu .dropdown-item", 2);
-            assert.containsN(
-                controlPanel.el,
-                ".o_comparison_menu .dropdown-item[role=menuitemcheckbox]",
-                2
-            );
-            const comparisonOptions = [
-                ...controlPanel.el.querySelectorAll(".o_comparison_menu .dropdown-item"),
-            ];
-            assert.deepEqual(
-                comparisonOptions.map((e) => e.innerText.trim()),
-                ["Birthday: Previous Period", "Birthday: Previous Year"]
-            );
-            assert.deepEqual(
-                comparisonOptions.map((e) => e.ariaChecked),
-                ["false", "true"]
-            );
-
-            assert.deepEqual(cpHelpers.getFacetTexts(controlPanel), [
-                "Birthday: January 1997",
-                "Birthday: Previous Year",
-            ]);
-
-            await cpHelpers.removeFacet(controlPanel);
-
-            assert.deepEqual(cpHelpers.getFacetTexts(controlPanel), []);
-
-            unpatchDate();
-        });
-
-        QUnit.test('no timeRanges key in search query if "comparison" not in searchMenuTypes', async function (assert) {
-            assert.expect(1);
-
-            this.cpModelConfig.searchMenuTypes = ['filter'];
-            const params = {
-                cpModelConfig: this.cpModelConfig,
-                cpProps: { fields: this.fields, searchMenuTypes: ['filter'] },
-            };
-            const controlPanel = await createControlPanel(params);
-
-            await cpHelpers.toggleFilterMenu(controlPanel);
-            await cpHelpers.toggleMenuItem(controlPanel, "Birthday");
-            await cpHelpers.toggleMenuItemOption(controlPanel, "Birthday", 0);
-
-            assert.notOk("timeRanges" in controlPanel.getQuery());
-        });
-    });
diff --git a/addons/web/static/tests/mobile/search/control_panel_tests.js b/addons/web/static/tests/mobile/search/control_panel_tests.js
index 59aa373f50a..a37e3f90362 100644
--- a/addons/web/static/tests/mobile/search/control_panel_tests.js
+++ b/addons/web/static/tests/mobile/search/control_panel_tests.js
@@ -1,12 +1,8 @@
 /** @odoo-module **/
 
-import { click, getFixture, triggerEvent, nextTick } from "@web/../tests/helpers/utils";
+import { getFixture, nextTick } from "@web/../tests/helpers/utils";
 import { ControlPanel } from "@web/search/control_panel/control_panel";
-import {
-    editSearch,
-    makeWithSearch,
-    setupControlPanelServiceRegistry,
-} from "@web/../tests/search/helpers";
+import { makeWithSearch, setupControlPanelServiceRegistry } from "@web/../tests/search/helpers";
 import { registry } from "@web/core/registry";
 import { uiService } from "@web/core/ui/ui_service";
 
@@ -42,86 +38,6 @@ QUnit.module("Search", (hooks) => {
 
     QUnit.module("Control Panel (mobile)");
 
-    QUnit.test("Display control panel mobile", async (assert) => {
-        await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchMenuTypes: ["filter"],
-            searchViewId: false,
-        });
-
-        assert.containsOnce(target, ".breadcrumb");
-        assert.containsOnce(target, ".o_enable_searchview");
-        assert.containsNone(target, ".o_searchview");
-        assert.containsNone(target, ".o_toggle_searchview_full");
-
-        await click(target, ".o_enable_searchview");
-
-        assert.containsNone(target, ".breadcrumb");
-        assert.containsOnce(target, ".o_enable_searchview");
-        assert.containsOnce(target, ".o_searchview");
-        assert.containsOnce(target, ".o_toggle_searchview_full");
-
-        await click(target, ".o_toggle_searchview_full");
-
-        assert.containsOnce(document.body, ".o_searchview.o_mobile_search");
-        assert.containsN(document.body, ".o_mobile_search .o_mobile_search_button", 2);
-        assert.strictEqual(
-            document.body.querySelector(".o_mobile_search_header").textContent.trim(),
-            "FILTER CLEAR"
-        );
-        assert.containsOnce(document.body, ".o_searchview.o_mobile_search .o_cp_searchview");
-        assert.containsOnce(document.body, ".o_searchview.o_mobile_search .o_mobile_search_footer");
-
-        await click(document.body.querySelector(".o_mobile_search_button"));
-
-        assert.containsNone(target, ".breadcrumb");
-        assert.containsOnce(target, ".o_enable_searchview");
-        assert.containsOnce(target, ".o_searchview");
-        assert.containsOnce(target, ".o_toggle_searchview_full");
-
-        await click(target, ".o_enable_searchview");
-
-        assert.containsOnce(target, ".breadcrumb");
-        assert.containsOnce(target, ".o_enable_searchview");
-        assert.containsNone(target, ".o_searchview");
-        assert.containsNone(target, ".o_toggle_searchview_full");
-    });
-
-    QUnit.test("Make a simple search in mobile mode", async (assert) => {
-        await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchMenuTypes: ["filter"],
-            searchViewFields: {
-                birthday: { string: "Birthday", type: "date", store: true, sortable: true },
-            },
-            searchViewArch: `
-                <search>
-                    <field name="birthday"/>
-                </search>
-            `,
-        });
-        assert.containsNone(target, ".o_searchview");
-
-        await click(target, ".o_enable_searchview");
-        assert.containsOnce(target, ".o_searchview");
-        const input = target.querySelector(".o_searchview input");
-        assert.containsNone(target, ".o_searchview_autocomplete");
-
-        await editSearch(target, "2022-02-14");
-        assert.strictEqual(input.value, "2022-02-14", "input value should be updated");
-        assert.containsOnce(target, ".o_searchview_autocomplete");
-
-        await triggerEvent(input, null, "keydown", { key: "Escape" });
-        assert.containsNone(target, ".o_searchview_autocomplete");
-
-        await click(target, ".o_enable_searchview");
-        assert.containsNone(target, ".o_searchview");
-    });
-
     QUnit.test("Control panel is shown/hide on top when scrolling", async (assert) => {
         await makeWithSearch({
             serverData,
diff --git a/addons/web/static/tests/mobile/views/calendar_view_tests.js b/addons/web/static/tests/mobile/views/calendar_view_tests.js
index 9a0218f7557..fade1aac318 100644
--- a/addons/web/static/tests/mobile/views/calendar_view_tests.js
+++ b/addons/web/static/tests/mobile/views/calendar_view_tests.js
@@ -92,63 +92,59 @@ QUnit.module("Views", ({ beforeEach }) => {
 
         assert.containsNone(target, ".o_calendar_button_prev", "prev button should be hidden");
         assert.containsNone(target, ".o_calendar_button_next", "next button should be hidden");
+        await click(target, ".o_calendar_container .o_other_calendar_panel");
         assert.isVisible(
             target.querySelector(
-                ".o_cp_bottom_left .o_calendar_buttons .o_view_scale_selector + button.o_cp_today_button"
+                ".o_calendar_container .o_calendar_sidebar_container button.o_calendar_button_today"
             ),
-            "today button should be visible near the calendar buttons (bottom left corner)"
+            "today button should be visible"
         );
 
         // Test all views
         // displays month mode by default
-        assert.containsOnce(
-            target,
-            ".fc-view-container > .fc-timeGridWeek-view",
-            "should display the current week"
-        );
         assert.equal(
-            target.querySelector(".breadcrumb-item").textContent,
-            "undefined (Dec 11 – 17, 2016)"
+            target.querySelector(
+                ".o_calendar_container .o_calendar_sidebar_container .dropdown-toggle"
+            ).textContent,
+            "Week",
+            "should display the current week"
         );
 
         // switch to day mode
-        await click(target, ".o_control_panel .scale_button_selection");
-        await click(target, ".o_control_panel .o_scale_button_day");
+        await click(target, ".o_calendar_sidebar_container .dropdown-toggle");
+        await click(target, ".o_calendar_sidebar_container .o_scale_button_day");
         await nextTick();
-        assert.containsOnce(
-            target,
-            ".fc-view-container > .fc-timeGridDay-view",
-            "should display the current day"
-        );
         assert.equal(
-            target.querySelector(".breadcrumb-item").textContent,
-            "undefined (December 12, 2016)"
+            target.querySelector(
+                ".o_calendar_container .o_calendar_sidebar_container .dropdown-toggle"
+            ).textContent,
+            "Day",
+            "should display the current day"
         );
 
         // switch to month mode
-        await click(target, ".o_control_panel .scale_button_selection");
-        await click(target, ".o_control_panel .o_scale_button_month");
+        await click(target, ".o_calendar_sidebar_container .dropdown-toggle");
+        await click(target, ".o_calendar_sidebar_container .o_scale_button_month");
         await nextTick();
-        assert.containsOnce(
-            target,
-            ".fc-view-container > .fc-dayGridMonth-view",
-            "should display the current month"
-        );
         assert.equal(
-            target.querySelector(".breadcrumb-item").textContent,
-            "undefined (December 2016)"
+            target.querySelector(
+                ".o_calendar_container .o_calendar_sidebar_container .dropdown-toggle"
+            ).textContent,
+            "Month",
+            "should display the current month"
         );
 
         // switch to year mode
-        await click(target, ".o_control_panel .scale_button_selection");
-        await click(target, ".o_control_panel .o_scale_button_year");
+        await click(target, ".o_calendar_sidebar_container .dropdown-toggle");
+        await click(target, ".o_calendar_sidebar_container .o_scale_button_year");
         await nextTick();
-        assert.containsOnce(
-            target,
-            ".fc-view-container > .fc-dayGridYear-view",
+        assert.equal(
+            target.querySelector(
+                ".o_calendar_container .o_calendar_sidebar_container .dropdown-toggle"
+            ).textContent,
+            "Year",
             "should display the current year"
         );
-        assert.equal(target.querySelector(".breadcrumb-item").textContent, "undefined (2016)");
     });
 
     QUnit.test("calendar: popover is rendered as dialog in mobile", async function (assert) {
@@ -186,7 +182,9 @@ QUnit.module("Views", ({ beforeEach }) => {
         await swipeRight(target, ".o_calendar_widget");
         assert.equal(target.querySelector(".fc-day-header[data-date]").dataset.date, "2016-12-11");
 
+        await click(target, ".o_other_calendar_panel");
         await click(target, ".o_calendar_button_today");
+        await click(target, ".o_other_calendar_panel");
         assert.equal(target.querySelector(".fc-day-header[data-date]").dataset.date, "2016-12-12");
     });
 
@@ -358,7 +356,6 @@ QUnit.module("Views", ({ beforeEach }) => {
         // Should display year view
         assert.containsOnce(target, ".fc-dayGridYear-view");
         assert.containsN(target, ".fc-month-container", 12);
-        assert.equal(target.querySelector(".breadcrumb-item").textContent, "undefined (2016)");
 
         // Tap on a date
         await tap(target, ".fc-day-top[data-date='2016-02-05']");
@@ -368,19 +365,14 @@ QUnit.module("Views", ({ beforeEach }) => {
         // Should display day view
         assert.containsNone(target, ".fc-dayGridYear-view");
         assert.containsOnce(target, ".fc-timeGridDay-view");
-        assert.equal(
-            target.querySelector(".breadcrumb-item").textContent,
-            "undefined (February 5, 2016)"
-        );
+        assert.equal(target.querySelector(".fc-day-header[data-date]").dataset.date, "2016-02-05");
 
         // Change scale to month
+        await click(target, ".o_calendar_container .o_other_calendar_panel");
         await changeScale(target, "month");
+        await click(target, ".o_calendar_container .o_other_calendar_panel");
         assert.containsNone(target, ".fc-timeGridDay-view");
         assert.containsOnce(target, ".fc-dayGridMonth-view");
-        assert.equal(
-            target.querySelector(".breadcrumb-item").textContent,
-            "undefined (February 2016)"
-        );
 
         // Tap on a date
         await tap(target, ".fc-day-top[data-date='2016-02-10']");
@@ -389,9 +381,6 @@ QUnit.module("Views", ({ beforeEach }) => {
 
         assert.containsNone(target, ".fc-dayGridMonth-view");
         assert.containsOnce(target, ".fc-timeGridDay-view");
-        assert.equal(
-            target.querySelector(".breadcrumb-item").textContent,
-            "undefined (February 10, 2016)"
-        );
+        assert.equal(target.querySelector(".fc-day-header[data-date]").dataset.date, "2016-02-10");
     });
 });
diff --git a/addons/web/static/tests/mobile/views/fields/statusbar_field_tests.js b/addons/web/static/tests/mobile/views/fields/statusbar_field_tests.js
index 9fba23e21dd..ef436857d69 100644
--- a/addons/web/static/tests/mobile/views/fields/statusbar_field_tests.js
+++ b/addons/web/static/tests/mobile/views/fields/statusbar_field_tests.js
@@ -29,7 +29,7 @@ QUnit.module("Mobile Fields", ({ beforeEach }) => {
 
     QUnit.module("StatusBarField");
 
-    QUnit.test("statusbar is rendered correclty on small devices", async (assert) => {
+    QUnit.test("statusbar is rendered correctly on small devices", async (assert) => {
         await makeView({
             type: "form",
             resModel: "partner",
@@ -75,20 +75,20 @@ QUnit.module("Mobile Fields", ({ beforeEach }) => {
         );
         assert.containsN(
             fixture,
-            ".o_statusbar_status .dropdown-menu .btn",
+            ".o_statusbar_status .dropdown-menu .dropdown-item",
             3,
             "should have 3 status"
         );
         assert.containsN(
             fixture,
-            ".o_statusbar_status .btn.disabled",
+            ".o_statusbar_status .dropdown-item.disabled",
             3,
             "all status should be disabled"
         );
         assert.hasClass(
-            fixture.querySelector(".o_statusbar_status .btn:nth-child(3)"),
-            "btn-primary",
-            "active status should be btn-primary"
+            fixture.querySelector(".o_statusbar_status .dropdown-item:nth-child(3)"),
+            "active",
+            "active status should be set"
         );
     });
 
@@ -131,30 +131,30 @@ QUnit.module("Mobile Fields", ({ beforeEach }) => {
         );
         assert.containsN(
             fixture,
-            ".o_statusbar_status .dropdown-menu .btn",
+            ".o_statusbar_status .dropdown-menu .dropdown-item",
             3,
-            "statusbar widget dropdown menu should have 3 buttons"
+            "statusbar widget dropdown menu should have 3 items"
         );
         assert.strictEqual(
             fixture
-                .querySelectorAll(".o_statusbar_status .dropdown-menu .btn")[0]
+                .querySelectorAll(".o_statusbar_status .dropdown-menu .dropdown-item")[0]
                 .textContent.trim(),
             "first record",
-            "statusbar widget dropdown first button should display the first record display_name"
+            "statusbar widget dropdown first item should display the first record display_name"
         );
         assert.strictEqual(
             fixture
-                .querySelectorAll(".o_statusbar_status .dropdown-menu .btn")[1]
+                .querySelectorAll(".o_statusbar_status .dropdown-menu .dropdown-item")[1]
                 .textContent.trim(),
             "second record",
-            "statusbar widget dropdown second button should display the second record display_name"
+            "statusbar widget dropdown second item should display the second record display_name"
         );
         assert.strictEqual(
             fixture
-                .querySelectorAll(".o_statusbar_status .dropdown-menu .btn")[2]
+                .querySelectorAll(".o_statusbar_status .dropdown-menu .dropdown-item")[2]
                 .textContent.trim(),
             "aaa",
-            "statusbar widget dropdown third button should display the third record display_name"
+            "statusbar widget dropdown third item should display the third record display_name"
         );
     });
 
@@ -175,34 +175,34 @@ QUnit.module("Mobile Fields", ({ beforeEach }) => {
 
         await click(fixture, ".o_statusbar_status .dropdown-toggle");
         assert.hasClass(
-            fixture.querySelector(".o_statusbar_status .dropdown-menu .btn:nth-child(3)"),
-            "btn-primary"
+            fixture.querySelector(".o_statusbar_status .dropdown-menu .dropdown-item:nth-child(3)"),
+            "active"
         );
         assert.hasClass(
-            fixture.querySelector(".o_statusbar_status .dropdown-menu .btn:nth-child(3)"),
+            fixture.querySelector(".o_statusbar_status .dropdown-menu .dropdown-item:nth-child(3)"),
             "disabled"
         );
 
         assert.containsN(
             fixture,
-            ".o_statusbar_status .btn-secondary:not(.dropdown-toggle):not(.disabled)",
+            ".o_statusbar_status .dropdown-item:not(.dropdown-toggle):not(.disabled):not(.active)",
             2,
-            "other status should be btn-secondary and not disabled"
+            "other status should be active and not disabled"
         );
 
         await click(
             fixture.querySelector(
-                ".o_statusbar_status .btn-secondary:not(.dropdown-toggle):not(.disabled)"
+                ".o_statusbar_status .dropdown-item:not(.dropdown-toggle):not(.disabled):not(.active)"
             )
         );
 
         await click(fixture, ".o_statusbar_status .dropdown-toggle");
         assert.hasClass(
-            fixture.querySelector(".o_statusbar_status .dropdown-menu .btn:nth-child(1)"),
-            "btn-primary"
+            fixture.querySelector(".o_statusbar_status .dropdown-menu .dropdown-item:nth-child(1)"),
+            "active"
         );
         assert.hasClass(
-            fixture.querySelector(".o_statusbar_status .dropdown-menu .btn:nth-child(1)"),
+            fixture.querySelector(".o_statusbar_status .dropdown-menu .dropdown-item:nth-child(1)"),
             "disabled"
         );
     });
diff --git a/addons/web/static/tests/mobile/views/form_view_tests.js b/addons/web/static/tests/mobile/views/form_view_tests.js
index d2fbc4b0b6e..7095ed7da57 100644
--- a/addons/web/static/tests/mobile/views/form_view_tests.js
+++ b/addons/web/static/tests/mobile/views/form_view_tests.js
@@ -422,7 +422,7 @@ QUnit.module("Mobile Views", ({ beforeEach }) => {
             );
 
             // click on back button
-            await click(fixture, ".modal .modal-header .fa-arrow-left");
+            await click(fixture, ".modal .modal-header .oi-arrow-left");
             assert.strictEqual(
                 window.scrollY,
                 265,
diff --git a/addons/web/static/tests/mobile/views/list_view_tests.js b/addons/web/static/tests/mobile/views/list_view_tests.js
index 5484217752d..b14b9af1f68 100644
--- a/addons/web/static/tests/mobile/views/list_view_tests.js
+++ b/addons/web/static/tests/mobile/views/list_view_tests.js
@@ -61,13 +61,13 @@ QUnit.module("Mobile Views", ({ beforeEach }) => {
 
         assert.containsN(fixture, ".o_data_row", 4);
         assert.containsNone(fixture, ".o_list_selection_box");
-        assert.containsOnce(fixture, ".o_control_panel .o_cp_bottom_right");
+        assert.containsOnce(fixture, ".o_control_panel .fa-search");
 
         // select a record
         await triggerEvents(fixture, ".o_data_row:nth-child(1)", ["touchstart", "touchend"]);
         assert.containsOnce(fixture, ".o_list_selection_box");
         assert.containsNone(fixture, ".o_list_selection_box .o_list_select_domain");
-        assert.containsNone(fixture, ".o_control_panel .o_cp_bottom_right");
+        assert.containsNone(fixture, ".o_control_panel .o_cp_searchview");
         assert.ok(
             fixture.querySelector(".o_list_selection_box").textContent.includes("1 selected")
         );
@@ -94,7 +94,7 @@ QUnit.module("Mobile Views", ({ beforeEach }) => {
         // unselect all
         await click(fixture, ".o_list_unselect_all");
         assert.containsNone(fixture, ".o_list_selection_box");
-        assert.containsOnce(fixture, ".o_control_panel .o_cp_bottom_right");
+        assert.containsOnce(fixture, ".o_control_panel .fa-search");
     });
 
     QUnit.test("selection box is properly displayed (multi pages)", async function (assert) {
diff --git a/addons/web/static/tests/mobile/webclient/burger_menu/burger_menu_tests.js b/addons/web/static/tests/mobile/webclient/burger_menu/burger_menu_tests.js
index 474f3419e4e..020ebc2a1ab 100644
--- a/addons/web/static/tests/mobile/webclient/burger_menu/burger_menu_tests.js
+++ b/addons/web/static/tests/mobile/webclient/burger_menu/burger_menu_tests.js
@@ -72,7 +72,7 @@ QUnit.test("Burger Menu on an App", async (assert) => {
         document.body.querySelector(".o_burger_menu nav.o_burger_menu_content li").textContent,
         "SubMenu"
     );
-    assert.hasClass(document.body.querySelector(".o_burger_menu_content"), "o_burger_menu_dark");
+    assert.hasClass(document.body.querySelector(".o_burger_menu_content"), "o_burger_menu_app");
 
     await click(document.body, ".o_burger_menu_topbar");
     assert.doesNotHaveClass(
@@ -81,7 +81,7 @@ QUnit.test("Burger Menu on an App", async (assert) => {
     );
 
     await click(document.body, ".o_burger_menu_topbar");
-    assert.hasClass(document.body.querySelector(".o_burger_menu_content"), "o_burger_menu_dark");
+    assert.hasClass(document.body.querySelector(".o_burger_menu_content"), "o_burger_menu_app");
 });
 
 QUnit.test("Burger Menu on an App without SubMenu", async (assert) => {
diff --git a/addons/web/static/tests/search/comparison_menu_tests.js b/addons/web/static/tests/search/comparison_menu_tests.js
deleted file mode 100644
index aeaf52ce561..00000000000
--- a/addons/web/static/tests/search/comparison_menu_tests.js
+++ /dev/null
@@ -1,136 +0,0 @@
-/** @odoo-module **/
-
-import { getFixture, patchDate, patchWithCleanup } from "@web/../tests/helpers/utils";
-import { browser } from "@web/core/browser/browser";
-import { ControlPanel } from "@web/search/control_panel/control_panel";
-import {
-    getFacetTexts,
-    makeWithSearch,
-    removeFacet,
-    setupControlPanelServiceRegistry,
-    toggleComparisonMenu,
-    toggleFilterMenu,
-    toggleMenuItem,
-    toggleMenuItemOption,
-} from "./helpers";
-
-let target;
-let serverData;
-QUnit.module("Search", (hooks) => {
-    hooks.beforeEach(async () => {
-        serverData = {
-            models: {
-                foo: {
-                    fields: {
-                        birthday: { string: "Birthday", type: "date", store: true, sortable: true },
-                        date_field: { string: "Date", type: "date", store: true, sortable: true },
-                    },
-                },
-            },
-            views: {
-                "foo,false,search": `
-          <search>
-            <filter name="birthday" date="birthday"/>
-            <filter name="date_field" date="date_field"/>
-          </search>
-        `,
-            },
-        };
-        setupControlPanelServiceRegistry();
-        patchWithCleanup(browser, {
-            setTimeout: (fn) => fn(),
-            clearTimeout: () => {},
-        });
-        target = getFixture();
-    });
-
-    QUnit.module("Comparison");
-
-    QUnit.test("simple rendering", async function (assert) {
-        patchDate(1997, 0, 9, 12, 0, 0);
-        await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchMenuTypes: ["filter", "comparison"],
-            searchViewId: false,
-        });
-        assert.containsOnce(target, ".dropdown.o_filter_menu");
-        assert.containsNone(target, ".dropdown.o_comparison_menu");
-        await toggleFilterMenu(target);
-        await toggleMenuItem(target, "Birthday");
-        await toggleMenuItemOption(target, "Birthday", "January");
-        assert.containsOnce(target, "div.o_comparison_menu > button i.fa.fa-adjust");
-        assert.strictEqual(
-            target
-                .querySelector("div.o_comparison_menu > button span")
-                .innerText.trim()
-                .toUpperCase() /** @todo why do I need to upperCase */,
-            "COMPARISON"
-        );
-        await toggleComparisonMenu(target);
-        assert.containsN(target, ".o_comparison_menu .dropdown-item", 2);
-        assert.containsN(target, ".o_comparison_menu .dropdown-item[role=menuitemcheckbox]", 2);
-        const comparisonOptions = [...target.querySelectorAll(".o_comparison_menu .dropdown-item")];
-        assert.deepEqual(
-            comparisonOptions.map((e) => e.innerText.trim()),
-            ["Birthday: Previous Period", "Birthday: Previous Year"]
-        );
-        assert.deepEqual(
-            comparisonOptions.map((e) => e.ariaChecked),
-            ["false", "false"]
-        );
-    });
-
-    QUnit.test("activate a comparison works", async function (assert) {
-        patchDate(1997, 0, 9, 12, 0, 0);
-        await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchMenuTypes: ["filter", "comparison"],
-            searchViewId: false,
-        });
-        await toggleFilterMenu(target);
-        await toggleMenuItem(target, "Birthday");
-        await toggleMenuItemOption(target, "Birthday", "January");
-        await toggleComparisonMenu(target);
-        await toggleMenuItem(target, "Birthday: Previous Period");
-        assert.deepEqual(getFacetTexts(target), [
-            "Birthday: January 1997",
-            "Birthday: Previous Period",
-        ]);
-        await toggleFilterMenu(target);
-        await toggleMenuItem(target, "Date");
-        await toggleMenuItemOption(target, "Date", "December");
-        await toggleComparisonMenu(target);
-        await toggleMenuItem(target, "Date: Previous Year");
-        assert.deepEqual(getFacetTexts(target), [
-            ["Birthday: January 1997", "Date: December 1996"].join("or"),
-            "Date: Previous Year",
-        ]);
-        await toggleFilterMenu(target);
-        await toggleMenuItem(target, "Date");
-        await toggleMenuItemOption(target, "Date", "1996");
-        assert.deepEqual(getFacetTexts(target), ["Birthday: January 1997"]);
-        await toggleComparisonMenu(target);
-        await toggleMenuItem(target, "Birthday: Previous Year");
-        assert.containsN(target, ".o_comparison_menu .dropdown-item", 2);
-        assert.containsN(target, ".o_comparison_menu .dropdown-item[role=menuitemcheckbox]", 2);
-        const comparisonOptions = [...target.querySelectorAll(".o_comparison_menu .dropdown-item")];
-        assert.deepEqual(
-            comparisonOptions.map((e) => e.innerText.trim()),
-            ["Birthday: Previous Period", "Birthday: Previous Year"]
-        );
-        assert.deepEqual(
-            comparisonOptions.map((e) => e.ariaChecked),
-            ["false", "true"]
-        );
-        assert.deepEqual(getFacetTexts(target), [
-            "Birthday: January 1997",
-            "Birthday: Previous Year",
-        ]);
-        await removeFacet(target);
-        assert.deepEqual(getFacetTexts(target), []);
-    });
-});
diff --git a/addons/web/static/tests/search/control_panel.js b/addons/web/static/tests/search/control_panel.js
index 8c350911081..7bd23c4f64e 100644
--- a/addons/web/static/tests/search/control_panel.js
+++ b/addons/web/static/tests/search/control_panel.js
@@ -1,10 +1,8 @@
 /** @odoo-module **/
 
-import { click, getFixture, mount, nextTick } from "@web/../tests/helpers/utils";
+import { click, getFixture, nextTick } from "@web/../tests/helpers/utils";
 import { ControlPanel } from "@web/search/control_panel/control_panel";
 import { makeWithSearch, setupControlPanelServiceRegistry } from "./helpers";
-import { Component, xml } from "@odoo/owl";
-import { makeTestEnv } from "../helpers/mock_env";
 
 let target;
 let serverData;
@@ -39,16 +37,15 @@ QUnit.module("Search", (hooks) => {
             searchMenuTypes: [],
         });
 
-        assert.containsOnce(target, ".o_cp_top");
-        assert.containsOnce(target, ".o_cp_top_left");
-        assert.strictEqual(target.querySelector(".o_cp_top_right").innerHTML, "");
-        assert.containsOnce(target, ".o_cp_bottom");
-        assert.containsOnce(target, ".o_cp_bottom_left");
-        assert.containsOnce(target, ".o_cp_bottom_right");
+        assert.containsOnce(target, ".o_control_panel_breadcrumbs");
+        assert.containsOnce(target, ".o_control_panel_actions");
+        assert.strictEqual(target.querySelector(".o_control_panel_actions").innerHTML, "");
+        assert.containsOnce(target, ".o_control_panel_navigation");
+        assert.strictEqual(target.querySelector(".o_control_panel_navigation").innerHTML, "");
 
         assert.containsNone(target, ".o_cp_switch_buttons");
 
-        assert.containsOnce(target, ".breadcrumb");
+        assert.containsOnce(target, ".o_breadcrumb");
     });
 
     QUnit.test("breadcrumbs", async (assert) => {
@@ -65,8 +62,9 @@ QUnit.module("Search", (hooks) => {
             searchMenuTypes: [],
         });
 
-        assert.containsN(target, ".breadcrumb li.breadcrumb-item", 2);
-        const breadcrumbItems = target.querySelectorAll("li.breadcrumb-item");
+        const breadcrumbsSelector = ".o_breadcrumb li.breadcrumb-item, .o_breadcrumb .active";
+        assert.containsN(target, breadcrumbsSelector, 2);
+        const breadcrumbItems = target.querySelectorAll(breadcrumbsSelector);
         assert.strictEqual(breadcrumbItems[0].innerText, "Previous");
         assert.hasClass(breadcrumbItems[1], "active");
         assert.strictEqual(breadcrumbItems[1].innerText, "Current");
@@ -93,7 +91,10 @@ QUnit.module("Search", (hooks) => {
             searchMenuTypes: [],
         });
 
-        assert.containsOnce(target, ".o_cp_switch_buttons");
+        assert.containsOnce(
+            target,
+            ".o_control_panel_navigation .d-xl-inline-flex.o_cp_switch_buttons"
+        );
         assert.containsN(target, ".o_switch_view", 2);
         const views = target.querySelectorAll(".o_switch_view");
 
@@ -134,23 +135,4 @@ QUnit.module("Search", (hooks) => {
         await nextTick();
         assert.containsNone(target, ".o_pager");
     });
-
-    QUnit.test("control panel without bottom-right specifics", async (assert) => {
-        class CustomPage extends Component {}
-        CustomPage.components = { ControlPanel };
-        CustomPage.template = xml`
-            <ControlPanel display="{'top-right':false}">
-                <t t-set-slot="control-panel-bottom-right">
-                    <div class="o_new_bottom_right">Something else</div>
-                </t>
-            </ControlPanel>
-        `;
-        // Minimal config, still needs at least an empty breadcrumbs to setup a control_panel
-        const env = await makeTestEnv();
-        Object.assign(env, { config: { breadcrumbs: [] } });
-        await mount(CustomPage, target, { env });
-        assert.containsOnce(target, ".o_new_bottom_right");
-        assert.containsNone(target, ".o_cp_switch_buttons");
-        assert.containsNone(target, ".o_pager");
-    });
 });
diff --git a/addons/web/static/tests/search/custom_favorite_item_tests.js b/addons/web/static/tests/search/custom_favorite_item_tests.js
index 090318b319e..45e40109907 100644
--- a/addons/web/static/tests/search/custom_favorite_item_tests.js
+++ b/addons/web/static/tests/search/custom_favorite_item_tests.js
@@ -3,8 +3,7 @@
 import { getFixture, patchWithCleanup, triggerEvent } from "@web/../tests/helpers/utils";
 import { browser } from "@web/core/browser/browser";
 import { registry } from "@web/core/registry";
-import { ControlPanel } from "@web/search/control_panel/control_panel";
-import { FavoriteMenu } from "@web/search/favorite_menu/favorite_menu";
+import { SearchBarMenu } from "@web/search/search_bar_menu/search_bar_menu";
 import { useSetupAction } from "@web/webclient/actions/action_hook";
 import {
     editFavoriteName,
@@ -14,12 +13,13 @@ import {
     saveFavorite,
     setupControlPanelFavoriteMenuRegistry,
     setupControlPanelServiceRegistry,
-    toggleFavoriteMenu,
     toggleSaveFavorite,
+    toggleSearchBarMenu,
     validateSearch,
 } from "./helpers";
 
 import { Component, xml } from "@odoo/owl";
+import { SearchBar } from "@web/search/search_bar/search_bar";
 const serviceRegistry = registry.category("services");
 
 /**
@@ -79,7 +79,7 @@ QUnit.module("Search", (hooks) => {
         await makeWithSearch({
             serverData,
             resModel: "foo",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: ["favorite"],
             searchViewId: false,
             config: {
@@ -87,7 +87,7 @@ QUnit.module("Search", (hooks) => {
             },
         });
 
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleSaveFavorite(target);
         assert.strictEqual(
             target.querySelector('.o_add_favorite input[type="text"]').value,
@@ -107,12 +107,12 @@ QUnit.module("Search", (hooks) => {
         await makeWithSearch({
             serverData,
             resModel: "foo",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: ["favorite"],
             searchViewId: false,
         });
 
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleSaveFavorite(target);
         const checkboxes = target.querySelectorAll('input[type="checkbox"]');
 
@@ -166,8 +166,8 @@ QUnit.module("Search", (hooks) => {
                 });
             }
         }
-        TestComponent.components = { FavoriteMenu };
-        TestComponent.template = xml`<div><FavoriteMenu/></div>`;
+        TestComponent.components = { SearchBarMenu };
+        TestComponent.template = xml`<div><SearchBarMenu/></div>`;
 
         const comp = await makeWithSearch({
             serverData,
@@ -187,7 +187,7 @@ QUnit.module("Search", (hooks) => {
 
         assert.verifySteps([]);
 
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "aaa");
         await saveFavorite(target);
@@ -211,8 +211,8 @@ QUnit.module("Search", (hooks) => {
                 }
             },
             resModel: "foo",
-            Component: ControlPanel,
-            searchMenuTypes: ["favorite"],
+            Component: SearchBar,
+            searchMenuTypes: ["filter", "favorite"],
             searchViewId: false,
             searchViewArch: `
                     <search>
@@ -224,7 +224,7 @@ QUnit.module("Search", (hooks) => {
 
         assert.deepEqual(getFacetTexts(target), ["Filter"]);
 
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "My favorite");
         await saveFavorite(target);
@@ -245,7 +245,7 @@ QUnit.module("Search", (hooks) => {
                 }
             },
             resModel: "foo",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: ["favorite"],
             searchViewId: false,
             searchViewArch: `
@@ -262,7 +262,7 @@ QUnit.module("Search", (hooks) => {
 
         assert.deepEqual(getFacetTexts(target), ["Foo\na"]);
 
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "My favorite");
         await saveFavorite(target);
@@ -312,7 +312,7 @@ QUnit.module("Search", (hooks) => {
                     }
                 },
                 resModel: "foo",
-                Component: ControlPanel,
+                Component: SearchBar,
                 searchMenuTypes: ["favorite"],
                 searchViewId: false,
                 irFilters: [
@@ -328,7 +328,7 @@ QUnit.module("Search", (hooks) => {
                 ],
             });
 
-            await toggleFavoriteMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleSaveFavorite(target);
 
             // first try: should fail
@@ -345,44 +345,47 @@ QUnit.module("Search", (hooks) => {
         }
     );
 
-    QUnit.test("undefined name for filter shows notification and not error", async function (assert) {
-        assert.expect(2);
+    QUnit.test(
+        "undefined name for filter shows notification and not error",
+        async function (assert) {
+            assert.expect(2);
 
-        serviceRegistry.add(
-            "notification",
-            {
-                start() {
-                    return {
-                        add(message, options) {
-                            assert.strictEqual(
-                                message,
-                                "A name for your favorite filter is required.",
-                                "The notification should match: A name for your favorite filter is required."
-                            );
-                            assert.deepEqual(options, { type: "danger" });
-                        },
-                    };
+            serviceRegistry.add(
+                "notification",
+                {
+                    start() {
+                        return {
+                            add(message, options) {
+                                assert.strictEqual(
+                                    message,
+                                    "A name for your favorite filter is required.",
+                                    "The notification should match: A name for your favorite filter is required."
+                                );
+                                assert.deepEqual(options, { type: "danger" });
+                            },
+                        };
+                    },
                 },
-            },
-            { force: true }
-        );
+                { force: true }
+            );
 
-        await makeWithSearch({
-            serverData,
-            mockRPC: (_, args) => {
-                if (args.model === "ir.filters" && args.method === "create_or_replace") {
-                    return 7; // fake serverSideId
-                }
-            },
-            resModel: "foo",
-            Component: FavoriteMenu,
-            searchViewId: false,
-        });
+            await makeWithSearch({
+                serverData,
+                mockRPC: (_, args) => {
+                    if (args.model === "ir.filters" && args.method === "create_or_replace") {
+                        return 7; // fake serverSideId
+                    }
+                },
+                resModel: "foo",
+                Component: SearchBarMenu,
+                searchViewId: false,
+            });
 
-        await toggleFavoriteMenu(target);
-        await toggleSaveFavorite(target);
-        await saveFavorite(target);
-    });
+            await toggleSearchBarMenu(target);
+            await toggleSaveFavorite(target);
+            await saveFavorite(target);
+        }
+    );
 
     QUnit.skip("save search filter in modal", async function (assert) {
         /** @todo I don't know yet how to convert this test */
@@ -498,7 +501,7 @@ QUnit.module("Search", (hooks) => {
         // await applyFilter(".modal");
         // assert.containsNone(document.body, "tr.o_data_row", "should display 0 records");
         // // Save this search
-        // await toggleFavoriteMenu(".modal");
+        // await toggleSearchBarMenu(".modal");
         // await toggleSaveFavorite(".modal");
         // const filterNameInput = document.querySelector('.o_add_favorite input[type="text"]');
         // assert.isVisible(filterNameInput, "should display an input field for the filter name");
diff --git a/addons/web/static/tests/search/custom_group_by_item_tests.js b/addons/web/static/tests/search/custom_group_by_item_tests.js
index 04d85bb62d4..6b28f393004 100644
--- a/addons/web/static/tests/search/custom_group_by_item_tests.js
+++ b/addons/web/static/tests/search/custom_group_by_item_tests.js
@@ -1,7 +1,6 @@
 /** @odoo-module **/
 
 import { browser } from "@web/core/browser/browser";
-import { ControlPanel } from "@web/search/control_panel/control_panel";
 import { getFixture, patchWithCleanup } from "../helpers/utils";
 import {
     applyGroup,
@@ -11,9 +10,10 @@ import {
     makeWithSearch,
     setupControlPanelServiceRegistry,
     toggleAddCustomGroup,
-    toggleGroupByMenu,
     toggleMenuItem,
+    toggleSearchBarMenu,
 } from "./helpers";
+import { SearchBar } from "@web/search/search_bar/search_bar";
 
 let target;
 let serverData;
@@ -52,12 +52,12 @@ QUnit.module("Search", (hooks) => {
         await makeWithSearch({
             serverData,
             resModel: "foo",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: ["groupBy"],
             searchViewId: false,
         });
 
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
 
         const customGroupByItem = target.querySelector(".o_add_custom_group_menu");
         assert.strictEqual(customGroupByItem.innerText.trim(), "Add Custom Group");
@@ -85,7 +85,7 @@ QUnit.module("Search", (hooks) => {
             await makeWithSearch({
                 serverData,
                 resModel: "foo",
-                Component: ControlPanel,
+                Component: SearchBar,
                 searchMenuTypes: ["groupBy"],
                 searchViewId: false,
                 searchViewFields: {
@@ -94,7 +94,7 @@ QUnit.module("Search", (hooks) => {
                 },
             });
 
-            await toggleGroupByMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleAddCustomGroup(target);
 
             assert.deepEqual(
@@ -116,7 +116,7 @@ QUnit.module("Search", (hooks) => {
             await makeWithSearch({
                 serverData,
                 resModel: "foo",
-                Component: ControlPanel,
+                Component: SearchBar,
                 searchMenuTypes: ["groupBy"],
                 searchViewId: false,
                 searchViewFields: {
@@ -130,7 +130,7 @@ QUnit.module("Search", (hooks) => {
                 },
             });
 
-            await toggleGroupByMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleAddCustomGroup(target);
 
             assert.deepEqual(
@@ -152,7 +152,7 @@ QUnit.module("Search", (hooks) => {
             const controlPanel = await makeWithSearch({
                 serverData,
                 resModel: "foo",
-                Component: ControlPanel,
+                Component: SearchBar,
                 searchMenuTypes: ["groupBy"],
                 searchViewId: false,
                 searchViewFields: {
@@ -160,7 +160,7 @@ QUnit.module("Search", (hooks) => {
                     id: { sortable: true, string: "ID", type: "integer" },
                 },
             });
-            await toggleGroupByMenu(target);
+            await toggleSearchBarMenu(target);
 
             assert.deepEqual(controlPanel.env.searchModel.groupBy, []);
             assert.containsNone(target, ".o_menu_item");
@@ -184,14 +184,14 @@ QUnit.module("Search", (hooks) => {
         await makeWithSearch({
             serverData,
             resModel: "foo",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: ["groupBy"],
             searchViewFields: {
                 date: { sortable: true, name: "date", string: "Super Date", type: "date" },
             },
         });
 
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
 
         const addCustomGroupMenu = target.querySelector(".o_add_custom_group_menu");
 
@@ -220,7 +220,7 @@ QUnit.module("Search", (hooks) => {
             await makeWithSearch({
                 serverData,
                 resModel: "foo",
-                Component: ControlPanel,
+                Component: SearchBar,
                 searchMenuTypes: ["groupBy"],
                 searchViewFields: {
                     candle_light: {
@@ -231,7 +231,7 @@ QUnit.module("Search", (hooks) => {
                 },
             });
 
-            await toggleGroupByMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleAddCustomGroup(target);
             await applyGroup(target);
 
diff --git a/addons/web/static/tests/search/favorite_menu_tests.js b/addons/web/static/tests/search/favorite_menu_tests.js
deleted file mode 100644
index 79d0fbff210..00000000000
--- a/addons/web/static/tests/search/favorite_menu_tests.js
+++ /dev/null
@@ -1,391 +0,0 @@
-/** @odoo-module **/
-
-import { click, getFixture, patchDate } from "@web/../tests/helpers/utils";
-import { createWebClient, doAction } from "@web/../tests/webclient/helpers";
-import { registry } from "@web/core/registry";
-import { ControlPanel } from "@web/search/control_panel/control_panel";
-import { FavoriteMenu } from "@web/search/favorite_menu/favorite_menu";
-import { SearchBar } from "@web/search/search_bar/search_bar";
-import {
-    deleteFavorite,
-    getFacetTexts,
-    isItemSelected,
-    makeWithSearch,
-    setupControlPanelFavoriteMenuRegistry,
-    setupControlPanelServiceRegistry,
-    toggleComparisonMenu,
-    toggleFavoriteMenu,
-    toggleMenuItem,
-} from "@web/../tests/search/helpers";
-
-import { Component, onWillUpdateProps, xml } from "@odoo/owl";
-const viewRegistry = registry.category("views");
-const favoriteMenuRegistry = registry.category("favoriteMenu");
-
-function getDomain(comp) {
-    return comp.env.searchModel.domain;
-}
-
-let serverData;
-let target;
-QUnit.module("Search", (hooks) => {
-    hooks.beforeEach(async () => {
-        target = getFixture();
-        serverData = {
-            models: {
-                foo: {
-                    fields: {
-                        bar: { string: "Bar", type: "many2one", relation: "partner" },
-                        birthday: { string: "Birthday", type: "date", store: true, sortable: true },
-                        date_field: { string: "Date", type: "date", store: true, sortable: true },
-                        float_field: { string: "Float", type: "float", group_operator: "sum" },
-                        foo: { string: "Foo", type: "char", store: true, sortable: true },
-                    },
-                    records: {},
-                },
-            },
-            views: {
-                "foo,false,search": `<search/>`,
-            },
-        };
-        setupControlPanelFavoriteMenuRegistry();
-        setupControlPanelServiceRegistry();
-    });
-
-    QUnit.module("FavoriteMenu");
-
-    QUnit.test(
-        "simple rendering with no favorite (without ability to save)",
-        async function (assert) {
-            assert.expect(4);
-
-            favoriteMenuRegistry.remove("custom-favorite-item");
-
-            await makeWithSearch({
-                serverData,
-                resModel: "foo",
-                Component: ControlPanel,
-                searchMenuTypes: ["favorite"],
-                searchViewId: false,
-                config: {
-                    getDisplayName: () => "Action Name",
-                },
-            });
-
-            assert.containsOnce(target, "div.o_favorite_menu > button i.fa.fa-star");
-            assert.strictEqual(
-                target
-                    .querySelector("div.o_favorite_menu > button span")
-                    .innerText.trim()
-                    .toUpperCase(),
-                "FAVORITES"
-            );
-
-            await toggleFavoriteMenu(target);
-            assert.containsOnce(
-                target,
-                "div.o_favorite_menu > .dropdown-menu",
-                "the menu should be opened"
-            );
-            assert.containsNone(target, ".dropdown-menu *", "the menu should be empty");
-        }
-    );
-
-    QUnit.test("simple rendering with no favorite", async function (assert) {
-        assert.expect(5);
-
-        await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchMenuTypes: ["favorite"],
-            searchViewId: false,
-            config: {
-                getDisplayName: () => "Action Name",
-            },
-        });
-
-        assert.containsOnce(target, "div.o_favorite_menu > button i.fa.fa-star");
-        assert.strictEqual(
-            target
-                .querySelector("div.o_favorite_menu > button span")
-                .innerText.trim()
-                .toUpperCase(),
-            "FAVORITES"
-        );
-
-        await toggleFavoriteMenu(target);
-        assert.containsOnce(
-            target,
-            "div.o_favorite_menu > .dropdown-menu",
-            "the menu should be opened"
-        );
-        assert.containsNone(target, ".dropdown-menu .dropdown-divider");
-        assert.containsOnce(target, ".dropdown-menu .o_add_favorite");
-    });
-
-    QUnit.test("delete an active favorite", async function (assert) {
-        assert.expect(14);
-
-        class ToyController extends Component {
-            setup() {
-                assert.deepEqual(this.props.domain, [["foo", "=", "qsdf"]]);
-                onWillUpdateProps((nextProps) => {
-                    assert.deepEqual(nextProps.domain, []);
-                });
-            }
-        }
-        ToyController.components = { FavoriteMenu, SearchBar };
-        ToyController.template = xml`
-                <div>
-                    <SearchBar/>
-                    <FavoriteMenu/>
-                </div>
-            `;
-
-        viewRegistry.add("toy", {
-            type: "toy",
-            display_name: "Toy",
-            Controller: ToyController,
-        });
-
-        serverData.views["foo,false,toy"] = `<toy />`;
-        serverData.models.foo.filters = [
-            {
-                context: "{}",
-                domain: "[['foo', '=', 'qsdf']]",
-                id: 7,
-                is_default: true,
-                name: "My favorite",
-                sort: "[]",
-                user_id: [2, "Mitchell Admin"],
-            },
-        ];
-
-        const webClient = await createWebClient({
-            serverData,
-            mockRPC: async (_, args) => {
-                if (args.model === "ir.filters" && args.method === "unlink") {
-                    assert.step("deleteFavorite");
-                    return { result: true }; // mocked unlink result
-                }
-            },
-        });
-        webClient.env.bus.on("CLEAR-CACHES", webClient, () => assert.step("CLEAR-CACHES"));
-        await doAction(webClient, {
-            name: "Action",
-            res_model: "foo",
-            type: "ir.actions.act_window",
-            views: [[false, "toy"]],
-        });
-
-        await toggleFavoriteMenu(target);
-        const favorite = target.querySelector(".o_favorite_menu .dropdown-item");
-        assert.equal(favorite.innerText, "My favorite");
-        assert.deepEqual(favorite.getAttribute("role"), "menuitemcheckbox");
-        assert.deepEqual(favorite.ariaChecked, "true");
-
-        assert.deepEqual(getFacetTexts(target), ["My favorite"]);
-        assert.hasClass(target.querySelector(".o_favorite_menu .o_menu_item"), "selected");
-
-        await deleteFavorite(target, 0);
-
-        assert.verifySteps([]);
-
-        await click(document.querySelector("div.o_dialog footer button"));
-
-        assert.deepEqual(getFacetTexts(target), []);
-        assert.containsNone(target, ".o_favorite_menu .o_menu_item");
-        assert.containsOnce(target, ".o_favorite_menu .o_add_favorite");
-        assert.verifySteps(["deleteFavorite", "CLEAR-CACHES"]);
-    });
-
-    QUnit.test(
-        "default favorite is not activated if activateFavorite is set to false",
-        async function (assert) {
-            assert.expect(3);
-
-            const controlPanel = await makeWithSearch({
-                serverData,
-                resModel: "foo",
-                Component: ControlPanel,
-                searchMenuTypes: ["favorite"],
-                searchViewId: false,
-                irFilters: [
-                    {
-                        context: "{}",
-                        domain: "[('foo', '=', 'a')]",
-                        id: 7,
-                        is_default: true,
-                        name: "My favorite",
-                        sort: "[]",
-                        user_id: [2, "Mitchell Admin"],
-                    },
-                ],
-                activateFavorite: false,
-            });
-
-            await toggleFavoriteMenu(target);
-
-            assert.notOk(isItemSelected(target, "My favorite"));
-            assert.deepEqual(getDomain(controlPanel), []);
-            assert.deepEqual(getFacetTexts(target), []);
-        }
-    );
-
-    QUnit.test(
-        'toggle favorite correctly clears filter, groupbys, comparison and field "options"',
-        async function (assert) {
-            patchDate(2019, 6, 31, 13, 43, 0);
-
-            const controlPanel = await makeWithSearch({
-                serverData,
-                resModel: "foo",
-                Component: ControlPanel,
-                searchMenuTypes: ["filter", "groupBy", "comparison", "favorite"],
-                searchViewId: false,
-                irFilters: [
-                    {
-                        context: `
-                                {
-                                    "group_by": ["foo"],
-                                    "comparison": {
-                                        "favorite comparison content": "bla bla..."
-                                    },
-                                 }
-                            `,
-                        domain: "['!', ['foo', '=', 'qsdf']]",
-                        id: 7,
-                        is_default: false,
-                        name: "My favorite",
-                        sort: "[]",
-                        user_id: [2, "Mitchell Admin"],
-                    },
-                ],
-                searchViewArch: `
-                        <search>
-                            <field string="Foo" name="foo"/>
-                            <filter string="Date Field Filter" name="positive" date="date_field" default_period="this_year"/>
-                            <filter string="Date Field Groupby" name="coolName" context="{'group_by': 'date_field'}"/>
-                        </search>
-                    `,
-                context: {
-                    search_default_positive: true,
-                    search_default_coolName: true,
-                    search_default_foo: "a",
-                },
-            });
-
-            let domain = controlPanel.env.searchModel.domain;
-            let groupBy = controlPanel.env.searchModel.groupBy;
-            let comparison = controlPanel.env.searchModel.getFullComparison();
-
-            assert.deepEqual(domain, [
-                "&",
-                ["foo", "ilike", "a"],
-                "&",
-                ["date_field", ">=", "2019-01-01"],
-                ["date_field", "<=", "2019-12-31"],
-            ]);
-            assert.deepEqual(groupBy, ["date_field:month"]);
-            assert.deepEqual(comparison, null);
-
-            assert.deepEqual(getFacetTexts(target), [
-                "Foo\na",
-                "Date Field Filter: 2019",
-                "Date Field Groupby: Month",
-            ]);
-
-            // activate a comparison
-            await toggleComparisonMenu(target);
-            await toggleMenuItem(target, "Date Field Filter: Previous Period");
-
-            domain = controlPanel.env.searchModel.domain;
-            groupBy = controlPanel.env.searchModel.groupBy;
-            comparison = controlPanel.env.searchModel.getFullComparison();
-
-            assert.deepEqual(domain, [["foo", "ilike", "a"]]);
-            assert.deepEqual(groupBy, ["date_field:month"]);
-            assert.deepEqual(comparison, {
-                comparisonId: "previous_period",
-                comparisonRange: [
-                    "&",
-                    ["date_field", ">=", "2018-01-01"],
-                    ["date_field", "<=", "2018-12-31"],
-                ],
-                comparisonRangeDescription: "2018",
-                fieldDescription: "Date Field Filter",
-                fieldName: "date_field",
-                range: [
-                    "&",
-                    ["date_field", ">=", "2019-01-01"],
-                    ["date_field", "<=", "2019-12-31"],
-                ],
-                rangeDescription: "2019",
-            });
-
-            // activate the unique existing favorite
-            await toggleFavoriteMenu(target);
-            const favorite = target.querySelector(".o_favorite_menu .dropdown-item");
-            assert.equal(favorite.innerText, "My favorite");
-            assert.deepEqual(favorite.getAttribute("role"), "menuitemcheckbox");
-            assert.deepEqual(favorite.ariaChecked, "false");
-            await toggleMenuItem(target, 0);
-            assert.deepEqual(favorite.ariaChecked, "true");
-
-            domain = controlPanel.env.searchModel.domain;
-            groupBy = controlPanel.env.searchModel.groupBy;
-            comparison = controlPanel.env.searchModel.getFullComparison();
-
-            assert.deepEqual(domain, ["!", ["foo", "=", "qsdf"]]);
-            assert.deepEqual(groupBy, ["foo"]);
-            assert.deepEqual(comparison, {
-                "favorite comparison content": "bla bla...",
-            });
-
-            assert.deepEqual(getFacetTexts(target), ["My favorite"]);
-        }
-    );
-
-    QUnit.skip("modal loads saved search filters", async function (assert) {
-        /** @todo I don't know yet how to convert this test */
-        // assert.expect(1);
-        // const data = {
-        //     partner: {
-        //         fields: {
-        //             bar: { string: "Bar", type: "many2one", relation: "partner" },
-        //         },
-        //         // 10 records so that the Search button shows
-        //         records: Array.apply(null, Array(10)).map(function (_, i) {
-        //             return { id: i, display_name: "Record " + i, bar: 1 };
-        //         }),
-        //     },
-        // };
-        // const form = await createView({
-        //     arch: `
-        //     <form string="Partners">
-        //         <sheet>
-        //             <group>
-        //                 <field name="bar"/>
-        //             </group>
-        //         </sheet>
-        //     </form>`,
-        //     data,
-        //     model: "partner",
-        //     res_id: 1,
-        //     View: FormView,
-        //     interceptsPropagate: {
-        //         load_views: function (ev) {
-        //             assert.ok(
-        //                 ev.data.options.load_filters,
-        //                 "opening dialog should load the filters"
-        //             );
-        //         },
-        //     },
-        // });
-        // await testUtils.form.clickEdit(form);
-        // await testUtils.fields.many2one.clickOpenDropdown("bar");
-        // await testUtils.fields.many2one.clickItem("bar", "Search");
-        // form.destroy();
-    });
-});
diff --git a/addons/web/static/tests/search/filter_menu_tests.js b/addons/web/static/tests/search/filter_menu_tests.js
deleted file mode 100644
index 3b53af105f0..00000000000
--- a/addons/web/static/tests/search/filter_menu_tests.js
+++ /dev/null
@@ -1,800 +0,0 @@
-/** @odoo-module **/
-
-import {
-    click,
-    editInput,
-    getFixture,
-    getNodesTextContent,
-    patchDate,
-    patchWithCleanup,
-} from "@web/../tests/helpers/utils";
-import { browser } from "@web/core/browser/browser";
-import { ControlPanel } from "@web/search/control_panel/control_panel";
-import {
-    getFacetTexts,
-    isItemSelected,
-    isOptionSelected,
-    makeWithSearch,
-    openAddCustomFilterDialog,
-    setupControlPanelServiceRegistry,
-    toggleFilterMenu,
-    toggleMenuItem,
-    toggleMenuItemOption,
-} from "./helpers";
-
-function getDomain(controlPanel) {
-    return controlPanel.env.searchModel.domain;
-}
-
-function getContext(controlPanel) {
-    return controlPanel.env.searchModel.context;
-}
-
-let target;
-let serverData;
-QUnit.module("Search", (hooks) => {
-    hooks.beforeEach(async () => {
-        serverData = {
-            models: {
-                foo: {
-                    fields: {
-                        date_field: {
-                            string: "Date",
-                            type: "date",
-                            store: true,
-                            sortable: true,
-                            searchable: true,
-                        },
-                        foo: { string: "Foo", type: "char", store: true, sortable: true },
-                    },
-                    records: [],
-                },
-            },
-            views: {
-                "foo,false,search": `<search/>`,
-            },
-        };
-        setupControlPanelServiceRegistry();
-        patchWithCleanup(browser, {
-            setTimeout: (fn) => fn(),
-            clearTimeout: () => {},
-        });
-        target = getFixture();
-    });
-
-    QUnit.module("FilterMenu");
-
-    QUnit.test("simple rendering with no filter", async function (assert) {
-        await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchMenuTypes: ["filter"],
-        });
-
-        await toggleFilterMenu(target);
-        assert.containsNone(target, ".o_menu_item");
-        assert.containsNone(target, ".dropdown-divider");
-        assert.containsOnce(target, ".dropdown-item");
-        assert.strictEqual(target.querySelector(".dropdown-item").innerText, "Add Custom Filter");
-    });
-
-    QUnit.test("simple rendering with a single filter", async function (assert) {
-        await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchViewId: false,
-            searchMenuTypes: ["filter"],
-            searchViewArch: `
-                    <search>
-                        <filter string="Foo" name="foo" domain="[]"/>
-                    </search>
-                `,
-        });
-
-        await toggleFilterMenu(target);
-        assert.containsOnce(target, ".o_menu_item");
-        assert.containsOnce(target, ".o_menu_item[role=menuitemcheckbox]");
-        assert.deepEqual(target.querySelector(".o_menu_item").ariaChecked, "false");
-        assert.containsOnce(target, ".dropdown-divider");
-        assert.containsOnce(target, ".dropdown-item:not(.o_menu_item)");
-        assert.strictEqual(
-            target.querySelector(".dropdown-item:not(.o_menu_item)").innerText,
-            "Add Custom Filter"
-        );
-    });
-
-    QUnit.test('toggle a "simple" filter in filter menu works', async function (assert) {
-        const controlPanel = await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchViewId: false,
-            searchMenuTypes: ["filter"],
-            searchViewArch: `
-                    <search>
-                        <filter string="Foo" name="foo" domain="[('foo', '=', 'qsdf')]"/>
-                    </search>
-                `,
-        });
-
-        await toggleFilterMenu(target);
-        assert.deepEqual(getFacetTexts(target), []);
-        assert.notOk(isItemSelected(target, "Foo"));
-        assert.deepEqual(getDomain(controlPanel), []);
-        assert.containsOnce(target, ".o_menu_item[role=menuitemcheckbox]");
-        assert.deepEqual(target.querySelector(".o_menu_item").ariaChecked, "false");
-
-        await toggleMenuItem(target, "Foo");
-        assert.deepEqual(target.querySelector(".o_menu_item").ariaChecked, "true");
-
-        assert.deepEqual(getFacetTexts(target), ["Foo"]);
-        assert.containsOnce(
-            target.querySelector(".o_searchview .o_searchview_facet"),
-            "span.fa.fa-filter.o_searchview_facet_label"
-        );
-        assert.ok(isItemSelected(target, "Foo"));
-        assert.deepEqual(getDomain(controlPanel), [["foo", "=", "qsdf"]]);
-
-        await toggleMenuItem(target, "Foo");
-
-        assert.deepEqual(getFacetTexts(target), []);
-        assert.notOk(isItemSelected(target, "Foo"));
-        assert.deepEqual(getDomain(controlPanel), []);
-    });
-
-    QUnit.test("filter by a date field using period works", async function (assert) {
-        assert.expect(57);
-
-        patchDate(2017, 2, 22, 1, 0, 0);
-
-        const controlPanel = await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchViewId: false,
-            searchMenuTypes: ["filter"],
-            searchViewArch: `
-                    <search>
-                        <filter string="Date" name="date_field" date="date_field"/>
-                    </search>
-                `,
-            context: { search_default_date_field: 1 },
-        });
-
-        await toggleFilterMenu(target);
-        await toggleMenuItem(target, "Date");
-
-        const optionEls = target.querySelectorAll(".dropdown .o_item_option");
-
-        // default filter should be activated with the global default period 'this_month'
-        assert.deepEqual(getDomain(controlPanel), [
-            "&",
-            ["date_field", ">=", "2017-03-01"],
-            ["date_field", "<=", "2017-03-31"],
-        ]);
-        assert.ok(isItemSelected(target, "Date"));
-        assert.ok(isOptionSelected(target, "Date", "March"));
-
-        // check option descriptions
-        const optionDescriptions = [...optionEls].map((e) => e.innerText.trim());
-        const expectedDescriptions = [
-            "March",
-            "February",
-            "January",
-            "Q4",
-            "Q3",
-            "Q2",
-            "Q1",
-            "2017",
-            "2016",
-            "2015",
-        ];
-        assert.deepEqual(optionDescriptions, expectedDescriptions);
-
-        // check generated domains
-        const steps = [
-            {
-                toggledOption: "March",
-                resultingFacet: "Date: 2017",
-                selectedoptions: ["2017"],
-                domain: [
-                    "&",
-                    ["date_field", ">=", "2017-01-01"],
-                    ["date_field", "<=", "2017-12-31"],
-                ],
-            },
-            {
-                toggledOption: "February",
-                resultingFacet: "Date: February 2017",
-                selectedoptions: ["February", "2017"],
-                domain: [
-                    "&",
-                    ["date_field", ">=", "2017-02-01"],
-                    ["date_field", "<=", "2017-02-28"],
-                ],
-            },
-            {
-                toggledOption: "February",
-                resultingFacet: "Date: 2017",
-                selectedoptions: ["2017"],
-                domain: [
-                    "&",
-                    ["date_field", ">=", "2017-01-01"],
-                    ["date_field", "<=", "2017-12-31"],
-                ],
-            },
-            {
-                toggledOption: "January",
-                resultingFacet: "Date: January 2017",
-                selectedoptions: ["January", "2017"],
-                domain: [
-                    "&",
-                    ["date_field", ">=", "2017-01-01"],
-                    ["date_field", "<=", "2017-01-31"],
-                ],
-            },
-            {
-                toggledOption: "Q4",
-                resultingFacet: "Date: January 2017/Q4 2017",
-                selectedoptions: ["January", "Q4", "2017"],
-                domain: [
-                    "|",
-                    "&",
-                    ["date_field", ">=", "2017-01-01"],
-                    ["date_field", "<=", "2017-01-31"],
-                    "&",
-                    ["date_field", ">=", "2017-10-01"],
-                    ["date_field", "<=", "2017-12-31"],
-                ],
-            },
-            {
-                toggledOption: "January",
-                resultingFacet: "Date: Q4 2017",
-                selectedoptions: ["Q4", "2017"],
-                domain: [
-                    "&",
-                    ["date_field", ">=", "2017-10-01"],
-                    ["date_field", "<=", "2017-12-31"],
-                ],
-            },
-            {
-                toggledOption: "Q4",
-                resultingFacet: "Date: 2017",
-                selectedoptions: ["2017"],
-                domain: [
-                    "&",
-                    ["date_field", ">=", "2017-01-01"],
-                    ["date_field", "<=", "2017-12-31"],
-                ],
-            },
-            {
-                toggledOption: "Q1",
-                resultingFacet: "Date: Q1 2017",
-                selectedoptions: ["Q1", "2017"],
-                domain: [
-                    "&",
-                    ["date_field", ">=", "2017-01-01"],
-                    ["date_field", "<=", "2017-03-31"],
-                ],
-            },
-            {
-                toggledOption: "Q1",
-                resultingFacet: "Date: 2017",
-                selectedoptions: ["2017"],
-                domain: [
-                    "&",
-                    ["date_field", ">=", "2017-01-01"],
-                    ["date_field", "<=", "2017-12-31"],
-                ],
-            },
-            {
-                toggledOption: "2017",
-                selectedoptions: [],
-                domain: [],
-            },
-            {
-                toggledOption: "2017",
-                resultingFacet: "Date: 2017",
-                selectedoptions: ["2017"],
-                domain: [
-                    "&",
-                    ["date_field", ">=", "2017-01-01"],
-                    ["date_field", "<=", "2017-12-31"],
-                ],
-            },
-            {
-                toggledOption: "2016",
-                resultingFacet: "Date: 2016/2017",
-                selectedoptions: ["2017", "2016"],
-                domain: [
-                    "|",
-                    "&",
-                    ["date_field", ">=", "2016-01-01"],
-                    ["date_field", "<=", "2016-12-31"],
-                    "&",
-                    ["date_field", ">=", "2017-01-01"],
-                    ["date_field", "<=", "2017-12-31"],
-                ],
-            },
-            {
-                toggledOption: "2015",
-                resultingFacet: "Date: 2015/2016/2017",
-                selectedoptions: ["2017", "2016", "2015"],
-                domain: [
-                    "|",
-                    "&",
-                    ["date_field", ">=", "2015-01-01"],
-                    ["date_field", "<=", "2015-12-31"],
-                    "|",
-                    "&",
-                    ["date_field", ">=", "2016-01-01"],
-                    ["date_field", "<=", "2016-12-31"],
-                    "&",
-                    ["date_field", ">=", "2017-01-01"],
-                    ["date_field", "<=", "2017-12-31"],
-                ],
-            },
-            {
-                toggledOption: "March",
-                resultingFacet: "Date: March 2015/March 2016/March 2017",
-                selectedoptions: ["March", "2017", "2016", "2015"],
-                domain: [
-                    "|",
-                    "&",
-                    ["date_field", ">=", "2015-03-01"],
-                    ["date_field", "<=", "2015-03-31"],
-                    "|",
-                    "&",
-                    ["date_field", ">=", "2016-03-01"],
-                    ["date_field", "<=", "2016-03-31"],
-                    "&",
-                    ["date_field", ">=", "2017-03-01"],
-                    ["date_field", "<=", "2017-03-31"],
-                ],
-            },
-        ];
-        for (const s of steps) {
-            await toggleMenuItemOption(target, "Date", s.toggledOption);
-            assert.deepEqual(getDomain(controlPanel), s.domain);
-            if (s.resultingFacet) {
-                assert.deepEqual(getFacetTexts(target), [s.resultingFacet]);
-            } else {
-                assert.deepEqual(getFacetTexts(target), []);
-            }
-            s.selectedoptions.forEach((option) => {
-                assert.ok(
-                    isOptionSelected(target, "Date", option),
-                    `at step ${steps.indexOf(s) + 1}, ${option} should be selected`
-                );
-            });
-        }
-    });
-
-    QUnit.test(
-        "filter by a date field using period works even in January",
-        async function (assert) {
-            assert.expect(5);
-
-            patchDate(2017, 0, 7, 3, 0, 0);
-
-            const controlPanel = await makeWithSearch({
-                serverData,
-                resModel: "foo",
-                Component: ControlPanel,
-                searchViewId: false,
-                searchMenuTypes: ["filter"],
-                searchViewArch: `
-                        <search>
-                            <filter string="Date" name="some_filter" date="date_field" default_period="last_month"/>
-                        </search>
-                    `,
-                context: { search_default_some_filter: 1 },
-            });
-
-            assert.deepEqual(getDomain(controlPanel), [
-                "&",
-                ["date_field", ">=", "2016-12-01"],
-                ["date_field", "<=", "2016-12-31"],
-            ]);
-
-            assert.deepEqual(getFacetTexts(target), ["Date: December 2016"]);
-
-            await toggleFilterMenu(target);
-            await toggleMenuItem(target, "Date");
-
-            assert.ok(isItemSelected(target, "Date"));
-            assert.ok(isOptionSelected(target, "Date", "December"));
-            assert.ok(isOptionSelected(target, "Date", "2016"));
-        }
-    );
-
-    QUnit.test("`context` key in <filter> is used", async function (assert) {
-        assert.expect(1);
-
-        const controlPanel = await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchViewId: false,
-            searchMenuTypes: ["filter"],
-            searchViewArch: `
-                    <search>
-                        <filter string="Filter" name="some_filter" domain="[]" context="{'coucou_1': 1}"/>
-                    </search>
-                `,
-            context: { search_default_some_filter: 1 },
-        });
-
-        assert.deepEqual(getContext(controlPanel), {
-            coucou_1: 1,
-            lang: "en",
-            tz: "taht",
-            uid: 7,
-        });
-    });
-
-    QUnit.test("Filter with JSON-parsable domain works", async function (assert) {
-        assert.expect(1);
-
-        const xml_domain = "[[&quot;foo&quot;,&quot;=&quot;,&quot;Gently Weeps&quot;]]";
-
-        const controlPanel = await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchViewId: false,
-            searchMenuTypes: ["filter"],
-            searchViewArch: `
-                    <search>
-                        <filter string="Foo" name="gently_weeps" domain="${xml_domain}"/>
-                    </search>
-                `,
-            context: { search_default_gently_weeps: 1 },
-        });
-
-        assert.deepEqual(
-            getDomain(controlPanel),
-            [["foo", "=", "Gently Weeps"]],
-            "A JSON parsable xml domain should be handled just like any other"
-        );
-    });
-
-    QUnit.test("filter with date attribute set as search_default", async function (assert) {
-        assert.expect(1);
-
-        patchDate(2019, 6, 31, 13, 43, 0);
-
-        await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchViewId: false,
-            searchMenuTypes: ["filter"],
-            searchViewArch: `
-                    <search>
-                        <filter string="Date" name="date_field" date="date_field" default_period="last_month"/>
-                    </search>
-                `,
-            context: { search_default_date_field: true },
-        });
-
-        assert.deepEqual(getFacetTexts(target), ["Date: June 2019"]);
-    });
-
-    QUnit.test(
-        "filter with multiple values in default_period date attribute set as search_default",
-        async function (assert) {
-            assert.expect(3);
-
-            patchDate(2019, 6, 31, 13, 43, 0);
-
-            await makeWithSearch({
-                serverData,
-                resModel: "foo",
-                Component: ControlPanel,
-                searchViewId: false,
-                searchMenuTypes: ["filter"],
-                searchViewArch: `
-                    <search>
-                        <filter string="Date" name="date_field" date="date_field" default_period="this_year,last_year"/>
-                    </search>
-                `,
-                context: { search_default_date_field: true },
-            });
-
-            await toggleFilterMenu(target);
-            await toggleMenuItem(target, "Date");
-
-            assert.ok(isItemSelected(target, "Date"));
-            assert.ok(isOptionSelected(target, "Date", "2019"));
-            assert.ok(isOptionSelected(target, "Date", "2018"));
-        }
-    );
-
-    QUnit.test("filter domains are correcly combined by OR and AND", async function (assert) {
-        assert.expect(2);
-
-        const controlPanel = await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchViewId: false,
-            searchMenuTypes: ["filter"],
-            searchViewArch: `
-                    <search>
-                        <filter string="Filter Group 1" name="f_1_g1" domain="[['foo', '=', 'f1_g1']]"/>
-                        <separator/>
-                        <filter string="Filter 1 Group 2" name="f1_g2" domain="[['foo', '=', 'f1_g2']]"/>
-                        <filter string="Filter 2 GROUP 2" name="f2_g2" domain="[['foo', '=', 'f2_g2']]"/>
-                    </search>
-                `,
-            context: {
-                search_default_f_1_g1: true,
-                search_default_f1_g2: true,
-                search_default_f2_g2: true,
-            },
-        });
-
-        assert.deepEqual(getDomain(controlPanel), [
-            "&",
-            ["foo", "=", "f1_g1"],
-            "|",
-            ["foo", "=", "f1_g2"],
-            ["foo", "=", "f2_g2"],
-        ]);
-
-        assert.deepEqual(getFacetTexts(target), [
-            "Filter Group 1",
-            "Filter 1 Group 2orFilter 2 GROUP 2",
-        ]);
-    });
-
-    QUnit.test("arch order of groups of filters preserved", async function (assert) {
-        assert.expect(12);
-
-        await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchViewId: false,
-            searchMenuTypes: ["filter"],
-            searchViewArch: `
-                    <search>
-                        <filter string="1" name="coolName1" date="date_field"/>
-                        <separator/>
-                        <filter string="2" name="coolName2" date="date_field"/>
-                        <separator/>
-                        <filter string="3" name="coolName3" domain="[]"/>
-                        <separator/>
-                        <filter string="4" name="coolName4" domain="[]"/>
-                        <separator/>
-                        <filter string="5" name="coolName5" domain="[]"/>
-                        <separator/>
-                        <filter string="6" name="coolName6" domain="[]"/>
-                        <separator/>
-                        <filter string="7" name="coolName7" domain="[]"/>
-                        <separator/>
-                        <filter string="8" name="coolName8" domain="[]"/>
-                        <separator/>
-                        <filter string="9" name="coolName9" domain="[]"/>
-                        <separator/>
-                        <filter string="10" name="coolName10" domain="[]"/>
-                        <separator/>
-                        <filter string="11" name="coolName11" domain="[]"/>
-                    </search>
-                `,
-        });
-
-        await toggleFilterMenu(target);
-        assert.containsN(target, ".o_filter_menu .o_menu_item", 11);
-
-        const menuItemEls = target.querySelectorAll(".o_filter_menu .o_menu_item");
-        [...menuItemEls].forEach((e, index) => {
-            assert.strictEqual(e.innerText.trim(), String(index + 1));
-        });
-    });
-
-    QUnit.test("Open 'Add Custom Filter' dialog", async function (assert) {
-        await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchMenuTypes: ["filter"],
-        });
-
-        await toggleFilterMenu(target);
-        assert.deepEqual(
-            getNodesTextContent(target.querySelectorAll(".o_filter_menu .dropdown-item")),
-            ["Add Custom Filter"]
-        );
-        assert.containsNone(target, ".modal");
-
-        await openAddCustomFilterDialog(target);
-        assert.containsOnce(target, ".modal");
-        assert.strictEqual(target.querySelector(".modal header").innerText, "Add Custom Filter");
-        assert.containsOnce(target, ".modal .o_domain_selector");
-        assert.containsOnce(target, ".modal .o_domain_selector .o_domain_leaf");
-        assert.deepEqual(getNodesTextContent(target.querySelectorAll(".modal footer button")), [
-            "Add",
-            "Cancel",
-        ]);
-    });
-
-    QUnit.test(
-        "Default leaf in 'Add Custom Filter' dialog is based on ID (if no special fields on model)",
-        async function (assert) {
-            await makeWithSearch({
-                serverData,
-                resModel: "foo",
-                Component: ControlPanel,
-                searchMenuTypes: ["filter"],
-            });
-            await toggleFilterMenu(target);
-            await openAddCustomFilterDialog(target);
-            assert.containsOnce(target, ".modal .o_domain_selector .o_domain_leaf");
-            assert.containsOnce(target, ".o_domain_leaf .o_model_field_selector_chain_part");
-            assert.strictEqual(
-                target.querySelector(".o_domain_leaf .o_model_field_selector_chain_part").innerText,
-                "ID"
-            );
-        }
-    );
-
-    QUnit.test(
-        "Default leaf in 'Add Custom Filter' dialog is based on first special field (if any special fields on model)",
-        async function (assert) {
-            serverData.models.foo.fields.country_id = {
-                string: "Country",
-                type: "many2one",
-            };
-            await makeWithSearch({
-                serverData,
-                resModel: "foo",
-                Component: ControlPanel,
-                searchMenuTypes: ["filter"],
-            });
-            await toggleFilterMenu(target);
-            await openAddCustomFilterDialog(target);
-            assert.containsOnce(target, ".modal .o_domain_selector .o_domain_leaf");
-            assert.containsOnce(target, ".o_domain_leaf .o_model_field_selector_chain_part");
-            assert.strictEqual(
-                target.querySelector(".o_domain_leaf .o_model_field_selector_chain_part").innerText,
-                "Country"
-            );
-        }
-    );
-
-    QUnit.test("Default connector is '|' (any)", async function (assert) {
-        await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchMenuTypes: ["filter"],
-        });
-        await toggleFilterMenu(target);
-        await openAddCustomFilterDialog(target);
-        assert.containsOnce(target, ".modal .o_domain_selector .o_domain_leaf");
-        assert.containsOnce(target, ".o_domain_leaf .o_model_field_selector_chain_part");
-        assert.strictEqual(
-            target.querySelector(".o_domain_leaf .o_model_field_selector_chain_part").innerText,
-            "ID"
-        );
-        assert.containsNone(target, "button.o_domain_tree_connector_caret");
-
-        await click(target, ".o_domain_add_node_button .fa-plus");
-        assert.containsOnce(target, "button.o_domain_tree_connector_caret");
-        assert.strictEqual(
-            target.querySelector("button.o_domain_tree_connector_caret").innerText,
-            "any"
-        );
-        assert.containsN(target, ".modal .o_domain_selector .o_domain_leaf", 2);
-    });
-
-    QUnit.test("Add a custom filter", async function (assert) {
-        const controlPanel = await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchMenuTypes: ["filter"],
-            searchViewId: false,
-            searchViewArch: `
-                    <search>
-                        <filter string="Filter" name="filter" domain="[('foo', '=', 'abc')]"/>
-                    </search>
-                `,
-            context: {
-                search_default_filter: true,
-            },
-        });
-        assert.deepEqual(getFacetTexts(target), ["Filter"]);
-        assert.deepEqual(getDomain(controlPanel), [["foo", "=", "abc"]]);
-
-        await toggleFilterMenu(target);
-        await openAddCustomFilterDialog(target);
-        await click(target, ".o_domain_add_node_button .fa-plus");
-
-        const connectorEl = target.querySelector(".o_domain_tree_connector_selector");
-        await click(connectorEl.querySelector("button.o_domain_tree_connector_caret"));
-        await click(
-            [...target.querySelectorAll(".o_domain_tree_connector_selector .dropdown-item")].find(
-                (el) => el.innerText === "all"
-            )
-        );
-
-        await click([...target.querySelectorAll(".o_domain_add_node_button .fa-sitemap")].at(-1));
-        await click([...target.querySelectorAll(".o_domain_add_node_button .fa-sitemap")].at(-1));
-        await click(target.querySelector(".modal footer button"));
-
-        assert.deepEqual(getFacetTexts(target), [
-            "Filter",
-            "ID = 1",
-            "ID = 1",
-            "ID = 1 or ID = 1 or ( ID = 1 and ID = 1 )",
-        ]);
-        assert.deepEqual(getDomain(controlPanel), [
-            "&",
-            ["foo", "=", "abc"],
-            "&",
-            ["id", "=", 1],
-            "&",
-            ["id", "=", 1],
-            "|",
-            "|",
-            ["id", "=", 1],
-            ["id", "=", 1],
-            "&",
-            ["id", "=", 1],
-            ["id", "=", 1],
-        ]);
-    });
-
-    QUnit.test("Add a custom filter containing an expression", async function (assert) {
-        patchWithCleanup(odoo, { debug: true });
-
-        const controlPanel = await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchMenuTypes: ["filter"],
-            searchViewId: false,
-            searchViewArch: `<search />`,
-        });
-        assert.deepEqual(getFacetTexts(target), []);
-        assert.deepEqual(getDomain(controlPanel), []);
-
-        await toggleFilterMenu(target);
-        await openAddCustomFilterDialog(target);
-        await editInput(target, ".o_domain_debug_input", `[("foo", "in", [uid, 1, "a"])]`);
-        await click(target.querySelector(".modal footer button"));
-
-        assert.deepEqual(getFacetTexts(target), [`Foo in uid or 1 or "a"`]);
-        assert.deepEqual(getDomain(controlPanel), [
-            ["foo", "in", [7, 1, "a"]], // uid = 7
-        ]);
-    });
-
-    QUnit.test("Add a custom filter containing a between operator", async function (assert) {
-        patchWithCleanup(odoo, { debug: true });
-
-        const controlPanel = await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchMenuTypes: ["filter"],
-            searchViewId: false,
-            searchViewArch: `<search />`,
-        });
-        assert.deepEqual(getFacetTexts(target), []);
-        assert.deepEqual(getDomain(controlPanel), []);
-
-        await toggleFilterMenu(target);
-        await openAddCustomFilterDialog(target);
-        await editInput(target, ".o_domain_debug_input", `[("id", "between", [0, 10])]`);
-        await click(target.querySelector(".modal footer button"));
-
-        assert.deepEqual(getFacetTexts(target), [`ID is between 0 and 10`]);
-        assert.deepEqual(getDomain(controlPanel), ["&", ["id", ">=", 0], ["id", "<=", 10]]);
-    });
-});
diff --git a/addons/web/static/tests/search/group_by_menu_tests.js b/addons/web/static/tests/search/group_by_menu_tests.js
deleted file mode 100644
index 3a07947a3d8..00000000000
--- a/addons/web/static/tests/search/group_by_menu_tests.js
+++ /dev/null
@@ -1,534 +0,0 @@
-/** @odoo-module **/
-
-import { browser } from "@web/core/browser/browser";
-import { ControlPanel } from "@web/search/control_panel/control_panel";
-import { getFixture, patchWithCleanup } from "../helpers/utils";
-import {
-    getFacetTexts,
-    isItemSelected,
-    isOptionSelected,
-    makeWithSearch,
-    removeFacet,
-    setupControlPanelServiceRegistry,
-    toggleGroupByMenu,
-    toggleMenuItem,
-    toggleMenuItemOption,
-} from "./helpers";
-
-let target;
-let serverData;
-QUnit.module("Search", (hooks) => {
-    hooks.beforeEach(async () => {
-        serverData = {
-            models: {
-                foo: {
-                    fields: {
-                        bar: { string: "Bar", type: "many2one", relation: "partner" },
-                        birthday: { string: "Birthday", type: "date", store: true, sortable: true },
-                        date_field: { string: "Date", type: "date", store: true, sortable: true },
-                        float_field: { string: "Float", type: "float", group_operator: "sum" },
-                        foo: { string: "Foo", type: "char", store: true, sortable: true },
-                    },
-                    records: {},
-                },
-            },
-            views: {
-                "foo,false,search": `<search/>`,
-            },
-        };
-        setupControlPanelServiceRegistry();
-        patchWithCleanup(browser, {
-            setTimeout: (fn) => fn(),
-            clearTimeout: () => {},
-        });
-        target = getFixture();
-    });
-
-    QUnit.module("GroupByMenu");
-
-    QUnit.test(
-        "simple rendering with neither groupbys nor groupable fields",
-        async function (assert) {
-            assert.expect(3);
-
-            await makeWithSearch({
-                serverData,
-                resModel: "foo",
-                Component: ControlPanel,
-                searchMenuTypes: ["groupBy"],
-                searchViewId: false,
-                searchViewFields: {},
-            });
-
-            await toggleGroupByMenu(target);
-
-            assert.containsNone(target, ".o_menu_item");
-            assert.containsNone(target, ".dropdown-divider");
-            assert.containsNone(target, ".o_add_custom_group_menu");
-        }
-    );
-
-    QUnit.test("simple rendering with no groupby", async function (assert) {
-        assert.expect(3);
-
-        await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchMenuTypes: ["groupBy"],
-            searchViewId: false,
-        });
-
-        await toggleGroupByMenu(target);
-
-        assert.containsNone(target, ".o_menu_item");
-        assert.containsNone(target, ".dropdown-divider");
-        assert.containsOnce(target, ".o_add_custom_group_menu");
-    });
-
-    QUnit.test("simple rendering with a single groupby", async function (assert) {
-        await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchMenuTypes: ["groupBy"],
-            searchViewId: false,
-            searchViewArch: `
-                    <search>
-                        <filter string="Foo" name="group_by_foo" context="{'group_by': 'foo'}"/>
-                    </search>
-                `,
-        });
-
-        await toggleGroupByMenu(target);
-
-        assert.containsOnce(target, ".o_menu_item");
-        const menuItem = target.querySelector(".o_menu_item");
-        assert.strictEqual(menuItem.innerText.trim(), "Foo");
-        assert.strictEqual(menuItem.getAttribute("role"), "menuitemcheckbox");
-        assert.strictEqual(menuItem.ariaChecked, "false");
-        assert.containsOnce(target, ".dropdown-divider");
-        assert.containsOnce(target, ".o_add_custom_group_menu");
-    });
-
-    QUnit.test('toggle a "simple" groupby in groupby menu works', async function (assert) {
-        const controlPanel = await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchMenuTypes: ["groupBy"],
-            searchViewId: false,
-            searchViewArch: `
-                    <search>
-                        <filter string="Foo" name="group_by_foo" context="{'group_by': 'foo'}"/>
-                    </search>
-                `,
-        });
-
-        await toggleGroupByMenu(target);
-
-        assert.deepEqual(controlPanel.env.searchModel.groupBy, []);
-        assert.deepEqual(getFacetTexts(target), []);
-        assert.notOk(isItemSelected(target, "Foo"));
-        const menuItem = target.querySelector(".o_menu_item");
-        assert.strictEqual(menuItem.innerText.trim(), "Foo");
-        assert.strictEqual(menuItem.getAttribute("role"), "menuitemcheckbox");
-        assert.strictEqual(menuItem.ariaChecked, "false");
-        await toggleMenuItem(target, "Foo");
-        assert.strictEqual(menuItem.ariaChecked, "true");
-
-        assert.deepEqual(controlPanel.env.searchModel.groupBy, ["foo"]);
-        assert.deepEqual(getFacetTexts(target), ["Foo"]);
-        assert.containsOnce(
-            target.querySelector(".o_searchview .o_searchview_facet"),
-            "span.oi.oi-group.o_searchview_facet_label"
-        );
-        assert.ok(isItemSelected(target, "Foo"));
-
-        await toggleMenuItem(target, "Foo");
-
-        assert.deepEqual(controlPanel.env.searchModel.groupBy, []);
-        assert.deepEqual(getFacetTexts(target), []);
-        assert.notOk(isItemSelected(target, "Foo"));
-    });
-
-    QUnit.test('toggle a "simple" groupby quickly does not crash', async function (assert) {
-        assert.expect(1);
-
-        await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchMenuTypes: ["groupBy"],
-            searchViewId: false,
-            searchViewArch: `
-                    <search>
-                        <filter string="Foo" name="group_by_foo" context="{'group_by': 'foo'}"/>
-                    </search>
-                `,
-        });
-
-        await toggleGroupByMenu(target);
-
-        toggleMenuItem(target, "Foo");
-        toggleMenuItem(target, "Foo");
-
-        assert.ok(true);
-    });
-
-    QUnit.test(
-        'remove a "Group By" facet properly unchecks groupbys in groupby menu',
-        async function (assert) {
-            assert.expect(6);
-
-            const controlPanel = await makeWithSearch({
-                serverData,
-                resModel: "foo",
-                Component: ControlPanel,
-                searchMenuTypes: ["groupBy"],
-                searchViewId: false,
-                searchViewArch: `
-                    <search>
-                        <filter string="Foo" name="group_by_foo" context="{'group_by': 'foo'}"/>
-                    </search>
-                `,
-                context: { search_default_group_by_foo: 1 },
-            });
-
-            await toggleGroupByMenu(target);
-
-            assert.deepEqual(getFacetTexts(target), ["Foo"]);
-            assert.deepEqual(controlPanel.env.searchModel.groupBy, ["foo"]);
-            assert.ok(isItemSelected(target, "Foo"));
-
-            await removeFacet(target, "Foo");
-
-            assert.deepEqual(getFacetTexts(target), []);
-            assert.deepEqual(controlPanel.env.searchModel.groupBy, []);
-
-            await toggleGroupByMenu(target);
-
-            assert.notOk(isItemSelected(target, "Foo"));
-        }
-    );
-
-    QUnit.test("group by a date field using interval works", async function (assert) {
-        assert.expect(21);
-
-        const controlPanel = await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchMenuTypes: ["groupBy"],
-            searchViewId: false,
-            searchViewArch: `
-                    <search>
-                        <filter string="Date" name="date" context="{'group_by': 'date_field:week'}"/>
-                    </search>
-                `,
-            context: { search_default_date: 1 },
-        });
-
-        await toggleGroupByMenu(target);
-
-        assert.deepEqual(controlPanel.env.searchModel.groupBy, ["date_field:week"]);
-
-        await toggleMenuItem(target, "Date");
-
-        assert.ok(isOptionSelected(target, "Date", "Week"));
-
-        assert.deepEqual(
-            [...target.querySelectorAll(".o_item_option")].map((el) => el.innerText),
-            ["Year", "Quarter", "Month", "Week", "Day"]
-        );
-
-        const steps = [
-            {
-                description: "Year",
-                facetTexts: ["Date: Year>Date: Week"],
-                selectedoptions: ["Year", "Week"],
-                groupBy: ["date_field:year", "date_field:week"],
-            },
-            {
-                description: "Month",
-                facetTexts: ["Date: Year>Date: Month>Date: Week"],
-                selectedoptions: ["Year", "Month", "Week"],
-                groupBy: ["date_field:year", "date_field:month", "date_field:week"],
-            },
-            {
-                description: "Week",
-                facetTexts: ["Date: Year>Date: Month"],
-                selectedoptions: ["Year", "Month"],
-                groupBy: ["date_field:year", "date_field:month"],
-            },
-            {
-                description: "Month",
-                facetTexts: ["Date: Year"],
-                selectedoptions: ["Year"],
-                groupBy: ["date_field:year"],
-            },
-            { description: "Year", facetTexts: [], selectedoptions: [], groupBy: [] },
-        ];
-        for (const s of steps) {
-            await toggleMenuItemOption(target, "Date", s.description);
-
-            assert.deepEqual(controlPanel.env.searchModel.groupBy, s.groupBy);
-            assert.deepEqual(getFacetTexts(target), s.facetTexts);
-            s.selectedoptions.forEach((description) => {
-                assert.ok(isOptionSelected(target, "Date", description));
-            });
-        }
-    });
-
-    QUnit.test("interval options are correctly grouped and ordered", async function (assert) {
-        assert.expect(8);
-
-        await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchMenuTypes: ["groupBy"],
-            searchViewId: false,
-            searchViewArch: `
-                    <search>
-                        <filter string="Bar" name="bar" context="{'group_by': 'bar'}"/>
-                        <filter string="Date" name="date" context="{'group_by': 'date_field'}"/>
-                        <filter string="Foo" name="foo" context="{'group_by': 'foo'}"/>
-                    </search>
-                `,
-            context: { search_default_bar: 1 },
-        });
-
-        assert.deepEqual(getFacetTexts(target), ["Bar"]);
-
-        // open menu 'Group By'
-        await toggleGroupByMenu(target);
-
-        // Open the groupby 'Date'
-        await toggleMenuItem(target, "Date");
-        // select option 'week'
-        await toggleMenuItemOption(target, "Date", "Week");
-
-        assert.deepEqual(getFacetTexts(target), ["Bar>Date: Week"]);
-
-        // select option 'day'
-        await toggleMenuItemOption(target, "Date", "Day");
-
-        assert.deepEqual(getFacetTexts(target), ["Bar>Date: Week>Date: Day"]);
-
-        // select option 'year'
-        await toggleMenuItemOption(target, "Date", "Year");
-
-        assert.deepEqual(getFacetTexts(target), ["Bar>Date: Year>Date: Week>Date: Day"]);
-
-        // select 'Foo'
-        await toggleMenuItem(target, "Foo");
-
-        assert.deepEqual(getFacetTexts(target), ["Bar>Date: Year>Date: Week>Date: Day>Foo"]);
-
-        // select option 'quarter'
-        await toggleMenuItem(target, "Date");
-        await toggleMenuItemOption(target, "Date", "Quarter");
-
-        assert.deepEqual(getFacetTexts(target), [
-            "Bar>Date: Year>Date: Quarter>Date: Week>Date: Day>Foo",
-        ]);
-
-        // unselect 'Bar'
-        await toggleMenuItem(target, "Bar");
-
-        assert.deepEqual(getFacetTexts(target), [
-            "Date: Year>Date: Quarter>Date: Week>Date: Day>Foo",
-        ]);
-
-        // unselect option 'week'
-        await toggleMenuItem(target, "Date");
-        await toggleMenuItemOption(target, "Date", "Week");
-
-        assert.deepEqual(getFacetTexts(target), ["Date: Year>Date: Quarter>Date: Day>Foo"]);
-    });
-
-    QUnit.test("default groupbys can be ordered", async function (assert) {
-        assert.expect(2);
-
-        const controlPanel = await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchMenuTypes: ["groupBy"],
-            searchViewId: false,
-            searchViewArch: `
-                    <search>
-                        <filter string="Birthday" name="birthday" context="{'group_by': 'birthday'}"/>
-                        <filter string="Date" name="date" context="{'group_by': 'date_field:week'}"/>
-                    </search>
-                `,
-            context: { search_default_birthday: 2, search_default_date: 1 },
-        });
-
-        // the default groupbys should be activated in the right order
-        assert.deepEqual(controlPanel.env.searchModel.groupBy, [
-            "date_field:week",
-            "birthday:month",
-        ]);
-        assert.deepEqual(getFacetTexts(target), ["Date: Week>Birthday: Month"]);
-    });
-
-    QUnit.test("a separator in groupbys does not cause problems", async function (assert) {
-        assert.expect(23);
-
-        await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchMenuTypes: ["groupBy"],
-            searchViewId: false,
-            searchViewArch: `
-                    <search>
-                        <filter string="Date" name="coolName" context="{'group_by': 'date_field'}"/>
-                        <separator/>
-                        <filter string="Bar" name="superName" context="{'group_by': 'bar'}"/>
-                    </search>
-                `,
-        });
-
-        await toggleGroupByMenu(target);
-        await toggleMenuItem(target, "Date");
-        await toggleMenuItemOption(target, "Date", "Day");
-
-        assert.ok(isItemSelected(target, "Date"));
-        assert.notOk(isItemSelected(target, "Bar"));
-        assert.ok(isOptionSelected(target, "Date", "Day"), "selected");
-        assert.deepEqual(getFacetTexts(target), ["Date: Day"]);
-
-        await toggleMenuItem(target, "Bar");
-        await toggleMenuItem(target, "Date");
-
-        assert.ok(isItemSelected(target, "Date"));
-        assert.ok(isItemSelected(target, "Bar"));
-        assert.ok(isOptionSelected(target, "Date", "Day"), "selected");
-        assert.deepEqual(getFacetTexts(target), ["Date: Day>Bar"]);
-
-        await toggleMenuItemOption(target, "Date", "Quarter");
-
-        assert.ok(isItemSelected(target, "Date"));
-        assert.ok(isItemSelected(target, "Bar"));
-        assert.ok(isOptionSelected(target, "Date", "Quarter"), "selected");
-        assert.ok(isOptionSelected(target, "Date", "Day"), "selected");
-        assert.deepEqual(getFacetTexts(target), ["Date: Quarter>Date: Day>Bar"]);
-
-        await toggleMenuItem(target, "Bar");
-        await toggleMenuItem(target, "Date");
-
-        assert.ok(isItemSelected(target, "Date"));
-        assert.notOk(isItemSelected(target, "Bar"));
-        assert.ok(isOptionSelected(target, "Date", "Quarter"), "selected");
-        assert.ok(isOptionSelected(target, "Date", "Day"), "selected");
-        assert.deepEqual(getFacetTexts(target), ["Date: Quarter>Date: Day"]);
-
-        await removeFacet(target);
-
-        assert.deepEqual(getFacetTexts(target), []);
-
-        await toggleGroupByMenu(target);
-        await toggleMenuItem(target, "Date");
-
-        assert.notOk(isItemSelected(target, "Date"));
-        assert.notOk(isItemSelected(target, "Bar"));
-        assert.notOk(isOptionSelected(target, "Date", "Quarter"), "selected");
-        assert.notOk(isOptionSelected(target, "Date", "Day"), "selected");
-    });
-
-    QUnit.test("falsy search default groupbys are not activated", async function (assert) {
-        assert.expect(2);
-
-        const controlPanel = await makeWithSearch({
-            serverData,
-            resModel: "foo",
-            Component: ControlPanel,
-            searchMenuTypes: ["groupBy"],
-            searchViewId: false,
-            searchViewArch: `
-                    <search>
-                        <filter string="Birthday" name="birthday" context="{'group_by': 'birthday'}"/>
-                        <filter string="Date" name="date" context="{'group_by': 'foo'}"/>
-                    </search>
-                `,
-            context: { search_default_birthday: false, search_default_foo: 0 },
-        });
-
-        assert.deepEqual(controlPanel.env.searchModel.groupBy, []);
-        assert.deepEqual(getFacetTexts(target), []);
-    });
-
-    QUnit.test(
-        "Custom group by menu is displayed when hideCustomGroupBy is not set",
-        async function (assert) {
-            await makeWithSearch({
-                serverData,
-                resModel: "foo",
-                Component: ControlPanel,
-                searchViewId: false,
-                searchViewArch: `
-                    <search>
-                        <filter string="Birthday" name="birthday" context="{'group_by': 'birthday'}"/>
-                        <filter string="Date" name="date" context="{'group_by': 'foo'}"/>
-                    </search>
-                `,
-                searchMenuTypes: ["groupBy"],
-            });
-
-            await toggleGroupByMenu(target);
-
-            assert.containsOnce(target, ".o_add_custom_group_menu");
-        }
-    );
-
-    QUnit.test(
-        "Custom group by menu is displayed when hideCustomGroupBy is false",
-        async function (assert) {
-            await makeWithSearch({
-                serverData,
-                resModel: "foo",
-                Component: ControlPanel,
-                searchViewId: false,
-                searchViewArch: `
-                    <search>
-                        <filter string="Birthday" name="birthday" context="{'group_by': 'birthday'}"/>
-                        <filter string="Date" name="date" context="{'group_by': 'foo'}"/>
-                    </search>
-                `,
-                hideCustomGroupBy: false,
-                searchMenuTypes: ["groupBy"],
-            });
-
-            await toggleGroupByMenu(target);
-
-            assert.containsOnce(target, ".o_add_custom_group_menu");
-        }
-    );
-
-    QUnit.test(
-        "Custom group by menu is displayed when hideCustomGroupBy is true",
-        async function (assert) {
-            await makeWithSearch({
-                serverData,
-                resModel: "foo",
-                Component: ControlPanel,
-                searchViewId: false,
-                searchViewArch: `
-                    <search>
-                        <filter string="Birthday" name="birthday" context="{'group_by': 'birthday'}"/>
-                        <filter string="Date" name="date" context="{'group_by': 'foo'}"/>
-                    </search>
-                `,
-                hideCustomGroupBy: true,
-                searchMenuTypes: ["groupBy"],
-            });
-
-            await toggleGroupByMenu(target);
-
-            assert.containsNone(target, ".o_add_custom_group_menu");
-        }
-    );
-});
diff --git a/addons/web/static/tests/search/helpers.js b/addons/web/static/tests/search/helpers.js
index 55cc640c057..fdccbf36f0d 100644
--- a/addons/web/static/tests/search/helpers.js
+++ b/addons/web/static/tests/search/helpers.js
@@ -19,7 +19,7 @@ import { notificationService } from "@web/core/notifications/notification_servic
 import { ormService } from "@web/core/orm_service";
 import { popoverService } from "@web/core/popover/popover_service";
 import { registry } from "@web/core/registry";
-import { CustomFavoriteItem } from "@web/search/favorite_menu/custom_favorite_item";
+import { CustomFavoriteItem } from "@web/search/custom_favorite_item/custom_favorite_item";
 import { WithSearch } from "@web/search/with_search/with_search";
 import { getDefaultConfig } from "@web/views/view";
 import { viewService } from "@web/views/view_service";
@@ -196,7 +196,18 @@ export function getMenuItemTexts(target) {
 }
 
 export function getButtons(el) {
-    return [...el.querySelector(`div.o_cp_bottom div.o_cp_buttons`).children];
+    return [...el.querySelectorAll(`div.o_control_panel_breadcrumbs button`)];
+}
+
+export function getVisibleButtons(el) {
+    return [
+        ...$(el).find(
+            [
+                "div.o_control_panel_breadcrumbs button:visible", // button in the breadcrumbs
+                "div.o_control_panel_actions button:visible", // buttons for list selection
+            ].join(",")
+        ),
+    ];
 }
 
 /** Filter menu */
@@ -280,7 +291,7 @@ export async function applyGroup(el) {
 }
 
 export async function groupByMenu(el, fieldName) {
-    await toggleGroupByMenu(el);
+    await toggleSearchBarMenu(el);
     await toggleAddCustomGroup(el);
     await selectGroup(el, fieldName);
     await applyGroup(el);
@@ -331,7 +342,7 @@ export function getFacetTexts(target) {
 
 export async function removeFacet(el, facetFinder = 0) {
     const facet = findItem(el, `div.o_searchview_facet`, facetFinder);
-    await click(facet.querySelector("i.o_facet_remove"));
+    await click(facet.querySelector(".o_facet_remove"));
 }
 
 export async function editSearch(el, value) {
@@ -384,7 +395,11 @@ export async function editPager(el, value) {
  * @param {string} [menuFinder="Action"]
  * @returns {Promise}
  */
-export async function toggleActionMenu(el, menuFinder = "Action") {
-    const dropdown = findItem(el, `.o_cp_action_menus button`, menuFinder);
-    await click(dropdown);
+export async function toggleActionMenu(el) {
+    await click(el.querySelector(".o_cp_action_menus .dropdown-toggle"));
+}
+
+/** SearchBarMenu */
+export async function toggleSearchBarMenu(el) {
+    await click(findItem(el, `.o_searchview_dropdown_toggler`));
 }
diff --git a/addons/web/static/tests/search/search_bar_menu_tests.js b/addons/web/static/tests/search/search_bar_menu_tests.js
new file mode 100644
index 00000000000..8baeea6250d
--- /dev/null
+++ b/addons/web/static/tests/search/search_bar_menu_tests.js
@@ -0,0 +1,1710 @@
+/** @odoo-module **/
+
+import {
+    click,
+    editInput,
+    getFixture,
+    getNodesTextContent,
+    patchDate,
+    patchWithCleanup,
+} from "@web/../tests/helpers/utils";
+import { browser } from "@web/core/browser/browser";
+import {
+    getFacetTexts,
+    makeWithSearch,
+    removeFacet,
+    setupControlPanelServiceRegistry,
+    toggleSearchBarMenu,
+    toggleMenuItem,
+    toggleMenuItemOption,
+    deleteFavorite,
+    isItemSelected,
+    isOptionSelected,
+    openAddCustomFilterDialog,
+    setupControlPanelFavoriteMenuRegistry,
+} from "./helpers";
+import { SearchBar } from "@web/search/search_bar/search_bar";
+import { SearchBarMenu } from "@web/search/search_bar_menu/search_bar_menu";
+import { registry } from "@web/core/registry";
+import { Component, onWillUpdateProps, xml } from "@odoo/owl";
+import { createWebClient, doAction } from "../webclient/helpers";
+
+function getDomain(searchable) {
+    return searchable.env.searchModel.domain;
+}
+
+function getContext(searchable) {
+    return searchable.env.searchModel.context;
+}
+
+const viewRegistry = registry.category("views");
+const favoriteMenuRegistry = registry.category("favoriteMenu");
+
+let target;
+let serverData;
+QUnit.module("Search", (hooks) => {
+    hooks.beforeEach(async () => {
+        serverData = {
+            models: {
+                foo: {
+                    fields: {
+                        bar: { string: "Bar", type: "many2one", relation: "partner" },
+                        foo: { string: "Foo", type: "char", store: true, sortable: true },
+                        birthday: {
+                            string: "Birthday",
+                            type: "date",
+                            store: true,
+                            sortable: true,
+                        },
+                        date_field: {
+                            string: "Date",
+                            type: "date",
+                            store: true,
+                            sortable: true,
+                        },
+                    },
+                },
+            },
+            views: {
+                "foo,false,search": `
+                    <search>
+                        <filter name="birthday" date="birthday"/>
+                        <filter name="date_field" date="date_field"/>
+                    </search>`,
+            },
+        };
+        setupControlPanelServiceRegistry();
+        setupControlPanelFavoriteMenuRegistry();
+        patchWithCleanup(browser, {
+            setTimeout: (fn) => fn(),
+            clearTimeout: () => {},
+        });
+        target = getFixture();
+    });
+
+    QUnit.module("SearchBarMenu", () => {
+        QUnit.module("Comparison");
+        QUnit.test("simple rendering", async function (assert) {
+            patchDate(1997, 0, 9, 12, 0, 0);
+            await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBarMenu,
+                searchMenuTypes: ["filter", "comparison"],
+                searchViewId: false,
+            });
+            assert.containsOnce(target, ".o_searchview_dropdown_toggler");
+            assert.containsNone(target, ".dropdown.o_comparison_menu");
+            await toggleSearchBarMenu(target);
+            await toggleMenuItem(target, "Birthday");
+            await toggleMenuItemOption(target, "Birthday", "January");
+            assert.containsOnce(target, ".o_comparison_menu .fa.fa-adjust");
+            assert.strictEqual(
+                target
+                    .querySelector(".o_comparison_menu .o_dropdown_title")
+                    .innerText.trim()
+                    .toUpperCase(),
+                "COMPARISON"
+            );
+            assert.containsN(target, ".o_comparison_menu .dropdown-item", 2);
+            assert.containsN(target, ".o_comparison_menu .dropdown-item[role=menuitemcheckbox]", 2);
+            const comparisonOptions = [
+                ...target.querySelectorAll(".o_comparison_menu .dropdown-item"),
+            ];
+            assert.deepEqual(
+                comparisonOptions.map((e) => e.innerText.trim()),
+                ["Birthday: Previous Period", "Birthday: Previous Year"]
+            );
+            assert.deepEqual(
+                comparisonOptions.map((e) => e.ariaChecked),
+                ["false", "false"]
+            );
+        });
+
+        QUnit.test("activate a comparison works", async function (assert) {
+            patchDate(1997, 0, 9, 12, 0, 0);
+            await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBar,
+                searchMenuTypes: ["filter", "comparison"],
+                searchViewId: false,
+            });
+            await toggleSearchBarMenu(target);
+            await toggleMenuItem(target, "Birthday");
+            await toggleMenuItemOption(target, "Birthday", "January");
+            await toggleMenuItem(target, "Birthday: Previous Period");
+            assert.deepEqual(getFacetTexts(target), [
+                "Birthday: January 1997",
+                "Birthday: Previous Period",
+            ]);
+            await toggleMenuItem(target, "Date");
+            await toggleMenuItemOption(target, "Date", "December");
+            await toggleMenuItem(target, "Date: Previous Year");
+            assert.deepEqual(getFacetTexts(target), [
+                ["Birthday: January 1997", "Date: December 1996"].join("\nor\n"),
+                "Date: Previous Year",
+            ]);
+            await toggleMenuItem(target, "Date");
+            await toggleMenuItemOption(target, "Date", "1996");
+            assert.deepEqual(getFacetTexts(target), ["Birthday: January 1997"]);
+            await toggleMenuItem(target, "Birthday: Previous Year");
+            assert.containsN(target, ".o_comparison_menu .dropdown-item", 2);
+            assert.containsN(target, ".o_comparison_menu .dropdown-item[role=menuitemcheckbox]", 2);
+            const comparisonOptions = [
+                ...target.querySelectorAll(".o_comparison_menu .dropdown-item"),
+            ];
+            assert.deepEqual(
+                comparisonOptions.map((e) => e.innerText.trim()),
+                ["Birthday: Previous Period", "Birthday: Previous Year"]
+            );
+            assert.deepEqual(
+                comparisonOptions.map((e) => e.ariaChecked),
+                ["false", "true"]
+            );
+            assert.deepEqual(getFacetTexts(target), [
+                "Birthday: January 1997",
+                "Birthday: Previous Year",
+            ]);
+            await removeFacet(target);
+            assert.deepEqual(getFacetTexts(target), []);
+        });
+
+        QUnit.module("Favorite");
+        QUnit.test(
+            "simple rendering with no favorite (without ability to save)",
+            async function (assert) {
+                assert.expect(4);
+
+                favoriteMenuRegistry.remove("custom-favorite-item");
+
+                await makeWithSearch({
+                    serverData,
+                    resModel: "foo",
+                    Component: SearchBarMenu,
+                    searchMenuTypes: ["favorite"],
+                    searchViewId: false,
+                    config: {
+                        getDisplayName: () => "Action Name",
+                    },
+                });
+
+                await toggleSearchBarMenu(target);
+                assert.containsOnce(target, ".o_favorite_menu .fa.fa-star");
+                assert.strictEqual(
+                    target
+                        .querySelector(".o_favorite_menu .o_dropdown_title")
+                        .innerText.trim()
+                        .toUpperCase(),
+                    "FAVORITES"
+                );
+                assert.containsOnce(target, ".o_favorite_menu", "the menu should be opened");
+                assert.containsNone(
+                    target,
+                    ".o_favorite_menu .o_menu_item",
+                    "the menu should be empty"
+                );
+            }
+        );
+
+        QUnit.test("simple rendering with no favorite", async function (assert) {
+            assert.expect(5);
+
+            await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBarMenu,
+                searchMenuTypes: ["favorite"],
+                searchViewId: false,
+                config: {
+                    getDisplayName: () => "Action Name",
+                },
+            });
+
+            await toggleSearchBarMenu(target);
+            assert.containsOnce(target, ".o_favorite_menu .fa.fa-star");
+            assert.strictEqual(
+                target
+                    .querySelector(".o_favorite_menu .o_dropdown_title")
+                    .innerText.trim()
+                    .toUpperCase(),
+                "FAVORITES"
+            );
+
+            assert.containsOnce(target, ".o_favorite_menu", "the menu should be opened");
+            assert.containsNone(target, ".o_favorite_menu .dropdown-divider");
+            assert.containsOnce(target, ".o_favorite_menu .o_add_favorite");
+        });
+
+        QUnit.test("delete an active favorite", async function (assert) {
+            assert.expect(14);
+
+            class ToyController extends Component {
+                setup() {
+                    assert.deepEqual(this.props.domain, [["foo", "=", "qsdf"]]);
+                    onWillUpdateProps((nextProps) => {
+                        assert.deepEqual(nextProps.domain, []);
+                    });
+                }
+            }
+            ToyController.components = { SearchBar };
+            ToyController.template = xml`
+                <div>
+                    <SearchBar/>
+                </div>
+            `;
+
+            viewRegistry.add("toy", {
+                type: "toy",
+                display_name: "Toy",
+                Controller: ToyController,
+            });
+
+            serverData.views["foo,false,toy"] = `<toy />`;
+            serverData.models.foo.filters = [
+                {
+                    context: "{}",
+                    domain: "[['foo', '=', 'qsdf']]",
+                    id: 7,
+                    is_default: true,
+                    name: "My favorite",
+                    sort: "[]",
+                    user_id: [2, "Mitchell Admin"],
+                },
+            ];
+
+            const webClient = await createWebClient({
+                serverData,
+                mockRPC: async (_, args) => {
+                    if (args.model === "ir.filters" && args.method === "unlink") {
+                        assert.step("deleteFavorite");
+                        return { result: true }; // mocked unlink result
+                    }
+                },
+            });
+            webClient.env.bus.on("CLEAR-CACHES", webClient, () => assert.step("CLEAR-CACHES"));
+            await doAction(webClient, {
+                name: "Action",
+                res_model: "foo",
+                type: "ir.actions.act_window",
+                views: [[false, "toy"]],
+            });
+
+            await toggleSearchBarMenu(target);
+            const favorite = target.querySelector(".o_favorite_menu .dropdown-item");
+            assert.equal(favorite.innerText, "My favorite");
+            assert.deepEqual(favorite.getAttribute("role"), "menuitemcheckbox");
+            assert.deepEqual(favorite.ariaChecked, "true");
+
+            assert.deepEqual(getFacetTexts(target), ["My favorite"]);
+            assert.hasClass(target.querySelector(".o_favorite_menu .o_menu_item"), "selected");
+
+            await deleteFavorite(target, 0);
+
+            assert.verifySteps([]);
+
+            await click(document.querySelector("div.o_dialog footer button"));
+
+            assert.deepEqual(getFacetTexts(target), []);
+            assert.containsNone(target, ".o_favorite_menu .o_menu_item");
+            assert.containsOnce(target, ".o_favorite_menu .o_add_favorite");
+            assert.verifySteps(["deleteFavorite", "CLEAR-CACHES"]);
+        });
+
+        QUnit.test(
+            "default favorite is not activated if activateFavorite is set to false",
+            async function (assert) {
+                assert.expect(3);
+
+                const controlPanel = await makeWithSearch({
+                    serverData,
+                    resModel: "foo",
+                    Component: SearchBarMenu,
+                    searchMenuTypes: ["favorite"],
+                    searchViewId: false,
+                    irFilters: [
+                        {
+                            context: "{}",
+                            domain: "[('foo', '=', 'a')]",
+                            id: 7,
+                            is_default: true,
+                            name: "My favorite",
+                            sort: "[]",
+                            user_id: [2, "Mitchell Admin"],
+                        },
+                    ],
+                    activateFavorite: false,
+                });
+
+                await toggleSearchBarMenu(target);
+
+                assert.notOk(isItemSelected(target, "My favorite"));
+                assert.deepEqual(getDomain(controlPanel), []);
+                assert.deepEqual(getFacetTexts(target), []);
+            }
+        );
+
+        QUnit.test(
+            'toggle favorite correctly clears filter, groupbys, comparison and field "options"',
+            async function (assert) {
+                patchDate(2019, 6, 31, 13, 43, 0);
+
+                const searchBar = await makeWithSearch({
+                    serverData,
+                    resModel: "foo",
+                    Component: SearchBar,
+                    searchMenuTypes: ["filter", "groupBy", "comparison", "favorite"],
+                    searchViewId: false,
+                    irFilters: [
+                        {
+                            context: `
+                                {
+                                    "group_by": ["foo"],
+                                    "comparison": {
+                                        "favorite comparison content": "bla bla..."
+                                    },
+                                 }
+                            `,
+                            domain: "['!', ['foo', '=', 'qsdf']]",
+                            id: 7,
+                            is_default: false,
+                            name: "My favorite",
+                            sort: "[]",
+                            user_id: [2, "Mitchell Admin"],
+                        },
+                    ],
+                    searchViewArch: `
+                        <search>
+                            <field string="Foo" name="foo"/>
+                            <filter string="Date Field Filter" name="positive" date="date_field" default_period="this_year"/>
+                            <filter string="Date Field Groupby" name="coolName" context="{'group_by': 'date_field'}"/>
+                        </search>
+                    `,
+                    context: {
+                        search_default_positive: true,
+                        search_default_coolName: true,
+                        search_default_foo: "a",
+                    },
+                });
+
+                let domain = searchBar.env.searchModel.domain;
+                let groupBy = searchBar.env.searchModel.groupBy;
+                let comparison = searchBar.env.searchModel.getFullComparison();
+
+                assert.deepEqual(domain, [
+                    "&",
+                    ["foo", "ilike", "a"],
+                    "&",
+                    ["date_field", ">=", "2019-01-01"],
+                    ["date_field", "<=", "2019-12-31"],
+                ]);
+                assert.deepEqual(groupBy, ["date_field:month"]);
+                assert.deepEqual(comparison, null);
+
+                assert.deepEqual(getFacetTexts(target), [
+                    "Foo\na",
+                    "Date Field Filter: 2019",
+                    "Date Field Groupby: Month",
+                ]);
+
+                // activate a comparison
+                await toggleSearchBarMenu(target);
+                await toggleMenuItem(target, "Date Field Filter: Previous Period");
+
+                domain = searchBar.env.searchModel.domain;
+                groupBy = searchBar.env.searchModel.groupBy;
+                comparison = searchBar.env.searchModel.getFullComparison();
+
+                assert.deepEqual(domain, [["foo", "ilike", "a"]]);
+                assert.deepEqual(groupBy, ["date_field:month"]);
+                assert.deepEqual(comparison, {
+                    comparisonId: "previous_period",
+                    comparisonRange: [
+                        "&",
+                        ["date_field", ">=", "2018-01-01"],
+                        ["date_field", "<=", "2018-12-31"],
+                    ],
+                    comparisonRangeDescription: "2018",
+                    fieldDescription: "Date Field Filter",
+                    fieldName: "date_field",
+                    range: [
+                        "&",
+                        ["date_field", ">=", "2019-01-01"],
+                        ["date_field", "<=", "2019-12-31"],
+                    ],
+                    rangeDescription: "2019",
+                });
+
+                // activate the unique existing favorite
+                const favorite = target.querySelector(".o_favorite_menu .dropdown-item");
+                assert.equal(favorite.innerText, "My favorite");
+                assert.deepEqual(favorite.getAttribute("role"), "menuitemcheckbox");
+                assert.deepEqual(favorite.ariaChecked, "false");
+                await toggleMenuItem(target.querySelector(".o_favorite_menu"), 0);
+                assert.deepEqual(favorite.ariaChecked, "true");
+
+                domain = searchBar.env.searchModel.domain;
+                groupBy = searchBar.env.searchModel.groupBy;
+                comparison = searchBar.env.searchModel.getFullComparison();
+
+                assert.deepEqual(domain, ["!", ["foo", "=", "qsdf"]]);
+                assert.deepEqual(groupBy, ["foo"]);
+                assert.deepEqual(comparison, {
+                    "favorite comparison content": "bla bla...",
+                });
+
+                assert.deepEqual(getFacetTexts(target), ["My favorite"]);
+            }
+        );
+
+        QUnit.module("Group by");
+        QUnit.test(
+            "simple rendering with neither groupbys nor groupable fields",
+            async function (assert) {
+                assert.expect(3);
+
+                serverData.views = {
+                    "foo,false,search": `<search/>`,
+                };
+
+                await makeWithSearch({
+                    serverData,
+                    resModel: "foo",
+                    Component: SearchBarMenu,
+                    searchMenuTypes: ["groupBy"],
+                    searchViewId: false,
+                    searchViewFields: {},
+                });
+
+                await toggleSearchBarMenu(target);
+
+                assert.containsNone(target, ".o_menu_item");
+                assert.containsNone(target, ".dropdown-divider");
+                assert.containsNone(target, ".o_add_custom_group_menu");
+            }
+        );
+
+        QUnit.test("simple rendering with no groupby", async function (assert) {
+            assert.expect(3);
+
+            await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBarMenu,
+                searchMenuTypes: ["groupBy"],
+                searchViewId: false,
+            });
+
+            await toggleSearchBarMenu(target);
+
+            assert.containsNone(target, ".o_menu_item");
+            assert.containsNone(target, ".dropdown-divider");
+            assert.containsOnce(target, ".o_add_custom_group_menu");
+        });
+
+        QUnit.test("simple rendering with a single groupby", async function (assert) {
+            await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBarMenu,
+                searchMenuTypes: ["groupBy"],
+                searchViewId: false,
+                searchViewArch: `
+                    <search>
+                        <filter string="Foo" name="group_by_foo" context="{'group_by': 'foo'}"/>
+                    </search>
+                `,
+            });
+
+            await toggleSearchBarMenu(target);
+
+            assert.containsOnce(target, ".o_menu_item");
+            const menuItem = target.querySelector(".o_menu_item");
+            assert.strictEqual(menuItem.innerText.trim(), "Foo");
+            assert.strictEqual(menuItem.getAttribute("role"), "menuitemcheckbox");
+            assert.strictEqual(menuItem.ariaChecked, "false");
+            assert.containsOnce(target, ".dropdown-divider");
+            assert.containsOnce(target, ".o_add_custom_group_menu");
+        });
+
+        QUnit.test('toggle a "simple" groupby in groupby menu works', async function (assert) {
+            const controlPanel = await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBar,
+                searchMenuTypes: ["groupBy"],
+                searchViewId: false,
+                searchViewArch: `
+                    <search>
+                        <filter string="Foo" name="group_by_foo" context="{'group_by': 'foo'}"/>
+                    </search>
+                `,
+            });
+
+            await toggleSearchBarMenu(target);
+
+            assert.deepEqual(controlPanel.env.searchModel.groupBy, []);
+            assert.deepEqual(getFacetTexts(target), []);
+            assert.notOk(isItemSelected(target, "Foo"));
+            const menuItem = target.querySelector(".o_menu_item");
+            assert.strictEqual(menuItem.innerText.trim(), "Foo");
+            assert.strictEqual(menuItem.getAttribute("role"), "menuitemcheckbox");
+            assert.strictEqual(menuItem.ariaChecked, "false");
+            await toggleMenuItem(target, "Foo");
+            assert.strictEqual(menuItem.ariaChecked, "true");
+
+            assert.deepEqual(controlPanel.env.searchModel.groupBy, ["foo"]);
+            assert.deepEqual(getFacetTexts(target), ["Foo"]);
+            assert.containsOnce(
+                target.querySelector(".o_searchview .o_searchview_facet"),
+                ".o_searchview_facet_label"
+            );
+            assert.ok(isItemSelected(target, "Foo"));
+
+            await toggleMenuItem(target, "Foo");
+
+            assert.deepEqual(controlPanel.env.searchModel.groupBy, []);
+            assert.deepEqual(getFacetTexts(target), []);
+            assert.notOk(isItemSelected(target, "Foo"));
+        });
+
+        QUnit.test('toggle a "simple" groupby quickly does not crash', async function (assert) {
+            assert.expect(1);
+
+            await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBarMenu,
+                searchMenuTypes: ["groupBy"],
+                searchViewId: false,
+                searchViewArch: `
+                    <search>
+                        <filter string="Foo" name="group_by_foo" context="{'group_by': 'foo'}"/>
+                    </search>
+                `,
+            });
+
+            await toggleSearchBarMenu(target);
+
+            toggleMenuItem(target, "Foo");
+            toggleMenuItem(target, "Foo");
+
+            assert.ok(true);
+        });
+
+        QUnit.test(
+            'remove a "Group By" facet properly unchecks groupbys in groupby menu',
+            async function (assert) {
+                assert.expect(6);
+
+                const controlPanel = await makeWithSearch({
+                    serverData,
+                    resModel: "foo",
+                    Component: SearchBar,
+                    searchMenuTypes: ["groupBy"],
+                    searchViewId: false,
+                    searchViewArch: `
+                    <search>
+                        <filter string="Foo" name="group_by_foo" context="{'group_by': 'foo'}"/>
+                    </search>
+                `,
+                    context: { search_default_group_by_foo: 1 },
+                });
+
+                await toggleSearchBarMenu(target);
+
+                assert.deepEqual(getFacetTexts(target), ["Foo"]);
+                assert.deepEqual(controlPanel.env.searchModel.groupBy, ["foo"]);
+                assert.ok(isItemSelected(target, "Foo"));
+
+                await removeFacet(target, "Foo");
+
+                assert.deepEqual(getFacetTexts(target), []);
+                assert.deepEqual(controlPanel.env.searchModel.groupBy, []);
+
+                await toggleSearchBarMenu(target);
+
+                assert.notOk(isItemSelected(target, "Foo"));
+            }
+        );
+
+        QUnit.test("group by a date field using interval works", async function (assert) {
+            assert.expect(21);
+
+            const controlPanel = await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBar,
+                searchMenuTypes: ["groupBy"],
+                searchViewId: false,
+                searchViewArch: `
+                    <search>
+                        <filter string="Date" name="date" context="{'group_by': 'date_field:week'}"/>
+                    </search>
+                `,
+                context: { search_default_date: 1 },
+            });
+
+            await toggleSearchBarMenu(target);
+
+            assert.deepEqual(controlPanel.env.searchModel.groupBy, ["date_field:week"]);
+
+            await toggleMenuItem(target, "Date");
+
+            assert.ok(isOptionSelected(target, "Date", "Week"));
+
+            assert.deepEqual(
+                [...target.querySelectorAll(".o_item_option")].map((el) => el.innerText),
+                ["Year", "Quarter", "Month", "Week", "Day"]
+            );
+
+            const steps = [
+                {
+                    description: "Year",
+                    facetTexts: ["Date: Year\n>\nDate: Week"],
+                    selectedoptions: ["Year", "Week"],
+                    groupBy: ["date_field:year", "date_field:week"],
+                },
+                {
+                    description: "Month",
+                    facetTexts: ["Date: Year\n>\nDate: Month\n>\nDate: Week"],
+                    selectedoptions: ["Year", "Month", "Week"],
+                    groupBy: ["date_field:year", "date_field:month", "date_field:week"],
+                },
+                {
+                    description: "Week",
+                    facetTexts: ["Date: Year\n>\nDate: Month"],
+                    selectedoptions: ["Year", "Month"],
+                    groupBy: ["date_field:year", "date_field:month"],
+                },
+                {
+                    description: "Month",
+                    facetTexts: ["Date: Year"],
+                    selectedoptions: ["Year"],
+                    groupBy: ["date_field:year"],
+                },
+                {
+                    description: "Year",
+                    facetTexts: [],
+                    selectedoptions: [],
+                    groupBy: [],
+                },
+            ];
+            for (const s of steps) {
+                await toggleMenuItemOption(target, "Date", s.description);
+
+                assert.deepEqual(controlPanel.env.searchModel.groupBy, s.groupBy);
+                assert.deepEqual(getFacetTexts(target), s.facetTexts);
+                s.selectedoptions.forEach((description) => {
+                    assert.ok(isOptionSelected(target, "Date", description));
+                });
+            }
+        });
+
+        QUnit.test("interval options are correctly grouped and ordered", async function (assert) {
+            assert.expect(8);
+
+            await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBar,
+                searchMenuTypes: ["groupBy"],
+                searchViewId: false,
+                searchViewArch: `
+                    <search>
+                        <filter string="Bar" name="bar" context="{'group_by': 'bar'}"/>
+                        <filter string="Date" name="date" context="{'group_by': 'date_field'}"/>
+                        <filter string="Foo" name="foo" context="{'group_by': 'foo'}"/>
+                    </search>
+                `,
+                context: { search_default_bar: 1 },
+            });
+
+            assert.deepEqual(getFacetTexts(target), ["Bar"]);
+
+            // open menu 'Group By'
+            await toggleSearchBarMenu(target);
+
+            // Open the groupby 'Date'
+            await toggleMenuItem(target, "Date");
+            // select option 'week'
+            await toggleMenuItemOption(target, "Date", "Week");
+
+            assert.deepEqual(getFacetTexts(target), ["Bar\n>\nDate: Week"]);
+
+            // select option 'day'
+            await toggleMenuItemOption(target, "Date", "Day");
+
+            assert.deepEqual(getFacetTexts(target), ["Bar\n>\nDate: Week\n>\nDate: Day"]);
+
+            // select option 'year'
+            await toggleMenuItemOption(target, "Date", "Year");
+
+            assert.deepEqual(getFacetTexts(target), [
+                "Bar\n>\nDate: Year\n>\nDate: Week\n>\nDate: Day",
+            ]);
+
+            // select 'Foo'
+            await toggleMenuItem(target, "Foo");
+
+            assert.deepEqual(getFacetTexts(target), [
+                "Bar\n>\nDate: Year\n>\nDate: Week\n>\nDate: Day\n>\nFoo",
+            ]);
+
+            // select option 'quarter'
+            await toggleMenuItem(target, "Date");
+            await toggleMenuItemOption(target, "Date", "Quarter");
+
+            assert.deepEqual(getFacetTexts(target), [
+                "Bar\n>\nDate: Year\n>\nDate: Quarter\n>\nDate: Week\n>\nDate: Day\n>\nFoo",
+            ]);
+
+            // unselect 'Bar'
+            await toggleMenuItem(target, "Bar");
+
+            assert.deepEqual(getFacetTexts(target), [
+                "Date: Year\n>\nDate: Quarter\n>\nDate: Week\n>\nDate: Day\n>\nFoo",
+            ]);
+
+            // unselect option 'week'
+            await toggleMenuItem(target, "Date");
+            await toggleMenuItemOption(target, "Date", "Week");
+
+            assert.deepEqual(getFacetTexts(target), [
+                "Date: Year\n>\nDate: Quarter\n>\nDate: Day\n>\nFoo",
+            ]);
+        });
+
+        QUnit.test("default groupbys can be ordered", async function (assert) {
+            assert.expect(2);
+
+            const controlPanel = await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBar,
+                searchMenuTypes: ["groupBy"],
+                searchViewId: false,
+                searchViewArch: `
+                    <search>
+                        <filter string="Birthday" name="birthday" context="{'group_by': 'birthday'}"/>
+                        <filter string="Date" name="date" context="{'group_by': 'date_field:week'}"/>
+                    </search>
+                `,
+                context: { search_default_birthday: 2, search_default_date: 1 },
+            });
+
+            // the default groupbys should be activated in the right order
+            assert.deepEqual(controlPanel.env.searchModel.groupBy, [
+                "date_field:week",
+                "birthday:month",
+            ]);
+            assert.deepEqual(getFacetTexts(target), ["Date: Week\n>\nBirthday: Month"]);
+        });
+
+        QUnit.test("a separator in groupbys does not cause problems", async function (assert) {
+            assert.expect(23);
+
+            await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBar,
+                searchMenuTypes: ["groupBy"],
+                searchViewId: false,
+                searchViewArch: `
+                    <search>
+                        <filter string="Date" name="coolName" context="{'group_by': 'date_field'}"/>
+                        <separator/>
+                        <filter string="Bar" name="superName" context="{'group_by': 'bar'}"/>
+                    </search>
+                `,
+            });
+
+            await toggleSearchBarMenu(target);
+            await toggleMenuItem(target, "Date");
+            await toggleMenuItemOption(target, "Date", "Day");
+
+            assert.ok(isItemSelected(target, "Date"));
+            assert.notOk(isItemSelected(target, "Bar"));
+            assert.ok(isOptionSelected(target, "Date", "Day"), "selected");
+            assert.deepEqual(getFacetTexts(target), ["Date: Day"]);
+
+            await toggleMenuItem(target, "Bar");
+            await toggleMenuItem(target, "Date");
+
+            assert.ok(isItemSelected(target, "Date"));
+            assert.ok(isItemSelected(target, "Bar"));
+            assert.ok(isOptionSelected(target, "Date", "Day"), "selected");
+            assert.deepEqual(getFacetTexts(target), ["Date: Day\n>\nBar"]);
+
+            await toggleMenuItemOption(target, "Date", "Quarter");
+
+            assert.ok(isItemSelected(target, "Date"));
+            assert.ok(isItemSelected(target, "Bar"));
+            assert.ok(isOptionSelected(target, "Date", "Quarter"), "selected");
+            assert.ok(isOptionSelected(target, "Date", "Day"), "selected");
+            assert.deepEqual(getFacetTexts(target), ["Date: Quarter\n>\nDate: Day\n>\nBar"]);
+
+            await toggleMenuItem(target, "Bar");
+            await toggleMenuItem(target, "Date");
+
+            assert.ok(isItemSelected(target, "Date"));
+            assert.notOk(isItemSelected(target, "Bar"));
+            assert.ok(isOptionSelected(target, "Date", "Quarter"), "selected");
+            assert.ok(isOptionSelected(target, "Date", "Day"), "selected");
+            assert.deepEqual(getFacetTexts(target), ["Date: Quarter\n>\nDate: Day"]);
+
+            await removeFacet(target);
+
+            assert.deepEqual(getFacetTexts(target), []);
+
+            await toggleSearchBarMenu(target);
+            await toggleMenuItem(target, "Date");
+
+            assert.notOk(isItemSelected(target, "Date"));
+            assert.notOk(isItemSelected(target, "Bar"));
+            assert.notOk(isOptionSelected(target, "Date", "Quarter"), "selected");
+            assert.notOk(isOptionSelected(target, "Date", "Day"), "selected");
+        });
+
+        QUnit.test("falsy search default groupbys are not activated", async function (assert) {
+            assert.expect(2);
+
+            const controlPanel = await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBar,
+                searchMenuTypes: ["groupBy"],
+                searchViewId: false,
+                searchViewArch: `
+                    <search>
+                        <filter string="Birthday" name="birthday" context="{'group_by': 'birthday'}"/>
+                        <filter string="Date" name="date" context="{'group_by': 'foo'}"/>
+                    </search>
+                `,
+                context: { search_default_birthday: false, search_default_foo: 0 },
+            });
+
+            assert.deepEqual(controlPanel.env.searchModel.groupBy, []);
+            assert.deepEqual(getFacetTexts(target), []);
+        });
+
+        QUnit.test(
+            "Custom group by menu is displayed when hideCustomGroupBy is not set",
+            async function (assert) {
+                await makeWithSearch({
+                    serverData,
+                    resModel: "foo",
+                    Component: SearchBarMenu,
+                    searchViewId: false,
+                    searchViewArch: `
+                    <search>
+                        <filter string="Birthday" name="birthday" context="{'group_by': 'birthday'}"/>
+                        <filter string="Date" name="date" context="{'group_by': 'foo'}"/>
+                    </search>
+                `,
+                    searchMenuTypes: ["groupBy"],
+                });
+
+                await toggleSearchBarMenu(target);
+
+                assert.containsOnce(target, ".o_add_custom_group_menu");
+            }
+        );
+
+        QUnit.test(
+            "Custom group by menu is displayed when hideCustomGroupBy is false",
+            async function (assert) {
+                await makeWithSearch({
+                    serverData,
+                    resModel: "foo",
+                    Component: SearchBarMenu,
+                    searchViewId: false,
+                    searchViewArch: `
+                    <search>
+                        <filter string="Birthday" name="birthday" context="{'group_by': 'birthday'}"/>
+                        <filter string="Date" name="date" context="{'group_by': 'foo'}"/>
+                    </search>
+                `,
+                    hideCustomGroupBy: false,
+                    searchMenuTypes: ["groupBy"],
+                });
+
+                await toggleSearchBarMenu(target);
+
+                assert.containsOnce(target, ".o_add_custom_group_menu");
+            }
+        );
+
+        QUnit.test(
+            "Custom group by menu is displayed when hideCustomGroupBy is true",
+            async function (assert) {
+                await makeWithSearch({
+                    serverData,
+                    resModel: "foo",
+                    Component: SearchBarMenu,
+                    searchViewId: false,
+                    searchViewArch: `
+                    <search>
+                        <filter string="Birthday" name="birthday" context="{'group_by': 'birthday'}"/>
+                        <filter string="Date" name="date" context="{'group_by': 'foo'}"/>
+                    </search>
+                `,
+                    hideCustomGroupBy: true,
+                    searchMenuTypes: ["groupBy"],
+                });
+
+                await toggleSearchBarMenu(target);
+
+                assert.containsNone(target, ".o_add_custom_group_menu");
+            }
+        );
+
+        QUnit.module("Filter");
+
+        QUnit.test("simple rendering with no filter", async function (assert) {
+            await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBarMenu,
+                searchMenuTypes: ["filter"],
+            });
+
+            await toggleSearchBarMenu(target);
+            assert.containsNone(target, ".o_menu_item");
+            assert.containsNone(target, ".dropdown-divider");
+            assert.containsOnce(target, ".dropdown-item");
+            assert.strictEqual(
+                target.querySelector(".dropdown-item").innerText,
+                "Add Custom Filter"
+            );
+        });
+
+        QUnit.test("simple rendering with a single filter", async function (assert) {
+            await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBarMenu,
+                searchViewId: false,
+                searchMenuTypes: ["filter"],
+                searchViewArch: `
+                    <search>
+                        <filter string="Foo" name="foo" domain="[]"/>
+                    </search>
+                `,
+            });
+
+            await toggleSearchBarMenu(target);
+            assert.containsOnce(target, ".o_menu_item");
+            assert.containsOnce(target, ".o_menu_item[role=menuitemcheckbox]");
+            assert.deepEqual(target.querySelector(".o_menu_item").ariaChecked, "false");
+            assert.containsOnce(target, ".dropdown-divider");
+            assert.containsOnce(target, ".dropdown-item:not(.o_menu_item)");
+            assert.strictEqual(
+                target.querySelector(".dropdown-item:not(.o_menu_item)").innerText,
+                "Add Custom Filter"
+            );
+        });
+
+        QUnit.test('toggle a "simple" filter in filter menu works', async function (assert) {
+            const controlPanel = await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBar,
+                searchViewId: false,
+                searchMenuTypes: ["filter"],
+                searchViewArch: `
+                    <search>
+                        <filter string="Foo" name="foo" domain="[('foo', '=', 'qsdf')]"/>
+                    </search>
+                `,
+            });
+
+            await toggleSearchBarMenu(target);
+            assert.deepEqual(getFacetTexts(target), []);
+            assert.notOk(isItemSelected(target, "Foo"));
+            assert.deepEqual(getDomain(controlPanel), []);
+            assert.containsOnce(target, ".o_menu_item[role=menuitemcheckbox]");
+            assert.deepEqual(target.querySelector(".o_menu_item").ariaChecked, "false");
+
+            await toggleMenuItem(target, "Foo");
+            assert.deepEqual(target.querySelector(".o_menu_item").ariaChecked, "true");
+
+            assert.deepEqual(getFacetTexts(target), ["Foo"]);
+            assert.containsOnce(
+                target.querySelector(".o_searchview .o_searchview_facet"),
+                ".o_searchview_facet_label"
+            );
+            assert.ok(isItemSelected(target, "Foo"));
+            assert.deepEqual(getDomain(controlPanel), [["foo", "=", "qsdf"]]);
+
+            await toggleMenuItem(target, "Foo");
+
+            assert.deepEqual(getFacetTexts(target), []);
+            assert.notOk(isItemSelected(target, "Foo"));
+            assert.deepEqual(getDomain(controlPanel), []);
+        });
+
+        QUnit.test("filter by a date field using period works", async function (assert) {
+            assert.expect(57);
+
+            patchDate(2017, 2, 22, 1, 0, 0);
+
+            const controlPanel = await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBar,
+                searchViewId: false,
+                searchMenuTypes: ["filter"],
+                searchViewArch: `
+                    <search>
+                        <filter string="Date" name="date_field" date="date_field"/>
+                    </search>
+                `,
+                context: { search_default_date_field: 1 },
+            });
+
+            await toggleSearchBarMenu(target);
+            await toggleMenuItem(target, "Date");
+
+            const optionEls = target.querySelectorAll(".dropdown .o_item_option");
+
+            // default filter should be activated with the global default period 'this_month'
+            assert.deepEqual(getDomain(controlPanel), [
+                "&",
+                ["date_field", ">=", "2017-03-01"],
+                ["date_field", "<=", "2017-03-31"],
+            ]);
+            assert.ok(isItemSelected(target, "Date"));
+            assert.ok(isOptionSelected(target, "Date", "March"));
+
+            // check option descriptions
+            const optionDescriptions = [...optionEls].map((e) => e.innerText.trim());
+            const expectedDescriptions = [
+                "March",
+                "February",
+                "January",
+                "Q4",
+                "Q3",
+                "Q2",
+                "Q1",
+                "2017",
+                "2016",
+                "2015",
+            ];
+            assert.deepEqual(optionDescriptions, expectedDescriptions);
+
+            // check generated domains
+            const steps = [
+                {
+                    toggledOption: "March",
+                    resultingFacet: "Date: 2017",
+                    selectedoptions: ["2017"],
+                    domain: [
+                        "&",
+                        ["date_field", ">=", "2017-01-01"],
+                        ["date_field", "<=", "2017-12-31"],
+                    ],
+                },
+                {
+                    toggledOption: "February",
+                    resultingFacet: "Date: February 2017",
+                    selectedoptions: ["February", "2017"],
+                    domain: [
+                        "&",
+                        ["date_field", ">=", "2017-02-01"],
+                        ["date_field", "<=", "2017-02-28"],
+                    ],
+                },
+                {
+                    toggledOption: "February",
+                    resultingFacet: "Date: 2017",
+                    selectedoptions: ["2017"],
+                    domain: [
+                        "&",
+                        ["date_field", ">=", "2017-01-01"],
+                        ["date_field", "<=", "2017-12-31"],
+                    ],
+                },
+                {
+                    toggledOption: "January",
+                    resultingFacet: "Date: January 2017",
+                    selectedoptions: ["January", "2017"],
+                    domain: [
+                        "&",
+                        ["date_field", ">=", "2017-01-01"],
+                        ["date_field", "<=", "2017-01-31"],
+                    ],
+                },
+                {
+                    toggledOption: "Q4",
+                    resultingFacet: "Date: January 2017/Q4 2017",
+                    selectedoptions: ["January", "Q4", "2017"],
+                    domain: [
+                        "|",
+                        "&",
+                        ["date_field", ">=", "2017-01-01"],
+                        ["date_field", "<=", "2017-01-31"],
+                        "&",
+                        ["date_field", ">=", "2017-10-01"],
+                        ["date_field", "<=", "2017-12-31"],
+                    ],
+                },
+                {
+                    toggledOption: "January",
+                    resultingFacet: "Date: Q4 2017",
+                    selectedoptions: ["Q4", "2017"],
+                    domain: [
+                        "&",
+                        ["date_field", ">=", "2017-10-01"],
+                        ["date_field", "<=", "2017-12-31"],
+                    ],
+                },
+                {
+                    toggledOption: "Q4",
+                    resultingFacet: "Date: 2017",
+                    selectedoptions: ["2017"],
+                    domain: [
+                        "&",
+                        ["date_field", ">=", "2017-01-01"],
+                        ["date_field", "<=", "2017-12-31"],
+                    ],
+                },
+                {
+                    toggledOption: "Q1",
+                    resultingFacet: "Date: Q1 2017",
+                    selectedoptions: ["Q1", "2017"],
+                    domain: [
+                        "&",
+                        ["date_field", ">=", "2017-01-01"],
+                        ["date_field", "<=", "2017-03-31"],
+                    ],
+                },
+                {
+                    toggledOption: "Q1",
+                    resultingFacet: "Date: 2017",
+                    selectedoptions: ["2017"],
+                    domain: [
+                        "&",
+                        ["date_field", ">=", "2017-01-01"],
+                        ["date_field", "<=", "2017-12-31"],
+                    ],
+                },
+                {
+                    toggledOption: "2017",
+                    selectedoptions: [],
+                    domain: [],
+                },
+                {
+                    toggledOption: "2017",
+                    resultingFacet: "Date: 2017",
+                    selectedoptions: ["2017"],
+                    domain: [
+                        "&",
+                        ["date_field", ">=", "2017-01-01"],
+                        ["date_field", "<=", "2017-12-31"],
+                    ],
+                },
+                {
+                    toggledOption: "2016",
+                    resultingFacet: "Date: 2016/2017",
+                    selectedoptions: ["2017", "2016"],
+                    domain: [
+                        "|",
+                        "&",
+                        ["date_field", ">=", "2016-01-01"],
+                        ["date_field", "<=", "2016-12-31"],
+                        "&",
+                        ["date_field", ">=", "2017-01-01"],
+                        ["date_field", "<=", "2017-12-31"],
+                    ],
+                },
+                {
+                    toggledOption: "2015",
+                    resultingFacet: "Date: 2015/2016/2017",
+                    selectedoptions: ["2017", "2016", "2015"],
+                    domain: [
+                        "|",
+                        "&",
+                        ["date_field", ">=", "2015-01-01"],
+                        ["date_field", "<=", "2015-12-31"],
+                        "|",
+                        "&",
+                        ["date_field", ">=", "2016-01-01"],
+                        ["date_field", "<=", "2016-12-31"],
+                        "&",
+                        ["date_field", ">=", "2017-01-01"],
+                        ["date_field", "<=", "2017-12-31"],
+                    ],
+                },
+                {
+                    toggledOption: "March",
+                    resultingFacet: "Date: March 2015/March 2016/March 2017",
+                    selectedoptions: ["March", "2017", "2016", "2015"],
+                    domain: [
+                        "|",
+                        "&",
+                        ["date_field", ">=", "2015-03-01"],
+                        ["date_field", "<=", "2015-03-31"],
+                        "|",
+                        "&",
+                        ["date_field", ">=", "2016-03-01"],
+                        ["date_field", "<=", "2016-03-31"],
+                        "&",
+                        ["date_field", ">=", "2017-03-01"],
+                        ["date_field", "<=", "2017-03-31"],
+                    ],
+                },
+            ];
+            for (const s of steps) {
+                await toggleMenuItemOption(target, "Date", s.toggledOption);
+                assert.deepEqual(getDomain(controlPanel), s.domain);
+                if (s.resultingFacet) {
+                    assert.deepEqual(getFacetTexts(target), [s.resultingFacet]);
+                } else {
+                    assert.deepEqual(getFacetTexts(target), []);
+                }
+                s.selectedoptions.forEach((option) => {
+                    assert.ok(
+                        isOptionSelected(target, "Date", option),
+                        `at step ${steps.indexOf(s) + 1}, ${option} should be selected`
+                    );
+                });
+            }
+        });
+
+        QUnit.test(
+            "filter by a date field using period works even in January",
+            async function (assert) {
+                assert.expect(5);
+
+                patchDate(2017, 0, 7, 3, 0, 0);
+
+                const controlPanel = await makeWithSearch({
+                    serverData,
+                    resModel: "foo",
+                    Component: SearchBar,
+                    searchViewId: false,
+                    searchMenuTypes: ["filter"],
+                    searchViewArch: `
+                        <search>
+                            <filter string="Date" name="some_filter" date="date_field" default_period="last_month"/>
+                        </search>
+                    `,
+                    context: { search_default_some_filter: 1 },
+                });
+
+                assert.deepEqual(getDomain(controlPanel), [
+                    "&",
+                    ["date_field", ">=", "2016-12-01"],
+                    ["date_field", "<=", "2016-12-31"],
+                ]);
+
+                assert.deepEqual(getFacetTexts(target), ["Date: December 2016"]);
+
+                await toggleSearchBarMenu(target);
+                await toggleMenuItem(target, "Date");
+
+                assert.ok(isItemSelected(target, "Date"));
+                assert.ok(isOptionSelected(target, "Date", "December"));
+                assert.ok(isOptionSelected(target, "Date", "2016"));
+            }
+        );
+
+        QUnit.test("`context` key in <filter> is used", async function (assert) {
+            assert.expect(1);
+
+            const controlPanel = await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBarMenu,
+                searchViewId: false,
+                searchMenuTypes: ["filter"],
+                searchViewArch: `
+                    <search>
+                        <filter string="Filter" name="some_filter" domain="[]" context="{'coucou_1': 1}"/>
+                    </search>
+                `,
+                context: { search_default_some_filter: 1 },
+            });
+
+            assert.deepEqual(getContext(controlPanel), {
+                coucou_1: 1,
+                lang: "en",
+                tz: "taht",
+                uid: 7,
+            });
+        });
+
+        QUnit.test("Filter with JSON-parsable domain works", async function (assert) {
+            assert.expect(1);
+
+            const xml_domain = "[[&quot;foo&quot;,&quot;=&quot;,&quot;Gently Weeps&quot;]]";
+
+            const controlPanel = await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBarMenu,
+                searchViewId: false,
+                searchMenuTypes: ["filter"],
+                searchViewArch: `
+                    <search>
+                        <filter string="Foo" name="gently_weeps" domain="${xml_domain}"/>
+                    </search>
+                `,
+                context: { search_default_gently_weeps: 1 },
+            });
+
+            assert.deepEqual(
+                getDomain(controlPanel),
+                [["foo", "=", "Gently Weeps"]],
+                "A JSON parsable xml domain should be handled just like any other"
+            );
+        });
+
+        QUnit.test("filter with date attribute set as search_default", async function (assert) {
+            assert.expect(1);
+
+            patchDate(2019, 6, 31, 13, 43, 0);
+
+            await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBar,
+                searchViewId: false,
+                searchMenuTypes: ["filter"],
+                searchViewArch: `
+                    <search>
+                        <filter string="Date" name="date_field" date="date_field" default_period="last_month"/>
+                    </search>
+                `,
+                context: { search_default_date_field: true },
+            });
+
+            assert.deepEqual(getFacetTexts(target), ["Date: June 2019"]);
+        });
+
+        QUnit.test(
+            "filter with multiple values in default_period date attribute set as search_default",
+            async function (assert) {
+                assert.expect(3);
+
+                patchDate(2019, 6, 31, 13, 43, 0);
+
+                await makeWithSearch({
+                    serverData,
+                    resModel: "foo",
+                    Component: SearchBarMenu,
+                    searchViewId: false,
+                    searchMenuTypes: ["filter"],
+                    searchViewArch: `
+                        <search>
+                            <filter string="Date" name="date_field" date="date_field" default_period="this_year,last_year"/>
+                        </search>
+                    `,
+                    context: { search_default_date_field: true },
+                });
+
+                await toggleSearchBarMenu(target);
+                await toggleMenuItem(target, "Date");
+
+                assert.ok(isItemSelected(target, "Date"));
+                assert.ok(isOptionSelected(target, "Date", "2019"));
+                assert.ok(isOptionSelected(target, "Date", "2018"));
+            }
+        );
+
+        QUnit.test("filter domains are correcly combined by OR and AND", async function (assert) {
+            assert.expect(2);
+
+            const controlPanel = await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBar,
+                searchViewId: false,
+                searchMenuTypes: ["filter"],
+                searchViewArch: `
+                    <search>
+                        <filter string="Filter Group 1" name="f_1_g1" domain="[['foo', '=', 'f1_g1']]"/>
+                        <separator/>
+                        <filter string="Filter 1 Group 2" name="f1_g2" domain="[['foo', '=', 'f1_g2']]"/>
+                        <filter string="Filter 2 GROUP 2" name="f2_g2" domain="[['foo', '=', 'f2_g2']]"/>
+                    </search>
+                `,
+                context: {
+                    search_default_f_1_g1: true,
+                    search_default_f1_g2: true,
+                    search_default_f2_g2: true,
+                },
+            });
+
+            assert.deepEqual(getDomain(controlPanel), [
+                "&",
+                ["foo", "=", "f1_g1"],
+                "|",
+                ["foo", "=", "f1_g2"],
+                ["foo", "=", "f2_g2"],
+            ]);
+
+            assert.deepEqual(getFacetTexts(target), [
+                "Filter Group 1",
+                "Filter 1 Group 2\nor\nFilter 2 GROUP 2",
+            ]);
+        });
+
+        QUnit.test("arch order of groups of filters preserved", async function (assert) {
+            assert.expect(12);
+
+            await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBarMenu,
+                searchViewId: false,
+                searchMenuTypes: ["filter"],
+                searchViewArch: `
+                    <search>
+                        <filter string="1" name="coolName1" date="date_field"/>
+                        <separator/>
+                        <filter string="2" name="coolName2" date="date_field"/>
+                        <separator/>
+                        <filter string="3" name="coolName3" domain="[]"/>
+                        <separator/>
+                        <filter string="4" name="coolName4" domain="[]"/>
+                        <separator/>
+                        <filter string="5" name="coolName5" domain="[]"/>
+                        <separator/>
+                        <filter string="6" name="coolName6" domain="[]"/>
+                        <separator/>
+                        <filter string="7" name="coolName7" domain="[]"/>
+                        <separator/>
+                        <filter string="8" name="coolName8" domain="[]"/>
+                        <separator/>
+                        <filter string="9" name="coolName9" domain="[]"/>
+                        <separator/>
+                        <filter string="10" name="coolName10" domain="[]"/>
+                        <separator/>
+                        <filter string="11" name="coolName11" domain="[]"/>
+                    </search>
+                `,
+            });
+
+            await toggleSearchBarMenu(target);
+            assert.containsN(target, ".o_filter_menu .o_menu_item", 11);
+
+            const menuItemEls = target.querySelectorAll(".o_filter_menu .o_menu_item");
+            [...menuItemEls].forEach((e, index) => {
+                assert.strictEqual(e.innerText.trim(), String(index + 1));
+            });
+        });
+
+        QUnit.test("Open 'Add Custom Filter' dialog", async function (assert) {
+            await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBarMenu,
+                searchMenuTypes: ["filter"],
+            });
+
+            await toggleSearchBarMenu(target);
+            assert.deepEqual(
+                getNodesTextContent(target.querySelectorAll(".o_filter_menu .dropdown-item")),
+                ["Add Custom Filter"]
+            );
+            assert.containsNone(target, ".modal");
+
+            await openAddCustomFilterDialog(target);
+            assert.containsOnce(target, ".modal");
+            assert.strictEqual(
+                target.querySelector(".modal header").innerText,
+                "Add Custom Filter"
+            );
+            assert.containsOnce(target, ".modal .o_domain_selector");
+            assert.containsOnce(target, ".modal .o_domain_selector .o_domain_leaf");
+            assert.deepEqual(getNodesTextContent(target.querySelectorAll(".modal footer button")), [
+                "Add",
+                "Cancel",
+            ]);
+        });
+
+        QUnit.test(
+            "Default leaf in 'Add Custom Filter' dialog is based on ID (if no special fields on model)",
+            async function (assert) {
+                await makeWithSearch({
+                    serverData,
+                    resModel: "foo",
+                    Component: SearchBarMenu,
+                    searchMenuTypes: ["filter"],
+                });
+                await toggleSearchBarMenu(target);
+                await openAddCustomFilterDialog(target);
+                assert.containsOnce(target, ".modal .o_domain_selector .o_domain_leaf");
+                assert.containsOnce(target, ".o_domain_leaf .o_model_field_selector_chain_part");
+                assert.strictEqual(
+                    target.querySelector(".o_domain_leaf .o_model_field_selector_chain_part")
+                        .innerText,
+                    "ID"
+                );
+            }
+        );
+
+        QUnit.test(
+            "Default leaf in 'Add Custom Filter' dialog is based on first special field (if any special fields on model)",
+            async function (assert) {
+                serverData.models.foo.fields.country_id = {
+                    string: "Country",
+                    type: "many2one",
+                };
+                await makeWithSearch({
+                    serverData,
+                    resModel: "foo",
+                    Component: SearchBarMenu,
+                    searchMenuTypes: ["filter"],
+                });
+                await toggleSearchBarMenu(target);
+                await openAddCustomFilterDialog(target);
+                assert.containsOnce(target, ".modal .o_domain_selector .o_domain_leaf");
+                assert.containsOnce(target, ".o_domain_leaf .o_model_field_selector_chain_part");
+                assert.strictEqual(
+                    target.querySelector(".o_domain_leaf .o_model_field_selector_chain_part")
+                        .innerText,
+                    "Country"
+                );
+            }
+        );
+
+        QUnit.test("Default connector is '|' (any)", async function (assert) {
+            await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBarMenu,
+                searchMenuTypes: ["filter"],
+            });
+            await toggleSearchBarMenu(target);
+            await openAddCustomFilterDialog(target);
+            assert.containsOnce(target, ".modal .o_domain_selector .o_domain_leaf");
+            assert.containsOnce(target, ".o_domain_leaf .o_model_field_selector_chain_part");
+            assert.strictEqual(
+                target.querySelector(".o_domain_leaf .o_model_field_selector_chain_part").innerText,
+                "ID"
+            );
+            assert.containsNone(target, "button.o_domain_tree_connector_caret");
+
+            await click(target, ".o_domain_add_node_button .fa-plus");
+            assert.containsOnce(target, "button.o_domain_tree_connector_caret");
+            assert.strictEqual(
+                target.querySelector("button.o_domain_tree_connector_caret").innerText,
+                "any"
+            );
+            assert.containsN(target, ".modal .o_domain_selector .o_domain_leaf", 2);
+        });
+
+        QUnit.test("Add a custom filter", async function (assert) {
+            const controlPanel = await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBar,
+                searchMenuTypes: ["filter"],
+                searchViewId: false,
+                searchViewArch: `
+                    <search>
+                        <filter string="Filter" name="filter" domain="[('foo', '=', 'abc')]"/>
+                    </search>
+                `,
+                context: {
+                    search_default_filter: true,
+                },
+            });
+            assert.deepEqual(getFacetTexts(target), ["Filter"]);
+            assert.deepEqual(getDomain(controlPanel), [["foo", "=", "abc"]]);
+
+            await toggleSearchBarMenu(target);
+            await openAddCustomFilterDialog(target);
+            await click(target, ".o_domain_add_node_button .fa-plus");
+
+            const connectorEl = target.querySelector(".o_domain_tree_connector_selector");
+            await click(connectorEl.querySelector("button.o_domain_tree_connector_caret"));
+            await click(
+                [
+                    ...target.querySelectorAll(".o_domain_tree_connector_selector .dropdown-item"),
+                ].find((el) => el.innerText === "all")
+            );
+
+            await click(
+                [...target.querySelectorAll(".o_domain_add_node_button .fa-sitemap")].at(-1)
+            );
+            await click(
+                [...target.querySelectorAll(".o_domain_add_node_button .fa-sitemap")].at(-1)
+            );
+            await click(target.querySelector(".modal footer button"));
+
+            assert.deepEqual(getFacetTexts(target), [
+                "Filter",
+                "ID = 1",
+                "ID = 1",
+                "ID = 1 or ID = 1 or ( ID = 1 and ID = 1 )",
+            ]);
+            assert.deepEqual(getDomain(controlPanel), [
+                "&",
+                ["foo", "=", "abc"],
+                "&",
+                ["id", "=", 1],
+                "&",
+                ["id", "=", 1],
+                "|",
+                "|",
+                ["id", "=", 1],
+                ["id", "=", 1],
+                "&",
+                ["id", "=", 1],
+                ["id", "=", 1],
+            ]);
+        });
+
+        QUnit.test("Add a custom filter containing an expression", async function (assert) {
+            patchWithCleanup(odoo, { debug: true });
+
+            const controlPanel = await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBar,
+                searchMenuTypes: ["filter"],
+                searchViewId: false,
+                searchViewArch: `<search />`,
+            });
+            assert.deepEqual(getFacetTexts(target), []);
+            assert.deepEqual(getDomain(controlPanel), []);
+
+            await toggleSearchBarMenu(target);
+            await openAddCustomFilterDialog(target);
+            await editInput(target, ".o_domain_debug_input", `[("foo", "in", [uid, 1, "a"])]`);
+            await click(target.querySelector(".modal footer button"));
+
+            assert.deepEqual(getFacetTexts(target), [`Foo in uid or 1 or "a"`]);
+            assert.deepEqual(getDomain(controlPanel), [
+                ["foo", "in", [7, 1, "a"]], // uid = 7
+            ]);
+        });
+
+        QUnit.test("Add a custom filter containing a between operator", async function (assert) {
+            patchWithCleanup(odoo, { debug: true });
+
+            const controlPanel = await makeWithSearch({
+                serverData,
+                resModel: "foo",
+                Component: SearchBar,
+                searchMenuTypes: ["filter"],
+                searchViewId: false,
+                searchViewArch: `<search />`,
+            });
+            assert.deepEqual(getFacetTexts(target), []);
+            assert.deepEqual(getDomain(controlPanel), []);
+
+            await toggleSearchBarMenu(target);
+            await openAddCustomFilterDialog(target);
+            await editInput(target, ".o_domain_debug_input", `[("id", "between", [0, 10])]`);
+            await click(target.querySelector(".modal footer button"));
+
+            assert.deepEqual(getFacetTexts(target), [`ID is between 0 and 10`]);
+            assert.deepEqual(getDomain(controlPanel), ["&", ["id", ">=", 0], ["id", "<=", 10]]);
+        });
+    });
+});
diff --git a/addons/web/static/tests/search/search_bar_tests.js b/addons/web/static/tests/search/search_bar_tests.js
index 5ae0304fae8..a38d1170eae 100644
--- a/addons/web/static/tests/search/search_bar_tests.js
+++ b/addons/web/static/tests/search/search_bar_tests.js
@@ -1,6 +1,5 @@
 /** @odoo-module **/
 
-import { ControlPanel } from "@web/search/control_panel/control_panel";
 import {
     click,
     getFixture,
@@ -9,7 +8,6 @@ import {
     nextTick,
     patchDate,
     patchTimeZone,
-    patchWithCleanup,
     triggerEvent,
 } from "../helpers/utils";
 import {
@@ -18,9 +16,8 @@ import {
     makeWithSearch,
     removeFacet,
     setupControlPanelServiceRegistry,
-    toggleComparisonMenu,
-    toggleGroupByMenu,
     toggleMenuItem,
+    toggleSearchBarMenu,
     validateSearch,
 } from "./helpers";
 
@@ -32,7 +29,8 @@ function getDomain(controlPanel) {
     return controlPanel.env.searchModel.domain;
 }
 
-import { onWillUpdateProps } from "@odoo/owl";
+import { Component, onWillUpdateProps, xml } from "@odoo/owl";
+import { SearchBar } from "@web/search/search_bar/search_bar";
 
 let target;
 let serverData;
@@ -143,7 +141,7 @@ QUnit.module("Search", (hooks) => {
         await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: [],
             searchViewId: false,
         });
@@ -161,7 +159,7 @@ QUnit.module("Search", (hooks) => {
         await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: ["groupBy"],
             searchViewId: false,
             context: { search_default_date_group_by: 1 },
@@ -190,7 +188,7 @@ QUnit.module("Search", (hooks) => {
         await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: ["groupBy"],
             searchViewId: false,
             context: {
@@ -236,7 +234,7 @@ QUnit.module("Search", (hooks) => {
         const controlPanel = await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: [],
             searchViewId: false,
         });
@@ -248,7 +246,7 @@ QUnit.module("Search", (hooks) => {
         await triggerEvent(searchInput, null, "keydown", { key: "Enter" }); // select
 
         assert.deepEqual(
-            getFacetTexts(target).map((str) => str.replace(/\s+/, " ")),
+            getFacetTexts(target).map((str) => str.replace(/\s+/g, " ")),
             ["Birthday 07/15/1983"],
             "The format of the date in the facet should be in locale"
         );
@@ -265,8 +263,8 @@ QUnit.module("Search", (hooks) => {
         await triggerEvent(searchInput, null, "keydown", { key: "Enter" }); // select
 
         assert.deepEqual(
-            getFacetTexts(target).map((str) => str.replace(/\s+/, " ")),
-            ["Birth DateTime\n07/15/1983 00:00:00"],
+            getFacetTexts(target).map((str) => str.replace(/\s+/g, " ")),
+            ["Birth DateTime 07/15/1983 00:00:00"],
             "The format of the datetime in the facet should be in locale"
         );
 
@@ -279,7 +277,7 @@ QUnit.module("Search", (hooks) => {
         await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: [],
             searchViewId: false,
             searchViewArch: `
@@ -324,7 +322,7 @@ QUnit.module("Search", (hooks) => {
         const controlPanel = await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: [],
             searchViewId: false,
         });
@@ -352,19 +350,20 @@ QUnit.module("Search", (hooks) => {
         assert.expect(8);
 
         let updateCount = 0;
-        patchWithCleanup(ControlPanel.prototype, {
+        class TestComponent extends Component {
             setup() {
-                this._super();
                 onWillUpdateProps(() => {
                     updateCount++;
                 });
-            },
-        });
+            }
+        }
+        TestComponent.template = xml`<SearchBar/>`;
+        TestComponent.components = { SearchBar };
 
         const controlPanel = await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: TestComponent,
             searchMenuTypes: [],
             searchViewId: false,
         });
@@ -378,8 +377,8 @@ QUnit.module("Search", (hooks) => {
         await triggerEvent(searchInput, null, "keydown", { key: "Enter" });
 
         assert.deepEqual(
-            getFacetTexts(target).map((str) => str.replace(/\s+/, "")),
-            ["BarFirst record"]
+            getFacetTexts(target).map((str) => str.replace(/\s+/g, " ")),
+            ["Bar First record"]
         );
 
         assert.strictEqual(updateCount, 1);
@@ -396,8 +395,8 @@ QUnit.module("Search", (hooks) => {
         await triggerEvent(searchInput, null, "keydown", { key: "Enter" });
 
         assert.deepEqual(
-            getFacetTexts(target).map((str) => str.replace(/\s+/, "")),
-            ["BarFirst recordorSecond record"]
+            getFacetTexts(target).map((str) => str.replace(/\s+/g, " ")),
+            ["Bar First record or Second record"]
         );
 
         assert.strictEqual(updateCount, 2);
@@ -410,19 +409,20 @@ QUnit.module("Search", (hooks) => {
         assert.expect(2);
 
         let updateCount = 0;
-        patchWithCleanup(ControlPanel.prototype, {
+        class TestComponent extends Component {
             setup() {
-                this._super();
                 onWillUpdateProps(() => {
                     updateCount++;
                 });
-            },
-        });
+            }
+        }
+        TestComponent.template = xml`<SearchBar/>`;
+        TestComponent.components = { SearchBar };
 
         await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: TestComponent,
             searchMenuTypes: [],
             searchViewId: false,
         });
@@ -440,7 +440,7 @@ QUnit.module("Search", (hooks) => {
         await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: [],
             searchViewId: false,
             searchViewArch: `
@@ -487,7 +487,7 @@ QUnit.module("Search", (hooks) => {
             await makeWithSearch({
                 serverData,
                 resModel: "partner",
-                Component: ControlPanel,
+                Component: SearchBar,
                 searchMenuTypes: [],
                 searchViewId: false,
             });
@@ -588,7 +588,7 @@ QUnit.module("Search", (hooks) => {
         await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: [],
             searchViewId: false,
         });
@@ -610,7 +610,7 @@ QUnit.module("Search", (hooks) => {
         const controlPanel = await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: [],
             searchViewId: false,
             searchViewArch: `
@@ -647,7 +647,7 @@ QUnit.module("Search", (hooks) => {
         const controlPanel = await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: [],
             searchViewId: false,
         });
@@ -672,7 +672,7 @@ QUnit.module("Search", (hooks) => {
         const controlPanel = await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: [],
             searchViewId: false,
             searchViewArch: `
@@ -719,7 +719,7 @@ QUnit.module("Search", (hooks) => {
         const controlPanel = await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: [],
             searchViewId: false,
             searchViewArch: `
@@ -759,7 +759,7 @@ QUnit.module("Search", (hooks) => {
         const controlPanel = await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: [],
             searchViewId: false,
             searchViewArch: `
@@ -801,7 +801,7 @@ QUnit.module("Search", (hooks) => {
                 serverData,
                 mockRPC,
                 resModel: "partner",
-                Component: ControlPanel,
+                Component: SearchBar,
                 searchMenuTypes: [],
                 searchViewId: false,
                 searchViewArch: `
@@ -840,7 +840,7 @@ QUnit.module("Search", (hooks) => {
                 serverData,
                 mockRPC,
                 resModel: "partner",
-                Component: ControlPanel,
+                Component: SearchBar,
                 searchMenuTypes: [],
                 searchViewId: false,
                 searchViewArch: `
@@ -867,7 +867,7 @@ QUnit.module("Search", (hooks) => {
         await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: [],
             searchViewId: false,
             searchViewArch: `
@@ -895,7 +895,7 @@ QUnit.module("Search", (hooks) => {
         await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: [],
             searchViewId: false,
             searchViewArch: `
@@ -926,7 +926,7 @@ QUnit.module("Search", (hooks) => {
         const controlPanel = await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: [],
             searchViewId: false,
             searchViewArch: /*xml*/ `
@@ -989,7 +989,7 @@ QUnit.module("Search", (hooks) => {
             serverData,
             mockRPC,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: [],
             searchViewId: false,
         });
@@ -1029,18 +1029,18 @@ QUnit.module("Search", (hooks) => {
             serverData,
             mockRPC,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: [],
             searchViewId: false,
             context: { search_default_company: 1 },
         });
 
         await nextTick();
-        assert.containsNone(target, ".o_control_panel");
+        assert.containsNone(target, ".o_cp_searchview");
 
         def.resolve();
         await nextTick();
-        assert.containsOnce(target, ".o_control_panel");
+        assert.containsOnce(target, ".o_cp_searchview");
         assert.strictEqual(getFacetTexts(target)[0].replace("\n", ""), "CompanyFirst record");
     });
 
@@ -1050,7 +1050,7 @@ QUnit.module("Search", (hooks) => {
         await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: [],
             searchViewId: false,
             searchViewArch: `
@@ -1147,7 +1147,7 @@ QUnit.module("Search", (hooks) => {
         const controlPanel = await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: [],
             searchViewId: false,
             searchViewArch: `
@@ -1211,7 +1211,7 @@ QUnit.module("Search", (hooks) => {
         ]);
 
         // expand the selection properties
-        await click(target.querySelector(".o_control_panel"));
+        await click(target.querySelector(".o_cp_searchview"));
         await editSearch(target, "a");
         await click(target.querySelector(".o_expand"));
         items = target.querySelectorAll(".o_searchview_input_container li");
@@ -1233,7 +1233,7 @@ QUnit.module("Search", (hooks) => {
         assert.deepEqual(getDomain(controlPanel), expectedDomain);
 
         // select the selection option "A"
-        await click(target.querySelector(".o_control_panel"));
+        await click(target.querySelector(".o_cp_searchview"));
         await editSearch(target, "a");
         await click(target.querySelector(".o_expand"));
         await click(target.querySelector(".o_searchview_input_container li:nth-child(4)"));
@@ -1257,7 +1257,7 @@ QUnit.module("Search", (hooks) => {
         await click(target.querySelector(".o_facet_remove"));
 
         // search a many2one value
-        await click(target.querySelector(".o_control_panel"));
+        await click(target.querySelector(".o_cp_searchview"));
         await editSearch(target, "Ali");
         await click(target.querySelector(".o_expand"));
         await click(target.querySelector("li:nth-child(2) .o_expand"));
@@ -1270,7 +1270,7 @@ QUnit.module("Search", (hooks) => {
         assert.deepEqual(getDomain(controlPanel), expectedDomain);
 
         // search a tag value
-        await click(target.querySelector(".o_control_panel"));
+        await click(target.querySelector(".o_cp_searchview"));
         await editSearch(target, "A");
         await click(target.querySelector(".o_expand"));
         items = target.querySelectorAll(".o_searchview_input_container li");
@@ -1290,7 +1290,7 @@ QUnit.module("Search", (hooks) => {
         ];
         assert.deepEqual(getDomain(controlPanel), expectedDomain);
         // add the tag "B"
-        await click(target.querySelector(".o_control_panel"));
+        await click(target.querySelector(".o_cp_searchview"));
         await editSearch(target, "B");
         await click(target.querySelector(".o_expand"));
         items = target.querySelectorAll(".o_searchview_input_container li");
@@ -1402,7 +1402,7 @@ QUnit.module("Search", (hooks) => {
         await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: [],
             searchViewId: false,
             searchViewArch: `
@@ -1414,7 +1414,7 @@ QUnit.module("Search", (hooks) => {
             context: { active_id: 2 },
         });
 
-        await click(target.querySelector(".o_control_panel"));
+        await click(target.querySelector(".o_cp_searchview"));
         await editSearch(target, "a");
         await click(target.querySelector(".o_expand"));
 
@@ -1427,7 +1427,7 @@ QUnit.module("Search", (hooks) => {
         await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: ["groupBy"], // we need it to have facet (see facets getter in search_model)
             searchViewId: false,
             searchViewArch: `
@@ -1490,7 +1490,7 @@ QUnit.module("Search", (hooks) => {
             const controlPanel = await makeWithSearch({
                 serverData,
                 resModel: "partner",
-                Component: ControlPanel,
+                Component: SearchBar,
                 searchViewId: false,
                 searchViewArch: `
                 <search>
@@ -1527,7 +1527,7 @@ QUnit.module("Search", (hooks) => {
         await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: ["groupBy"], // we need it to have facet (see facets getter in search_model)
             searchViewId: false,
             searchViewArch: `
@@ -1543,7 +1543,7 @@ QUnit.module("Search", (hooks) => {
             ".o_searchview_facet.o_facet_with_domain .o_searchview_facet_label"
         );
 
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Company");
 
         assert.deepEqual(getFacetTexts(target), ["My favorite", "Company"]);
@@ -1562,7 +1562,7 @@ QUnit.module("Search", (hooks) => {
 
         await click(target.querySelector(".modal footer button"));
         assert.containsNone(target, ".modal");
-        assert.deepEqual(getFacetTexts(target), ["Bool>Company", 'Foo contains "abc"']);
+        assert.deepEqual(getFacetTexts(target), ["Bool\n>\nCompany", 'Foo contains "abc"']);
     });
 
     QUnit.test("edit a date filter with comparison active", async function (assert) {
@@ -1570,7 +1570,7 @@ QUnit.module("Search", (hooks) => {
         await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchMenuTypes: ["filter", "comparison"],
             searchViewId: false,
             searchViewArch: `
@@ -1588,8 +1588,8 @@ QUnit.module("Search", (hooks) => {
             ".o_searchview_facet.o_facet_with_domain .o_searchview_facet_label"
         );
 
-        await toggleComparisonMenu(target);
-        await toggleMenuItem(target);
+        await toggleSearchBarMenu(target);
+        await toggleMenuItem(target, "Birthday: Previous Period");
 
         assert.deepEqual(getFacetTexts(target), [
             "Birthday: April 2023",
@@ -1628,7 +1628,7 @@ QUnit.module("Search", (hooks) => {
         await makeWithSearch({
             serverData,
             resModel: "partner",
-            Component: ControlPanel,
+            Component: SearchBar,
             searchViewId: false,
             searchViewArch: `
                 <search>
@@ -1650,7 +1650,7 @@ QUnit.module("Search", (hooks) => {
         await triggerEvent(searchInput, null, "keydown", { key: "ArrowDown" });
         await triggerEvent(searchInput, null, "keydown", { key: "Enter" }); // select
 
-        assert.deepEqual(getFacetTexts(target), ["Foo\nabcordef"]);
+        assert.deepEqual(getFacetTexts(target), ["Foo\nabc\nor\ndef"]);
 
         await click(target, ".o_facet_with_domain .o_searchview_facet_label");
         assert.containsN(target, ".o_domain_leaf", 2);
diff --git a/addons/web/static/tests/search/search_panel_tests.js b/addons/web/static/tests/search/search_panel_tests.js
index 54141b76cf6..7c1db54408b 100644
--- a/addons/web/static/tests/search/search_panel_tests.js
+++ b/addons/web/static/tests/search/search_panel_tests.js
@@ -12,13 +12,12 @@ import {
     makeWithSearch,
     setupControlPanelServiceRegistry,
     switchView,
-    toggleFilterMenu,
+    toggleSearchBarMenu,
     toggleMenuItem,
 } from "@web/../tests/search/helpers";
-import { createWebClient, doAction } from "@web/../tests/webclient/helpers";
+import { createWebClient, doAction }  from "@web/../tests/webclient/helpers";
 import { registry } from "@web/core/registry";
-import { FilterMenu } from "@web/search/filter_menu/filter_menu";
-import { GroupByMenu } from "@web/search/group_by_menu/group_by_menu";
+import { SearchBarMenu } from "@web/search/search_bar_menu/search_bar_menu";
 import { SearchPanel } from "@web/search/search_panel/search_panel";
 
 import { Component, xml } from "@odoo/owl";
@@ -122,12 +121,11 @@ function makeTestComponent({ onWillStart, onWillUpdateProps } = {}) {
         }
     }
 
-    TestComponent.components = { FilterMenu, GroupByMenu, SearchPanel };
+    TestComponent.components = { SearchBarMenu, SearchPanel };
     TestComponent.template = xml`
         <div class="o_test_component">
             <SearchPanel t-if="env.searchModel.display.searchPanel" />
-            <FilterMenu />
-            <GroupByMenu />
+            <SearchBarMenu />
         </div>`;
 
     return { TestComponent, getDomain: () => domain };
@@ -960,7 +958,7 @@ QUnit.module("Search", (hooks) => {
         );
         assert.containsN(target, ".o_search_panel_category_value", 5);
 
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "True Domain");
 
         assert.hasClass(
@@ -1083,7 +1081,7 @@ QUnit.module("Search", (hooks) => {
         // Case 2: search domain changed so we wait for the search panel once again
         promise = makeDeferred();
 
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, 0);
 
         assert.verifySteps([]);
@@ -1285,7 +1283,7 @@ QUnit.module("Search", (hooks) => {
         // trigger a reload and delay the get_filter
         promise = makeDeferred();
 
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, 0);
 
         assert.deepEqual(getDomain(), []);
@@ -1434,7 +1432,7 @@ QUnit.module("Search", (hooks) => {
             assert.verifySteps(["search_panel_select_range", "search_panel_select_multi_range"]);
 
             // reload with another domain, so the filters should be reloaded
-            await toggleFilterMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, 0);
 
             assert.verifySteps(["search_panel_select_multi_range"]);
@@ -1476,7 +1474,7 @@ QUnit.module("Search", (hooks) => {
             assert.verifySteps(["search_panel_select_range", "search_panel_select_multi_range"]);
 
             // reload with another domain, so the filters should be reloaded
-            await toggleFilterMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, 0);
 
             assert.verifySteps(["search_panel_select_multi_range"]);
@@ -1533,7 +1531,7 @@ QUnit.module("Search", (hooks) => {
         ]);
 
         // reload with another domain, so the categories 'state' and 'company_id' should be reloaded
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, 0);
 
         assert.verifySteps(["search_panel_select_range", "state"]);
@@ -1593,7 +1591,7 @@ QUnit.module("Search", (hooks) => {
         assert.deepEqual(getCategoriesContent(target), ["All", "ABC", "DEF", "GHI"]);
 
         // reload with another domain, so the category 'state' should be reloaded
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, 0);
 
         assert.verifySteps([]);
@@ -3322,7 +3320,7 @@ QUnit.module("Search", (hooks) => {
             assert.verifySteps(["search_panel_select_range"]);
 
             // select DEF in filter menu
-            await toggleFilterMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "DEF");
 
             assert.verifySteps(["search_panel_select_range"]);
@@ -3373,7 +3371,7 @@ QUnit.module("Search", (hooks) => {
             assert.deepEqual(getCategoriesContent(target), ["All", "ABC", "DEF", "GHI"]);
 
             // select DEF in filter menu --> the external domain changes --> the values should be updated
-            await toggleFilterMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "DEF");
 
             assert.verifySteps(["search_panel_select_range"]);
diff --git a/addons/web/static/tests/search/with_search_tests.js b/addons/web/static/tests/search/with_search_tests.js
index 4fcd056c181..a261a94e35c 100644
--- a/addons/web/static/tests/search/with_search_tests.js
+++ b/addons/web/static/tests/search/with_search_tests.js
@@ -2,16 +2,14 @@
 
 import { makeTestEnv } from "@web/../tests/helpers/mock_env";
 import { getFixture, nextTick } from "@web/../tests/helpers/utils";
-import { FilterMenu } from "@web/search/filter_menu/filter_menu";
-import { GroupByMenu } from "@web/search/group_by_menu/group_by_menu";
+import { SearchBarMenu } from "@web/search/search_bar_menu/search_bar_menu";
 import { WithSearch } from "@web/search/with_search/with_search";
 import { mount } from "../helpers/utils";
 import {
     getMenuItemTexts,
     makeWithSearch,
     setupControlPanelServiceRegistry,
-    toggleFilterMenu,
-    toggleGroupByMenu,
+    toggleSearchBarMenu,
     toggleMenuItem,
 } from "./helpers";
 
@@ -235,11 +233,10 @@ QUnit.module("Search", (hooks) => {
             assert.expect(3);
 
             class TestComponent extends Component {}
-            TestComponent.components = { FilterMenu, GroupByMenu };
+            TestComponent.components = { SearchBarMenu };
             TestComponent.template = xml`
                 <div class="o_test_component">
-                    <FilterMenu/>
-                    <GroupByMenu/>
+                    <SearchBarMenu/>
                 </div>
             `;
 
@@ -254,10 +251,10 @@ QUnit.module("Search", (hooks) => {
                 Component: TestComponent,
                 searchViewId: 1,
             });
-            await toggleFilterMenu(target);
+            await toggleSearchBarMenu(target);
             await assert.ok(getMenuItemTexts(target), ["True Domain"]);
 
-            await toggleGroupByMenu(target);
+            await toggleSearchBarMenu(target);
             await assert.ok(getMenuItemTexts(target), ["Name"]);
         }
     );
@@ -277,10 +274,10 @@ QUnit.module("Search", (hooks) => {
                     });
                 }
             }
-            TestComponent.components = { FilterMenu };
+            TestComponent.components = { SearchBarMenu };
             TestComponent.template = xml`
                 <div class="o_test_component">
-                    <FilterMenu/>
+                    <SearchBarMenu/>
                 </div>
             `;
 
@@ -290,7 +287,7 @@ QUnit.module("Search", (hooks) => {
                 Component: TestComponent,
                 searchViewId: 1,
             });
-            await toggleFilterMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "True domain");
         }
     );
diff --git a/addons/web/static/tests/views/calendar/calendar_view_tests.js b/addons/web/static/tests/views/calendar/calendar_view_tests.js
index d31e92734e0..7def96755ad 100644
--- a/addons/web/static/tests/views/calendar/calendar_view_tests.js
+++ b/addons/web/static/tests/views/calendar/calendar_view_tests.js
@@ -777,50 +777,8 @@ QUnit.module("Views", ({ beforeEach }) => {
         }
     );
 
-    QUnit.test(`breadcrumbs are updated with the displayed period`, async (assert) => {
-        await makeView({
-            type: "calendar",
-            resModel: "event",
-            serverData,
-            arch: `
-                <calendar date_start="start" date_stop="stop" all_day="allday" />
-            `,
-        });
-
-        // displays week mode by default
-        assert.strictEqual(
-            target.querySelector(".o_control_panel .breadcrumb-item.active").textContent,
-            "undefined (Dec 11 – 17, 2016)",
-            "should display the current week"
-        );
-
-        // switch to day mode
-        await changeScale(target, "day");
-        assert.strictEqual(
-            target.querySelector(".o_control_panel .breadcrumb-item.active").textContent,
-            "undefined (December 12, 2016)",
-            "should display the current day"
-        );
-
-        // switch to month mode
-        await changeScale(target, "month");
-        assert.strictEqual(
-            target.querySelector(".o_control_panel .breadcrumb-item.active").textContent,
-            "undefined (December 2016)",
-            "should display the current month"
-        );
-
-        // switch to year mode
-        await changeScale(target, "year");
-        assert.strictEqual(
-            target.querySelector(".o_control_panel .breadcrumb-item.active").textContent,
-            "undefined (2016)",
-            "should display the current year"
-        );
-    });
-
     QUnit.test(`create and change events`, async (assert) => {
-        assert.expect(28);
+        assert.expect(30);
 
         await makeView({
             type: "calendar",
@@ -999,9 +957,26 @@ QUnit.module("Views", ({ beforeEach }) => {
         assert.containsN(target, ".fc-event-container .fc-event", 10, "should display 10 events");
         // move to next month
         await navigate(target, "next");
+        assert.containsN(
+            target,
+            ".fc-event-container .fc-event",
+            10,
+            "should still display 10 events"
+        );
+        await pickDate(target, "2017-01-01");
+        assert.containsN(
+            target,
+            ".o_calendar_sidebar tr:has(.ui-state-active) td",
+            7,
+            "week scale should highlight 7 days in mini calendar"
+        );
+
+        await changeScale(target, "month");
         assert.containsNone(target, ".fc-event-container .fc-event", "should display 0 events");
 
         await navigate(target, "prev");
+        await pickDate(target, "2016-12-27");
+        await changeScale(target, "month");
         await selectDateRange(target, "2016-12-20", "2016-12-21");
         await editInput(target, ".o-calendar-quick-create--input", "test");
         await click(target, ".o-calendar-quick-create--create-btn");
@@ -3403,7 +3378,8 @@ QUnit.module("Views", ({ beforeEach }) => {
         // select filter for partner 1, 2 and 4
         await toggleSectionFilter(target, "partner_ids");
         await toggleFilter(target, "partner_id", 4);
-        await navigate(target, "prev");
+        await pickDate(target, "2016-12-05");
+        await changeScale(target, "week");
         assert.containsN(target, ".o_calendar_filter_item", 6, "should display 6 filter items");
         assert.containsN(target, ".fc-event", 2, "should display 2 events");
         const events = target.querySelectorAll(".fc-event .o_event_title");
@@ -3999,7 +3975,7 @@ QUnit.module("Views", ({ beforeEach }) => {
     });
 
     QUnit.test(`initial_date given in the context`, async (assert) => {
-        assert.expect(1);
+        assert.expect(2);
         serverData.views = {
             "event,1,calendar": `<calendar date_start="start" date_stop="stop" mode="day"/>`,
             "event,false,search": `<search />`,
@@ -4018,8 +3994,13 @@ QUnit.module("Views", ({ beforeEach }) => {
         await doAction(webClient, 1);
         await nextTick();
         assert.strictEqual(
-            target.querySelector(".o_control_panel .breadcrumb-item").textContent,
-            "context initial date (January 30, 2016)",
+            target.querySelector(".o_control_panel .o_breadcrumb").textContent,
+            "context initial date",
+            "should display name passed in the context"
+        );
+        assert.strictEqual(
+            target.querySelector(".o_calendar_renderer .fc-day-header").textContent,
+            "January 30, 2016",
             "should display day passed in the context"
         );
     });
diff --git a/addons/web/static/tests/views/calendar/helpers.js b/addons/web/static/tests/views/calendar/helpers.js
index c98f923216d..5a90c19be60 100644
--- a/addons/web/static/tests/views/calendar/helpers.js
+++ b/addons/web/static/tests/views/calendar/helpers.js
@@ -508,7 +508,7 @@ export async function changeScale(target, scale) {
 }
 
 export async function navigate(target, direction) {
-    await click(target, `.o_calendar_navigation_buttons .o_calendar_button_${direction}`);
+    await click(target, `.o_calendar_mini .ui-datepicker-${direction}`);
 }
 
 export function findFilterPanelSection(target, sectionName) {
diff --git a/addons/web/static/tests/views/fields/binary_field_tests.js b/addons/web/static/tests/views/fields/binary_field_tests.js
index a96c0db6898..25b7758b244 100644
--- a/addons/web/static/tests/views/fields/binary_field_tests.js
+++ b/addons/web/static/tests/views/fields/binary_field_tests.js
@@ -376,7 +376,10 @@ QUnit.module("Fields", (hooks) => {
                 resId: 1,
             });
 
-            await click(target, ".o_form_button_create");
+            await click(
+                target,
+                ".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_form_button_create"
+            );
             await click(target, ".o_field_many2one[name='product_id'] input");
             await click(
                 target.querySelector(".o_field_many2one[name='product_id'] .dropdown-item")
@@ -474,7 +477,7 @@ QUnit.module("Fields", (hooks) => {
         );
     });
 
-    QUnit.test('isUploading state should be set to false after upload', async function(assert) {
+    QUnit.test("isUploading state should be set to false after upload", async function (assert) {
         assert.expect(1);
         serverData.models.partner.onchanges = {
             document: function (obj) {
@@ -498,7 +501,7 @@ QUnit.module("Fields", (hooks) => {
         await editInput(target, ".o_field_binary .o_input_file", file);
         assert.equal(
             target.querySelector(".o_select_file_button").innerText,
-            "UPLOAD YOUR FILE",
+            "Upload your file",
             "displayed value should be upload your file"
         );
     });
diff --git a/addons/web/static/tests/views/fields/color_picker_field_tests.js b/addons/web/static/tests/views/fields/color_picker_field_tests.js
index f5050684848..1e1e7d8f5c8 100644
--- a/addons/web/static/tests/views/fields/color_picker_field_tests.js
+++ b/addons/web/static/tests/views/fields/color_picker_field_tests.js
@@ -224,7 +224,11 @@ QUnit.module("Fields", (hooks) => {
                  </tree>`,
             domain: [["id", "<", 0]],
         });
-        await click(target.querySelector(".o_list_button_add"));
+        await click(
+            target.querySelector(
+                ".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_add"
+            )
+        );
         const date_column_width = target
             .querySelector('.o_list_table thead th[data-name="date_field"]')
             .style.width.replace("px", "");
diff --git a/addons/web/static/tests/views/fields/float_field_tests.js b/addons/web/static/tests/views/fields/float_field_tests.js
index 200681b7010..cbf559d60ac 100644
--- a/addons/web/static/tests/views/fields/float_field_tests.js
+++ b/addons/web/static/tests/views/fields/float_field_tests.js
@@ -268,7 +268,11 @@ QUnit.module("Fields", (hooks) => {
         );
 
         await editInput(target, 'div[name="float_field"] input', "18.8958938598598");
-        await click(target.querySelector(".o_list_button_save"));
+        await click(
+            target.querySelector(
+                ".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_save"
+            )
+        );
         assert.strictEqual(
             target.querySelector(".o_field_widget").textContent,
             "18.896",
diff --git a/addons/web/static/tests/views/fields/image_field_tests.js b/addons/web/static/tests/views/fields/image_field_tests.js
index 2af8034ba52..6c0cb35981a 100644
--- a/addons/web/static/tests/views/fields/image_field_tests.js
+++ b/addons/web/static/tests/views/fields/image_field_tests.js
@@ -652,7 +652,7 @@ QUnit.module("Fields", (hooks) => {
         );
 
         await clickSave(target);
-        await click(target, ".o_form_button_create");
+        await click(target, ".o_control_panel_main_buttons .d-none .o_form_button_create");
         assert.strictEqual(
             target.querySelector("img[data-alt='Binary file']").dataset.src,
             "/web/static/img/placeholder.png",
diff --git a/addons/web/static/tests/views/fields/integer_field_tests.js b/addons/web/static/tests/views/fields/integer_field_tests.js
index 7b8ef00acb4..c5e773381e7 100644
--- a/addons/web/static/tests/views/fields/integer_field_tests.js
+++ b/addons/web/static/tests/views/fields/integer_field_tests.js
@@ -262,7 +262,11 @@ QUnit.module("Fields", (hooks) => {
             "The value should be displayed properly in the input."
         );
 
-        await click(target.querySelector(".o_list_button_save"));
+        await click(
+            target.querySelector(
+                ".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_save"
+            )
+        );
         assert.strictEqual(
             target.querySelector("td:not(.o_list_record_selector)").textContent,
             "-28",
diff --git a/addons/web/static/tests/views/fields/label_selection_field_tests.js b/addons/web/static/tests/views/fields/label_selection_field_tests.js
index 8b686dd979a..ce61379377a 100644
--- a/addons/web/static/tests/views/fields/label_selection_field_tests.js
+++ b/addons/web/static/tests/views/fields/label_selection_field_tests.js
@@ -181,7 +181,11 @@ QUnit.module("Fields", (hooks) => {
         );
 
         // save and check the result
-        await click(target.querySelector(".o_list_button_save"));
+        await click(
+            target.querySelector(
+                ".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_save"
+            )
+        );
         assert.strictEqual(
             target.querySelectorAll(".o_field_widget .badge:not(:empty)").length,
             3,
diff --git a/addons/web/static/tests/views/fields/many2many_tags_avatar_field_tests.js b/addons/web/static/tests/views/fields/many2many_tags_avatar_field_tests.js
index 385633a300c..0e2d2813439 100644
--- a/addons/web/static/tests/views/fields/many2many_tags_avatar_field_tests.js
+++ b/addons/web/static/tests/views/fields/many2many_tags_avatar_field_tests.js
@@ -59,13 +59,13 @@ QUnit.module("Fields", (hooks) => {
 
         assert.containsN(
             target,
-            ".o_field_many2many_tags_avatar.o_field_widget .badge",
+            ".o_field_many2many_tags_avatar.o_field_widget .o_avatar img",
             2,
             "should have 2 records"
         );
         assert.strictEqual(
-            target.querySelector(".o_field_many2many_tags_avatar.o_field_widget .badge img").dataset
-                .src,
+            target.querySelector(".o_field_many2many_tags_avatar.o_field_widget .o_avatar img")
+                .dataset.src,
             "/web/image/partner/2/avatar_128",
             "should have correct avatar image"
         );
@@ -116,13 +116,13 @@ QUnit.module("Fields", (hooks) => {
         );
         assert.containsN(
             target,
-            ".o_data_row:nth-child(2) .o_field_many2many_tags_avatar .o_tag:not(.o_m2m_avatar_empty)",
+            ".o_data_row:nth-child(2) .o_field_many2many_tags_avatar .o_avatar:not(.o_m2m_avatar_empty) img",
             4,
             "should have 4 records"
         );
         assert.containsN(
             target,
-            ".o_data_row:nth-child(3) .o_field_many2many_tags_avatar .o_tag:not(.o_m2m_avatar_empty)",
+            ".o_data_row:nth-child(3) .o_field_many2many_tags_avatar .o_avatar:not(.o_m2m_avatar_empty) img",
             5,
             "should have 5 records"
         );
@@ -149,21 +149,21 @@ QUnit.module("Fields", (hooks) => {
         );
         assert.strictEqual(
             target.querySelector(
-                ".o_data_row:nth-child(2) .o_field_many2many_tags_avatar .o_tag:nth-child(2) img.o_m2m_avatar"
+                ".o_data_row:nth-child(2) .o_field_many2many_tags_avatar .o_avatar:nth-child(2) img.o_m2m_avatar"
             ).dataset.src,
             "/web/image/partner/2/avatar_128",
             "should have correct avatar image"
         );
         assert.strictEqual(
             target.querySelector(
-                ".o_data_row:nth-child(2) .o_field_many2many_tags_avatar .o_tag:nth-child(3) img.o_m2m_avatar"
+                ".o_data_row:nth-child(2) .o_field_many2many_tags_avatar .o_avatar:nth-child(3) img.o_m2m_avatar"
             ).dataset.src,
             "/web/image/partner/4/avatar_128",
             "should have correct avatar image"
         );
         assert.strictEqual(
             target.querySelector(
-                ".o_data_row:nth-child(2) .o_field_many2many_tags_avatar .o_tag:nth-child(4) img.o_m2m_avatar"
+                ".o_data_row:nth-child(2) .o_field_many2many_tags_avatar .o_avatar:nth-child(4) img.o_m2m_avatar"
             ).dataset.src,
             "/web/image/partner/5/avatar_128",
             "should have correct avatar image"
@@ -175,7 +175,7 @@ QUnit.module("Fields", (hooks) => {
         );
         assert.containsN(
             target,
-            ".o_data_row:nth-child(4) .o_field_many2many_tags_avatar .o_tag:not(.o_m2m_avatar_empty)",
+            ".o_data_row:nth-child(4) .o_field_many2many_tags_avatar .o_avatar:not(.o_m2m_avatar_empty) img",
             4,
             "should have 4 records"
         );
@@ -213,16 +213,20 @@ QUnit.module("Fields", (hooks) => {
         await click(target.querySelector(".o_data_row .o_many2many_tags_avatar_cell"));
         assert.containsN(
             target,
-            ".o_data_row.o_selected_row .o_many2many_tags_avatar_cell .badge",
+            ".o_data_row.o_selected_row .o_many2many_tags_avatar_cell .o_avatar img",
             1,
             "should have 1 many2many badges in edit mode"
         );
 
         await selectDropdownItem(target, "partner_ids", "second record");
-        await click(target.querySelector(".o_list_button_save"));
+        await click(
+            target.querySelector(
+                ".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_save"
+            )
+        );
         assert.containsN(
             target,
-            ".o_data_row:first-child .o_field_many2many_tags_avatar .o_tag",
+            ".o_data_row:first-child .o_field_many2many_tags_avatar .o_avatar img",
             2,
             "should have 2 records"
         );
@@ -333,13 +337,13 @@ QUnit.module("Fields", (hooks) => {
 
         assert.containsN(
             target,
-            ".o_kanban_record:nth-child(2) .o_field_many2many_tags_avatar .o_tag",
+            ".o_kanban_record:nth-child(2) .o_field_many2many_tags_avatar .o_avatar img",
             2,
             "should have 2 records"
         );
         assert.containsN(
             target,
-            ".o_kanban_record:nth-child(3) .o_field_many2many_tags_avatar .o_tag",
+            ".o_kanban_record:nth-child(3) .o_field_many2many_tags_avatar .o_avatar img",
             2,
             "should have 2 records"
         );
@@ -374,7 +378,7 @@ QUnit.module("Fields", (hooks) => {
 
         assert.containsN(
             target,
-            ".o_kanban_record:nth-child(4) .o_field_many2many_tags_avatar .o_tag",
+            ".o_kanban_record:nth-child(4) .o_field_many2many_tags_avatar .o_avatar img",
             2,
             "should have 2 records"
         );
@@ -455,24 +459,24 @@ QUnit.module("Fields", (hooks) => {
 
         assert.containsN(
             target,
-            ".o_field_many2many_tags_avatar.o_field_widget .badge",
+            ".o_field_many2many_tags_avatar.o_field_widget .o_tag",
             2,
             "should have 2 records"
         );
 
         await click(
-            target.querySelector(".o_field_many2many_tags_avatar.o_field_widget .badge .o_delete")
+            target.querySelector(".o_field_many2many_tags_avatar.o_field_widget .o_tag .o_delete")
         );
         assert.containsOnce(
             target,
-            ".o_field_many2many_tags_avatar.o_field_widget .badge",
+            ".o_field_many2many_tags_avatar.o_field_widget .o_tag",
             "should have 1 record"
         );
 
         await clickSave(target);
         assert.containsOnce(
             target,
-            ".o_field_many2many_tags_avatar.o_field_widget .badge",
+            ".o_field_many2many_tags_avatar.o_field_widget .o_tag",
             "should have 1 record"
         );
     });
diff --git a/addons/web/static/tests/views/fields/many2one_field_tests.js b/addons/web/static/tests/views/fields/many2one_field_tests.js
index 06ce97ab756..f5a7366e6d8 100644
--- a/addons/web/static/tests/views/fields/many2one_field_tests.js
+++ b/addons/web/static/tests/views/fields/many2one_field_tests.js
@@ -26,8 +26,7 @@ import {
 import {
     editSearch,
     getFacetTexts,
-    toggleFilterMenu,
-    toggleGroupByMenu,
+    toggleSearchBarMenu,
     toggleMenuItem,
     validateSearch,
 } from "@web/../tests/search/helpers";
@@ -626,7 +625,7 @@ QUnit.module("Fields", (hooks) => {
 
         const modal = target.querySelector(".modal");
 
-        await toggleFilterMenu(modal);
+        await toggleSearchBarMenu(modal);
         await toggleMenuItem(modal, "Filter");
 
         assert.strictEqual($("tr.o_data_row").length, 0, "should display 0 records");
@@ -1767,7 +1766,10 @@ QUnit.module("Fields", (hooks) => {
 
         assert.containsN(target, ".o_data_row", 3);
 
-        await click(target, ".o_list_button_add");
+        await click(
+            target,
+            ".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_add"
+        );
 
         assert.containsN(target, ".o_data_row", 4);
 
@@ -3980,32 +3982,14 @@ QUnit.module("Fields", (hooks) => {
         await click(target, `.o_field_widget[name="trululu"] .o_m2o_dropdown_option_search_more`);
 
         // dropdown selector
-        const filterMenuCss = ".o_search_options > .o_filter_menu";
-        const groupByMenuCss = ".o_search_options > .o_group_by_menu";
+        const searchDropdown = ".o_control_panel_actions .o-dropdown";
 
-        await click(document.querySelector(`${filterMenuCss} > .dropdown-toggle`));
+        await click(document.querySelector(`${searchDropdown} .dropdown-toggle`));
 
-        assert.hasClass(document.querySelector(filterMenuCss), "show");
+        assert.hasClass(document.querySelector(searchDropdown), "show");
         assert.isVisible(
-            document.querySelector(`${filterMenuCss} > .dropdown-menu`),
-            "the filter dropdown menu should be visible"
-        );
-        assert.doesNotHaveClass(document.querySelector(groupByMenuCss), "show");
-        assert.isNotVisible(
-            document.querySelector(`${groupByMenuCss} > .dropdown-menu`),
-            "the Group by dropdown menu should be not visible"
-        );
-
-        await click(document.querySelector(`${groupByMenuCss} > .dropdown-toggle`));
-        assert.hasClass(document.querySelector(groupByMenuCss), "show");
-        assert.isVisible(
-            document.querySelector(`${groupByMenuCss} > .dropdown-menu`),
-            "the group by dropdown menu should be visible"
-        );
-        assert.doesNotHaveClass(document.querySelector(filterMenuCss), "show");
-        assert.isNotVisible(
-            document.querySelector(`${filterMenuCss} > .dropdown-menu`),
-            "the filter dropdown menu should be not visible"
+            document.querySelector(`${searchDropdown} > .dropdown-menu`),
+            "the search bar dropdown menu should be visible"
         );
     });
 
@@ -4198,7 +4182,7 @@ QUnit.module("Fields", (hooks) => {
 
         await selectDropdownItem(target, "trululu", "Search More...");
         const modal = target.querySelector(".modal");
-        await toggleGroupByMenu(modal);
+        await toggleSearchBarMenu(modal);
         await toggleMenuItem(modal, "Bar");
 
         await click(modal.querySelectorAll(".o_group_header")[1]);
@@ -4371,20 +4355,23 @@ QUnit.module("Fields", (hooks) => {
         const target = getFixture();
         await doAction(webClient, 1);
         assert.containsOnce(target, "a.o_form_uri", "should display 1 m2o link in form");
-        assert.containsN(
+        assert.containsOnce(
             target,
-            ".breadcrumb-item",
-            1,
+            ".o_breadcrumb",
             "Should only contain one breadcrumb at the start"
         );
 
         await click(target.querySelector("a.o_form_uri"));
         assert.verifySteps(["get_formview_action"]);
-        assert.containsN(
+        assert.containsOnce(
             target,
             ".breadcrumb-item",
-            2,
-            "Should contain 2 breadcrumbs after the clicking on the link"
+            "Should contain 1 breadcrumb link after the clicking on the link"
+        );
+        assert.containsOnce(
+            target,
+            ".o_breadcrumb",
+            "Should also contain the active breadcrumb item"
         );
     });
 
@@ -4436,11 +4423,11 @@ QUnit.module("Fields", (hooks) => {
         await doAction(webClient, 1);
 
         await selectDropdownItem(target, "trululu", "first record");
-        assert.containsOnce(target, ".o_field_widget .o_external_button.fa-arrow-right");
+        assert.containsOnce(target, ".o_field_widget .o_external_button.oi-arrow-right");
         await click(target, ".o_field_widget .o_external_button");
 
         assert.verifySteps(["get_formview_action"]);
-        assert.strictEqual(target.querySelector(".breadcrumb").textContent, "first recordNew");
+        assert.strictEqual(target.querySelector(".breadcrumb").textContent, "first record");
     });
 
     QUnit.test("external_button opens a FormViewDialog in dialogs", async function (assert) {
@@ -4459,7 +4446,7 @@ QUnit.module("Fields", (hooks) => {
         assert.containsOnce(target, ".modal");
 
         await selectDropdownItem(target, "trululu", "first record");
-        assert.containsOnce(target, ".o_field_widget .o_external_button.fa-external-link");
+        assert.containsOnce(target, ".o_field_widget .o_external_button.oi-launch");
         await click(target, ".o_field_widget .o_external_button");
 
         assert.verifySteps(["get_formview_id"]);
@@ -4482,7 +4469,7 @@ QUnit.module("Fields", (hooks) => {
         assert.containsOnce(target, ".modal");
 
         await selectDropdownItem(target, "trululu", "first record");
-        assert.containsOnce(target, ".o_field_widget .o_external_button.fa-external-link");
+        assert.containsOnce(target, ".o_field_widget .o_external_button.oi-launch");
         await click(target, ".o_field_widget .o_external_button");
 
         assert.verifySteps(["get_formview_id"]);
@@ -4511,7 +4498,7 @@ QUnit.module("Fields", (hooks) => {
 
         await editInput(target, ".o_field_widget[name=foo] input", "some value");
         await selectDropdownItem(target, "trululu", "first record");
-        assert.containsOnce(target, ".o_field_widget .o_external_button.fa-external-link");
+        assert.containsOnce(target, ".o_field_widget .o_external_button.oi-launch");
         await click(target, ".o_field_widget .o_external_button");
         assert.containsN(target, ".modal", 2);
 
diff --git a/addons/web/static/tests/views/fields/monetary_field_tests.js b/addons/web/static/tests/views/fields/monetary_field_tests.js
index 32a0d12fe81..6a3532ea0f7 100644
--- a/addons/web/static/tests/views/fields/monetary_field_tests.js
+++ b/addons/web/static/tests/views/fields/monetary_field_tests.js
@@ -771,7 +771,11 @@ QUnit.module("Fields", (hooks) => {
                 </tree>`,
         });
 
-        await click(target.querySelector(".o_list_button_add"));
+        await click(
+            target.querySelector(
+                ".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_add"
+            )
+        );
         assert.containsOnce(
             target,
             ".o_selected_row .o_field_widget[name=float_field] input",
diff --git a/addons/web/static/tests/views/fields/percent_pie_field_tests.js b/addons/web/static/tests/views/fields/percent_pie_field_tests.js
index 1a8aa489573..2870084390c 100644
--- a/addons/web/static/tests/views/fields/percent_pie_field_tests.js
+++ b/addons/web/static/tests/views/fields/percent_pie_field_tests.js
@@ -63,72 +63,15 @@ QUnit.module("Fields", (hooks) => {
             "should have a pie chart"
         );
         assert.strictEqual(
-            target.querySelector(".o_field_percent_pie.o_field_widget .o_pie .o_pie_value")
+            target.querySelector(".o_field_percent_pie.o_field_widget .o_pie_info .o_pie_value")
                 .textContent,
             "10%",
             "should have 10% as pie value since int_field=10"
         );
         assert.strictEqual(
-            target.querySelector(".o_field_percent_pie.o_field_widget .o_pie .o_mask").style
-                .transform,
-            "rotate(180deg)",
-            "left mask should be covering the whole left side of the pie"
-        );
-        assert.strictEqual(
-            target.querySelectorAll(".o_field_percent_pie.o_field_widget .o_pie .o_mask")[1].style
-                .transform,
-            "rotate(36deg)",
-            "right mask should be rotated from 360*(10/100) = 36 degrees"
-        );
-
-        assert.containsOnce(
-            target,
-            ".o_field_percent_pie.o_field_widget .o_pie",
-            "should have a pie chart"
-        );
-        assert.strictEqual(
-            target.querySelector(".o_field_percent_pie.o_field_widget .o_pie .o_pie_value")
-                .textContent,
-            "10%",
-            "should have 10% as pie value since int_field=10"
-        );
-        assert.ok(
-            String(
-                target.querySelector(".o_field_percent_pie.o_field_widget .o_pie .o_mask").style
-                    .transform
-            ).includes("rotate(180deg)"),
-            "left mask should be covering the whole left side of the pie"
-        );
-        assert.ok(
-            String(
-                target.querySelectorAll(".o_field_percent_pie.o_field_widget .o_pie .o_mask")[1]
-                    .style.transform
-            ).includes("rotate(36deg)"),
-            "right mask should be rotated from 360*(10/100) = 36 degrees"
-        );
-
-        assert.containsOnce(
-            target,
-            ".o_field_percent_pie.o_field_widget .o_pie",
-            "should have a pie chart"
-        );
-        assert.strictEqual(
-            target.querySelector(".o_field_percent_pie.o_field_widget .o_pie .o_pie_value")
-                .textContent,
-            "10%",
-            "should have 10% as pie value since int_field=10"
-        );
-        assert.strictEqual(
-            target.querySelector(".o_field_percent_pie.o_field_widget .o_pie .o_mask").style
-                .transform,
-            "rotate(180deg)",
-            "left mask should be covering the whole left side of the pie"
-        );
-        assert.strictEqual(
-            target.querySelectorAll(".o_field_percent_pie.o_field_widget .o_pie .o_mask")[1].style
-                .transform,
-            "rotate(36deg)",
-            "right mask should be rotated from 360*(10/100) = 36 degrees"
+            target.querySelector(".o_field_percent_pie.o_field_widget .o_pie").style.background,
+            "conic-gradient( var(--PercentPieField-color-active) 0% 10%, var(--PercentPieField-color-static) 0% 100% )",
+            "pie should have a background computed for its value of 10%"
         );
     });
 
@@ -154,117 +97,15 @@ QUnit.module("Fields", (hooks) => {
             "should have a pie chart"
         );
         assert.strictEqual(
-            target.querySelector(".o_field_percent_pie.o_field_widget .o_pie .o_pie_value")
-                .textContent,
-            "80%",
-            "should have 80% as pie value since int_field=80"
-        );
-        assert.ok(
-            String(
-                target.querySelector(".o_field_percent_pie.o_field_widget .o_pie .o_mask").style
-                    .transform
-            ).includes("rotate(288deg)"),
-            "left mask should be rotated from 360*(80/100) = 288 degrees"
-        );
-        assert.hasClass(
-            target.querySelectorAll(".o_field_percent_pie.o_field_widget .o_pie .o_mask")[1],
-            "o_full",
-            "right mask should be hidden since the value > 50%"
-        );
-
-        assert.containsOnce(
-            target,
-            ".o_field_percent_pie.o_field_widget .o_pie",
-            "should have a pie chart"
-        );
-        assert.strictEqual(
-            target.querySelector(".o_field_percent_pie.o_field_widget .o_pie .o_pie_value")
+            target.querySelector(".o_field_percent_pie.o_field_widget .o_pie_info .o_pie_value")
                 .textContent,
             "80%",
             "should have 80% as pie value since int_field=80"
         );
         assert.strictEqual(
-            target.querySelector(".o_field_percent_pie.o_field_widget .o_pie .o_mask").style
-                .transform,
-            "rotate(288deg)",
-            "left mask should be rotated from 360*(80/100) = 288 degrees"
-        );
-        assert.hasClass(
-            target.querySelectorAll(".o_field_percent_pie.o_field_widget .o_pie .o_mask")[1],
-            "o_full",
-            "right mask should be hidden since the value > 50%"
-        );
-
-        assert.containsOnce(
-            target,
-            ".o_field_percent_pie.o_field_widget .o_pie",
-            "should have a pie chart"
-        );
-        assert.strictEqual(
-            target.querySelector(".o_field_percent_pie.o_field_widget .o_pie .o_pie_value")
-                .textContent,
-            "80%",
-            "should have 80% as pie value since int_field=80"
-        );
-        assert.strictEqual(
-            target.querySelector(".o_field_percent_pie.o_field_widget .o_pie .o_mask").style
-                .transform,
-            "rotate(288deg)",
-            "left mask should be rotated from 360*(80/100) = 288 degrees"
-        );
-        assert.hasClass(
-            target.querySelectorAll(".o_field_percent_pie.o_field_widget .o_pie .o_mask")[1],
-            "o_full",
-            "right mask should be hidden since the value > 50%"
+            target.querySelector(".o_field_percent_pie.o_field_widget .o_pie").style.background,
+            "conic-gradient( var(--PercentPieField-color-active) 0% 80%, var(--PercentPieField-color-static) 0% 100% )",
+            "pie should have a background computed for its value of 80%"
         );
     });
-
-    // TODO: This test would pass without any issue since all the classes and
-    //       custom style attributes are correctly set on the widget in list
-    //       view, but since the scss itself for this widget currently only
-    //       applies inside the form view, the widget is unusable. This test can
-    //       be uncommented when we refactor the scss files so that this widget
-    //       stylesheet applies in both form and list view.
-    // QUnit.test('percentpie widget in editable list view', async function(assert) {
-    //     assert.expect(10);
-    //
-    //     var list = await createView({
-    //         View: ListView,
-    //         model: 'partner',
-    //         data: this.data,
-    //         arch: '<tree editable="bottom">' +
-    //                 '<field name="foo"/>' +
-    //                 '<field name="int_field" widget="percentpie"/>' +
-    //               '</tree>',
-    //     });
-    //
-    //     assert.containsN(list, '.o_field_percent_pie .o_pie', 5,
-    //         "should have five pie charts");
-    //     assert.strictEqual(target.querySelector('.o_field_percent_pie:first .o_pie .o_pie_value').textContent,
-    //         '10%', "should have 10% as pie value since int_field=10");
-    //     assert.strictEqual(target.querySelector('.o_field_percent_pie:first .o_pie .o_mask').attr('style'),
-    //         'rotate(180deg)', "left mask should be covering the whole left side of the pie");
-    //     assert.strictEqual(target.querySelector('.o_field_percent_pie:first .o_pie .o_mask').last().attr('style'),
-    //         'rotate(36deg)', "right mask should be rotated from 360*(10/100) = 36 degrees");
-    //
-    //     // switch to edit mode and check the result
-    //    testUtils.dom.click(     target.querySelector('tbody td:not(.o_list_record_selector)'));
-    //     assert.strictEqual(target.querySelector('.o_field_percent_pie:first .o_pie .o_pie_value').textContent,
-    //         '10%', "should have 10% as pie value since int_field=10");
-    //     assert.strictEqual(target.querySelector('.o_field_percent_pie:first .o_pie .o_mask').attr('style'),
-    //         'rotate(180deg)', "left mask should be covering the whole right side of the pie");
-    //     assert.strictEqual(target.querySelector('.o_field_percent_pie:first .o_pie .o_mask').last().attr('style'),
-    //         'rotate(36deg)', "right mask should be rotated from 360*(10/100) = 36 degrees");
-    //
-    //     // save
-    //    testUtils.dom.click(     list.$buttons.find('.o_list_button_save'));
-    //     assert.strictEqual(target.querySelector('.o_field_percent_pie:first .o_pie .o_pie_value').textContent,
-    //         '10%', "should have 10% as pie value since int_field=10");
-    //     assert.strictEqual(target.querySelector('.o_field_percent_pie:first .o_pie .o_mask').attr('style'),
-    //         'rotate(180deg)', "left mask should be covering the whole right side of the pie");
-    //     assert.strictEqual(target.querySelector('.o_field_percent_pie:first .o_pie .o_mask').last().attr('style'),
-    //         'rotate(36deg)', "right mask should be rotated from 360*(10/100) = 36 degrees");
-    //
-    //     list.destroy();
-    // });
 });
diff --git a/addons/web/static/tests/views/fields/phone_field_tests.js b/addons/web/static/tests/views/fields/phone_field_tests.js
index b791c2b7b28..f91d3f5bc9b 100644
--- a/addons/web/static/tests/views/fields/phone_field_tests.js
+++ b/addons/web/static/tests/views/fields/phone_field_tests.js
@@ -140,7 +140,11 @@ QUnit.module("Fields", (hooks) => {
         await editInput(cell, "input", "new");
 
         // save
-        await click(target.querySelector(".o_list_button_save"));
+        await click(
+            target.querySelector(
+                ".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_save"
+            )
+        );
         cell = target.querySelector("tbody td:not(.o_list_record_selector)");
         assert.doesNotHaveClass(
             cell.parentElement,
diff --git a/addons/web/static/tests/views/fields/priority_field_tests.js b/addons/web/static/tests/views/fields/priority_field_tests.js
index 07634f61447..0f8f9ddc9a5 100644
--- a/addons/web/static/tests/views/fields/priority_field_tests.js
+++ b/addons/web/static/tests/views/fields/priority_field_tests.js
@@ -343,7 +343,10 @@ QUnit.module("Fields", (hooks) => {
         assert.verifySteps(['write [[1],{"selection":"1"}]']);
         assert.containsOnce(target, ".o_kanban_record .fa-star");
 
-        await click(target, ".o-kanban-button-new");
+        await click(
+            target,
+            ".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o-kanban-button-new"
+        );
         await click(target, ".o_kanban_quick_create .o_kanban_add");
         await click(target.querySelector(".o_priority a.o_priority_star.fa-star-o"), null, true);
         assert.verifySteps(['write [[6],{"selection":"1"}]']);
@@ -404,7 +407,10 @@ QUnit.module("Fields", (hooks) => {
         );
 
         // save
-        await click(target, ".o_list_button_save");
+        await click(
+            target,
+            ".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_save"
+        );
 
         assert.containsN(
             target.querySelectorAll(".o_data_row")[0],
@@ -514,7 +520,10 @@ QUnit.module("Fields", (hooks) => {
         );
 
         // save
-        await click(target, ".o_list_button_save");
+        await click(
+            target,
+            ".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_save"
+        );
         rows = target.querySelectorAll(".o_data_row");
 
         assert.containsN(
diff --git a/addons/web/static/tests/views/fields/progress_bar_field_tests.js b/addons/web/static/tests/views/fields/progress_bar_field_tests.js
index 3ac95b6777a..ad5ca75c211 100644
--- a/addons/web/static/tests/views/fields/progress_bar_field_tests.js
+++ b/addons/web/static/tests/views/fields/progress_bar_field_tests.js
@@ -1,9 +1,6 @@
 /** @odoo-module **/
 
-import {
-    makeFakeLocalizationService,
-    makeFakeNotificationService,
-} from "@web/../tests/helpers/mock_services";
+import { makeFakeLocalizationService } from "@web/../tests/helpers/mock_services";
 import {
     click,
     clickSave,
@@ -507,13 +504,6 @@ QUnit.module("Fields", (hooks) => {
         "ProgressBarField: write gibbrish instead of int throws warning",
         async function (assert) {
             serverData.models.partner.records[0].int_field = 99;
-            const mock = () => {
-                assert.step("Show error message");
-                return () => {};
-            };
-            registry.category("services").add("notification", makeFakeNotificationService(mock), {
-                force: true,
-            });
 
             await makeView({
                 serverData,
@@ -535,7 +525,11 @@ QUnit.module("Fields", (hooks) => {
             await editInput(target, ".o_progressbar_value .o_input", "trente sept virgule neuf");
             await clickSave(target);
             assert.containsOnce(target, ".o_form_dirty", "The form has not been saved");
-            assert.verifySteps(["Show error message"], "The error message was shown correctly");
+            assert.strictEqual(
+                target.querySelector(".o_form_button_save").disabled,
+                true,
+                "save button is disabled"
+            );
         }
     );
 
@@ -555,7 +549,8 @@ QUnit.module("Fields", (hooks) => {
             });
 
             assert.containsOnce(
-                target, ".o_progressbar .bg-warning",
+                target,
+                ".o_progressbar .bg-warning",
                 "As the value has excedded the max value, the color should be set to bg-warning"
             );
         }
diff --git a/addons/web/static/tests/views/fields/properties_field_tests.js b/addons/web/static/tests/views/fields/properties_field_tests.js
index 7397b992230..c303d23c28c 100644
--- a/addons/web/static/tests/views/fields/properties_field_tests.js
+++ b/addons/web/static/tests/views/fields/properties_field_tests.js
@@ -685,7 +685,7 @@ QUnit.module("Fields", (hooks) => {
         assert.ok(popover, "Should have opened the definition popover");
 
         // Move the property up
-        await click(popover, ".fa-chevron-up");
+        await click(popover, ".oi-chevron-up");
         assert.deepEqual(
             getLabels(),
             ["My Selection", "My Char", "My Char 3", "My Char 4"],
@@ -697,16 +697,16 @@ QUnit.module("Fields", (hooks) => {
         assert.ok(movedProperty, "Should highlight the moved property");
 
         // Move the property up again, should have no effect
-        await click(popover, ".fa-chevron-up");
+        await click(popover, ".oi-chevron-up");
         assert.deepEqual(getLabels(), ["My Selection", "My Char", "My Char 3", "My Char 4"]);
 
         // Move the property down
-        await click(popover, ".fa-chevron-down");
+        await click(popover, ".oi-chevron-down");
         assert.deepEqual(getLabels(), ["My Char", "My Selection", "My Char 3", "My Char 4"]);
 
         // Move the property at the bottom
-        await click(popover, ".fa-chevron-down");
-        await click(popover, ".fa-chevron-down");
+        await click(popover, ".oi-chevron-down");
+        await click(popover, ".oi-chevron-down");
         assert.deepEqual(getLabels(), ["My Char", "My Char 3", "My Char 4", "My Selection"]);
 
         await closePopover(target);
diff --git a/addons/web/static/tests/views/fields/reference_field_tests.js b/addons/web/static/tests/views/fields/reference_field_tests.js
index 8e2a43433dd..52ddceca89f 100644
--- a/addons/web/static/tests/views/fields/reference_field_tests.js
+++ b/addons/web/static/tests/views/fields/reference_field_tests.js
@@ -865,7 +865,7 @@ QUnit.module("Fields", (hooks) => {
             mockRPC: (route, { method, args }) => {
                 if (method === "onchange") {
                     return {
-                        value: {reference: "partner,2"},
+                        value: { reference: "partner,2" },
                     };
                 } else if (method === "create") {
                     assert.strictEqual(args.length, 1);
@@ -874,10 +874,16 @@ QUnit.module("Fields", (hooks) => {
             },
         });
 
-        await click(target, '.o_list_button_add');
+        await click(
+            target,
+            ".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_add"
+        );
         await click(target, '.o_list_char[name="display_name"] input');
         await editInput(target, '.o_list_char[name="display_name"] input', "Blabla");
-        await click(target, '.o_list_button_save');
+        await click(
+            target,
+            ".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_save"
+        );
     });
 
     QUnit.test(
diff --git a/addons/web/static/tests/views/fields/state_selection_field_tests.js b/addons/web/static/tests/views/fields/state_selection_field_tests.js
index b23a023e160..57f55573b58 100644
--- a/addons/web/static/tests/views/fields/state_selection_field_tests.js
+++ b/addons/web/static/tests/views/fields/state_selection_field_tests.js
@@ -82,14 +82,18 @@ QUnit.module("Fields", (hooks) => {
             ".o_field_widget.o_field_state_selection span.o_status.o_status_green",
             "should not have one green status since selection is the second, blocked state"
         );
-        assert.containsNone(target, ".dropdown-menu", "there should not be a dropdown");
+        assert.containsNone(target, ".o_content .dropdown-menu", "there should not be a dropdown");
 
         // Click on the status button to make the dropdown appear
         await click(target, ".o_field_widget.o_field_state_selection .o_status");
-        assert.containsOnce(document.body, ".dropdown-menu", "there should be a dropdown");
+        assert.containsOnce(
+            document.body,
+            ".o_content .dropdown-menu",
+            "there should be a dropdown"
+        );
         assert.containsN(
             target,
-            ".dropdown-menu .dropdown-item",
+            ".o_content .dropdown-menu .dropdown-item",
             3,
             "there should be three options in the dropdown"
         );
@@ -100,8 +104,12 @@ QUnit.module("Fields", (hooks) => {
         );
 
         // Click on the first option, "Normal"
-        await click(target.querySelector(".dropdown-menu .dropdown-item"));
-        assert.containsNone(target, ".dropdown-menu", "there should not be a dropdown anymore");
+        await click(target.querySelector(".o_content .dropdown-menu .dropdown-item"));
+        assert.containsNone(
+            target,
+            ".o_content .dropdown-menu",
+            "there should not be a dropdown anymore"
+        );
         assert.containsNone(
             target,
             ".o_field_widget.o_field_state_selection span.o_status.o_status_red",
@@ -118,7 +126,11 @@ QUnit.module("Fields", (hooks) => {
             "should have one grey status since selection is the first, normal state"
         );
 
-        assert.containsNone(target, ".dropdown-menu", "there should still not be a dropdown");
+        assert.containsNone(
+            target,
+            ".o_content .dropdown-menu",
+            "there should still not be a dropdown"
+        );
         assert.containsNone(
             target,
             ".o_field_widget.o_field_state_selection span.o_status.o_status_red",
@@ -137,7 +149,7 @@ QUnit.module("Fields", (hooks) => {
 
         // Click on the status button to make the dropdown appear
         await click(target, ".o_field_widget.o_field_state_selection .o_status");
-        assert.containsOnce(target, ".dropdown-menu", "there should be a dropdown");
+        assert.containsOnce(target, ".o_content .dropdown-menu", "there should be a dropdown");
         assert.containsN(
             target,
             ".dropdown-menu .dropdown-item",
@@ -146,8 +158,12 @@ QUnit.module("Fields", (hooks) => {
         );
 
         // Click on the last option, "Done"
-        await click(target, ".dropdown-menu .dropdown-item:last-child");
-        assert.containsNone(target, ".dropdown-menu", "there should not be a dropdown anymore");
+        await click(target, ".o_content .dropdown-menu .dropdown-item:last-child");
+        assert.containsNone(
+            target,
+            ".o_content .dropdown-menu",
+            "there should not be a dropdown anymore"
+        );
         assert.containsNone(
             target,
             ".o_field_widget.o_field_state_selection span.o_status.o_status_red",
@@ -163,7 +179,7 @@ QUnit.module("Fields", (hooks) => {
         await click(target.querySelector(".o_form_button_save"));
         assert.containsNone(
             target,
-            ".dropdown-menu",
+            ".o_content .dropdown-menu",
             "there should still not be a dropdown anymore"
         );
         assert.containsNone(
@@ -281,7 +297,7 @@ QUnit.module("Fields", (hooks) => {
             ".o_state_selection_cell .o_field_state_selection span.o_status.o_status_green",
             "should have one green status"
         );
-        assert.containsNone(target, ".dropdown-menu", "there should not be a dropdown");
+        assert.containsNone(target, ".o_content .dropdown-menu", "there should not be a dropdown");
 
         // Click on the status button to make the dropdown appear
         let cell = target.querySelector("tbody td.o_state_selection_cell");
@@ -293,16 +309,16 @@ QUnit.module("Fields", (hooks) => {
             "o_selected_row",
             "should not be in edit mode since we clicked on the state selection widget"
         );
-        assert.containsOnce(target, ".dropdown-menu", "there should be a dropdown");
+        assert.containsOnce(target, ".o_content .dropdown-menu", "there should be a dropdown");
         assert.containsN(
             target,
-            ".dropdown-menu .dropdown-item",
+            ".o_content .dropdown-menu .dropdown-item",
             3,
             "there should be three options in the dropdown"
         );
 
         // Click on the first option, "Normal"
-        await click(target.querySelector(".dropdown-menu .dropdown-item"));
+        await click(target.querySelector(".o_content .dropdown-menu .dropdown-item"));
         assert.containsN(
             target,
             ".o_state_selection_cell .o_field_state_selection span.o_status",
@@ -319,7 +335,7 @@ QUnit.module("Fields", (hooks) => {
             ".o_state_selection_cell .o_field_state_selection span.o_status.o_status_green",
             "should still have one green status"
         );
-        assert.containsNone(target, ".dropdown-menu", "there should not be a dropdown");
+        assert.containsNone(target, ".o_content .dropdown-menu", "there should not be a dropdown");
         assert.containsNone(target, "tr.o_selected_row", "should not be in edit mode");
 
         // switch to edit mode and check the result
@@ -342,16 +358,16 @@ QUnit.module("Fields", (hooks) => {
             ".o_state_selection_cell .o_field_state_selection span.o_status.o_status_green",
             "should still have one green status"
         );
-        assert.containsNone(target, ".dropdown-menu", "there should not be a dropdown");
+        assert.containsNone(target, ".o_content .dropdown-menu", "there should not be a dropdown");
 
         // Click on the status button to make the dropdown appear
         await click(
             target.querySelector(".o_state_selection_cell .o_field_state_selection span.o_status")
         );
-        assert.containsOnce(target, ".dropdown-menu", "there should be a dropdown");
+        assert.containsOnce(target, ".o_content .dropdown-menu", "there should be a dropdown");
         assert.containsN(
             target,
-            ".dropdown-menu .dropdown-item",
+            ".o_content .dropdown-menu .dropdown-item",
             3,
             "there should be three options in the dropdown"
         );
@@ -359,7 +375,11 @@ QUnit.module("Fields", (hooks) => {
         // Click on another row
         const lastCell = target.querySelectorAll("tbody td.o_state_selection_cell")[4];
         await click(lastCell);
-        assert.containsNone(target, ".dropdown-menu", "there should not be a dropdown anymore");
+        assert.containsNone(
+            target,
+            ".o_content .dropdown-menu",
+            "there should not be a dropdown anymore"
+        );
         const firstCell = target.querySelector("tbody td.o_state_selection_cell");
         assert.doesNotHaveClass(
             firstCell.parentElement,
@@ -378,17 +398,21 @@ QUnit.module("Fields", (hooks) => {
                 ".o_state_selection_cell .o_field_state_selection span.o_status"
             )[3]
         );
-        assert.containsOnce(target, ".dropdown-menu", "there should be a dropdown");
+        assert.containsOnce(target, ".o_content .dropdown-menu", "there should be a dropdown");
         assert.containsN(
             target,
-            ".dropdown-menu .dropdown-item",
+            ".o_content .dropdown-menu .dropdown-item",
             3,
             "there should be three options in the dropdown"
         );
 
         // Click on the last option, "Done"
-        await click(target, ".dropdown-menu .dropdown-item:last-child");
-        assert.containsNone(target, ".dropdown-menu", "there should not be a dropdown anymore");
+        await click(target, ".o_content .dropdown-menu .dropdown-item:last-child");
+        assert.containsNone(
+            target,
+            ".o_content .dropdown-menu",
+            "there should not be a dropdown anymore"
+        );
         assert.containsN(
             target,
             ".o_state_selection_cell .o_field_state_selection span.o_status",
@@ -406,10 +430,14 @@ QUnit.module("Fields", (hooks) => {
             2,
             "should now have two green status"
         );
-        assert.containsNone(target, ".dropdown-menu", "there should not be a dropdown");
+        assert.containsNone(target, ".o_content .dropdown-menu", "there should not be a dropdown");
 
         // save
-        await click(target.querySelector(".o_list_button_save"));
+        await click(
+            target.querySelector(
+                ".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_save"
+            )
+        );
         assert.containsN(
             target,
             ".o_state_selection_cell .o_field_state_selection span.o_status",
@@ -427,7 +455,7 @@ QUnit.module("Fields", (hooks) => {
             2,
             "should have two green status"
         );
-        assert.containsNone(target, ".dropdown-menu", "there should not be a dropdown");
+        assert.containsNone(target, ".o_content .dropdown-menu", "there should not be a dropdown");
     });
 
     QUnit.test(
diff --git a/addons/web/static/tests/views/fields/text_field_tests.js b/addons/web/static/tests/views/fields/text_field_tests.js
index c91d7f5df53..f014422f85d 100644
--- a/addons/web/static/tests/views/fields/text_field_tests.js
+++ b/addons/web/static/tests/views/fields/text_field_tests.js
@@ -584,7 +584,11 @@ QUnit.module("Fields", (hooks) => {
             arch: '<tree editable="top"><field name="foo"/></tree>',
         });
 
-        await click(target.querySelector(".o_list_button_add"));
+        await click(
+            target.querySelector(
+                ".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_add"
+            )
+        );
 
         assert.strictEqual(
             target.querySelector("textarea"),
diff --git a/addons/web/static/tests/views/fields/url_field_tests.js b/addons/web/static/tests/views/fields/url_field_tests.js
index 2dfb84a1a9f..293cf7e4221 100644
--- a/addons/web/static/tests/views/fields/url_field_tests.js
+++ b/addons/web/static/tests/views/fields/url_field_tests.js
@@ -226,7 +226,11 @@ QUnit.module("Fields", (hooks) => {
         await editInput(cell, "input", "brolo");
 
         // save
-        await click(target.querySelector(".o_list_button_save"));
+        await click(
+            target.querySelector(
+                ".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_list_button_save"
+            )
+        );
         cell = target.querySelector("tbody td:not(.o_list_record_selector)");
         assert.doesNotHaveClass(
             cell.parentElement,
diff --git a/addons/web/static/tests/views/form/form_compiler_tests.js b/addons/web/static/tests/views/form/form_compiler_tests.js
index e9039af3bf8..0cccade14d0 100644
--- a/addons/web/static/tests/views/form/form_compiler_tests.js
+++ b/addons/web/static/tests/views/form/form_compiler_tests.js
@@ -184,7 +184,7 @@ QUnit.module("Form Compiler", (hooks) => {
         const expected = /*xml*/ `
             <t>
             <div class="o_form_renderer o_form_nosheet" t-att-class="__comp__.props.class" t-attf-class="{{__comp__.props.record.isInEdition ? 'o_form_editable' : 'o_form_readonly'}} d-block {{ __comp__.props.record.isDirty ? 'o_form_dirty' : !__comp__.props.record.isNew ? 'o_form_saved' : '' }}" t-ref="compiled_view_root">
-                <div class="o_form_statusbar position-relative d-flex justify-content-between border-bottom"><StatusBarButtons/></div>
+                <div class="o_form_statusbar position-relative d-flex justify-content-between mb-2 px-3 pb-2 pb-md-0 px-md-0"><StatusBarButtons/></div>
                 <div>someDiv</div>
             </div>
             </t>`;
@@ -207,9 +207,9 @@ QUnit.module("Form Compiler", (hooks) => {
             <t>
             <div class="o_form_renderer" t-att-class="__comp__.props.class" t-attf-class="{{__comp__.props.record.isInEdition ? 'o_form_editable' : 'o_form_readonly'}} d-flex {{ __comp__.uiService.size &lt; 6 ? &quot;flex-column&quot; : &quot;flex-nowrap h-100&quot; }} {{ __comp__.props.record.isDirty ? 'o_form_dirty' : !__comp__.props.record.isNew ? 'o_form_saved' : '' }}" t-ref="compiled_view_root">
                 <div class="o_form_sheet_bg">
-                    <div class="o_form_statusbar position-relative d-flex justify-content-between border-bottom"><StatusBarButtons/></div>
+                    <div class="o_form_statusbar position-relative d-flex justify-content-between mb-2 px-3 pb-2 pb-md-0 px-md-0"><StatusBarButtons/></div>
                     <div>someDiv</div>
-                    <div class="o_form_sheet position-relative clearfix">
+                    <div class="o_form_sheet position-relative">
                         <div>inside sheet</div>
                     </div>
                 </div>
@@ -267,7 +267,7 @@ QUnit.module("Form Compiler", (hooks) => {
             </form>`;
 
         const expected = /*xml*/ `
-            <div class="o_form_statusbar position-relative d-flex justify-content-between border-bottom">
+            <div class="o_form_statusbar position-relative d-flex justify-content-between mb-2 px-3 pb-2 pb-md-0 px-md-0">
                <StatusBarButtons>
                   <t t-set-slot="button_0" isVisible="true">
                      <div>someDiv</div>
@@ -285,7 +285,7 @@ QUnit.module("Form Compiler", (hooks) => {
             </form>`;
 
         const expected = /*xml*/ `
-            <div class="o_form_statusbar position-relative d-flex justify-content-between border-bottom">
+            <div class="o_form_statusbar position-relative d-flex justify-content-between mb-2 px-3 pb-2 pb-md-0 px-md-0">
                <StatusBarButtons/>
             </div>`;
 
diff --git a/addons/web/static/tests/views/form/form_view_tests.js b/addons/web/static/tests/views/form/form_view_tests.js
index 0225a7dd021..9e22f72c90b 100644
--- a/addons/web/static/tests/views/form/form_view_tests.js
+++ b/addons/web/static/tests/views/form/form_view_tests.js
@@ -21,7 +21,11 @@ import {
     triggerEvent,
     triggerHotkey,
 } from "@web/../tests/helpers/utils";
-import { toggleActionMenu, toggleGroupByMenu, toggleMenuItem } from "@web/../tests/search/helpers";
+import {
+    toggleActionMenu,
+    toggleSearchBarMenu,
+    toggleMenuItem,
+} from "@web/../tests/search/helpers";
 import { makeView, makeViewInDialog, setupViewRegistries } from "@web/../tests/views/helpers";
 import { createWebClient, doAction } from "@web/../tests/webclient/helpers";
 import { browser } from "@web/core/browser/browser";
@@ -46,6 +50,11 @@ const widgetRegistry = registry.category("view_widgets");
 let target;
 let serverData;
 
+// Record
+async function createRecord() {
+    await click(target, ".o_control_panel_main_buttons .d-none button.o_form_button_create");
+}
+
 QUnit.module("Views", (hooks) => {
     hooks.beforeEach(() => {
         target = getFixture();
@@ -384,15 +393,15 @@ QUnit.module("Views", (hooks) => {
             type: "form",
             resModel: "partner",
             serverData,
-            arch: `<form><sheet><div name="button_box"><button id="btn1">MyButton</button><button id="btn2">MyButton2</button><button id="btn3">MyButton3</button></div></sheet></form>`,
+            arch: `<form><sheet><div name="button_box"><button id="btn1">MyButton</button><button id="btn2">MyButton2</button><button id="btn3">MyButton3</button><button id="btn4">MyButton4</button></div></sheet></form>`,
             resId: 2,
         });
 
-        assert.containsN(target, ".o-form-buttonbox > button", 2);
+        assert.containsN(target, ".o-form-buttonbox > button", 3);
         assert.containsOnce(target, ".o-dropdown.oe_stat_button .o_button_more");
-        await click(target, ".o-dropdown.oe_stat_button .o_button_more");
 
-        assert.containsOnce(target, ".o-dropdown--menu #btn3");
+        await click(target, ".o-dropdown.oe_stat_button .o_button_more");
+        assert.containsOnce(target, ".o-dropdown--menu #btn4");
     });
 
     QUnit.test("button box rendering on big screen", async (assert) => {
@@ -1708,7 +1717,7 @@ QUnit.module("Views", (hooks) => {
         const webClient = await createWebClient({ serverData });
         await doAction(webClient, 1);
 
-        await click(target.querySelector(".o_list_button_add"));
+        await click(target, ".o_control_panel_main_buttons .d-none button.o_list_button_add");
         assert.containsOnce(target, ".o_form_view");
         // sanity check: notebook active page is first page
         assert.hasClass(target.querySelector(".o_notebook .nav-link"), "active");
@@ -1720,7 +1729,7 @@ QUnit.module("Views", (hooks) => {
         await click(target.querySelector(".o_control_panel .o_form_button_cancel"));
         assert.containsNone(target, ".o_form_view");
 
-        await click(target.querySelector(".o_list_button_add"));
+        await click(target, ".o_control_panel_main_buttons .d-none button.o_list_button_add");
         assert.containsOnce(target, ".o_form_view");
         // check notebook active page is first page again
         assert.hasClass(target.querySelector(".o_notebook .nav-link"), "active");
@@ -3187,16 +3196,10 @@ QUnit.module("Views", (hooks) => {
         assert.verifySteps(["read1", "willStart"]);
 
         await click(target.querySelector(".o_form_statusbar button.p"));
-        assert.verifySteps(["willUpdateProps", "read2", "willUpdateProps", "willUpdateProps"]);
+        assert.verifySteps(["willUpdateProps", "read2", "willUpdateProps"]);
 
         await click(target.querySelector(".o_form_statusbar button.p"));
-        assert.verifySteps([
-            "willUpdateProps",
-            "willUpdateProps",
-            "read3",
-            "willUpdateProps",
-            "willUpdateProps",
-        ]);
+        assert.verifySteps(["willUpdateProps", "read3", "willUpdateProps"]);
     });
 
     QUnit.test("buttons in form view, new record", async function (assert) {
@@ -3636,7 +3639,7 @@ QUnit.module("Views", (hooks) => {
 
         const n = serverData.models.partner.records.length;
 
-        await click(target.querySelector(".o_form_button_create"));
+        await createRecord();
         assert.containsOnce(target, ".o_form_editable");
         assert.strictEqual(
             target.querySelector(".o_field_char input").value,
@@ -3784,7 +3787,7 @@ QUnit.module("Views", (hooks) => {
 
         assert.containsOnce(target, ".o_cp_action_menus");
 
-        await click(target.querySelector(".o_form_button_create"));
+        await createRecord();
 
         assert.containsOnce(target, ".o_cp_action_menus");
 
@@ -3897,13 +3900,13 @@ QUnit.module("Views", (hooks) => {
         await doAction(webClient, 1);
 
         assert.strictEqual(
-            target.querySelector(".o_control_panel .breadcrumb").textContent,
+            target.querySelector(".o_control_panel .o_breadcrumb").textContent,
             "first record",
-            "should have the display name of the record as  title"
+            "should have the display name of the record as title"
         );
-        await click(target.querySelector(".o_form_button_create"));
+        await createRecord();
         assert.strictEqual(
-            target.querySelector(".o_control_panel .breadcrumb").textContent,
+            target.querySelector(".o_control_panel .o_breadcrumb").textContent,
             "New",
             "should have the display name of the record as title"
         );
@@ -4186,16 +4189,16 @@ QUnit.module("Views", (hooks) => {
         });
 
         assert.strictEqual(
-            target.querySelector(".o_control_panel .breadcrumb").textContent,
+            target.querySelector(".o_control_panel .o_breadcrumb").textContent,
             "first record",
-            "should have the display name of the record as  title"
+            "should have the display name of the record as title"
         );
 
         await toggleActionMenu(target);
         await toggleMenuItem(target, "Duplicate");
 
         assert.strictEqual(
-            target.querySelector(".o_control_panel .breadcrumb").textContent,
+            target.querySelector(".o_control_panel .o_breadcrumb").textContent,
             "first record (copy)",
             "should have duplicated the record"
         );
@@ -4236,9 +4239,9 @@ QUnit.module("Views", (hooks) => {
         });
 
         assert.strictEqual(
-            target.querySelector(".o_control_panel .breadcrumb").textContent,
+            target.querySelector(".o_control_panel .o_breadcrumb").textContent,
             "first record",
-            "should have the display name of the record as  title"
+            "should have the display name of the record as title"
         );
         assert.containsOnce(target, ".o_cp_action_menus");
         await toggleActionMenu(target);
@@ -4342,15 +4345,14 @@ QUnit.module("Views", (hooks) => {
         });
 
         assert.strictEqual(
-            target.querySelector(".o_control_panel .breadcrumb").textContent,
+            target.querySelector(".o_control_panel .o_breadcrumb").textContent,
             "second record",
             "should have correct display_name"
         );
         await editInput(target, ".o_field_widget[name=name] input", "some other name");
-
         await click(target.querySelector(".oe_stat_button"));
         assert.strictEqual(
-            target.querySelector(".o_control_panel .breadcrumb").textContent,
+            target.querySelector(".o_control_panel .o_breadcrumb").textContent,
             "GOLDORAK",
             "should have correct display_name"
         );
@@ -5041,20 +5043,17 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        assert.strictEqual(target.querySelector(".breadcrumb").innerText, "first record");
+        assert.strictEqual(target.querySelector(".o_breadcrumb").innerText, "first record");
         assert.hasClass(target.querySelector(".o_field_widget[name=foo]"), "o_required_modifier");
         assert.strictEqual(target.querySelector(".o_pager_value").textContent, "1");
         assert.strictEqual(target.querySelector(".o_pager_limit").textContent, "2");
 
         await editInput(target, ".o_field_widget[name=foo] input", "");
         await click(target.querySelector(".o_pager_next"));
+        assert.strictEqual(target.querySelector(".o_breadcrumb").innerText, "first record");
         assert.strictEqual(
-            target.querySelector(".breadcrumb-item > span").innerText,
-            "first record"
-        );
-        assert.strictEqual(
-            target.querySelector(".breadcrumb-item > .o_form_status_indicator").innerText.trim(),
-            "Unable to save"
+            target.querySelector(".o_form_status_indicator .text-danger").dataset.tooltip,
+            "Unable to save. Correct the issue or discard changes"
         );
         assert.strictEqual(target.querySelector(".o_pager_value").textContent, "1");
         assert.strictEqual(target.querySelector(".o_pager_limit").textContent, "2");
@@ -5077,7 +5076,7 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        assert.strictEqual(target.querySelector(".breadcrumb").innerText, "first record");
+        assert.strictEqual(target.querySelector(".o_breadcrumb").innerText, "first record");
         assert.hasClass(target.querySelector(".o_field_widget[name=foo]"), "o_required_modifier");
         assert.strictEqual(target.querySelector(".o_pager_value").textContent, "1");
         assert.strictEqual(target.querySelector(".o_pager_limit").textContent, "2");
@@ -5085,13 +5084,10 @@ QUnit.module("Views", (hooks) => {
         await editInput(target, ".o_field_widget[name=foo] input", "");
         triggerHotkey("alt+n");
         await nextTick();
+        assert.strictEqual(target.querySelector(".o_breadcrumb").innerText, "first record");
         assert.strictEqual(
-            target.querySelector(".breadcrumb-item > span").innerText,
-            "first record"
-        );
-        assert.strictEqual(
-            target.querySelector(".breadcrumb-item > .o_form_status_indicator").innerText.trim(),
-            "Unable to save"
+            target.querySelector(".o_form_status_indicator .text-danger").dataset.tooltip,
+            "Unable to save. Correct the issue or discard changes"
         );
         assert.strictEqual(target.querySelector(".o_pager_value").textContent, "1");
         assert.strictEqual(target.querySelector(".o_pager_limit").textContent, "2");
@@ -5116,17 +5112,17 @@ QUnit.module("Views", (hooks) => {
             resId: 1,
         });
 
-        assert.strictEqual(target.querySelector(".breadcrumb").innerText, "first record");
+        assert.strictEqual(target.querySelector(".o_breadcrumb").innerText, "first record");
         assert.hasClass(target.querySelector(".o_field_widget[name=foo]"), "o_required_modifier");
         assert.strictEqual(target.querySelector(".o_pager_value").textContent, "1");
         assert.strictEqual(target.querySelector(".o_pager_limit").textContent, "2");
 
         await click(target.querySelector(".o_pager_next"));
-        assert.strictEqual(target.querySelector(".breadcrumb").innerText, "second record");
+        assert.strictEqual(target.querySelector(".o_breadcrumb").innerText, "second record");
         assert.strictEqual(target.querySelector(".o_pager_value").textContent, "2");
 
         await click(target.querySelector(".o_pager_previous"));
-        assert.strictEqual(target.querySelector(".breadcrumb").innerText, "first record");
+        assert.strictEqual(target.querySelector(".o_breadcrumb").innerText, "first record");
         assert.hasClass(target.querySelector(".o_field_widget[name=foo]"), "o_required_modifier");
         assert.strictEqual(target.querySelector(".o_pager_value").textContent, "1");
     });
@@ -5480,7 +5476,7 @@ QUnit.module("Views", (hooks) => {
             await click(target, ".o_back_button");
 
             // Create a new record
-            await click(target, ".o_list_button_add");
+            await click(target, ".o_control_panel_main_buttons .d-none button.o_list_button_add");
             notebooks = target.querySelectorAll(".o_notebook");
             assert.hasClass(notebooks[0].querySelector(".nav-link"), "active");
             assert.doesNotHaveClass(notebooks[0].querySelectorAll(".nav-link")[1], "active");
@@ -5505,7 +5501,7 @@ QUnit.module("Views", (hooks) => {
         assert.strictEqual(target.querySelector(".o_pager_value").textContent, "1");
         assert.strictEqual(target.querySelector(".o_pager_limit").textContent, "2");
 
-        await click(target.querySelector(".o_form_button_create"));
+        await createRecord();
 
         assert.containsNone(target, ".o_pager");
 
@@ -5557,7 +5553,7 @@ QUnit.module("Views", (hooks) => {
         });
 
         assert.containsNone(target, ".foo_field");
-        await click(target.querySelector(".o_form_button_create"));
+        await createRecord();
         assert.containsOnce(target, ".foo_field");
     });
 
@@ -5582,7 +5578,7 @@ QUnit.module("Views", (hooks) => {
         });
 
         assert.containsOnce(target, ".o_field_empty");
-        await click(target.querySelector(".o_form_button_create"));
+        await createRecord();
         assert.containsNone(target, ".o_field_empty");
     });
 
@@ -5883,7 +5879,7 @@ QUnit.module("Views", (hooks) => {
 
         // create mode (leave edition first!)
         await clickDiscard(target);
-        await click(target.querySelector(".o_form_button_create"));
+        await createRecord();
         assert.containsOnce(
             target,
             ".oe_stat_button",
@@ -7026,7 +7022,7 @@ QUnit.module("Views", (hooks) => {
         );
     });
 
-    QUnit.test("diplay something else than a button in a buttonbox", async function (assert) {
+    QUnit.test("display something else than a button in a buttonbox", async function (assert) {
         await makeView({
             type: "form",
             resModel: "partner",
@@ -7044,18 +7040,18 @@ QUnit.module("Views", (hooks) => {
         });
 
         assert.strictEqual(
-            target.querySelector(".oe_button_box").children.length,
+            target.querySelector(".o-form-buttonbox").children.length,
             2,
             "button box should contain two children"
         );
         assert.containsOnce(
             target,
-            ".oe_button_box > .oe_stat_button",
+            ".o-form-buttonbox > .oe_stat_button",
             "button box should only contain one button"
         );
         assert.containsOnce(
             target,
-            ".oe_button_box > label",
+            ".o-form-buttonbox > label",
             "button box should only contain one label"
         );
     });
@@ -7085,12 +7081,12 @@ QUnit.module("Views", (hooks) => {
             });
 
             assert.strictEqual(
-                target.querySelector(".oe_button_box").children.length,
+                target.querySelector(".o-form-buttonbox").children.length,
                 1,
                 "button box should contain only one child"
             );
             assert.hasClass(
-                target.querySelector(".oe_button_box"),
+                target.querySelector(".o-form-buttonbox"),
                 "o_not_full",
                 "the buttonbox should not be full"
             );
@@ -7135,7 +7131,7 @@ QUnit.module("Views", (hooks) => {
         });
 
         assert.strictEqual(
-            target.querySelector(".oe_button_box").children.length,
+            target.querySelector(".o-form-buttonbox").children.length,
             2,
             "button box should contain two children"
         );
@@ -7557,7 +7553,7 @@ QUnit.module("Views", (hooks) => {
 
         function getVisibleButtonTexts() {
             return [...target.querySelectorAll(".modal-footer button:not(.d-none)")].map((x) =>
-                x.innerHTML.trim()
+                x.textContent.trim()
             );
         }
     });
@@ -7624,7 +7620,7 @@ QUnit.module("Views", (hooks) => {
         );
 
         await clickDiscard(target);
-        await click(target.querySelector(".o_form_button_create"));
+        await createRecord();
         assert.strictEqual(
             target.querySelector(".o_field_widget[name=foo] input").value,
             "",
@@ -7642,16 +7638,14 @@ QUnit.module("Views", (hooks) => {
                 <form>
                     <sheet>
                         <div class="oe_button_box" name="button_box">
-                            <button string="Inventory Moves" class="oe_stat_button" icon="fa-arrows-v"/>
+                            <button string="Inventory Moves" class="oe_stat_button" icon="oi-arrows-v"/>
                         </div>
                     </sheet>
                 </form>`,
         });
-        var $button = target.querySelector(
-            ".o_form_view .o_form_sheet .oe_button_box .oe_stat_button"
-        );
+        const button = target.querySelector(".o_form_view .o-form-buttonbox .oe_stat_button");
         assert.strictEqual(
-            $button.textContent,
+            button.textContent,
             "Inventory Moves",
             "the stat button should contain a span with the string attribute value"
         );
@@ -7916,7 +7910,6 @@ QUnit.module("Views", (hooks) => {
                 <field name="bar"/>
             </button>`);
 
-        // legacySelector = ".oe_stat_button:not(.dropdown-item, .dropdown-toggle)";
         const statButtonSelector = ".o-form-buttonbox .oe_stat_button:not(.o-dropdown)";
 
         const formView = await makeView({
@@ -7944,12 +7937,12 @@ QUnit.module("Views", (hooks) => {
             );
         };
 
-        await assertFormContainsNButtonsWithSizeClass(0, 2);
-        await assertFormContainsNButtonsWithSizeClass(1, 2);
-        await assertFormContainsNButtonsWithSizeClass(2, 2);
-        await assertFormContainsNButtonsWithSizeClass(3, 4);
-        await assertFormContainsNButtonsWithSizeClass(4, 7);
-        await assertFormContainsNButtonsWithSizeClass(5, 7);
+        await assertFormContainsNButtonsWithSizeClass(0, 3);
+        await assertFormContainsNButtonsWithSizeClass(1, 3);
+        await assertFormContainsNButtonsWithSizeClass(2, 3);
+        await assertFormContainsNButtonsWithSizeClass(3, 7);
+        await assertFormContainsNButtonsWithSizeClass(4, 3);
+        await assertFormContainsNButtonsWithSizeClass(5, 4);
         await assertFormContainsNButtonsWithSizeClass(6, 7);
     });
 
@@ -8100,10 +8093,9 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        assert.containsNone(target, ".o_cp_action_menus .dropdown-toggle:contains(Print)");
-        assert.containsOnce(target, ".o_cp_action_menus .dropdown-toggle:contains(Action)");
-
         await toggleActionMenu(target);
+        assert.containsNone(target, ".o_cp_action_menus .dropdown-menu_group:contains(Print)");
+        assert.containsOnce(target, ".o_cp_action_menus .dropdown-menu_group:contains(Action)");
         assert.containsN(
             target,
             ".o_cp_action_menus .dropdown-item",
@@ -8152,7 +8144,7 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        assert.containsOnce(target, ".o_cp_action_menus .dropdown-toggle:contains(Action)");
+        assert.containsOnce(target, ".o_cp_action_menus .dropdown-toggle");
 
         await toggleActionMenu(target);
         await toggleMenuItem(target, "Action Partner");
@@ -8203,7 +8195,7 @@ QUnit.module("Views", (hooks) => {
             "My little Foo Value"
         );
         await editInput(target, ".o_field_widget[name='foo'] input", "test");
-        assert.containsOnce(target, ".o_cp_action_menus .dropdown-toggle:contains(Action)");
+        assert.containsOnce(target, ".o_cp_action_menus .dropdown-toggle");
 
         await toggleActionMenu(target);
         await toggleMenuItem(target, "Action Partner");
@@ -8396,7 +8388,7 @@ QUnit.module("Views", (hooks) => {
             serverData,
             arch: `
                 <form>
-                    <a type="action" name="42" class="btn-primary"><i class="fa fa-arrow-right"/> Click me !</a>
+                    <a type="action" name="42" class="btn-primary"><i class="oi oi-arrow-right"/> Click me !</a>
                 </form>`,
             resId: 1,
         });
@@ -9206,11 +9198,11 @@ QUnit.module("Views", (hooks) => {
                 </form>`,
             resId: 1,
         });
-
+        // Contains invisible buttons that are only displayed under xl screens
         assert.containsN(
             target,
-            ".o_control_panel button:not(.fa):not(:disabled)",
-            3,
+            ".o_control_panel_breadcrumbs button:not(.fa):not(:disabled)",
+            5,
             "control panel buttons should be enabled"
         );
         assert.containsN(
@@ -9221,17 +9213,18 @@ QUnit.module("Views", (hooks) => {
         );
         assert.containsOnce(
             target,
-            ".oe_button_box button:not(:disabled)",
+            ".o-form-buttonbox button:not(:disabled)",
             "stat buttons should be enabled"
         );
 
         await click(target.querySelector(".o_form_statusbar button"));
+        await nextTick();
 
         // The unresolved promise lets us check the state of the buttons
         assert.containsN(
             target,
-            ".o_control_panel button:not(.fa):disabled",
-            3,
+            ".o_control_panel_breadcrumbs button:not(.fa):disabled",
+            5,
             "control panel buttons should be disabled"
         );
         assert.containsN(
@@ -9242,7 +9235,7 @@ QUnit.module("Views", (hooks) => {
         );
         assert.containsOnce(
             target,
-            ".oe_button_box button:disabled",
+            ".o-form-buttonbox button:disabled",
             "stat buttons should be disabled"
         );
 
@@ -9250,8 +9243,8 @@ QUnit.module("Views", (hooks) => {
         await nextTick();
         assert.containsN(
             target,
-            ".o_control_panel button:not(.fa):not(:disabled)",
-            3,
+            ".o_control_panel_breadcrumbs button:not(.fa):not(:disabled)",
+            5,
             "control panel buttons should be enabled"
         );
         assert.containsN(
@@ -9262,7 +9255,7 @@ QUnit.module("Views", (hooks) => {
         );
         assert.containsOnce(
             target,
-            ".oe_button_box button:not(:disabled)",
+            ".o-form-buttonbox button:not(:disabled)",
             "stat buttons should be enabled"
         );
     });
@@ -9306,8 +9299,8 @@ QUnit.module("Views", (hooks) => {
 
         assert.containsN(
             target,
-            ".o_control_panel button:not(.fa):not(:disabled)",
-            3,
+            ".o_control_panel_breadcrumbs button:not(.fa):not(:disabled)",
+            5,
             "control panel buttons should be enabled"
         );
         assert.containsN(
@@ -9318,17 +9311,17 @@ QUnit.module("Views", (hooks) => {
         );
         assert.containsOnce(
             target,
-            ".oe_button_box button:not(:disabled)",
+            ".o-form-buttonbox button:not(:disabled)",
             "stat buttons should be enabled"
         );
 
-        await click(target.querySelector(".oe_button_box button"));
+        await click(target.querySelector(".o-form-buttonbox button"));
 
         // The unresolved promise lets us check the state of the buttons
         assert.containsN(
             target,
-            ".o_control_panel button:not(.fa):disabled",
-            3,
+            ".o_control_panel_breadcrumbs button:not(.fa):disabled",
+            5,
             "control panel buttons should be disabled"
         );
         assert.containsN(
@@ -9339,16 +9332,16 @@ QUnit.module("Views", (hooks) => {
         );
         assert.containsOnce(
             target,
-            ".oe_button_box button:disabled",
+            ".o-form-buttonbox button:disabled",
             "stat buttons should be disabled"
         );
-
         def.resolve();
+
         await nextTick();
         assert.containsN(
             target,
-            ".o_control_panel button:not(.fa):not(:disabled)",
-            3,
+            ".o_control_panel_breadcrumbs button:not(.fa):not(:disabled)",
+            5,
             "control panel buttons should be enabled"
         );
         assert.containsN(
@@ -9359,7 +9352,7 @@ QUnit.module("Views", (hooks) => {
         );
         assert.containsOnce(
             target,
-            ".oe_button_box button:not(:disabled)",
+            ".o-form-buttonbox button:not(:disabled)",
             "stat buttons should be enabled"
         );
     });
@@ -9538,14 +9531,14 @@ QUnit.module("Views", (hooks) => {
             });
 
             await click(target.querySelector(".o_external_button"));
-            assert.notOk(target.querySelector(".modal .oe_button_box button").disabled);
+            assert.notOk(target.querySelector(".modal .o-form-buttonbox button").disabled);
 
-            await click(target.querySelector(".modal .oe_button_box button"));
-            assert.ok(target.querySelector(".modal .oe_button_box button").disabled);
+            await click(target.querySelector(".modal .o-form-buttonbox button"));
+            assert.ok(target.querySelector(".modal .o-form-buttonbox button").disabled);
 
             def.resolve();
             await nextTick();
-            assert.notOk(target.querySelector(".modal .oe_button_box button").disabled);
+            assert.notOk(target.querySelector(".modal .o-form-buttonbox button").disabled);
         }
     );
 
@@ -10379,7 +10372,7 @@ QUnit.module("Views", (hooks) => {
             "yop",
         ]);
 
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "bar");
         assert.containsN(target, ".o_group_header", 2);
         assert.containsNone(target, ".o_data_row");
@@ -10659,7 +10652,7 @@ QUnit.module("Views", (hooks) => {
         const webClient = await createWebClient({ serverData, mockRPC });
         await doAction(webClient, 1);
 
-        await click(target, ".o_list_button_add");
+        await click(target, ".o_control_panel_main_buttons .d-none button.o_list_button_add");
 
         // edit foo to trigger a delayed onchange
         onchangeDef = makeDeferred();
@@ -10796,7 +10789,9 @@ QUnit.module("Views", (hooks) => {
 
         const webClient = await createWebClient({ serverData });
         await doAction(webClient, 1);
-        await click(target.querySelector(".o_control_panel .o-kanban-button-new"));
+        await click(
+            target.querySelector(".o_control_panel_main_buttons .d-none button.o-kanban-button-new")
+        );
 
         //cannot save because there is a required field
         await click(target.querySelector(".o_control_panel .o_form_button_save"));
@@ -10832,7 +10827,7 @@ QUnit.module("Views", (hooks) => {
                 resId: 1,
             });
 
-            await click(target.querySelector(".o_form_button_create"));
+            await createRecord();
             await click(target.querySelector(".o-kanban-button-new"));
 
             assert.containsOnce(target, ".modal");
@@ -11335,29 +11330,29 @@ QUnit.module("Views", (hooks) => {
         await doAction(webClient, 1);
 
         await click(target.querySelector(".o_data_row td.o_data_cell"));
-        assert.deepEqual(getNodesTextContent(target.querySelectorAll(".breadcrumb li")), [
-            "Partner",
-            "first record",
-        ]);
+        assert.strictEqual(
+            target.querySelector(".o_breadcrumb").textContent,
+            "Partnerfirst record"
+        );
 
         await editInput(target, ".o_field_widget[name='name'] input", "aaa");
 
         await click(target.querySelector(`.o_pager button.o_pager_next`));
         assert.containsOnce(target, ".o_form_editable");
-        assert.deepEqual(getNodesTextContent(target.querySelectorAll(".breadcrumb li")), [
-            "Partner",
-            "second record",
-        ]);
+        assert.strictEqual(
+            target.querySelector(".o_breadcrumb").textContent,
+            "Partnersecond record"
+        );
         assert.strictEqual(
             target.querySelector('.o_field_widget[name="name"] input').value,
             "name"
         );
 
         await clickDiscard(target);
-        assert.deepEqual(getNodesTextContent(target.querySelectorAll(".breadcrumb li")), [
-            "Partner",
-            "second record",
-        ]);
+        assert.strictEqual(
+            target.querySelector(".o_breadcrumb").textContent,
+            "Partnersecond record"
+        );
         assert.strictEqual(
             target.querySelector('.o_field_widget[name="name"] input').value,
             "name"
@@ -11365,10 +11360,10 @@ QUnit.module("Views", (hooks) => {
 
         await click(target.querySelector(`.o_pager button.o_pager_previous`));
         assert.containsOnce(target, ".o_form_saved");
-        assert.deepEqual(getNodesTextContent(target.querySelectorAll(".breadcrumb li")), [
-            "Partner",
-            "first record",
-        ]);
+        assert.strictEqual(
+            target.querySelector(".o_breadcrumb").textContent,
+            "Partnerfirst record"
+        );
         assert.strictEqual(target.querySelector('.o_field_widget[name="name"] input').value, "aaa");
     });
 
@@ -11411,24 +11406,24 @@ QUnit.module("Views", (hooks) => {
         await doAction(webClient, 1);
 
         await click(target.querySelector(".o_data_row td.o_data_cell"));
-        assert.deepEqual(getNodesTextContent(target.querySelectorAll(".breadcrumb li")), [
-            "Partner",
-            "first record",
-        ]);
+        assert.strictEqual(
+            target.querySelector(".o_breadcrumb").textContent,
+            "Partnerfirst record"
+        );
 
         await editInput(target, ".o_field_widget[name='name'] input", "aaa");
 
         await click(target.querySelector(".breadcrumb-item.o_back_button"));
 
-        assert.strictEqual(target.querySelector(".breadcrumb").textContent, "Partner");
+        assert.strictEqual(target.querySelector(".o_breadcrumb").textContent, "Partner");
         assert.strictEqual(target.querySelector(".o_field_cell").textContent, "aaa");
 
         await click(target.querySelector(".o_data_row td.o_data_cell"));
         assert.containsOnce(target, ".o_form_editable");
-        assert.deepEqual(getNodesTextContent(target.querySelectorAll(".breadcrumb li")), [
-            "Partner",
-            "first record",
-        ]);
+        assert.strictEqual(
+            target.querySelector(".o_breadcrumb").textContent,
+            "Partnerfirst record"
+        );
         assert.strictEqual(target.querySelector('.o_field_widget[name="name"] input').value, "aaa");
     });
 
@@ -11545,25 +11540,25 @@ QUnit.module("Views", (hooks) => {
         await doAction(webClient, 1);
 
         await click(target.querySelector(".o_data_row td.o_data_cell"));
-        assert.deepEqual(getNodesTextContent(target.querySelectorAll(".breadcrumb li")), [
-            "Partner",
-            "first record",
-        ]);
+        assert.strictEqual(
+            target.querySelector(".o_breadcrumb").textContent,
+            "Partnerfirst record"
+        );
 
         await editInput(target, ".o_field_widget[name='name'] input", "aaa");
 
         await doAction(webClient, 2, { clearBreadcrumbs: true });
 
-        assert.strictEqual(target.querySelector(".breadcrumb").textContent, "Other action");
+        assert.strictEqual(target.querySelector(".o_breadcrumb").textContent, "Other action");
 
         await doAction(webClient, 1, { clearBreadcrumbs: true });
 
         await click(target.querySelector(".o_data_row td.o_data_cell"));
         assert.containsOnce(target, ".o_form_editable");
-        assert.deepEqual(getNodesTextContent(target.querySelectorAll(".breadcrumb li")), [
-            "Partner",
-            "first record",
-        ]);
+        assert.strictEqual(
+            target.querySelector(".o_breadcrumb").textContent,
+            "Partnerfirst record"
+        );
         assert.strictEqual(target.querySelector('.o_field_widget[name="name"] input').value, "aaa");
     });
 
@@ -11764,14 +11759,14 @@ QUnit.module("Views", (hooks) => {
 
         // Click on a row to open a record
         await click(target.querySelector(".o_data_row td.o_data_cell"));
-        assert.deepEqual(getNodesTextContent(target.querySelectorAll(".breadcrumb li")), [
-            "Partner",
-            "first record",
-        ]);
+        assert.strictEqual(
+            target.querySelector(".o_breadcrumb").textContent,
+            "Partnerfirst record"
+        );
 
         // Return in the list view to detach the form view
         await click(target.querySelector(".o_back_button"));
-        assert.strictEqual(target.querySelector(".breadcrumb").textContent, "Partner");
+        assert.strictEqual(target.querySelector(".o_breadcrumb").textContent, "Partner");
 
         // Simulate tab/browser close in the list
         window.dispatchEvent(new Event("beforeunload"));
@@ -12103,13 +12098,16 @@ QUnit.module("Views", (hooks) => {
         assert.strictEqual(target.querySelector(".o_field_widget[name='foo'] input").value, "yop");
         await editInput(target, ".o_field_widget[name='foo'] input", "test");
 
-        await click(target, ".o_form_button_create");
+        await click(
+            target,
+            ".o_control_panel_main_buttons .d-none.d-xl-inline-flex .o_form_button_create"
+        );
         assert.verifySteps(["write"]);
         assert.strictEqual(
             target.querySelector(".o_field_widget[name='foo'] input").value,
             "My little Foo Value"
         );
-        assert.strictEqual(target.querySelector(".breadcrumb-item.active").textContent, "New");
+        assert.strictEqual(target.querySelector(".o_breadcrumb .active").textContent, "New");
     });
 
     QUnit.test("Auto save: error on save when create button clicked", async function (assert) {
@@ -12141,7 +12139,7 @@ QUnit.module("Views", (hooks) => {
         });
 
         await editInput(target, ".o_field_widget[name='foo'] input", "test");
-        await click(target, ".o_form_button_create");
+        await createRecord();
         assert.verifySteps(["write"]);
         await nextTick();
         assert.containsOnce(target, ".o_error_dialog");
@@ -12410,7 +12408,7 @@ QUnit.module("Views", (hooks) => {
         });
 
         assert.containsOnce(target, ".o_form_readonly");
-        await click(target.querySelector(".o_form_button_create"));
+        await createRecord();
         assert.containsOnce(target, ".o_form_editable");
     });
 
@@ -12576,7 +12574,7 @@ QUnit.module("Views", (hooks) => {
         });
 
         assert.containsOnce(target, ".o_list_view .o_content.o_view_sample_data");
-        await click(target.querySelector(".o_list_view .o_list_button_add"));
+        await click(target, ".o_control_panel_main_buttons .d-none button.o_list_button_add");
         assert.containsOnce(target, ".o_form_view");
         await click(target.querySelector(".o_form_view .breadcrumb-item a"));
         assert.containsOnce(target, ".o_list_view .o_content.o_view_sample_data");
@@ -12612,7 +12610,7 @@ QUnit.module("Views", (hooks) => {
         });
 
         assert.containsOnce(target, ".o_list_view .o_content.o_view_sample_data");
-        await click(target.querySelector(".o_list_view .o_list_button_add"));
+        await click(target, ".o_control_panel_main_buttons .d-none button.o_list_button_add");
         assert.containsOnce(target, ".o_form_view .o_field_x2many .o_kanban_renderer");
         assert.containsNone(target, ".o_view_nocontent");
     });
@@ -12756,8 +12754,8 @@ QUnit.module("Views", (hooks) => {
         assert.strictEqual(target.querySelector(".o_form_status_indicator").textContent, "");
         await clickSave(target);
         assert.strictEqual(
-            target.querySelector(".o_form_status_indicator").textContent.trim(),
-            "Unable to save"
+            target.querySelector(".o_form_status_indicator .text-danger").dataset.tooltip,
+            "Unable to save. Correct the issue or discard changes"
         );
     });
 
@@ -12914,7 +12912,7 @@ QUnit.module("Views", (hooks) => {
                 <form>
                     <setting help="this is bar" documentation="/applications/technical/web/settings/this_is_a_test.html">
                         <field name="bar"/>
-                        <button name="buttonName" icon="fa-arrow-right" type="action" string="Manage Users" class="btn-link"/>
+                        <button name="buttonName" icon="oi-arrow-right" type="action" string="Manage Users" class="btn-link"/>
                     </setting>
                 </form>`,
         });
@@ -13045,7 +13043,7 @@ QUnit.module("Views", (hooks) => {
         assert.isVisible(target.querySelector(".o_form_status_indicator_buttons"));
 
         await click(target, ".o_cp_action_menus .dropdown-toggle");
-        await click(target.querySelectorAll(".o_cp_action_menus .dropdown-item")[1]);
+        await click(target.querySelectorAll(".o_cp_action_menus .dropdown-item")[2]);
         assert.containsOnce(target, ".modal");
 
         await click(target, ".modal-footer button.btn-primary");
diff --git a/addons/web/static/tests/views/graph_view_tests.js b/addons/web/static/tests/views/graph_view_tests.js
index 5852a4df84b..64b136fb158 100644
--- a/addons/web/static/tests/views/graph_view_tests.js
+++ b/addons/web/static/tests/views/graph_view_tests.js
@@ -13,14 +13,11 @@ import {
     editFavoriteName,
     saveFavorite,
     switchView,
-    toggleComparisonMenu,
-    toggleFavoriteMenu,
-    toggleFilterMenu,
-    toggleGroupByMenu,
     toggleMenu,
     toggleMenuItem,
     toggleMenuItemOption,
     toggleSaveFavorite,
+    toggleSearchBarMenu,
     validateSearch,
 } from "@web/../tests/search/helpers";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
@@ -2292,7 +2289,7 @@ QUnit.module("Views", (hooks) => {
         await toggleMenuItem(target, "Revenue");
         assert.strictEqual(getYAxeLabel(graph), "Revenue");
         assert.ok(true, "Message");
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Color");
         checkModeIs(assert, graph, "line");
         assert.strictEqual(getXAxeLabel(graph), "Color");
@@ -2459,7 +2456,7 @@ QUnit.module("Views", (hooks) => {
         assert.containsOnce(target, "div.o_graph_canvas_container canvas");
         assert.containsNone(target, "div.o_view_nocontent");
         assert.containsNone(target, ".abc");
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "False Domain");
         assert.containsOnce(target, "div.o_graph_canvas_container canvas");
         assert.containsNone(target, "div.o_view_nocontent");
@@ -2484,7 +2481,7 @@ QUnit.module("Views", (hooks) => {
             `,
         });
         checkLabels(assert, graph, ["xphone", "xpad"]);
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Color");
         checkLabels(assert, graph, ["Undefined", "red"]);
     });
@@ -2560,7 +2557,7 @@ QUnit.module("Views", (hooks) => {
             `,
         });
 
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "First Favorite");
         await saveFavorite(target);
@@ -2568,23 +2565,21 @@ QUnit.module("Views", (hooks) => {
         await toggleMenu(target, "Measures");
         await toggleMenuItem(target, "Foo");
 
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "Second Favorite");
         await saveFavorite(target);
 
         await selectMode(target, "line");
 
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "Third Favorite");
         await saveFavorite(target);
 
-        await toggleGroupByMenu(target);
         await toggleMenuItem(target, "Product");
         await toggleMenuItem(target, "Color");
 
-        await toggleFavoriteMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "Fourth Favorite");
         await saveFavorite(target);
@@ -2751,7 +2746,7 @@ QUnit.module("Views", (hooks) => {
         checkLegend(assert, graph, "Count");
         assert.strictEqual(getYAxeLabel(graph), "Count");
         checkModeIs(assert, graph, "bar");
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Context");
         checkLegend(assert, graph, "Foo");
         assert.strictEqual(getYAxeLabel(graph), "Foo");
@@ -2780,7 +2775,7 @@ QUnit.module("Views", (hooks) => {
                 </search>
             `,
         });
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "False Domain");
     });
 
@@ -2812,7 +2807,7 @@ QUnit.module("Views", (hooks) => {
         checkDatasets(assert, graph, "data", { data: [82, 157] });
         assert.strictEqual(getXAxeLabel(graph), "Product");
         assert.strictEqual(getYAxeLabel(graph), "Foo");
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "False Domain");
         checkLabels(assert, graph, []);
         checkLegend(assert, graph, []);
@@ -2908,9 +2903,7 @@ QUnit.module("Views", (hooks) => {
         });
         await toggleMenu(target, "Measures");
         assert.deepEqual(
-            [...target.querySelectorAll(".o_cp_bottom_left .o_menu_item")].map(
-                (el) => el.innerText
-            ),
+            [...target.querySelectorAll(".o-dropdown .o_menu_item")].map((el) => el.innerText),
             ["Foo", "Revenue", "Count"]
         );
     });
@@ -2953,9 +2946,7 @@ QUnit.module("Views", (hooks) => {
             });
             await toggleMenu(target, "Measures");
             assert.deepEqual(
-                [...target.querySelectorAll(".o_cp_bottom_left .o_menu_item")].map(
-                    (el) => el.innerText
-                ),
+                [...target.querySelectorAll(".o-dropdown .o_menu_item")].map((el) => el.innerText),
                 ["Bouh", "Foo", "Revenue", "Count"]
             );
         }
@@ -3122,7 +3113,7 @@ QUnit.module("Views", (hooks) => {
             views: [[false, "graph"]],
         });
         assert.strictEqual(
-            target.querySelector(".o_control_panel .breadcrumb-item.active").innerText,
+            target.querySelector(".o_control_panel .o_breadcrumb .active:first-child").innerText,
             "Glou glou"
         );
     });
@@ -3619,7 +3610,7 @@ QUnit.module("Views", (hooks) => {
         assert.containsOnce(target, ".o_view_nocontent");
         assert.containsOnce(target, ".o_graph_canvas_container canvas");
 
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "False Domain");
 
         assert.doesNotHaveClass(
@@ -3652,7 +3643,7 @@ QUnit.module("Views", (hooks) => {
         assert.containsNone(target, ".o_view_nocontent");
         assert.containsOnce(target, ".o_graph_canvas_container canvas");
 
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "False Domain");
 
         assert.doesNotHaveClass(target, "o_view_sample_data");
@@ -3704,7 +3695,7 @@ QUnit.module("Views", (hooks) => {
                 },
             });
             checkLabels(assert, graph, ["2", "3", "4", "24", "42", "48", "53", "63"]);
-            await toggleGroupByMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "Foo");
             checkLabels(assert, graph, ["xphone", "xpad"]);
         }
@@ -3786,7 +3777,7 @@ QUnit.module("Views", (hooks) => {
 
             // Set a domain (this reload is delayed)
             def = makeDeferred();
-            await toggleFilterMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "My Filter");
 
             checkDatasets(assert, graph, ["data", "label"], {
@@ -3842,7 +3833,7 @@ QUnit.module("Views", (hooks) => {
 
         // Set a domain (this reload is delayed)
         def = makeDeferred();
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "My Filter");
 
         checkDatasets(assert, graph, ["data", "label"], {
@@ -3899,7 +3890,7 @@ QUnit.module("Views", (hooks) => {
         checkDatasets(assert, graph, "data", { data: [82, 157] });
 
         def = makeDeferred();
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Color");
         await toggleMenuItem(target, "Color");
         await toggleMenuItem(target, "Date");
@@ -3984,7 +3975,7 @@ QUnit.module("Views", (hooks) => {
             `,
         });
 
-        await toggleComparisonMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Date: Previous period");
 
         checkLabels(assert, graph, ["", ""]);
@@ -4018,7 +4009,7 @@ QUnit.module("Views", (hooks) => {
             `,
         });
 
-        await toggleComparisonMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Date: Previous period");
 
         checkDatasets(assert, graph, "backgroundColor", {
@@ -4075,7 +4066,7 @@ QUnit.module("Views", (hooks) => {
         checkLabels(assert, graph, ["Q1 2016", "Q2 2016", "Undefined"]);
         checkLegend(assert, graph, "Count");
 
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Favorite");
 
         checkModeIs(assert, graph, "bar");
diff --git a/addons/web/static/tests/views/kanban_view_tests.js b/addons/web/static/tests/views/kanban_view_tests.js
index 96a1d366809..06443ae7e06 100644
--- a/addons/web/static/tests/views/kanban_view_tests.js
+++ b/addons/web/static/tests/views/kanban_view_tests.js
@@ -19,12 +19,12 @@ import {
     triggerHotkey,
 } from "@web/../tests/helpers/utils";
 import {
-    getButtons,
+    getVisibleButtons,
     getFacetTexts,
     getPagerLimit,
     getPagerValue,
     pagerNext,
-    toggleFilterMenu,
+    toggleSearchBarMenu,
     validateSearch,
 } from "@web/../tests/search/helpers";
 import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
@@ -104,7 +104,7 @@ function getTooltips(groupIndex) {
 
 // Record
 async function createRecord() {
-    await click(target, "button.o-kanban-button-new");
+    await click(target, ".o_control_panel_main_buttons .d-none button.o-kanban-button-new");
 }
 
 async function quickCreateRecord(groupIndex) {
@@ -432,7 +432,7 @@ QUnit.module("Views", (hooks) => {
     });
 
     QUnit.test("basic grouped rendering", async (assert) => {
-        assert.expect(14);
+        assert.expect(13);
 
         await makeView({
             type: "kanban",
@@ -458,12 +458,6 @@ QUnit.module("Views", (hooks) => {
                 }
             },
         });
-
-        assert.hasClass(
-            target.querySelector(".o_kanban_group"),
-            "bg-100",
-            "o_kanban_group should have a background"
-        );
         assert.hasClass(target.querySelector(".o_kanban_view"), "o_kanban_test");
         assert.hasClass(target.querySelector(".o_kanban_renderer"), "o_kanban_grouped");
         assert.containsN(target, ".o_kanban_group", 2);
@@ -712,7 +706,7 @@ QUnit.module("Views", (hooks) => {
                 [...target.querySelectorAll(".o_kanban_group")].map((el) =>
                     el.innerText.replace(/\s/g, " ")
                 ),
-                ["None (1)", "gold yop blip", "silver yop gnap"]
+                ["None 1", "gold yop blip", "silver yop gnap"]
             );
 
             await click(getColumn(0));
@@ -1600,7 +1594,7 @@ QUnit.module("Views", (hooks) => {
         assert.containsN(target, ".o_kanban_group", 2);
         assert.containsNone(target, ".o_kanban_quick_add");
 
-        await click(target.querySelector(".o-kanban-button-new"));
+        await createRecord();
 
         assert.containsNone(target, ".o_kanban_quick_create");
         assert.verifySteps(["create record"]);
@@ -1622,7 +1616,10 @@ QUnit.module("Views", (hooks) => {
         });
 
         assert.containsN(target, ".o_kanban_group.o_group_draggable", 2);
-        assert.containsOnce(target, ".btn-primary.o-kanban-button-new");
+        assert.containsOnce(
+            target,
+            ".o_control_panel_main_buttons .d-none.d-xl-inline-flex button.o-kanban-button-new"
+        );
         assert.containsOnce(target, ".o_column_quick_create");
 
         await createRecord();
@@ -1996,7 +1993,7 @@ QUnit.module("Views", (hooks) => {
                 groupBy: ["bar"],
             });
 
-            await click(target, ".o-kanban-button-new");
+            await createRecord();
             assert.strictEqual(
                 document.activeElement,
                 target.querySelector(".o_field_widget[name=int_field] input")
@@ -2027,7 +2024,7 @@ QUnit.module("Views", (hooks) => {
                 groupBy: ["bar"],
             });
 
-            await click(target, ".o-kanban-button-new");
+            await createRecord();
             assert.strictEqual(
                 document.activeElement,
                 target.querySelector(".o_field_widget[name=foo] input")
@@ -5482,7 +5479,7 @@ QUnit.module("Views", (hooks) => {
         assert.deepEqual(getFacetTexts(target), []);
 
         // validate presence of the search arch info
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         assert.containsOnce(target, ".o_filter_menu .o_menu_item");
     });
 
@@ -5941,7 +5938,7 @@ QUnit.module("Views", (hooks) => {
         assert.containsN(target, ".o_kanban_group", 2, "should still have two columns");
         assert.strictEqual(
             getColumn(0).querySelector(".o_column_title").innerText,
-            "None (2)",
+            "None\n2",
             "first column should have no id (Undefined column)"
         );
 
@@ -6503,7 +6500,7 @@ QUnit.module("Views", (hooks) => {
         assert.containsOnce(target, ".o_kanban_group.o_column_folded");
         assert.deepEqual(
             [...target.querySelectorAll(".o_kanban_group")].map((e) => e.textContent),
-            ["not folded", "folded (0)"]
+            ["not folded", "folded0"]
         );
     });
 
@@ -6917,7 +6914,7 @@ QUnit.module("Views", (hooks) => {
         );
 
         // leaving column creation mode
-        await triggerEvent(target, ".o_column_quick_create .o_input", "keydown", {
+        await triggerEvent(target, ".o_column_quick_create .form-control", "keydown", {
             key: "Escape",
         });
 
@@ -7951,7 +7948,7 @@ QUnit.module("Views", (hooks) => {
                     <templates>
                         <div t-name="kanban-box">
                             <field name="foo"/>
-                            <a type="action" name="42" class="btn-primary" style="margin-left: 10px"><i class="fa fa-arrow-right"/> Click me !</a>
+                            <a type="action" name="42" class="btn-primary" style="margin-left: 10px"><i class="oi oi-arrow-right"/> Click me !</a>
                         </div>
                     </templates>
                 </kanban>`,
@@ -8645,7 +8642,10 @@ QUnit.module("Views", (hooks) => {
         await editColumnName("new column");
         await validateColumn();
 
-        assert.containsOnce(target, ".o-kanban-button-new");
+        assert.containsOnce(
+            target,
+            ".o_control_panel_main_buttons .d-none.d-xl-inline-flex button.o-kanban-button-new"
+        );
     });
 
     QUnit.test("group_by_tooltip option when grouping on a many2one", async (assert) => {
@@ -11373,7 +11373,7 @@ QUnit.module("Views", (hooks) => {
 
         assert.verifySteps([]);
 
-        await click(target, ".o-kanban-button-new");
+        await createRecord();
 
         assert.verifySteps(["create record"]);
         assert.containsNone(target, ".o_kanban_quick_create");
@@ -11457,7 +11457,7 @@ QUnit.module("Views", (hooks) => {
         );
         assert.verifySteps([]);
 
-        await click(target, ".o-kanban-button-new");
+        await createRecord();
 
         assert.verifySteps(["create record"]);
         assert.containsNone(target, ".o_kanban_quick_create");
@@ -11517,11 +11517,11 @@ QUnit.module("Views", (hooks) => {
             `,
         });
 
-        assert.containsNone(target, ".dropdown-menu");
+        assert.containsNone(target, ".o_content .dropdown-menu");
         await click(target, ".o_kanban_renderer .dropdown-toggle");
-        assert.containsOnce(target, ".dropdown-menu");
+        assert.containsOnce(target, ".o_content .dropdown-menu");
         await click(target, ".o_kanban_renderer .dropdown-menu .dropdown-item");
-        assert.containsNone(target, ".dropdown-menu");
+        assert.containsNone(target, ".o_content .dropdown-menu");
     });
 
     QUnit.test("can use JSON in kanban template", async (assert) => {
@@ -12244,7 +12244,7 @@ QUnit.module("Views", (hooks) => {
         assert.strictEqual(
             target
                 .querySelector(
-                    ".o_column_quick_create .o_quick_create_unfolded .input-group .o_input"
+                    ".o_column_quick_create .o_quick_create_unfolded .input-group .form-control"
                 )
                 .getAttribute("placeholder"),
             productFieldName + "..."
@@ -12276,13 +12276,13 @@ QUnit.module("Views", (hooks) => {
 
         assert.containsN(getColumn(0), ".o_kanban_record", 2);
         assert.hasClass(getColumn(1), "o_column_folded");
-        assert.strictEqual(getColumn(1).innerText, "xmo (2)");
+        assert.strictEqual(getColumn(1).innerText, "xmo\n2");
 
         await dragAndDrop(".o_kanban_group:first-child .o_kanban_record", ".o_column_folded");
 
         assert.containsN(getColumn(0), ".o_kanban_record", 1);
         assert.hasClass(getColumn(1), "o_column_folded");
-        assert.strictEqual(getColumn(1).innerText, "xmo (3)");
+        assert.strictEqual(getColumn(1).innerText, "xmo\n3");
     });
 
     QUnit.test("drag record on initially folded column should not unfold it", async (assert) => {
@@ -12310,13 +12310,13 @@ QUnit.module("Views", (hooks) => {
 
         assert.containsN(getColumn(0), ".o_kanban_record", 2);
         assert.hasClass(getColumn(1), "o_column_folded");
-        assert.strictEqual(getColumn(1).innerText, "xmo (2)");
+        assert.strictEqual(getColumn(1).innerText, "xmo\n2");
 
         await dragAndDrop(".o_kanban_group:first-child .o_kanban_record", ".o_column_folded");
 
         assert.containsN(getColumn(0), ".o_kanban_record", 1);
         assert.hasClass(getColumn(1), "o_column_folded");
-        assert.strictEqual(getColumn(1).innerText, "xmo (3)");
+        assert.strictEqual(getColumn(1).innerText, "xmo\n3");
     });
 
     QUnit.test("drag record to folded column, with progressbars", async (assert) => {
@@ -12356,7 +12356,7 @@ QUnit.module("Views", (hooks) => {
 
         assert.containsN(getColumn(0), ".o_kanban_record", 2);
         assert.hasClass(getColumn(1), "o_column_folded");
-        assert.strictEqual(getColumn(1).innerText, "Yes (2)");
+        assert.strictEqual(getColumn(1).innerText, "Yes\n2");
 
         await dragAndDrop(
             ".o_kanban_group:first-child .o_kanban_record",
@@ -12364,7 +12364,7 @@ QUnit.module("Views", (hooks) => {
         );
 
         assert.containsOnce(getColumn(0), ".o_kanban_record");
-        assert.strictEqual(getColumn(1).innerText, "Yes (3)");
+        assert.strictEqual(getColumn(1).innerText, "Yes\n3");
         assert.deepEqual(
             getProgressBars(0).map((pb) => pb.style.width),
             ["100%"]
@@ -12575,8 +12575,8 @@ QUnit.module("Views", (hooks) => {
             assert.containsN(target, ".o_column_folded", 2);
 
             assert.strictEqual(
-                getNodesTextContent(target.querySelectorAll("span.o_column_title")).join(" "),
-                "hello (2) xmo (2)"
+                getNodesTextContent(target.querySelectorAll(".o_column_title")).join(" "),
+                "hello2 xmo2"
             );
 
             assert.containsNone(target, ".o_nocontent_help");
@@ -12718,8 +12718,8 @@ QUnit.module("Views", (hooks) => {
         assert.strictEqual(content.scrollLeft, 20);
         assert.containsOnce(target, ".o_kanban_record.o_dragged");
 
-        // next 20 frames
-        await advanceFrame(20);
+        // next 40 frames
+        await advanceFrame(40);
 
         // Should be at the end of the content
         assert.strictEqual(content.clientWidth + content.scrollLeft, content.scrollWidth);
@@ -12739,8 +12739,8 @@ QUnit.module("Views", (hooks) => {
 
         assert.containsOnce(target, ".o_kanban_record.o_dragged");
 
-        // next 20 frames
-        await advanceFrame(20);
+        // next 40 frames
+        await advanceFrame(40);
 
         assert.strictEqual(content.scrollLeft, 0);
 
@@ -13084,10 +13084,10 @@ QUnit.module("Views", (hooks) => {
                 },
             });
 
-            const cpButtons = getButtons(target);
+            const cpButtons = getVisibleButtons(target);
             assert.deepEqual(
                 [...cpButtons].map((button) => button.textContent.trim()),
-                ["New", "display"]
+                ["New", "display", ""]
             );
             assert.hasClass(cpButtons[1], "display");
 
diff --git a/addons/web/static/tests/views/layout_tests.js b/addons/web/static/tests/views/layout_tests.js
index aed7b729487..e314d789c05 100644
--- a/addons/web/static/tests/views/layout_tests.js
+++ b/addons/web/static/tests/views/layout_tests.js
@@ -70,7 +70,7 @@ QUnit.module("Views", (hooks) => {
         class ToyComponent extends Component {}
         ToyComponent.template = xml`
             <Layout display="props.display">
-                <t t-set-slot="control-panel-top-right">
+                <t t-set-slot="layout-actions">
                     <div class="toy_search_bar" />
                 </t>
                 <div class="toy_content" />
@@ -84,7 +84,7 @@ QUnit.module("Views", (hooks) => {
             searchViewId: false,
         });
 
-        assert.containsOnce(target, ".o_control_panel .o_cp_top_right .toy_search_bar");
+        assert.containsOnce(target, ".o_control_panel .o_control_panel_actions .toy_search_bar");
         assert.containsOnce(target, ".o_component_with_search_panel .o_search_panel");
         assert.containsNone(target, ".o_cp_searchview");
         assert.containsOnce(target, ".o_content > .toy_content");
@@ -106,7 +106,7 @@ QUnit.module("Views", (hooks) => {
         }
         ToyComponent.template = xml`
             <Layout className="'o_view_sample_data'" display="{
-                controlPanel: { 'top-right': false, 'bottom-right': false, 'bottom-left': false },
+                controlPanel: {},
                 searchPanel: true,
                 }">
                 <div class="toy_content" />
@@ -122,7 +122,7 @@ QUnit.module("Views", (hooks) => {
 
         assert.containsOnce(target, ".o_search_panel");
         assert.containsOnce(target, ".o_control_panel");
-        assert.containsOnce(target, ".breadcrumb");
+        assert.containsOnce(target, ".o_breadcrumb");
         assert.containsOnce(target, ".o_component_with_search_panel");
         assert.containsOnce(target, ".o_content > .toy_content");
     });
@@ -159,7 +159,7 @@ QUnit.module("Views", (hooks) => {
         }
         ToyB.template = xml`
             <Layout className="'toy_b'" display="props.display">
-                <t t-set-slot="control-panel-top-right">
+                <t t-set-slot="layout-actions">
                     <div class="toy_b_breadcrumbs" />
                 </t>
                 <ToyC/>
@@ -170,7 +170,7 @@ QUnit.module("Views", (hooks) => {
         class ToyA extends Component {}
         ToyA.template = xml`
             <Layout className="'toy_a'" display="props.display">
-                <t t-set-slot="control-panel-top-right">
+                <t t-set-slot="layout-actions">
                     <div class="toy_a_search" />
                 </t>
                 <ToyB display="props.display"/>
@@ -291,21 +291,21 @@ QUnit.module("Views", (hooks) => {
     });
 
     QUnit.test("Simple rendering: with dynamically displayed search", async (assert) => {
-        let displayControlPanelTopRight = true;
+        let displayLayoutActions = true;
         class ToyComponent extends Component {
             get display() {
                 return {
                     ...this.props.display,
                     controlPanel: {
                         ...this.props.display.controlPanel,
-                        "top-right": displayControlPanelTopRight,
+                        layoutActions: displayLayoutActions,
                     },
                 };
             }
         }
         ToyComponent.template = xml`
             <Layout display="display">
-                <t t-set-slot="control-panel-top-right">
+                <t t-set-slot="layout-actions">
                     <div class="toy_search_bar" />
                 </t>
                 <div class="toy_content" />
@@ -319,16 +319,16 @@ QUnit.module("Views", (hooks) => {
             searchViewId: false,
         });
 
-        assert.containsOnce(target, ".o_control_panel .o_cp_top_right .toy_search_bar");
+        assert.containsOnce(target, ".o_control_panel .o_control_panel_actions .toy_search_bar");
         assert.containsOnce(target, ".o_component_with_search_panel .o_search_panel");
         assert.containsNone(target, ".o_cp_searchview");
         assert.containsOnce(target, ".o_content > .toy_content");
 
-        displayControlPanelTopRight = false;
+        displayLayoutActions = false;
         comp.render();
         await nextTick();
 
-        assert.containsNone(target, ".o_control_panel .o_cp_top_right .toy_search_bar");
+        assert.containsNone(target, ".o_control_panel .o_control_panel_actions .toy_search_bar");
         assert.containsOnce(target, ".o_component_with_search_panel .o_search_panel");
         assert.containsNone(target, ".o_cp_searchview");
         assert.containsOnce(target, ".o_content > .toy_content");
diff --git a/addons/web/static/tests/views/list_view_tests.js b/addons/web/static/tests/views/list_view_tests.js
index f711bf2bd35..c853a585822 100644
--- a/addons/web/static/tests/views/list_view_tests.js
+++ b/addons/web/static/tests/views/list_view_tests.js
@@ -45,7 +45,8 @@ import {
 } from "../helpers/utils";
 import {
     editFavoriteName,
-    getButtons,
+    editPager,
+    getVisibleButtons,
     getFacetTexts,
     getPagerLimit,
     getPagerValue,
@@ -55,9 +56,7 @@ import {
     removeFacet,
     saveFavorite,
     toggleActionMenu,
-    toggleFavoriteMenu,
-    toggleFilterMenu,
-    toggleGroupByMenu,
+    toggleSearchBarMenu,
     toggleMenuItem,
     toggleSaveFavorite,
     validateSearch,
@@ -72,7 +71,11 @@ let serverData;
 let target;
 
 async function reloadListView(target) {
-    await validateSearch(target);
+    if (target.querySelector(".o_searchview_input")) {
+        await validateSearch(target);
+    } else {
+        await editPager(target, getPagerValue(target));
+    }
 }
 
 function getDataRow(position) {
@@ -83,6 +86,15 @@ function getGroup(position) {
     return target.querySelectorAll(".o_group_header")[position - 1];
 }
 
+function clickAdd() {
+    const listAddButtons = target.querySelectorAll(".o_list_button_add");
+    if (listAddButtons.length) {
+        return listAddButtons.length >= 2 ? click(listAddButtons[1]) : click(listAddButtons[0]);
+    } else {
+        throw new Error("No add button found to be clicked.");
+    }
+}
+
 /**
  * @param {Element} el
  * @param {string} varName
@@ -280,8 +292,8 @@ QUnit.module("Views", (hooks) => {
             "right",
             "integer cells should be right aligned"
         );
-
-        assert.isVisible(target.querySelector(".o_list_button_add"));
+        assert.isNotVisible(target.querySelector(".d-xl-none .o_list_button_add"));
+        assert.isVisible(target.querySelector(".d-xl-inline-flex .o_list_button_add"));
         assert.isNotVisible(target.querySelector(".o_list_button_save"));
         assert.isNotVisible(target.querySelector(".o_list_button_discard"));
     });
@@ -294,7 +306,10 @@ QUnit.module("Views", (hooks) => {
             arch: '<tree><field name="foo"/><field name="int_field"/></tree>',
         });
         await click(target.querySelectorAll(".o_data_row .o_list_record_selector input")[0]);
-        assert.containsOnce(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
+        assert.containsOnce(
+            target.querySelector(".o_control_panel_actions"),
+            ".o_list_selection_box"
+        );
         assert.containsNone(target.querySelector(".o_list_selection_box"), ".o_list_select_domain");
         assert.strictEqual(
             target.querySelector(".o_list_selection_box").textContent.trim(),
@@ -314,7 +329,7 @@ QUnit.module("Views", (hooks) => {
 
         assert.strictEqual(
             target.querySelector(".o_list_selection_box").textContent.trim(),
-            "4 selected  Unselect all"
+            "4 selected"
         );
         assert.strictEqual(
             document.querySelectorAll(".o_data_row .o_list_record_selector input:checked").length,
@@ -329,7 +344,7 @@ QUnit.module("Views", (hooks) => {
         );
         assert.strictEqual(
             target.querySelector(".o_list_selection_box").textContent.trim(),
-            "2 selected  Unselect all"
+            "2 selected"
         );
         assert.strictEqual(
             document.querySelectorAll(".o_data_row .o_list_record_selector input:checked").length,
@@ -486,7 +501,7 @@ QUnit.module("Views", (hooks) => {
             arch: '<tree delete="0"><field name="foo"/></tree>',
         });
 
-        assert.containsNone(target, "div.o_control_panel .o_cp_action_menus");
+        assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus");
         assert.containsN(target, "tbody td.o_list_record_selector", 4, "should have 4 records");
 
         await click(target.querySelector("tbody td.o_list_record_selector input"));
@@ -531,7 +546,7 @@ QUnit.module("Views", (hooks) => {
                 arch: '<tree><field name="foo"/></tree>',
             });
 
-            assert.containsNone(target, "div.o_control_panel .o_cp_action_menus");
+            assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus");
             assert.ok(
                 $(target).find("tbody td.o_list_record_selector").length,
                 "should have at least one record"
@@ -564,12 +579,11 @@ QUnit.module("Views", (hooks) => {
             arch: '<tree><field name="foo"/></tree>',
         });
 
-        assert.containsNone(target, "div.o_control_panel .o_cp_action_menus");
+        assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus");
         assert.ok(
             target.querySelectorAll("tbody td.o_list_record_selector").length,
             "should have at least one record"
         );
-        assert.containsOnce(target, "div.o_control_panel .o_cp_buttons .o_list_export_xlsx");
 
         await click(target.querySelector("tbody td.o_list_record_selector input"));
         assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus");
@@ -583,54 +597,6 @@ QUnit.module("Views", (hooks) => {
         );
     });
 
-    QUnit.test("export button in list view", async function (assert) {
-        function hasGroup(group) {
-            return group === "base.group_allow_export";
-        }
-        serviceRegistry.add("user", makeFakeUserService(hasGroup), { force: true });
-
-        await makeView({
-            type: "list",
-            resModel: "foo",
-            serverData,
-            arch: '<tree><field name="foo"/></tree>',
-        });
-
-        assert.containsN(target, ".o_data_row", 4);
-        assert.isVisible(target.querySelector(".o_list_export_xlsx"));
-
-        await click(target.querySelector("tbody td.o_list_record_selector input"));
-        assert.isNotVisible(target.querySelector(".o_list_export_xlsx"));
-        assert.containsOnce(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
-
-        await click(target.querySelector("tbody td.o_list_record_selector input"));
-        assert.isVisible(target.querySelector(".o_list_export_xlsx"));
-    });
-
-    QUnit.test("export button in empty list view", async function (assert) {
-        const records = serverData.models.foo.records;
-
-        serverData.models.foo.records = [];
-
-        function hasGroup(group) {
-            return group === "base.group_allow_export";
-        }
-        serviceRegistry.add("user", makeFakeUserService(hasGroup), { force: true });
-
-        await makeView({
-            type: "list",
-            resModel: "foo",
-            serverData,
-            arch: '<tree><field name="foo"/></tree>',
-        });
-
-        assert.isNotVisible(target.querySelector(".o_list_export_xlsx"));
-
-        serverData.models.foo.records = records;
-        await reloadListView(target);
-        assert.isVisible(target.querySelector(".o_list_export_xlsx"));
-    });
-
     QUnit.test("Direct export button invisible", async function (assert) {
         function hasGroup(group) {
             return group === "base.group_allow_export";
@@ -855,31 +821,31 @@ QUnit.module("Views", (hooks) => {
                     <field name="foo" />
                 </tree>`,
         });
-        let cpButtons = getButtons(target);
-        assert.containsNone(cpButtons[0], 'button[name="x"]');
-        assert.containsNone(cpButtons[0], ".o_list_selection_box");
-        assert.containsNone(cpButtons[0], 'button[name="y"]');
+        let cpBreadcrumb = target.querySelector("div.o_control_panel_actions");
+        assert.containsNone(cpBreadcrumb, 'button[name="x"]');
+        assert.containsNone(cpBreadcrumb, ".o_list_selection_box");
+        assert.containsNone(cpBreadcrumb, 'button[name="y"]');
 
         await click(
             target.querySelector('.o_data_row .o_list_record_selector input[type="checkbox"]')
         );
-        cpButtons = getButtons(target);
-        assert.containsOnce(cpButtons[0], 'button[name="x"]');
-        assert.hasClass(cpButtons[0].querySelector('button[name="x"]'), "btn btn-secondary plaf");
-        assert.containsOnce(cpButtons[0], ".o_list_selection_box");
+        cpBreadcrumb = target.querySelector("div.o_control_panel_actions");
+        assert.containsOnce(cpBreadcrumb, 'button[name="x"]');
+        assert.hasClass(cpBreadcrumb.querySelector('button[name="x"]'), "btn btn-secondary plaf");
+        assert.containsOnce(cpBreadcrumb, ".o_list_selection_box");
         assert.strictEqual(
-            cpButtons[0].querySelector('button[name="x"]').nextElementSibling,
-            cpButtons[0].querySelector(".o_list_selection_box")
+            cpBreadcrumb.querySelector('button[name="x"]').previousElementSibling,
+            cpBreadcrumb.querySelector(".o_list_selection_box")
         );
-        assert.containsNone(cpButtons[0], 'button[name="y"]');
+        assert.containsNone(cpBreadcrumb, 'button[name="y"]');
 
         await click(
             target.querySelector('.o_data_row .o_list_record_selector input[type="checkbox"]')
         );
-        cpButtons = getButtons(target);
-        assert.containsNone(cpButtons[0], 'button[name="x"]');
-        assert.containsNone(cpButtons[0], ".o_list_selection_box");
-        assert.containsNone(cpButtons[0], 'button[name="y"]');
+        cpBreadcrumb = target.querySelector("div.o_control_panel_actions");
+        assert.containsNone(cpBreadcrumb, 'button[name="x"]');
+        assert.containsNone(cpBreadcrumb, ".o_list_selection_box");
+        assert.containsNone(cpBreadcrumb, 'button[name="y"]');
     });
 
     QUnit.test(
@@ -898,34 +864,38 @@ QUnit.module("Views", (hooks) => {
                     <field name="foo" />
                 </tree>`,
             });
-            let cpButtons = getButtons(target)[0];
+            let cpButtons = getVisibleButtons(target);
             assert.deepEqual(
-                [...cpButtons.querySelectorAll("button")].map((button) =>
-                    button.textContent.trim()
-                ),
-                ["New", "display", ""]
+                [...cpButtons].map((button) => button.textContent.trim()),
+                [
+                    "New",
+                    "display",
+                    "", // cog dropdown
+                    "", // search btn
+                ]
             );
 
             await click(
                 target.querySelector('.o_data_row .o_list_record_selector input[type="checkbox"]')
             );
-            cpButtons = getButtons(target)[0];
+            cpButtons = getVisibleButtons(target);
             assert.deepEqual(
-                [...cpButtons.querySelectorAll("button")].map((button) =>
-                    button.textContent.trim()
-                ),
+                [...cpButtons].map((button) => button.textContent.trim()),
                 ["New", "display", "default-selection"]
             );
 
             await click(
                 target.querySelector('.o_data_row .o_list_record_selector input[type="checkbox"]')
             );
-            cpButtons = getButtons(target)[0];
+            cpButtons = getVisibleButtons(target);
             assert.deepEqual(
-                [...cpButtons.querySelectorAll("button")].map((button) =>
-                    button.textContent.trim()
-                ),
-                ["New", "display", ""]
+                [...cpButtons].map((button) => button.textContent.trim()),
+                [
+                    "New",
+                    "display",
+                    "", // cog dropdown
+                    "", // search btn
+                ]
             );
         }
     );
@@ -961,8 +931,8 @@ QUnit.module("Views", (hooks) => {
                 },
             });
 
-            const cpButtons = getButtons(target)[0];
-            await click(cpButtons.querySelectorAll("button")[1]);
+            const cpButtons = getVisibleButtons(target);
+            await click(cpButtons[1]);
             assert.verifySteps(["doActionButton"]);
         }
     );
@@ -991,21 +961,14 @@ QUnit.module("Views", (hooks) => {
             await click(
                 target.querySelector('.o_data_row .o_list_record_selector input[type="checkbox"]')
             );
-            const cpButtons = getButtons(target);
-            assert.ok(
-                Array.from(cpButtons[0].querySelectorAll("button")).every((btn) => !btn.disabled)
-            );
-
-            await click(cpButtons[0].querySelector('button[name="x"]'));
-            assert.ok(
-                Array.from(cpButtons[0].querySelectorAll("button")).every((btn) => btn.disabled)
-            );
+            const cpButtons = getVisibleButtons(target);
+            assert.ok([...cpButtons].every((btn) => !btn.disabled));
+            await click(cpButtons[1]);
+            assert.ok([...cpButtons].every((btn) => btn.disabled));
 
             executeActionDef.resolve();
             await nextTick();
-            assert.ok(
-                Array.from(cpButtons[0].querySelectorAll("button")).every((btn) => !btn.disabled)
-            );
+            assert.ok([...cpButtons].every((btn) => !btn.disabled));
         }
     );
 
@@ -1132,8 +1095,8 @@ QUnit.module("Views", (hooks) => {
             await click(
                 target.querySelector('.o_data_row .o_list_record_selector input[type="checkbox"]')
             );
-            const cpButtons = getButtons(target);
-            await click(cpButtons[0].querySelector('button[name="x"]'));
+            const cpButtons = getVisibleButtons(target);
+            await click(cpButtons[1]);
         }
     );
 
@@ -1189,12 +1152,11 @@ QUnit.module("Views", (hooks) => {
             await click(
                 target.querySelector('.o_data_row .o_list_record_selector input[type="checkbox"]')
             );
-            const cpButtons = getButtons(target);
 
-            await click(cpButtons[0].querySelector(".o_list_select_domain"));
+            await click(target.querySelector(".o_list_select_domain"));
             assert.verifySteps([]);
 
-            await click(cpButtons[0].querySelector('button[name="x"]'));
+            await click(target.querySelector('button[name="x"]'));
             assert.verifySteps(["search", "execute_action"]);
         }
     );
@@ -1265,20 +1227,40 @@ QUnit.module("Views", (hooks) => {
         assert.containsN(target, ".o_list_record_selector input:enabled", 5);
         assert.containsOnce(target, "td:contains(yop)", "should contain yop");
 
-        assert.containsOnce(target, ".o_list_button_add");
+        assert.containsN(
+            target,
+            ".o_list_button_add",
+            2,
+            "Should have 2 add button (small and xl screens)"
+        );
         assert.containsNone(target, ".o_list_button_save");
         assert.containsNone(target, ".o_list_button_discard");
 
         await click(target.querySelector(".o_field_cell"));
 
         assert.containsNone(target, ".o_list_button_add");
-        assert.containsOnce(target, ".o_list_button_save");
-        assert.containsOnce(target, ".o_list_button_discard");
+        assert.containsN(
+            target,
+            ".o_list_button_save",
+            2,
+            "Should have 2 save button (small and xl screens)"
+        );
+        assert.containsN(
+            target,
+            ".o_list_button_discard",
+            2,
+            "Should have 2 discard button (small and xl screens)"
+        );
         assert.containsNone(target, ".o_list_record_selector input:enabled");
 
-        await click(target.querySelector(".o_list_button_save"));
+        await click($(".o_list_button_save:visible").get(0));
 
-        assert.containsOnce(target, ".o_list_button_add");
+        assert.containsN(
+            target,
+            ".o_list_button_add",
+            2,
+            "Should have 2 add button (small and xl screens)"
+        );
         assert.containsNone(target, ".o_list_button_save");
         assert.containsNone(target, ".o_list_button_discard");
         assert.containsN(target, ".o_list_record_selector input:enabled", 5);
@@ -1377,7 +1359,7 @@ QUnit.module("Views", (hooks) => {
         assert.containsN(target, ".o_data_row", 4);
         assert.verifySteps(["get_views", "web_search_read"]);
 
-        await click(target.querySelector(".o_list_button_add"));
+        await click($(".o_list_button_add:visible").get(0));
         await editInput(target, "[name='int_field'] input", 1);
         await click(target, ".o_list_view");
         assert.containsN(target, ".o_data_row", 5);
@@ -1479,7 +1461,7 @@ QUnit.module("Views", (hooks) => {
         assert.containsN(target, ".o_data_row", 4);
         assert.containsNone(target, ".o_selected_row");
 
-        await click(target.querySelector(".o_list_button_add"));
+        await click($(".o_list_button_add:visible").get(0));
         await editInput(target, "[name='int_field'] input", 1);
         await click(target, ".o_list_view");
         assert.containsN(target, ".o_data_row", 5);
@@ -1587,7 +1569,7 @@ QUnit.module("Views", (hooks) => {
                 },
             });
 
-            await click(target.querySelector(".o_list_button_add"));
+            await click($(".o_list_button_add:visible").get(0));
             assert.verifySteps(
                 ["get_views", "web_search_read", "onchange"],
                 "no nameget should be done"
@@ -1631,7 +1613,7 @@ QUnit.module("Views", (hooks) => {
 
         assert.containsN(target, ".o_data_row", 4, "There should be 4 rows");
 
-        await click(target.querySelector(".o_list_button_add"));
+        await click($(".o_list_button_add:visible").get(0));
         assert.containsOnce(target, ".o_selected_row");
 
         await click(target, ".o_field_date input");
@@ -1667,11 +1649,11 @@ QUnit.module("Views", (hooks) => {
             assert.containsN(target, ".o_data_row", 3);
             assert.containsN(target, "tbody tr", 4);
 
-            await click(target.querySelector(".o_list_button_add"));
+            await click($(".o_list_button_add:visible").get(0));
             assert.containsN(target, ".o_data_row", 4);
             assert.hasClass(target.querySelector("tbody tr"), "o_selected_row");
 
-            await click(target.querySelector(".o_list_button_discard"));
+            await click(target.querySelector(".o_list_button_discard:not(.dropdown-item)"));
             assert.containsN(target, ".o_data_row", 3);
             assert.containsN(target, "tbody tr", 4);
             assert.hasClass(target.querySelector("tbody tr"), "o_data_row");
@@ -2041,9 +2023,10 @@ QUnit.module("Views", (hooks) => {
             "should not have dropdown as delete item is not there"
         );
 
-        // unselect group by m2m
-        await toggleGroupByMenu(target);
-        await toggleMenuItem(target, "M2M field");
+        // unselect group by m2m (need to unselect record first)
+        await click(target.querySelector(".o_data_row .o_list_record_selector input"));
+        await click(target, ".o_searchview .o_facet_remove");
+
         await click(target.querySelector(".o_data_row .o_list_record_selector input"));
         assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus");
         assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus .dropdown");
@@ -2172,7 +2155,7 @@ QUnit.module("Views", (hooks) => {
         // Ascending order on Date
         await click(target, "th.o_column_sortable[data-name=date]");
 
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "My favorite");
         await saveFavorite(target);
@@ -2236,7 +2219,7 @@ QUnit.module("Views", (hooks) => {
             ],
         });
 
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "My second favorite");
     });
 
@@ -2693,7 +2676,7 @@ QUnit.module("Views", (hooks) => {
             "pager should be correct"
         );
 
-        await click(target.querySelector(".o_list_button_add"));
+        await click($(".o_list_button_add:visible").get(0));
 
         assert.containsN(target, "tbody tr", 4, "list should still contain 4 rows");
         assert.containsN(
@@ -2708,7 +2691,7 @@ QUnit.module("Views", (hooks) => {
             "pager should be correct"
         );
 
-        await click(target.querySelector(".o_list_button_discard"));
+        await click(target.querySelector(".o_list_button_discard:not(.dropdown-item)"));
 
         assert.containsN(target, "tbody tr", 4, "list should still contain 4 rows");
         assert.containsOnce(
@@ -2838,12 +2821,17 @@ QUnit.module("Views", (hooks) => {
             const webClient = await createWebClient({ serverData });
 
             await doAction(webClient, 11);
-            await click(target.querySelector(".o_list_button_add"));
+            await click($(".o_list_button_add:visible").get(0));
 
             assert.containsNone(target, ".o_list_button_add");
-            assert.containsOnce(target, ".o_list_button_save");
+            assert.containsN(
+                target,
+                ".o_list_button_save",
+                2,
+                "Should have 2 save button (small and xl screens)"
+            );
 
-            await toggleGroupByMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "candle");
 
             assert.containsNone(
@@ -3037,11 +3025,17 @@ QUnit.module("Views", (hooks) => {
         });
 
         assert.containsN(target, ".o_data_row", 4);
-        assert.containsNone(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
+        assert.containsNone(
+            target.querySelector(".o_control_panel_actions"),
+            ".o_list_selection_box"
+        );
 
         // select a record
         await click(target.querySelector(".o_data_row .o_list_record_selector input"));
-        assert.containsOnce(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
+        assert.containsOnce(
+            target.querySelector(".o_control_panel_actions"),
+            ".o_list_selection_box"
+        );
         assert.containsNone(target.querySelector(".o_list_selection_box"), ".o_list_select_domain");
         assert.strictEqual(
             target.querySelector(".o_list_selection_box").textContent.trim(),
@@ -3050,20 +3044,26 @@ QUnit.module("Views", (hooks) => {
 
         // select all records of first page
         await click(target.querySelector("thead .o_list_record_selector input"));
-        assert.containsOnce(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
+        assert.containsOnce(
+            target.querySelector(".o_control_panel_actions"),
+            ".o_list_selection_box"
+        );
         assert.containsNone(target.querySelector(".o_list_selection_box"), ".o_list_select_domain");
         assert.strictEqual(
             target.querySelector(".o_list_selection_box").textContent.trim(),
-            "4 selected  Unselect all"
+            "4 selected"
         );
 
         // unselect a record
         await click(target.querySelectorAll(".o_data_row .o_list_record_selector input")[1]);
-        assert.containsOnce(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
+        assert.containsOnce(
+            target.querySelector(".o_control_panel_actions"),
+            ".o_list_selection_box"
+        );
         assert.containsNone(target.querySelector(".o_list_selection_box"), ".o_list_select_domain");
         assert.strictEqual(
             target.querySelector(".o_list_selection_box").textContent.trim(),
-            "3 selected  Unselect all"
+            "3 selected"
         );
         await click(target.querySelector(".o_list_unselect_all"));
         assert.containsNone(
@@ -3087,11 +3087,17 @@ QUnit.module("Views", (hooks) => {
         });
 
         assert.containsN(target, ".o_data_row", 3);
-        assert.containsNone(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
+        assert.containsNone(
+            target.querySelector(".o_control_panel_actions"),
+            ".o_list_selection_box"
+        );
 
         // select a record
         await click(target.querySelector(".o_data_row .o_list_record_selector input"));
-        assert.containsOnce(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
+        assert.containsOnce(
+            target.querySelector(".o_control_panel_actions"),
+            ".o_list_selection_box"
+        );
         assert.containsNone(target.querySelector(".o_list_selection_box"), ".o_list_select_domain");
         assert.strictEqual(
             target.querySelector(".o_list_selection_box").textContent.trim(),
@@ -3100,19 +3106,25 @@ QUnit.module("Views", (hooks) => {
 
         // select all records of first page
         await click(target.querySelector("thead .o_list_record_selector input"));
-        assert.containsOnce(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
+        assert.containsOnce(
+            target.querySelector(".o_control_panel_actions"),
+            ".o_list_selection_box"
+        );
         assert.containsOnce(target.querySelector(".o_list_selection_box"), ".o_list_select_domain");
         assert.strictEqual(
             target.querySelector(".o_list_selection_box").textContent.replace(/\s+/g, " ").trim(),
-            "3 selected Select all 4 Unselect all"
+            "3 selected Select all 4"
         );
 
         // select all domain
         await click(target.querySelector(".o_list_selection_box .o_list_select_domain"));
-        assert.containsOnce(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
+        assert.containsOnce(
+            target.querySelector(".o_control_panel_actions"),
+            ".o_list_selection_box"
+        );
         assert.strictEqual(
             target.querySelector(".o_list_selection_box").textContent.trim(),
-            "All 4 selected Unselect all"
+            "All 4 selected"
         );
         await click(target.querySelector(".o_list_unselect_all"));
         assert.containsNone(
@@ -3131,14 +3143,20 @@ QUnit.module("Views", (hooks) => {
             groupBy: ["foo"],
         });
         assert.containsN(target, ".o_group_header", 3);
-        assert.containsNone(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
+        assert.containsNone(
+            target.querySelector(".o_control_panel_actions"),
+            ".o_list_selection_box"
+        );
 
         // open first group
         await click(target.querySelector(".o_group_header"));
 
         // select a record
         await click(target.querySelector(".o_data_row .o_list_record_selector input"));
-        assert.containsOnce(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
+        assert.containsOnce(
+            target.querySelector(".o_control_panel_actions"),
+            ".o_list_selection_box"
+        );
         assert.containsNone(target.querySelector(".o_list_selection_box"), ".o_list_select_domain");
         assert.strictEqual(
             target.querySelector(".o_list_selection_box").textContent.trim(),
@@ -3147,19 +3165,25 @@ QUnit.module("Views", (hooks) => {
 
         // select all records of first page
         await click(target.querySelector("thead .o_list_record_selector input"));
-        assert.containsOnce(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
+        assert.containsOnce(
+            target.querySelector(".o_control_panel_actions"),
+            ".o_list_selection_box"
+        );
         assert.containsOnce(target.querySelector(".o_list_selection_box"), ".o_list_select_domain");
         assert.strictEqual(
             target.querySelector(".o_list_selection_box").textContent.replace(/\s+/g, " ").trim(),
-            "2 selected Select all 4 Unselect all"
+            "2 selected Select all 4"
         );
 
         // select all domain
         await click(target.querySelector(".o_list_selection_box .o_list_select_domain"));
-        assert.containsOnce(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
+        assert.containsOnce(
+            target.querySelector(".o_control_panel_actions"),
+            ".o_list_selection_box"
+        );
         assert.strictEqual(
             target.querySelector(".o_list_selection_box").textContent.trim(),
-            "All 4 selected Unselect all"
+            "All 4 selected"
         );
         await click(target.querySelector(".o_list_unselect_all"));
         assert.containsNone(
@@ -3169,7 +3193,7 @@ QUnit.module("Views", (hooks) => {
         );
     });
 
-    QUnit.test("selection box is displayed after header buttons", async function (assert) {
+    QUnit.test("selection box is displayed as first action button", async function (assert) {
         await makeView({
             type: "list",
             resModel: "foo",
@@ -3186,15 +3210,20 @@ QUnit.module("Views", (hooks) => {
         });
 
         assert.containsN(target, ".o_data_row", 4);
-        assert.containsNone($(target).find(".o_cp_buttons"), ".o_list_selection_box");
+        assert.containsNone($(target).find(".o_control_panel_actions"), ".o_list_selection_box");
 
         // select a record
         await click(target, ".o_data_row:first-child .o_list_record_selector input");
-        assert.containsOnce(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
-        const lastElement = target.querySelector(".o_cp_buttons .o_list_buttons").lastElementChild;
+        assert.containsOnce(
+            target.querySelector(".o_control_panel_actions"),
+            ".o_list_selection_box"
+        );
+        const firstElement = target.querySelector(
+            ".o_control_panel_actions > div"
+        ).firstElementChild;
         assert.strictEqual(
-            lastElement,
-            target.querySelector(".o_cp_buttons .o_list_selection_box"),
+            firstElement,
+            target.querySelector(".o_control_panel_actions .o_list_selection_box"),
             "last element should selection box"
         );
         assert.strictEqual(
@@ -3213,7 +3242,7 @@ QUnit.module("Views", (hooks) => {
 
         assert.containsN(target, ".o_data_row", 4, "there should be 4 records");
         assert.containsNone(
-            target.querySelector(".o_cp_buttons"),
+            target.querySelector(".o_control_panel_actions"),
             ".o_list_selection_box",
             "list selection box should not be displayed"
         );
@@ -3221,7 +3250,7 @@ QUnit.module("Views", (hooks) => {
         // select all records
         await click(target.querySelector(".o_list_record_selector input"));
         assert.containsOnce(
-            target.querySelector(".o_cp_buttons"),
+            target.querySelector(".o_control_panel_actions"),
             ".o_list_selection_box",
             "list selection box should be displayed"
         );
@@ -3237,7 +3266,7 @@ QUnit.module("Views", (hooks) => {
         await editInput(target, ".o_data_row [name=foo] input", "legion");
         await click(target, ".modal-dialog button.btn-primary");
         assert.containsNone(
-            target.querySelector(".o_cp_buttons"),
+            target.querySelector(".o_control_panel_actions"),
             ".o_list_selection_box",
             "list selection box should not be displayed"
         );
@@ -3260,7 +3289,10 @@ QUnit.module("Views", (hooks) => {
                 </tree>`,
         });
 
-        assert.containsNone(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
+        assert.containsNone(
+            target.querySelector(".o_control_panel_actions"),
+            ".o_list_selection_box"
+        );
         assert.strictEqual(
             $(target).find("tfoot td:nth(2)").text(),
             "32",
@@ -3271,7 +3303,10 @@ QUnit.module("Views", (hooks) => {
         var firstRowSelector = target.querySelector("tbody .o_list_record_selector input");
         await click(firstRowSelector);
         assert.ok(firstRowSelector.checked, "first row should be selected");
-        assert.containsOnce(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
+        assert.containsOnce(
+            target.querySelector(".o_control_panel_actions"),
+            ".o_list_selection_box"
+        );
         assert.strictEqual(
             $(target).find("tfoot td:nth(2)").text(),
             "10",
@@ -3281,7 +3316,10 @@ QUnit.module("Views", (hooks) => {
         await reloadListView(target);
         firstRowSelector = target.querySelector("tbody .o_list_record_selector input");
         assert.notOk(firstRowSelector.checked, "first row should no longer be selected");
-        assert.containsNone(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
+        assert.containsNone(
+            target.querySelector(".o_control_panel_actions"),
+            ".o_list_selection_box"
+        );
         assert.strictEqual(
             $(target).find("tfoot td:nth(2)").text(),
             "32",
@@ -3303,14 +3341,20 @@ QUnit.module("Views", (hooks) => {
                 </tree>`,
         });
 
-        assert.containsNone(target, "div.o_control_panel .o_cp_action_menus");
-        assert.containsNone(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
+        assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus");
+        assert.containsNone(
+            target.querySelector(".o_control_panel_actions"),
+            ".o_list_selection_box"
+        );
 
         // open blip grouping and check all lines
         await click($(target).find('.o_group_header:contains("blip (2)")')[0]);
         await click(target.querySelector(".o_data_row input"));
         assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus");
-        assert.containsOnce(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
+        assert.containsOnce(
+            target.querySelector(".o_control_panel_actions"),
+            ".o_list_selection_box"
+        );
 
         // open yop grouping and verify blip are still checked
         await click($(target).find('.o_group_header:contains("yop (1)")')[0]);
@@ -3320,7 +3364,10 @@ QUnit.module("Views", (hooks) => {
             "opening a grouping does not uncheck others"
         );
         assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus");
-        assert.containsOnce(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
+        assert.containsOnce(
+            target.querySelector(".o_control_panel_actions"),
+            ".o_list_selection_box"
+        );
 
         // close and open blip grouping and verify blip are unchecked
         await click($(target).find('.o_group_header:contains("blip (2)")')[0]);
@@ -3330,8 +3377,11 @@ QUnit.module("Views", (hooks) => {
             ".o_data_row input:checked",
             "opening and closing a grouping uncheck its elements"
         );
-        assert.containsNone(target, "div.o_control_panel .o_cp_action_menus");
-        assert.containsNone(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
+        assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus");
+        assert.containsNone(
+            target.querySelector(".o_control_panel_actions"),
+            ".o_list_selection_box"
+        );
     });
 
     QUnit.test("select a record in list grouped by date with granularity", async function (assert) {
@@ -3347,11 +3397,17 @@ QUnit.module("Views", (hooks) => {
         });
 
         assert.containsN(target, ".o_group_header", 2);
-        assert.containsNone(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
+        assert.containsNone(
+            target.querySelector(".o_control_panel_actions"),
+            ".o_list_selection_box"
+        );
         await click(target.querySelector(".o_group_header"));
         assert.containsOnce(target, ".o_data_row");
         await click(target.querySelector(".o_data_row .o_list_record_selector"));
-        assert.containsOnce(target.querySelector(".o_cp_buttons"), ".o_list_selection_box");
+        assert.containsOnce(
+            target.querySelector(".o_control_panel_actions"),
+            ".o_list_selection_box"
+        );
     });
 
     QUnit.test("aggregates are computed correctly", async function (assert) {
@@ -3395,7 +3451,8 @@ QUnit.module("Views", (hooks) => {
         assert.deepEqual(getFooterTextArray(), ["", "", "32", "1.50"]);
 
         // Let's update the view to dislay NO records
-        await toggleFilterMenu(target);
+        await click(target.querySelector(".o_list_unselect_all"));
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "My Filter");
         assert.deepEqual(getFooterTextArray(), ["", "", "", ""]);
     });
@@ -4081,7 +4138,7 @@ QUnit.module("Views", (hooks) => {
         var editionWidth = window.getComputedStyle(target.querySelector("table")).width;
 
         // leave edition
-        await click(target.querySelector(".o_list_button_save"));
+        await click($(".o_list_button_save:visible").get(0));
 
         var readonlyWidths = [...target.querySelectorAll("thead th")].map((el) => el.offsetWidth);
         var readonlyWidth = window.getComputedStyle(target.querySelector("table")).width;
@@ -4419,7 +4476,7 @@ QUnit.module("Views", (hooks) => {
             assert.containsOnce(target, ".o_view_nocontent", "should have no content help");
 
             // click on create button
-            await click(target.querySelector(".o_list_button_add"));
+            await click($(".o_list_button_add:visible").get(0));
             const handleWidgetWidth = "33px";
             const handleWidgetHeader = target.querySelector("thead > tr > th.o_handle_cell");
 
@@ -4759,7 +4816,7 @@ QUnit.module("Views", (hooks) => {
                 arch: '<tree editable="top"><field name="m2o"/></tree>',
             });
 
-            await click(target.querySelector(".o_list_button_add"));
+            await click($(".o_list_button_add:visible").get(0));
             assert.strictEqual(
                 target.querySelector(".o_selected_row .o_field_many2one input").value,
                 ""
@@ -4870,7 +4927,7 @@ QUnit.module("Views", (hooks) => {
 
         var width = target.querySelectorAll('th[data-name="datetime"]')[0].offsetWidth;
 
-        await click(target.querySelector(".o_list_button_add"));
+        await click($(".o_list_button_add:visible").get(0));
 
         assert.containsOnce(target, ".o_data_row");
         assert.strictEqual(
@@ -4987,8 +5044,11 @@ QUnit.module("Views", (hooks) => {
                         <field name="text"/>
                     </tree>`,
             });
-
-            assert.strictEqual($(target).find('th[data-name="int_field"]')[0].offsetWidth, 200);
+            const pixelsWidth = getComputedStyle(
+                target.querySelector('th[data-name="int_field"]')
+            ).width;
+            const width = Math.floor(parseFloat(pixelsWidth));
+            assert.strictEqual(width, 200);
         }
     );
 
@@ -5163,7 +5223,7 @@ QUnit.module("Views", (hooks) => {
             const editionWidth = target.querySelector(".o_data_row").offsetWidth;
 
             // leave edition
-            await click(target.querySelector(".o_list_button_save"));
+            await click($(".o_list_button_save:visible").get(0));
             const readonlyHeight = target.querySelector(".o_data_row").offsetHeight;
             const readonlyWidth = target.querySelector(".o_data_row").offsetWidth;
 
@@ -5261,7 +5321,7 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        assert.containsNone(target, "div.o_control_panel .o_cp_action_menus");
+        assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus");
         assert.containsN(target, "tbody td.o_list_record_selector", 4, "should have 4 records");
 
         await click(target.querySelector("tbody td.o_list_record_selector:first-child input"));
@@ -5340,7 +5400,7 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        assert.containsNone(target, "div.o_control_panel .o_cp_action_menus");
+        assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus");
         assert.containsN(target, "tbody td.o_list_record_selector", 2, "should have 2 records");
 
         await click(target.querySelector("thead .o_list_record_selector input"));
@@ -5388,7 +5448,7 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        assert.containsNone(target, "div.o_control_panel .o_cp_action_menus");
+        assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus");
         assert.containsN(target, "tbody td.o_list_record_selector", 2, "should have 2 records");
 
         await click(target.querySelector("thead .o_list_record_selector input"));
@@ -5425,7 +5485,7 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        assert.containsNone(target, "div.o_control_panel .o_cp_action_menus");
+        assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus");
         assert.containsN(target, "tbody td.o_list_record_selector", 4, "should have 4 records");
 
         await click(target.querySelector("tbody td.o_list_record_selector:first-child input"));
@@ -5493,7 +5553,7 @@ QUnit.module("Views", (hooks) => {
             loadActionMenus: true,
         });
 
-        assert.containsNone(target, "div.o_control_panel .o_cp_action_menus");
+        assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus");
         assert.containsN(target, "tbody td.o_list_record_selector", 2, "should have 2 records");
 
         await click(target, "thead .o_list_record_selector input");
@@ -5544,7 +5604,7 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        assert.containsNone(target, "div.o_control_panel .o_cp_action_menus");
+        assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus");
         assert.containsN(target, "tbody td.o_list_record_selector", 2, "should have 2 records");
 
         await click(target, "thead .o_list_record_selector input");
@@ -5601,7 +5661,6 @@ QUnit.module("Views", (hooks) => {
         const webClient = await createWebClient({ serverData, mockRPC });
         await doAction(webClient, 11);
 
-        assert.containsNone(target, ".o_cp_action_menus", "sidebar should be invisible");
         assert.containsN(target, "tbody td.o_list_record_selector", 4, "should have 4 records");
 
         await click(target.querySelector("tbody td.o_list_record_selector input"));
@@ -5660,7 +5719,7 @@ QUnit.module("Views", (hooks) => {
                 </tree>`,
             actionMenus: {},
         });
-        assert.containsNone(target, "div.o_control_panel .o_cp_action_menus");
+        assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus");
 
         await click(target, "thead .o_list_record_selector input");
         assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus");
@@ -5714,7 +5773,7 @@ QUnit.module("Views", (hooks) => {
                 </tree>`,
             actionMenus: {},
         });
-        assert.containsNone(target, "div.o_control_panel .o_cp_action_menus");
+        assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus");
 
         await click(target, "thead .o_list_record_selector input");
         assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus");
@@ -5805,7 +5864,7 @@ QUnit.module("Views", (hooks) => {
 
         assert.containsOnce(target, "div.o_control_panel .o_cp_pager .o_pager");
         assert.strictEqual(target.querySelector(".o_pager_limit").innerText, "4");
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Bar");
         assert.strictEqual(target.querySelector(".o_pager_limit").innerText, "2");
     });
@@ -6216,10 +6275,8 @@ QUnit.module("Views", (hooks) => {
                     </search>`,
             });
 
-            await toggleFilterMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "Foo");
-
-            await toggleGroupByMenu(target);
             await toggleMenuItem(target, "Bar");
 
             // expand group
@@ -6320,7 +6377,12 @@ QUnit.module("Views", (hooks) => {
                     [false, "kanban"],
                 ],
             });
-            assert.containsOnce(target, ".o_cp_switch_buttons");
+            assert.containsN(
+                target,
+                ".o_cp_switch_buttons",
+                2,
+                "Should have 2 button (small and xl screens)"
+            );
             assert.containsN(target, ".o_switch_view", 2);
             assert.containsOnce(target, ".o_list_view");
 
@@ -6782,7 +6844,7 @@ QUnit.module("Views", (hooks) => {
                 "</tree>",
         });
 
-        await click(target.querySelector(".o_list_button_add"));
+        await click($(".o_list_button_add:visible").get(0));
         assert.containsNone(
             target,
             "tr.o_data_row.text-danger",
@@ -6947,7 +7009,7 @@ QUnit.module("Views", (hooks) => {
                 "o_catch_attention"
             );
 
-            await toggleFilterMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "Empty List");
             assert.containsOnce(target, ".o_view_nocontent");
 
@@ -7058,7 +7120,7 @@ QUnit.module("Views", (hooks) => {
             "Datetime field should have the right format"
         );
 
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "empty");
         await toggleMenuItem(target, "False Domain");
         assert.doesNotHaveClass(
@@ -7181,7 +7243,7 @@ QUnit.module("Views", (hooks) => {
         assert.hasClass(document.activeElement, "o_searchview_input");
 
         // From 'Create' button
-        document.querySelector(".btn.o_list_button_add").focus();
+        $(".o_list_button_add:visible").get(0).focus();
 
         assert.hasClass(document.activeElement, "o_list_button_add");
 
@@ -7254,7 +7316,7 @@ QUnit.module("Views", (hooks) => {
             "o_view_sample_data"
         );
 
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "true_domain");
         await toggleMenuItem(target, "false_domain");
         assert.containsOnce(target, ".o_list_table");
@@ -7360,7 +7422,7 @@ QUnit.module("Views", (hooks) => {
             assert.containsOnce(target, ".o_nocontent_help");
 
             // Start creating a record
-            await click(target.querySelector(".btn.o_list_button_add"));
+            await click($(".o_list_button_add:visible").get(0));
             assert.doesNotHaveClass(
                 target.querySelector(".o_list_view .o_content"),
                 "o_view_sample_data"
@@ -7368,7 +7430,7 @@ QUnit.module("Views", (hooks) => {
             assert.containsOnce(target, ".o_data_row");
 
             // Discard temporary record
-            await click(target.querySelector(".btn.o_list_button_discard"));
+            await click($(".o_list_button_discard:visible").get(0));
 
             // Final state: there should be no table, but the no content helper
             assert.doesNotHaveClass(
@@ -7405,7 +7467,7 @@ QUnit.module("Views", (hooks) => {
             assert.containsOnce(target, ".o_nocontent_help");
 
             // Start creating a record
-            await click(target.querySelector(".btn.o_list_button_add"));
+            await click($(".o_list_button_add:visible").get(0));
             assert.doesNotHaveClass(
                 target.querySelector(".o_list_view .o_content"),
                 "o_view_sample_data"
@@ -7751,7 +7813,7 @@ QUnit.module("Views", (hooks) => {
         assert.containsOnce(target, "div.table-responsive", "should have a div.table-responsive");
         assert.containsOnce(target, "table", "should have rendered a table");
 
-        await click(target.querySelector(".o_list_button_add"));
+        await click($(".o_list_button_add:visible").get(0));
         assert.containsNone(
             target,
             ".o_view_nocontent",
@@ -7813,7 +7875,7 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_list_button_add"));
+        await click($(".o_list_button_add:visible").get(0));
 
         assert.containsOnce(
             target,
@@ -7872,9 +7934,14 @@ QUnit.module("Views", (hooks) => {
             "td:not(.o_list_record_selector) input",
             "first cell should be editable"
         );
-        assert.containsOnce(target, ".o_list_button_discard");
+        assert.containsN(
+            target,
+            ".o_list_button_discard",
+            2,
+            "Should have 2 discard button (small and xl screens)"
+        );
 
-        await click(target.querySelector(".o_list_button_discard"));
+        await click(target.querySelector(".o_list_button_discard:not(.dropdown-item)"));
 
         assert.containsNone(
             target,
@@ -7904,17 +7971,17 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_list_button_add"));
+        await click($(".o_list_button_add:visible").get(0));
         await editInput(target, ".o_field_widget[name=foo] input", "new value");
         await click(target.querySelector(".o_list_renderer"));
         assert.verifySteps(["create"]);
 
-        await click(target.querySelector(".o_list_button_add"));
+        await click($(".o_list_button_add:visible").get(0));
         await editInput(target, ".o_field_widget[name=foo] input", "new value");
         await click(target.querySelector("tfoot"));
         assert.verifySteps(["create"]);
 
-        await click(target.querySelector(".o_list_button_add"));
+        await click($(".o_list_button_add:visible").get(0));
         await editInput(target, ".o_field_widget[name=foo] input", "new value");
         await click(target.querySelectorAll("tbody tr")[2].querySelector(".o_data_cell"));
         assert.verifySteps(["create"]);
@@ -7933,7 +8000,7 @@ QUnit.module("Views", (hooks) => {
                     <field name="date"/>
                 </tree>`,
         });
-        await click(target, ".o_list_button_add");
+        await click($(".o_list_button_add:visible").get(0));
         assert.strictEqual(
             document.activeElement,
             target.querySelector(".o_field_widget[name=foo] input")
@@ -8021,7 +8088,7 @@ QUnit.module("Views", (hooks) => {
         assert.strictEqual(target.querySelectorAll(".o_field_cell")[2].innerHTML, "");
         assert.strictEqual(target.querySelector(".o_data_cell.o_list_button").innerHTML, "");
 
-        await click(target.querySelector(".o_list_button_discard"));
+        await click(target.querySelector(".o_list_button_discard:not(.dropdown-item)"));
 
         // click on the invisible field's cell to edit first row
         await click(target.querySelectorAll(".o_field_cell")[2]);
@@ -8420,16 +8487,31 @@ QUnit.module("Views", (hooks) => {
         });
 
         assert.containsN(target, "tr.o_data_row", 4, "should have 4 records");
-        assert.containsOnce(target, ".o_list_button_add");
+        assert.containsN(
+            target,
+            ".o_list_button_add",
+            2,
+            "Should have 2 add button (small and xl screens)"
+        );
         assert.containsNone(target, ".o_list_button_discard");
         assert.containsN(target, ".o_list_record_selector input:enabled", 5);
-        await click(target.querySelector(".o_list_button_add"));
+        await click($(".o_list_button_add:visible").get(0));
         assert.containsNone(target, ".o_list_button_add");
-        assert.containsOnce(target, ".o_list_button_discard");
+        assert.containsN(
+            target,
+            ".o_list_button_discard",
+            2,
+            "Should have 2 discard button (small and xl screens)"
+        );
         assert.containsNone(target, ".o_list_record_selector input:enabled");
-        await click(target.querySelector(".o_list_button_discard"));
+        await click(target.querySelector(".o_list_button_discard:not(.dropdown-item)"));
         assert.containsN(target, "tr.o_data_row", 4, "should still have 4 records");
-        assert.containsOnce(target, ".o_list_button_add");
+        assert.containsN(
+            target,
+            ".o_list_button_add",
+            2,
+            "Should have 2 add button (small and xl screens)"
+        );
         assert.containsNone(target, ".o_list_button_discard");
         assert.containsN(target, ".o_list_record_selector input:enabled", 5);
     });
@@ -8477,7 +8559,7 @@ QUnit.module("Views", (hooks) => {
 
             // Reswitch the field to visible and save the row
             await click(target.querySelector(".o_field_widget[name=bar] input"));
-            await click(target.querySelector(".o_list_button_save"));
+            await click($(".o_list_button_save:visible").get(0));
 
             target.querySelectorAll(".o_data_cell.o_list_char");
             assert.deepEqual(
@@ -8583,7 +8665,7 @@ QUnit.module("Views", (hooks) => {
                 target.querySelector(".o_selected_row .o_field_widget[name=foo]"),
                 "o_required_modifier"
             );
-            await click(target.querySelector(".o_list_button_save"));
+            await click($(".o_list_button_save:visible").get(0));
             await click(target.querySelector(".o_field_cell"));
             assert.doesNotHaveClass(
                 target.querySelector(".o_selected_row .o_field_widget[name=foo]"),
@@ -8895,7 +8977,7 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        assert.containsNone(target, "div.o_control_panel .o_cp_action_menus");
+        assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus");
 
         await click(target.querySelector(".o_list_record_selector input"));
         await toggleActionMenu(target);
@@ -8941,7 +9023,7 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        assert.containsNone(target, "div.o_control_panel .o_cp_action_menus");
+        assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus");
         assert.containsN(target, ".o_data_row", 4);
         // select all records
         await click(target, "thead .o_list_record_selector input");
@@ -9002,7 +9084,7 @@ QUnit.module("Views", (hooks) => {
                     </search>`,
             });
 
-            assert.containsNone(target, "div.o_control_panel .o_cp_action_menus");
+            assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus");
             assert.containsN(target, ".o_data_row", 4);
 
             // select all records
@@ -9020,8 +9102,10 @@ QUnit.module("Views", (hooks) => {
             await toggleActionMenu(target);
             await toggleMenuItem(target, "Custom Action");
 
-            // add a domain and select first two records
-            await toggleFilterMenu(target);
+            // add a domain and select first two records (need to unselect records first)
+            await click(target.querySelector("thead .o_list_record_selector input")); // select all
+            await click(target.querySelector("thead .o_list_record_selector input")); // unselect all
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "bar");
             assert.containsN(target, ".o_data_row", 3);
             assert.containsNone(target, ".o_list_record_selector input:checked");
@@ -9083,7 +9167,7 @@ QUnit.module("Views", (hooks) => {
                     </search>`,
             });
 
-            assert.containsNone(target, "div.o_control_panel .o_cp_action_menus");
+            assert.containsOnce(target, "div.o_control_panel .o_cp_action_menus");
             assert.containsN(target, ".o_data_row", 2);
 
             // select all records
@@ -9102,8 +9186,9 @@ QUnit.module("Views", (hooks) => {
             await toggleActionMenu(target);
             await toggleMenuItem(target, "Custom Action");
 
-            // add a domain
-            await toggleFilterMenu(target);
+            // add a domain (need to unselect records first)
+            await click(target.querySelector("thead .o_list_record_selector input"));
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "bar");
             assert.containsNone(target, ".o_list_selection_box .o_list_select_domain");
 
@@ -9140,7 +9225,7 @@ QUnit.module("Views", (hooks) => {
         );
 
         await clickDiscard(target);
-        await click(target.querySelector(".o_list_button_add"));
+        await click($(".o_list_button_add:visible").get(0));
         assert.ok(
             $(target).find(".o_data_row:nth(0)").is(".o_selected_row"),
             "first row should be in edition (creation)"
@@ -9796,7 +9881,7 @@ QUnit.module("Views", (hooks) => {
 
             await click(target.querySelector(".o_field_cell"));
             await editInput(target, ".o_field_widget[name=foo] input", "hello");
-            await click(target.querySelector(".o_list_button_discard"));
+            await click(target.querySelector(".o_list_button_discard:not(.dropdown-item)"));
             assert.containsNone(document.body, ".modal", "should be no modal to ask for discard");
 
             assert.strictEqual(
@@ -9870,7 +9955,7 @@ QUnit.module("Views", (hooks) => {
                         <filter name="bar" string="bar" context="{'group_by': 'bar'}"/>
                     </search>`,
             });
-            await toggleGroupByMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "bar");
             await toggleMenuItem(target, "bar");
 
@@ -9885,7 +9970,7 @@ QUnit.module("Views", (hooks) => {
             );
 
             const modal = target.querySelector(".modal");
-            await toggleGroupByMenu(modal);
+            await toggleSearchBarMenu(modal);
             await toggleMenuItem(modal, "cornichon");
             await click(target.querySelector(".o_group_header"));
             assert.containsOnce(target, ".modal-content .o_group_open");
@@ -9919,7 +10004,7 @@ QUnit.module("Views", (hooks) => {
             arch: '<tree editable="top"><field name="foo"/></tree>',
         });
 
-        await click(target.querySelector(".o_list_button_add"));
+        await click($(".o_list_button_add:visible").get(0));
         assert.containsN(target, "tr.o_data_row", 5, "should currently adding a 5th data row");
 
         await triggerEvent(target, '[name="foo"] input', "keydown", { key: "escape" });
@@ -9938,7 +10023,7 @@ QUnit.module("Views", (hooks) => {
                 arch: '<tree editable="top"><field name="foo" required="1"/></tree>',
             });
 
-            await click(target.querySelector(".o_list_button_add"));
+            await click($(".o_list_button_add:visible").get(0));
             assert.containsN(target, "tr.o_data_row", 5, "should currently adding a 5th data row");
 
             await triggerEvent(target, '[name="foo"] input', "keydown", { key: "escape" });
@@ -10476,8 +10561,8 @@ QUnit.module("Views", (hooks) => {
         assert.containsN(target, ".o_data_row", 4, "should contain 4 records");
 
         // click on Add twice, and delay the onchange
-        click(target.querySelector(".o_list_button_add"));
-        click(target.querySelector(".o_list_button_add"));
+        click($(".o_list_button_add:visible").get(0));
+        click($(".o_list_button_add:visible").get(0));
 
         prom.resolve();
         await nextTick();
@@ -10810,7 +10895,7 @@ QUnit.module("Views", (hooks) => {
 
         await click(target.querySelector(".o_data_cell"));
         await editInput(target.querySelector(".o_field_widget[name=foo] input"), null, "abc");
-        await click(target.querySelector(".o_list_button_save"));
+        await click($(".o_list_button_save:visible").get(0));
     });
 
     QUnit.test("editable list view: contexts with multiple edit", async function (assert) {
@@ -10859,7 +10944,7 @@ QUnit.module("Views", (hooks) => {
         // Edit the second
         await click(target.querySelectorAll(".o_data_row")[1].querySelector(".o_data_cell"));
         await editInput(target, ".o_data_cell input", "oui");
-        await click(target.querySelector(".o_list_button_save"));
+        await click($(".o_list_button_save:visible").get(0));
 
         assert.deepEqual(getNodesTextContent(target.querySelectorAll(".o_data_cell")), [
             "yop",
@@ -10884,7 +10969,7 @@ QUnit.module("Views", (hooks) => {
             });
             assert.containsN(target, ".o_data_row", 4);
 
-            await click(target.querySelector(".o_list_button_add"));
+            await click($(".o_list_button_add:visible").get(0));
             assert.containsN(target, ".o_data_row", 5);
             assert.containsOnce(target, ".o_selected_row");
 
@@ -10893,12 +10978,12 @@ QUnit.module("Views", (hooks) => {
             assert.containsN(target, ".o_data_row", 4);
             assert.containsNone(target, ".o_selected_row");
 
-            await click(target.querySelector(".o_list_button_add"));
+            await click($(".o_list_button_add:visible").get(0));
             assert.containsN(target, ".o_data_row", 5);
             assert.containsOnce(target, ".o_selected_row");
 
             // do not change anything and then click save button should not allow to discard record
-            await click(target.querySelector(".o_list_button_save"));
+            await click($(".o_list_button_save:visible").get(0));
             assert.containsN(target, ".o_data_row", 5);
             assert.containsOnce(target, ".o_selected_row");
 
@@ -10912,7 +10997,7 @@ QUnit.module("Views", (hooks) => {
             assert.containsN(target, ".o_data_row", 4);
             assert.containsNone(target, ".o_selected_row");
 
-            await click(target.querySelector(".o_list_button_add"));
+            await click($(".o_list_button_add:visible").get(0));
             assert.containsN(target, ".o_data_row", 5);
             assert.containsOnce(target, ".o_selected_row");
 
@@ -10922,8 +11007,8 @@ QUnit.module("Views", (hooks) => {
             assert.containsOnce(target, ".o_selected_row");
 
             // discard row and create new record and keep required field empty and click anywhere
-            await click(target.querySelector(".o_list_button_discard"));
-            await click(target, ".o_list_button_add");
+            await click(target.querySelector(".o_list_button_discard:not(.dropdown-item)"));
+            await click($(".o_list_button_add:visible").get(0));
             assert.containsOnce(target, ".o_selected_row", "row should be selected");
             await editInput(target, ".o_selected_row [name=int_field] input", 123);
             await click(target, ".o_list_view");
@@ -10932,7 +11017,7 @@ QUnit.module("Views", (hooks) => {
     );
 
     QUnit.test("editable list view: multi edition", async function (assert) {
-        assert.expect(27);
+        assert.expect(26);
 
         await makeView({
             type: "list",
@@ -10981,7 +11066,7 @@ QUnit.module("Views", (hooks) => {
         assert.containsNone(target, ".o_selected_row");
 
         // create a record and edit its value
-        await click(target, ".o_list_button_add");
+        await click($(".o_list_button_add:visible").get(0));
         assert.verifySteps(["onchange"]);
 
         await editInput(target, ".o_selected_row [name=int_field] input", 123);
@@ -11040,11 +11125,6 @@ QUnit.module("Views", (hooks) => {
             ".o_data_cell input.o_field_widget",
             "no field should be editable anymore"
         );
-        assert.strictEqual(
-            document.activeElement,
-            $(target).find(".o_data_row:eq(0) .o_data_cell:eq(1)")[0],
-            "focus should be given to the most recently edited cell after confirm"
-        );
     });
 
     QUnit.test("editable list view: multi edit a field with string attr", async function (assert) {
@@ -11092,7 +11172,7 @@ QUnit.module("Views", (hooks) => {
         });
 
         // click on CREATE (should trigger a switch_view)
-        await click(target, ".o_list_button_add");
+        await click($(".o_list_button_add:visible").get(0));
         assert.verifySteps(["createRecord"]);
     });
 
@@ -11367,7 +11447,7 @@ QUnit.module("Views", (hooks) => {
             await click(rows[0].querySelector(".o_data_cell"));
             target.querySelector(".o_data_row .o_data_cell input").value = "oof";
 
-            const discardButton = target.querySelector(".o_list_button_discard");
+            const discardButton = $(".o_list_button_discard:visible").get(0);
             // Simulates an actual click (event chain is: mousedown > change > blur > focus > mouseup > click)
             await triggerEvents(discardButton, null, ["mousedown"]);
             await triggerEvents(target.querySelector(".o_data_row .o_data_cell input"), null, [
@@ -11411,7 +11491,7 @@ QUnit.module("Views", (hooks) => {
             await click(rows[0].querySelector(".o_data_cell"));
             target.querySelector(".o_data_row .o_data_cell input").value = "oof";
 
-            await triggerEvents(target, ".o_list_button_discard", ["mousedown"]);
+            await triggerEvents($(".o_list_button_discard:visible").get(0), null, ["mousedown"]);
             await triggerEvents(target, ".o_data_row .o_data_cell input", [
                 "change",
                 "blur",
@@ -11458,16 +11538,16 @@ QUnit.module("Views", (hooks) => {
             await triggerEvents(target, ".o_data_row .o_data_cell input", ["input"]);
 
             // mousedown on Discard and then mouseup also on Discard
-            await triggerEvents(target, ".o_list_button_discard", ["mousedown"]);
+            await triggerEvents($(".o_list_button_discard:visible").get(0), null, ["mousedown"]);
             await triggerEvents(target, ".o_data_row .o_data_cell input", [
                 "change",
                 "blur",
                 "focusout",
             ]);
-            await triggerEvents(target, ".o_list_button_discard", ["focus"]);
+            await triggerEvents($(".o_list_button_discard:visible").get(0), null, ["focus"]);
             assert.containsNone(target, ".o_dialog", "should not display an invalid field dialog");
-            await triggerEvents(target, ".o_list_button_discard", ["mouseup"]);
-            await click(target.querySelector(".o_list_button_discard"));
+            await triggerEvents($(".o_list_button_discard:visible").get(0), null, ["mouseup"]);
+            await click(target.querySelector(".o_list_button_discard:not(.dropdown-item)"));
             assert.containsNone(target, ".o_dialog", "should not display an invalid field dialog");
             assert.strictEqual(target.querySelector(".o_data_row .o_data_cell").innerText, "10");
 
@@ -11477,7 +11557,7 @@ QUnit.module("Views", (hooks) => {
             await triggerEvents(target, ".o_data_row .o_data_cell input", ["input"]);
 
             // mousedown on Discard (simulate a mousemove) and mouseup somewhere else
-            await triggerEvents(target, ".o_list_button_discard", ["mousedown"]);
+            await triggerEvents($(".o_list_button_discard:visible").get(0), null, ["mousedown"]);
             await triggerEvents(target, ".o_data_row .o_data_cell input", [
                 "change",
                 "blur",
@@ -11513,7 +11593,7 @@ QUnit.module("Views", (hooks) => {
             await click(rows[0].querySelector(".o_data_cell"));
             target.querySelector(".o_data_row .o_data_cell input").value = "oof";
 
-            const discardButton = target.querySelector(".o_list_button_discard");
+            const discardButton = $(".o_list_button_discard:visible").get(0);
             // Simulates an actual click (event chain is: mousedown > change > blur > focus > mouseup > click)
             await triggerEvents(discardButton, null, ["mousedown"]);
             await triggerEvents(target.querySelector(".o_data_row .o_data_cell input"), null, [
@@ -12180,7 +12260,7 @@ QUnit.module("Views", (hooks) => {
                 </tree>`,
         });
 
-        await click(target.querySelector(".o_list_button_add"));
+        await click($(".o_list_button_add:visible").get(0));
         assert.containsOnce(target, ".o_selected_row");
         assert.notOk(target.querySelector(".o_selected_row .o_field_boolean input").checked);
         assert.doesNotHaveClass(
@@ -12459,7 +12539,7 @@ QUnit.module("Views", (hooks) => {
         // reload with a domain (this request is blocked)
         blockSearchRead = true;
         // list.reload({ domain: [["foo", "=", "yop"]] });
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "yop");
         assert.containsN(
             target,
@@ -12471,7 +12551,7 @@ QUnit.module("Views", (hooks) => {
         // reload without the domain
         blockSearchRead = false;
         // list.reload({ domain: [] });
-        // await toggleFilterMenu(target);
+        // await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "yop");
         assert.containsN(
             target,
@@ -12703,13 +12783,21 @@ QUnit.module("Views", (hooks) => {
                 1,
                 "should have 1 records"
             );
-            assert.containsNone(target, ".o_cp_action_menus", "sidebar should not be available");
+            assert.containsNone(
+                target,
+                ".o_control_panel_actions .o_cp_action_menus",
+                "sidebar should not be available"
+            );
 
             await click(
                 target,
                 "tbody .o_data_row:first-child td.o_list_record_selector:first-child input"
             );
-            assert.containsOnce(target, ".o_cp_action_menus", "sidebar should be available");
+            assert.containsOnce(
+                target,
+                ".o_control_panel_actions .o_cp_action_menus",
+                "sidebar should be available"
+            );
 
             // archive all records of current page
             await toggleActionMenu(target);
@@ -12796,10 +12884,10 @@ QUnit.module("Views", (hooks) => {
             // check line is at the correct place
 
             const inputText = "ninja";
-            await click(target, ".o_list_button_add");
+            await click($(".o_list_button_add:visible").get(0));
             await editInput(target, '[name="foo"] input', inputText);
             await clickSave(target);
-            await click(target, ".o_list_button_add");
+            await click($(".o_list_button_add:visible").get(0));
 
             assert.deepEqual(
                 [...target.querySelectorAll(".o_data_cell.o_list_char")].map(
@@ -12824,7 +12912,7 @@ QUnit.module("Views", (hooks) => {
         });
 
         // add a new record
-        await click(target, ".o_list_button_add");
+        await click($(".o_list_button_add:visible").get(0));
 
         // modifiers should be evaluted to false
         assert.containsOnce(target, ".o_selected_row");
@@ -13090,7 +13178,7 @@ QUnit.module("Views", (hooks) => {
         assert.containsN(target, ".o_group_header", 1); // page 2
 
         // toggle a filter -> there should be only one group left (on page 1)
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, 0);
         assert.deepEqual(getPagerValue(target), [1, 1]);
         assert.containsN(target, ".o_group_header", 1); // page 1
@@ -13109,7 +13197,7 @@ QUnit.module("Views", (hooks) => {
                     <filter name="bar" string="bar" context="{'group_by': 'bar'}"/>
                 </search>`,
         });
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "bar");
         await click(target.querySelector(".o_group_header"));
 
@@ -13122,7 +13210,7 @@ QUnit.module("Views", (hooks) => {
         assert.containsNone(target, ".o_selected_row");
 
         // reload without groupBy
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "bar");
 
         // enter edition (ungrouped case)
@@ -13151,7 +13239,7 @@ QUnit.module("Views", (hooks) => {
         assert.containsOnce(target, ".o_selected_row");
 
         // reload with a groupby
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "bar");
 
         // open first group
@@ -13194,10 +13282,15 @@ QUnit.module("Views", (hooks) => {
                 </search>`,
         });
 
-        assert.containsOnce(target, ".o_list_button_add");
+        assert.containsN(
+            target,
+            ".o_list_button_add",
+            2,
+            "Should have 2 add button (small and xl screens)"
+        );
 
         // reload with a groupby
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "bar");
 
         assert.containsNone(target, ".o_list_button_add");
@@ -13205,7 +13298,12 @@ QUnit.module("Views", (hooks) => {
         // reload without groupby
         await toggleMenuItem(target, "bar");
 
-        assert.containsOnce(target, ".o_list_button_add");
+        assert.containsN(
+            target,
+            ".o_list_button_add",
+            2,
+            "Should have 2 add button (small and xl screens)"
+        );
     });
 
     QUnit.test(
@@ -13224,15 +13322,17 @@ QUnit.module("Views", (hooks) => {
             });
 
             assert.containsNone(target, ".o_data_row", "all groups should be closed");
-            assert.isVisible(
-                target.querySelector(".o_list_button_add"),
+            assert.strictEqual(
+                $(".o_list_button_add:visible").length,
+                1,
                 "should have a visible Create button"
             );
 
             await click(target.querySelector(".o_group_header"));
             assert.containsN(target, ".o_data_row", 2, "first group should be opened");
-            assert.isVisible(
-                target.querySelector(".o_list_button_add"),
+            assert.strictEqual(
+                $(".o_list_button_add:visible").length,
+                1,
                 "should have a visible Create button"
             );
 
@@ -13242,15 +13342,17 @@ QUnit.module("Views", (hooks) => {
                 ".o_data_row:eq(0) .o_list_record_selector input:enabled",
                 "should have selected first record"
             );
-            assert.isVisible(
-                target.querySelector(".o_list_button_add"),
+            assert.strictEqual(
+                $(".o_list_button_add:visible").length,
+                1,
                 "should have a visible Create button"
             );
 
             await click([...target.querySelectorAll(".o_group_header")].pop());
             assert.containsN(target, ".o_data_row", 3, "two groups should be opened");
-            assert.isVisible(
-                target.querySelector(".o_list_button_add"),
+            assert.strictEqual(
+                $(".o_list_button_add:visible").length,
+                1,
                 "should have a visible Create button"
             );
         }
@@ -13270,12 +13372,12 @@ QUnit.module("Views", (hooks) => {
         assert.containsOnce(target, ".o_selected_row");
         assert.hasClass(target.querySelector(".o_data_row:nth-child(5)"), "o_selected_row");
 
-        await click(target, ".o_list_button_discard");
+        await click($(".o_list_button_discard:visible").get(0));
         await click(target, ".o_data_row:nth-child(3) .o_data_cell:nth-child(2)");
         assert.containsOnce(target, ".o_selected_row");
         assert.hasClass(target.querySelector(".o_data_row:nth-child(3)"), "o_selected_row");
 
-        await click(target, ".o_list_button_discard");
+        await click($(".o_list_button_discard:visible").get(0));
         assert.containsNone(target, ".o_selected_row");
 
         await click(target, ".o_data_row:nth-child(5) .o_data_cell:nth-child(2)");
@@ -14415,7 +14517,7 @@ QUnit.module("Views", (hooks) => {
                 </search>`,
         });
 
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Foo");
 
         // expand group
@@ -14727,9 +14829,14 @@ QUnit.module("Views", (hooks) => {
         assert.containsNone(target, ".o_data_row");
 
         // focus create button as a starting point
-        assert.containsOnce(target, ".o_list_button_add");
-        target.querySelector(".o_list_button_add").focus();
-        assert.strictEqual(document.activeElement, target.querySelector(".o_list_button_add"));
+        assert.containsN(
+            target,
+            ".o_list_button_add",
+            2,
+            "Should have 2 add button (small and xl screens)"
+        );
+        $(".o_list_button_add:visible").get(0).focus();
+        assert.strictEqual(document.activeElement, $(".o_list_button_add:visible").get(0));
 
         triggerHotkey("ArrowDown");
         await nextTick();
@@ -14900,7 +15007,7 @@ QUnit.module("Views", (hooks) => {
             await click(target, ".o_group_field_row_add a");
 
             assert.containsN(target, ".o_data_row", 4);
-            await click(target, ".o_list_button_discard");
+            await click($(".o_list_button_discard:visible").get(0));
             // At this point, a crash manager should appear if no proper link targetting
             assert.containsN(target, ".o_data_row", 3);
         }
@@ -15967,7 +16074,7 @@ QUnit.module("Views", (hooks) => {
             const initialRowCount = $(".o_data_cell[name=int_field]").length;
 
             // click on int_field cell of first row
-            await click(target, ".o_list_button_add");
+            await click($(".o_list_button_add:visible").get(0));
 
             await editInput(target, ".o_data_cell[name=int_field] input", "1");
             triggerHotkey("Tab");
@@ -16072,7 +16179,7 @@ QUnit.module("Views", (hooks) => {
         );
         assert.containsN(target, ".o_data_row", 4);
 
-        await click(target, ".o_list_button_add");
+        await click($(".o_list_button_add:visible").get(0));
         await editInput(target, '.o_data_cell [name="foo"] input', "test");
 
         // change action and come back
@@ -16121,7 +16228,7 @@ QUnit.module("Views", (hooks) => {
             );
             assert.containsN(target, ".o_data_row", 4);
 
-            await click(target, ".o_list_button_add");
+            await click($(".o_list_button_add:visible").get(0));
             assert.containsN(target, ".o_data_row", 5);
 
             // change action and come back
@@ -16247,7 +16354,7 @@ QUnit.module("Views", (hooks) => {
             ["yop", "blip", "gnap"]
         );
 
-        await click(target.querySelector(".o_list_button_add"));
+        await click($(".o_list_button_add:visible").get(0));
         await editInput(target, '.o_data_cell [name="foo"] input', "test");
         await pagerNext(target);
         assert.deepEqual(
@@ -16759,7 +16866,7 @@ QUnit.module("Views", (hooks) => {
             ["yop", "gnap", "blip", "blip"]
         );
 
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Foo");
 
         assert.deepEqual(
@@ -16943,7 +17050,7 @@ QUnit.module("Views", (hooks) => {
 
         const value = "14";
         // add a new line
-        await click(target.querySelector(".o_list_button_add"));
+        await click($(".o_list_button_add:visible").get(0));
 
         assert.verifySteps(["onchange"]);
 
@@ -16994,7 +17101,7 @@ QUnit.module("Views", (hooks) => {
                 test: true,
             },
         });
-        await click(target.querySelector(".o_list_button_add"));
+        await click($(".o_list_button_add:visible").get(0));
         await editInput(target, "[name='display_name'] input", "blop");
         assert.containsOnce(target, ".o_selected_row");
 
@@ -17265,7 +17372,7 @@ QUnit.module("Views", (hooks) => {
                 ["yop", "blip"]
             );
 
-            await toggleGroupByMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "Bar");
             assert.containsN(target, "tbody .o_group_header", 2);
             assert.deepEqual(
@@ -17289,7 +17396,7 @@ QUnit.module("Views", (hooks) => {
                 ["gnap", "blip"]
             );
 
-            await toggleGroupByMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "Bar");
             assert.containsN(target, "tbody .o_group_header", 2);
             assert.deepEqual(
@@ -17313,7 +17420,7 @@ QUnit.module("Views", (hooks) => {
                     </tree>`,
         });
 
-        await click(target.querySelector(".o_list_button_add"));
+        await clickAdd();
 
         assert.containsOnce(target, ".o_selected_row");
         assert.containsOnce(target, "div[name=foo] input:focus");
@@ -17492,7 +17599,7 @@ QUnit.module("Views", (hooks) => {
 
         assert.verifySteps(["name_get"]);
 
-        await click(target, ".o_list_button_save");
+        await clickSave(target);
         assert.deepEqual(
             [...target.querySelectorAll(".o_data_row td[name=m2o]")].map((el) => el.innerText),
             ["Value 3", "Value 2", "Value 1", "Value 1"]
@@ -17578,7 +17685,7 @@ QUnit.module("Views", (hooks) => {
         assert.containsN(target, ".o_data_row", 4);
 
         // apply the filter to trigger a reload of datapoints
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "My Filter");
 
         assert.containsN(target, ".o_data_row", 3);
@@ -18291,7 +18398,7 @@ QUnit.module("Views", (hooks) => {
             "/web/dataset/call_kw/foo/web_search_read",
         ]);
 
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "only one");
 
         assert.verifySteps(["/web/dataset/call_kw/foo/web_search_read"]);
@@ -18427,8 +18534,7 @@ QUnit.module("Views", (hooks) => {
             },
         });
         await click(target.querySelector(".o_data_row .o_list_record_selector input"));
-        const cpButtons = getButtons(target);
-        await click(cpButtons[0].querySelector('button[name="a"]'));
+        await click(target.querySelector('.o_control_panel_actions button[name="a"]'));
         assert.containsOnce(document.body, ".modal");
         const modalText = target.querySelector(".modal-body").textContent;
         assert.strictEqual(modalText, "Are you sure?");
@@ -18484,5 +18590,4 @@ QUnit.module("Views", (hooks) => {
             "order:amount ASC, foo ASC", // go back to the list view, it should still be ordered by amount
         ]);
     });
-
 });
diff --git a/addons/web/static/tests/views/pivot_view_tests.js b/addons/web/static/tests/views/pivot_view_tests.js
index b8befa228ad..015185466ba 100644
--- a/addons/web/static/tests/views/pivot_view_tests.js
+++ b/addons/web/static/tests/views/pivot_view_tests.js
@@ -26,10 +26,7 @@ import {
     setupControlPanelFavoriteMenuRegistry,
     setupControlPanelServiceRegistry,
     toggleAddCustomGroup,
-    toggleComparisonMenu,
-    toggleFavoriteMenu,
-    toggleFilterMenu,
-    toggleGroupByMenu,
+    toggleSearchBarMenu,
     toggleMenu,
     toggleMenuItem,
     toggleMenuItemOption,
@@ -265,9 +262,9 @@ QUnit.module("Views", (hooks) => {
                 </pivot>`,
         });
 
-        await click(target.querySelector(".o_cp_bottom_left button.dropdown-toggle"));
+        await click(target.querySelector(".o_pivot_buttons button.dropdown-toggle"));
         assert.strictEqual(
-            target.querySelector(".o_cp_bottom_left .dropdown-menu .dropdown-item").innerText,
+            target.querySelector(".o_pivot_buttons .dropdown-menu .dropdown-item").innerText,
             "BAR"
         );
         assert.strictEqual(
@@ -366,9 +363,9 @@ QUnit.module("Views", (hooks) => {
 
         // there should be only one displayed measure as the other one is invisible
         assert.containsOnce(target, ".o_pivot_measure_row");
-        await click(target.querySelector(".o_cp_bottom_left button.dropdown-toggle"));
+        await click(target.querySelector(".o_pivot_buttons button.dropdown-toggle"));
         // there should be only one measure besides count, as the other one is invisible
-        assert.containsN(target, ".o_cp_bottom_left .dropdown-menu .dropdown-item", 2);
+        assert.containsN(target, ".o_pivot_buttons .dropdown-menu .dropdown-item", 2);
         // the invisible field souldn't be in the groupable fields neither
         await click(target.querySelector(".o_pivot_header_cell_closed"));
         assert.containsNone(target, '.dropdown-menu a[data-field="foo2"]');
@@ -432,10 +429,10 @@ QUnit.module("Views", (hooks) => {
                 </pivot>`,
             });
 
-            await click(target.querySelector(".o_cp_bottom_left button.dropdown-toggle"));
+            await click(target.querySelector(".o_pivot_buttons button.dropdown-toggle"));
             assert.containsOnce(
                 target,
-                ".o_cp_bottom_left .dropdown-menu .dropdown-item:contains(Computed and not stored)"
+                ".o_pivot_buttons .dropdown-menu .dropdown-item:contains(Computed and not stored)"
             );
             assert.strictEqual(
                 target.querySelector(".o_pivot_measure_row").innerText,
@@ -580,7 +577,7 @@ QUnit.module("Views", (hooks) => {
             context: { search_default_date_filter: true },
         });
 
-        await toggleComparisonMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Date: Previous period");
 
         // hover Count in first group
@@ -648,7 +645,7 @@ QUnit.module("Views", (hooks) => {
                 context: { search_default_date_filter: true },
             });
 
-            await toggleComparisonMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "Date: Previous period");
 
             // hover the second origin in second group
@@ -773,7 +770,7 @@ QUnit.module("Views", (hooks) => {
                 context: { search_default_date_filter: true },
             });
 
-            await toggleComparisonMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "Date: Previous period");
 
             assert.hasClass(target.querySelector("table"), "o_enable_linking");
@@ -829,9 +826,9 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_cp_bottom_left .dropdown-toggle"));
-        assert.containsOnce(target, ".o_cp_bottom_left .dropdown-menu .dropdown-item");
-        const measure = target.querySelector(".o_cp_bottom_left .dropdown-menu .dropdown-item");
+        await click(target.querySelector(".o_pivot_buttons .dropdown-toggle"));
+        assert.containsOnce(target, ".o_pivot_buttons .dropdown-menu .dropdown-item");
+        const measure = target.querySelector(".o_pivot_buttons .dropdown-menu .dropdown-item");
         assert.strictEqual(measure.innerText, "Count");
         assert.hasClass(measure, "selected", "The count measure should be selected");
     });
@@ -861,7 +858,7 @@ QUnit.module("Views", (hooks) => {
         );
         assert.strictEqual(readGroupCount, 1, "should have done 1 rpc");
 
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Some Filter");
         assert.containsOnce(
             target,
@@ -1064,16 +1061,16 @@ QUnit.module("Views", (hooks) => {
             });
 
             // open group by dropdown
-            await toggleGroupByMenu(target);
+            await toggleSearchBarMenu(target);
             assert.containsN(
                 target,
-                ".o_control_panel .o_cp_bottom_right .dropdown-menu .o_menu_item",
+                ".o_control_panel .o_cp_searchview .dropdown-menu .o_menu_item",
                 3,
                 "should have 3 dropdown items in searchview groupby"
             );
             assert.containsOnce(
                 target,
-                ".o_control_panel .o_cp_bottom_right .dropdown-menu .o_add_custom_group_menu",
+                ".o_control_panel .o_cp_searchview .dropdown-menu .o_add_custom_group_menu",
                 "should have custom group generator in searchview groupby"
             );
 
@@ -1129,10 +1126,10 @@ QUnit.module("Views", (hooks) => {
         });
 
         // open group by dropdown
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
         assert.containsN(
             target,
-            ".o_control_panel .o_cp_bottom_right .dropdown-menu .o_menu_item",
+            ".o_control_panel .o_cp_searchview .dropdown-menu .o_menu_item",
             2,
             "should have 2 dropdown items in searchview groupby"
         );
@@ -1147,12 +1144,12 @@ QUnit.module("Views", (hooks) => {
         );
 
         // add a custom group in searchview groupby
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleAddCustomGroup(target);
         await applyGroup(target);
         assert.containsN(
             target,
-            ".o_control_panel .o_cp_bottom_right .dropdown-menu .o_menu_item",
+            ".o_control_panel .o_cp_searchview .dropdown-menu .o_menu_item",
             3,
             "should have 3 dropdown items in searchview groupby now"
         );
@@ -1165,27 +1162,27 @@ QUnit.module("Views", (hooks) => {
         );
 
         // add a custom group in pivot groupby
-        await mouseEnter(target, ".dropdown-menu .o_add_custom_group_menu .dropdown-toggle");
-        target.querySelector(".dropdown-menu .o_add_custom_group_menu select").value = "date";
-        await triggerEvent(target, ".dropdown-menu .o_add_custom_group_menu select", "change");
-        await click(target, ".dropdown-menu .o_add_custom_group_menu .dropdown-menu .btn");
-        // click on closed header to open groupby selection dropdown
-        await click(target, "tbody tr:last-child .o_pivot_header_cell_closed");
-        assert.containsN(
-            target,
-            ".dropdown-menu .o_menu_item",
-            3,
-            "should have 3 dropdown items in pivot groupby dropdown"
-        );
+        // await mouseEnter(target, ".dropdown-menu .o_add_custom_group_menu .dropdown-toggle");
+        // target.querySelector(".dropdown-menu .o_add_custom_group_menu select").value = "date";
+        // await triggerEvent(target, ".dropdown-menu .o_add_custom_group_menu select", "change");
+        // await click(target, ".dropdown-menu .o_add_custom_group_menu .dropdown-menu .btn");
+        // // click on closed header to open groupby selection dropdown
+        // await click(target, "tbody tr:last-child .o_pivot_header_cell_closed");
+        // assert.containsN(
+        //     target,
+        //     ".dropdown-menu .o_menu_item",
+        //     3,
+        //     "should have 3 dropdown items in pivot groupby dropdown"
+        // );
 
-        // applying custom groupby in pivot groupby dropdown will not update search dropdown
-        await toggleGroupByMenu(target);
-        assert.containsN(
-            target,
-            ".o_control_panel .o_cp_bottom_right .dropdown-menu .o_menu_item",
-            3,
-            "should still have 3 dropdown items in searchview groupby dropdown"
-        );
+        // // applying custom groupby in pivot groupby dropdown will not update search dropdown
+        // await toggleSearchBarMenu(target);
+        // assert.containsN(
+        //     target,
+        //     ".o_control_panel .o_cp_searchview .dropdown-menu .o_menu_item",
+        //     3,
+        //     "should still have 3 dropdown items in searchview groupby dropdown"
+        // );
     });
 
     QUnit.test(
@@ -1208,10 +1205,10 @@ QUnit.module("Views", (hooks) => {
             });
 
             // open group by dropdown
-            await toggleGroupByMenu(target);
+            await toggleSearchBarMenu(target);
             assert.containsN(
                 target,
-                ".o_control_panel .o_cp_bottom_right .dropdown-menu .o_menu_item",
+                ".o_control_panel .o_cp_searchview .dropdown-menu .o_menu_item",
                 2,
                 "should have 2 dropdown items in searchview groupby"
             );
@@ -1219,7 +1216,7 @@ QUnit.module("Views", (hooks) => {
             await applyGroup(target);
             assert.containsN(
                 target,
-                ".o_control_panel .o_cp_bottom_right .dropdown-menu .o_menu_item",
+                ".o_control_panel .o_cp_searchview .dropdown-menu .o_menu_item",
                 3,
                 "should have 3 dropdown items in searchview groupby now"
             );
@@ -1333,15 +1330,15 @@ QUnit.module("Views", (hooks) => {
         });
 
         // open group by dropdown
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
         assert.containsNone(
             target,
-            ".o_control_panel .o_cp_bottom_right .dropdown-menu .o_menu_item",
+            ".o_control_panel .o_cp_searchview .dropdown-menu .o_menu_item",
             "should not have any dropdown item in searchview groupby"
         );
         assert.containsOnce(
             target,
-            ".o_control_panel .o_cp_bottom_right .dropdown-menu .o_add_custom_group_menu",
+            ".o_control_panel .o_cp_searchview .dropdown-menu .o_add_custom_group_menu",
             "should have add custom group item in searchview groupby"
         );
         // click on closed header to open dropdown
@@ -1403,15 +1400,15 @@ QUnit.module("Views", (hooks) => {
             });
 
             // open group by dropdown
-            await toggleGroupByMenu(target);
+            await toggleSearchBarMenu(target);
             assert.containsOnce(
                 target,
-                ".o_control_panel .o_cp_bottom_right .dropdown-menu .o_menu_item",
+                ".o_control_panel .o_cp_searchview .dropdown-menu .o_menu_item",
                 "should have 1 dropdown item in searchview groupby"
             );
             assert.containsNone(
                 target,
-                ".o_control_panel .o_cp_bottom_right .dropdown-menu .o_add_custom_group_menu",
+                ".o_control_panel .o_cp_searchview .dropdown-menu .o_add_custom_group_menu",
                 "should not have custom group generator in searchview groupby"
             );
 
@@ -1497,16 +1494,16 @@ QUnit.module("Views", (hooks) => {
             "should have 3 cells: 1 for the open header, and 2 for data"
         );
 
-        await click(target.querySelector(".o_cp_bottom_left button.dropdown-toggle"));
+        await click(target.querySelector(".o_pivot_buttons button.dropdown-toggle"));
         assert.doesNotHaveClass(
             $(target).find(".dropdown-item:contains(Count)"),
             "selected",
             "the __count measure should not be selected"
         );
-        await click($(target).find(".o_cp_bottom_left .dropdown-item:contains(Count)")[0]);
+        await click($(target).find(".o_pivot_buttons .dropdown-item:contains(Count)")[0]);
 
         assert.hasClass(
-            $(target).find(".o_cp_bottom_left .dropdown-item:contains(Count)"),
+            $(target).find(".o_pivot_buttons .dropdown-item:contains(Count)"),
             "selected",
             "the __count measure should be selected"
         );
@@ -1518,7 +1515,7 @@ QUnit.module("Views", (hooks) => {
         );
         assert.strictEqual(rpcCount, 2, "should have done 2 rpcs to reload data");
 
-        await click($(target).find(".o_cp_bottom_left .dropdown-item:contains(Count)")[0]);
+        await click($(target).find(".o_pivot_buttons .dropdown-item:contains(Count)")[0]);
 
         assert.doesNotHaveClass(
             $(target).find(".dropdown-item:contains(Count)")[0],
@@ -1545,8 +1542,8 @@ QUnit.module("Views", (hooks) => {
         assert.containsNone(target, ".o_view_nocontent");
         assert.containsOnce(target, "table");
 
-        await click(target.querySelector(".o_cp_bottom_left button.dropdown-toggle"));
-        await click($(target).find(".o_cp_bottom_left .dropdown-item:contains(Count)")[0]);
+        await click(target.querySelector(".o_pivot_buttons button.dropdown-toggle"));
+        await click($(target).find(".o_pivot_buttons .dropdown-item:contains(Count)")[0]);
 
         assert.containsOnce(target, ".o_view_nocontent");
         assert.containsNone(target, "table");
@@ -1567,7 +1564,7 @@ QUnit.module("Views", (hooks) => {
         assert.containsNone(target, ".o_view_nocontent");
         assert.containsOnce(target, "table");
 
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Some Filter");
 
         assert.containsOnce(target, ".o_view_nocontent");
@@ -1606,7 +1603,7 @@ QUnit.module("Views", (hooks) => {
         assert.containsOnce(target, ".o_searchview .o_searchview_facet");
         assert.containsOnce(target, ".o_view_nocontent");
 
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Some Filter");
         assert.containsN(target, ".o_searchview .o_searchview_facet", 2);
         assert.containsOnce(target, ".o_view_nocontent");
@@ -1659,7 +1656,7 @@ QUnit.module("Views", (hooks) => {
             "should have 1 row for measure Foo"
         );
 
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "My Filter");
         assert.containsNone(target, "table");
 
@@ -1701,7 +1698,7 @@ QUnit.module("Views", (hooks) => {
         assert.containsOnce(target, ".o_pivot_cell_value", "should have only 1 cell");
         assert.containsOnce(target, "tbody tr", "should have 1 rows");
 
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Product");
 
         assert.containsN(target, ".o_pivot_cell_value", 3, "should have 3 cells");
@@ -1781,7 +1778,7 @@ QUnit.module("Views", (hooks) => {
         );
 
         // expand on date:days, product
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Date");
         await toggleMenuItemOption(target, "Date", "Month");
         nbReadGroups = 0;
@@ -1835,7 +1832,7 @@ QUnit.module("Views", (hooks) => {
         });
 
         // expand on date:days, product
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Date");
         await toggleMenuItemOption(target, "Date", "Month");
         await toggleMenuItem(target, "Product");
@@ -1963,7 +1960,7 @@ QUnit.module("Views", (hooks) => {
             pivot_measures: ["foo"],
             pivot_row_groupby: [],
         };
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "Fav1");
         await saveFavorite(target);
@@ -1977,7 +1974,7 @@ QUnit.module("Views", (hooks) => {
             pivot_measures: ["foo"],
             pivot_row_groupby: [],
         };
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "Fav2");
         await saveFavorite(target);
@@ -1991,7 +1988,7 @@ QUnit.module("Views", (hooks) => {
             pivot_measures: ["foo"],
             pivot_row_groupby: ["product_id"],
         };
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "Fav3");
         await saveFavorite(target);
@@ -2051,7 +2048,7 @@ QUnit.module("Views", (hooks) => {
             pivot_measures: ["foo"],
             pivot_row_groupby: ["product_id"],
         };
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "1");
         await saveFavorite(target);
@@ -2064,7 +2061,7 @@ QUnit.module("Views", (hooks) => {
             pivot_measures: ["foo"],
             pivot_row_groupby: [],
         };
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "2");
         await saveFavorite(target);
@@ -2078,7 +2075,7 @@ QUnit.module("Views", (hooks) => {
             pivot_measures: ["foo"],
             pivot_row_groupby: [],
         };
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "3");
         await saveFavorite(target);
@@ -2092,7 +2089,7 @@ QUnit.module("Views", (hooks) => {
             pivot_measures: ["foo"],
             pivot_row_groupby: ["product_id"],
         };
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "4");
         await saveFavorite(target);
@@ -2106,7 +2103,7 @@ QUnit.module("Views", (hooks) => {
             pivot_measures: ["foo"],
             pivot_row_groupby: ["product_id"],
         };
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "5");
         await saveFavorite(target);
@@ -2139,7 +2136,7 @@ QUnit.module("Views", (hooks) => {
         );
 
         // Apply both groupbys
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Product");
         assert.strictEqual(
             target.querySelector("tbody .o_pivot_header_cell_closed").textContent,
@@ -2198,7 +2195,7 @@ QUnit.module("Views", (hooks) => {
         );
 
         // Apply BAR groupbys
-        await toggleGroupByMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Bar");
         assert.strictEqual(
             target.querySelector("tbody .o_pivot_header_cell_closed").textContent,
@@ -2317,7 +2314,7 @@ QUnit.module("Views", (hooks) => {
             );
 
             // activate the unique existing favorite
-            await toggleFavoriteMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, 0);
 
             assert.strictEqual(
@@ -2358,7 +2355,7 @@ QUnit.module("Views", (hooks) => {
             );
 
             // activate AGAIN the unique existing favorite
-            await toggleFavoriteMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, 0);
 
             assert.strictEqual(
@@ -2446,7 +2443,7 @@ QUnit.module("Views", (hooks) => {
         );
 
         // Equivalent to unload the filter
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "My fake favorite");
         // collapse all headers
         await click(target, ".o_pivot_header_cell_opened:first-child");
@@ -2488,7 +2485,7 @@ QUnit.module("Views", (hooks) => {
 
         // Equivalent to load another filter
         await removeFacet(target); // remove previously saved favorite
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "My fake favorite 2");
 
         // Check Columns
@@ -2553,7 +2550,7 @@ QUnit.module("Views", (hooks) => {
         await click(target.querySelectorAll("thead .dropdown-item")[1]);
 
         // Set a domain
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "My Filter 1");
 
         // Save to favorites and check that column groupbys were not lost
@@ -2563,7 +2560,6 @@ QUnit.module("Views", (hooks) => {
             pivot_measures: ["__count"],
             pivot_row_groupby: [],
         };
-        await toggleFavoriteMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "My favorite 1");
         await saveFavorite(target);
@@ -2574,7 +2570,7 @@ QUnit.module("Views", (hooks) => {
         await click(target.querySelectorAll("thead .dropdown-menu .dropdown-item")[4]);
 
         // Set a domain
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "My Filter 2");
 
         expectedContext = {
@@ -2583,7 +2579,6 @@ QUnit.module("Views", (hooks) => {
             pivot_measures: ["__count"],
             pivot_row_groupby: [],
         };
-        await toggleFavoriteMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "My favorite 2");
         await saveFavorite(target);
@@ -2626,7 +2621,7 @@ QUnit.module("Views", (hooks) => {
         assert.strictEqual(getCurrentValues(target), values.join(","));
 
         // reload (should keep folded groups folded as col/row groupbys didn't change)
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Dummy Filter");
 
         assert.strictEqual(getCurrentValues(target), values.join(","));
@@ -2692,11 +2687,10 @@ QUnit.module("Views", (hooks) => {
         assert.containsOnce(target, "table");
 
         // Set a domain for empty results
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "My Filter 1");
         assert.containsNone(target, "table");
 
-        await toggleFavoriteMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "My favorite 1");
         await saveFavorite(target);
@@ -2705,11 +2699,10 @@ QUnit.module("Views", (hooks) => {
         await removeFacet(target); // remove previously saved favorite
         assert.containsOnce(target, "table");
 
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "My Filter 2");
         assert.containsOnce(target, "table");
 
-        await toggleFavoriteMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "My favorite 2");
         await saveFavorite(target);
@@ -2807,7 +2800,7 @@ QUnit.module("Views", (hooks) => {
         assert.strictEqual(target.querySelectorAll(".o_pivot_cell_value")[4].innerText, ""); // xphone December 2016
 
         // invert axis, and reopen column groupings
-        await click(target.querySelector(".o_cp_bottom_left .o_pivot_flip_button"));
+        await click(target.querySelector(".o_pivot_buttons .o_pivot_flip_button"));
         await click(target.querySelector("thead .o_pivot_header_cell_opened"));
         await click(target.querySelector("thead .o_pivot_header_cell_closed"));
         await click(target.querySelectorAll("thead .dropdown-menu .dropdown-item")[4]);
@@ -2847,7 +2840,7 @@ QUnit.module("Views", (hooks) => {
         );
 
         // select filter "Bayou" in control panel
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Bayou");
 
         assert.deepEqual(
@@ -2889,7 +2882,7 @@ QUnit.module("Views", (hooks) => {
         );
 
         // select filter "Bayou" in control panel
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Bayou");
 
         assert.deepEqual(
@@ -2906,7 +2899,7 @@ QUnit.module("Views", (hooks) => {
         );
 
         // unselect filter "Bayou" in control panel
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Bayou");
 
         assert.deepEqual(
@@ -2964,7 +2957,7 @@ QUnit.module("Views", (hooks) => {
             "the active measure should be amount"
         );
 
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "My fake favorite");
 
         assert.containsOnce(
@@ -3145,13 +3138,13 @@ QUnit.module("Views", (hooks) => {
             },
         });
 
-        await click(target.querySelector(".o_cp_bottom_left button.dropdown-toggle"));
-        assert.containsOnce(target, ".o_cp_bottom_left .dropdown-item");
+        await click(target.querySelector(".o_pivot_buttons button.dropdown-toggle"));
+        assert.containsOnce(target, ".o_pivot_buttons .dropdown-item");
         assert.strictEqual(
-            target.querySelector(".o_cp_bottom_left .dropdown-item").innerText,
+            target.querySelector(".o_pivot_buttons .dropdown-item").innerText,
             "Count"
         );
-        assert.hasClass(target.querySelector(".o_cp_bottom_left .dropdown-item"), "selected");
+        assert.hasClass(target.querySelector(".o_pivot_buttons .dropdown-item"), "selected");
     });
 
     QUnit.test("not use a many2one as a measure by default", async function (assert) {
@@ -3167,13 +3160,13 @@ QUnit.module("Views", (hooks) => {
                     <field name="date" interval="month" type="col"/>
                 </pivot>`,
         });
-        await click(target.querySelector(".o_cp_bottom_left button.dropdown-toggle"));
-        assert.containsOnce(target, ".o_cp_bottom_left .dropdown-item");
+        await click(target.querySelector(".o_pivot_buttons button.dropdown-toggle"));
+        assert.containsOnce(target, ".o_pivot_buttons .dropdown-item");
         assert.strictEqual(
-            target.querySelector(".o_cp_bottom_left .dropdown-item").innerText,
+            target.querySelector(".o_pivot_buttons .dropdown-item").innerText,
             "Count"
         );
-        assert.hasClass(target.querySelector(".o_cp_bottom_left .dropdown-item"), "selected");
+        assert.hasClass(target.querySelector(".o_pivot_buttons .dropdown-item"), "selected");
     });
 
     QUnit.test("pivot view with many2one field as a measure", async function (assert) {
@@ -3261,7 +3254,7 @@ QUnit.module("Views", (hooks) => {
         await click(target.querySelectorAll("tbody .dropdown-item")[4]);
 
         // Add a filter
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Some Filter");
 
         assert.containsOnce(
@@ -3276,7 +3269,6 @@ QUnit.module("Views", (hooks) => {
         );
 
         // Save current search to favorite
-        await toggleFavoriteMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "My favorite");
         await saveFavorite(target);
@@ -3312,7 +3304,7 @@ QUnit.module("Views", (hooks) => {
             assert.containsOnce(target, "tbody tr", "should have 1 row initially");
 
             def = makeDeferred();
-            await toggleGroupByMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "Product");
             await toggleMenuItem(target, "Customer");
 
@@ -3361,9 +3353,9 @@ QUnit.module("Views", (hooks) => {
                 </pivot>`,
         });
 
-        await click(target.querySelector(".o_cp_bottom_left button.dropdown-toggle"));
+        await click(target.querySelector(".o_pivot_buttons button.dropdown-toggle"));
         assert.strictEqual(
-            [...target.querySelectorAll(".o_cp_bottom_left .dropdown-item")]
+            [...target.querySelectorAll(".o_pivot_buttons .dropdown-item")]
                 .map((i) => i.innerText)
                 .join(""),
             "bouhFoomoddZipCount"
@@ -3479,12 +3471,11 @@ QUnit.module("Views", (hooks) => {
         });
 
         // with no data
-        await toggleComparisonMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Date: Previous period");
 
         assert.containsOnce(target, "p.o_view_nocontent_empty_folder");
 
-        await toggleFilterMenu(target);
         await toggleMenuItem(target, "Date");
         await toggleMenuItemOption(target, "Date", "December");
         await toggleMenuItemOption(target, "Date", "2016");
@@ -3530,10 +3521,10 @@ QUnit.module("Views", (hooks) => {
         ];
         assert.strictEqual(getCurrentValues(target), values.join());
 
-        await click(target.querySelector(".o_cp_bottom_left button.dropdown-toggle"));
+        await click(target.querySelector(".o_pivot_buttons button.dropdown-toggle"));
 
-        await click(target.querySelectorAll(".o_cp_bottom_left .dropdown-menu .dropdown-item")[0]);
-        await click(target.querySelectorAll(".o_cp_bottom_left .dropdown-menu .dropdown-item")[1]);
+        await click(target.querySelectorAll(".o_pivot_buttons .dropdown-menu .dropdown-item")[0]);
+        await click(target.querySelectorAll(".o_pivot_buttons .dropdown-menu .dropdown-item")[1]);
         values = ["2,0,-100%,0,2,100%,2,2,0%,2,0,-100%,0,1,100%,2,1,-50%,0,1,100%,0,1,100%"];
         assert.strictEqual(getCurrentValues(target), values.join());
 
@@ -3541,7 +3532,7 @@ QUnit.module("Views", (hooks) => {
         values = ["2", "2", "0%", "2", "1", "-50%", "0", "1", "100%"];
         assert.strictEqual(getCurrentValues(target), values.join());
 
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "Fav");
         await saveFavorite(target);
@@ -3596,7 +3587,7 @@ QUnit.module("Views", (hooks) => {
         });
 
         // open comparison menu
-        await toggleComparisonMenu(target);
+        await toggleSearchBarMenu(target);
         // compare October 2016 to September 2016
         await toggleMenuItem(target, "Date: Previous period");
 
@@ -3604,17 +3595,16 @@ QUnit.module("Views", (hooks) => {
         assert.containsOnce(target, "p.o_view_nocontent_empty_folder", "there should be no data");
         // export data should be impossible since the pivot buttons
         // are deactivated (exception: the 'Measures' button).
-        assert.ok(target.querySelector(".o_control_panel button.o_pivot_download").disabled);
+        assert.ok(target.querySelector(".o_pivot_buttons button.o_pivot_download").disabled);
 
-        await toggleFilterMenu(target);
         await toggleMenuItem(target, "Date");
         await toggleMenuItemOption(target, "Date", "December");
         await toggleMenuItemOption(target, "Date", "October");
-        assert.notOk(target.querySelector(".o_control_panel button.o_pivot_download").disabled);
+        assert.notOk(target.querySelector(".o_pivot_buttons button.o_pivot_download").disabled);
 
         // With the data above, the time ranges contain some records.
         // export data. Should execute 'get_file'
-        await click(target.querySelector(".o_control_panel button.o_pivot_download"));
+        await click(target.querySelector(".o_pivot_buttons button.o_pivot_download"));
 
         assert.verifySteps([
             // col group headers
@@ -3673,7 +3663,7 @@ QUnit.module("Views", (hooks) => {
         mockMock = true;
 
         // compare December 2016 to November 2016
-        await toggleComparisonMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Date: Previous period");
 
         const values = ["0", "4", "100%", "0", "2", "100%", "0", "2", "100%"];
@@ -3715,7 +3705,7 @@ QUnit.module("Views", (hooks) => {
             });
 
             // compare December 2016 to November 2016
-            await toggleComparisonMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "Date: Previous period");
 
             // initial sanity check
@@ -3968,21 +3958,21 @@ QUnit.module("Views", (hooks) => {
             arch: `<pivot><field name="foo" type="measure"/></pivot>`,
         });
 
-        assert.containsNone(target, ".o_cp_bottom_left .dropdown-menu");
+        assert.containsNone(target, ".o_pivot_buttons .dropdown-menu");
 
         // open the "Measures" menu
-        await click(target.querySelector(".o_cp_bottom_left .dropdown-toggle"));
-        assert.containsOnce(target, ".o_cp_bottom_left .dropdown-menu");
+        await click(target.querySelector(".o_pivot_buttons .dropdown-toggle"));
+        assert.containsOnce(target, ".o_pivot_buttons .dropdown-menu");
 
         // click on the divider in the "Measures" menu does not crash
-        await click(target.querySelector(".o_cp_bottom_left .dropdown-menu .dropdown-divider"));
+        await click(target.querySelector(".o_pivot_buttons .dropdown-menu .dropdown-divider"));
         // the menu should still be open
-        assert.containsOnce(target, ".o_cp_bottom_left .dropdown-menu");
+        assert.containsOnce(target, ".o_pivot_buttons .dropdown-menu");
 
         // click on the measure list but not on a menu item or the separator
-        await click(target.querySelector(".o_cp_bottom_left .dropdown-menu"));
+        await click(target.querySelector(".o_pivot_buttons .dropdown-menu"));
         // the menu should still be open
-        assert.containsOnce(target, ".o_cp_bottom_left .dropdown-menu");
+        assert.containsOnce(target, ".o_pivot_buttons .dropdown-menu");
     });
 
     QUnit.test(
@@ -4038,7 +4028,7 @@ QUnit.module("Views", (hooks) => {
                 views: [[false, "pivot"]],
             });
 
-            await toggleFilterMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, 0);
             await nextTick();
 
@@ -4090,7 +4080,7 @@ QUnit.module("Views", (hooks) => {
             });
 
             // compare December 2016 to November 2016
-            await toggleComparisonMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "Date: Previous period");
 
             // initial sanity check
@@ -4237,12 +4227,11 @@ QUnit.module("Views", (hooks) => {
         );
 
         // Filter on December 2016
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Date");
         await toggleMenuItemOption(target, "Date", "December");
 
         // compare December 2016 to November 2016
-        await toggleComparisonMenu(target);
         await toggleMenuItem(target, "Date: Previous period");
 
         assert.deepEqual(
@@ -4384,7 +4373,7 @@ QUnit.module("Views", (hooks) => {
             );
 
             // open group by menu and add new groupby
-            await toggleGroupByMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleAddCustomGroup(target);
             await applyGroup(target);
 
@@ -4415,7 +4404,7 @@ QUnit.module("Views", (hooks) => {
             );
 
             // open groupby menu generator and add a new groupby
-            await toggleGroupByMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleAddCustomGroup(target);
             await selectGroup(target, "bar");
             await applyGroup(target);
@@ -4648,7 +4637,7 @@ QUnit.module("Views", (hooks) => {
         assert.containsNone(target, ".o_view_nocontent .abc");
         assert.containsOnce(target, "table");
 
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Small Than 0");
 
         assert.doesNotHaveClass(target, "o_view_sample_data");
@@ -4911,7 +4900,7 @@ QUnit.module("Views", (hooks) => {
 
         // Set a domain (this reload is delayed)
         def = makeDeferred();
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "My Filter");
         assert.strictEqual(getCurrentValues(target), values.join(","));
 
@@ -4951,7 +4940,7 @@ QUnit.module("Views", (hooks) => {
 
         // Set a domain (this reload is delayed)
         def = makeDeferred();
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "My Filter");
         assert.strictEqual(getCurrentValues(target), ["32", "12", "20"].join(","));
 
@@ -4992,7 +4981,7 @@ QUnit.module("Views", (hooks) => {
 
         // Set a domain (this reload is delayed)
         def = makeDeferred();
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "My Filter");
         assert.strictEqual(getCurrentValues(target), ["32", "12", "20"].join(","));
 
@@ -5033,7 +5022,7 @@ QUnit.module("Views", (hooks) => {
 
         // Set a domain (this reload is delayed)
         def = makeDeferred();
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "My Filter");
         assert.strictEqual(getCurrentValues(target), ["32", "12", "20"].join(","));
 
@@ -5079,7 +5068,7 @@ QUnit.module("Views", (hooks) => {
 
         // Set a domain (this reload is delayed)
         def = makeDeferred();
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "My Filter");
         assert.strictEqual(getCurrentValues(target), ["32", "12", "12", "20"].join(","));
 
@@ -5122,7 +5111,7 @@ QUnit.module("Views", (hooks) => {
 
             // Set a domain (this reload is delayed)
             def = makeDeferred();
-            await toggleFilterMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "My Filter");
 
             assert.strictEqual(getCurrentValues(target), ["32", "12", "20"].join(","));
@@ -5215,13 +5204,13 @@ QUnit.module("Views", (hooks) => {
 
         // "Count" is the only measure available
         assert.deepEqual(
-            [...target.querySelectorAll(".o_cp_bottom_left .dropdown-menu .o_menu_item")].map(
+            [...target.querySelectorAll(".o_pivot_buttons .dropdown-menu .o_menu_item")].map(
                 (e) => e.innerText
             ),
             ["Count"]
         );
         // No separator should be displayed in the menu "Measures"
-        assert.containsNone(target, ".o_cp_bottom_left .dropdown-menu div.dropdown-divider");
+        assert.containsNone(target, ".o_pivot_buttons .dropdown-menu div.dropdown-divider");
     });
 
     QUnit.test(
@@ -5257,11 +5246,10 @@ QUnit.module("Views", (hooks) => {
             });
 
             // compare 2021 to 2020
-            await toggleFilterMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "Date");
             await toggleMenuItemOption(target, "Date", "2021");
-            await toggleComparisonMenu(target);
-            await toggleMenuItem(target, 0);
+            await toggleMenuItem(target.querySelector(".o_comparison_menu"), 0);
 
             assert.deepEqual(
                 [...target.querySelectorAll("th")].slice(0, 6).map((el) => el.innerText),
@@ -5333,7 +5321,7 @@ QUnit.module("Views", (hooks) => {
             "The row headers should be as expected"
         );
 
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "Favorite");
         await saveFavorite(target);
@@ -5352,7 +5340,7 @@ QUnit.module("Views", (hooks) => {
             "The row headers should be as expected"
         );
 
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Favorite");
 
         assert.deepEqual(
@@ -5361,7 +5349,6 @@ QUnit.module("Views", (hooks) => {
             "The row headers should be as expected"
         );
 
-        await toggleGroupByMenu(target);
         await toggleMenuItem(target, "Customer");
 
         assert.deepEqual(
@@ -5380,7 +5367,7 @@ QUnit.module("Views", (hooks) => {
             "The row headers should be as expected"
         );
 
-        await toggleFavoriteMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "Favorite 2");
         await saveFavorite(target);
@@ -5429,7 +5416,7 @@ QUnit.module("Views", (hooks) => {
                 "The row headers should be as expected"
             );
 
-            await toggleFavoriteMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "Favorite");
 
             assert.deepEqual(
@@ -5492,7 +5479,7 @@ QUnit.module("Views", (hooks) => {
                 ["Total", "", "No", "Yes", "Computed and not stored"]
             );
 
-            await toggleFavoriteMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "My favorite 2");
 
             assert.deepEqual(
@@ -5554,7 +5541,7 @@ QUnit.module("Views", (hooks) => {
                 ["Total", "Computed and not stored"]
             );
 
-            await toggleFavoriteMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleSaveFavorite(target);
             await editFavoriteName(target, "Favorite");
             await saveFavorite(target);
diff --git a/addons/web/static/tests/views/view_dialogs/export_data_dialog_tests.js b/addons/web/static/tests/views/view_dialogs/export_data_dialog_tests.js
index 3f32e39c609..cd142117611 100644
--- a/addons/web/static/tests/views/view_dialogs/export_data_dialog_tests.js
+++ b/addons/web/static/tests/views/view_dialogs/export_data_dialog_tests.js
@@ -19,6 +19,11 @@ import { makeFakeUserService } from "../../helpers/mock_services";
 
 const serviceRegistry = registry.category("services");
 
+async function exportAllAction(target) {
+    await click(target, ".o_cp_action_menus .dropdown-toggle");
+    await click(target, ".o_cp_action_menus .dropdown-item");
+}
+
 QUnit.module("ViewDialogs", (hooks) => {
     let serverData;
     let target;
@@ -734,6 +739,7 @@ QUnit.module("ViewDialogs", (hooks) => {
             activateElement: () => {},
             deactivateElement: () => {},
             size: 4,
+            isSmall: true,
         };
         const fakeUIService = {
             start(env) {
@@ -947,7 +953,7 @@ QUnit.module("ViewDialogs", (hooks) => {
             domain: [["bar", "!=", "glou"]],
         });
 
-        await click(target.querySelector(".o_list_export_xlsx"));
+        await exportAllAction(target);
     });
 
     QUnit.test("Direct export grouped list ", async function (assert) {
@@ -999,7 +1005,7 @@ QUnit.module("ViewDialogs", (hooks) => {
             domain: [["bar", "!=", "glou"]],
         });
 
-        await click(target.querySelector(".o_list_export_xlsx"));
+        await exportAllAction(target);
     });
 
     QUnit.test("Export dialog with duplicated fields", async function (assert) {
diff --git a/addons/web/static/tests/views/view_dialogs/select_create_dialog_tests.js b/addons/web/static/tests/views/view_dialogs/select_create_dialog_tests.js
index d0d292b94a8..c7a7da43997 100644
--- a/addons/web/static/tests/views/view_dialogs/select_create_dialog_tests.js
+++ b/addons/web/static/tests/views/view_dialogs/select_create_dialog_tests.js
@@ -19,8 +19,7 @@ import {
     editFavoriteName,
     removeFacet,
     saveFavorite,
-    toggleFavoriteMenu,
-    toggleFilterMenu,
+    toggleSearchBarMenu,
     toggleMenuItem,
     toggleSaveFavorite,
 } from "@web/../tests/search/helpers";
@@ -401,13 +400,12 @@ QUnit.module("ViewDialogs", (hooks) => {
         assert.containsN(target, ".o_data_row", 3, "should contain 3 records");
 
         // filter on bar
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Bar");
 
         assert.containsN(target, ".o_data_row", 2, "should contain 2 records");
 
         // save filter
-        await toggleFavoriteMenu(target);
         await toggleSaveFavorite(target);
         await editFavoriteName(target, "some name");
         await saveFavorite(target);
diff --git a/addons/web/static/tests/webclient/actions/client_action_tests.js b/addons/web/static/tests/webclient/actions/client_action_tests.js
index 07c2ef939b6..cad4d21416d 100644
--- a/addons/web/static/tests/webclient/actions/client_action_tests.js
+++ b/addons/web/static/tests/webclient/actions/client_action_tests.js
@@ -430,7 +430,7 @@ QUnit.module("ActionManager", (hooks) => {
         await click(target, ".my_owl_action");
         await doAction(webClient, 3);
         assert.strictEqual(
-            target.querySelector(".breadcrumb").textContent,
+            target.querySelector(".o_breadcrumb").textContent,
             "Favorite PoniesnewOwlTitlePartners"
         );
     });
diff --git a/addons/web/static/tests/webclient/actions/concurrency_tests.js b/addons/web/static/tests/webclient/actions/concurrency_tests.js
index 6044197cbfb..1d47d2308cc 100644
--- a/addons/web/static/tests/webclient/actions/concurrency_tests.js
+++ b/addons/web/static/tests/webclient/actions/concurrency_tests.js
@@ -3,14 +3,16 @@
 import {
     click,
     getFixture,
+    getNodesTextContent,
     legacyExtraNextTick,
     makeDeferred,
     nextTick,
 } from "@web/../tests/helpers/utils";
 import { ControlPanel } from "@web/search/control_panel/control_panel";
+import { SearchBar } from "@web/search/search_bar/search_bar";
 import {
     isItemSelected,
-    toggleFilterMenu,
+    toggleSearchBarMenu,
     toggleMenuItem,
     switchView,
 } from "@web/../tests/search/helpers";
@@ -26,6 +28,10 @@ import {
 import { Component, xml } from "@odoo/owl";
 const actionRegistry = registry.category("actions");
 
+function getBreadCrumbTexts(target) {
+    return getNodesTextContent(target.querySelectorAll(".breadcrumb-item, .o_breadcrumb .active"));
+}
+
 let serverData;
 let target;
 
@@ -109,12 +115,7 @@ QUnit.module("ActionManager", (hooks) => {
         doAction(webClient, 4);
         def.resolve();
         await nextTick();
-        await legacyExtraNextTick();
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item.active").text(),
-            "Partners Action 4",
-            "action 4 should be loaded"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners Action 4"]);
     });
 
     QUnit.test("clicking quickly on breadcrumbs...", async function (assert) {
@@ -140,11 +141,7 @@ QUnit.module("ActionManager", (hooks) => {
         // resolve the form view read
         def.resolve();
         await nextTick();
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item.active").text(),
-            "Partners Action 4",
-            "action 4 should be loaded and visible"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners Action 4"]);
     });
 
     QUnit.test(
@@ -335,11 +332,7 @@ QUnit.module("ActionManager", (hooks) => {
         await nextTick();
         assert.containsOnce(target, ".o_kanban_view", "should display the kanban view of action 4");
         assert.containsNone(target, ".o_list_view", "should not display the list view of action 3");
-        assert.containsOnce(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            "there should be one controller in the breadcrumbs"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners Action 4"]);
         assert.verifySteps([
             "/web/webclient/load_menus",
             "/web/action/load",
@@ -370,11 +363,7 @@ QUnit.module("ActionManager", (hooks) => {
         await nextTick();
         assert.containsOnce(target, ".o_kanban_view", "should display the kanban view of action 4");
         assert.containsNone(target, ".o_list_view", "should not display the list view of action 3");
-        assert.containsOnce(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            "there should be one controller in the breadcrumbs"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners Action 4"]);
         assert.verifySteps([
             "/web/webclient/load_menus",
             "/web/action/load",
@@ -398,12 +387,12 @@ QUnit.module("ActionManager", (hooks) => {
         await doAction(webClient, 3);
         assert.containsOnce(target, ".o_list_view");
         assert.containsN(target, ".o_list_view .o_data_row", 5);
-        assert.containsOnce(target, ".o_control_panel .o_list_buttons");
+        assert.containsOnce(target, ".o_control_panel .d-none.d-xl-inline-flex .o_list_buttons");
         // reload (the search_read RPC will be blocked)
         def = makeDeferred();
         await switchView(target, "list");
         assert.containsN(target, ".o_list_view .o_data_row", 5);
-        assert.containsOnce(target, ".o_control_panel .o_list_buttons");
+        assert.containsOnce(target, ".o_control_panel .d-none.d-xl-inline-flex .o_list_buttons");
         // open a record in form view
         await click(target.querySelector(".o_list_view .o_data_cell"));
         assert.containsOnce(target, ".o_form_view");
@@ -468,10 +457,7 @@ QUnit.module("ActionManager", (hooks) => {
             def.resolve();
             await nextTick();
             assert.containsOnce(target, ".o_list_view");
-            assert.strictEqual(
-                target.querySelector(".o_control_panel .breadcrumb-item").textContent,
-                "Partners"
-            );
+            assert.deepEqual(getBreadCrumbTexts(target), ["Partners"]);
             assert.containsNone(target, ".o_form_view");
             assert.verifySteps([
                 "/web/webclient/load_menus",
@@ -505,10 +491,7 @@ QUnit.module("ActionManager", (hooks) => {
         def.resolve();
         await nextTick();
         assert.containsOnce(target, ".o_kanban_view");
-        assert.strictEqual(
-            target.querySelector(".o_control_panel .breadcrumb-item").textContent,
-            "Partners"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners"]);
         assert.containsNone(target, ".o_list_view");
         assert.verifySteps([
             "/web/webclient/load_menus",
@@ -540,10 +523,7 @@ QUnit.module("ActionManager", (hooks) => {
         def.resolve();
         await nextTick();
         assert.containsOnce(target, ".o_kanban_view");
-        assert.strictEqual(
-            target.querySelector(".o_control_panel .breadcrumb-item").textContent,
-            "Partners"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners"]);
         assert.containsNone(target, ".o_list_view");
         assert.verifySteps([
             "/web/webclient/load_menus",
@@ -575,10 +555,7 @@ QUnit.module("ActionManager", (hooks) => {
         def.resolve();
         await nextTick();
         assert.containsOnce(target, ".o_kanban_view");
-        assert.strictEqual(
-            target.querySelector(".o_control_panel .breadcrumb-item").textContent,
-            "Partners"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners"]);
         assert.containsNone(target, ".o_list_view");
         assert.verifySteps([
             "/web/webclient/load_menus",
@@ -616,18 +593,12 @@ QUnit.module("ActionManager", (hooks) => {
         await click(row1.querySelector(".o_data_cell"));
         await click(row2.querySelector(".o_data_cell"));
         assert.containsOnce(target, ".o_form_view");
-        assert.strictEqual(
-            target.querySelector(".breadcrumb-item.active").innerText,
-            "Second record"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners", "Second record"]);
 
         def.resolve();
         await nextTick();
         assert.containsOnce(target, ".o_form_view");
-        assert.strictEqual(
-            target.querySelector(".breadcrumb-item.active").innerText,
-            "Second record"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners", "Second record"]);
     });
 
     QUnit.test("local state, global state, and race conditions", async function (assert) {
@@ -659,15 +630,15 @@ QUnit.module("ActionManager", (hooks) => {
         ToyController.template = xml`
             <div class="o_toy_view">
                 <ControlPanel />
+                <SearchBar />
             </div>`;
-        ToyController.components = { ControlPanel };
+        ToyController.components = { ControlPanel, SearchBar };
 
         registry.category("views").add("toy", {
             type: "toy",
             display_name: "Toy",
             icon: "fab fa-android",
             multiRecord: true,
-            searchMenuTypes: ["filter"],
             Controller: ToyController,
         });
 
@@ -683,7 +654,7 @@ QUnit.module("ActionManager", (hooks) => {
             ],
         });
 
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         await toggleMenuItem(target, "Foo");
         assert.ok(isItemSelected(target, "Foo"));
 
@@ -695,7 +666,7 @@ QUnit.module("ActionManager", (hooks) => {
         def.resolve();
         await nextTick();
 
-        await toggleFilterMenu(target);
+        await toggleSearchBarMenu(target);
         assert.ok(isItemSelected(target, "Foo"));
         // this test is not able to detect that getGlobalState is put on the right place:
         // currentController.action.globalState contains in any case the search state
diff --git a/addons/web/static/tests/webclient/actions/error_handling_tests.js b/addons/web/static/tests/webclient/actions/error_handling_tests.js
index 878ee7e7a63..243ac1bf5e6 100644
--- a/addons/web/static/tests/webclient/actions/error_handling_tests.js
+++ b/addons/web/static/tests/webclient/actions/error_handling_tests.js
@@ -33,7 +33,7 @@ QUnit.module("ActionManager", (hooks) => {
         const webClient = await createWebClient({ serverData, mockRPC });
         await doAction(webClient, "1");
         assert.containsOnce(target, ".o_kanban_view");
-        assert.strictEqual(target.querySelector(".breadcrumb").textContent, "Partners Action 1");
+        assert.strictEqual(target.querySelector(".o_breadcrumb").textContent, "Partners Action 1");
         assert.deepEqual(
             [...target.querySelectorAll(".o_kanban_record span")].map((el) => el.textContent),
             ["yop", "blip", "gnap", "plop", "zoup"]
@@ -46,7 +46,7 @@ QUnit.module("ActionManager", (hooks) => {
             assert.ok(e.cause instanceof TypeError);
         }
         assert.containsOnce(target, ".o_kanban_view");
-        assert.strictEqual(target.querySelector(".breadcrumb").textContent, "Partners Action 1");
+        assert.strictEqual(target.querySelector(".o_breadcrumb").textContent, "Partners Action 1");
         assert.deepEqual(
             [...target.querySelectorAll(".o_kanban_record span")].map((el) => el.textContent),
             ["yop", "blip", "gnap", "plop", "zoup"]
diff --git a/addons/web/static/tests/webclient/actions/load_state_tests.js b/addons/web/static/tests/webclient/actions/load_state_tests.js
index 5a5499e411d..ab5fae75d66 100644
--- a/addons/web/static/tests/webclient/actions/load_state_tests.js
+++ b/addons/web/static/tests/webclient/actions/load_state_tests.js
@@ -17,8 +17,9 @@ import {
     nextTick,
     makeDeferred,
     editInput,
+    getNodesTextContent,
 } from "../../helpers/utils";
-import { pagerNext, toggleFilterMenu, toggleMenuItem } from "@web/../tests/search/helpers";
+import { pagerNext, toggleMenuItem, toggleSearchBarMenu } from "@web/../tests/search/helpers";
 import { session } from "@web/session";
 import {
     createWebClient,
@@ -31,6 +32,10 @@ import { errorService } from "@web/core/errors/error_service";
 
 import { Component, xml } from "@odoo/owl";
 
+function getBreadCrumbTexts(target) {
+    return getNodesTextContent(target.querySelectorAll(".breadcrumb-item, .o_breadcrumb .active"));
+}
+
 let serverData;
 let target;
 
@@ -233,13 +238,8 @@ QUnit.module("ActionManager", (hooks) => {
             model: "partner",
         });
         await testUtils.nextTick();
-        await legacyExtraNextTick();
         assert.containsOnce(target, ".o_form_view");
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item").text(),
-            "Second record",
-            "should have opened the second record"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Second record"]);
         assert.verifySteps(["/web/webclient/load_menus", "get_views", "read"]);
     });
 
@@ -261,11 +261,7 @@ QUnit.module("ActionManager", (hooks) => {
 
         await testUtils.nextTick();
         assert.containsOnce(target, ".o_form_view");
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item").text(),
-            "Second record",
-            "should have opened the second record"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Second record"]);
         assert.containsNone(target, ".o_menu_brand");
         assert.verifySteps(["/web/webclient/load_menus", "get_views", "read"]);
     });
@@ -318,7 +314,7 @@ QUnit.module("ActionManager", (hooks) => {
     QUnit.test(
         "lazy load multi record view if mono record one is requested",
         async function (assert) {
-            assert.expect(12);
+            assert.expect(11);
             const mockRPC = async function (route, args) {
                 assert.step((args && args.method) || route);
             };
@@ -332,15 +328,9 @@ QUnit.module("ActionManager", (hooks) => {
             await legacyExtraNextTick();
             assert.containsNone(target, ".o_list_view");
             assert.containsOnce(target, ".o_form_view");
-            assert.containsN(target, ".o_control_panel .breadcrumb-item", 2);
-            assert.strictEqual(
-                $(target).find(".o_control_panel .breadcrumb-item:last").text(),
-                "Second record",
-                "breadcrumbs should contain the display_name of the opened record"
-            );
+            assert.deepEqual(getBreadCrumbTexts(target), ["Partners", "Second record"]);
             // go back to List
             await testUtils.dom.click($(target).find(".o_control_panel .breadcrumb a"));
-            await legacyExtraNextTick();
             assert.containsOnce(target, ".o_list_view");
             assert.containsNone(target, ".o_form_view");
             assert.verifySteps([
@@ -354,48 +344,21 @@ QUnit.module("ActionManager", (hooks) => {
     );
 
     QUnit.test("lazy load multi record view with previous action", async function (assert) {
-        assert.expect(6);
         const webClient = await createWebClient({ serverData });
         await doAction(webClient, 4);
-        assert.containsOnce(
-            target,
-            ".o_control_panel .breadcrumb li",
-            "there should be one controller in the breadcrumbs"
-        );
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb li").text(),
-            "Partners Action 4",
-            "breadcrumbs should contain the display_name of the opened record"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners Action 4"]);
         await doAction(webClient, 3, {
             props: { resId: 2 },
             viewType: "form",
         });
-        assert.containsN(
-            target,
-            ".o_control_panel .breadcrumb li",
-            3,
-            "there should be three controllers in the breadcrumbs"
-        );
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb li").text(),
-            "Partners Action 4PartnersSecond record",
-            "the breadcrumb elements should be correctly ordered"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), [
+            "Partners Action 4",
+            "Partners",
+            "Second record",
+        ]);
         // go back to List
         await testUtils.dom.click($(target).find(".o_control_panel .breadcrumb a:last"));
-        await legacyExtraNextTick();
-        assert.containsN(
-            target,
-            ".o_control_panel .breadcrumb li",
-            2,
-            "there should be two controllers in the breadcrumbs"
-        );
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb li").text(),
-            "Partners Action 4Partners",
-            "the breadcrumb elements should be correctly ordered"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners Action 4", "Partners"]);
     });
 
     QUnit.test(
@@ -421,7 +384,7 @@ QUnit.module("ActionManager", (hooks) => {
     );
 
     QUnit.test("change the viewType of the current action", async function (assert) {
-        assert.expect(14);
+        assert.expect(13);
         const mockRPC = async function (route, args) {
             assert.step((args && args.method) || route);
         };
@@ -447,17 +410,7 @@ QUnit.module("ActionManager", (hooks) => {
         await legacyExtraNextTick();
         assert.containsNone(target, ".o_kanban_view");
         assert.containsOnce(target, ".o_form_view");
-        assert.containsN(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            2,
-            "there should be two controllers in the breadcrumbs"
-        );
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item:last").text(),
-            "Fourth record",
-            "should have opened the requested record"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners", "Fourth record"]);
         // verify steps to ensure that the whole action hasn't been re-executed
         // (if it would have been, /web/action/load and get_views would appear
         // several times)
@@ -472,7 +425,7 @@ QUnit.module("ActionManager", (hooks) => {
     });
 
     QUnit.test("change the id of the current action", async function (assert) {
-        assert.expect(12);
+        assert.expect(11);
         const mockRPC = async function (route, args) {
             assert.step((args && args.method) || route);
         };
@@ -480,13 +433,8 @@ QUnit.module("ActionManager", (hooks) => {
         // execute action 3 and open the first record in a form view
         await doAction(webClient, 3);
         await testUtils.dom.click($(target).find(".o_list_view .o_data_cell:first"));
-        await legacyExtraNextTick();
         assert.containsOnce(target, ".o_form_view");
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item:last").text(),
-            "First record",
-            "should have opened the first record"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners", "First record"]);
         // switch to record 4
         webClient.env.bus.trigger("test:hashchange", {
             action: 3,
@@ -494,19 +442,8 @@ QUnit.module("ActionManager", (hooks) => {
             view_type: "form",
         });
         await testUtils.nextTick();
-        await legacyExtraNextTick();
         assert.containsOnce(target, ".o_form_view");
-        assert.containsN(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            2,
-            "there should be two controllers in the breadcrumbs"
-        );
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item:last").text(),
-            "Fourth record",
-            "should have switched to the requested record"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners", "Fourth record"]);
         // verify steps to ensure that the whole action hasn't been re-executed
         // (if it would have been, /web/action/load and get_views would appear
         // twice)
@@ -699,20 +636,12 @@ QUnit.module("ActionManager", (hooks) => {
         const webClient = await createWebClient({ serverData, mockRPC });
         await doAction(webClient, 4);
         assert.containsOnce(target, ".o_kanban_view", "should display a kanban view");
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item").text(),
-            "Partners Action 4",
-            "breadcrumbs should display the display_name of the action"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners Action 4"]);
         await loadState(webClient, {
             model: "partner",
             view_type: "list",
         });
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item").text(),
-            "Partners Action 4",
-            "should still be in the same action"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners Action 4"]);
         assert.containsNone(target, ".o_kanban_view", "should no longer display a kanban view");
         assert.containsOnce(target, ".o_list_view", "should display a list view");
         assert.verifySteps([
@@ -742,11 +671,7 @@ QUnit.module("ActionManager", (hooks) => {
         const webClient = await createWebClient({ serverData, mockRPC });
         await loadState(webClient, { menu_id: 666 });
         assert.containsOnce(target, ".o_kanban_view", "should display a kanban view");
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item").text(),
-            "Partners Action 1",
-            "breadcrumbs should display the display_name of the action"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners Action 1"]);
         assert.verifySteps([
             "/web/webclient/load_menus",
             "/web/action/load",
@@ -762,21 +687,14 @@ QUnit.module("ActionManager", (hooks) => {
             1: { id: 1, children: [], name: "App1", appID: 1, actionID: 1 },
         };
         const webClient = await createWebClient({ serverData });
-        await legacyExtraNextTick();
         assert.containsOnce(target, ".o_kanban_view"); // action 1 (default app)
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item").text(),
-            "Partners Action 1"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners Action 1"]);
         await loadState(webClient, { action: 3 });
         assert.containsOnce(target, ".o_list_view"); // action 3
-        assert.strictEqual($(target).find(".o_control_panel .breadcrumb-item").text(), "Partners");
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners"]);
         await loadState(webClient, { home: 1 });
         assert.containsOnce(target, ".o_kanban_view"); // action 1 (default app)
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item").text(),
-            "Partners Action 1"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners Action 1"]);
     });
 
     QUnit.test("load state supports #home as initial state", async function (assert) {
@@ -793,10 +711,7 @@ QUnit.module("ActionManager", (hooks) => {
         await createWebClient({ serverData, mockRPC });
         await legacyExtraNextTick();
         assert.containsOnce(target, ".o_kanban_view", "should display a kanban view");
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item").text(),
-            "Partners Action 1"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners Action 1"]);
         assert.verifySteps([
             "/web/webclient/load_menus",
             "/web/action/load",
@@ -806,7 +721,7 @@ QUnit.module("ActionManager", (hooks) => {
     });
 
     QUnit.test("load state: in a form view, remove the id from the state", async function (assert) {
-        assert.expect(13);
+        assert.expect(11);
         serverData.actions[999] = {
             id: 999,
             name: "Partner",
@@ -823,11 +738,7 @@ QUnit.module("ActionManager", (hooks) => {
         const webClient = await createWebClient({ serverData, mockRPC });
         await doAction(webClient, 999, { viewType: "form", props: { resId: 2 } });
         assert.containsOnce(target, ".o_form_view");
-        assert.containsN(target, ".breadcrumb-item", 2);
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item.active").text(),
-            "Second record"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partner", "Second record"]);
         assert.verifySteps([
             "/web/webclient/load_menus",
             "/web/action/load",
@@ -841,11 +752,7 @@ QUnit.module("ActionManager", (hooks) => {
         });
         assert.verifySteps(["/web/dataset/call_kw/partner/onchange"]);
         assert.containsOnce(target, ".o_form_view .o_form_editable");
-        assert.containsN(target, ".breadcrumb-item", 2);
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item.active").text(),
-            "New"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partner", "New"]);
     });
 
     QUnit.test("hashchange does not trigger canberemoved right away", async function (assert) {
@@ -957,11 +864,10 @@ QUnit.module("ActionManager", (hooks) => {
             });
 
             await click(target.querySelector(".o_control_panel .breadcrumb-item"));
-            await legacyExtraNextTick();
 
             assert.containsN(target, ".o_list_view .o_data_row", 5);
 
-            await toggleFilterMenu(target);
+            await toggleSearchBarMenu(target);
             await toggleMenuItem(target, "Filter");
 
             assert.containsN(target, ".o_list_view .o_data_row", 1);
@@ -982,18 +888,18 @@ QUnit.module("ActionManager", (hooks) => {
             },
             { props: { resIds: [1, 2] } }
         );
-        assert.strictEqual(target.querySelector(".breadcrumb").textContent, "First record");
+        assert.deepEqual(getBreadCrumbTexts(target), ["First record"]);
         await pagerNext(target);
-        assert.strictEqual(target.querySelector(".breadcrumb").textContent, "Second record");
+        assert.deepEqual(getBreadCrumbTexts(target), ["Second record"]);
         await editInput(target, "[name=display_name] input", "new name");
 
         // without saving we now make a loadState which should commit changes
         await loadState(webClient, { action: 1337, id: 1, model: "partner", view_type: "form" });
-        assert.strictEqual(target.querySelector(".breadcrumb").textContent, "First record");
+        assert.deepEqual(getBreadCrumbTexts(target), ["First record"]);
 
         // loadState again just to check if changes were commited
         await loadState(webClient, { action: 1337, id: 2, model: "partner", view_type: "form" });
-        assert.strictEqual(target.querySelector(".breadcrumb").textContent, "new name");
+        assert.deepEqual(getBreadCrumbTexts(target), ["new name"]);
     });
 
     QUnit.test("initial action crashes", async (assert) => {
diff --git a/addons/web/static/tests/webclient/actions/misc_tests.js b/addons/web/static/tests/webclient/actions/misc_tests.js
index f33e115a5d0..1fe20bbb2e4 100644
--- a/addons/web/static/tests/webclient/actions/misc_tests.js
+++ b/addons/web/static/tests/webclient/actions/misc_tests.js
@@ -5,7 +5,6 @@ import { registry } from "@web/core/registry";
 import { session } from "@web/session";
 import AbstractAction from "web.AbstractAction";
 import core from "web.core";
-import testUtils from "web.test_utils";
 import { makeTestEnv } from "../../helpers/mock_env";
 import {
     click,
@@ -207,10 +206,10 @@ QUnit.module("ActionManager", (hooks) => {
         serverData.actions[4].context = { no_breadcrumbs: true };
         const webClient = await createWebClient({ serverData });
         await doAction(webClient, 3);
-        assert.containsOnce(target, ".o_control_panel .breadcrumb-item");
+        assert.containsOnce(target, ".o_control_panel .o_breadcrumb");
         // push another action flagged with 'no_breadcrumbs=true'
         await doAction(webClient, 4);
-        assert.containsNone(target, ".o_control_panel .breadcrumb-item");
+        assert.containsNone(target, ".o_control_panel .o_breadcrumb");
     });
 
     QUnit.test("document's title is updated when an action is executed", async function (assert) {
@@ -272,10 +271,10 @@ QUnit.module("ActionManager", (hooks) => {
             const webClient = await createWebClient({ serverData });
             await doAction(webClient, "ClientAction");
             assert.containsOnce(target, ".my_button");
-            await testUtils.dom.click(target.querySelector(".my_button"));
+            await click(target.querySelector(".my_button"));
             await legacyExtraNextTick();
             assert.containsOnce(target, ".o_kanban_view");
-            await testUtils.dom.click($(target).find(".o_control_panel .breadcrumb a:first"));
+            await click(target, ".o_control_panel .breadcrumb a");
             await legacyExtraNextTick();
             assert.containsOnce(target, ".my_button");
             assert.verifySteps(["on_reverse_breadcrumb"]);
@@ -284,7 +283,7 @@ QUnit.module("ActionManager", (hooks) => {
     );
 
     QUnit.test('handles "history_back" event', async function (assert) {
-        assert.expect(3);
+        assert.expect(4);
         let list;
         patchWithCleanup(listView.Controller.prototype, {
             setup() {
@@ -295,13 +294,13 @@ QUnit.module("ActionManager", (hooks) => {
         const webClient = await createWebClient({ serverData });
         await doAction(webClient, 4);
         await doAction(webClient, 3);
-        assert.containsN(target, ".o_control_panel .breadcrumb-item", 2);
+        assert.containsOnce(target, "ol.breadcrumb");
+        assert.containsOnce(target, ".o_breadcrumb span");
         list.env.config.historyBack();
-        await testUtils.nextTick();
-        await legacyExtraNextTick();
-        assert.containsOnce(target, ".o_control_panel .breadcrumb-item");
+        await nextTick();
+        assert.containsOnce(target, ".o_breadcrumb span");
         assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item").text(),
+            target.querySelector(".o_control_panel .o_breadcrumb").textContent,
             "Partners Action 4",
             "breadcrumbs should display the display_name of the action"
         );
diff --git a/addons/web/static/tests/webclient/actions/reports/report_action_tests.js b/addons/web/static/tests/webclient/actions/reports/report_action_tests.js
index 1b4f62ef12b..596e1837ebf 100644
--- a/addons/web/static/tests/webclient/actions/reports/report_action_tests.js
+++ b/addons/web/static/tests/webclient/actions/reports/report_action_tests.js
@@ -166,7 +166,12 @@ QUnit.module("ActionManager", (hooks) => {
                 ".o_content iframe",
                 "should have opened the report client action"
             );
-            assert.containsOnce(target, "button[title='Print']", "should have a print button");
+            // the control panel has the content twice and a d-none class is toggled depending the screen size
+            assert.containsOnce(
+                target,
+                ":not(.d-none) > button[title='Print']",
+                "should have a print button"
+            );
             assert.verifySteps([
                 "/web/webclient/load_menus",
                 "/web/action/load",
@@ -359,7 +364,11 @@ QUnit.module("ActionManager", (hooks) => {
         assert.verifySteps([
             "/report/html/ennio.morricone/99?context=%7B%22lang%22%3A%22en%22%2C%22uid%22%3A7%2C%22tz%22%3A%22taht%22%7D",
         ]);
-        await click(target.querySelector("button[title='Print']"));
+        await click(
+            target.querySelector(
+                ".o_control_panel_main_buttons .d-none.d-xl-inline-flex button[title='Print']"
+            )
+        );
         assert.verifySteps(["/report/check_wkhtmltopdf", "/report/download"]);
     });
 
diff --git a/addons/web/static/tests/webclient/actions/target_tests.js b/addons/web/static/tests/webclient/actions/target_tests.js
index eb3077dad95..01929b6c0cb 100644
--- a/addons/web/static/tests/webclient/actions/target_tests.js
+++ b/addons/web/static/tests/webclient/actions/target_tests.js
@@ -407,7 +407,7 @@ QUnit.module("ActionManager", (hooks) => {
         // execute an action in target="current"
         await doAction(webClient, 1);
         assert.deepEqual(
-            [...target.querySelectorAll(".breadcrumb-item")].map((i) => i.innerText),
+            [...target.querySelectorAll(".o_breadcrumb span")].map((i) => i.innerText),
             ["Partners Action 1"]
         );
 
@@ -420,7 +420,7 @@ QUnit.module("ActionManager", (hooks) => {
             type: "ir.actions.act_window",
             views: [[false, "list"]],
         });
-        assert.containsNone(target, ".modal .breadcrumb");
+        assert.containsNone(target, ".modal .o_breadcrumb");
     });
 
     QUnit.test('call switchView in an action in target="new"', async function (assert) {
@@ -554,9 +554,9 @@ QUnit.module("ActionManager", (hooks) => {
         await doAction(webClient, 1);
 
         assert.containsOnce(target, ".o_kanban_view");
-        assert.containsOnce(target, ".breadcrumb-item");
+        assert.containsOnce(target, ".o_breadcrumb span");
         assert.strictEqual(
-            target.querySelector(".o_control_panel .breadcrumb").textContent,
+            target.querySelector(".o_control_panel .o_breadcrumb").textContent,
             "Partners Action 1"
         );
 
@@ -569,9 +569,9 @@ QUnit.module("ActionManager", (hooks) => {
         });
 
         assert.containsOnce(target, ".o_list_view");
-        assert.containsOnce(target, ".breadcrumb-item");
+        assert.containsOnce(target, ".o_breadcrumb span");
         assert.strictEqual(
-            target.querySelector(".o_control_panel .breadcrumb").textContent,
+            target.querySelector(".o_control_panel .o_breadcrumb").textContent,
             "Another Partner Action"
         );
     });
@@ -590,9 +590,9 @@ QUnit.module("ActionManager", (hooks) => {
         });
 
         assert.containsOnce(target, ".o_list_view");
-        assert.containsOnce(target, ".breadcrumb-item");
+        assert.containsOnce(target, ".o_breadcrumb span");
         assert.strictEqual(
-            target.querySelector(".o_control_panel .breadcrumb").textContent,
+            target.querySelector(".o_control_panel .o_breadcrumb").textContent,
             "Partner Action"
         );
 
@@ -600,9 +600,10 @@ QUnit.module("ActionManager", (hooks) => {
         await click(target.querySelector(".o_data_row .o_data_cell"));
 
         assert.containsOnce(target, ".o_form_view");
-        assert.containsN(target, ".breadcrumb-item", 2);
+        assert.containsOnce(target, "ol.breadcrumb");
+        assert.containsOnce(target, ".o_breadcrumb span");
         assert.strictEqual(
-            target.querySelector(".o_control_panel .breadcrumb").textContent,
+            target.querySelector(".o_control_panel .o_breadcrumb").textContent,
             "Partner ActionFirst record"
         );
     });
@@ -621,31 +622,34 @@ QUnit.module("ActionManager", (hooks) => {
         });
 
         assert.containsOnce(target, ".o_list_view");
-        assert.containsOnce(target, ".breadcrumb-item");
+        assert.containsOnce(target, ".o_breadcrumb span");
         assert.strictEqual(
-            target.querySelector(".o_control_panel .breadcrumb").textContent,
+            target.querySelector(".o_control_panel .o_breadcrumb").textContent,
             "Partner Action"
         );
 
         // open first record
         await click(target.querySelector(".o_data_row .o_data_cell"));
         assert.containsOnce(target, ".o_form_view");
-        assert.containsN(target, ".breadcrumb-item", 2);
+        assert.containsOnce(target, "ol.breadcrumb");
+        assert.containsOnce(target, ".o_breadcrumb span");
         assert.strictEqual(
-            target.querySelector(".o_control_panel .breadcrumb").textContent,
+            target.querySelector(".o_control_panel .o_breadcrumb").textContent,
             "Partner ActionFirst record"
         );
 
         await doAction(webClient, 1);
         assert.containsOnce(target, ".o_kanban_view");
-        assert.containsN(target, ".breadcrumb-item", 3);
+        assert.containsOnce(target, "ol.breadcrumb");
+        assert.containsOnce(target, ".o_breadcrumb span");
 
         // go back to form view
-        await click(target.querySelectorAll(".breadcrumb-item")[1]);
+        await click(target.querySelector("ol.breadcrumb .o_back_button"));
         assert.containsOnce(target, ".o_form_view");
-        assert.containsN(target, ".breadcrumb-item", 2);
+        assert.containsOnce(target, "ol.breadcrumb");
+        assert.containsOnce(target, ".o_breadcrumb span");
         assert.strictEqual(
-            target.querySelector(".o_control_panel .breadcrumb").textContent,
+            target.querySelector(".o_control_panel .o_breadcrumb").textContent,
             "Partner ActionFirst record"
         );
     });
diff --git a/addons/web/static/tests/webclient/actions/window_action_tests.js b/addons/web/static/tests/webclient/actions/window_action_tests.js
index 9cea0e7a499..0ef56759ca4 100644
--- a/addons/web/static/tests/webclient/actions/window_action_tests.js
+++ b/addons/web/static/tests/webclient/actions/window_action_tests.js
@@ -32,6 +32,18 @@ let serverData;
 let target;
 const serviceRegistry = registry.category("services");
 
+function getBreadCrumbTexts(target) {
+    return getNodesTextContent(target.querySelectorAll(".breadcrumb-item, .o_breadcrumb .active"));
+}
+
+async function clickKanbanNew(target) {
+    await click(target.querySelectorAll(".o_control_panel .o-kanban-button-new")[1]);
+}
+
+async function clickListNew(target) {
+    await click(target.querySelectorAll(".o_control_panel .o_list_button_add")[1]);
+}
+
 QUnit.module("ActionManager", (hooks) => {
     hooks.beforeEach(() => {
         serverData = getActionManagerServerData();
@@ -78,7 +90,8 @@ QUnit.module("ActionManager", (hooks) => {
         };
         const webClient = await createWebClient({ serverData, mockRPC });
         await doAction(webClient, 3);
-        assert.containsNone(target, ".o_cp_action_menus");
+
+        assert.containsNone(target, ".o_cp_action_menus .o_dropdown_title"); // no action menu
         await click(target.querySelector("input.form-check-input"));
         assert.isVisible(
             $(target).find('.o_cp_action_menus button.dropdown-toggle:contains("Print")')[0]
@@ -160,7 +173,7 @@ QUnit.module("ActionManager", (hooks) => {
         await doAction(webClient, 1);
         assert.containsOnce(target, ".o_kanban_view", "should display the kanban view");
         // quick create record
-        await testUtils.dom.click(target.querySelector(".o-kanban-button-new"));
+        await clickKanbanNew(target);
         await editInput(target, ".o_field_widget[name=display_name] input", "New name");
 
         // edit quick-created record
@@ -236,98 +249,41 @@ QUnit.module("ActionManager", (hooks) => {
     );
 
     QUnit.test("breadcrumbs are updated when switching between views", async function (assert) {
-        assert.expect(15);
+        assert.expect(10);
         const webClient = await createWebClient({ serverData });
         await doAction(webClient, 3);
-        assert.containsOnce(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            "there should be one controller in the breadcrumbs"
-        );
+
+        assert.containsNone(target, ".o_control_panel .breadcrumb-item");
         assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item").text(),
-            "Partners",
-            "breadcrumbs should display the display_name of the action"
+            target.querySelector(".o_control_panel .o_breadcrumb .active").innerText,
+            "Partners"
         );
         // switch to kanban view
         await cpHelpers.switchView(target, "kanban");
         await legacyExtraNextTick();
-        assert.containsOnce(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            "there should still be one controller in the breadcrumbs"
-        );
+        assert.containsNone(target, ".o_control_panel .breadcrumb-item");
         assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item").text(),
-            "Partners",
-            "breadcrumbs should still display the display_name of the action"
+            target.querySelector(".o_control_panel .o_breadcrumb .active").innerText,
+            "Partners"
         );
         // open a record in form view
         await testUtils.dom.click(target.querySelector(".o_kanban_view .o_kanban_record"));
-        await legacyExtraNextTick();
-        assert.containsN(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            2,
-            "there should be two controllers in the breadcrumbs"
-        );
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item:last").text(),
-            "First record"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners", "First record"]);
         // go back to kanban view using the breadcrumbs
         await testUtils.dom.click(target.querySelector(".o_control_panel .breadcrumb a"));
-        await legacyExtraNextTick();
-        assert.containsOnce(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            "there should be one controller in the breadcrumbs"
-        );
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item").text(),
-            "Partners",
-            "breadcrumbs should display the display_name of the action"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners"]);
+
         // switch back to list view
         await cpHelpers.switchView(target, "list");
-        await legacyExtraNextTick();
-        assert.containsOnce(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            "there should still be one controller in the breadcrumbs"
-        );
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item").text(),
-            "Partners",
-            "breadcrumbs should still display the display_name of the action"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners"]);
         // open a record in form view
         await testUtils.dom.click(target.querySelector(".o_list_view .o_data_cell"));
-        await legacyExtraNextTick();
-        assert.containsN(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            2,
-            "there should be two controllers in the breadcrumbs"
-        );
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item:last").text(),
-            "First record"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners", "First record"]);
+
         // go back to list view using the breadcrumbs
         await testUtils.dom.click(target.querySelector(".o_control_panel .breadcrumb a"));
-        await legacyExtraNextTick();
         assert.containsOnce(target, ".o_list_view", "should be back on list view");
-        assert.containsOnce(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            "there should be one controller in the breadcrumbs"
-        );
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item").text(),
-            "Partners",
-            "breadcrumbs should display the display_name of the action"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners"]);
     });
 
     QUnit.test("switch buttons are updated when switching between views", async function (assert) {
@@ -562,7 +518,7 @@ QUnit.module("ActionManager", (hooks) => {
         await doAction(webClient, 3);
         assert.containsN(target, ".o_data_row", 5);
         // activate a domain
-        await cpHelpers.toggleFilterMenu(target);
+        await cpHelpers.toggleSearchBarMenu(target);
         await cpHelpers.toggleMenuItem(target, "Bar");
         await legacyExtraNextTick();
         assert.containsN(target, ".o_data_row", 2);
@@ -596,7 +552,7 @@ QUnit.module("ActionManager", (hooks) => {
         assert.containsOnce(target, ".o_form_view", "The form view should be displayed");
 
         // Delete the current record
-        await testUtils.controlPanel.toggleActionMenu(target);
+        await click(target, ".o_cp_action_menus .fa-cog");
         await testUtils.dom.click(
             Array.from(document.querySelectorAll(".o_menu_item")).find(
                 (e) => e.textContent === "Delete"
@@ -649,103 +605,56 @@ QUnit.module("ActionManager", (hooks) => {
         // switch to kanban view
         def = testUtils.makeTestPromise();
         await cpHelpers.switchView(target, "kanban");
-        await legacyExtraNextTick();
         assert.containsOnce(target, ".o_list_view", "should still display the list view");
         assert.containsNone(target, ".o_kanban_view", "shouldn't display the kanban view yet");
         def.resolve();
         await testUtils.nextTick();
-        await legacyExtraNextTick();
         assert.containsNone(target, ".o_list_view", "shouldn't display the list view anymore");
         assert.containsOnce(target, ".o_kanban_view", "should now display the kanban view");
         // switch back to list view
         def = testUtils.makeTestPromise();
         await cpHelpers.switchView(target, "list");
-        await legacyExtraNextTick();
         assert.containsOnce(target, ".o_kanban_view", "should still display the kanban view");
         assert.containsNone(target, ".o_list_view", "shouldn't display the list view yet");
         def.resolve();
         await testUtils.nextTick();
-        await legacyExtraNextTick();
         assert.containsNone(target, ".o_kanban_view", "shouldn't display the kanban view anymore");
         assert.containsOnce(target, ".o_list_view", "should now display the list view");
         // open a record in form view
         def = testUtils.makeTestPromise();
         await click(target.querySelector(".o_list_view .o_data_cell"));
-        await legacyExtraNextTick();
         assert.containsOnce(target, ".o_list_view", "should still display the list view");
         assert.containsNone(target, ".o_form_view", "shouldn't display the form view yet");
-        assert.containsOnce(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            "there should still be one controller in the breadcrumbs"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners"]);
         def.resolve();
         await testUtils.nextTick();
-        await legacyExtraNextTick();
         assert.containsNone(target, ".o_list_view", "should no longer display the list view");
         assert.containsOnce(target, ".o_form_view", "should display the form view");
-        assert.containsN(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            2,
-            "there should be two controllers in the breadcrumbs"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners", "First record"]);
         // go back to list view using the breadcrumbs
         def = testUtils.makeTestPromise();
         await testUtils.dom.click($(target).find(".o_control_panel .breadcrumb a"));
-        await legacyExtraNextTick();
         assert.containsOnce(target, ".o_form_view", "should still display the form view");
         assert.containsNone(target, ".o_list_view", "shouldn't display the list view yet");
-        assert.containsN(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            2,
-            "there should still be two controllers in the breadcrumbs"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners", "First record"]);
         def.resolve();
         await testUtils.nextTick();
-        await legacyExtraNextTick();
         assert.containsNone(target, ".o_form_view", "should no longer display the form view");
         assert.containsOnce(target, ".o_list_view", "should display the list view");
-        assert.containsOnce(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            "there should be one controller in the breadcrumbs"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners"]);
     });
 
     QUnit.test("breadcrumbs are updated when display_name changes", async function (assert) {
-        assert.expect(4);
+        assert.expect(2);
         const webClient = await createWebClient({ serverData });
         await doAction(webClient, 3);
         // open a record in form view
         await click(target.querySelector(".o_list_view .o_data_cell"));
-        await legacyExtraNextTick();
-        assert.containsN(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            2,
-            "there should be two controllers in the breadcrumbs"
-        );
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item:last").text(),
-            "First record",
-            "breadcrumbs should contain the display_name of the opened record"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners", "First record"]);
         // switch to edit mode and change the display_name
         await editInput(target, ".o_field_widget[name=display_name] input", "New name");
         await clickSave(target);
-        assert.containsN(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            2,
-            "there should still be two controllers in the breadcrumbs"
-        );
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item:last").text(),
-            "New name",
-            "breadcrumbs should contain the display_name of the opened record"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners", "New name"]);
     });
 
     QUnit.test('reverse breadcrumb works on accesskey "b"', async function (assert) {
@@ -754,20 +663,23 @@ QUnit.module("ActionManager", (hooks) => {
         await doAction(webClient, 3);
         // open a record in form view
         await click(target.querySelector(".o_list_view .o_data_cell"));
-        await legacyExtraNextTick();
         await testUtils.dom.click($(target).find(".o_form_view button:contains(Execute action)"));
-        assert.containsN(target, ".o_control_panel .breadcrumb li", 3);
-        let $previousBreadcrumb = $(target).find(".o_control_panel .breadcrumb li.active").prev();
+        assert.deepEqual(getBreadCrumbTexts(target), [
+            "Partners",
+            "First record",
+            "Partners Action 4",
+        ]);
+        let previousBreadcrumb = target.querySelector(".breadcrumb-item.o_back_button");
         assert.strictEqual(
-            $previousBreadcrumb.attr("data-hotkey"),
+            previousBreadcrumb.getAttribute("data-hotkey"),
             "b",
             "previous breadcrumb should have accessKey 'b'"
         );
-        await testUtils.dom.click($previousBreadcrumb);
-        assert.containsN(target, ".o_control_panel .breadcrumb li", 2);
-        $previousBreadcrumb = $(target).find(".o_control_panel .breadcrumb li.active").prev();
+        await testUtils.dom.click(previousBreadcrumb);
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners", "First record"]);
+        previousBreadcrumb = target.querySelector(".breadcrumb-item.o_back_button");
         assert.strictEqual(
-            $previousBreadcrumb.attr("data-hotkey"),
+            previousBreadcrumb.getAttribute("data-hotkey"),
             "b",
             "previous breadcrumb should have accessKey 'b'"
         );
@@ -781,8 +693,7 @@ QUnit.module("ActionManager", (hooks) => {
         const webClient = await createWebClient({ serverData, mockRPC });
         await doAction(webClient, 3);
         // create a new record
-        await testUtils.dom.click($(target).find(".o_control_panel .o_list_button_add"));
-        await legacyExtraNextTick();
+        await clickListNew(target);
         assert.containsOnce(
             target,
             ".o_form_view .o_form_editable",
@@ -790,7 +701,6 @@ QUnit.module("ActionManager", (hooks) => {
         );
         // discard
         await testUtils.dom.click($(target).find(".o_control_panel .o_form_button_cancel"));
-        await legacyExtraNextTick();
         assert.containsOnce(target, ".o_list_view", "should have switched back to the list view");
         assert.verifySteps([
             "/web/webclient/load_menus",
@@ -978,22 +888,14 @@ QUnit.module("ActionManager", (hooks) => {
         await doAction(webClient, 3);
         // open a record in form view
         await click(target.querySelector(".o_list_view .o_data_cell"));
-        await legacyExtraNextTick();
         // click on 'Execute action' button (should execute an action)
-        assert.containsN(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            2,
-            "there should be two parts in the breadcrumbs"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners", "First record"]);
         await testUtils.dom.click($(target).find(".o_form_view button:contains(Execute action)"));
-        await legacyExtraNextTick();
-        assert.containsN(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            3,
-            "the returned action should have been stacked over the previous one"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), [
+            "Partners",
+            "First record",
+            "Partners Action 4",
+        ]);
         assert.containsOnce(
             target,
             ".o_kanban_view",
@@ -1025,14 +927,14 @@ QUnit.module("ActionManager", (hooks) => {
         const webClient = await createWebClient({ serverData, mockRPC });
         await doAction(webClient, 24);
         assert.containsOnce(target, ".o_form_view");
-        assert.containsOnce(target, ".o_form_button_create:not([disabled])");
+        assert.containsOnce(target, ".o_form_button_create:not([disabled]):visible");
         await testUtils.dom.click(target.querySelector(".oe_stat_button"));
         await legacyExtraNextTick();
         assert.containsOnce(target, ".o_kanban_view");
         await testUtils.dom.click(target.querySelector(".breadcrumb-item"));
         await legacyExtraNextTick();
         assert.containsOnce(target, ".o_form_view");
-        assert.containsOnce(target, ".o_form_button_create:not([disabled])");
+        assert.containsOnce(target, ".o_form_button_create:not([disabled]):visible");
         assert.verifySteps(["read", "web_search_read", "read"]);
     });
 
@@ -1047,11 +949,11 @@ QUnit.module("ActionManager", (hooks) => {
         const webClient = await createWebClient({ serverData, mockRPC });
         await doAction(webClient, 24);
         assert.containsOnce(target, ".o_form_view");
-        assert.containsOnce(target, ".o_form_button_create:not([disabled])");
+        assert.containsOnce(target, ".o_form_button_create:not([disabled]):visible");
         await testUtils.dom.click(target.querySelector(".oe_stat_button"));
         await legacyExtraNextTick();
         assert.containsOnce(target, ".o_form_view");
-        assert.containsOnce(target, ".o_form_button_create:not([disabled])");
+        assert.containsOnce(target, ".o_form_button_create:not([disabled]):visible");
         assert.verifySteps([
             "/web/webclient/load_menus",
             "/web/action/load",
@@ -1138,9 +1040,8 @@ QUnit.module("ActionManager", (hooks) => {
         await doAction(webClient, 3);
         // open the first record in form view
         await click(target.querySelector(".o_list_view .o_data_cell"));
-        await legacyExtraNextTick();
         assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item:last").text(),
+            target.querySelector(".o_breadcrumb .active").innerText,
             "First record",
             "breadcrumbs should contain the display_name of the opened record"
         );
@@ -1151,14 +1052,12 @@ QUnit.module("ActionManager", (hooks) => {
         );
         // go back to list view using the breadcrumbs
         await testUtils.dom.click($(target).find(".o_control_panel .breadcrumb a"));
-        await legacyExtraNextTick();
         // open the second record in form view
         await testUtils.dom.click(
             $(target).find(".o_list_view .o_data_row:nth(1) .o_data_cell:first")
         );
-        await legacyExtraNextTick();
         assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item:last").text(),
+            target.querySelector(".o_breadcrumb .active").innerText,
             "Second record",
             "breadcrumbs should contain the display_name of the opened record"
         );
@@ -1179,45 +1078,24 @@ QUnit.module("ActionManager", (hooks) => {
     });
 
     QUnit.test("restore previous view state when switching back", async function (assert) {
-        assert.expect(5);
         registry.category("services").add("cookie", fakeCookieService);
         serverData.actions[3].views.unshift([false, "graph"]);
         serverData.views["partner,false,graph"] = "<graph/>";
         const webClient = await createWebClient({ serverData });
         await doAction(webClient, 3);
-        assert.hasClass(
-            $(target).find(".o_control_panel [data-mode='bar']")[0],
-            "active",
-            "bar chart button is active"
-        );
+        assert.hasClass(target.querySelector(".o_graph_renderer [data-mode='bar']"), "active");
         assert.doesNotHaveClass(
-            $(target).find(".o_control_panel [data-mode='line']")[0],
-            "active",
-            "line chart button is not active"
+            target.querySelector(".o_graph_renderer [data-mode='line']"),
+            "active"
         );
         // display line chart
-        await testUtils.dom.click($(target).find(".o_control_panel [data-mode='line']"));
-        await legacyExtraNextTick();
-        assert.hasClass(
-            $(target).find(".o_control_panel [data-mode='line']")[0],
-            "active",
-            "line chart button is now active"
-        );
+        await testUtils.dom.click(target.querySelector(".o_graph_renderer [data-mode='line']"));
+        assert.hasClass(target.querySelector(".o_graph_renderer [data-mode='line']"), "active");
         // switch to kanban and back to graph view
         await cpHelpers.switchView(target, "kanban");
-        await legacyExtraNextTick();
-        assert.containsNone(
-            target,
-            ".o_control_panel [data-mode='line']",
-            "graph buttons are no longer in control panel"
-        );
+        assert.containsNone(target, ".o_graph_renderer [data-mode='line']");
         await cpHelpers.switchView(target, "graph");
-        await legacyExtraNextTick();
-        assert.hasClass(
-            $(target).find(".o_control_panel [data-mode='line']")[0],
-            "active",
-            "line chart button is still active"
-        );
+        assert.hasClass(target.querySelector(".o_graph_renderer [data-mode='line']"), "active");
     });
 
     QUnit.test("can't restore previous action if form is invalid", async function (assert) {
@@ -1227,7 +1105,7 @@ QUnit.module("ActionManager", (hooks) => {
         await doAction(webClient, 3);
         assert.containsOnce(target, ".o_list_view");
 
-        await click(target.querySelector(".o_list_button_add"));
+        await clickListNew(target);
         assert.containsOnce(target, ".o_form_view");
         assert.hasClass(target.querySelector(".o_field_widget[name=foo]"), "o_required_modifier");
 
@@ -1287,7 +1165,7 @@ QUnit.module("ActionManager", (hooks) => {
             "list view is not grouped"
         );
         // open group by dropdown
-        await cpHelpers.toggleGroupByMenu(target);
+        await cpHelpers.toggleSearchBarMenu(target);
         // click on foo link
         await cpHelpers.toggleMenuItem(target, "foo");
         await legacyExtraNextTick();
@@ -1367,77 +1245,32 @@ QUnit.module("ActionManager", (hooks) => {
     });
 
     QUnit.test("go back to a previous action using the breadcrumbs", async function (assert) {
-        assert.expect(10);
         const webClient = await createWebClient({ serverData });
         await doAction(webClient, 3);
         // open a record in form view
         await click(target.querySelector(".o_list_view .o_data_cell"));
-        await legacyExtraNextTick();
-        assert.containsN(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            2,
-            "there should be two controllers in the breadcrumbs"
-        );
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item:last").text(),
-            "First record",
-            "breadcrumbs should contain the display_name of the opened record"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners", "First record"]);
         // push another action on top of the first one, and come back to the form view
         await doAction(webClient, 4);
-        assert.containsN(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            3,
-            "there should be three controllers in the breadcrumbs"
-        );
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item:last").text(),
+        assert.deepEqual(getBreadCrumbTexts(target), [
+            "Partners",
+            "First record",
             "Partners Action 4",
-            "breadcrumbs should contain the name of the current action"
-        );
+        ]);
+
         // go back using the breadcrumbs
         await testUtils.dom.click($(target).find(".o_control_panel .breadcrumb a:nth(1)"));
-        await legacyExtraNextTick();
-        assert.containsN(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            2,
-            "there should be two controllers in the breadcrumbs"
-        );
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item:last").text(),
-            "First record",
-            "breadcrumbs should contain the display_name of the opened record"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners", "First record"]);
         // push again the other action on top of the first one, and come back to the list view
         await doAction(webClient, 4);
-        assert.containsN(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            3,
-            "there should be three controllers in the breadcrumbs"
-        );
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item:last").text(),
+        assert.deepEqual(getBreadCrumbTexts(target), [
+            "Partners",
+            "First record",
             "Partners Action 4",
-            "breadcrumbs should contain the name of the current action"
-        );
+        ]);
         // go back using the breadcrumbs
         await testUtils.dom.click($(target).find(".o_control_panel .breadcrumb a:first"));
-        await legacyExtraNextTick();
-        assert.containsN(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            1,
-            "there should be one controller in the breadcrumbs"
-        );
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item:last").text(),
-            "Partners",
-            "breadcrumbs should contain the name of the current action"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners"]);
     });
 
     QUnit.test(
@@ -1481,14 +1314,14 @@ QUnit.module("ActionManager", (hooks) => {
     );
 
     QUnit.test("honor group_by specified in actions context", async function (assert) {
-        assert.expect(5);
         serverData.actions[3].context = "{'group_by': 'bar'}";
         serverData.views["partner,false,search"] = `
-      <search>
-        <group>
-          <filter name="foo" string="foo" context="{'group_by': 'foo'}"/>
-        </group>
-      </search>`;
+            <search>
+                <group>
+                <filter name="foo" string="Foo" context="{'group_by': 'foo'}"/>
+                </group>
+            </search>
+        `;
         const webClient = await createWebClient({ serverData });
         await doAction(webClient, 3);
         assert.containsOnce(target, ".o_list_table_grouped", "should be grouped");
@@ -1498,9 +1331,9 @@ QUnit.module("ActionManager", (hooks) => {
             2,
             "should be grouped by 'bar' (two groups) at first load"
         );
-        // groupby 'bar' using the searchview
-        await click(target.querySelectorAll(".o_control_panel .o_cp_bottom_right button")[1]);
-        await click(target.querySelector(".o_control_panel .o_group_by_menu .o_menu_item"));
+        // groupby 'foo' using the searchview
+        await cpHelpers.toggleSearchBarMenu(target);
+        await cpHelpers.toggleMenuItem(target, "Foo");
         assert.containsN(target, ".o_group_header", 5, "should be grouped by 'foo' (five groups)");
         // remove the groupby in the searchview
         await click(target.querySelector(".o_control_panel .o_searchview .o_facet_remove"));
@@ -1561,7 +1394,7 @@ QUnit.module("ActionManager", (hooks) => {
         const webClient = await createWebClient({ serverData });
         await doAction(webClient, 33);
         assert.containsOnce(target, ".o_list_view");
-        assert.containsN(target, ".o_cp_switch_buttons button", 2);
+        assert.containsN(target, "nav.o_cp_switch_buttons button", 2);
     });
 
     QUnit.test("flags field of ir.actions.act_window is used", async function (assert) {
@@ -1631,7 +1464,7 @@ QUnit.module("ActionManager", (hooks) => {
         await doAction(webClient, 33);
         assert.containsN(target, ".o_data_row", 5, "should contain 5 records");
         // filter on bar
-        await cpHelpers.toggleFilterMenu(target);
+        await cpHelpers.toggleSearchBarMenu(target);
         await cpHelpers.toggleMenuItem(target, "Bar");
         assert.containsN(target, ".o_data_row", 2);
         // save filter
@@ -1674,7 +1507,7 @@ QUnit.module("ActionManager", (hooks) => {
                 "record should be in descending order as default_order applies"
             );
 
-            await cpHelpers.toggleFavoriteMenu(target);
+            await cpHelpers.toggleSearchBarMenu(target);
             await cpHelpers.toggleMenuItem(target, "favorite filter");
             assert.strictEqual(
                 target.querySelector(".o_control_panel .o_facet_values").innerText.trim(),
@@ -1736,25 +1569,19 @@ QUnit.module("ActionManager", (hooks) => {
     QUnit.test(
         "search menus are still available when switching between actions",
         async function (assert) {
-            assert.expect(3);
             const webClient = await createWebClient({ serverData });
             await doAction(webClient, 1);
-            assert.isVisible(
-                target.querySelector(".o_search_options .dropdown.o_filter_menu"),
-                "the search options should be available"
-            );
+            assert.deepEqual(getBreadCrumbTexts(target), ["Partners Action 1"]);
+            assert.containsOnce(target, ".o_searchview_dropdown_toggler");
+
             await doAction(webClient, 3);
-            assert.isVisible(
-                target.querySelector(".o_search_options .dropdown.o_filter_menu"),
-                "the search options should be available"
-            );
+            assert.deepEqual(getBreadCrumbTexts(target), ["Partners Action 1", "Partners"]);
+            assert.containsOnce(target, ".o_searchview_dropdown_toggler");
+
             // go back using the breadcrumbs
-            await testUtils.dom.click($(target).find(".o_control_panel .breadcrumb a:first"));
-            await legacyExtraNextTick();
-            assert.isVisible(
-                target.querySelector(".o_search_options .dropdown.o_filter_menu"),
-                "the search options should be available"
-            );
+            await click(target, ".o_control_panel .breadcrumb-item a");
+            assert.deepEqual(getBreadCrumbTexts(target), ["Partners Action 1"]);
+            assert.containsOnce(target, ".o_searchview_dropdown_toggler");
         }
     );
 
@@ -1791,7 +1618,6 @@ QUnit.module("ActionManager", (hooks) => {
     );
 
     QUnit.test("destroy action with lazy loaded controller", async function (assert) {
-        assert.expect(6);
         const webClient = await createWebClient({ serverData });
         await loadState(webClient, {
             action: 3,
@@ -1800,17 +1626,7 @@ QUnit.module("ActionManager", (hooks) => {
         });
         assert.containsNone(target, ".o_list_view");
         assert.containsOnce(target, ".o_form_view");
-        assert.containsN(
-            target,
-            ".o_control_panel .breadcrumb-item",
-            2,
-            "there should be two controllers in the breadcrumbs"
-        );
-        assert.strictEqual(
-            $(target).find(".o_control_panel .breadcrumb-item:last").text(),
-            "Second record",
-            "breadcrumbs should contain the display_name of the opened record"
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners", "Second record"]);
         await doAction(webClient, 1, { clearBreadcrumbs: true });
         assert.containsNone(target, ".o_form_view");
         assert.containsOnce(target, ".o_kanban_view");
@@ -1839,32 +1655,23 @@ QUnit.module("ActionManager", (hooks) => {
 
         // execute an action and create a new record
         await doAction(webClient, 3);
-        await click(target.querySelector(".o_list_button_add"));
+        await clickListNew(target);
         assert.containsOnce(target, ".o_form_view .o_form_editable");
         assert.containsOnce(target, ".o_form_uri:contains(First record)");
-        assert.deepEqual(
-            getNodesTextContent(target.querySelectorAll(".o_control_panel .breadcrumb-item")),
-            ["Partners", "New"]
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners", "New"]);
 
         // set form view dirty and open m2o record
         await editInput(target, '.o_field_widget[name="display_name"] input', "test");
         await editInput(target, ".o_field_widget[name=foo] input", "val");
         await click(target.querySelector(".o_form_uri"));
         assert.containsOnce(target, ".o_form_view .o_form_editable");
-        assert.deepEqual(
-            getNodesTextContent(target.querySelectorAll(".o_control_panel .breadcrumb-item")),
-            ["Partners", "test", "First record"]
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners", "test", "First record"]);
         // go back to test using the breadcrumbs
         await testUtils.dom.click(
             target.querySelectorAll(".o_control_panel .breadcrumb-item a")[1]
         );
         assert.containsOnce(target, ".o_form_view .o_form_editable");
-        assert.deepEqual(
-            getNodesTextContent(target.querySelectorAll(".o_control_panel .breadcrumb-item")),
-            ["Partners", "test"]
-        );
+        assert.deepEqual(getBreadCrumbTexts(target), ["Partners", "test"]);
         assert.verifySteps([
             "/web/webclient/load_menus",
             "/web/action/load",
@@ -1903,7 +1710,7 @@ QUnit.module("ActionManager", (hooks) => {
         await click(target.querySelector(".o_data_row .o_data_cell"));
         assert.containsOnce(target, ".o_form_view");
         // execute the custom action from the action menu
-        await cpHelpers.toggleActionMenu(target);
+        await click(target, ".o_cp_action_menus .fa-cog");
         await cpHelpers.toggleMenuItem(target, "Favorite Ponies");
         assert.containsOnce(target, ".o_list_view");
     });
@@ -1933,23 +1740,14 @@ QUnit.module("ActionManager", (hooks) => {
             const webClient = await createWebClient({ serverData, mockRPC });
             await doAction(webClient, 999);
             assert.containsOnce(target, ".o_form_view .o_form_editable");
-            assert.strictEqual(
-                target.querySelector(".o_control_panel .breadcrumb").textContent,
-                "Second record"
-            );
+            assert.deepEqual(getBreadCrumbTexts(target), ["Second record"]);
             // push another action in the breadcrumb
             await click(target, ".o_field_many2one .o_external_button");
-            assert.strictEqual(
-                target.querySelector(".o_control_panel .breadcrumb").textContent,
-                "Second recordThird record"
-            );
+            assert.deepEqual(getBreadCrumbTexts(target), ["Second record", "Third record"]);
             // go back to the form view
             await click(target.querySelector(".o_control_panel .breadcrumb a"));
             assert.containsOnce(target, ".o_form_view .o_form_editable");
-            assert.strictEqual(
-                target.querySelector(".o_control_panel .breadcrumb-item").textContent,
-                "Second record"
-            );
+            assert.deepEqual(getBreadCrumbTexts(target), ["Second record"]);
         }
     );
 
@@ -1973,10 +1771,7 @@ QUnit.module("ActionManager", (hooks) => {
             const webClient = await createWebClient({ serverData, mockRPC });
             await doAction(webClient, 999, { props: { resIds: [1, 2] } });
             assert.containsOnce(target, ".o_form_view .o_form_editable");
-            assert.strictEqual(
-                target.querySelector(".o_control_panel .breadcrumb").textContent,
-                "First record"
-            );
+            assert.deepEqual(getBreadCrumbTexts(target), ["First record"]);
             assert.strictEqual(
                 target.querySelector(".o_control_panel .o_pager_counter").textContent,
                 "1 / 2"
@@ -1984,10 +1779,7 @@ QUnit.module("ActionManager", (hooks) => {
 
             // load another id on current action (through pager)
             await click(target.querySelector(".o_pager_next"));
-            assert.strictEqual(
-                target.querySelector(".o_control_panel .breadcrumb").textContent,
-                "Second record"
-            );
+            assert.deepEqual(getBreadCrumbTexts(target), ["Second record"]);
             assert.strictEqual(
                 target.querySelector(".o_control_panel .o_pager_counter").textContent,
                 "2 / 2"
@@ -1995,17 +1787,11 @@ QUnit.module("ActionManager", (hooks) => {
 
             // push another action in the breadcrumb
             await click(target, ".o_field_many2one .o_external_button");
-            assert.strictEqual(
-                target.querySelector(".o_control_panel .breadcrumb").textContent,
-                "Second recordThird record"
-            );
+            assert.deepEqual(getBreadCrumbTexts(target), ["Second record", "Third record"]);
 
             // restore previous action through breadcrumb
             await click(target.querySelector(".o_control_panel .breadcrumb a"));
-            assert.strictEqual(
-                target.querySelector(".o_control_panel .breadcrumb").textContent,
-                "Second record"
-            );
+            assert.deepEqual(getBreadCrumbTexts(target), ["Second record"]);
             assert.strictEqual(
                 target.querySelector(".o_control_panel .o_pager_counter").textContent,
                 "2 / 2"
@@ -2027,7 +1813,7 @@ QUnit.module("ActionManager", (hooks) => {
         await click(target.querySelector(".o_control_panel .breadcrumb-item a"));
         assert.containsOnce(target, ".o_list_view");
         // create a new record
-        await click(target.querySelector(".o_list_button_add"));
+        await clickListNew(target);
         assert.containsOnce(target, ".o_form_view");
         assert.containsOnce(target, ".o_form_view .o_form_editable");
     });
@@ -2074,7 +1860,7 @@ QUnit.module("ActionManager", (hooks) => {
             // execute an action and create a new record
             await doAction(webClient, 3);
             assert.containsOnce(target, ".o_list_view");
-            await click(target.querySelector(".o_list_button_add"));
+            await clickListNew(target);
             assert.containsOnce(target, ".o_form_view");
             assert.containsOnce(target, ".o_form_view .o_form_editable");
             await editInput(target, ".o_field_widget[name=display_name] input", "another record");
@@ -2191,7 +1977,7 @@ QUnit.module("ActionManager", (hooks) => {
 
             await doAction(webClient, 3);
 
-            await click(target.querySelector(".o_list_button_add"));
+            await clickListNew(target);
             assert.containsOnce(
                 document.body,
                 ".modal.o_technical_modal",
@@ -2633,36 +2419,42 @@ QUnit.module("ActionManager", (hooks) => {
         await click(target.querySelector(".o_data_row .o_data_cell"));
         assert.containsOnce(target, ".o_form_view");
         assert.deepEqual(getNodesTextContent(target.querySelectorAll(".breadcrumb-item")), [
-            "Partners",
+            "",
             "First record",
             "Partners",
-            "First record",
         ]);
-
+        assert.strictEqual(target.querySelector(".o_breadcrumb .active").innerText, "First record");
         // open action menu and delete
-        await cpHelpers.toggleActionMenu(target);
+        await click(target, ".o_cp_action_menus .fa-cog");
         await cpHelpers.toggleMenuItem(target, "Delete");
         assert.containsOnce(target, ".o_dialog");
 
         // confirm
         await click(target.querySelector(".o_dialog .modal-footer .btn-primary"));
+
         assert.containsOnce(target, ".o_form_view");
         assert.deepEqual(getNodesTextContent(target.querySelectorAll(".breadcrumb-item")), [
-            "Partners",
+            "",
             "First record",
             "Partners",
-            "Second record",
         ]);
+        assert.strictEqual(
+            target.querySelector(".o_breadcrumb .active").innerText,
+            "Second record"
+        );
 
         // click on "First record" in breadcrumbs, which doesn't exist anymore
-        await click(target.querySelectorAll(".breadcrumb-item a")[1]);
+        await click(target.querySelectorAll(".breadcrumb-item a")[0]);
         await nextTick();
         assert.containsOnce(target, ".o_form_view");
         assert.deepEqual(getNodesTextContent(target.querySelectorAll(".breadcrumb-item")), [
+            "",
             "Partners",
             "Partners",
-            "Partners",
-            "Second record",
         ]);
+        assert.strictEqual(
+            target.querySelector(".o_breadcrumb .active").innerText,
+            "Second record"
+        );
     });
 });
diff --git a/addons/web/static/tests/webclient/helpers.js b/addons/web/static/tests/webclient/helpers.js
index ff072288930..43830436106 100644
--- a/addons/web/static/tests/webclient/helpers.js
+++ b/addons/web/static/tests/webclient/helpers.js
@@ -53,7 +53,7 @@ import { uiService } from "@web/core/ui/ui_service";
 import { ClientActionAdapter } from "@web/legacy/action_adapters";
 import { commandService } from "@web/core/commands/command_service";
 import { ConnectionAbortedError } from "@web/core/network/rpc_service";
-import { CustomFavoriteItem } from "@web/search/favorite_menu/custom_favorite_item";
+import { CustomFavoriteItem } from "@web/search/custom_favorite_item/custom_favorite_item";
 import { standaloneAdapter } from "web.OwlCompatibility";
 import { overlayService } from "@web/core/overlay/overlay_service";
 
diff --git a/addons/web/static/tests/webclient/settings_form_view/settings_form_view_tests.js b/addons/web/static/tests/webclient/settings_form_view/settings_form_view_tests.js
index 793f15ba555..3f11db8561d 100644
--- a/addons/web/static/tests/webclient/settings_form_view/settings_form_view_tests.js
+++ b/addons/web/static/tests/webclient/settings_form_view/settings_form_view_tests.js
@@ -80,7 +80,7 @@ QUnit.module("SettingsFormView", (hooks) => {
                         <block title="Title of group Bar">
                             <setting help="this is bar" documentation="/applications/technical/web/settings/this_is_a_test.html">
                                 <field name="bar"/>
-                                <button name="buttonName" icon="fa-arrow-right" type="action" string="Manage Users" class="btn-link"/>
+                                <button name="buttonName" icon="oi-arrow-right" type="action" string="Manage Users" class="btn-link"/>
                             </setting>
                             <setting>
                                 <label string="Big BAZ" for="baz"/>
@@ -407,10 +407,7 @@ QUnit.module("SettingsFormView", (hooks) => {
             await doAction(webClient, 1);
             assert.notOk(target.querySelector(".o_field_boolean input").disabled);
             await click(target.querySelector("button[name='4']"));
-            assert.strictEqual(
-                target.querySelector(".breadcrumb").textContent,
-                "SettingsOther action"
-            );
+            assert.strictEqual(target.querySelector(".breadcrumb").textContent, "Settings");
             await click(target.querySelector(".o_control_panel .breadcrumb-item a"));
             assert.notOk(target.querySelector(".o_field_boolean input").disabled);
             assert.verifySteps([
@@ -500,7 +497,7 @@ QUnit.module("SettingsFormView", (hooks) => {
         await click(target.querySelector(".o_field_char .btn.o_field_translate")); // Transalte
         await click(target.querySelector(".modal-footer .btn-primary")); // Warning dialog (OK)
         await click(target.querySelectorAll(".modal-footer .btn")[1]); // Discard
-        await click(target.querySelector(".o_form_button_save")); // Save Settings
+        await click(target.querySelector(".o_control_panel .o_form_button_save")); // Save Settings
     });
 
     QUnit.test("settings views does not read existing id when reload", async function (assert) {
@@ -733,7 +730,7 @@ QUnit.module("SettingsFormView", (hooks) => {
         assert.notOk(target.querySelector(".o_field_boolean input").disabled);
         await click(target.querySelector(".o_field_boolean input"));
         assert.containsOnce(target, ".o_field_boolean input:checked", "checkbox should be checked");
-        await click(target.querySelector(".o_form_button_save"));
+        await click(target.querySelector(".o_control_panel .o_form_button_save"));
 
         await nextTick();
         assert.notOk(webClient.env.services.router.current.hash.id);
@@ -928,12 +925,12 @@ QUnit.module("SettingsFormView", (hooks) => {
             await click(target.querySelectorAll(".modal-footer .btn")[1]); // Stay Here
             assert.containsOnce(target, ".o_form_view", "should be remain on form view");
 
-            await click(target.querySelector(".o_form_button_save")); // Form Save button
+            await click(target.querySelector(".o_control_panel .o_form_button_save")); // Form Save button
             assert.containsNone(document.body, ".modal", "should not open a warning dialog");
             assert.notOk(target.querySelector(".o_field_boolean input").disabled); // Everything must stay in edit
 
             await click(target.querySelector(".o_field_boolean input"));
-            await click(target.querySelector(".o_form_button_cancel")); // Form Discard button
+            await click(target.querySelector(".o_control_panel .o_form_button_cancel")); // Form Discard button
             assert.containsNone(document.body, ".modal", "should not open a warning dialog");
         }
     );
@@ -1138,10 +1135,18 @@ QUnit.module("SettingsFormView", (hooks) => {
             ".o_field_boolean input:checked",
             "checkbox should not be checked"
         );
-        assert.containsNone(target, ".o_dirty_warning", "warning message should not be shown");
+        assert.containsNone(
+            target,
+            ".o_control_panel .o_dirty_warning",
+            "warning message should not be shown"
+        );
         await click(target.querySelector(".o_field_boolean input[id=bar_0]"));
         assert.containsOnce(target, ".o_field_boolean input:checked", "checkbox should be checked");
-        assert.containsOnce(target, ".o_dirty_warning", "warning message should be shown");
+        assert.containsOnce(
+            target,
+            ".o_control_panel .o_dirty_warning",
+            "warning message should be shown"
+        );
     });
 
     QUnit.test(
@@ -1171,9 +1176,17 @@ QUnit.module("SettingsFormView", (hooks) => {
             });
 
             await click(target.querySelector("input[id=bar_0]"));
-            assert.containsOnce(target, ".o_dirty_warning", "warning message should be shown");
-            await click(target.querySelector(".o_form_button_save"));
-            assert.containsOnce(target, ".o_dirty_warning", "warning message should be shown");
+            assert.containsOnce(
+                target,
+                ".o_control_panel .o_dirty_warning",
+                "warning message should be shown"
+            );
+            await click(target.querySelector(".o_control_panel .o_form_button_save"));
+            assert.containsOnce(
+                target,
+                ".o_control_panel .o_dirty_warning",
+                "warning message should be shown"
+            );
         }
     );
 
@@ -1233,19 +1246,19 @@ QUnit.module("SettingsFormView", (hooks) => {
 
             const webClient = await createWebClient({ serverData, mockRPC });
             await doAction(webClient, 1);
-            assert.strictEqual($(target).find(".breadcrumb").text(), "First action");
+            assert.strictEqual($(target).find(".o_breadcrumb").text(), "First action");
 
             await doAction(webClient, 2);
-            assert.strictEqual($(target).find(".breadcrumb").text(), "First actionSettings");
+            assert.strictEqual($(target).find(".o_breadcrumb").text(), "First actionSettings");
 
             def = makeDeferred();
             await click(target.querySelector('button[name="3"]'));
-            assert.strictEqual($(target).find(".breadcrumb").text(), "First actionSettings");
+            assert.strictEqual($(target).find(".o_breadcrumb").text(), "First actionSettings");
 
             def.resolve();
             await nextTick();
             assert.strictEqual(
-                $(target).find(".breadcrumb").text(),
+                $(target).find(".o_breadcrumb").text(),
                 "First actionSettingsOther action"
             );
         }
@@ -1407,7 +1420,7 @@ QUnit.module("SettingsFormView", (hooks) => {
         await click(target.querySelector(".o_field_boolean input"));
         assert.containsOnce(target, ".o_field_boolean input:checked", "checkbox should be checked");
 
-        await click(target.querySelector(".o_form_button_cancel"));
+        await click(target.querySelector(".o_control_panel .o_form_button_cancel"));
 
         assert.containsNone(
             target,
@@ -1596,7 +1609,7 @@ QUnit.module("SettingsFormView", (hooks) => {
 
         assert.containsOnce(target, "[name='textField'] input");
         assert.verifySteps([
-            `focusin: <input type="text" class="o_searchview_input" accesskey="Q" placeholder="Search..." role="searchbox">`,
+            `focusin: <input type="text" class="o_searchview_input flex-grow-1 w-auto border-0" accesskey="Q" placeholder="Search..." role="searchbox">`,
         ]);
     });
 
diff --git a/addons/web/static/tests/webclient/user_menu_tests.js b/addons/web/static/tests/webclient/user_menu_tests.js
index 9443c1678b0..14315af4720 100644
--- a/addons/web/static/tests/webclient/user_menu_tests.js
+++ b/addons/web/static/tests/webclient/user_menu_tests.js
@@ -100,8 +100,6 @@ QUnit.test("can be rendered", async (assert) => {
         target.querySelector("img.o_user_avatar").dataset.src,
         "http://lordofthering/web/image?model=res.users&field=avatar_128&id=7"
     );
-    assert.containsOnce(target, "span.oe_topbar_name");
-    assert.strictEqual(target.querySelector(".oe_topbar_name").textContent, "Sauron");
     assert.containsNone(target, ".dropdown-menu .dropdown-item");
     await click(target.querySelector("button.dropdown-toggle"));
     assert.containsN(target, ".dropdown-menu .dropdown-item", 4);
@@ -132,8 +130,8 @@ QUnit.test("display the correct name in debug mode", async (assert) => {
     env = await makeTestEnv();
     await mount(UserMenu, target, { env });
     assert.containsOnce(target, "img.o_user_avatar");
-    assert.containsOnce(target, "span.oe_topbar_name");
-    assert.strictEqual(target.querySelector(".oe_topbar_name").textContent, "Sauron (test)");
+    assert.containsOnce(target, "small.oe_topbar_name");
+    assert.strictEqual(target.querySelector(".oe_topbar_name").textContent, "Sauron" + "test");
 });
 
 QUnit.test("can execute the callback of settings", async (assert) => {
diff --git a/addons/web/views/base_document_layout_views.xml b/addons/web/views/base_document_layout_views.xml
index 96675ca2acb..0341cb9528a 100644
--- a/addons/web/views/base_document_layout_views.xml
+++ b/addons/web/views/base_document_layout_views.xml
@@ -34,7 +34,7 @@
                         </group>
                         <div>
                             <field name="preview" widget="iframe_wrapper" />
-                            <button name="web.action_report_layout_preview" string="Download PDF Preview" type="action" class="oe_link" icon="fa-arrow-right"/>
+                            <button name="web.action_report_layout_preview" string="Download PDF Preview" type="action" class="oe_link" icon="oi-arrow-right"/>
                         </div>
                     </group>
                     <footer>
diff --git a/addons/web_editor/static/src/components/media_dialog/file_selector.xml b/addons/web_editor/static/src/components/media_dialog/file_selector.xml
index 8db6d01a78f..15aca680bab 100644
--- a/addons/web_editor/static/src/components/media_dialog/file_selector.xml
+++ b/addons/web_editor/static/src/components/media_dialog/file_selector.xml
@@ -58,7 +58,7 @@
             multiSelect="props.multiSelect"/>
         <t t-call="{{ constructor.attachmentsListTemplate }}"/>
         <div name="load_more_attachments" class="mt-4 text-center mx-auto o_we_load_more" t-ref="load-more-button">
-            <button t-if="canLoadMore" class="btn btn-odoo o_load_more" type="button" t-on-click="handleLoadMore">Load more...</button>
+            <button t-if="canLoadMore" class="btn btn-primary o_load_more" type="button" t-on-click="handleLoadMore">Load more...</button>
             <div t-if="hasContent and !canLoadMore" class="mt-4 o_load_done_msg">
                 <span><i t-esc="allLoadedText"/></span>
             </div>
diff --git a/addons/web_editor/static/src/scss/web_editor.variables.scss b/addons/web_editor/static/src/scss/web_editor.variables.scss
index 05144ff68b7..b664a12096e 100644
--- a/addons/web_editor/static/src/scss/web_editor.variables.scss
+++ b/addons/web_editor/static/src/scss/web_editor.variables.scss
@@ -282,7 +282,7 @@ $o-base-color-palette: (
 ) !default;
 $o-color-palettes: (
     'base-1': (
-        'o-color-1': scale-color($o-enterprise-primary-color, $saturation: -50%, $lightness: 20%),
+        'o-color-1': scale-color($o-enterprise-action-color, $saturation: -50%, $lightness: 20%),
         'o-color-2': scale-color($o-enterprise-color, $saturation: -50%),
         'o-color-3': #F6F6F6,
         'o-color-4': #FFFFFF,
@@ -305,7 +305,7 @@ $o-theme-color-palettes: (
     // They should not be used in the code base anymore and ideally they will
     // not generate any classes for >= 13.4 databases.
     'base-1': (
-        'alpha': $o-enterprise-primary-color,
+        'alpha': $o-enterprise-action-color,
         'beta': $o-enterprise-color,
         'gamma': #5C5B80,
         'delta': #5B899E,
diff --git a/addons/web_editor/static/src/xml/wysiwyg.xml b/addons/web_editor/static/src/xml/wysiwyg.xml
index 09a54b29726..6fc7f89a951 100644
--- a/addons/web_editor/static/src/xml/wysiwyg.xml
+++ b/addons/web_editor/static/src/xml/wysiwyg.xml
@@ -357,8 +357,8 @@
                     <button type="button" title="Rotate Right" data-action="rotate" data-value="90"><i class="fa fa-fw fa-rotate-right"/></button>
                 </div>
                 <div class="btn-group" role="group">
-                    <button type="button" title="Flip Horizontal" data-action="flip" data-scale-direction="scaleX"><i class="fa fa-fw fa-arrows-h"/></button>
-                    <button type="button" title="Flip Vertical" data-action="flip" data-scale-direction="scaleY"><i class="fa fa-fw fa-arrows-v"/></button>
+                    <button type="button" title="Flip Horizontal" data-action="flip" data-scale-direction="scaleX"><i class="oi oi-fw oi-arrows-h"/></button>
+                    <button type="button" title="Flip Vertical" data-action="flip" data-scale-direction="scaleY"><i class="oi oi-fw oi-arrows-v"/></button>
                 </div>
                 <div class="btn-group" role="group">
                     <button type="button" title="Reset Image" data-action="reset"><i class="fa fa-refresh"/> Reset Image</button>
diff --git a/addons/web_editor/views/snippets.xml b/addons/web_editor/views/snippets.xml
index 073b04dc599..dbdbb34c374 100644
--- a/addons/web_editor/views/snippets.xml
+++ b/addons/web_editor/views/snippets.xml
@@ -398,8 +398,8 @@
                 <we-button data-shape="" data-name="shape_none_opt" data-dependencies="!shape_none_opt" data-no-preview="true" class="o_we_image_shape_remove o_we_bg_danger fa fa-fw fa-times"/>
             </we-row>
             <we-row string="Flip" class="o_we_sublevel_2">
-                <we-button class="fa fa-fw fa-arrows-h" data-flip-x="true" data-no-preview="true" data-dependencies="!shape_none_opt"/>
-                <we-button class="fa fa-fw fa-arrows-v" data-flip-y="true" data-no-preview="true" data-dependencies="!shape_none_opt"/>
+                <we-button class="oi oi-fw oi-arrows-h" data-flip-x="true" data-no-preview="true" data-dependencies="!shape_none_opt"/>
+                <we-button class="oi oi-fw oi-arrows-v" data-flip-y="true" data-no-preview="true" data-dependencies="!shape_none_opt"/>
             </we-row>
             <we-row string="Colors" class="o_we_sublevel_2" data-name="colors">
                 <we-colorpicker data-select-style="" data-css-property="background-color" data-color-prefix="bg-" data-apply-to="> .o_we_shape"/>
diff --git a/addons/web_tour/static/src/tour_service/tour_utils.js b/addons/web_tour/static/src/tour_service/tour_utils.js
index 3ccecaa662d..820aa11cae3 100644
--- a/addons/web_tour/static/src/tour_service/tour_utils.js
+++ b/addons/web_tour/static/src/tour_service/tour_utils.js
@@ -483,11 +483,11 @@ export const stepUtils = {
 
     autoExpandMoreButtons(extra_trigger) {
         return {
-            trigger: ".oe_button_box",
+            trigger: ".o-form-buttonbox",
             extra_trigger: extra_trigger,
             auto: true,
             run: (actions) => {
-                const $more = $(".oe_button_box .o_button_more");
+                const $more = $(".o-form-buttonbox .o_button_more");
                 if ($more.length) {
                     actions.click($more);
                 }
@@ -498,7 +498,7 @@ export const stepUtils = {
     goBackBreadcrumbsMobile(description, ...extraTrigger) {
         return extraTrigger.map((element) => ({
             mobile: true,
-            trigger: ".breadcrumb-item.o_back_button",
+            trigger: ".o_back_button",
             extra_trigger: element,
             content: description,
             position: "bottom",
@@ -596,6 +596,11 @@ export const stepUtils = {
 
     mobileKanbanSearchMany2X(modalTitle, valueSearched) {
         return [
+            {
+                mobile: true,
+                trigger: `.o_control_panel_navigation .btn .fa-search`,
+                position: "bottom",
+            },
             {
                 mobile: true,
                 trigger: ".o_searchview_input",
diff --git a/addons/web_unsplash/static/description/icon.png b/addons/web_unsplash/static/description/icon.png
index 54f5c717396..23000add28e 100644
Binary files a/addons/web_unsplash/static/description/icon.png and b/addons/web_unsplash/static/description/icon.png differ
diff --git a/addons/web_unsplash/static/description/icon.svg b/addons/web_unsplash/static/description/icon.svg
index 09999b47674..7a011e50d4e 100644
--- a/addons/web_unsplash/static/description/icon.svg
+++ b/addons/web_unsplash/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#7CC098"/><stop offset="100%" stop-color="#5F8A71"/></linearGradient><path id="d" d="M35 24c1.653 0 3.066.538 4.24 1.614C40.413 26.69 41 27.985 41 29.5c0 1.515-.587 2.81-1.76 3.886C38.066 34.462 36.653 35 35 35s-3.066-.538-4.24-1.614C29.587 32.31 29 31.015 29 29.5c0-1.515.587-2.81 1.76-3.886C31.934 24.538 33.347 24 35 24zm11.733-5.154c1.178 0 2.184.376 3.017 1.127.833.751 1.25 1.658 1.25 2.72v13.46c0 1.063-.417 1.969-1.25 2.72-.833.751-1.839 1.127-3.017 1.127H23.267c-1.178 0-2.184-.376-3.017-1.127-.833-.751-1.25-1.657-1.25-2.72v-13.46c0-1.062.417-1.969 1.25-2.72.833-.751 1.839-1.127 3.017-1.127H27l.85-2.043c.211-.49.597-.914 1.158-1.27.561-.355 1.136-.533 1.725-.533h8.534c.589 0 1.164.178 1.725.533.56.356.947.78 1.158 1.27l.85 2.043h3.733zM35 37c2.202 0 4.086-.734 5.652-2.201C42.217 33.33 43 31.565 43 29.5c0-2.065-.783-3.83-2.348-5.299C39.086 22.734 37.202 22 35 22s-4.086.734-5.652 2.201C27.783 25.67 27 27.435 27 29.5c0 2.065.783 3.83 2.348 5.299C30.914 36.266 32.798 37 35 37zM19.699 50.884c0 1.063-.297 1.853-.891 2.37-.594.518-1.415.776-2.464.776-1.063 0-1.886-.257-2.47-.77-.583-.513-.874-1.305-.874-2.376V46h1.727v4.884c0 .213.018.422.055.627.037.205.114.387.231.544.117.158.28.286.49.386.209.099.489.148.841.148.616 0 1.041-.137 1.276-.413.235-.275.352-.705.352-1.292V46h1.727v4.884zm.956-2.717h1.485v.792h.033c.198-.33.454-.57.77-.72.315-.15.638-.226.968-.226.418 0 .76.057 1.028.17.268.114.479.272.633.474.154.201.262.447.324.737.063.29.094.61.094.962v3.498h-1.562v-3.212c0-.47-.074-.82-.22-1.05-.147-.232-.407-.347-.781-.347-.426 0-.734.126-.924.38-.191.253-.286.669-.286 1.248v2.981h-1.562v-5.687zm7.368 3.839a.857.857 0 0 0 .374.731c.11.078.237.134.38.171a1.67 1.67 0 0 0 .792.017c.12-.026.23-.066.33-.122a.75.75 0 0 0 .247-.22.578.578 0 0 0 .1-.346c0-.235-.156-.41-.468-.528a9.336 9.336 0 0 0-1.304-.352 7.71 7.71 0 0 1-.665-.181 2.274 2.274 0 0 1-.578-.276 1.337 1.337 0 0 1-.407-.428 1.216 1.216 0 0 1-.154-.633c0-.367.072-.667.215-.902.143-.235.332-.42.566-.555.235-.136.5-.231.792-.286.294-.056.594-.083.902-.083.308 0 .607.03.897.088.29.059.548.158.775.297.228.14.417.324.567.555.15.232.24.523.27.875h-1.486c-.022-.3-.135-.504-.34-.61a1.559 1.559 0 0 0-.727-.16c-.088 0-.183.005-.286.017a.955.955 0 0 0-.28.071.578.578 0 0 0-.215.16.421.421 0 0 0-.088.28c0 .14.052.253.154.341.103.088.237.16.402.215.165.055.354.104.566.148.213.044.43.092.65.143.227.051.449.114.665.187.216.073.409.17.577.291.17.122.305.272.407.451.103.18.154.402.154.666 0 .374-.075.687-.225.94-.15.254-.347.457-.589.611a2.412 2.412 0 0 1-.83.325 4.84 4.84 0 0 1-1.92-.006 2.555 2.555 0 0 1-.841-.33 1.887 1.887 0 0 1-.605-.61c-.158-.254-.244-.57-.259-.952h1.485zm7.204.825c.257 0 .471-.051.644-.154.172-.103.311-.236.418-.401.106-.166.181-.358.225-.578.044-.22.066-.444.066-.671a3.16 3.16 0 0 0-.071-.671 1.786 1.786 0 0 0-.237-.589 1.317 1.317 0 0 0-.423-.418 1.183 1.183 0 0 0-.633-.159c-.257 0-.471.053-.643.16a1.284 1.284 0 0 0-.418.412 1.712 1.712 0 0 0-.226.583 3.47 3.47 0 0 0-.066.682c0 .227.024.451.072.671.047.22.124.412.23.578.107.165.248.298.424.401.176.103.389.154.638.154zm-2.87-4.664h1.484v.726h.022c.19-.308.433-.532.726-.671.293-.14.616-.209.968-.209.447 0 .832.084 1.155.253.323.169.59.392.803.671.213.279.37.603.473.974.103.37.154.757.154 1.16 0 .381-.051.748-.154 1.1a2.8 2.8 0 0 1-.467.935c-.21.271-.47.488-.781.649-.312.161-.677.242-1.095.242-.352 0-.676-.071-.973-.215a1.843 1.843 0 0 1-.732-.632h-.022v2.695h-1.562v-7.678zm6.4-2.167h1.562v7.854h-1.562V46zm2.364 3.916c.022-.367.113-.671.275-.913.16-.242.366-.436.616-.583.249-.147.53-.251.841-.314.312-.062.625-.093.94-.093.287 0 .576.02.87.06.293.04.56.12.803.237.242.117.44.28.594.49.154.209.23.485.23.83v2.959c0 .257.015.502.045.737.029.235.08.41.154.528h-1.584a2.241 2.241 0 0 1-.11-.55c-.25.257-.543.436-.88.539a3.532 3.532 0 0 1-1.034.154c-.272 0-.525-.033-.76-.099a1.738 1.738 0 0 1-.615-.308 1.434 1.434 0 0 1-.413-.528 1.785 1.785 0 0 1-.148-.759c0-.323.056-.588.17-.797.114-.21.26-.376.44-.501s.385-.218.616-.28c.231-.063.464-.112.699-.149.234-.037.465-.066.693-.088.227-.022.429-.055.605-.099.176-.044.315-.108.418-.193.102-.084.15-.207.143-.368a.829.829 0 0 0-.083-.402.607.607 0 0 0-.22-.23.865.865 0 0 0-.319-.11 2.61 2.61 0 0 0-.39-.028c-.308 0-.55.066-.726.198-.176.132-.28.352-.308.66H41.12zm3.608 1.155a.7.7 0 0 1-.248.138c-.099.033-.205.06-.319.082-.114.022-.233.04-.357.055-.125.015-.25.033-.374.055a2.82 2.82 0 0 0-.347.088 1.024 1.024 0 0 0-.297.149.706.706 0 0 0-.203.236.76.76 0 0 0-.077.363c0 .14.025.257.077.352a.59.59 0 0 0 .209.226c.088.055.19.093.308.115.117.022.238.033.363.033.308 0 .546-.051.715-.154a1.03 1.03 0 0 0 .374-.368c.08-.144.13-.288.148-.435.018-.147.028-.264.028-.352v-.583zm3.617.935a.857.857 0 0 0 .374.731c.11.078.237.134.38.171a1.67 1.67 0 0 0 .792.017c.12-.026.23-.066.33-.122a.75.75 0 0 0 .247-.22.578.578 0 0 0 .1-.346c0-.235-.157-.41-.468-.528a9.336 9.336 0 0 0-1.304-.352 7.71 7.71 0 0 1-.665-.181 2.274 2.274 0 0 1-.578-.276 1.337 1.337 0 0 1-.407-.428 1.216 1.216 0 0 1-.154-.633c0-.367.072-.667.215-.902.143-.235.332-.42.566-.555.235-.136.499-.231.792-.286.294-.056.594-.083.902-.083.308 0 .607.03.897.088.29.059.548.158.775.297.228.14.416.324.567.555.15.232.24.523.27.875H50.49c-.022-.3-.135-.504-.34-.61a1.559 1.559 0 0 0-.727-.16c-.088 0-.183.005-.286.017a.955.955 0 0 0-.28.071.578.578 0 0 0-.215.16.421.421 0 0 0-.088.28c0 .14.052.253.154.341.103.088.237.16.402.215.165.055.354.104.566.148.213.044.43.092.65.143.227.051.448.114.665.187.216.073.409.17.577.291.169.122.305.272.407.451.103.18.154.402.154.666 0 .374-.075.687-.225.94-.15.254-.347.457-.589.611a2.412 2.412 0 0 1-.83.325 4.84 4.84 0 0 1-1.92-.006 2.555 2.555 0 0 1-.841-.33 1.887 1.887 0 0 1-.605-.61c-.158-.254-.244-.57-.259-.952h1.485zM52.68 46h1.562v2.959h.033c.198-.33.451-.57.759-.72.308-.15.609-.226.902-.226.418 0 .76.057 1.028.17.268.114.479.272.633.474.154.201.262.447.324.737.063.29.094.61.094.962v3.498h-1.562v-3.212c0-.47-.073-.82-.22-1.05-.147-.232-.407-.347-.781-.347-.425 0-.733.126-.924.38-.19.253-.286.669-.286 1.248v2.981h-1.562V46zM14.036 57.642H13V57h2.833v.642h-1.037v2.832h-.76v-2.832zM16 57h1.07l.809 2.389h.01L18.652 57h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438H16V57z"/><path id="e" d="M35 22c1.653 0 3.066.538 4.24 1.614C40.413 24.69 41 25.985 41 27.5c0 1.515-.587 2.81-1.76 3.886C38.066 32.462 36.653 33 35 33s-3.066-.538-4.24-1.614C29.587 30.31 29 29.015 29 27.5c0-1.515.587-2.81 1.76-3.886C31.934 22.538 33.347 22 35 22zm11.733-5.154c1.178 0 2.184.376 3.017 1.127.833.751 1.25 1.658 1.25 2.72v13.46c0 1.063-.417 1.969-1.25 2.72-.833.751-1.839 1.127-3.017 1.127H23.267c-1.178 0-2.184-.376-3.017-1.127-.833-.751-1.25-1.657-1.25-2.72v-13.46c0-1.062.417-1.969 1.25-2.72.833-.751 1.839-1.127 3.017-1.127H27l.85-2.043c.211-.49.597-.914 1.158-1.27.561-.355 1.136-.533 1.725-.533h8.534c.589 0 1.164.178 1.725.533.56.356.947.78 1.158 1.27l.85 2.043h3.733zM35 35c2.202 0 4.086-.734 5.652-2.201C42.217 31.33 43 29.565 43 27.5c0-2.065-.783-3.83-2.348-5.299C39.086 20.734 37.202 20 35 20s-4.086.734-5.652 2.201C27.783 23.67 27 25.435 27 27.5c0 2.065.783 3.83 2.348 5.299C30.914 34.266 32.798 35 35 35zM19.699 48.884c0 1.063-.297 1.853-.891 2.37-.594.518-1.415.776-2.464.776-1.063 0-1.886-.257-2.47-.77-.583-.513-.874-1.305-.874-2.376V44h1.727v4.884c0 .213.018.422.055.627.037.205.114.387.231.544.117.158.28.286.49.386.209.099.489.148.841.148.616 0 1.041-.137 1.276-.413.235-.275.352-.705.352-1.292V44h1.727v4.884zm.956-2.717h1.485v.792h.033c.198-.33.454-.57.77-.72.315-.15.638-.226.968-.226.418 0 .76.057 1.028.17.268.114.479.272.633.474.154.201.262.447.324.737.063.29.094.61.094.962v3.498h-1.562v-3.212c0-.47-.074-.82-.22-1.05-.147-.232-.407-.347-.781-.347-.426 0-.734.126-.924.38-.191.253-.286.669-.286 1.248v2.981h-1.562v-5.687zm7.368 3.839a.857.857 0 0 0 .374.731c.11.078.237.134.38.171a1.67 1.67 0 0 0 .792.017c.12-.026.23-.066.33-.122a.75.75 0 0 0 .247-.22.578.578 0 0 0 .1-.346c0-.235-.156-.41-.468-.528a9.336 9.336 0 0 0-1.304-.352 7.71 7.71 0 0 1-.665-.181 2.274 2.274 0 0 1-.578-.276 1.337 1.337 0 0 1-.407-.428 1.216 1.216 0 0 1-.154-.633c0-.367.072-.667.215-.902.143-.235.332-.42.566-.555.235-.136.5-.231.792-.286.294-.056.594-.083.902-.083.308 0 .607.03.897.088.29.059.548.158.775.297.228.14.417.324.567.555.15.232.24.523.27.875h-1.486c-.022-.3-.135-.504-.34-.61a1.559 1.559 0 0 0-.727-.16c-.088 0-.183.005-.286.017a.955.955 0 0 0-.28.071.578.578 0 0 0-.215.16.421.421 0 0 0-.088.28c0 .14.052.253.154.341.103.088.237.16.402.215.165.055.354.104.566.148.213.044.43.092.65.143.227.051.449.114.665.187.216.073.409.17.577.291.17.122.305.272.407.451.103.18.154.402.154.666 0 .374-.075.687-.225.94-.15.254-.347.457-.589.611a2.412 2.412 0 0 1-.83.325 4.84 4.84 0 0 1-1.92-.006 2.555 2.555 0 0 1-.841-.33 1.887 1.887 0 0 1-.605-.61c-.158-.254-.244-.57-.259-.952h1.485zm7.204.825c.257 0 .471-.051.644-.154.172-.103.311-.236.418-.401.106-.166.181-.358.225-.578.044-.22.066-.444.066-.671a3.16 3.16 0 0 0-.071-.671 1.786 1.786 0 0 0-.237-.589 1.317 1.317 0 0 0-.423-.418 1.183 1.183 0 0 0-.633-.159c-.257 0-.471.053-.643.16a1.284 1.284 0 0 0-.418.412 1.712 1.712 0 0 0-.226.583 3.47 3.47 0 0 0-.066.682c0 .227.024.451.072.671.047.22.124.412.23.578.107.165.248.298.424.401.176.103.389.154.638.154zm-2.87-4.664h1.484v.726h.022c.19-.308.433-.532.726-.671.293-.14.616-.209.968-.209.447 0 .832.084 1.155.253.323.169.59.392.803.671.213.279.37.603.473.974.103.37.154.757.154 1.16 0 .381-.051.748-.154 1.1a2.8 2.8 0 0 1-.467.935c-.21.271-.47.488-.781.649-.312.161-.677.242-1.095.242-.352 0-.676-.071-.973-.215a1.843 1.843 0 0 1-.732-.632h-.022v2.695h-1.562v-7.678zm6.4-2.167h1.562v7.854h-1.562V44zm2.364 3.916c.022-.367.113-.671.275-.913.16-.242.366-.436.616-.583.249-.147.53-.251.841-.314.312-.062.625-.093.94-.093.287 0 .576.02.87.06.293.04.56.12.803.237.242.117.44.28.594.49.154.209.23.485.23.83v2.959c0 .257.015.502.045.737.029.235.08.41.154.528h-1.584a2.241 2.241 0 0 1-.11-.55c-.25.257-.543.436-.88.539a3.532 3.532 0 0 1-1.034.154c-.272 0-.525-.033-.76-.099a1.738 1.738 0 0 1-.615-.308 1.434 1.434 0 0 1-.413-.528 1.785 1.785 0 0 1-.148-.759c0-.323.056-.588.17-.797.114-.21.26-.376.44-.501s.385-.218.616-.28c.231-.063.464-.112.699-.149.234-.037.465-.066.693-.088.227-.022.429-.055.605-.099.176-.044.315-.108.418-.193.102-.084.15-.207.143-.368a.829.829 0 0 0-.083-.402.607.607 0 0 0-.22-.23.865.865 0 0 0-.319-.11 2.61 2.61 0 0 0-.39-.028c-.308 0-.55.066-.726.198-.176.132-.28.352-.308.66H41.12zm3.608 1.155a.7.7 0 0 1-.248.138c-.099.033-.205.06-.319.082-.114.022-.233.04-.357.055-.125.015-.25.033-.374.055a2.82 2.82 0 0 0-.347.088 1.024 1.024 0 0 0-.297.149.706.706 0 0 0-.203.236.76.76 0 0 0-.077.363c0 .14.025.257.077.352a.59.59 0 0 0 .209.226c.088.055.19.093.308.115.117.022.238.033.363.033.308 0 .546-.051.715-.154a1.03 1.03 0 0 0 .374-.368c.08-.144.13-.288.148-.435.018-.147.028-.264.028-.352v-.583zm3.617.935a.857.857 0 0 0 .374.731c.11.078.237.134.38.171a1.67 1.67 0 0 0 .792.017c.12-.026.23-.066.33-.122a.75.75 0 0 0 .247-.22.578.578 0 0 0 .1-.346c0-.235-.157-.41-.468-.528a9.336 9.336 0 0 0-1.304-.352 7.71 7.71 0 0 1-.665-.181 2.274 2.274 0 0 1-.578-.276 1.337 1.337 0 0 1-.407-.428 1.216 1.216 0 0 1-.154-.633c0-.367.072-.667.215-.902.143-.235.332-.42.566-.555.235-.136.499-.231.792-.286.294-.056.594-.083.902-.083.308 0 .607.03.897.088.29.059.548.158.775.297.228.14.416.324.567.555.15.232.24.523.27.875H50.49c-.022-.3-.135-.504-.34-.61a1.559 1.559 0 0 0-.727-.16c-.088 0-.183.005-.286.017a.955.955 0 0 0-.28.071.578.578 0 0 0-.215.16.421.421 0 0 0-.088.28c0 .14.052.253.154.341.103.088.237.16.402.215.165.055.354.104.566.148.213.044.43.092.65.143.227.051.448.114.665.187.216.073.409.17.577.291.169.122.305.272.407.451.103.18.154.402.154.666 0 .374-.075.687-.225.94-.15.254-.347.457-.589.611a2.412 2.412 0 0 1-.83.325 4.84 4.84 0 0 1-1.92-.006 2.555 2.555 0 0 1-.841-.33 1.887 1.887 0 0 1-.605-.61c-.158-.254-.244-.57-.259-.952h1.485zM52.68 44h1.562v2.959h.033c.198-.33.451-.57.759-.72.308-.15.609-.226.902-.226.418 0 .76.057 1.028.17.268.114.479.272.633.474.154.201.262.447.324.737.063.29.094.61.094.962v3.498h-1.562v-3.212c0-.47-.073-.82-.22-1.05-.147-.232-.407-.347-.781-.347-.425 0-.733.126-.924.38-.19.253-.286.669-.286 1.248v2.981h-1.562V44zM14.036 55.642H13V55h2.833v.642h-1.037v2.832h-.76v-2.832zM16 55h1.07l.809 2.389h.01L18.652 55h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438H16V55z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V33.916L25 18l11.4-3 11.016 3.802 3.209 19.927L46.5 47.19l1.345-.833h2.78l2.135-2.198L54 47.19l3-.19 1.014 4.854L39.224 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M43.105 4h.972V.818h1.108V0H42v.818h1.105V4Zm2.775 0h.858V1.453h.053L47.663 4h.555l.871-2.547h.056V4H50V0h-1.108l-.924 2.714h-.05L46.99 0h-1.11v4Z" fill="#D1D5DB"/><path d="M17.125 15.813V4h15.75v11.813h-15.75Zm15.75 6.562H46V46H4V22.375h13.125v11.813h15.75V22.374Z"/></svg>
diff --git a/addons/web_unsplash/views/res_config_settings_view.xml b/addons/web_unsplash/views/res_config_settings_view.xml
index 5ed5527075e..6a874857e32 100644
--- a/addons/web_unsplash/views/res_config_settings_view.xml
+++ b/addons/web_unsplash/views/res_config_settings_view.xml
@@ -17,7 +17,7 @@
                     </div>
                     <div>
                         <a href="https://www.odoo.com/documentation/master/applications/websites/website/optimize/unsplash.html#generate-an-unsplash-access-key" class="oe_link" target="_blank">
-                            <i class="fa fa-arrow-right"/> Generate an Access Key
+                            <i class="oi oi-arrow-right"/> Generate an Access Key
                         </a>
                     </div>
                 </div>
diff --git a/addons/website/static/description/icon.png b/addons/website/static/description/icon.png
index 432fe05e387..88646538988 100644
Binary files a/addons/website/static/description/icon.png and b/addons/website/static/description/icon.png differ
diff --git a/addons/website/static/description/icon.svg b/addons/website/static/description/icon.svg
index ef945983564..3ab5a4d4662 100644
--- a/addons/website/static/description/icon.svg
+++ b/addons/website/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#DA956B"/><stop offset="100%" stop-color="#CC7039"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-.146-4-4.074V42.409l18.596-21.11L36 14l18 11.204-1.95 22.765L36.782 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><path fill="#000" d="M35 15.571c3.888 0 7.473.958 10.756 2.874a21.332 21.332 0 0 1 7.799 7.799c1.916 3.283 2.874 6.868 2.874 10.756s-.958 7.473-2.874 10.756a21.332 21.332 0 0 1-7.799 7.799C42.473 57.47 38.888 58.429 35 58.429s-7.473-.958-10.756-2.874a21.332 21.332 0 0 1-7.799-7.799C14.53 44.473 13.571 40.888 13.571 37s.958-7.473 2.874-10.756a21.332 21.332 0 0 1 7.799-7.799c3.283-1.916 6.868-2.874 10.756-2.874zm7.645 14.537c-.037.019-.125.107-.265.265-.14.158-.265.247-.377.265.038 0 .08-.046.126-.14.046-.092.093-.194.14-.306a.856.856 0 0 1 .097-.195c.112-.13.316-.27.614-.419.26-.111.744-.223 1.45-.335.633-.149 1.108-.046 1.424.307-.037-.037.05-.158.265-.363.214-.204.349-.316.404-.334.056-.038.196-.08.419-.126.223-.046.363-.116.418-.21l.056-.613c-.223.019-.386-.046-.488-.195-.102-.15-.163-.344-.181-.586 0 .037-.056.111-.168.223 0-.13-.042-.205-.125-.223a.671.671 0 0 0-.321.028c-.13.037-.214.046-.251.028a1.095 1.095 0 0 1-.419-.21c-.093-.083-.167-.237-.223-.46a7.936 7.936 0 0 0-.112-.419c-.037-.093-.125-.19-.265-.293-.14-.102-.228-.2-.265-.293a3.026 3.026 0 0 1-.07-.153 3.41 3.41 0 0 0-.083-.181.589.589 0 0 0-.112-.154.213.213 0 0 0-.153-.07c-.056 0-.121.047-.196.14a5.451 5.451 0 0 0-.209.279c-.065.093-.107.14-.125.14a.228.228 0 0 0-.168-.042.89.89 0 0 0-.125.028.47.47 0 0 0-.126.083.78.78 0 0 1-.14.098.637.637 0 0 1-.237.084 1.824 1.824 0 0 0-.237.055c.28-.093.27-.195-.028-.307-.186-.074-.335-.102-.446-.083.167-.075.237-.186.21-.335a.671.671 0 0 0-.238-.39h.14c-.02-.075-.098-.154-.238-.238a3.42 3.42 0 0 0-.488-.237 2.402 2.402 0 0 1-.363-.167c-.149-.093-.465-.182-.948-.265-.484-.084-.79-.089-.921-.014-.093.111-.135.209-.126.293.01.083.047.213.112.39.065.177.098.293.098.349.018.112-.033.232-.154.363-.12.13-.181.241-.181.334 0 .13.13.275.39.433.26.158.354.358.28.6-.056.149-.205.297-.447.446-.242.15-.39.26-.446.335-.093.149-.107.321-.042.516.065.196.162.349.293.46.037.038.05.075.042.112-.01.037-.042.08-.098.126a1.249 1.249 0 0 1-.154.111c-.046.028-.107.06-.181.098l-.084.056c-.204.093-.395.037-.572-.168a1.804 1.804 0 0 1-.376-.725c-.13-.465-.28-.744-.447-.837-.428-.149-.697-.14-.809.028-.093-.242-.474-.484-1.144-.726-.465-.167-1.004-.204-1.618-.111.111-.019.111-.158 0-.419-.13-.279-.307-.39-.53-.335a1.4 1.4 0 0 0 .111-.488c.019-.214.028-.34.028-.376.056-.242.168-.456.335-.642a5.35 5.35 0 0 0 .46-.614c.065-.112.07-.167.014-.167.651.074 1.116-.028 1.395-.307.093-.093.2-.252.321-.475.121-.223.219-.381.293-.474.168-.112.298-.163.39-.154.094.01.229.06.405.154.177.093.312.14.405.14.26.018.405-.084.433-.307a.606.606 0 0 0-.21-.559c.223.02.251-.139.084-.474a1.065 1.065 0 0 0-.223-.251c-.223-.074-.475-.028-.754.14-.148.074-.13.148.056.223-.018-.019-.107.079-.265.293a2.36 2.36 0 0 1-.46.488c-.15.112-.298.065-.447-.14-.018-.018-.07-.144-.153-.376-.084-.233-.172-.358-.265-.377-.149 0-.298.14-.447.419.056-.15-.046-.289-.307-.419-.26-.13-.483-.204-.67-.223.354-.223.28-.474-.222-.753-.13-.075-.321-.121-.572-.14-.252-.019-.433.019-.544.112-.093.13-.145.237-.154.32-.01.084.037.159.14.224.102.065.2.116.293.153.093.037.2.075.32.112.121.037.2.065.238.084.26.186.334.316.223.39a3.374 3.374 0 0 1-.237.098c-.121.046-.228.088-.321.125-.093.038-.15.075-.168.112-.055.074-.055.205 0 .39.056.187.038.317-.055.391-.093-.093-.177-.256-.252-.488-.074-.233-.14-.386-.195-.46.13.167-.102.223-.697.167l-.28-.028c-.074 0-.223.019-.446.056a2.073 2.073 0 0 1-.572.028.519.519 0 0 1-.377-.223c-.074-.15-.074-.335 0-.558.02-.075.056-.093.112-.056a4.18 4.18 0 0 1-.307-.265c-.13-.121-.223-.2-.279-.237-.856.279-1.73.66-2.623 1.143.112.02.224.01.335-.027.093-.038.214-.098.363-.182a9.41 9.41 0 0 1 .279-.153c.632-.26 1.023-.326 1.172-.196l.14-.14c.26.299.446.531.557.698-.13-.074-.409-.083-.837-.027-.372.111-.576.223-.614.334.13.224.177.391.14.503a4.358 4.358 0 0 1-.32-.28 2.213 2.213 0 0 0-.405-.306c-.13-.075-.27-.121-.419-.14-.298 0-.502.01-.614.028-2.716 1.488-4.901 3.553-6.557 6.194.13.13.242.205.335.224.074.018.121.102.14.25.018.15.041.252.07.308.027.055.134.027.32-.084.168.149.195.325.084.53.018-.019.428.232 1.228.753.353.317.548.512.586.586.055.205-.038.372-.28.502-.018-.037-.102-.12-.25-.25-.15-.13-.233-.168-.252-.112-.056.093-.05.265.014.516.065.251.163.367.293.349-.13 0-.218.149-.265.446-.046.298-.07.628-.07.99 0 .363-.009.582-.028.656l.056.028c-.056.223-.004.544.154.963.158.418.358.6.6.544-.242.056-.056.456.558 1.2.111.149.186.232.223.25.056.038.167.108.335.21.167.102.307.195.418.28.112.083.205.18.28.292.074.093.167.302.278.628.112.325.242.544.39.656-.036.111.052.297.266.558.214.26.312.474.293.641a.136.136 0 0 0-.07.028.136.136 0 0 1-.07.028c.056.13.2.26.433.39.232.131.377.252.432.364.019.055.038.148.056.279.019.13.047.232.084.306.037.075.111.093.223.056.037-.372-.186-.948-.67-1.73a22.925 22.925 0 0 1-.474-.809 1.604 1.604 0 0 1-.153-.432 2.128 2.128 0 0 0-.126-.405c.037 0 .093.014.167.042.075.028.154.06.238.098.083.037.153.074.209.111.056.037.074.065.056.084-.056.13-.037.293.056.488.093.196.204.368.334.516a38.267 38.267 0 0 0 .81.893c.111.112.241.293.39.544.149.251.149.377 0 .377.168 0 .354.093.558.28.205.185.363.371.474.557.093.149.168.39.224.726.056.334.102.558.14.67.036.13.115.255.236.376.121.12.238.21.35.265l.446.223.362.195c.093.038.265.135.516.293a3.6 3.6 0 0 0 .6.321c.186.075.335.112.447.112.111 0 .246-.023.404-.07.158-.046.284-.079.377-.098.28-.037.549.103.81.419.26.316.455.512.585.586.67.353 1.181.456 1.535.307-.037.018-.033.088.014.21.046.12.12.264.223.432a27.356 27.356 0 0 0 .404.641c.093.112.26.251.503.419.242.167.409.307.502.418.112-.074.177-.158.195-.25-.056.148.01.334.196.557.186.224.353.317.502.28.26-.056.39-.354.39-.894-.576.28-1.032.112-1.367-.502a.544.544 0 0 0-.07-.153 1.766 1.766 0 0 1-.181-.474.396.396 0 0 1 0-.21c.019-.056.065-.084.14-.084.167 0 .26-.032.279-.097.018-.065 0-.182-.056-.349a5.625 5.625 0 0 1-.112-.363c-.018-.148-.12-.334-.307-.558a7.435 7.435 0 0 1-.334-.418c-.094.167-.242.242-.447.223-.205-.019-.353-.102-.446-.251a.77.77 0 0 1-.042.153.664.664 0 0 0-.042.182c-.242 0-.381-.01-.419-.028.019-.056.042-.219.07-.488.028-.27.06-.48.098-.628a1.55 1.55 0 0 1 .153-.335 5.76 5.76 0 0 0 .21-.405c.055-.12.093-.237.111-.348.019-.112-.023-.2-.125-.266-.103-.065-.265-.088-.489-.07-.353.02-.595.205-.725.559a5.787 5.787 0 0 0-.084.293.945.945 0 0 1-.14.32.694.694 0 0 1-.25.196c-.13.056-.354.074-.67.056-.316-.019-.54-.065-.67-.14-.242-.149-.45-.418-.628-.809-.176-.39-.265-.735-.265-1.032 0-.186.024-.433.07-.74.047-.307.075-.54.084-.697.01-.158-.042-.386-.154-.684.056-.037.14-.125.252-.265.111-.14.204-.237.279-.293a.498.498 0 0 1 .125-.042.285.285 0 0 1 .126 0c.037.01.074-.004.111-.042a.354.354 0 0 0 .084-.167.831.831 0 0 0-.112-.084c-.055-.056-.093-.083-.111-.083.13.055.395.041.795-.042.4-.084.656-.07.767.042.28.204.484.186.614-.056a2.22 2.22 0 0 0-.07-.265c-.046-.158-.05-.284-.014-.377.093.502.363.586.81.251.055.056.2.102.432.14.233.037.395.083.488.14.056.036.121.088.196.153.074.065.125.107.153.125.028.019.074.014.14-.014a.84.84 0 0 0 .237-.181c.186.26.297.484.335.67.204.744.38 1.153.53 1.227.13.056.232.075.307.056.074-.019.116-.107.125-.265.01-.158.01-.288 0-.39a6.933 6.933 0 0 0-.042-.35l-.028-.223v-.502l-.027-.223c-.28-.056-.452-.168-.517-.335a.599.599 0 0 1 .042-.516c.093-.177.233-.349.419-.516a.91.91 0 0 1 .223-.098c.13-.046.274-.107.432-.181.159-.075.275-.15.35-.224.39-.353.53-.678.418-.976.13 0 .232-.084.307-.251-.019 0-.065-.028-.14-.084a2.04 2.04 0 0 0-.21-.14.379.379 0 0 0-.125-.055c.168-.093.186-.242.056-.447.093-.055.163-.158.21-.307.046-.148.116-.241.209-.279.167.224.362.242.586.056.13-.149.14-.297.027-.446.093-.13.284-.228.572-.293.289-.065.46-.154.517-.265.13.037.204.018.223-.056.018-.074.028-.186.028-.335 0-.149.028-.26.083-.335.075-.093.214-.176.419-.25.205-.075.325-.122.363-.14l.474-.307c.056-.075.056-.112 0-.112a1.01 1.01 0 0 0 .865-.307c.186-.204.13-.39-.167-.558.055-.111.027-.2-.084-.265a1.46 1.46 0 0 0-.419-.153c.056-.019.163-.024.321-.014.158.009.256-.005.293-.042.28-.186.214-.335-.195-.447-.316-.093-.716.019-1.2.335zm-4.548 24.47c3.832-.67 7.096-2.427 9.794-5.273-.056-.056-.172-.098-.35-.126-.176-.028-.292-.06-.348-.098-.335-.13-.558-.204-.67-.223a.547.547 0 0 0-.07-.362.745.745 0 0 0-.223-.252c-.083-.055-.2-.13-.348-.223a14.687 14.687 0 0 1-.307-.195 2.631 2.631 0 0 0-.196-.168 9.374 9.374 0 0 0-.195-.153 1.98 1.98 0 0 0-.21-.126c-.101-.055-.18-.074-.236-.055a.98.98 0 0 1-.28.028l-.083.027a.771.771 0 0 0-.153.07 2.285 2.285 0 0 1-.154.084.288.288 0 0 0-.112.084c-.018.028-.018.05 0 .07-.39-.317-.725-.521-1.004-.614a.788.788 0 0 1-.307-.154 2.65 2.65 0 0 0-.293-.195.408.408 0 0 0-.279-.042c-.102.019-.21.084-.32.195-.094.093-.15.233-.168.419a2.115 2.115 0 0 1-.056.362c-.13-.093-.13-.255 0-.488.13-.232.149-.404.056-.516-.056-.112-.154-.153-.293-.126a.934.934 0 0 0-.335.126 5.36 5.36 0 0 0-.32.237c-.131.102-.215.163-.252.182a2.67 2.67 0 0 0-.237.153.939.939 0 0 0-.237.21 1.385 1.385 0 0 0-.168.334 1.688 1.688 0 0 1-.14.307c-.036-.074-.143-.135-.32-.181-.177-.047-.265-.098-.265-.154.037.186.074.512.111.977.038.465.084.818.14 1.06.13.577.019 1.023-.335 1.34-.502.464-.772.836-.809 1.115-.074.41.037.651.335.726 0 .13-.075.32-.223.572-.15.25-.214.45-.196.6 0 .111.019.26.056.446z" opacity=".3"/><path fill="#FFF" d="M35 13.571c3.888 0 7.473.958 10.756 2.874a21.332 21.332 0 0 1 7.799 7.799c1.916 3.283 2.874 6.868 2.874 10.756s-.958 7.473-2.874 10.756a21.332 21.332 0 0 1-7.799 7.799C42.473 55.47 38.888 56.429 35 56.429s-7.473-.958-10.756-2.874a21.332 21.332 0 0 1-7.799-7.799C14.53 42.473 13.571 38.888 13.571 35s.958-7.473 2.874-10.756a21.332 21.332 0 0 1 7.799-7.799c3.283-1.916 6.868-2.874 10.756-2.874zm7.645 14.537c-.037.019-.125.107-.265.265-.14.158-.265.247-.377.265.038 0 .08-.046.126-.14.046-.092.093-.194.14-.306a.856.856 0 0 1 .097-.195c.112-.13.316-.27.614-.419.26-.111.744-.223 1.45-.335.633-.149 1.108-.046 1.424.307-.037-.037.05-.158.265-.363.214-.204.349-.316.404-.334.056-.038.196-.08.419-.126.223-.046.363-.116.418-.21l.056-.613c-.223.019-.386-.046-.488-.195-.102-.15-.163-.344-.181-.586 0 .037-.056.111-.168.223 0-.13-.042-.205-.125-.223a.671.671 0 0 0-.321.028c-.13.037-.214.046-.251.028a1.095 1.095 0 0 1-.419-.21c-.093-.083-.167-.237-.223-.46a7.936 7.936 0 0 0-.112-.419c-.037-.093-.125-.19-.265-.293-.14-.102-.228-.2-.265-.293a3.026 3.026 0 0 1-.07-.153 3.41 3.41 0 0 0-.083-.181.589.589 0 0 0-.112-.154.213.213 0 0 0-.153-.07c-.056 0-.121.047-.196.14a5.451 5.451 0 0 0-.209.279c-.065.093-.107.14-.125.14a.228.228 0 0 0-.168-.042.89.89 0 0 0-.125.028.47.47 0 0 0-.126.083.78.78 0 0 1-.14.098.637.637 0 0 1-.237.084 1.824 1.824 0 0 0-.237.055c.28-.093.27-.195-.028-.307-.186-.074-.335-.102-.446-.083.167-.075.237-.186.21-.335a.671.671 0 0 0-.238-.39h.14c-.02-.075-.098-.154-.238-.238a3.42 3.42 0 0 0-.488-.237 2.402 2.402 0 0 1-.363-.167c-.149-.093-.465-.182-.948-.265-.484-.084-.79-.089-.921-.014-.093.111-.135.209-.126.293.01.083.047.213.112.39.065.177.098.293.098.349.018.112-.033.232-.154.363-.12.13-.181.241-.181.334 0 .13.13.275.39.433.26.158.354.358.28.6-.056.149-.205.297-.447.446-.242.15-.39.26-.446.335-.093.149-.107.321-.042.516.065.196.162.349.293.46.037.038.05.075.042.112-.01.037-.042.08-.098.126a1.249 1.249 0 0 1-.154.111c-.046.028-.107.06-.181.098l-.084.056c-.204.093-.395.037-.572-.168a1.804 1.804 0 0 1-.376-.725c-.13-.465-.28-.744-.447-.837-.428-.149-.697-.14-.809.028-.093-.242-.474-.484-1.144-.726-.465-.167-1.004-.204-1.618-.111.111-.019.111-.158 0-.419-.13-.279-.307-.39-.53-.335a1.4 1.4 0 0 0 .111-.488c.019-.214.028-.34.028-.376.056-.242.168-.456.335-.642a5.35 5.35 0 0 0 .46-.614c.065-.112.07-.167.014-.167.651.074 1.116-.028 1.395-.307.093-.093.2-.252.321-.475.121-.223.219-.381.293-.474.168-.112.298-.163.39-.154.094.01.229.06.405.154.177.093.312.14.405.14.26.018.405-.084.433-.307a.606.606 0 0 0-.21-.559c.223.02.251-.139.084-.474a1.065 1.065 0 0 0-.223-.251c-.223-.074-.475-.028-.754.14-.148.074-.13.148.056.223-.018-.019-.107.079-.265.293a2.36 2.36 0 0 1-.46.488c-.15.112-.298.065-.447-.14-.018-.018-.07-.144-.153-.376-.084-.233-.172-.358-.265-.377-.149 0-.298.14-.447.419.056-.15-.046-.289-.307-.419-.26-.13-.483-.204-.67-.223.354-.223.28-.474-.222-.753-.13-.075-.321-.121-.572-.14-.252-.019-.433.019-.544.112-.093.13-.145.237-.154.32-.01.084.037.159.14.224.102.065.2.116.293.153.093.037.2.075.32.112.121.037.2.065.238.084.26.186.334.316.223.39a3.374 3.374 0 0 1-.237.098c-.121.046-.228.088-.321.125-.093.038-.15.075-.168.112-.055.074-.055.205 0 .39.056.187.038.317-.055.391-.093-.093-.177-.256-.252-.488-.074-.233-.14-.386-.195-.46.13.167-.102.223-.697.167l-.28-.028c-.074 0-.223.019-.446.056a2.073 2.073 0 0 1-.572.028.519.519 0 0 1-.377-.223c-.074-.15-.074-.335 0-.558.02-.075.056-.093.112-.056a4.18 4.18 0 0 1-.307-.265c-.13-.121-.223-.2-.279-.237-.856.279-1.73.66-2.623 1.143.112.02.224.01.335-.027.093-.038.214-.098.363-.182a9.41 9.41 0 0 1 .279-.153c.632-.26 1.023-.326 1.172-.196l.14-.14c.26.299.446.531.557.698-.13-.074-.409-.083-.837-.027-.372.111-.576.223-.614.334.13.224.177.391.14.503a4.358 4.358 0 0 1-.32-.28 2.213 2.213 0 0 0-.405-.306c-.13-.075-.27-.121-.419-.14-.298 0-.502.01-.614.028-2.716 1.488-4.901 3.553-6.557 6.194.13.13.242.205.335.224.074.018.121.102.14.25.018.15.041.252.07.308.027.055.134.027.32-.084.168.149.195.325.084.53.018-.019.428.232 1.228.753.353.317.548.512.586.586.055.205-.038.372-.28.502-.018-.037-.102-.12-.25-.25-.15-.13-.233-.168-.252-.112-.056.093-.05.265.014.516.065.251.163.367.293.349-.13 0-.218.149-.265.446-.046.298-.07.628-.07.99 0 .363-.009.582-.028.656l.056.028c-.056.223-.004.544.154.963.158.418.358.6.6.544-.242.056-.056.456.558 1.2.111.149.186.232.223.25.056.038.167.108.335.21.167.102.307.195.418.28.112.083.205.18.28.292.074.093.167.302.278.628.112.325.242.544.39.656-.036.111.052.297.266.558.214.26.312.474.293.641a.136.136 0 0 0-.07.028.136.136 0 0 1-.07.028c.056.13.2.26.433.39.232.131.377.252.432.364.019.055.038.148.056.279.019.13.047.232.084.306.037.075.111.093.223.056.037-.372-.186-.948-.67-1.73a22.925 22.925 0 0 1-.474-.809 1.604 1.604 0 0 1-.153-.432 2.128 2.128 0 0 0-.126-.405c.037 0 .093.014.167.042.075.028.154.06.238.098.083.037.153.074.209.111.056.037.074.065.056.084-.056.13-.037.293.056.488.093.196.204.368.334.516a38.267 38.267 0 0 0 .81.893c.111.112.241.293.39.544.149.251.149.377 0 .377.168 0 .354.093.558.28.205.185.363.371.474.557.093.149.168.39.224.726.056.334.102.558.14.67.036.13.115.255.236.376.121.12.238.21.35.265l.446.223.362.195c.093.038.265.135.516.293a3.6 3.6 0 0 0 .6.321c.186.075.335.112.447.112.111 0 .246-.023.404-.07.158-.046.284-.079.377-.098.28-.037.549.103.81.419.26.316.455.512.585.586.67.353 1.181.456 1.535.307-.037.018-.033.088.014.21.046.12.12.264.223.432a27.356 27.356 0 0 0 .404.641c.093.112.26.251.503.419.242.167.409.307.502.418.112-.074.177-.158.195-.25-.056.148.01.334.196.557.186.224.353.317.502.28.26-.056.39-.354.39-.894-.576.28-1.032.112-1.367-.502a.544.544 0 0 0-.07-.153 1.766 1.766 0 0 1-.181-.474.396.396 0 0 1 0-.21c.019-.056.065-.084.14-.084.167 0 .26-.032.279-.097.018-.065 0-.182-.056-.349a5.625 5.625 0 0 1-.112-.363c-.018-.148-.12-.334-.307-.558a7.435 7.435 0 0 1-.334-.418c-.094.167-.242.242-.447.223-.205-.019-.353-.102-.446-.251a.77.77 0 0 1-.042.153.664.664 0 0 0-.042.182c-.242 0-.381-.01-.419-.028.019-.056.042-.219.07-.488.028-.27.06-.48.098-.628a1.55 1.55 0 0 1 .153-.335 5.76 5.76 0 0 0 .21-.405c.055-.12.093-.237.111-.348.019-.112-.023-.2-.125-.266-.103-.065-.265-.088-.489-.07-.353.02-.595.205-.725.559a5.787 5.787 0 0 0-.084.293.945.945 0 0 1-.14.32.694.694 0 0 1-.25.196c-.13.056-.354.074-.67.056-.316-.019-.54-.065-.67-.14-.242-.149-.45-.418-.628-.809-.176-.39-.265-.735-.265-1.032 0-.186.024-.433.07-.74.047-.307.075-.54.084-.697.01-.158-.042-.386-.154-.684.056-.037.14-.125.252-.265.111-.14.204-.237.279-.293a.498.498 0 0 1 .125-.042.285.285 0 0 1 .126 0c.037.01.074-.004.111-.042a.354.354 0 0 0 .084-.167.831.831 0 0 0-.112-.084c-.055-.056-.093-.083-.111-.083.13.055.395.041.795-.042.4-.084.656-.07.767.042.28.204.484.186.614-.056a2.22 2.22 0 0 0-.07-.265c-.046-.158-.05-.284-.014-.377.093.502.363.586.81.251.055.056.2.102.432.14.233.037.395.083.488.14.056.036.121.088.196.153.074.065.125.107.153.125.028.019.074.014.14-.014a.84.84 0 0 0 .237-.181c.186.26.297.484.335.67.204.744.38 1.153.53 1.227.13.056.232.075.307.056.074-.019.116-.107.125-.265.01-.158.01-.288 0-.39a6.933 6.933 0 0 0-.042-.35l-.028-.223v-.502l-.027-.223c-.28-.056-.452-.168-.517-.335a.599.599 0 0 1 .042-.516c.093-.177.233-.349.419-.516a.91.91 0 0 1 .223-.098c.13-.046.274-.107.432-.181.159-.075.275-.15.35-.224.39-.353.53-.678.418-.976.13 0 .232-.084.307-.251-.019 0-.065-.028-.14-.084a2.04 2.04 0 0 0-.21-.14.379.379 0 0 0-.125-.055c.168-.093.186-.242.056-.447.093-.055.163-.158.21-.307.046-.148.116-.241.209-.279.167.224.362.242.586.056.13-.149.14-.297.027-.446.093-.13.284-.228.572-.293.289-.065.46-.154.517-.265.13.037.204.018.223-.056.018-.074.028-.186.028-.335 0-.149.028-.26.083-.335.075-.093.214-.176.419-.25.205-.075.325-.122.363-.14l.474-.307c.056-.075.056-.112 0-.112a1.01 1.01 0 0 0 .865-.307c.186-.204.13-.39-.167-.558.055-.111.027-.2-.084-.265a1.46 1.46 0 0 0-.419-.153c.056-.019.163-.024.321-.014.158.009.256-.005.293-.042.28-.186.214-.335-.195-.447-.316-.093-.716.019-1.2.335zm-4.548 24.47c3.832-.67 7.096-2.427 9.794-5.273-.056-.056-.172-.098-.35-.126-.176-.028-.292-.06-.348-.098-.335-.13-.558-.204-.67-.223a.547.547 0 0 0-.07-.362.745.745 0 0 0-.223-.252c-.083-.055-.2-.13-.348-.223a14.687 14.687 0 0 1-.307-.195 2.631 2.631 0 0 0-.196-.168 9.374 9.374 0 0 0-.195-.153 1.98 1.98 0 0 0-.21-.126c-.101-.055-.18-.074-.236-.055a.98.98 0 0 1-.28.028l-.083.027a.771.771 0 0 0-.153.07 2.285 2.285 0 0 1-.154.084.288.288 0 0 0-.112.084c-.018.028-.018.05 0 .07-.39-.317-.725-.521-1.004-.614a.788.788 0 0 1-.307-.154 2.65 2.65 0 0 0-.293-.195.408.408 0 0 0-.279-.042c-.102.019-.21.084-.32.195-.094.093-.15.233-.168.419a2.115 2.115 0 0 1-.056.362c-.13-.093-.13-.255 0-.488.13-.232.149-.404.056-.516-.056-.112-.154-.153-.293-.126a.934.934 0 0 0-.335.126 5.36 5.36 0 0 0-.32.237c-.131.102-.215.163-.252.182a2.67 2.67 0 0 0-.237.153.939.939 0 0 0-.237.21 1.385 1.385 0 0 0-.168.334 1.688 1.688 0 0 1-.14.307c-.036-.074-.143-.135-.32-.181-.177-.047-.265-.098-.265-.154.037.186.074.512.111.977.038.465.084.818.14 1.06.13.577.019 1.023-.335 1.34-.502.464-.772.836-.809 1.115-.074.41.037.651.335.726 0 .13-.075.32-.223.572-.15.25-.214.45-.196.6 0 .111.019.26.056.446z"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M25 50c13.807 0 25-11.193 25-25a24.9 24.9 0 0 0-2.276-10.435C45 12.5 41.07 10.5 38 10.5c-13.807 0-27 13.693-27 27.5 0 3.725 2.5 7.5 5.276 10.435A24.947 24.947 0 0 0 25 50Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path d="M25 50c13.807 0 25-11.193 25-25a24.9 24.9 0 0 0-2.276-10.435C45 12.5 41.07 10.5 38 10.5c-13.807 0-27 13.693-27 27.5 0 3.725 2.5 7.5 5.276 10.435A24.947 24.947 0 0 0 25 50Z" fill="url(#o_icon_website__a)" fill-opacity=".2"/><path d="M16.276 48.435A24.907 24.907 0 0 1 14 38c0-13.807 11.193-25 25-25 3.069 0 6.008.553 8.724 1.565a24.94 24.94 0 0 0-1.594-2.933C42.5 8 36.44 4 30.5 4c-13.531 0-26 12.969-26 26.5 0 5.94 3 11.5 7.132 15.63a24.912 24.912 0 0 0 4.644 2.305Z" fill="var(--o-icons-cyan-cyan, #0382F3)"/><path d="M16.276 48.435A24.907 24.907 0 0 1 14 38c0-13.807 11.193-25 25-25 3.069 0 6.008.553 8.724 1.565a24.94 24.94 0 0 0-1.594-2.933C42.5 8 36.44 4 30.5 4c-13.531 0-26 12.969-26 26.5 0 5.94 3 11.5 7.132 15.63a24.912 24.912 0 0 0 4.644 2.305Z" fill="url(#o_icon_website__b)" fill-opacity=".2"/><path d="M46.13 11.632C41.697 4.641 33.89 0 25 0 11.193 0 0 11.193 0 25c0 8.89 4.64 16.697 11.632 21.13A24.4 24.4 0 0 1 6 30.5C6 16.969 16.969 6 30.5 6a24.4 24.4 0 0 1 15.63 5.632Z" fill="var(--o-icons-purple-cyan, #102E7A)"/><path d="M46.13 11.632C41.697 4.641 33.89 0 25 0 11.193 0 0 11.193 0 25c0 8.89 4.64 16.697 11.632 21.13A24.4 24.4 0 0 1 6 30.5C6 16.969 16.969 6 30.5 6a24.4 24.4 0 0 1 15.63 5.632Z" fill="url(#o_icon_website__c)" fill-opacity=".3"/><defs><linearGradient id="o_icon_website__a" x1="11" y1="10.5" x2="56.95" y2="21.842" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website__b" x1="4.5" y1="4" x2="55.514" y2="16.406" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website__c" x1="0" y1="0" x2="54.27" y2="13.568" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/website/static/src/client_actions/website_preview/website_preview.xml b/addons/website/static/src/client_actions/website_preview/website_preview.xml
index db0c9c8a690..d4b2bc8b9b6 100644
--- a/addons/website/static/src/client_actions/website_preview/website_preview.xml
+++ b/addons/website/static/src/client_actions/website_preview/website_preview.xml
@@ -12,7 +12,8 @@
     <div class="o_website_preview" t-ref="container"
          t-att-class="{ 'editor_enable editor_has_snippets': this.websiteContext.snippetsLoaded,
                         'o_is_blocked': this.blockedState.isBlocked,
-                        'o_is_mobile': this.websiteContext.isMobile }">
+                        'o_is_mobile': this.websiteContext.isMobile,
+                        'border-top': !this.websiteContext.snippetsLoaded }">
         <BlockPreview t-if="this.blockedState.showLoader"/>
         <div class="o_iframe_container">
             <iframe t-if="!testMode"
diff --git a/addons/website/static/src/components/fields/redirect_field.xml b/addons/website/static/src/components/fields/redirect_field.xml
index 3214d36cff4..36a8187e9e0 100644
--- a/addons/website/static/src/components/fields/redirect_field.xml
+++ b/addons/website/static/src/components/fields/redirect_field.xml
@@ -2,7 +2,7 @@
 <templates xml:space="preserve">
 
 <t t-name="website.RedirectField" owl="1">
-    <button type="button" class="oe_stat_button btn btn-light w-100 mb-0 py-0 border-0 border-start border-bottom rounded-0 text-start text-nowrap text-capitalize"
+    <button type="button" class="btn oe_stat_button btn-outline-secondary flex-grow-1 flex-lg-grow-0"
         t-on-click="onClick"
         t-att-aria-label="info"
         t-att-title="info">
diff --git a/addons/website/static/src/components/views/page_list.xml b/addons/website/static/src/components/views/page_list.xml
index 12a7ed8b01a..c4190544d97 100644
--- a/addons/website/static/src/components/views/page_list.xml
+++ b/addons/website/static/src/components/views/page_list.xml
@@ -23,16 +23,16 @@
     </xpath>
 </t>
 
-<t t-name="website.ControlPanel.Regular" t-inherit="web.ControlPanel.Regular" t-inherit-mode="extension" owl="1">
+<!-- <t t-name="website.ControlPanel.Regular" t-inherit="web.ControlPanel.Regular" t-inherit-mode="extension" owl="1">
     <xpath expr="//div[hasclass('o_search_options')]/*[last()]" position="after">
         <t t-slot="control-panel-website-extra-actions"/>
     </xpath>
-</t>
+</t> -->
 
 <t t-name="website.ControlPanel" t-inherit="web.ControlPanel" t-inherit-mode="primary" owl="1">
-    <xpath expr="//t[@t-call='web.ControlPanel.Regular']" position="replace">
+    <!-- <xpath expr="//t[@t-call='web.ControlPanel.Regular']" position="replace">
         <t t-call="website.ControlPanel.Regular"/>
-    </xpath>
+    </xpath> -->
 </t>
 
 <t t-name="website.RecordFilter" owl="1">
diff --git a/addons/website/static/src/components/views/theme_preview.xml b/addons/website/static/src/components/views/theme_preview.xml
index 1c970c4999b..a5f789cc6b4 100644
--- a/addons/website/static/src/components/views/theme_preview.xml
+++ b/addons/website/static/src/components/views/theme_preview.xml
@@ -1,62 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <templates id="template" xml:space="preserve">
-
-<t t-name="website.ThemePreview.Buttons" owl="1">
-    <div>
-        <div class="o_form_buttons_view" role="toolbar" aria-label="Main actions">
-            <ViewButton className="'btn btn-primary o_use_theme'"
-                        clickParams="{type: 'object', name: 'button_choose_theme'}"
-                        record="this.model.root">
-                <t t-set-slot="contents">Start Now</t>
-            </ViewButton>
-            <button class="btn btn-link o_switch_theme" t-on-click.stop="this.back">
-                Choose another theme
-            </button>
+    <t t-name="website.ThemePreview.Buttons" owl="1">
+        <div>
+            <div class="o_form_buttons_view" role="toolbar" aria-label="Main actions">
+                <ViewButton className="'btn btn-primary o_use_theme'"
+                            clickParams="{type: 'object', name: 'button_choose_theme'}"
+                            record="this.model.root">
+                    <t t-set-slot="contents">Start Now</t>
+                </ViewButton>
+                <button class="btn btn-link o_switch_theme" t-on-click.stop="this.back">
+                    Choose another theme
+                </button>
+            </div>
         </div>
-    </div>
-</t>
+    </t>
 
-<t t-name="website.ThemePreviewForm.ControlPanel.Regular" t-inherit="web.ControlPanel.Regular" t-inherit-mode="primary" owl="1">
-    <xpath expr="//div[hasclass('o_cp_bottom_right')]" position="replace">
-        <div class="o_cp_bottom_right" role="group">
-            <input class="btn-check" id="themeViewerDesktop" type="radio" name="viewer" data-mode='desktop' autocomplete="off" checked='checked'/>
-            <label class="btn btn-secondary" for="themeViewerDesktop" t-on-click="this.onDesktopClick">Desktop</label>
-            <input class="btn-check"  id="themeViewerMobile" type="radio" name="viewer" data-mode='mobile' autocomplete="off"/>
-            <label class="btn btn-secondary" for="themeViewerMobile" t-on-click="this.onMobileClick">Mobile</label>
-        </div>
-    </xpath>
-</t>
-
-<t t-name="website.ThemePreviewForm.ControlPanel" t-inherit="web.ControlPanel" t-inherit-mode="primary" owl="1">
-    <xpath expr="//t[@t-call='web.ControlPanel.Regular']" position="replace">
-        <t t-call="website.ThemePreviewForm.ControlPanel.Regular"/>
-    </xpath>
-</t>
-
-<t t-name="website.ThemePreviewKanban.ControlPanel.Regular" t-inherit="web.ControlPanel.Regular" t-inherit-mode="primary" owl="1">
-    <xpath expr="//div[hasclass('o_cp_top_left')]" position="replace">
-        <div class="o_cp_top_left">
-            <ol class="breadcrumb" role="navigation">
-                <li class="breadcrumb-item active text-black-75">
-                    <span class="text-900">Pick a Theme</span>
-                    <small class="mx-2 text-muted">Don't worry, you can switch later.</small>
-                </li>
-            </ol>
-        </div>
-    </xpath>
-    <xpath expr="//div[hasclass('o_cp_top_right')]" position="replace">
-        <div class="o_cp_top_right d-flex flex-row-reverse">
-            <a class="btn btn-secondary" t-on-click="this.close">
-                <i class="fa fa-times" />
-            </a>
-        </div>
-    </xpath>
-</t>
-
-<t t-name="website.ThemePreviewKanban.ControlPanel" t-inherit="web.ControlPanel" t-inherit-mode="primary" owl="1">
-    <xpath expr="//t[@t-call='web.ControlPanel.Regular']" position="replace">
-        <t t-call="website.ThemePreviewKanban.ControlPanel.Regular"/>
-    </xpath>
-</t>
+    <t t-name="website.ThemePreviewKanban.ControlPanel.BreadCrumbs" owl="1">
+            <div class="o_breadcrumb d-flex gap-1">
+                <div class="active d-flex flex-column">
+                    <div class="text-truncate">Pick a Theme</div>
+                    <div class="text-muted small">Don't worry, you can switch later.</div>
+                </div>
+            </div>
+    </t>
 
+    <t t-name="website.ThemePreviewKanban.ControlPanel" t-inherit="web.ControlPanel" t-inherit-mode="primary" owl="1">
+        <xpath expr="//t[@t-call='web.Breadcrumbs']" position="replace">
+            <t t-call="website.ThemePreviewKanban.ControlPanel.BreadCrumbs"/>
+        </xpath>
+        <xpath expr="//div[contains(@class,'o_control_panel_navigation')]" position="replace">
+            <div>
+                <a class="btn btn-secondary" t-on-click="this.close" aria-label="Close" data-tooltip="Close">
+                    <i class="fa fa-times" />
+                </a>
+            </div>
+        </xpath>
+    </t>
 </templates>
diff --git a/addons/website/static/src/components/views/theme_preview_form.js b/addons/website/static/src/components/views/theme_preview_form.js
index 5ccad3dbaa8..0170cf2a627 100644
--- a/addons/website/static/src/components/views/theme_preview_form.js
+++ b/addons/website/static/src/components/views/theme_preview_form.js
@@ -93,10 +93,7 @@ ThemePreviewFormControlPanel.template = 'website.ThemePreviewForm.ControlPanel';
 const ThemePreviewFormView = {
     ...formView,
     display: {
-        controlPanel: {
-            'top-right': false,
-            'bottom-right': true,
-        }
+        controlPanel: {}
     },
     buttonTemplate: 'website.ThemePreview.Buttons',
     Controller: ThemePreviewFormController,
diff --git a/addons/website/static/src/components/views/theme_preview_kanban.js b/addons/website/static/src/components/views/theme_preview_kanban.js
index 03a2fcce111..e7d9c98df38 100644
--- a/addons/website/static/src/components/views/theme_preview_kanban.js
+++ b/addons/website/static/src/components/views/theme_preview_kanban.js
@@ -25,6 +25,13 @@ class ThemePreviewControlPanel extends ControlPanel {
     close() {
         this.website.goToWebsite();
     }
+
+    get display() {
+        return {
+            layoutActions: false,
+            ...this.props.display,
+        };
+    }
 }
 ThemePreviewControlPanel.template = 'website.ThemePreviewKanban.ControlPanel';
 
@@ -33,10 +40,7 @@ const ThemePreviewKanbanView = {
     Controller: ThemePreviewKanbanController,
     ControlPanel: ThemePreviewControlPanel,
     display: {
-        controlPanel: {
-            'bottom-left': false,
-            'bottom-right': false,
-        },
+        controlPanel: {},
     },
 };
 
diff --git a/addons/website/static/src/js/backend/view_hierarchy/view_hierarchy.xml b/addons/website/static/src/js/backend/view_hierarchy/view_hierarchy.xml
index 4f6835383f3..9cf43a9fa68 100644
--- a/addons/website/static/src/js/backend/view_hierarchy/view_hierarchy.xml
+++ b/addons/website/static/src/js/backend/view_hierarchy/view_hierarchy.xml
@@ -13,7 +13,7 @@
                 <div t-if="siblingViews.length > 0" class="alert alert-info m-1 p-1">
                     Multiple tree exists for this view
                     <a t-foreach="siblingViews" t-as="siblingView" t-key="siblingView.id" href="#" class="o_load_hierarchy" t-on-click.stop.prevent="() => this.onShowHierarchy(siblingView.id)">
-                        <i class="fa fa-arrow-right me-1"/>
+                        <i class="oi oi-arrow-right me-1"/>
                         <t t-esc="siblingView.display_name"/>
                         &lt;<t t-esc="siblingView.key"/>&gt;
                         <t t-if="siblingView.website_id">
diff --git a/addons/website/static/src/scss/website.ui.scss b/addons/website/static/src/scss/website.ui.scss
index 399128bee8d..cc4be16277c 100644
--- a/addons/website/static/src/scss/website.ui.scss
+++ b/addons/website/static/src/scss/website.ui.scss
@@ -8,7 +8,7 @@ $-mini-nav-size: 40px;
 .o_frontend_to_backend_nav {
     @include o-position-absolute(0, auto, auto, 0);
     z-index: $zindex-modal;
-    font-size: $o-font-size-base * ($o-root-font-size / 16px);
+    font-size: $o-font-size-base;
 
     &::before {
         content: "";
@@ -40,7 +40,7 @@ $-mini-nav-size: 40px;
     }
 
     .o_frontend_to_backend_apps_menu {
-        font-size: $o-font-size-base * ($o-root-font-size / 14px);
+        font-size: $o-font-size-base;
         max-height: 70vh;
         overflow: auto;
     }
diff --git a/addons/website/static/src/snippets/s_image_gallery/000.xml b/addons/website/static/src/snippets/s_image_gallery/000.xml
index b1d19496ccd..bbbb5f649f2 100644
--- a/addons/website/static/src/snippets/s_image_gallery/000.xml
+++ b/addons/website/static/src/snippets/s_image_gallery/000.xml
@@ -21,22 +21,22 @@
 
             <ul class="carousel-indicators">
                 <li class="o_indicators_left text-center d-none" aria-label="Previous" title="Previous">
-                    <i class="fa fa-chevron-left"/>
+                    <i class="oi oi-chevron-left"/>
                 </li>
                 <t t-foreach="images" t-as="image">
                     <li t-attf-data-bs-target="##{id}" t-att-data-bs-slide-to="image_index" t-att-class="image_index == index and 'active' or None" t-attf-style="background-image: url(#{image.src})"></li>
                 </t>
                 <li class="o_indicators_right text-center d-none" aria-label="Next" title="Next">
-                    <i class="fa fa-chevron-right"/>
+                    <i class="oi oi-chevron-right"/>
                 </li>
             </ul>
 
             <a class="carousel-control-prev o_we_no_overlay" t-attf-href="##{id}" data-bs-slide="prev" aria-label="Previous" title="Previous">
-                <span class="fa fa-chevron-left fa-2x text-white"></span>
+                <span class="oi oi-chevron-left fa-2x text-white"></span>
                 <span class="visually-hidden">Previous</span>
             </a>
             <a class="carousel-control-next o_we_no_overlay" t-attf-href="##{id}" data-bs-slide="next" aria-label="Next" title="Next">
-                <span class="fa fa-chevron-right fa-2x text-white"></span>
+                <span class="oi oi-chevron-right fa-2x text-white"></span>
                 <span class="visually-hidden">Next</span>
             </a>
         </div>
diff --git a/addons/website/static/src/snippets/s_website_form/000.js b/addons/website/static/src/snippets/s_website_form/000.js
index 91ebf524ab1..9701adb9da5 100644
--- a/addons/website/static/src/snippets/s_website_form/000.js
+++ b/addons/website/static/src/snippets/s_website_form/000.js
@@ -103,10 +103,10 @@
                 icons: {
                     time: 'fa fa-clock-o',
                     date: 'fa fa-calendar',
-                    next: 'fa fa-chevron-right',
-                    previous: 'fa fa-chevron-left',
-                    up: 'fa fa-chevron-up',
-                    down: 'fa fa-chevron-down',
+                    next: 'oi oi-chevron-right',
+                    previous: 'oi oi-chevron-left',
+                    up: 'oi oi-chevron-up',
+                    down: 'oi oi-chevron-down',
                 },
                 locale: moment.locale(),
                 format: time.getLangDatetimeFormat(),
diff --git a/addons/website/static/src/systray_items/edit_in_backend.xml b/addons/website/static/src/systray_items/edit_in_backend.xml
index b4cbab5a06b..3cc9184c97c 100644
--- a/addons/website/static/src/systray_items/edit_in_backend.xml
+++ b/addons/website/static/src/systray_items/edit_in_backend.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
 <t t-name="website.EditInBackendSystray" owl="1">
-    <div class="o_website_edit_in_backend">
-        <a href="#" accesskey="e" t-on-click="editInBackend">
+    <div class="o_website_edit_in_backend d-flex">
+        <a href="#" class="d-flex align-items-center px-2" accesskey="e" t-on-click="editInBackend">
             <span class="fa fa-cog"/>
             <span class= "d-none d-md-block ms-2" t-esc="state.mainObjectName"/>
         </a>
diff --git a/addons/website/static/src/systray_items/edit_website.scss b/addons/website/static/src/systray_items/edit_website.scss
index facb2a8946d..d82eeabc07f 100644
--- a/addons/website/static/src/systray_items/edit_website.scss
+++ b/addons/website/static/src/systray_items/edit_website.scss
@@ -1,5 +1,3 @@
 .o_edit_website_container {
-    &:not(.o_translatable) {
-        @include button-variant($o-brand-primary, $o-brand-primary);
-    }
+    margin: -$o-navbar-padding-v 0;
 }
diff --git a/addons/website/static/src/systray_items/edit_website.xml b/addons/website/static/src/systray_items/edit_website.xml
index 96a7dd2f08b..a164c8c16f3 100644
--- a/addons/website/static/src/systray_items/edit_website.xml
+++ b/addons/website/static/src/systray_items/edit_website.xml
@@ -2,7 +2,7 @@
 <templates xml:space="preserve">
 <t t-name="website.EditWebsiteSystray" owl="1">
     <div class="o_edit_website_container d-none d-md-block" t-att-class="{ o_translatable: translatable }">
-        <a href="#" accesskey="a" t-on-click="startEdit" t-att-class="{ 'text-reset': !translatable }">
+        <a href="#" class="btn btn-primary d-flex align-items-center h-100 rounded-0 border-0" accesskey="a" t-on-click="startEdit">
             <span t-if="translatable" class="fa fa-pencil me-2"/>
             <span t-else="" class="fa me-2" t-att-class="{ 'fa-refresh fa-spin': this.state.isLoading, 'fa-pencil': !this.state.isLoading }"/>
             <t t-esc="label"/>
diff --git a/addons/website/static/src/systray_items/mobile_preview.xml b/addons/website/static/src/systray_items/mobile_preview.xml
index 5ebf76115fc..9070534f7f0 100644
--- a/addons/website/static/src/systray_items/mobile_preview.xml
+++ b/addons/website/static/src/systray_items/mobile_preview.xml
@@ -4,7 +4,7 @@
     <div class="o_mobile_preview o_menu_systray_item d-none d-md-block"
          t-on-click="() => this.websiteService.context.isMobile = !this.websiteService.context.isMobile"
          t-att-class="{ 'o_mobile_preview_active': this.state.isMobile }">
-        <a href="#" accesskey="v">
+        <a href="#" accesskey="v" class="o_nav_entry">
             <span title="Mobile preview" role="img" aria-label="Mobile preview" class="fa fa-lg fa-mobile"/>
         </a>
     </div>
diff --git a/addons/website/static/src/systray_items/new_content.xml b/addons/website/static/src/systray_items/new_content.xml
index d13f03f90aa..a9dd8d13fcf 100644
--- a/addons/website/static/src/systray_items/new_content.xml
+++ b/addons/website/static/src/systray_items/new_content.xml
@@ -41,7 +41,7 @@
 
 <t t-name="website.NewContentSystray" owl="1">
     <div class="o_menu_systray_item o_new_content_container d-none d-md-block" t-on-click="onClick">
-        <a href="#" accesskey="c"><span class="fa fa-plus me-2"/>New</a>
+        <a href="#" accesskey="c" class="o_nav_entry"><span class="fa fa-plus me-2"/>New</a>
         <NewContentModal t-if="websiteContext.showNewContentModal"/>
     </div>
 </t>
diff --git a/addons/website/static/src/systray_items/publish.js b/addons/website/static/src/systray_items/publish.js
index d035816ab3e..5f1284037a6 100644
--- a/addons/website/static/src/systray_items/publish.js
+++ b/addons/website/static/src/systray_items/publish.js
@@ -55,7 +55,7 @@ class PublishSystray extends Component {
 }
 PublishSystray.template = xml`
 <div t-on-click="publishContent" class="o_menu_systray_item d-md-flex ms-auto" data-hotkey="p" t-att-data-processing="state.processing and 1">
-    <a href="#">
+    <a href="#" class="o_nav_entry">
         <Switch value="state.published" disabled="true" extraClasses="'mb-0 o_switch_danger_success'"/>
         <span class="d-none d-md-block ms-2" t-esc="this.label"/>
     </a>
diff --git a/addons/website/static/src/systray_items/translate_website.scss b/addons/website/static/src/systray_items/translate_website.scss
index f8fcfdcfb5a..4397f19ce20 100644
--- a/addons/website/static/src/systray_items/translate_website.scss
+++ b/addons/website/static/src/systray_items/translate_website.scss
@@ -1,3 +1,3 @@
 .o_translate_website_container {
-    @include button-variant($o-brand-primary, $o-brand-primary);
+    margin: -$o-navbar-padding-v 0;
 }
diff --git a/addons/website/static/src/systray_items/translate_website.xml b/addons/website/static/src/systray_items/translate_website.xml
index b60623cafd6..9849a8c31e8 100644
--- a/addons/website/static/src/systray_items/translate_website.xml
+++ b/addons/website/static/src/systray_items/translate_website.xml
@@ -3,7 +3,7 @@
 
     <t t-name="website.TranslateWebsiteSystray" owl="1">
         <div class="o_translate_website_container d-none d-md-block">
-            <a href="#" accesskey="t" t-on-click="startTranslate" class="text-reset">
+            <a href="#" accesskey="t" t-on-click="startTranslate" class="btn btn-secondary d-flex align-items-center h-100 rounded-0 border-0">
                 <span t-if="websiteContext.translation" class="fa fa-refresh fa-spin me-2"/>
                 TRANSLATE
             </a>
diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml
index 093a2c67e85..1254069f4cf 100644
--- a/addons/website/static/src/xml/website.backend.xml
+++ b/addons/website/static/src/xml/website.backend.xml
@@ -62,7 +62,7 @@
             <button class="btn btn-secondary js_date_range" data-date="month">Last Month</button>
             <button class="btn btn-secondary js_date_range" data-date="year">Last Year</button>
         </div>
-        <div class="btn-group d-none d-md-inline-block float-end" style="margin-right: 20px;">
+        <div class="btn-group d-none d-md-inline-block float-end">
             <t t-foreach="widget.websites" t-as="website">
                 <button t-attf-class="btn btn-secondary js_website #{website.selected ? 'active' : ''}"
                         t-att-data-website-id="website.id">
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index b0dbafcc725..a6b3abb345a 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -123,12 +123,12 @@
                     Hint: How to use Google Map on your website (Contact Us page and as a snippet)
                     <br/>
                     <a target="_blank" href="https://console.developers.google.com/flows/enableapi?apiid=maps_backend,static_maps_backend&amp;keyType=CLIENT_SIDE&amp;reusekey=true">
-                        <i class="fa fa-arrow-right"/>
+                        <i class="oi oi-arrow-right"/>
                         Create a Google Project and Get a Key
                     </a>
                     <br/>
                     <a target="_blank" href="https://cloud.google.com/maps-platform/pricing">
-                        <i class="fa fa-arrow-right"/>
+                        <i class="oi oi-arrow-right"/>
                         Enable billing on your Google Project
                     </a>
                 </div>
diff --git a/addons/website/static/tests/tours/page_manager.js b/addons/website/static/tests/tours/page_manager.js
index 46dd8f81afa..e621b7907c7 100644
--- a/addons/website/static/tests/tours/page_manager.js
+++ b/addons/website/static/tests/tours/page_manager.js
@@ -7,12 +7,12 @@ const checkKanbanGroupBy = [{
     content: "Click on Kanban View",
     trigger: '.o_cp_switch_buttons .o_kanban',
 }, {
-    content: "Click on Group By",
+    content: "Open search panel menu",
     extra_trigger: '.o_kanban_renderer',
-    trigger: '.o_search_options .o_group_by_menu button',
+    trigger: '.o_control_panel .o_searchview_dropdown_toggler',
 }, {
     content: "Click on Add Custom Group",
-    trigger: '.o_search_options .o_add_custom_group_menu button',
+    trigger: '.o_add_custom_group_menu button',
     run: function (actions) {
         this.$anchor[0].dispatchEvent(new MouseEvent('mouseenter'));
     },
diff --git a/addons/website/static/tests/tours/reset_password.js b/addons/website/static/tests/tours/reset_password.js
index 7cd6cecf179..3f731e89a32 100644
--- a/addons/website/static/tests/tours/reset_password.js
+++ b/addons/website/static/tests/tours/reset_password.js
@@ -21,7 +21,7 @@ registry.category("web_tour.tours").add('website_reset_password', {
     },
     {
         content: "check that we're logged in",
-        trigger: '.oe_topbar_name:contains("The King")',
+        trigger: '.o_user_menu .dropdown-toggle',
         run: function () {}
     },
 ]});
diff --git a/addons/website/views/res_config_settings_views.xml b/addons/website/views/res_config_settings_views.xml
index aba0ee3023a..4fc3e78f047 100644
--- a/addons/website/views/res_config_settings_views.xml
+++ b/addons/website/views/res_config_settings_views.xml
@@ -45,7 +45,7 @@
                                     <field name="website_default_lang_id" options="{'no_open': True, 'no_create': True}" attrs="{'required': [('website_id', '!=', False)]}"/>
                                 </div>
                                 <div class="mt8">
-                                    <button type="action" name="%(base.action_view_base_language_install)d" string="Install languages" class="btn-link" icon="fa-arrow-right"/>
+                                    <button type="action" name="%(base.action_view_base_language_install)d" string="Install languages" class="btn-link" icon="oi-arrow-right"/>
                                 </div>
                             </div>
                         </setting>
@@ -88,7 +88,7 @@
                             <field name="auth_signup_uninvited" class="o_light_label" widget="radio" options="{'horizontal': true}" required="True"/>
                             <div class="content-group" attrs="{'invisible': [('auth_signup_uninvited','=','b2b')]}">
                                 <div class="mt8">
-                                    <button type="object" name="action_open_template_user" string="Default Access Rights" icon="fa-arrow-right" class="btn-link"/>
+                                    <button type="object" name="action_open_template_user" string="Default Access Rights" icon="oi-arrow-right" class="btn-link"/>
                                 </div>
                             </div>
                         </setting>
@@ -106,7 +106,7 @@
                             <div attrs="{'invisible': [('has_google_analytics', '=', False)]}">
                                 <a href="https://www.odoo.com/documentation/master/applications/websites/website/optimize/google_analytics.html"
                                         class="oe_link" target="_blank">
-                                    <i class="fa fa-arrow-right"/>
+                                    <i class="oi oi-arrow-right"/>
                                     How to get my Measurement ID
                                 </a>
                             </div>
@@ -174,7 +174,7 @@
                             <div attrs="{'invisible': [('has_plausible_shared_key', '=', False)]}">
                                 <a href="https://www.odoo.com/documentation/master/applications/websites/website/reporting/plausible.html"
                                         class="oe_link" target="_blank">
-                                    <i class="fa fa-arrow-right"/>
+                                    <i class="oi oi-arrow-right"/>
                                     How to create my Plausible Shared Link
                                 </a>
                             </div>
diff --git a/addons/website/views/snippets/s_image_gallery.xml b/addons/website/views/snippets/s_image_gallery.xml
index 56c3ff2d08b..33972ec4106 100644
--- a/addons/website/views/snippets/s_image_gallery.xml
+++ b/addons/website/views/snippets/s_image_gallery.xml
@@ -18,21 +18,21 @@
                 </div>
                 <ul class="carousel-indicators">
                     <li class="o_indicators_left text-center d-none" aria-label="Previous" title="Previous">
-                        <i class="fa fa-chevron-left"/>
+                        <i class="oi oi-chevron-left"/>
                     </li>
                     <li data-bs-target="#slideshow_sample" data-bs-slide-to="0" style="background-image: url(/web/image/website.library_image_08)" class="active"/>
                     <li data-bs-target="#slideshow_sample" data-bs-slide-to="1" style="background-image: url(/web/image/website.library_image_03)"/>
                     <li data-bs-target="#slideshow_sample" data-bs-slide-to="2" style="background-image: url(/web/image/website.library_image_02)"/>
                     <li class="o_indicators_right text-center d-none" aria-label="Next" title="Next">
-                        <i class="fa fa-chevron-right"/>
+                        <i class="oi oi-chevron-right"/>
                     </li>
                 </ul>
                 <a class="carousel-control-prev o_we_no_overlay o_not_editable" href="#slideshow_sample" data-bs-slide="prev" aria-label="Previous" title="Previous">
-                    <span class="fa fa-chevron-left fa-2x text-white"/>
+                    <span class="oi oi-chevron-left fa-2x text-white"/>
                     <span class="visually-hidden">Previous</span>
                 </a>
                 <a class="carousel-control-next o_we_no_overlay o_not_editable" href="#slideshow_sample" data-bs-slide="next" aria-label="Next" title="Next">
-                    <span class="fa fa-chevron-right fa-2x text-white"/>
+                    <span class="oi oi-chevron-right fa-2x text-white"/>
                     <span class="visually-hidden">Next</span>
                 </a>
             </div>
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index ed14fae62c2..14459228d73 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -1905,7 +1905,7 @@
                href="#top"
                title="Scroll To Top"
                class="btn btn-primary rounded-circle d-flex align-items-center justify-content-center">
-                <span class="fa fa-1x fa-chevron-up"/>
+                <span class="oi fa-1x oi-chevron-up"/>
             </a>
         </div>
     </xpath>
diff --git a/addons/website/views/website_visitor_views.xml b/addons/website/views/website_visitor_views.xml
index 5292618a7b6..642fe7a1fbf 100644
--- a/addons/website/views/website_visitor_views.xml
+++ b/addons/website/views/website_visitor_views.xml
@@ -188,12 +188,16 @@
                 <sheet>
                     <div class="oe_button_box" name="button_box">
                         <button class="oe_stat_button o_stat_button_info" disabled="1" attrs="{'invisible': [('is_connected', '=', False)]}">
-                            <i class="fa fa-fw o_button_icon fa-circle text-success"/>
-                            <span>Connected</span>
+                            <i class="fa fa-fw o_button_icon fa-circle text-success" title="Connected"/>
+                            <div class="o_stat_info">
+                                <span class="o_stat_text">Connected</span>
+                            </div>
                         </button>
                         <button class="oe_stat_button o_stat_button_info" disabled="1" attrs="{'invisible': [('is_connected', '=', True)]}">
-                            <i class="fa fa-fw o_button_icon fa-circle text-danger"/>
-                            <span>Offline</span>
+                            <i class="fa fa-fw o_button_icon fa-circle text-danger" title="Offline"/>
+                            <div class="o_stat_info">
+                                <span class="o_stat_text">Offline</span>
+                            </div>
                         </button>
                         <button id="w_visitor_visit_counter" class="oe_stat_button o_stat_button_info" disabled="1" icon="fa-globe">
                             <field name="visit_count" widget="statinfo" string="Visits"/>
diff --git a/addons/website_blog/static/description/icon.png b/addons/website_blog/static/description/icon.png
index 989bd719515..683a93cb5b8 100644
Binary files a/addons/website_blog/static/description/icon.png and b/addons/website_blog/static/description/icon.png differ
diff --git a/addons/website_blog/static/description/icon.svg b/addons/website_blog/static/description/icon.svg
index b04e930c625..731d0be3c72 100644
--- a/addons/website_blog/static/description/icon.svg
+++ b/addons/website_blog/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#269396"/><stop offset="100%" stop-color="#218689"/></linearGradient><path id="d" d="M26.971 49.017c0 2.879-2.4 5.212-5.36 5.212-2.961 0-5.361-2.333-5.361-5.212 0-2.878 2.4-5.211 5.36-5.211 2.961 0 5.361 2.333 5.361 5.211zm14.704 3.846c-.7-12.582-11.065-22.672-24.02-23.352-.764-.04-1.405.557-1.405 1.301v3.912c0 .685.543 1.26 1.246 1.304 9.361.592 16.864 7.87 17.475 16.99.046.683.637 1.211 1.341 1.211h4.024c.766 0 1.38-.623 1.339-1.366zm12.074.023c-.702-19.028-16.45-34.428-36.118-35.114-.755-.027-1.381.567-1.381 1.302v3.912c0 .702.572 1.273 1.293 1.302 16.003.638 28.848 13.128 29.504 28.684.03.701.617 1.257 1.339 1.257h4.023c.757 0 1.367-.608 1.34-1.343z"/><path id="e" d="M26.971 47.017c0 2.879-2.4 5.212-5.36 5.212-2.961 0-5.361-2.333-5.361-5.212 0-2.878 2.4-5.211 5.36-5.211 2.961 0 5.361 2.333 5.361 5.211zm14.704 3.846c-.7-12.582-11.065-22.672-24.02-23.352-.764-.04-1.405.557-1.405 1.301v3.912c0 .685.543 1.26 1.246 1.304 9.361.592 16.864 7.87 17.475 16.99.046.683.637 1.211 1.341 1.211h4.024c.766 0 1.38-.623 1.339-1.366zm12.074.023c-.702-19.028-16.45-34.428-36.118-35.114-.755-.027-1.381.567-1.381 1.302v3.912c0 .702.572 1.273 1.293 1.302 16.003.638 28.848 13.128 29.504 28.684.03.701.617 1.257 1.339 1.257h4.023c.757 0 1.367-.608 1.34-1.343z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M42.103 69H4c-2 0-4-1-4-4V34.165l16.641-18.024L44 29l9.485 22.679L42.103 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M47 28A25 25 0 0 0 22 3v25h25Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M47 28A25 25 0 0 0 22 3v25h25Z" fill="url(#o_icon_website_blog__a)" fill-opacity=".2"/><path d="M39 32a21.001 21.001 0 0 0-21-21v21h21Z" fill="var(--o-icons-cyan-cyan, #0382F3)"/><path d="M39 32a21.001 21.001 0 0 0-21-21v21h21Z" fill="url(#o_icon_website_blog__b)" fill-opacity=".2"/><path d="M38.615 28A20.997 20.997 0 0 0 22 11.385V28h16.615Z" fill="var(--o-icons-purple-cyan, #102E7A)"/><path d="M38.615 28A20.997 20.997 0 0 0 22 11.385V28h16.615Z" fill="url(#o_icon_website_blog__c)" fill-opacity=".3"/><path d="M6.942 29.419c.271-1.53 1.413-2.824 2.93-3.319l12.56-4.1s2.868.33 4.05 1.488C27.664 24.645 28 27.454 28 27.454l-4.222 12.382a4.375 4.375 0 0 1-3.261 2.845L4 46l2.942-16.581Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path d="M6.942 29.419c.271-1.53 1.413-2.824 2.93-3.319l12.56-4.1s2.868.33 4.05 1.488C27.664 24.645 28 27.454 28 27.454l-4.222 12.382a4.375 4.375 0 0 1-3.261 2.845L4 46l2.942-16.581Z" fill="url(#o_icon_website_blog__d)" fill-opacity=".2"/><defs><linearGradient id="o_icon_website_blog__a" x1="22" y1="3" x2="51.412" y2="10.353" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_blog__b" x1="18" y1="11" x2="42.706" y2="17.177" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_blog__c" x1="22" y1="11.385" x2="41.548" y2="16.272" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_blog__d" x1="4" y1="22" x2="32.235" y2="29.059" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/website_blog/views/website_blog_posts_loop.xml b/addons/website_blog/views/website_blog_posts_loop.xml
index 59eef917905..be59f9510f7 100644
--- a/addons/website_blog/views/website_blog_posts_loop.xml
+++ b/addons/website_blog/views/website_blog_posts_loop.xml
@@ -119,7 +119,7 @@ according to the enabled options.
                             </div>
                             <div t-else="" class="mt-3">
                                 <a t-attf-href="/blog/#{slug(blog_post.blog_id)}/#{slug(blog_post)}" class="btn btn-primary">
-                                    Read more <i class="fa fa-chevron-right ms-2"/>
+                                    Read more <i class="oi oi-chevron-right ms-2"/>
                                 </a>
                             </div>
                         </t>
diff --git a/addons/website_blog/views/website_blog_views.xml b/addons/website_blog/views/website_blog_views.xml
index 432ba973baf..1f959a4fa3c 100644
--- a/addons/website_blog/views/website_blog_views.xml
+++ b/addons/website_blog/views/website_blog_views.xml
@@ -19,7 +19,7 @@
             <field name="arch" type="xml">
                 <form string="Blog">
                     <sheet>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <group>
                             <field name="active" invisible="1"/>
                             <field name="name"/>
diff --git a/addons/website_blog/views/website_pages_views.xml b/addons/website_blog/views/website_pages_views.xml
index 278091ad619..1f8f062fbc8 100644
--- a/addons/website_blog/views/website_pages_views.xml
+++ b/addons/website_blog/views/website_pages_views.xml
@@ -10,7 +10,7 @@
                 <div class="oe_button_box" name="button_box" attrs="{'invisible': [('active', '=', False)]}">
                     <field name="is_published" widget="website_redirect_button"/>
                 </div>
-                <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                 <group name="blog_details">
                     <field name="blog_id"/>
                     <field name="active" invisible="1"/>
@@ -76,7 +76,7 @@
                                 <img t-if="record.author_id.raw_value"
                                      t-att-title="record.author_id.value"
                                      t-att-alt="record.author_id.value"
-                                     class="oe_kanban_avatar o_image_24_cover rounded-circle"
+                                     class="oe_kanban_avatar o_avatar rounded"
                                      t-att-src="kanban_image('res.partner', 'avatar_128', record.author_id.raw_value)"/>
                             </div>
                         </div>
diff --git a/addons/website_cf_turnstile/views/res_config_settings_view.xml b/addons/website_cf_turnstile/views/res_config_settings_view.xml
index 3acd8206e7d..d4db56a25c6 100644
--- a/addons/website_cf_turnstile/views/res_config_settings_view.xml
+++ b/addons/website_cf_turnstile/views/res_config_settings_view.xml
@@ -18,7 +18,7 @@
                     </div>
                     <div>
                         <a href="https://blog.cloudflare.com/turnstile-private-captcha-alternative/" class="oe_link" target="_blank">
-                            <i class="fa fa-arrow-right"/> More info
+                            <i class="oi oi-arrow-right"/> More info
                         </a>
                     </div>
                 </div>
diff --git a/addons/website_crm/static/description/icon.png b/addons/website_crm/static/description/icon.png
index ff358222c52..32c61db62c6 100644
Binary files a/addons/website_crm/static/description/icon.png and b/addons/website_crm/static/description/icon.png differ
diff --git a/addons/website_crm/static/description/icon.svg b/addons/website_crm/static/description/icon.svg
index 308be18a262..8345aabcf8a 100644
--- a/addons/website_crm/static/description/icon.svg
+++ b/addons/website_crm/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#94B6C8"/><stop offset="100%" stop-color="#6A9EBA"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V36.068L12.746 22l2.101-1h17.128L39 14h10v2.968l-4.079 4.3v6.773L52 21l7 2-.691 19.842L37.604 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><path fill="#000" d="M52 44h3a2 2 0 0 0 2-2V27a2 2 0 0 0-2-2h-3v-2h4a3 3 0 0 1 3 3v17a3 3 0 0 1-3 3h-4v-2zM36 25H16a2 2 0 0 0-2 2v15a2 2 0 0 0 2 2h20v2H15a3 3 0 0 1-3-3V26a3 3 0 0 1 3-3h21v2zm7 25V19h-4v-3h10v3h-4v31h4v3H39v-3h4zM30.468 33.075c.097-.07.24-.005.24.106v4.606c0 .597-.533 1.08-1.19 1.08H19.19c-.657 0-1.191-.483-1.191-1.08v-4.604c0-.113.141-.176.24-.106.557.392 1.294.89 3.826 2.559.524.347 1.407 1.076 2.288 1.072.887.007 1.788-.739 2.291-1.072 2.532-1.67 3.267-2.17 3.823-2.561zm-6.114 2.691c-.575.01-1.405-.658-1.822-.932-3.293-2.17-3.544-2.36-4.304-2.9A.526.526 0 0 1 18 31.51v-.428c0-.597.534-1.081 1.191-1.081h10.326c.658 0 1.192.484 1.192 1.081v.428a.523.523 0 0 1-.229.426c-.76.54-1.01.73-4.304 2.899-.417.274-1.246.941-1.822.932z" opacity=".3"/><path fill="#FFF" d="M52 42h3a2 2 0 0 0 2-2V25a2 2 0 0 0-2-2h-3v-2h4a3 3 0 0 1 3 3v17a3 3 0 0 1-3 3h-4v-2zM36 23H16a2 2 0 0 0-2 2v15a2 2 0 0 0 2 2h20v2H15a3 3 0 0 1-3-3V24a3 3 0 0 1 3-3h21v2zm7 25V17h-4v-3h10v3h-4v31h4v3H39v-3h4zM30.468 31.075c.097-.07.24-.005.24.106v4.606c0 .597-.533 1.08-1.19 1.08H19.19c-.657 0-1.191-.483-1.191-1.08v-4.604c0-.113.141-.176.24-.106.557.392 1.294.89 3.826 2.559.524.347 1.407 1.076 2.288 1.072.887.007 1.788-.739 2.291-1.072 2.532-1.67 3.267-2.17 3.823-2.561zm-6.114 2.691c-.575.01-1.405-.658-1.822-.932-3.293-2.17-3.544-2.36-4.304-2.9A.526.526 0 0 1 18 29.51v-.428c0-.597.534-1.081 1.191-1.081h10.326c.658 0 1.192.484 1.192 1.081v.428a.523.523 0 0 1-.229.426c-.76.54-1.01.73-4.304 2.899-.417.274-1.246.941-1.822.932z"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M38 46a8 8 0 0 0 8-8V8H12a4 4 0 0 0-4 4v34h30Zm-8-27a6 6 0 1 1-12 0 6 6 0 0 1 12 0Zm4 9H24a9 9 0 0 0-9 9h10a9 9 0 0 0 9-9Z" fill="var(--o-icons-red-pure, #FC787D)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M38 46a8 8 0 0 0 8-8V8H12a4 4 0 0 0-4 4v34h30Zm-8-27a6 6 0 1 1-12 0 6 6 0 0 1 12 0Zm4 9H24a9 9 0 0 0-9 9h10a9 9 0 0 0 9-9Z" fill="url(#o_icon_website_crm__a)" fill-opacity=".2"/><path fill-rule="evenodd" clip-rule="evenodd" d="M38 42a4 4 0 0 0 4-4V4H12a8 8 0 0 0-8 8v30h34Zm-8-23a6 6 0 1 1-12 0 6 6 0 0 1 12 0Zm4 9H24a9 9 0 0 0-9 9h10a9 9 0 0 0 9-9Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M38 42a4 4 0 0 0 4-4V4H12a8 8 0 0 0-8 8v30h34Zm-8-23a6 6 0 1 1-12 0 6 6 0 0 1 12 0Zm4 9H24a9 9 0 0 0-9 9h10a9 9 0 0 0 9-9Z" fill="url(#o_icon_website_crm__b)" fill-opacity=".2"/><path fill-rule="evenodd" clip-rule="evenodd" d="M42 38a4 4 0 0 1-4 4H8V12a4 4 0 0 1 4-4h30v30ZM30 19a6 6 0 1 1-12 0 6 6 0 0 1 12 0Zm4 9H24a9 9 0 0 0-9 9h10a9 9 0 0 0 9-9Z" fill="var(--o-icons-red-cyan, #1B567A)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M42 38a4 4 0 0 1-4 4H8V12a4 4 0 0 1 4-4h30v30ZM30 19a6 6 0 1 1-12 0 6 6 0 0 1 12 0Zm4 9H24a9 9 0 0 0-9 9h10a9 9 0 0 0 9-9Z" fill="url(#o_icon_website_crm__c)" fill-opacity=".2"/><defs><linearGradient id="o_icon_website_crm__a" x1="8" y1="8" x2="52.706" y2="19.177" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_crm__b" x1="4" y1="4" x2="48.706" y2="15.177" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_crm__c" x1="8" y1="8" x2="48" y2="18" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/website_crm_partner_assign/static/description/icon.png b/addons/website_crm_partner_assign/static/description/icon.png
index 527c0e17cee..6503ee278f6 100644
Binary files a/addons/website_crm_partner_assign/static/description/icon.png and b/addons/website_crm_partner_assign/static/description/icon.png differ
diff --git a/addons/website_crm_partner_assign/static/description/icon.svg b/addons/website_crm_partner_assign/static/description/icon.svg
index 9fe38ef517c..4d83baaf2d2 100644
--- a/addons/website_crm_partner_assign/static/description/icon.svg
+++ b/addons/website_crm_partner_assign/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#7CC098"/><stop offset="100%" stop-color="#5F8A71"/></linearGradient><path id="d" d="M42.525 39.25H32.346l.228 1.125h9.32c.534 0 .93.503.812 1.03l-.191.854a1.971 1.971 0 0 1 1.096 1.772c0 1.097-.886 1.985-1.973 1.969-1.035-.015-1.887-.866-1.915-1.914a1.975 1.975 0 0 1 .583-1.461h-7.28c.361.357.585.855.585 1.406 0 1.119-.921 2.02-2.037 1.967-.991-.047-1.797-.857-1.849-1.86a1.973 1.973 0 0 1 .974-1.814l-2.44-12.074h-2.426a.839.839 0 0 1-.833-.844v-.562c0-.466.373-.844.833-.844h3.56c.396 0 .737.282.817.675l.318 1.575h13.638c.535 0 .931.503.813 1.03l-1.641 7.313a.836.836 0 0 1-.813.657zm-3.358-5.344H37.5V32.5a.559.559 0 0 0-.556-.563h-.555a.559.559 0 0 0-.556.563v1.406h-1.666a.559.559 0 0 0-.556.563v.562c0 .31.249.563.556.563h1.666V37c0 .31.25.562.556.562h.555A.559.559 0 0 0 37.5 37v-1.406h1.667a.559.559 0 0 0 .555-.563v-.562a.559.559 0 0 0-.555-.563zM26.385 8l-5.9 8.058 9.51 3.036-1.28-3.953a22.208 22.208 0 0 1 7.2-1.203c11.135 0 20.316 8.182 21.904 18.866l3.228-2.94c-2.799-11.282-12.995-19.668-25.132-19.668a25.8 25.8 0 0 0-8.365 1.394L26.385 8zm-8.44 9.452C13.046 22.167 10 28.769 10 36.088c0 7.763 3.434 14.745 8.861 19.496l-2.54 2.807 9.93 1.07-2.12-9.739-2.768 3.074a22.075 22.075 0 0 1-7.6-16.708 22.073 22.073 0 0 1 8.326-17.319l-2.922-.935-1.223-.382zM60.97 32.766l-7.39 6.702 4.068.879c-1.98 10.21-10.933 17.891-21.733 17.891-2.858 0-5.591-.528-8.097-1.508l.916 4.258A25.918 25.918 0 0 0 35.914 62c12.565 0 23.05-8.988 25.4-20.87l3.686.782-4.03-9.146z"/><path id="e" d="M42.525 37.25H32.346l.228 1.125h9.32c.534 0 .93.503.812 1.03l-.191.854a1.971 1.971 0 0 1 1.096 1.772c0 1.097-.886 1.985-1.973 1.969-1.035-.015-1.887-.866-1.915-1.914a1.975 1.975 0 0 1 .583-1.461h-7.28c.361.357.585.855.585 1.406 0 1.119-.921 2.02-2.037 1.967-.991-.047-1.797-.857-1.849-1.86a1.973 1.973 0 0 1 .974-1.814l-2.44-12.074h-2.426a.839.839 0 0 1-.833-.844v-.562c0-.466.373-.844.833-.844h3.56c.396 0 .737.282.817.675l.318 1.575h13.638c.535 0 .931.503.813 1.03l-1.641 7.313a.836.836 0 0 1-.813.657zm-3.358-5.344H37.5V30.5a.559.559 0 0 0-.556-.563h-.555a.559.559 0 0 0-.556.563v1.406h-1.666a.559.559 0 0 0-.556.563v.562c0 .31.249.563.556.563h1.666V35c0 .31.25.562.556.562h.555A.559.559 0 0 0 37.5 35v-1.406h1.667a.559.559 0 0 0 .555-.563v-.562a.559.559 0 0 0-.555-.563zM26.385 6l-5.9 8.058 9.51 3.036-1.28-3.953a22.208 22.208 0 0 1 7.2-1.203c11.135 0 20.316 8.182 21.904 18.866l3.228-2.94C58.248 16.582 48.052 8.196 35.915 8.196A25.8 25.8 0 0 0 27.55 9.59L26.385 6zm-8.44 9.452C13.046 20.167 10 26.769 10 34.088c0 7.763 3.434 14.745 8.861 19.496l-2.54 2.807 9.93 1.07-2.12-9.739-2.768 3.074a22.075 22.075 0 0 1-7.6-16.708 22.073 22.073 0 0 1 8.326-17.319l-2.922-.935-1.223-.382zM60.97 30.766l-7.39 6.702 4.068.879c-1.98 10.21-10.933 17.891-21.733 17.891-2.858 0-5.591-.528-8.097-1.508l.916 4.258A25.918 25.918 0 0 0 35.914 60c12.565 0 23.05-8.988 25.4-20.87l3.686.782-4.03-9.146z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M38.386 69H4c-2 0-4-1-4-4V36.453l14.194-16.398 3.743-4.473 6.001-3.975C38.52 11.29 47.207 12.422 50 15c1.762 1.626 5.428 5.916 10.998 12.868v3.175l3.838 8.813-8.77 9.88-1.372 2.168L38.386 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-opacity=".3" fill-rule="nonzero" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M15.724 6.397C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397L37.236 13H41.9c2.46 0 4.367 2.099 4.07 4.481l-3.106 25C42.613 44.49 40.866 46 38.793 46H11.207c-2.074 0-3.82-1.51-4.07-3.519l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603ZM32.917 13H17.082c0-.56.123-1.134.39-1.691l.956-2C19.102 7.9 20.551 7 22.144 7h5.711c1.593 0 3.042.9 3.716 2.308l.957 2c.266.558.39 1.132.39 1.692Z" fill="var(--o-icons-cyan-cyan, #0382F3)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M15.724 6.397C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397L37.236 13H41.9c2.46 0 4.367 2.099 4.07 4.481l-3.106 25C42.613 44.49 40.866 46 38.793 46H11.207c-2.074 0-3.82-1.51-4.07-3.519l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603ZM32.917 13H17.082c0-.56.123-1.134.39-1.691l.956-2C19.102 7.9 20.551 7 22.144 7h5.711c1.593 0 3.042.9 3.716 2.308l.957 2c.266.558.39 1.132.39 1.692Z" fill="url(#o_icon_website_crm_partner_assign__a)" fill-opacity=".2"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8.514 45.016a3.963 3.963 0 0 1-1.377-2.535l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397l2.59 5.777C35.5 28.256 23.848 41.405 8.515 45.016ZM17.082 13h15.835c0-.56-.123-1.134-.39-1.691l-.956-2C30.897 7.9 29.448 7 27.855 7h-5.711c-1.593 0-3.042.9-3.716 2.308l-.956 2a3.904 3.904 0 0 0-.39 1.692Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8.514 45.016a3.963 3.963 0 0 1-1.377-2.535l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397l2.59 5.777C35.5 28.256 23.848 41.405 8.515 45.016ZM17.082 13h15.835c0-.56-.123-1.134-.39-1.691l-.956-2C30.897 7.9 29.448 7 27.855 7h-5.711c-1.593 0-3.042.9-3.716 2.308l-.956 2a3.904 3.904 0 0 0-.39 1.692Z" fill="url(#o_icon_website_crm_partner_assign__b)" fill-opacity=".2"/><path d="M33.689 27.924c-.776 2.774-5.49 7.604-9.144 11.031-2.055 1.927-5.403 1.068-6.177-1.585-1.376-4.719-2.937-11.16-2.161-13.933 1.295-4.63 6.258-7.379 11.085-6.14 4.828 1.24 7.692 5.997 6.397 10.627Z" fill="var(--o-icons-white, #FFFFFF)"/><defs><linearGradient id="o_icon_website_crm_partner_assign__a" x1="4" y1="4" x2="53.412" y2="16.353" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_crm_partner_assign__b" x1="4" y1="4" x2="43.497" y2="11.912" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js b/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js
index db8a30319e7..504256cac55 100644
--- a/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js
+++ b/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js
@@ -268,8 +268,8 @@ publicWidget.registry.crmPartnerAssign = publicWidget.Widget.extend({
             icons: {
                 time: 'fa fa-clock-o',
                 date: 'fa fa-calendar',
-                up: 'fa fa-chevron-up',
-                down: 'fa fa-chevron-down',
+                up: 'oi oi-chevron-up',
+                down: 'oi oi-chevron-down',
             },
         };
         $calendarInputGroup.datetimepicker(calendarOptions);
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
index 3bbe3eaef4f..3caed907419 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
@@ -508,7 +508,7 @@
                             <div class="d-inline-block">
                                 <small class="me-2 mt-1 float-start"><b>Stage:</b></small>
                                 <div t-foreach="stages[::-1]" t-as="stage" class="float-start">
-                                    <i t-if="not stage_first" class="fa fa-chevron-right ms-2 me-1 small" style="opacity: 0.5"/>
+                                    <i t-if="not stage_first" class="oi oi-chevron-right ms-2 me-1 small" style="opacity: 0.5"/>
                                     <button type="button" t-att-data="stage.id" t-att-opp="opportunity.id" t-attf-class="btn btn-sm px-2 opp-stage-button #{'btn-secondary' if opportunity.stage_id.name != stage.name else 'btn-primary disabled'}">
                                         <span t-field="stage.name"/>
                                     </button>
diff --git a/addons/website_customer/static/description/icon.png b/addons/website_customer/static/description/icon.png
index 5c32a741448..fc305663c74 100644
Binary files a/addons/website_customer/static/description/icon.png and b/addons/website_customer/static/description/icon.png differ
diff --git a/addons/website_customer/static/description/icon.svg b/addons/website_customer/static/description/icon.svg
index eaa4027b353..fff43297209 100644
--- a/addons/website_customer/static/description/icon.svg
+++ b/addons/website_customer/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#7CC098"/><stop offset="100%" stop-color="#5F8A71"/></linearGradient><path id="d" d="M28.352 34.871c.482.038 1.02.074 1.648.129.8.07 2-1.196 2-2 0-1.693-1.596-2.82-2-4 1.84-1.809 2-2.806 2-5.304 0-.666-.061-1.317-.18-1.949a11.475 11.475 0 0 1 6.855-2.247c6.235 0 11.29 4.897 11.29 10.938 0 6.04-5.055 10.937-11.29 10.937-4.606 0-8.567-2.672-10.323-6.504zm23.255 7.449c3.015.73 5.13 3.355 5.13 6.366v2.533c0 1.812-1.516 3.281-3.386 3.281H23.999c-1.87 0-3.386-1.469-3.386-3.281v-2.533c0-3.011 2.115-5.636 5.13-6.366l5.032-1.219c4.106 2.862 10.514 3.684 15.8 0l5.032 1.219zM19.151 14.158c6.41 0 11.611 4.09 11.611 9.14 0 2.167-.955 4.153-2.552 5.722.351 1.024.891 1.437 1.496 1.894.448.338 1.298.866.992 1.898a1.45 1.45 0 0 1-1.536 1.024c-2.326-.202-4.483-.843-6.33-1.867-1.157.303-2.395.47-3.677.47-6.414 0-11.611-4.087-11.611-9.14-.004-5.05 5.193-9.141 11.607-9.141zm0 16.171c1.31 0 2.637-.193 3.923-.615 1.302.835 3.173 2.022 5.43 2.373-1.29-1.054-2.29-2.707-2.467-3.884 1.536-1.143 2.79-2.853 2.79-4.905 0-3.116-3.48-7.031-9.676-7.031-6.197 0-9.676 3.915-9.676 7.031 0 3.12 3.48 7.031 9.676 7.031z"/><path id="e" d="M28.352 32.871c.482.038 1.02.074 1.648.129.8.07 2-1.196 2-2 0-1.693-1.596-2.82-2-4 1.84-1.809 2-2.806 2-5.304 0-.666-.061-1.317-.18-1.949a11.475 11.475 0 0 1 6.855-2.247c6.235 0 11.29 4.897 11.29 10.938 0 6.04-5.055 10.937-11.29 10.937-4.606 0-8.567-2.672-10.323-6.504zm23.255 7.449c3.015.73 5.13 3.355 5.13 6.366v2.533c0 1.812-1.516 3.281-3.386 3.281H23.999c-1.87 0-3.386-1.469-3.386-3.281v-2.533c0-3.011 2.115-5.636 5.13-6.366l5.032-1.219c4.106 2.862 10.514 3.684 15.8 0l5.032 1.219zM19.151 12.158c6.41 0 11.611 4.09 11.611 9.14 0 2.167-.955 4.153-2.552 5.722.351 1.024.891 1.437 1.496 1.894.448.338 1.298.866.992 1.898a1.45 1.45 0 0 1-1.536 1.024c-2.326-.202-4.483-.843-6.33-1.867-1.157.303-2.395.47-3.677.47-6.414 0-11.611-4.087-11.611-9.14-.004-5.05 5.193-9.141 11.607-9.141zm0 16.171c1.31 0 2.637-.193 3.923-.615 1.302.835 3.173 2.022 5.43 2.373-1.29-1.054-2.29-2.707-2.467-3.884 1.536-1.143 2.79-2.853 2.79-4.905 0-3.116-3.48-7.031-9.676-7.031-6.197 0-9.676 3.915-9.676 7.031 0 3.12 3.48 7.031 9.676 7.031z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-.145-4-4.054V27.195l7.973-7.858c2.666-5.405 7.36-6.757 12.027-6.08 4.667.675 8 2.702 10 6.08v4.16l1.956-3.643 17.05 12.426-8.914 11.08 16.21 7.48L43.794 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M43 24a5 5 0 1 1-10 0 5 5 0 0 1 10 0Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path d="M43 24a5 5 0 1 1-10 0 5 5 0 0 1 10 0Z" fill="url(#o_icon_website_customer__a)" fill-opacity=".2"/><path d="M28 16c0 5.523-4.477 10-10 10S8 21.523 8 16 12.477 6 18 6s10 4.477 10 10Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M28 16c0 5.523-4.477 10-10 10S8 21.523 8 16 12.477 6 18 6s10 4.477 10 10Z" fill="url(#o_icon_website_customer__b)" fill-opacity=".2"/><path d="M16 31h26a4 4 0 0 1 4 4v5a4 4 0 0 1-4 4H16V31Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path d="M16 31h26a4 4 0 0 1 4 4v5a4 4 0 0 1-4 4H16V31Z" fill="url(#o_icon_website_customer__c)" fill-opacity=".2"/><path d="M4 31h16c7.18 0 13 5.82 13 13H17C9.82 44 4 38.18 4 31Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M4 31h16c7.18 0 13 5.82 13 13H17C9.82 44 4 38.18 4 31Z" fill="url(#o_icon_website_customer__d)" fill-opacity=".2"/><path d="M13.948 21.331 18 18.397l4.052 2.934-1.606-4.716 4.052-2.934h-4.96L18 9l-1.537 4.68h-4.96l4.017 2.935-1.572 4.716Z" fill="var(--o-icons-white, #FFFFFF)"/><defs><linearGradient id="o_icon_website_customer__a" x1="33" y1="19" x2="44.765" y2="21.941" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_customer__b" x1="8" y1="6" x2="31.529" y2="11.882" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_customer__c" x1="16" y1="31" x2="44.135" y2="47.232" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_customer__d" x1="4" y1="31" x2="31.65" y2="46.42" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/website_event/static/description/icon.png b/addons/website_event/static/description/icon.png
index 92866264624..1e3f64f92de 100644
Binary files a/addons/website_event/static/description/icon.png and b/addons/website_event/static/description/icon.png differ
diff --git a/addons/website_event/static/description/icon.svg b/addons/website_event/static/description/icon.svg
index b3f72c43bc9..96123caec4d 100644
--- a/addons/website_event/static/description/icon.svg
+++ b/addons/website_event/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#269396"/><stop offset="100%" stop-color="#218689"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M43.126 69H4c-2 0-4-.146-4-4.078v-23.83l15-16.955 8-4.078 8 2.039L39 17l26 23.451L43.126 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><path fill="#000" d="M32.51 22.527l-6.99 7.529.047-.334c.058-.081.058-.189 0-.323-.1-.215-.238-.3-.411-.258.043-.086.072-.211.086-.376.015-.165.022-.262.022-.29.043-.187.13-.352.26-.495a4.13 4.13 0 0 0 .357-.474c.05-.086.054-.129.01-.129.506.058.867-.021 1.084-.236.072-.072.155-.194.248-.366.094-.172.17-.294.228-.366.13-.086.23-.125.303-.118a.974.974 0 0 1 .314.118c.137.072.242.108.314.108.202.014.314-.065.335-.237a.465.465 0 0 0-.162-.43c.173.014.195-.108.065-.366a.823.823 0 0 0-.173-.193c-.173-.058-.368-.022-.585.107-.115.058-.1.115.044.172-.015-.014-.083.061-.206.226-.123.165-.242.29-.357.377-.116.086-.231.05-.347-.108a1.73 1.73 0 0 1-.119-.29c-.065-.18-.133-.276-.206-.29-.115 0-.23.107-.346.322.043-.115-.036-.222-.238-.323a1.564 1.564 0 0 0-.52-.172c.274-.172.217-.366-.173-.58-.101-.058-.249-.094-.444-.108-.195-.015-.335.014-.422.086a.577.577 0 0 0-.12.247c-.006.065.03.122.11.172.078.05.154.09.226.119.073.028.156.057.25.086.093.028.155.05.183.064.203.144.26.244.174.301-.03.015-.09.04-.184.076-.094.035-.177.068-.25.096-.072.03-.115.058-.13.086-.043.058-.043.158 0 .302.044.143.03.243-.043.3-.072-.07-.137-.196-.194-.376a1.367 1.367 0 0 0-.152-.355c.101.13-.08.172-.541.13l-.217-.022c-.058 0-.173.014-.346.043a1.619 1.619 0 0 1-.444.021.403.403 0 0 1-.292-.172c-.058-.114-.058-.258 0-.43.014-.057.043-.072.086-.043a3.238 3.238 0 0 1-.238-.204 2.11 2.11 0 0 0-.216-.183 12.32 12.32 0 0 0-2.036.882.536.536 0 0 0 .26-.022c.072-.028.166-.075.282-.14.115-.064.187-.103.216-.118.49-.2.794-.25.91-.15l.108-.108c.202.23.346.409.433.538-.101-.057-.318-.065-.65-.022-.288.086-.447.172-.476.259.101.172.137.3.108.387a3.375 3.375 0 0 1-.249-.215c-.108-.1-.213-.18-.314-.237a.868.868 0 0 0-.324-.108c-.231 0-.39.008-.477.022a13.627 13.627 0 0 0-5.088 4.776c.101.1.188.157.26.172.058.014.094.079.108.193a.82.82 0 0 0 .054.237c.022.043.105.022.25-.064.13.114.15.25.064.408.015-.014.332.18.953.581.274.244.426.394.455.452.043.158-.03.287-.217.387a1.103 1.103 0 0 0-.195-.194c-.115-.1-.18-.129-.195-.086-.043.072-.04.205.011.398.05.194.127.284.228.27-.101 0-.17.114-.206.344-.036.229-.054.484-.054.763 0 .28-.007.448-.022.506l.043.021c-.043.172-.003.42.12.742.122.323.277.463.465.42-.188.043-.043.351.433.925.087.115.144.18.173.194.044.028.13.082.26.16.13.08.238.151.325.216a.92.92 0 0 1 .216.226c.058.072.13.233.217.484.086.25.187.42.303.505-.029.087.04.23.206.43.166.202.241.366.227.496a.106.106 0 0 0-.054.021.106.106 0 0 1-.054.022c.043.1.155.2.335.3.18.101.293.194.336.28.014.043.029.115.043.216.015.1.036.179.065.236.029.058.087.072.173.043.03-.287-.144-.731-.52-1.334-.216-.358-.338-.566-.367-.623a1.231 1.231 0 0 1-.12-.334 1.633 1.633 0 0 0-.097-.312c.029 0 .072.01.13.032.058.022.12.047.184.076.065.028.12.057.162.086.044.028.058.05.044.064-.044.1-.03.226.043.377.072.15.159.283.26.398a29.568 29.568 0 0 0 .628.688c.086.086.187.226.303.42.115.193.115.29 0 .29.13 0 .274.072.433.215.159.144.281.287.368.43.072.115.13.302.173.56.043.258.08.43.108.516.03.1.09.197.184.29.094.094.185.162.271.205l.347.172.281.15c.072.03.206.105.4.226a2.8 2.8 0 0 0 .466.248c.144.057.26.086.346.086.087 0 .192-.018.314-.054.123-.036.22-.06.293-.075.216-.029.425.079.628.322.202.244.353.395.454.452.52.273.917.352 1.191.237-.029.014-.025.068.01.161.037.093.095.205.174.334a21.069 21.069 0 0 0 .314.494c.072.086.202.194.39.323.187.13.317.237.39.323.086-.058.137-.122.151-.194-.043.115.007.258.152.43.144.173.274.244.39.216.201-.043.302-.273.302-.689-.447.215-.8.086-1.06-.387a.418.418 0 0 0-.055-.118 1.367 1.367 0 0 1-.14-.366.303.303 0 0 1 0-.161c.014-.043.05-.065.108-.065.13 0 .202-.025.216-.075.015-.05 0-.14-.043-.27a4.316 4.316 0 0 1-.086-.279c-.015-.115-.094-.258-.239-.43a5.739 5.739 0 0 1-.26-.323c-.072.13-.187.187-.346.172-.159-.014-.274-.079-.346-.193a.59.59 0 0 1-.033.118.509.509 0 0 0-.032.14c-.188 0-.296-.007-.325-.022.014-.043.032-.168.054-.376s.047-.37.076-.484c.014-.057.054-.144.119-.258l.069-.125 3.432 3.26a.426.426 0 0 0-.07.07 1.065 1.065 0 0 0-.13.258c-.043.115-.079.194-.107.237-.03-.058-.112-.104-.25-.14-.137-.036-.205-.075-.205-.118.029.143.058.394.086.753.03.358.065.63.109.817.1.445.014.789-.26 1.033-.39.358-.6.645-.628.86-.058.316.029.502.26.56 0 .1-.058.247-.173.44-.116.194-.166.348-.152.463 0 .086.014.2.043.344 1.916-.332 3.649-1.013 5.199-2.042l2.057 1.954c-.42.297-.858.578-1.312.841-2.548 1.477-5.33 2.216-8.347 2.216-3.017 0-5.799-.739-8.346-2.216a16.5 16.5 0 0 1-6.052-6.013c-1.487-2.53-2.23-5.295-2.23-8.293 0-2.997.743-5.761 2.23-8.293a16.5 16.5 0 0 1 6.052-6.012c2.547-1.478 5.33-2.216 8.346-2.216 2.071 0 4.032.348 5.882 1.044zm-8.39 17.386l2.321 2.205a.67.67 0 0 0-.224.318 4.44 4.44 0 0 0-.065.226.726.726 0 0 1-.108.247.538.538 0 0 1-.195.15c-.101.044-.275.058-.52.044-.245-.014-.419-.05-.52-.108-.187-.114-.35-.322-.487-.624-.137-.3-.205-.566-.205-.796 0-.143.018-.333.054-.57.036-.236.057-.415.065-.537.004-.082-.035-.257-.12-.527l.004-.028zm17.614-12.441l14.71 13.245-7.995 8.879-14.71-13.245 7.995-8.88zm14.245 20.962a2.978 2.978 0 0 0 .208 4.206l-3.997 4.44a2.978 2.978 0 0 1-4.205.233L25.92 37.445a2.978 2.978 0 0 1-.208-4.206l3.997-4.44a2.978 2.978 0 0 0 4.205-.233 2.978 2.978 0 0 0-.207-4.206l3.997-4.44a2.978 2.978 0 0 1 4.205-.233l22.065 19.868a2.978 2.978 0 0 1 .208 4.206l-3.997 4.44a2.978 2.978 0 0 0-4.206.233zm2.233-6.774a1.489 1.489 0 0 0-.104-2.103L42.662 25.65a1.489 1.489 0 0 0-2.102.116l-8.661 9.62a1.489 1.489 0 0 0 .104 2.102l15.445 13.908c.61.548 1.55.496 2.103-.117l8.66-9.619z" opacity=".3"/><path fill="#FFF" d="M32.51 20.527l-6.99 7.529.047-.334c.058-.081.058-.189 0-.323-.1-.215-.238-.3-.411-.258.043-.086.072-.211.086-.376.015-.165.022-.262.022-.29.043-.187.13-.352.26-.495a4.13 4.13 0 0 0 .357-.474c.05-.086.054-.129.01-.129.506.058.867-.021 1.084-.236.072-.072.155-.194.248-.366.094-.172.17-.294.228-.366.13-.086.23-.125.303-.118a.974.974 0 0 1 .314.118c.137.072.242.108.314.108.202.014.314-.065.335-.237a.465.465 0 0 0-.162-.43c.173.014.195-.108.065-.366a.823.823 0 0 0-.173-.193c-.173-.058-.368-.022-.585.107-.115.058-.1.115.044.172-.015-.014-.083.061-.206.226-.123.165-.242.29-.357.377-.116.086-.231.05-.347-.108a1.73 1.73 0 0 1-.119-.29c-.065-.18-.133-.276-.206-.29-.115 0-.23.107-.346.322.043-.115-.036-.222-.238-.323a1.564 1.564 0 0 0-.52-.172c.274-.172.217-.366-.173-.58-.101-.058-.249-.094-.444-.108-.195-.015-.335.014-.422.086a.577.577 0 0 0-.12.247c-.006.065.03.122.11.172.078.05.154.09.226.119.073.028.156.057.25.086.093.028.155.05.183.064.203.144.26.244.174.301-.03.015-.09.04-.184.076-.094.035-.177.068-.25.096-.072.03-.115.058-.13.086-.043.058-.043.158 0 .302.044.143.03.243-.043.3-.072-.07-.137-.196-.194-.376a1.367 1.367 0 0 0-.152-.355c.101.13-.08.172-.541.13l-.217-.022c-.058 0-.173.014-.346.043a1.619 1.619 0 0 1-.444.021.403.403 0 0 1-.292-.172c-.058-.114-.058-.258 0-.43.014-.057.043-.072.086-.043a3.238 3.238 0 0 1-.238-.204 2.11 2.11 0 0 0-.216-.183 12.32 12.32 0 0 0-2.036.882.536.536 0 0 0 .26-.022c.072-.028.166-.075.282-.14.115-.064.187-.103.216-.118.49-.2.794-.25.91-.15l.108-.108c.202.23.346.409.433.538-.101-.057-.318-.065-.65-.022-.288.086-.447.172-.476.259.101.172.137.3.108.387a3.375 3.375 0 0 1-.249-.215c-.108-.1-.213-.18-.314-.237a.868.868 0 0 0-.324-.108c-.231 0-.39.008-.477.022a13.627 13.627 0 0 0-5.088 4.776c.101.1.188.157.26.172.058.014.094.079.108.193a.82.82 0 0 0 .054.237c.022.043.105.022.25-.064.13.114.15.25.064.408.015-.014.332.18.953.581.274.244.426.394.455.452.043.158-.03.287-.217.387a1.103 1.103 0 0 0-.195-.194c-.115-.1-.18-.129-.195-.086-.043.072-.04.205.011.398.05.194.127.284.228.27-.101 0-.17.114-.206.344-.036.229-.054.484-.054.763 0 .28-.007.448-.022.506l.043.021c-.043.172-.003.42.12.742.122.323.277.463.465.42-.188.043-.043.351.433.925.087.115.144.18.173.194.044.028.13.082.26.16.13.08.238.151.325.216a.92.92 0 0 1 .216.226c.058.072.13.233.217.484.086.25.187.42.303.505-.029.087.04.23.206.43.166.202.241.366.227.496a.106.106 0 0 0-.054.021.106.106 0 0 1-.054.022c.043.1.155.2.335.3.18.101.293.194.336.28.014.043.029.115.043.216.015.1.036.179.065.236.029.058.087.072.173.043.03-.287-.144-.731-.52-1.334-.216-.358-.338-.566-.367-.623a1.231 1.231 0 0 1-.12-.334 1.633 1.633 0 0 0-.097-.312c.029 0 .072.01.13.032.058.022.12.047.184.076.065.028.12.057.162.086.044.028.058.05.044.064-.044.1-.03.226.043.377.072.15.159.283.26.398a29.568 29.568 0 0 0 .628.688c.086.086.187.226.303.42.115.193.115.29 0 .29.13 0 .274.072.433.215.159.144.281.287.368.43.072.115.13.302.173.56.043.258.08.43.108.516.03.1.09.197.184.29.094.094.185.162.271.205l.347.172.281.15c.072.03.206.105.4.226a2.8 2.8 0 0 0 .466.248c.144.057.26.086.346.086.087 0 .192-.018.314-.054.123-.036.22-.06.293-.075.216-.029.425.079.628.322.202.244.353.395.454.452.52.273.917.352 1.191.237-.029.014-.025.068.01.161.037.093.095.205.174.334a21.069 21.069 0 0 0 .314.494c.072.086.202.194.39.323.187.13.317.237.39.323.086-.058.137-.122.151-.194-.043.115.007.258.152.43.144.173.274.244.39.216.201-.043.302-.273.302-.689-.447.215-.8.086-1.06-.387a.418.418 0 0 0-.055-.118 1.367 1.367 0 0 1-.14-.366.303.303 0 0 1 0-.161c.014-.043.05-.065.108-.065.13 0 .202-.025.216-.075.015-.05 0-.14-.043-.27a4.316 4.316 0 0 1-.086-.279c-.015-.115-.094-.258-.239-.43a5.739 5.739 0 0 1-.26-.323c-.072.13-.187.187-.346.172-.159-.014-.274-.079-.346-.193a.59.59 0 0 1-.033.118.509.509 0 0 0-.032.14c-.188 0-.296-.007-.325-.022.014-.043.032-.168.054-.376s.047-.37.076-.484c.014-.057.054-.144.119-.258l.069-.125 3.432 3.26a.426.426 0 0 0-.07.07 1.065 1.065 0 0 0-.13.258c-.043.115-.079.194-.107.237-.03-.058-.112-.104-.25-.14-.137-.036-.205-.075-.205-.118.029.143.058.394.086.753.03.358.065.63.109.817.1.445.014.789-.26 1.033-.39.358-.6.645-.628.86-.058.316.029.502.26.56 0 .1-.058.247-.173.44-.116.194-.166.348-.152.463 0 .086.014.2.043.344 1.916-.332 3.649-1.013 5.199-2.042l2.057 1.954c-.42.297-.858.578-1.312.841-2.548 1.477-5.33 2.216-8.347 2.216-3.017 0-5.799-.739-8.346-2.216a16.5 16.5 0 0 1-6.052-6.013c-1.487-2.53-2.23-5.295-2.23-8.293 0-2.997.743-5.761 2.23-8.293a16.5 16.5 0 0 1 6.052-6.012c2.547-1.478 5.33-2.216 8.346-2.216 2.071 0 4.032.348 5.882 1.044zm-8.39 17.386l2.321 2.205a.67.67 0 0 0-.224.318 4.44 4.44 0 0 0-.065.226.726.726 0 0 1-.108.247.538.538 0 0 1-.195.15c-.101.044-.275.058-.52.044-.245-.014-.419-.05-.52-.108-.187-.114-.35-.322-.487-.624-.137-.3-.205-.566-.205-.796 0-.143.018-.333.054-.57.036-.236.057-.415.065-.537.004-.082-.035-.257-.12-.527l.004-.028zm17.614-12.441l14.71 13.245-7.995 8.879-14.71-13.245 7.995-8.88zm14.245 20.962a2.978 2.978 0 0 0 .208 4.206l-3.997 4.44a2.978 2.978 0 0 1-4.205.233L25.92 35.445a2.978 2.978 0 0 1-.208-4.206l3.997-4.44a2.978 2.978 0 0 0 4.205-.233 2.978 2.978 0 0 0-.207-4.206l3.997-4.44a2.978 2.978 0 0 1 4.205-.233l22.065 19.868a2.978 2.978 0 0 1 .208 4.206l-3.997 4.44a2.978 2.978 0 0 0-4.206.233zm2.233-6.774a1.489 1.489 0 0 0-.104-2.103L42.662 23.65a1.489 1.489 0 0 0-2.102.116l-8.661 9.62a1.489 1.489 0 0 0 .104 2.102l15.445 13.908c.61.548 1.55.496 2.103-.117l8.66-9.619z"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M13.238 11.483a1.927 1.927 0 0 1 .654-2.55c1.403-.912 2.927-1.233 4.181-.613.2.1.376.24.54.39L49.26 37.346c.472.426.741 1.025.741 1.653H28L13.238 11.483Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M13.238 11.483a1.927 1.927 0 0 1 .654-2.55c1.403-.912 2.927-1.233 4.181-.613.2.1.376.24.54.39L49.26 37.346c.472.426.741 1.025.741 1.653H28L13.238 11.483Z" fill="url(#o_icon_website_event__a)" fill-opacity=".2"/><path d="M50 39c0 1.657-4.925 3-11 3s-11-1.343-11-3 4.925-3 11-3 11 1.343 11 3Z" fill="var(--o-icons-red-red, #F9383D)"/><path d="M50 39c0 1.657-4.925 3-11 3s-11-1.343-11-3 4.925-3 11-3 11 1.343 11 3Z" fill="url(#o_icon_website_event__b)" fill-opacity=".2"/><path d="M36.762 11.483a1.927 1.927 0 0 0-.654-2.55c-1.403-.912-2.927-1.233-4.181-.613-.2.1-.376.24-.54.39L.74 37.346A2.226 2.226 0 0 0 0 39h22l14.762-27.517Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path d="M36.762 11.483a1.927 1.927 0 0 0-.654-2.55c-1.403-.912-2.927-1.233-4.181-.613-.2.1-.376.24-.54.39L.74 37.346A2.226 2.226 0 0 0 0 39h22l14.762-27.517Z" fill="url(#o_icon_website_event__c)" fill-opacity=".2"/><path d="M31.693 20.932 25 14.677l-6.693 6.255L25 33.408l6.693-12.476Z" fill="var(--o-icons-red-teal, #006158)"/><path d="M31.693 20.932 25 14.677l-6.693 6.255L25 33.408l6.693-12.476Z" fill="url(#o_icon_website_event__d)" fill-opacity=".2"/><path d="M0 39c0 1.657 4.925 3 11 3s11-1.343 11-3-4.925-3-11-3-11 1.343-11 3Z" fill="var(--o-icons-teal-teal, #00A079)"/><path d="M0 39c0 1.657 4.925 3 11 3s11-1.343 11-3-4.925-3-11-3-11 1.343-11 3Z" fill="url(#o_icon_website_event__e)" fill-opacity=".2"/><defs><linearGradient id="o_icon_website_event__a" x1="13" y1="8" x2="55.469" y2="20.672" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_event__b" x1="28" y1="36" x2="42.943" y2="49.698" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_event__c" x1="0" y1="8" x2="42.469" y2="20.672" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_event__d" x1="18.307" y1="14.677" x2="34.522" y2="17.574" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_event__e" x1="0" y1="36" x2="14.943" y2="49.698" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/website_event_exhibitor/static/src/scss/event_templates_sponsor.scss b/addons/website_event_exhibitor/static/src/scss/event_templates_sponsor.scss
index 16a23a17848..daecd7900a7 100644
--- a/addons/website_event_exhibitor/static/src/scss/event_templates_sponsor.scss
+++ b/addons/website_event_exhibitor/static/src/scss/event_templates_sponsor.scss
@@ -57,34 +57,6 @@
     margin: 0 -1px -1px 0;
     cursor: pointer;
 
-    .ribbon-wrapper {
-        width: 50px;
-        height: 50px;
-    }
-
-    .ribbon {
-        font: bold 10px Sans-Serif;
-        padding: 2px 0;
-        top: 10px;
-        width: 70px;
-        background-image: none; // not needed if colors for ribbons (Gold,Silver,Bronze) is removed in website_event_track.css
-
-        &.ribbon_Gold {
-            background-color: #e3aa24;
-            color:$white;
-        }
-
-        &.ribbon_Silver {
-            background-color: #adb5bd;
-            color: $white;
-        }
-
-        &.ribbon_Bronze {
-            background-color: #c7632a;
-            color: $white;
-        }
-    }
-
     &:before {
         content: "";
         display: block;
diff --git a/addons/website_event_exhibitor/views/event_exhibitor_templates_page.xml b/addons/website_event_exhibitor/views/event_exhibitor_templates_page.xml
index 9cdef1ddef8..b61f9361bf5 100644
--- a/addons/website_event_exhibitor/views/event_exhibitor_templates_page.xml
+++ b/addons/website_event_exhibitor/views/event_exhibitor_templates_page.xml
@@ -154,7 +154,7 @@
             <div class="alert alert-info mx-3 mt-3 o_wesponsor_exhibitor_main_empty_website_descr_warning">
                 The sponsor website description is missing.
                 <a t-attf-href="?{{ keep_query('*', enable_editor=1) }}">
-                    <i class="fa fa-fw fa-arrow-right"></i>
+                    <i class="oi oi-fw oi-arrow-right"></i>
                     Write one.
                 </a>
             </div>
@@ -173,7 +173,7 @@
                 <span class="h5 m-3">Other exhibitors</span>
                 <a href="#collapse_exhibitor_aside" data-bs-toggle="collapse"
                    class="d-lg-none p-2 text-decoration-none o_wevent_online_page_aside_collapse collapsed">
-                    <i class="fa fa-chevron-down d-lg-none"/>
+                    <i class="oi oi-chevron-down d-lg-none"/>
                 </a>
             </div>
             <ul id="collapse_exhibitor_aside" class="list-unstyled collapse d-lg-block mb-0">
diff --git a/addons/website_event_exhibitor/views/event_sponsor_views.xml b/addons/website_event_exhibitor/views/event_sponsor_views.xml
index 348416b6d13..aa5d967ba9d 100644
--- a/addons/website_event_exhibitor/views/event_sponsor_views.xml
+++ b/addons/website_event_exhibitor/views/event_sponsor_views.xml
@@ -77,7 +77,7 @@
                         <field name="is_published" widget="website_redirect_button"
                             attrs="{'invisible': [('exhibitor_type', '=', 'sponsor')]}"/>
                     </div>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <field name="active" invisible="1"/>
                     <field name="image_512" widget="image" class="oe_avatar"/>
                     <div class="oe_title">
diff --git a/addons/website_event_meet/views/event_meet_templates_page.xml b/addons/website_event_meet/views/event_meet_templates_page.xml
index 6c531541ad2..3826fc37067 100644
--- a/addons/website_event_meet/views/event_meet_templates_page.xml
+++ b/addons/website_event_meet/views/event_meet_templates_page.xml
@@ -106,7 +106,7 @@
             <div class="d-flex align-items-center justify-content-between me-2">
                 <span class="h5 m-3">Other Rooms</span>
                 <a href="#collapse_meet_room_aside" data-bs-toggle="collapse" class="d-lg-none p-2 text-decoration-none o_wevent_online_page_aside_collapse collapsed">
-                    <i class="fa fa-chevron-down d-lg-none"/>
+                    <i class="oi oi-chevron-down d-lg-none"/>
                 </a>
             </div>
             <ul id="collapse_meet_room_aside" class="list-unstyled collapse d-lg-block mb-0">
diff --git a/addons/website_event_sale/static/description/icon.png b/addons/website_event_sale/static/description/icon.png
index 6202111e7dd..68de0ea5043 100644
Binary files a/addons/website_event_sale/static/description/icon.png and b/addons/website_event_sale/static/description/icon.png differ
diff --git a/addons/website_event_sale/static/description/icon.svg b/addons/website_event_sale/static/description/icon.svg
index 9dc4966daa9..9d0cc4cde2f 100644
--- a/addons/website_event_sale/static/description/icon.svg
+++ b/addons/website_event_sale/static/description/icon.svg
@@ -1,24 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70">
-    <defs>
-        <path id="icon-a" d="M4,5.35309892e-14 C36.4160122,9.87060235e-15 58.0836068,-3.97961823e-14 65,5.07020818e-14 C69,6.733808e-14 70,1 70,5 C70,43.0488877 70,62.4235458 70,65 C70,69 69,70 65,70 C61,70 9,70 4,70 C1,70 7.10542736e-15,69 7.10542736e-15,65 C7.25721566e-15,62.4676575 3.83358709e-14,41.8005206 3.60818146e-14,5 C-1.13686838e-13,1 1,5.75716207e-14 4,5.35309892e-14 Z"/>
-        <linearGradient id="icon-c" x1="100%" x2="0%" y1="0%" y2="100%">
-            <stop offset="0%" stop-color="#DA956B"/>
-            <stop offset="100%" stop-color="#CC7039"/>
-        </linearGradient>
-        <path id="icon-d" d="M30.4841117,22.0178818 L43,33 C39,37.3544294 37.3333333,42.3544294 38,48 L21.0744625,32.4683559 L30.4841117,22.0178818 Z M42.5223849,56.838607 C41.2078243,58.1148367 39.1294169,58.18659 37.7708523,56.9633329 L12.0893951,33.839645 C10.6710296,32.562543 10.574444,30.3575851 11.8736617,28.9146577 L16.5784862,23.6894206 C17.9968517,24.9665226 20.1998265,24.8320983 21.4990443,23.3891709 C22.798262,21.9462434 22.7016763,19.7412856 21.2833108,18.4641836 L25.9881354,13.2389465 C27.2873531,11.7960191 29.4903279,11.6615948 30.9086934,12.9386968 L49.9350371,30.0700936 C47.9735137,30.1405297 46.1915216,30.6862713 44.6377627,31.6080597 L31.6243623,19.8907413 C30.9151795,19.2521903 29.8136921,19.3194025 29.1640833,20.0408662 L18.9702967,31.3622132 C18.3206878,32.0836769 18.3689807,33.1861558 19.0781634,33.8247068 L37.0551835,50.0112884 C37.5260595,50.4352671 38.1698855,50.5481058 38.7395561,50.3648826 C39.4901538,52.938764 40.7880675,55.1720216 42.5223849,56.838607 Z M47.7280684,41.09729 C47.7280684,44.4791455 58.0000556,43.620791 58,50.0493457 C58,53.1285938 55.7508537,55.7588721 52.0971585,56.3075293 L52.0971585,58.8554688 C52.0971585,59.2114111 51.7984472,59.5 51.43002,59.5 L49.2062249,59.5 C48.8377977,59.5 48.5390864,59.2114111 48.5390864,58.8554688 L48.5390864,56.2656885 C46.3429776,55.9048584 44.386038,54.9254395 43.0490368,53.6890137 C42.805698,53.4639648 42.7750097,53.0985693 42.9766523,52.8378564 L44.666125,50.6535938 C44.8927853,50.3606006 45.3248687,50.3096289 45.6200774,50.5386523 C47.0052794,51.6132471 48.7943781,52.4661768 50.5039761,52.4661768 C52.4949954,52.4661768 53.4018034,51.3202539 53.4018034,50.255542 C53.4018034,47.1078662 43.1298162,47.7912305 43.1298162,41.1561572 C43.1298162,38.3244092 45.2797812,36.034873 48.539142,35.3210547 L48.539142,32.6445313 C48.539142,32.2885889 48.8378533,32 49.2062805,32 L51.4300755,32 C51.7985028,32 52.0972141,32.2885889 52.0972141,32.6445313 L52.0972141,35.1817822 C53.8848117,35.3813721 55.8225155,36.0588281 57.1724147,37.2123779 C57.4043009,37.4105176 57.4628423,37.7377783 57.3155715,38.0008545 L56.006201,40.3399121 C55.8146766,40.6821045 55.3560189,40.7828125 55.029121,40.5556689 C53.7868535,39.6925342 52.2641099,39.033877 50.7782812,39.033877 C48.9253596,39.033877 47.7280684,39.8438379 47.7280684,41.09729 Z"/>
-        <path id="icon-e" d="M30.4841117,20.0178818 L43,31 C39,35.3544294 37.3333333,40.3544294 38,46 L21.0744625,30.4683559 L30.4841117,20.0178818 Z M42.5223849,54.838607 C41.2078243,56.1148367 39.1294169,56.18659 37.7708523,54.9633329 L12.0893951,31.839645 C10.6710296,30.562543 10.574444,28.3575851 11.8736617,26.9146577 L16.5784862,21.6894206 C17.9968517,22.9665226 20.1998265,22.8320983 21.4990443,21.3891709 C22.798262,19.9462434 22.7016763,17.7412856 21.2833108,16.4641836 L25.9881354,11.2389465 C27.2873531,9.79601907 29.4903279,9.66159477 30.9086934,10.9386968 L49.9350371,28.0700936 C47.9735137,28.1405297 46.1915216,28.6862713 44.6377627,29.6080597 L31.6243623,17.8907413 C30.9151795,17.2521903 29.8136921,17.3194025 29.1640833,18.0408662 L18.9702967,29.3622132 C18.3206878,30.0836769 18.3689807,31.1861558 19.0781634,31.8247068 L37.0551835,48.0112884 C37.5260595,48.4352671 38.1698855,48.5481058 38.7395561,48.3648826 C39.4901538,50.938764 40.7880675,53.1720216 42.5223849,54.838607 Z M47.7280684,39.09729 C47.7280684,42.4791455 58.0000556,41.620791 58,48.0493457 C58,51.1285938 55.7508537,53.7588721 52.0971585,54.3075293 L52.0971585,56.8554688 C52.0971585,57.2114111 51.7984472,57.5 51.43002,57.5 L49.2062249,57.5 C48.8377977,57.5 48.5390864,57.2114111 48.5390864,56.8554688 L48.5390864,54.2656885 C46.3429776,53.9048584 44.386038,52.9254395 43.0490368,51.6890137 C42.805698,51.4639648 42.7750097,51.0985693 42.9766523,50.8378564 L44.666125,48.6535938 C44.8927853,48.3606006 45.3248687,48.3096289 45.6200774,48.5386523 C47.0052794,49.6132471 48.7943781,50.4661768 50.5039761,50.4661768 C52.4949954,50.4661768 53.4018034,49.3202539 53.4018034,48.255542 C53.4018034,45.1078662 43.1298162,45.7912305 43.1298162,39.1561572 C43.1298162,36.3244092 45.2797812,34.034873 48.539142,33.3210547 L48.539142,30.6445313 C48.539142,30.2885889 48.8378533,30 49.2062805,30 L51.4300755,30 C51.7985028,30 52.0972141,30.2885889 52.0972141,30.6445313 L52.0972141,33.1817822 C53.8848117,33.3813721 55.8225155,34.0588281 57.1724147,35.2123779 C57.4043009,35.4105176 57.4628423,35.7377783 57.3155715,36.0008545 L56.006201,38.3399121 C55.8146766,38.6821045 55.3560189,38.7828125 55.029121,38.5556689 C53.7868535,37.6925342 52.2641099,37.033877 50.7782812,37.033877 C48.9253596,37.033877 47.7280684,37.8438379 47.7280684,39.09729 Z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <mask id="icon-b" fill="#fff">
-            <use xlink:href="#icon-a"/>
-        </mask>
-        <g mask="url(#icon-b)">
-            <rect width="70" height="70" fill="url(#icon-c)"/>
-            <path fill="#FFF" fill-opacity=".383" d="M4,1.8 L65,1.8 C67.6666667,1.8 69.3333333,1.13333333 70,-0.2 C70,2.46666667 70,3.46666667 70,2.8 L1.10547097e-14,2.8 C-1.65952376e-14,3.46666667 -2.9161925e-14,2.46666667 -2.66453526e-14,-0.2 C0.666666667,1.13333333 2,1.8 4,1.8 Z" transform="matrix(1 0 0 -1 0 2.8)"/>
-            <path fill="#393939" d="M40.940835,55 L4,55 C2,55 -7.10542736e-15,54.851752 0,50.8490566 L2.0990647e-16,27.6230718 L12,13.490566 L24,0 L37,3.11320755 L46,11.4150943 L52,16.6037736 L52,19.7169811 L57,21.7924528 L51,29.0566038 L57,35.9806542 L52,38.8120355 L52,42.1170824 L40.940835,55 Z" opacity=".324" transform="translate(0 15)"/>
-            <path fill="#000" fill-opacity=".383" d="M4,4 L65,4 C67.6666667,4 69.3333333,3 70,1 C70,3.66666667 70,5 70,5 L1.77635684e-15,5 C1.77635684e-15,5 1.77635684e-15,3.66666667 1.77635684e-15,1 C0.666666667,3 2,4 4,4 Z" transform="translate(0 65)"/>
-            <use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#icon-d"/>
-            <use fill="#FFF" fill-rule="nonzero" xlink:href="#icon-e"/>
-        </g>
-    </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M13.238 11.483a1.927 1.927 0 0 1 .654-2.55c1.403-.912 2.927-1.233 4.181-.613.2.1.376.24.54.39L49.26 37.346c.472.426.741 1.025.741 1.653H28L13.238 11.483Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path d="M13.238 11.483a1.927 1.927 0 0 1 .654-2.55c1.403-.912 2.927-1.233 4.181-.613.2.1.376.24.54.39L49.26 37.346c.472.426.741 1.025.741 1.653H28L13.238 11.483Z" fill="url(#o_icon_website_event_sale__a)" fill-opacity=".2"/><path d="M50 39c0 1.657-4.925 3-11 3s-11-1.343-11-3 4.925-3 11-3 11 1.343 11 3Z" fill="var(--o-icons-cyan-cyan, #0382F3)"/><path d="M50 39c0 1.657-4.925 3-11 3s-11-1.343-11-3 4.925-3 11-3 11 1.343 11 3Z" fill="url(#o_icon_website_event_sale__b)" fill-opacity=".2"/><path d="M36.762 11.483a1.927 1.927 0 0 0-.654-2.55c-1.403-.912-2.927-1.233-4.181-.613-.2.1-.376.24-.54.39L.74 37.346A2.226 2.226 0 0 0 0 39h22l14.762-27.517Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M36.762 11.483a1.927 1.927 0 0 0-.654-2.55c-1.403-.912-2.927-1.233-4.181-.613-.2.1-.376.24-.54.39L.74 37.346A2.226 2.226 0 0 0 0 39h22l14.762-27.517Z" fill="url(#o_icon_website_event_sale__c)" fill-opacity=".2"/><path d="M31.693 20.932 25 14.677l-6.693 6.255L25 33.408l6.693-12.476Z" fill="var(--o-icons-purple-cyan, #102E7A)"/><path d="M31.693 20.932 25 14.677l-6.693 6.255L25 33.408l6.693-12.476Z" fill="url(#o_icon_website_event_sale__d)" fill-opacity=".3"/><path d="M0 39c0 1.657 4.925 3 11 3s11-1.343 11-3-4.925-3-11-3-11 1.343-11 3Z" fill="var(--o-icons-purple-purple, #55103D)"/><path d="M0 39c0 1.657 4.925 3 11 3s11-1.343 11-3-4.925-3-11-3-11 1.343-11 3Z" fill="url(#o_icon_website_event_sale__e)" fill-opacity=".3"/><defs><linearGradient id="o_icon_website_event_sale__a" x1="13" y1="8" x2="55.469" y2="20.672" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_event_sale__b" x1="28" y1="36" x2="42.943" y2="49.698" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_event_sale__c" x1="0" y1="8" x2="42.469" y2="20.672" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_event_sale__d" x1="18.307" y1="14.677" x2="34.522" y2="17.574" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_event_sale__e" x1="0" y1="36" x2="14.943" y2="49.698" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/website_event_track/static/description/icon.png b/addons/website_event_track/static/description/icon.png
index 55d895b2766..93fb2a7688e 100644
Binary files a/addons/website_event_track/static/description/icon.png and b/addons/website_event_track/static/description/icon.png differ
diff --git a/addons/website_event_track/static/description/icon.svg b/addons/website_event_track/static/description/icon.svg
index 87c7872c923..ac266e242c9 100644
--- a/addons/website_event_track/static/description/icon.svg
+++ b/addons/website_event_track/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#CD7690"/><stop offset="100%" stop-color="#CA5377"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M34.79 69H4c-2 0-4-.146-4-4.075v-20.97l25-23.86 9-2.038 10 2.037L45 15h12v8.15l-6 5.095 2 8.151-1 7.132-3 5.095L34.79 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><path fill="#000" d="M24.762 52.559V50c-3.65-2.952-4.016-8.81-1.095-17.571l9.767 1.485A79.883 79.883 0 0 1 33 32l10-3c3.333 10 3.667 15.667 1 17l1.4 4.898c3.439-3.111 5.6-7.61 5.6-12.612 0-9.39-7.611-17-17-17s-17 7.61-17 17c0 5.982 3.09 11.243 7.762 14.273zm2.566 1.367A16.945 16.945 0 0 0 34 55.286c3.28 0 6.343-.93 8.94-2.538L41 47c-2.868-.574-5.242-4.355-7.123-11.344-.816 9.87-2.759 15-5.83 15.392l-.72 2.878zm15.289-32.579a8.215 8.215 0 1 1 8.68 9.066A18.93 18.93 0 0 1 53 38.286c0 10.493-8.507 19-19 19s-19-8.507-19-19c0-10.494 8.507-19 19-19 3.102 0 6.03.743 8.617 2.061zM49.786 18v3H47v2h2.786v3H52v-3h3v-2h-3v-3h-2.214z" opacity=".3"/><path fill="#FFF" d="M24.762 50.559V48c-3.65-2.952-4.016-8.81-1.095-17.571l9.767 1.485A79.883 79.883 0 0 1 33 30l10-3c3.333 10 3.667 15.667 1 17l1.4 4.898c3.439-3.111 5.6-7.61 5.6-12.612 0-9.39-7.611-17-17-17s-17 7.61-17 17c0 5.982 3.09 11.243 7.762 14.273zm2.566 1.367A16.945 16.945 0 0 0 34 53.286c3.28 0 6.343-.93 8.94-2.538L41 45c-2.868-.574-5.242-4.355-7.123-11.344-.816 9.87-2.759 15-5.83 15.392l-.72 2.878zm15.289-32.579a8.215 8.215 0 1 1 8.68 9.066A18.93 18.93 0 0 1 53 36.286c0 10.493-8.507 19-19 19s-19-8.507-19-19c0-10.494 8.507-19 19-19 3.102 0 6.03.743 8.617 2.061zM49.786 16v3H47v2h2.786v3H52v-3h3v-2h-3v-3h-2.214z"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M13.238 11.483a1.927 1.927 0 0 1 .654-2.55c1.403-.912 2.927-1.233 4.181-.613.2.1.376.24.54.39L49.26 37.346c.472.426.741 1.025.741 1.653H28L13.238 11.483Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M13.238 11.483a1.927 1.927 0 0 1 .654-2.55c1.403-.912 2.927-1.233 4.181-.613.2.1.376.24.54.39L49.26 37.346c.472.426.741 1.025.741 1.653H28L13.238 11.483Z" fill="url(#o_icon_website_event_track__a)" fill-opacity=".2"/><path d="M50 39c0 1.657-4.925 3-11 3s-11-1.343-11-3 4.925-3 11-3 11 1.343 11 3Z" fill="var(--o-icons-yellow-yellow, #F77B09)"/><path d="M50 39c0 1.657-4.925 3-11 3s-11-1.343-11-3 4.925-3 11-3 11 1.343 11 3Z" fill="url(#o_icon_website_event_track__b)" fill-opacity=".2"/><path d="M36.762 11.483a1.927 1.927 0 0 0-.654-2.55c-1.403-.912-2.927-1.233-4.181-.613-.2.1-.376.24-.54.39L.74 37.346A2.226 2.226 0 0 0 0 39h22l14.762-27.517Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M36.762 11.483a1.927 1.927 0 0 0-.654-2.55c-1.403-.912-2.927-1.233-4.181-.613-.2.1-.376.24-.54.39L.74 37.346A2.226 2.226 0 0 0 0 39h22l14.762-27.517Z" fill="url(#o_icon_website_event_track__c)" fill-opacity=".2"/><path d="M31.693 20.932 25 14.677l-6.693 6.255L25 33.408l6.693-12.476Z" fill="var(--o-icons-purple-yellow, #912C18)"/><path d="M31.693 20.932 25 14.677l-6.693 6.255L25 33.408l6.693-12.476Z" fill="url(#o_icon_website_event_track__d)" fill-opacity=".2"/><path d="M0 39c0 1.657 4.925 3 11 3s11-1.343 11-3-4.925-3-11-3-11 1.343-11 3Z" fill="var(--o-icons-purple-purple, #55103D)"/><path d="M0 39c0 1.657 4.925 3 11 3s11-1.343 11-3-4.925-3-11-3-11 1.343-11 3Z" fill="url(#o_icon_website_event_track__e)" fill-opacity=".3"/><defs><linearGradient id="o_icon_website_event_track__a" x1="13" y1="8" x2="55.469" y2="20.672" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_event_track__b" x1="28" y1="36" x2="42.943" y2="49.698" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_event_track__c" x1="0" y1="8" x2="42.469" y2="20.672" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_event_track__d" x1="18.307" y1="14.677" x2="34.522" y2="17.574" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_event_track__e" x1="0" y1="36" x2="14.943" y2="49.698" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/website_event_track/views/event_track_templates_list.xml b/addons/website_event_track/views/event_track_templates_list.xml
index 656ea6a5367..f2c32ca0c9a 100644
--- a/addons/website_event_track/views/event_track_templates_list.xml
+++ b/addons/website_event_track/views/event_track_templates_list.xml
@@ -193,7 +193,7 @@
                         t-attf-aria-controls="collapse_session_list_{{ tracks_info_index }}"
                         t-att-aria-expanded="'false' if tracks_info['default_collapsed'] else 'true'"
                         data-bs-toggle="collapse">
-                        <i class="fa fa-2x fa-chevron-down"/>
+                        <i class="oi fa-2x oi-chevron-down"/>
                     </a>
                     <hr class="mt-2 mb-2"/>
                 </div>
diff --git a/addons/website_event_track/views/event_track_templates_page.xml b/addons/website_event_track/views/event_track_templates_page.xml
index 4bf35f062bb..462f2e4921a 100644
--- a/addons/website_event_track/views/event_track_templates_page.xml
+++ b/addons/website_event_track/views/event_track_templates_page.xml
@@ -152,7 +152,7 @@
                 <div class="alert alert-info mx-3 mt-3 o_wesession_track_main_empty_descr_warning">
                     This track does not have a description.
                     <a t-attf-href="?{{ keep_query('*', enable_editor=1) }}">
-                        <i class="fa fa-fw fa-arrow-right"></i>
+                        <i class="oi oi-fw oi-arrow-right"></i>
                         Write one.
                     </a>
                 </div>
@@ -198,7 +198,7 @@
                     </li>
                 </ul>
                 <a href="#collapse_track_aside" data-bs-toggle="collapse" class="d-md-none p-2 text-decoration-none o_wevent_online_page_aside_collapse collapsed">
-                    <i class="fa fa-chevron-down d-md-none"/>
+                    <i class="oi oi-chevron-down d-md-none"/>
                 </a>
             </div>
             <div id="collapse_track_aside"
diff --git a/addons/website_event_track/views/event_track_views.xml b/addons/website_event_track/views/event_track_views.xml
index 515a303252d..8bb213cc278 100644
--- a/addons/website_event_track/views/event_track_views.xml
+++ b/addons/website_event_track/views/event_track_views.xml
@@ -68,7 +68,7 @@
                                         <field name="kanban_state" widget="state_selection" groups="base.group_user"/>
                                         <img t-att-src="kanban_image('res.partner', 'avatar_128', record.partner_id.raw_value)"
                                             t-att-title="record.partner_id.value" t-att-alt="record.partner_id.value"
-                                            class="oe_kanban_avatar"/>
+                                            class="oe_kanban_avatar o_avatar rounded"/>
                                     </div>
                                 </div>
                             </div>
@@ -156,7 +156,7 @@
                     <field name="legend_blocked" invisible="1"/>
                     <field name="legend_normal" invisible="1"/>
                     <field name="legend_done" invisible="1"/>
-                    <widget name="web_ribbon" text="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="d-flex gap-4 mb-3">
                         <div class="flex-grow-1">
                             <label for="name"/>
diff --git a/addons/website_form_project/static/description/icon.png b/addons/website_form_project/static/description/icon.png
index f36f46cdd5c..7a6684c2700 100644
Binary files a/addons/website_form_project/static/description/icon.png and b/addons/website_form_project/static/description/icon.png differ
diff --git a/addons/website_form_project/static/description/icon.svg b/addons/website_form_project/static/description/icon.svg
index 6eec87514d8..5c2e48f7da5 100644
--- a/addons/website_form_project/static/description/icon.svg
+++ b/addons/website_form_project/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#94B6C8"/><stop offset="100%" stop-color="#6A9EBA"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M30.093 69H4c-2 0-4-.146-4-4.078V40.91l22.395-18.848 4.727-2.094 2.97-1.317.686.32 6.112-7.503 2.724-.795v7.978l7.8 8.27 9.65 2.772-8.332 11.066-2.992 5.28L30.093 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><path fill="#000" d="M49.315 41.024a16.27 16.27 0 0 1-1.84 4.61 16.757 16.757 0 0 1-6.138 6.113C38.752 53.25 35.93 54 32.869 54c-3.06 0-5.883-.75-8.467-2.253a16.757 16.757 0 0 1-6.14-6.112C16.754 43.06 16 40.25 16 37.203c0-3.047.754-5.857 2.262-8.43a16.757 16.757 0 0 1 6.14-6.113 16.484 16.484 0 0 1 3.925-1.655c-.625.62-1.127 1.525-1.504 2.717v1.618a3.369 3.369 0 0 1-.237-.204 2.141 2.141 0 0 0-.22-.186c-.673.219-1.362.518-2.064.897a.543.543 0 0 0 .263-.022c.073-.03.169-.077.286-.142.117-.066.19-.106.22-.12.497-.205.805-.256.922-.154l.11-.11c.205.234.351.416.439.548-.103-.059-.322-.066-.659-.022-.293.087-.454.175-.483.262.102.175.139.306.11.394a3.426 3.426 0 0 1-.253-.219 1.741 1.741 0 0 0-.318-.24.88.88 0 0 0-.33-.11c-.234 0-.395.007-.483.022a13.836 13.836 0 0 0-5.162 4.855c.103.102.19.16.264.175.058.015.095.08.11.197a.835.835 0 0 0 .054.24c.022.044.107.023.253-.065.132.117.154.255.066.416.015-.015.337.182.966.59.279.248.432.401.462.46.044.16-.03.291-.22.393a1.12 1.12 0 0 0-.198-.197c-.117-.102-.183-.131-.197-.087-.044.073-.04.208.01.404.052.197.129.288.231.274-.102 0-.172.116-.208.35a5.03 5.03 0 0 0-.055.776c0 .284-.008.456-.022.514l.044.022c-.044.175-.004.426.12.754.125.329.282.47.473.427-.19.044-.044.357.439.94.088.117.146.183.176.197.044.03.131.084.263.164s.242.153.33.219a.934.934 0 0 1 .22.23c.058.072.131.236.219.492.088.255.19.426.308.514-.03.087.04.233.208.437.169.204.245.372.23.503a.107.107 0 0 0-.054.022.107.107 0 0 1-.055.022c.044.102.157.204.34.306.184.102.297.197.34.284.016.044.03.117.045.219a.802.802 0 0 0 .066.24c.029.059.088.073.175.044.03-.291-.146-.743-.527-1.356a17.95 17.95 0 0 1-.373-.634 1.254 1.254 0 0 1-.12-.339 1.662 1.662 0 0 0-.1-.317c.03 0 .073.01.132.033.059.022.12.047.187.076.066.03.12.059.164.088.044.029.06.05.044.065-.044.102-.029.23.044.383.074.153.161.288.264.405a30.038 30.038 0 0 0 .637.7c.088.087.19.23.307.426.118.197.118.295 0 .295.132 0 .279.073.44.22.16.145.285.29.373.436.073.117.132.307.176.57.044.262.08.437.11.524.029.102.091.2.186.295.096.095.187.164.275.208l.351.175.286.153c.073.03.209.106.406.23.198.124.355.207.473.251.146.059.263.088.35.088.089 0 .195-.019.32-.055a3.67 3.67 0 0 1 .296-.077c.22-.029.432.08.637.329.205.247.359.4.461.459.527.277.93.357 1.208.24-.029.015-.025.07.011.164.037.095.095.208.176.34a21.426 21.426 0 0 0 .318.502c.074.088.205.197.396.328.19.132.322.241.395.329.088-.059.14-.124.154-.197-.044.116.007.262.154.437.146.175.278.248.395.219.205-.044.308-.277.308-.7-.454.219-.813.087-1.077-.394a.425.425 0 0 0-.055-.12 1.39 1.39 0 0 1-.142-.372.309.309 0 0 1 0-.164c.014-.044.05-.065.11-.065.131 0 .204-.026.22-.077.014-.051 0-.142-.045-.273a4.395 4.395 0 0 1-.088-.285c-.014-.116-.095-.262-.241-.437a5.832 5.832 0 0 1-.264-.328c-.073.131-.19.19-.351.175-.161-.015-.279-.08-.352-.197a.601.601 0 0 1-.033.12.518.518 0 0 0-.033.142c-.19 0-.3-.007-.33-.021.016-.044.034-.172.056-.383.022-.212.047-.376.077-.492.014-.059.055-.146.12-.263.066-.116.121-.222.165-.317.044-.095.073-.186.088-.273.015-.088-.018-.157-.099-.208-.08-.051-.208-.07-.384-.055-.278.015-.469.16-.571.438a4.52 4.52 0 0 0-.066.23.74.74 0 0 1-.11.25.546.546 0 0 1-.198.154c-.102.044-.278.058-.527.044-.249-.015-.424-.051-.527-.11-.19-.116-.355-.328-.494-.634-.14-.306-.209-.576-.209-.81 0-.145.018-.338.055-.579.037-.24.059-.422.066-.546a1.084 1.084 0 0 0-.048-.283c4.096 1.7 14.522 1.865 20.921.599zM26.823 25.34v.573a.444.444 0 0 1-.083-.09c-.059-.116-.059-.262 0-.437.014-.056.042-.072.083-.046zm6.484 25.64c1.95-.339 3.714-1.035 5.291-2.087l-3.676-3.675c-.105.08-.168.135-.187.164a1.084 1.084 0 0 0-.132.262 1.32 1.32 0 0 1-.11.241c-.029-.058-.113-.106-.252-.142-.14-.037-.209-.077-.209-.12.03.145.059.4.088.765.03.365.066.642.11.831.102.452.014.802-.264 1.05-.395.364-.608.656-.637.875-.058.32.03.51.264.568 0 .102-.059.252-.176.449-.117.197-.168.353-.154.47 0 .087.015.204.044.35zm24.094-20.786c0 .889-.245 1.63-.733 2.223-.489.593-1.166.889-2.034.889-.45 0-.875-.096-1.276-.288-.4-.192-.724-.4-.971-.626a4.29 4.29 0 0 0-.93-.626 2.522 2.522 0 0 0-1.17-.288c-1.208 0-1.811.68-1.811 2.042 0 .428.088 1.06.263 1.894.176.834.258 1.465.247 1.893v.083c-.241 0-.422.005-.543.016-.373.033-.909.096-1.606.19-.697.093-1.33.167-1.902.222-.57.055-1.108.082-1.613.082-.67 0-1.235-.145-1.696-.436-.462-.291-.692-.75-.692-1.375 0-.406.096-.796.288-1.17.192-.373.4-.683.626-.93.225-.247.433-.57.626-.971.192-.4.288-.826.288-1.276 0-.868-.297-1.545-.89-2.034-.592-.489-1.333-.733-2.222-.733-.923 0-1.708.25-2.355.75-.648.499-.972 1.199-.972 2.099 0 .472.083.928.247 1.367.165.439.349.793.552 1.062.203.269.387.56.552.873.164.312.247.59.247.831 0 .494-.253.983-.758 1.466-.406.384-1.048.576-1.927.576-1.042 0-2.387-.132-4.034-.395a4.52 4.52 0 0 0-.453-.066 4.52 4.52 0 0 1-.453-.066l-.214-.033a.126.126 0 0 1-.05-.016c-.021 0-.032-.006-.032-.017V20.545c.022.011.118.03.288.058.17.027.357.055.56.082.203.028.321.047.354.058 1.647.263 2.992.395 4.034.395.879 0 1.52-.192 1.927-.576.505-.483.758-.972.758-1.466 0-.241-.083-.519-.247-.831a6.361 6.361 0 0 0-.552-.873c-.203-.27-.387-.623-.552-1.062a3.861 3.861 0 0 1-.247-1.367c0-.9.324-1.6.972-2.1.647-.499 1.438-.749 2.371-.749.878 0 1.614.245 2.207.733.592.489.889 1.166.889 2.034 0 .45-.096.875-.288 1.276-.193.4-.401.724-.626.971a4.29 4.29 0 0 0-.626.93 2.522 2.522 0 0 0-.288 1.17c0 .626.23 1.084.692 1.375.46.29 1.026.436 1.696.436.702 0 1.69-.082 2.964-.247 1.273-.164 2.168-.258 2.684-.28v.033c-.011.022-.03.118-.058.288-.027.17-.055.357-.082.56a3.379 3.379 0 0 1-.058.354c-.263 1.647-.395 2.992-.395 4.035 0 .878.192 1.52.576 1.926.483.505.972.758 1.466.758.241 0 .518-.083.831-.247.313-.165.604-.349.873-.552.269-.203.623-.387 1.062-.552.44-.164.895-.247 1.367-.247.9 0 1.6.324 2.1.972.499.648.749 1.433.749 2.355z" opacity=".3"/><path fill="#FFF" d="M49.315 39.024a16.27 16.27 0 0 1-1.84 4.61 16.757 16.757 0 0 1-6.138 6.113C38.752 51.25 35.93 52 32.869 52c-3.06 0-5.883-.75-8.467-2.253a16.757 16.757 0 0 1-6.14-6.112C16.754 41.06 16 38.25 16 35.203c0-3.047.754-5.857 2.262-8.43a16.757 16.757 0 0 1 6.14-6.113 16.484 16.484 0 0 1 3.925-1.655c-.625.62-1.127 1.525-1.504 2.717v1.618a3.369 3.369 0 0 1-.237-.204 2.141 2.141 0 0 0-.22-.186c-.673.219-1.362.518-2.064.897a.543.543 0 0 0 .263-.022c.073-.03.169-.077.286-.142.117-.066.19-.106.22-.12.497-.205.805-.256.922-.154l.11-.11c.205.234.351.416.439.548-.103-.059-.322-.066-.659-.022-.293.087-.454.175-.483.262.102.175.139.306.11.394a3.426 3.426 0 0 1-.253-.219 1.741 1.741 0 0 0-.318-.24.88.88 0 0 0-.33-.11c-.234 0-.395.007-.483.022a13.836 13.836 0 0 0-5.162 4.855c.103.102.19.16.264.175.058.015.095.08.11.197a.835.835 0 0 0 .054.24c.022.044.107.023.253-.065.132.117.154.255.066.416.015-.015.337.182.966.59.279.248.432.401.462.46.044.16-.03.291-.22.393a1.12 1.12 0 0 0-.198-.197c-.117-.102-.183-.131-.197-.087-.044.073-.04.208.01.404.052.197.129.288.231.274-.102 0-.172.116-.208.35a5.03 5.03 0 0 0-.055.776c0 .284-.008.456-.022.514l.044.022c-.044.175-.004.426.12.754.125.329.282.47.473.427-.19.044-.044.357.439.94.088.117.146.183.176.197.044.03.131.084.263.164s.242.153.33.219a.934.934 0 0 1 .22.23c.058.072.131.236.219.492.088.255.19.426.308.514-.03.087.04.233.208.437.169.204.245.372.23.503a.107.107 0 0 0-.054.022.107.107 0 0 1-.055.022c.044.102.157.204.34.306.184.102.297.197.34.284.016.044.03.117.045.219a.802.802 0 0 0 .066.24c.029.059.088.073.175.044.03-.291-.146-.743-.527-1.356a17.95 17.95 0 0 1-.373-.634 1.254 1.254 0 0 1-.12-.339 1.662 1.662 0 0 0-.1-.317c.03 0 .073.01.132.033.059.022.12.047.187.076.066.03.12.059.164.088.044.029.06.05.044.065-.044.102-.029.23.044.383.074.153.161.288.264.405a30.038 30.038 0 0 0 .637.7c.088.087.19.23.307.426.118.197.118.295 0 .295.132 0 .279.073.44.22.16.145.285.29.373.436.073.117.132.307.176.57.044.262.08.437.11.524.029.102.091.2.186.295.096.095.187.164.275.208l.351.175.286.153c.073.03.209.106.406.23.198.124.355.207.473.251.146.059.263.088.35.088.089 0 .195-.019.32-.055a3.67 3.67 0 0 1 .296-.077c.22-.029.432.08.637.329.205.247.359.4.461.459.527.277.93.357 1.208.24-.029.015-.025.07.011.164.037.095.095.208.176.34a21.426 21.426 0 0 0 .318.502c.074.088.205.197.396.328.19.132.322.241.395.329.088-.059.14-.124.154-.197-.044.116.007.262.154.437.146.175.278.248.395.219.205-.044.308-.277.308-.7-.454.219-.813.087-1.077-.394a.425.425 0 0 0-.055-.12 1.39 1.39 0 0 1-.142-.372.309.309 0 0 1 0-.164c.014-.044.05-.065.11-.065.131 0 .204-.026.22-.077.014-.051 0-.142-.045-.273a4.395 4.395 0 0 1-.088-.285c-.014-.116-.095-.262-.241-.437a5.832 5.832 0 0 1-.264-.328c-.073.131-.19.19-.351.175-.161-.015-.279-.08-.352-.197a.601.601 0 0 1-.033.12.518.518 0 0 0-.033.142c-.19 0-.3-.007-.33-.021.016-.044.034-.172.056-.383.022-.212.047-.376.077-.492.014-.059.055-.146.12-.263.066-.116.121-.222.165-.317.044-.095.073-.186.088-.273.015-.088-.018-.157-.099-.208-.08-.051-.208-.07-.384-.055-.278.015-.469.16-.571.438a4.52 4.52 0 0 0-.066.23.74.74 0 0 1-.11.25.546.546 0 0 1-.198.154c-.102.044-.278.058-.527.044-.249-.015-.424-.051-.527-.11-.19-.116-.355-.328-.494-.634-.14-.306-.209-.576-.209-.81 0-.145.018-.338.055-.579.037-.24.059-.422.066-.546a1.084 1.084 0 0 0-.048-.283c4.096 1.7 14.522 1.865 20.921.599zM26.823 23.34v.573a.444.444 0 0 1-.083-.09c-.059-.116-.059-.262 0-.437.014-.056.042-.072.083-.046zm6.484 25.64c1.95-.339 3.714-1.035 5.291-2.087l-3.676-3.675c-.105.08-.168.135-.187.164a1.084 1.084 0 0 0-.132.262 1.32 1.32 0 0 1-.11.241c-.029-.058-.113-.106-.252-.142-.14-.037-.209-.077-.209-.12.03.145.059.4.088.765.03.365.066.642.11.831.102.452.014.802-.264 1.05-.395.364-.608.656-.637.875-.058.32.03.51.264.568 0 .102-.059.252-.176.449-.117.197-.168.353-.154.47 0 .087.015.204.044.35zm24.094-20.786c0 .889-.245 1.63-.733 2.223-.489.593-1.166.889-2.034.889-.45 0-.875-.096-1.276-.288-.4-.192-.724-.4-.971-.626a4.29 4.29 0 0 0-.93-.626 2.522 2.522 0 0 0-1.17-.288c-1.208 0-1.811.68-1.811 2.042 0 .428.088 1.06.263 1.894.176.834.258 1.465.247 1.893v.083c-.241 0-.422.005-.543.016-.373.033-.909.096-1.606.19-.697.093-1.33.167-1.902.222-.57.055-1.108.082-1.613.082-.67 0-1.235-.145-1.696-.436-.462-.291-.692-.75-.692-1.375 0-.406.096-.796.288-1.17.192-.373.4-.683.626-.93.225-.247.433-.57.626-.971.192-.4.288-.826.288-1.276 0-.868-.297-1.545-.89-2.034-.592-.489-1.333-.733-2.222-.733-.923 0-1.708.25-2.355.75-.648.499-.972 1.199-.972 2.099 0 .472.083.928.247 1.367.165.439.349.793.552 1.062.203.269.387.56.552.873.164.312.247.59.247.831 0 .494-.253.983-.758 1.466-.406.384-1.048.576-1.927.576-1.042 0-2.387-.132-4.034-.395a4.52 4.52 0 0 0-.453-.066 4.52 4.52 0 0 1-.453-.066l-.214-.033a.126.126 0 0 1-.05-.016c-.021 0-.032-.006-.032-.017V18.545c.022.011.118.03.288.058.17.027.357.055.56.082.203.028.321.047.354.058 1.647.263 2.992.395 4.034.395.879 0 1.52-.192 1.927-.576.505-.483.758-.972.758-1.466 0-.241-.083-.519-.247-.831a6.361 6.361 0 0 0-.552-.873c-.203-.27-.387-.623-.552-1.062a3.861 3.861 0 0 1-.247-1.367c0-.9.324-1.6.972-2.1.647-.499 1.438-.749 2.371-.749.878 0 1.614.245 2.207.733.592.489.889 1.166.889 2.034 0 .45-.096.875-.288 1.276-.193.4-.401.724-.626.971a4.29 4.29 0 0 0-.626.93 2.522 2.522 0 0 0-.288 1.17c0 .626.23 1.084.692 1.375.46.29 1.026.436 1.696.436.702 0 1.69-.082 2.964-.247 1.273-.164 2.168-.258 2.684-.28v.033c-.011.022-.03.118-.058.288-.027.17-.055.357-.082.56a3.379 3.379 0 0 1-.058.354c-.263 1.647-.395 2.992-.395 4.035 0 .878.192 1.52.576 1.926.483.505.972.758 1.466.758.241 0 .518-.083.831-.247.313-.165.604-.349.873-.552.269-.203.623-.387 1.062-.552.44-.164.895-.247 1.367-.247.9 0 1.6.324 2.1.972.499.648.749 1.433.749 2.355z"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="m30.842 34.612-8.105 10.387L5.452 31.37a3.862 3.862 0 0 1-.616-5.417l5.748-7.243 20.258 15.903Z" fill="var(--o-icons-cyan-cyan, #0382F3)"/><path d="m30.842 34.612-8.105 10.387L5.452 31.37a3.862 3.862 0 0 1-.616-5.417l5.748-7.243 20.258 15.903Z" fill="url(#o_icon_website_form_project__a)" fill-opacity=".2"/><path d="m22.622 44.909-10.455-8.335 8.127-10.242 10.548 8.28L22.737 45l-.115-.091Z" fill="var(--o-icons-purple-cyan, #102E7A)"/><path d="m22.622 44.909-10.455-8.335 8.127-10.242 10.548 8.28L22.737 45l-.115-.091Z" fill="url(#o_icon_website_form_project__b)" fill-opacity=".3"/><path d="m22.593 44.886.144.114 22.447-28.767a3.862 3.862 0 0 0-.636-5.393L37.223 5 20.296 26.332l10.547 8.28-8.105 10.387-.144-.113Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path d="m22.593 44.886.144.114 22.447-28.767a3.862 3.862 0 0 0-.636-5.393L37.223 5 20.296 26.332l10.547 8.28-8.105 10.387-.144-.113Z" fill="url(#o_icon_website_form_project__c)" fill-opacity=".2"/><defs><linearGradient id="o_icon_website_form_project__a" x1="4" y1="18.709" x2="35.5" y2="26.749" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_form_project__b" x1="12.167" y1="26.332" x2="34.137" y2="31.827" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_form_project__c" x1="20.295" y1="5" x2="51.618" y2="10.032" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/website_forum/static/description/icon.png b/addons/website_forum/static/description/icon.png
index e5c25559a08..8040875b919 100644
Binary files a/addons/website_forum/static/description/icon.png and b/addons/website_forum/static/description/icon.png differ
diff --git a/addons/website_forum/static/description/icon.svg b/addons/website_forum/static/description/icon.svg
index 925ac76d0b2..2431124215d 100644
--- a/addons/website_forum/static/description/icon.svg
+++ b/addons/website_forum/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="98.616%"><stop offset="0%" stop-color="#797C79"/><stop offset="100%" stop-color="#545554"/></linearGradient><path id="d" d="M30.37 44.533c-2.72 0-5.282-.495-7.533-1.37-2.27 1.799-5.054 2.894-8.013 3.209a.598.598 0 0 1-.644-.44c-.07-.291.151-.47.37-.682 1.087-1.058 2.404-1.89 2.92-5.442-2.073-2.01-3.303-4.52-3.303-7.244 0-6.612 7.255-11.97 16.203-11.97 8.949 0 16.204 5.358 16.204 11.97 0 6.616-7.255 11.97-16.204 11.97zm-.37-19.2a4.167 4.167 0 1 0 0 8.334 4.167 4.167 0 0 0 0-8.334zm4.773 8.694l-1.857-.465c-1.951 1.404-4.316 1.09-5.832 0l-1.857.465a2.5 2.5 0 0 0-1.894 2.425v.965c0 .69.56 1.25 1.25 1.25h10.834c.69 0 1.25-.56 1.25-1.25v-.965a2.5 2.5 0 0 0-1.894-2.425zm20.703 18.356c-1.008-.961-2.231-1.717-2.71-4.947 4.978-4.729 3.775-11.494-2.725-15.166.003.098.005.196.005.294 0 8.971-9.374 15.849-20.562 15.47 2.758 2.268 6.799 3.698 11.303 3.698 2.526 0 4.905-.45 6.995-1.245 2.108 1.635 4.693 2.63 7.44 2.916a.556.556 0 0 0 .599-.4c.066-.264-.14-.426-.345-.62z"/><path id="e" d="M30.37 42.533c-2.72 0-5.282-.495-7.533-1.37-2.27 1.799-5.054 2.894-8.013 3.209a.598.598 0 0 1-.644-.44c-.07-.291.151-.47.37-.682 1.087-1.058 2.404-1.89 2.92-5.442-2.073-2.01-3.303-4.52-3.303-7.244 0-6.612 7.255-11.97 16.203-11.97 8.949 0 16.204 5.358 16.204 11.97 0 6.616-7.255 11.97-16.204 11.97zm-.37-19.2a4.167 4.167 0 1 0 0 8.334 4.167 4.167 0 0 0 0-8.334zm4.773 8.694l-1.857-.465c-1.951 1.404-4.316 1.09-5.832 0l-1.857.465a2.5 2.5 0 0 0-1.894 2.425v.965c0 .69.56 1.25 1.25 1.25h10.834c.69 0 1.25-.56 1.25-1.25v-.965a2.5 2.5 0 0 0-1.894-2.425zm20.703 18.356c-1.008-.961-2.231-1.717-2.71-4.947 4.978-4.729 3.775-11.494-2.725-15.166.003.098.005.196.005.294 0 8.971-9.374 15.849-20.562 15.47 2.758 2.268 6.799 3.698 11.303 3.698 2.526 0 4.905-.45 6.995-1.245 2.108 1.635 4.693 2.63 7.44 2.916a.556.556 0 0 0 .599-.4c.066-.264-.14-.426-.345-.62z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M43.795 69H4c-2 0-4-.146-4-4.082v-22.25l16-16.525 7-6.123L33 19l9 4.082 3.451 6.272L50 31.244 49 44.51l7 7.143L43.795 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#o_icon_website_forum__a)"><path d="M25 50c-3.069 0-6.008-.553-8.724-1.565C13.5 45.5 11.5 41.725 11.5 38c0-13.807 13.193-27 27-27 3.069 0 7 1.5 9.224 3.565A24.908 24.908 0 0 1 50 25v20.238A4.762 4.762 0 0 1 45.238 50H25Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M25 50c-3.069 0-6.008-.553-8.724-1.565C13.5 45.5 11.5 41.725 11.5 38c0-13.807 13.193-27 27-27 3.069 0 7 1.5 9.224 3.565A24.908 24.908 0 0 1 50 25v20.238A4.762 4.762 0 0 1 45.238 50H25Z" fill="url(#o_icon_website_forum__b)" fill-opacity=".2"/><path d="M16.276 48.435a24.907 24.907 0 0 1-4.644-2.306C8.115 41.889 3.5 36.441 3.5 30.5c0-13.531 13.469-26 27-26 5.94 0 12 3.5 15.63 7.132a24.956 24.956 0 0 1 1.594 2.933A24.948 24.948 0 0 0 39 13c-13.807 0-25 11.193-25 25a24.9 24.9 0 0 0 2.276 10.435Z" fill="var(--o-icons-red-red, #F9383D)"/><path d="M16.276 48.435a24.907 24.907 0 0 1-4.644-2.306C8.115 41.889 3.5 36.441 3.5 30.5c0-13.531 13.469-26 27-26 5.94 0 12 3.5 15.63 7.132a24.956 24.956 0 0 1 1.594 2.933A24.948 24.948 0 0 0 39 13c-13.807 0-25 11.193-25 25a24.9 24.9 0 0 0 2.276 10.435Z" fill="url(#o_icon_website_forum__c)" fill-opacity=".2"/><path d="M46.13 11.632C41.697 4.641 33.89 0 25 0 11.193 0 0 11.193 0 25c0 8.89 4.64 16.697 11.632 21.13A24.4 24.4 0 0 1 6 30.5C6 16.969 16.969 6 30.5 6a24.4 24.4 0 0 1 15.63 5.632Z" fill="var(--o-icons-purple-red, #911E3D)"/><path d="M46.13 11.632C41.697 4.641 33.89 0 25 0 11.193 0 0 11.193 0 25c0 8.89 4.64 16.697 11.632 21.13A24.4 24.4 0 0 1 6 30.5C6 16.969 16.969 6 30.5 6a24.4 24.4 0 0 1 15.63 5.632Z" fill="url(#o_icon_website_forum__d)" fill-opacity=".2"/></g><defs><linearGradient id="o_icon_website_forum__b" x1="11.5" y1="11" x2="56.862" y2="22.195" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_forum__c" x1="3.5" y1="4.5" x2="55.488" y2="17.583" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_forum__d" x1="0" y1="0" x2="54.27" y2="13.568" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><clipPath id="o_icon_website_forum__a"><path fill="var(--o-icons-white, #FFFFFF)" d="M0 0h50v50H0z"/></clipPath></defs></svg>
diff --git a/addons/website_forum/views/forum_forum_templates.xml b/addons/website_forum/views/forum_forum_templates.xml
index 440279f1b46..af766854d91 100644
--- a/addons/website_forum/views/forum_forum_templates.xml
+++ b/addons/website_forum/views/forum_forum_templates.xml
@@ -191,7 +191,7 @@
         <div t-if="request.env.user.forum_waiting_posts_count" class="alert border" role="alert">
             <b>You already have a pending post.</b><br/>
             <p>Please wait for a moderator to validate your previous post before continuing.</p>
-            <a t-attf-href="/forum/#{ slug(forum) }" title="All Topics"><i class="fa fa-chevron-left me-2"/>Back to All Topics</a>
+            <a t-attf-href="/forum/#{ slug(forum) }" title="All Topics"><i class="oi oi-chevron-left me-2"/>Back to All Topics</a>
         </div>
 
         <form t-else="" t-attf-action="/forum/#{slug(forum)}/new" method="post" role="form" class="tag_text js_website_submit_form js_wforum_submit_form o_wforum_readable">
diff --git a/addons/website_forum/views/forum_forum_templates_layout.xml b/addons/website_forum/views/forum_forum_templates_layout.xml
index 7e40d3d85d2..ef1e3bc0c8a 100644
--- a/addons/website_forum/views/forum_forum_templates_layout.xml
+++ b/addons/website_forum/views/forum_forum_templates_layout.xml
@@ -108,7 +108,7 @@
     <div class="navbar navbar-expand-sm navbar-light">
         <div class="container flex-wrap flex-md-nowrap">
             <a t-if="has_back_button_url" class="btn btn-light border me-2 o_back_button" title="Back">
-                <i class="fa fa-chevron-left me-1"/>Back
+                <i class="oi oi-chevron-left me-1"/>Back
             </a>
             <!-- Desktop -->
             <ul class="navbar-nav me-auto d-none d-lg-flex">
diff --git a/addons/website_forum/views/forum_forum_templates_post.xml b/addons/website_forum/views/forum_forum_templates_post.xml
index 21401699d24..5d0868f4955 100644
--- a/addons/website_forum/views/forum_forum_templates_post.xml
+++ b/addons/website_forum/views/forum_forum_templates_post.xml
@@ -229,7 +229,7 @@
                             <t t-set="url" t-value="'/forum/' + slug(forum) + '/question/' + slug(question) + '/reopen'"/>
                             <t t-set="label">Reopen</t>
                             <t t-set="inDropdown" t-value="False"/>
-                            <t t-set="icon" t-value="'fa-arrow-right'"/>
+                            <t t-set="icon" t-value="'oi oi-arrow-right'"/>
                             <t t-set="karma" t-value="not question.can_close and question.karma_close or 0"/>
                         </t>
                     </div>
diff --git a/addons/website_forum/views/forum_forum_views.xml b/addons/website_forum/views/forum_forum_views.xml
index a0d7ae32617..78003584cbf 100644
--- a/addons/website_forum/views/forum_forum_views.xml
+++ b/addons/website_forum/views/forum_forum_views.xml
@@ -49,7 +49,7 @@
                             </button>
                         </div>
                         <field name="active" invisible="1"/>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <field name="image_1920" widget="image" options="{'preview_image': 'image_128'}" class="oe_avatar"/>
                         <div class="oe_title">
                             <label for="name"/>
diff --git a/addons/website_forum/views/forum_post_views.xml b/addons/website_forum/views/forum_post_views.xml
index 42bea1c9102..de40c8100cc 100644
--- a/addons/website_forum/views/forum_post_views.xml
+++ b/addons/website_forum/views/forum_post_views.xml
@@ -14,7 +14,7 @@
                         </div>
                     </button>
                 </div>
-                <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                 <label for="name"/>
                 <h1>
                     <field name="name" placeholder="e.g. When should I plant my tomatoes?"/>
diff --git a/addons/website_forum/views/website_profile_templates.xml b/addons/website_forum/views/website_profile_templates.xml
index 68853088a1e..2f1ceed02d1 100644
--- a/addons/website_forum/views/website_profile_templates.xml
+++ b/addons/website_forum/views/website_profile_templates.xml
@@ -14,7 +14,7 @@
             <div t-if="request.params.get('forum_origin')" class="o_wprofile_all_users_nav_btn_container col pe-0 flex-grow-0">
                 <a t-att-href="(request.website.domain or '') + '/' + request.params.get('forum_origin').lstrip('/')"
                     class="o_wprofile_all_users_nav_btn btn text-nowrap">
-                    <i class="fa fa-chevron-left small"/> Back
+                    <i class="oi oi-chevron-left small"/> Back
                 </a>
             </div>
         </xpath>
diff --git a/addons/website_google_map/static/description/icon.png b/addons/website_google_map/static/description/icon.png
index 988e7045f38..22766efb243 100644
Binary files a/addons/website_google_map/static/description/icon.png and b/addons/website_google_map/static/description/icon.png differ
diff --git a/addons/website_google_map/static/description/icon.svg b/addons/website_google_map/static/description/icon.svg
index acb983d54d6..bfb49bca1e4 100644
--- a/addons/website_google_map/static/description/icon.svg
+++ b/addons/website_google_map/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#7CC098"/><stop offset="100%" stop-color="#5F8A71"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M21.133 69H4c-2 0-4-.146-4-4.078v-23.83l22.808-19.397 7.515 1.218L35 19.09l4.05-2.847 10.88 1.975 4.671 13.71-12.054 16.98L21.133 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><path fill="#000" d="M42.676 50.887c-.43.304-.876.59-1.34.86C38.753 53.25 35.93 54 32.87 54c-3.06 0-5.883-.75-8.467-2.253a16.757 16.757 0 0 1-6.14-6.112C16.754 43.06 16 40.25 16 37.203c0-3.047.754-5.857 2.262-8.43a16.757 16.757 0 0 1 6.14-6.113c2.428-1.411 5.066-2.16 7.915-2.245-.585.74-1.11 1.83-1.576 3.27l-.003.002a.587.587 0 0 0-.12.252.14.14 0 0 0 .017.085c-.092.302-.182.618-.27.948a3.21 3.21 0 0 1-.307-.016l-.22-.022c-.059 0-.176.015-.352.044a1.64 1.64 0 0 1-.45.022.409.409 0 0 1-.296-.175c-.059-.117-.059-.263 0-.438.014-.058.044-.073.088-.043a3.287 3.287 0 0 1-.242-.208 2.141 2.141 0 0 0-.22-.186c-.673.219-1.362.518-2.064.897a.543.543 0 0 0 .263-.022c.073-.03.169-.077.286-.142.117-.066.19-.106.22-.12.497-.205.805-.256.922-.154l.11-.11c.205.234.351.416.439.548-.103-.059-.322-.066-.659-.022-.293.087-.454.175-.483.262.102.175.139.306.11.394a3.426 3.426 0 0 1-.253-.219 1.741 1.741 0 0 0-.318-.24.88.88 0 0 0-.33-.11c-.234 0-.395.007-.483.022a13.836 13.836 0 0 0-5.162 4.855c.103.102.19.16.264.175.058.015.095.08.11.197a.835.835 0 0 0 .054.24c.022.044.107.023.253-.065.132.117.154.255.066.416.015-.015.337.182.966.59.279.248.432.401.462.46.044.16-.03.291-.22.393a1.12 1.12 0 0 0-.198-.197c-.117-.102-.183-.131-.197-.087-.044.073-.04.208.01.404.052.197.129.288.231.274-.102 0-.172.116-.208.35a5.03 5.03 0 0 0-.055.776c0 .284-.008.456-.022.514l.044.022c-.044.175-.004.426.12.754.125.329.282.47.473.427-.19.044-.044.357.439.94.088.117.146.183.176.197.044.03.131.084.263.164s.242.153.33.219a.934.934 0 0 1 .22.23c.058.072.131.236.219.492.088.255.19.426.308.514-.03.087.04.233.208.437.169.204.245.372.23.503a.107.107 0 0 0-.054.022.107.107 0 0 1-.055.022c.044.102.157.204.34.306.184.102.297.197.34.284.016.044.03.117.045.219a.802.802 0 0 0 .066.24c.029.059.088.073.175.044.03-.291-.146-.743-.527-1.356a17.95 17.95 0 0 1-.373-.634 1.254 1.254 0 0 1-.12-.339 1.662 1.662 0 0 0-.1-.317c.03 0 .073.01.132.033.059.022.12.047.187.076.066.03.12.059.164.088.044.029.06.05.044.065-.044.102-.029.23.044.383.074.153.161.288.264.405a30.038 30.038 0 0 0 .637.7c.088.087.19.23.307.426.118.197.118.295 0 .295.132 0 .279.073.44.22.16.145.285.29.373.436.073.117.132.307.176.57.044.262.08.437.11.524.029.102.091.2.186.295.096.095.187.164.275.208l.351.175.286.153c.073.03.209.106.406.23.198.124.355.207.473.251.146.059.263.088.35.088.089 0 .195-.019.32-.055a3.67 3.67 0 0 1 .296-.077c.22-.029.432.08.637.329.205.247.359.4.461.459.527.277.93.357 1.208.24-.029.015-.025.07.011.164.037.095.095.208.176.34a21.426 21.426 0 0 0 .318.502c.074.088.205.197.396.328.19.132.322.241.395.329.088-.059.14-.124.154-.197-.044.116.007.262.154.437.146.175.278.248.395.219.205-.044.308-.277.308-.7-.454.219-.813.087-1.077-.394a.425.425 0 0 0-.055-.12 1.39 1.39 0 0 1-.142-.372.309.309 0 0 1 0-.164c.014-.044.05-.065.11-.065.131 0 .204-.026.22-.077.014-.051 0-.142-.045-.273a4.395 4.395 0 0 1-.088-.285c-.014-.116-.095-.262-.241-.437a5.832 5.832 0 0 1-.264-.328c-.073.131-.19.19-.351.175-.161-.015-.279-.08-.352-.197a.601.601 0 0 1-.033.12.518.518 0 0 0-.033.142c-.19 0-.3-.007-.33-.021.016-.044.034-.172.056-.383.022-.212.047-.376.077-.492.014-.059.055-.146.12-.263.066-.116.121-.222.165-.317.044-.095.073-.186.088-.273.015-.088-.018-.157-.099-.208-.08-.051-.208-.07-.384-.055-.278.015-.469.16-.571.438a4.52 4.52 0 0 0-.066.23.74.74 0 0 1-.11.25.546.546 0 0 1-.198.154c-.102.044-.278.058-.527.044-.249-.015-.424-.051-.527-.11-.19-.116-.355-.328-.494-.634-.14-.306-.209-.576-.209-.81 0-.145.018-.338.055-.579.037-.24.059-.422.066-.546.005-.083-.035-.262-.12-.536l.623-4.406c1.345 3.236 3.548 6.64 5.82 9.583a.238.238 0 0 0-.03.034 1.084 1.084 0 0 0-.132.262 1.32 1.32 0 0 1-.11.241c-.029-.058-.113-.106-.252-.142-.14-.037-.209-.077-.209-.12.03.145.059.4.088.765.03.365.066.642.11.831.102.452.014.802-.264 1.05-.395.364-.608.656-.637.875-.058.32.03.51.264.568 0 .102-.059.252-.176.449-.117.197-.168.353-.154.47 0 .087.015.204.044.35 1.724-.3 3.302-.878 4.734-1.735a39.265 39.265 0 0 0 2.635 2.64zm.189-3.11C33.85 34.856 32.178 33.53 32.178 28.78 32.178 22.274 37.511 17 44.089 17 50.667 17 56 22.274 56 28.78c0 4.749-1.673 6.075-10.687 18.998a1.5 1.5 0 0 1-2.448 0zM43.92 35c3.56 0 6.446-2.892 6.446-6.46s-2.886-6.46-6.446-6.46c-3.56 0-6.447 2.892-6.447 6.46S40.36 35 43.921 35z" opacity=".241"/><path fill="#FFF" d="M42.676 48.887c-.43.304-.876.59-1.34.86C38.753 51.25 35.93 52 32.87 52c-3.06 0-5.883-.75-8.467-2.253a16.757 16.757 0 0 1-6.14-6.112C16.754 41.06 16 38.25 16 35.203c0-3.047.754-5.857 2.262-8.43a16.757 16.757 0 0 1 6.14-6.113c2.428-1.411 5.066-2.16 7.915-2.245-.585.74-1.11 1.83-1.576 3.27l-.003.002a.587.587 0 0 0-.12.252.14.14 0 0 0 .017.085c-.092.302-.182.618-.27.948a3.21 3.21 0 0 1-.307-.016l-.22-.022c-.059 0-.176.015-.352.044a1.64 1.64 0 0 1-.45.022.409.409 0 0 1-.296-.175c-.059-.117-.059-.263 0-.438.014-.058.044-.073.088-.043a3.287 3.287 0 0 1-.242-.208 2.141 2.141 0 0 0-.22-.186c-.673.219-1.362.518-2.064.897a.543.543 0 0 0 .263-.022c.073-.03.169-.077.286-.142.117-.066.19-.106.22-.12.497-.205.805-.256.922-.154l.11-.11c.205.234.351.416.439.548-.103-.059-.322-.066-.659-.022-.293.087-.454.175-.483.262.102.175.139.306.11.394a3.426 3.426 0 0 1-.253-.219 1.741 1.741 0 0 0-.318-.24.88.88 0 0 0-.33-.11c-.234 0-.395.007-.483.022a13.836 13.836 0 0 0-5.162 4.855c.103.102.19.16.264.175.058.015.095.08.11.197a.835.835 0 0 0 .054.24c.022.044.107.023.253-.065.132.117.154.255.066.416.015-.015.337.182.966.59.279.248.432.401.462.46.044.16-.03.291-.22.393a1.12 1.12 0 0 0-.198-.197c-.117-.102-.183-.131-.197-.087-.044.073-.04.208.01.404.052.197.129.288.231.274-.102 0-.172.116-.208.35a5.03 5.03 0 0 0-.055.776c0 .284-.008.456-.022.514l.044.022c-.044.175-.004.426.12.754.125.329.282.47.473.427-.19.044-.044.357.439.94.088.117.146.183.176.197.044.03.131.084.263.164s.242.153.33.219a.934.934 0 0 1 .22.23c.058.072.131.236.219.492.088.255.19.426.308.514-.03.087.04.233.208.437.169.204.245.372.23.503a.107.107 0 0 0-.054.022.107.107 0 0 1-.055.022c.044.102.157.204.34.306.184.102.297.197.34.284.016.044.03.117.045.219a.802.802 0 0 0 .066.24c.029.059.088.073.175.044.03-.291-.146-.743-.527-1.356a17.95 17.95 0 0 1-.373-.634 1.254 1.254 0 0 1-.12-.339 1.662 1.662 0 0 0-.1-.317c.03 0 .073.01.132.033.059.022.12.047.187.076.066.03.12.059.164.088.044.029.06.05.044.065-.044.102-.029.23.044.383.074.153.161.288.264.405a30.038 30.038 0 0 0 .637.7c.088.087.19.23.307.426.118.197.118.295 0 .295.132 0 .279.073.44.22.16.145.285.29.373.436.073.117.132.307.176.57.044.262.08.437.11.524.029.102.091.2.186.295.096.095.187.164.275.208l.351.175.286.153c.073.03.209.106.406.23.198.124.355.207.473.251.146.059.263.088.35.088.089 0 .195-.019.32-.055a3.67 3.67 0 0 1 .296-.077c.22-.029.432.08.637.329.205.247.359.4.461.459.527.277.93.357 1.208.24-.029.015-.025.07.011.164.037.095.095.208.176.34a21.426 21.426 0 0 0 .318.502c.074.088.205.197.396.328.19.132.322.241.395.329.088-.059.14-.124.154-.197-.044.116.007.262.154.437.146.175.278.248.395.219.205-.044.308-.277.308-.7-.454.219-.813.087-1.077-.394a.425.425 0 0 0-.055-.12 1.39 1.39 0 0 1-.142-.372.309.309 0 0 1 0-.164c.014-.044.05-.065.11-.065.131 0 .204-.026.22-.077.014-.051 0-.142-.045-.273a4.395 4.395 0 0 1-.088-.285c-.014-.116-.095-.262-.241-.437a5.832 5.832 0 0 1-.264-.328c-.073.131-.19.19-.351.175-.161-.015-.279-.08-.352-.197a.601.601 0 0 1-.033.12.518.518 0 0 0-.033.142c-.19 0-.3-.007-.33-.021.016-.044.034-.172.056-.383.022-.212.047-.376.077-.492.014-.059.055-.146.12-.263.066-.116.121-.222.165-.317.044-.095.073-.186.088-.273.015-.088-.018-.157-.099-.208-.08-.051-.208-.07-.384-.055-.278.015-.469.16-.571.438a4.52 4.52 0 0 0-.066.23.74.74 0 0 1-.11.25.546.546 0 0 1-.198.154c-.102.044-.278.058-.527.044-.249-.015-.424-.051-.527-.11-.19-.116-.355-.328-.494-.634-.14-.306-.209-.576-.209-.81 0-.145.018-.338.055-.579.037-.24.059-.422.066-.546.005-.083-.035-.262-.12-.536l.623-4.406c1.345 3.236 3.548 6.64 5.82 9.583a.238.238 0 0 0-.03.034 1.084 1.084 0 0 0-.132.262 1.32 1.32 0 0 1-.11.241c-.029-.058-.113-.106-.252-.142-.14-.037-.209-.077-.209-.12.03.145.059.4.088.765.03.365.066.642.11.831.102.452.014.802-.264 1.05-.395.364-.608.656-.637.875-.058.32.03.51.264.568 0 .102-.059.252-.176.449-.117.197-.168.353-.154.47 0 .087.015.204.044.35 1.724-.3 3.302-.878 4.734-1.735a39.265 39.265 0 0 0 2.635 2.64zm.189-3.11C33.85 32.856 32.178 31.53 32.178 26.78 32.178 20.274 37.511 15 44.089 15 50.667 15 56 20.274 56 26.78c0 4.749-1.673 6.075-10.687 18.998a1.5 1.5 0 0 1-2.448 0zM43.92 33c3.56 0 6.446-2.892 6.446-6.46s-2.886-6.46-6.446-6.46c-3.56 0-6.447 2.892-6.447 6.46S40.36 33 43.921 33z"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M30.439.813A18.546 18.546 0 0 0 25.001 0C19.47 0 14.52 2.423 11.22 6.23l8.504 6.934L30.439.813Z" fill="#1A73E8"/><path d="M11.217 6.23C8.587 9.262 7 13.175 7 17.443c0 3.282.675 5.94 1.783 8.321l10.938-12.6-8.504-6.934Z" fill="#EA4335"/><path d="M25.003 10.774c3.804 0 6.885 2.987 6.885 6.673 0 1.64-.612 3.145-1.626 4.306 0 0 5.437-6.268 10.715-12.347-2.18-4.064-5.96-7.19-10.532-8.593l-10.723 12.35a6.954 6.954 0 0 1 5.281-2.389Z" fill="#4285F4"/><path d="M25.003 24.115c-3.803 0-6.885-2.987-6.885-6.673a6.55 6.55 0 0 1 1.603-4.283L8.783 25.763c1.869 4.019 4.978 7.244 8.18 11.307l13.294-15.318a6.957 6.957 0 0 1-5.254 2.363Z" fill="#FBBC04"/><path d="M29.994 41.252C35.998 32.152 43 28.021 43 17.443c0-2.9-.733-5.633-2.025-8.037L16.965 37.07a62.11 62.11 0 0 1 3.047 4.185C23.663 46.722 22.65 50 25.005 50c2.349 0 1.338-3.281 4.99-8.748Z" fill="#34A853"/></svg>
diff --git a/addons/website_hr_recruitment/static/description/icon.png b/addons/website_hr_recruitment/static/description/icon.png
index 7f1d37cc9e5..b984fef2a3a 100644
Binary files a/addons/website_hr_recruitment/static/description/icon.png and b/addons/website_hr_recruitment/static/description/icon.png differ
diff --git a/addons/website_hr_recruitment/static/description/icon.svg b/addons/website_hr_recruitment/static/description/icon.svg
index d4f967d9580..bed877cc081 100644
--- a/addons/website_hr_recruitment/static/description/icon.svg
+++ b/addons/website_hr_recruitment/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="98.162%" x2="0%" y1="1.838%" y2="100%"><stop offset="0%" stop-color="#797DA5"/><stop offset="50.799%" stop-color="#6D7194"/><stop offset="100%" stop-color="#626584"/></linearGradient><path id="d" d="M21.98 54.23h26.04V25.582h-2.603v-3.906a3.906 3.906 0 0 0-3.907-3.906H28.49a3.906 3.906 0 0 0-3.907 3.906v3.906H21.98V54.23zm7.812-31.25h10.416v2.603H29.792V22.98zm26.041 6.51v20.833a3.906 3.906 0 0 1-3.906 3.906h-1.302V25.583h1.302a3.906 3.906 0 0 1 3.906 3.907zM19.375 54.23h-1.302a3.906 3.906 0 0 1-3.906-3.907V29.49a3.906 3.906 0 0 1 3.906-3.907h1.302V54.23z"/><path id="e" d="M21.98 52.23h26.04V23.582h-2.603v-3.906a3.906 3.906 0 0 0-3.907-3.906H28.49a3.906 3.906 0 0 0-3.907 3.906v3.906H21.98V52.23zm7.812-31.25h10.416v2.603H29.792V20.98zm26.041 6.51v20.833a3.906 3.906 0 0 1-3.906 3.906h-1.302V23.583h1.302a3.906 3.906 0 0 1 3.906 3.907zM19.375 52.23h-1.302a3.906 3.906 0 0 1-3.906-3.907V27.49a3.906 3.906 0 0 1 3.906-3.907h1.302V52.23z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M43.024 69H4c-2 0-4-.146-4-4.078v-22.77l15-15.976L26 17h18v7.137h8l4 25.49L43.024 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M0 21a4 4 0 0 1 4-4h46v21a4 4 0 0 1-4 4H0V21Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path d="M0 21a4 4 0 0 1 4-4h46v21a4 4 0 0 1-4 4H0V21Z" fill="url(#o_icon_website_hr_recruitment__a)" fill-opacity=".2"/><path d="M0 21a4 4 0 0 1 4-4h21v25H0V21Z" fill="var(--o-icons-teal-teal, #00A079)"/><path d="M0 21a4 4 0 0 1 4-4h21v25H0V21Z" fill="url(#o_icon_website_hr_recruitment__b)" fill-opacity=".2"/><path d="M34 17a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M34 17a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" fill="url(#o_icon_website_hr_recruitment__c)" fill-opacity=".2"/><path d="M25 17h-9a9 9 0 0 0 9 9v-9Z" fill="var(--o-icons-purple-teal, #003458)"/><path d="M25 17h-9a9 9 0 0 0 9 9v-9Z" fill="url(#o_icon_website_hr_recruitment__d)" fill-opacity=".3"/><defs><linearGradient id="o_icon_website_hr_recruitment__a" x1="0" y1="17" x2="50" y2="42" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_hr_recruitment__b" x1="0" y1="17" x2="29.412" y2="24.353" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_hr_recruitment__c" x1="16" y1="8" x2="37.176" y2="13.294" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_hr_recruitment__d" x1="16" y1="17" x2="26.588" y2="19.647" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/website_hr_recruitment/views/hr_job_views.xml b/addons/website_hr_recruitment/views/hr_job_views.xml
index 91644f56624..303c5316ca6 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="bg-odoo">Published</span>
+                    <span class="text-bg-success">Published</span>
                 </div>
             </xpath>
             <xpath expr="//div[@name='kanban_boxes']" position="attributes">
diff --git a/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml b/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml
index cc96cc52b46..82e3b9c3bd6 100644
--- a/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml
+++ b/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml
@@ -311,7 +311,7 @@
                     </section>
                     <section class="col-12 col-md-3 ps-5">
                         <a role="button" t-attf-href="/jobs/detail/#{slug(job)}" class="btn btn-outline-primary btn-lg mb16 o_apply_description_link">
-                            <i class="fa fa-arrow-left"></i> Job Description
+                            <i class="oi oi-arrow-left"></i> Job Description
                         </a>
                         <div t-if="job.name" class="d-flex flex-column align-items-baseline">
                             <span class="text-muted small">Job</span>
diff --git a/addons/website_links/static/description/icon.png b/addons/website_links/static/description/icon.png
index 93fd625f011..a4eb0c8c886 100644
Binary files a/addons/website_links/static/description/icon.png and b/addons/website_links/static/description/icon.png differ
diff --git a/addons/website_links/static/description/icon.svg b/addons/website_links/static/description/icon.svg
index a50e7136a33..d9e7178c247 100644
--- a/addons/website_links/static/description/icon.svg
+++ b/addons/website_links/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#DA956B"/><stop offset="100%" stop-color="#CC7039"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><g><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/></g><path fill="#393939" d="M4 69c-2 0-4-.146-4-4.074l-.374-15.924 20.62-23.304 3.816-3.623.958 1.178 4.235-5.2 5.776-3.22 8.058 7.495-.939 5.116 4.72-.59 8.557 9.214L32.62 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><path fill="#000" d="M47.855 45.665l-.068.117a16.426 16.426 0 0 1-6.005 6.005C39.254 53.262 36.493 54 33.5 54c-2.993 0-5.754-.738-8.282-2.213a16.426 16.426 0 0 1-6.005-6.005C17.738 43.254 17 40.493 17 37.5c0-2.993.738-5.754 2.213-8.282a16.426 16.426 0 0 1 6.005-6.005c.16-.093.32-.183.481-.27l.776 2.75a13.543 13.543 0 0 0-4.62 4.524c.1.1.187.157.258.172.058.014.093.078.108.193a.823.823 0 0 0 .053.236c.022.043.104.022.247-.064.13.114.15.25.065.408.014-.014.33.18.945.58.272.244.423.394.451.451.043.158-.028.287-.214.387a1.099 1.099 0 0 0-.194-.193c-.114-.1-.179-.13-.193-.086-.043.071-.04.204.01.397.05.194.126.283.226.269-.1 0-.168.114-.204.344-.036.229-.054.483-.054.762 0 .28-.007.448-.021.505l.043.022c-.043.171-.004.419.118.74.122.323.276.463.462.42-.186.043-.043.35.43.924.086.114.143.179.172.193.042.029.128.082.257.161.13.079.237.15.323.215.086.064.157.14.214.226.058.071.13.232.215.483.086.25.186.419.301.505-.029.086.04.229.204.43.165.2.24.365.226.494a.104.104 0 0 0-.054.021.104.104 0 0 1-.054.022c.043.1.154.2.333.3.18.1.29.194.333.28.015.043.029.114.043.215a.79.79 0 0 0 .065.236c.028.057.086.071.172.043.028-.287-.144-.73-.516-1.332a17.652 17.652 0 0 1-.365-.623 1.235 1.235 0 0 1-.118-.333 1.638 1.638 0 0 0-.097-.312c.029 0 .072.01.129.032.057.022.118.047.182.076.065.028.119.057.162.086.043.028.057.05.043.064-.043.1-.03.226.043.376.071.15.157.283.257.397a29.466 29.466 0 0 0 .623.688c.086.086.187.226.301.419.115.193.115.29 0 .29.13 0 .272.072.43.215.157.143.28.286.365.43.072.114.129.3.172.558.043.258.079.43.107.516.029.1.09.197.183.29.093.093.183.16.269.204l.343.172.28.15c.071.029.204.104.397.226.193.121.347.204.462.247a.99.99 0 0 0 .344.086c.086 0 .19-.018.311-.054.122-.036.219-.06.29-.075.215-.029.423.079.623.322.2.244.351.394.452.451.515.272.909.351 1.181.237-.029.014-.025.068.01.16.037.094.094.205.173.334a21.063 21.063 0 0 0 .311.494c.072.086.2.193.387.322.186.129.315.236.387.322.086-.057.136-.121.15-.193-.043.115.007.258.15.43.144.172.273.243.387.215.2-.043.301-.273.301-.688-.444.215-.795.086-1.053-.387a.419.419 0 0 0-.053-.118 1.369 1.369 0 0 1-.14-.365.305.305 0 0 1 0-.161c.014-.043.05-.065.107-.065.13 0 .2-.025.215-.075.014-.05 0-.14-.043-.268a4.332 4.332 0 0 1-.086-.28c-.014-.114-.093-.258-.236-.43a5.725 5.725 0 0 1-.258-.322c-.071.13-.186.187-.344.172-.157-.014-.272-.079-.343-.193 0 .014-.011.054-.033.118a.511.511 0 0 0-.032.14c-.186 0-.293-.008-.322-.022a2.66 2.66 0 0 0 .054-.376c.021-.207.046-.369.075-.483.014-.057.054-.143.118-.258.064-.115.118-.218.161-.312.043-.093.072-.182.086-.268.014-.086-.018-.154-.097-.204-.078-.05-.204-.068-.376-.054-.272.014-.458.158-.558.43a4.456 4.456 0 0 0-.065.225.728.728 0 0 1-.107.247.535.535 0 0 1-.193.15c-.1.044-.273.058-.516.044-.244-.015-.415-.05-.516-.108-.186-.114-.347-.322-.483-.623-.136-.3-.204-.565-.204-.795 0-.143.018-.333.054-.569.035-.236.057-.415.064-.537.007-.122-.032-.297-.118-.526a1.09 1.09 0 0 0 .193-.205c.086-.107.158-.182.215-.225a.383.383 0 0 1 .097-.032.22.22 0 0 1 .096 0c.029.007.058-.004.086-.033a.272.272 0 0 0 .065-.128.64.64 0 0 0-.086-.065c-.043-.043-.072-.064-.086-.064.1.043.304.032.612-.033.308-.064.505-.053.591.033.215.157.372.143.473-.043a1.71 1.71 0 0 0-.054-.204c-.036-.122-.04-.219-.01-.29.07.386.279.45.622.193.043.043.154.079.333.107.18.029.305.065.376.108.043.028.093.068.15.118.058.05.097.082.119.097.021.014.057.01.107-.011a.648.648 0 0 0 .183-.14c.143.2.229.373.258.516.157.573.293.888.408.945.1.043.179.057.236.043.057-.014.09-.082.097-.204a2.084 2.084 0 0 0 0-.3 5.339 5.339 0 0 0-.032-.27l-.022-.171v-.387l-.021-.172c-.215-.043-.348-.129-.398-.258a.461.461 0 0 1 .032-.397c.072-.136.18-.269.323-.398a.701.701 0 0 1 .172-.075c.1-.036.21-.082.333-.14a.966.966 0 0 0 .268-.171c.3-.272.408-.523.322-.752.1 0 .18-.065.237-.194-.015 0-.05-.021-.108-.064a1.57 1.57 0 0 0-.16-.107.292.292 0 0 0-.097-.043c.08-.045.116-.107.107-.186 4.292 5.112 6.94 8.087 7.945 8.922.644.536 1.599.84 2.865.911zm-11.97 5.37c2.95-.515 5.464-1.869 7.54-4.06-.042-.043-.132-.076-.268-.097a.772.772 0 0 1-.268-.075 3.38 3.38 0 0 0-.516-.172.42.42 0 0 0-.054-.28.573.573 0 0 0-.172-.193 11.49 11.49 0 0 0-.268-.172 11.31 11.31 0 0 1-.236-.15 2.026 2.026 0 0 0-.15-.129 1.525 1.525 0 0 0-.312-.215c-.08-.043-.14-.057-.183-.043a.754.754 0 0 1-.215.022l-.064.021a.594.594 0 0 0-.118.054 1.76 1.76 0 0 1-.119.064.221.221 0 0 0-.086.065c-.014.021-.014.04 0 .054-.3-.244-.558-.402-.773-.473a.607.607 0 0 1-.236-.118 2.04 2.04 0 0 0-.226-.15.314.314 0 0 0-.215-.033.49.49 0 0 0-.247.15.514.514 0 0 0-.129.323 1.629 1.629 0 0 1-.043.279c-.1-.072-.1-.197 0-.376s.115-.311.043-.397c-.043-.086-.118-.119-.225-.097a.719.719 0 0 0-.258.097 4.128 4.128 0 0 0-.247.182c-.1.079-.165.126-.194.14-.028.014-.089.054-.182.118a.723.723 0 0 0-.183.161 1.067 1.067 0 0 0-.129.258 1.3 1.3 0 0 1-.107.236c-.029-.057-.111-.104-.247-.14-.136-.035-.204-.075-.204-.118.028.144.057.394.086.752.028.359.064.63.107.817.1.444.014.788-.258 1.031-.386.358-.594.645-.623.86-.057.315.029.5.258.558 0 .1-.057.247-.172.44-.114.194-.165.348-.15.462 0 .086.014.2.043.344zm16.851-15.059c0-.455-.158-.842-.474-1.16l-3.525-3.553a1.563 1.563 0 0 0-1.153-.478c-.474 0-.88.182-1.22.546.034.034.141.14.322.316.18.177.302.299.365.367.062.069.146.177.254.325.107.148.18.293.22.435.04.143.06.3.06.47 0 .455-.159.842-.475 1.161-.316.319-.7.478-1.153.478-.169 0-.324-.02-.466-.06a1.359 1.359 0 0 1-.432-.221 4.04 4.04 0 0 1-.322-.257c-.067-.062-.189-.185-.364-.367a46.78 46.78 0 0 0-.313-.324c-.373.353-.56.768-.56 1.246 0 .456.158.843.475 1.162l3.49 3.535c.306.307.69.46 1.153.46.452 0 .836-.147 1.152-.443l2.492-2.493c.316-.32.474-.7.474-1.145zm-11.913-12.04c0-.455-.158-.842-.475-1.16l-3.49-3.536a1.563 1.563 0 0 0-1.153-.478c-.44 0-.825.154-1.152.461l-2.491 2.494c-.317.318-.475.7-.475 1.144 0 .455.158.842.475 1.161l3.524 3.552c.305.308.69.461 1.153.461.474 0 .88-.176 1.22-.53l-.322-.315c-.18-.177-.302-.299-.364-.367a4.061 4.061 0 0 1-.255-.325 1.378 1.378 0 0 1-.22-.435 1.75 1.75 0 0 1-.06-.47c0-.455.159-.842.475-1.161.317-.319.7-.478 1.153-.478.169 0 .324.02.466.06.14.04.285.113.432.222.147.108.254.193.322.256.067.062.189.185.364.367l.314.324c.372-.353.559-.768.559-1.246zm15.167 12.04c0 1.367-.48 2.522-1.44 3.467l-2.492 2.493c-.938.945-2.084 1.418-3.44 1.418-1.367 0-2.52-.484-3.457-1.452l-3.49-3.535c-.939-.945-1.407-2.1-1.407-3.467 0-1.4.497-2.59 1.49-3.569l-1.49-1.503c-.972 1.002-2.147 1.503-3.525 1.503-1.356 0-2.508-.478-3.457-1.434l-3.525-3.552c-.95-.957-1.424-2.118-1.424-3.484s.48-2.522 1.44-3.467l2.492-2.493c.938-.945 2.084-1.418 3.44-1.418 1.367 0 2.52.484 3.457 1.452l3.491 3.535c.938.945 1.407 2.1 1.407 3.467 0 1.4-.498 2.59-1.492 3.569l1.492 1.503c.971-1.002 2.146-1.503 3.524-1.503 1.356 0 2.508.478 3.457 1.434l3.525 3.553c.95.956 1.424 2.117 1.424 3.483z" opacity=".3"/><path fill="#FFF" d="M47.855 43.665l-.068.117a16.426 16.426 0 0 1-6.005 6.005C39.254 51.262 36.493 52 33.5 52c-2.993 0-5.754-.738-8.282-2.213a16.426 16.426 0 0 1-6.005-6.005C17.738 41.254 17 38.493 17 35.5c0-2.993.738-5.754 2.213-8.282a16.426 16.426 0 0 1 6.005-6.005c.16-.093.32-.183.481-.27l.776 2.75a13.543 13.543 0 0 0-4.62 4.524c.1.1.187.157.258.172.058.014.093.078.108.193a.823.823 0 0 0 .053.236c.022.043.104.022.247-.064.13.114.15.25.065.408.014-.014.33.18.945.58.272.244.423.394.451.451.043.158-.028.287-.214.387a1.099 1.099 0 0 0-.194-.193c-.114-.1-.179-.13-.193-.086-.043.071-.04.204.01.397.05.194.126.283.226.269-.1 0-.168.114-.204.344-.036.229-.054.483-.054.762 0 .28-.007.448-.021.505l.043.022c-.043.171-.004.419.118.74.122.323.276.463.462.42-.186.043-.043.35.43.924.086.114.143.179.172.193.042.029.128.082.257.161.13.079.237.15.323.215.086.064.157.14.214.226.058.071.13.232.215.483.086.25.186.419.301.505-.029.086.04.229.204.43.165.2.24.365.226.494a.104.104 0 0 0-.054.021.104.104 0 0 1-.054.022c.043.1.154.2.333.3.18.1.29.194.333.28.015.043.029.114.043.215a.79.79 0 0 0 .065.236c.028.057.086.071.172.043.028-.287-.144-.73-.516-1.332a17.652 17.652 0 0 1-.365-.623 1.235 1.235 0 0 1-.118-.333 1.638 1.638 0 0 0-.097-.312c.029 0 .072.01.129.032.057.022.118.047.182.076.065.028.119.057.162.086.043.028.057.05.043.064-.043.1-.03.226.043.376.071.15.157.283.257.397a29.466 29.466 0 0 0 .623.688c.086.086.187.226.301.419.115.193.115.29 0 .29.13 0 .272.072.43.215.157.143.28.286.365.43.072.114.129.3.172.558.043.258.079.43.107.516.029.1.09.197.183.29.093.093.183.16.269.204l.343.172.28.15c.071.029.204.104.397.226.193.121.347.204.462.247a.99.99 0 0 0 .344.086c.086 0 .19-.018.311-.054.122-.036.219-.06.29-.075.215-.029.423.079.623.322.2.244.351.394.452.451.515.272.909.351 1.181.237-.029.014-.025.068.01.16.037.094.094.205.173.334a21.063 21.063 0 0 0 .311.494c.072.086.2.193.387.322.186.129.315.236.387.322.086-.057.136-.121.15-.193-.043.115.007.258.15.43.144.172.273.243.387.215.2-.043.301-.273.301-.688-.444.215-.795.086-1.053-.387a.419.419 0 0 0-.053-.118 1.369 1.369 0 0 1-.14-.365.305.305 0 0 1 0-.161c.014-.043.05-.065.107-.065.13 0 .2-.025.215-.075.014-.05 0-.14-.043-.268a4.332 4.332 0 0 1-.086-.28c-.014-.114-.093-.258-.236-.43a5.725 5.725 0 0 1-.258-.322c-.071.13-.186.187-.344.172-.157-.014-.272-.079-.343-.193 0 .014-.011.054-.033.118a.511.511 0 0 0-.032.14c-.186 0-.293-.008-.322-.022a2.66 2.66 0 0 0 .054-.376c.021-.207.046-.369.075-.483.014-.057.054-.143.118-.258.064-.115.118-.218.161-.312.043-.093.072-.182.086-.268.014-.086-.018-.154-.097-.204-.078-.05-.204-.068-.376-.054-.272.014-.458.158-.558.43a4.456 4.456 0 0 0-.065.225.728.728 0 0 1-.107.247.535.535 0 0 1-.193.15c-.1.044-.273.058-.516.044-.244-.015-.415-.05-.516-.108-.186-.114-.347-.322-.483-.623-.136-.3-.204-.565-.204-.795 0-.143.018-.333.054-.569.035-.236.057-.415.064-.537.007-.122-.032-.297-.118-.526a1.09 1.09 0 0 0 .193-.205c.086-.107.158-.182.215-.225a.383.383 0 0 1 .097-.032.22.22 0 0 1 .096 0c.029.007.058-.004.086-.033a.272.272 0 0 0 .065-.128.64.64 0 0 0-.086-.065c-.043-.043-.072-.064-.086-.064.1.043.304.032.612-.033.308-.064.505-.053.591.033.215.157.372.143.473-.043a1.71 1.71 0 0 0-.054-.204c-.036-.122-.04-.219-.01-.29.07.386.279.45.622.193.043.043.154.079.333.107.18.029.305.065.376.108.043.028.093.068.15.118.058.05.097.082.119.097.021.014.057.01.107-.011a.648.648 0 0 0 .183-.14c.143.2.229.373.258.516.157.573.293.888.408.945.1.043.179.057.236.043.057-.014.09-.082.097-.204a2.084 2.084 0 0 0 0-.3 5.339 5.339 0 0 0-.032-.27l-.022-.171v-.387l-.021-.172c-.215-.043-.348-.129-.398-.258a.461.461 0 0 1 .032-.397c.072-.136.18-.269.323-.398a.701.701 0 0 1 .172-.075c.1-.036.21-.082.333-.14a.966.966 0 0 0 .268-.171c.3-.272.408-.523.322-.752.1 0 .18-.065.237-.194-.015 0-.05-.021-.108-.064a1.57 1.57 0 0 0-.16-.107.292.292 0 0 0-.097-.043c.08-.045.116-.107.107-.186 4.292 5.112 6.94 8.087 7.945 8.922.644.536 1.599.84 2.865.911zm-11.97 5.37c2.95-.515 5.464-1.869 7.54-4.06-.042-.043-.132-.076-.268-.097a.772.772 0 0 1-.268-.075 3.38 3.38 0 0 0-.516-.172.42.42 0 0 0-.054-.28.573.573 0 0 0-.172-.193 11.49 11.49 0 0 0-.268-.172 11.31 11.31 0 0 1-.236-.15 2.026 2.026 0 0 0-.15-.129 1.525 1.525 0 0 0-.312-.215c-.08-.043-.14-.057-.183-.043a.754.754 0 0 1-.215.022l-.064.021a.594.594 0 0 0-.118.054 1.76 1.76 0 0 1-.119.064.221.221 0 0 0-.086.065c-.014.021-.014.04 0 .054-.3-.244-.558-.402-.773-.473a.607.607 0 0 1-.236-.118 2.04 2.04 0 0 0-.226-.15.314.314 0 0 0-.215-.033.49.49 0 0 0-.247.15.514.514 0 0 0-.129.323 1.629 1.629 0 0 1-.043.279c-.1-.072-.1-.197 0-.376s.115-.311.043-.397c-.043-.086-.118-.119-.225-.097a.719.719 0 0 0-.258.097 4.128 4.128 0 0 0-.247.182c-.1.079-.165.126-.194.14-.028.014-.089.054-.182.118a.723.723 0 0 0-.183.161 1.067 1.067 0 0 0-.129.258 1.3 1.3 0 0 1-.107.236c-.029-.057-.111-.104-.247-.14-.136-.035-.204-.075-.204-.118.028.144.057.394.086.752.028.359.064.63.107.817.1.444.014.788-.258 1.031-.386.358-.594.645-.623.86-.057.315.029.5.258.558 0 .1-.057.247-.172.44-.114.194-.165.348-.15.462 0 .086.014.2.043.344zm16.851-15.059c0-.455-.158-.842-.474-1.16l-3.525-3.553a1.563 1.563 0 0 0-1.153-.478c-.474 0-.88.182-1.22.546.034.034.141.14.322.316.18.177.302.299.365.367.062.069.146.177.254.325.107.148.18.293.22.435.04.143.06.3.06.47 0 .455-.159.842-.475 1.161-.316.319-.7.478-1.153.478-.169 0-.324-.02-.466-.06a1.359 1.359 0 0 1-.432-.221 4.04 4.04 0 0 1-.322-.257c-.067-.062-.189-.185-.364-.367a46.78 46.78 0 0 0-.313-.324c-.373.353-.56.768-.56 1.246 0 .456.158.843.475 1.162l3.49 3.535c.306.307.69.46 1.153.46.452 0 .836-.147 1.152-.443l2.492-2.493c.316-.32.474-.7.474-1.145zm-11.913-12.04c0-.455-.158-.842-.475-1.16l-3.49-3.536a1.563 1.563 0 0 0-1.153-.478c-.44 0-.825.154-1.152.461l-2.491 2.494c-.317.318-.475.7-.475 1.144 0 .455.158.842.475 1.161l3.524 3.552c.305.308.69.461 1.153.461.474 0 .88-.176 1.22-.53l-.322-.315c-.18-.177-.302-.299-.364-.367a4.061 4.061 0 0 1-.255-.325 1.378 1.378 0 0 1-.22-.435 1.75 1.75 0 0 1-.06-.47c0-.455.159-.842.475-1.161.317-.319.7-.478 1.153-.478.169 0 .324.02.466.06.14.04.285.113.432.222.147.108.254.193.322.256.067.062.189.185.364.367l.314.324c.372-.353.559-.768.559-1.246zm15.167 12.04c0 1.367-.48 2.522-1.44 3.467l-2.492 2.493c-.938.945-2.084 1.418-3.44 1.418-1.367 0-2.52-.484-3.457-1.452l-3.49-3.535c-.939-.945-1.407-2.1-1.407-3.467 0-1.4.497-2.59 1.49-3.569l-1.49-1.503c-.972 1.002-2.147 1.503-3.525 1.503-1.356 0-2.508-.478-3.457-1.434l-3.525-3.552c-.95-.957-1.424-2.118-1.424-3.484s.48-2.522 1.44-3.467l2.492-2.493c.938-.945 2.084-1.418 3.44-1.418 1.367 0 2.52.484 3.457 1.452l3.491 3.535c.938.945 1.407 2.1 1.407 3.467 0 1.4-.498 2.59-1.492 3.569l1.492 1.503c.971-1.002 2.146-1.503 3.524-1.503 1.356 0 2.508.478 3.457 1.434l3.525 3.553c.95.956 1.424 2.117 1.424 3.483z"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M.983 23.814a3.356 3.356 0 0 1 0-4.746L11.068 8.983a3.356 3.356 0 0 1 4.746 0l17.203 17.203a3.356 3.356 0 0 1 0 4.746L22.932 41.017a3.356 3.356 0 0 1-4.746 0L.983 23.814Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M.983 23.814a3.356 3.356 0 0 1 0-4.746L11.068 8.983a3.356 3.356 0 0 1 4.746 0l17.203 17.203a3.356 3.356 0 0 1 0 4.746L22.932 41.017a3.356 3.356 0 0 1-4.746 0L.983 23.814Z" fill="url(#o_icon_website_links__a)" fill-opacity=".2"/><path d="M16.983 19.068a3.356 3.356 0 0 0 0 4.746l4.53 4.53 7.063-6.598 4.441 4.44a3.356 3.356 0 0 1 0 4.747L28.56 35.39l5.627 5.627a3.356 3.356 0 0 0 4.746 0l10.085-10.085a3.356 3.356 0 0 0 0-4.746L31.814 8.983a3.356 3.356 0 0 0-4.746 0L16.983 19.068Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M16.983 19.068a3.356 3.356 0 0 0 0 4.746l4.53 4.53 7.063-6.598 4.441 4.44a3.356 3.356 0 0 1 0 4.747L28.56 35.39l5.627 5.627a3.356 3.356 0 0 0 4.746 0l10.085-10.085a3.356 3.356 0 0 0 0-4.746L31.814 8.983a3.356 3.356 0 0 0-4.746 0L16.983 19.068Z" fill="url(#o_icon_website_links__b)" fill-opacity=".2"/><defs><linearGradient id="o_icon_website_links__a" x1="0" y1="8" x2="40" y2="18" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_links__b" x1="16" y1="8" x2="56" y2="18" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/website_livechat/static/description/icon.png b/addons/website_livechat/static/description/icon.png
index f73afe2f192..34f9444288c 100644
Binary files a/addons/website_livechat/static/description/icon.png and b/addons/website_livechat/static/description/icon.png differ
diff --git a/addons/website_livechat/static/description/icon.svg b/addons/website_livechat/static/description/icon.svg
index f608435ba51..c458b22e5e5 100644
--- a/addons/website_livechat/static/description/icon.svg
+++ b/addons/website_livechat/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#CD7690"/><stop offset="100%" stop-color="#CA5377"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M42.103 69H4c-2 0-4-.145-4-4.07V41.395L20 19.14C23.333 15.07 28.333 11 35 11s11.667 7.801 17 17.298v8.14h2V48.65l-2.635 1.09L51 54.754 42.103 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><path fill="#000" d="M35.096 13C25.103 13 18 21.103 18 31.096V35c-1.333 0-2 .667-2 2v8.171C16 48.51 18.662 51 22 51h2c1.333 0 2-.667 2-2V37c0-1.333-.667-2-2-2h-2.979v-3.904c0-7.781 6.294-14.075 14.075-14.075C42.878 17.021 49 23.315 49 31.096V35h-3c-1.333 0-2 .667-2 2v12c0 1.333.667 2 2 2h3c.667 1.333.667 2.667 0 4h-9c0-.667-.328-1-.984-1H36c-.667 0-1 .333-1 1v1c.064.667.398 1 1 1h13c2 0 3-2 3-6 2 0 3-2 3-6v-8c0-1.333-1-2-3-2v-3.904C52 21.103 45.09 13 35.096 13z" opacity=".3"/><path fill="#FFF" d="M35.096 11C25.103 11 18 19.103 18 29.096V33c-1.333 0-2 .667-2 2v8.171C16 46.51 18.662 49 22 49h2c1.333 0 2-.667 2-2V35c0-1.333-.667-2-2-2h-2.979v-3.904c0-7.781 6.294-14.075 14.075-14.075C42.878 15.021 49 21.315 49 29.096V33h-3c-1.333 0-2 .667-2 2v12c0 1.333.667 2 2 2h3c.667 1.333.667 2.667 0 4h-9c0-.667-.328-1-.984-1H36c-.667 0-1 .333-1 1v1c.064.667.398 1 1 1h13c2 0 3-2 3-6 2 0 3-2 3-6v-8c0-1.333-1-2-3-2v-3.904C52 19.103 45.09 11 35.096 11z"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M4 26.222C4 27.204 4.796 28 5.778 28H16c6.627 0 12-5.373 12-12S22.627 4 16 4 4 9.373 4 16v10.222Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M4 26.222C4 27.204 4.796 28 5.778 28H16c6.627 0 12-5.373 12-12S22.627 4 16 4 4 9.373 4 16v10.222Z" fill="url(#o_icon_website_livechat__a)" fill-opacity=".2"/><path d="M46 5.778C46 4.796 45.204 4 44.222 4H34c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12V5.778Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M46 5.778C46 4.796 45.204 4 44.222 4H34c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12V5.778Z" fill="url(#o_icon_website_livechat__b)" fill-opacity=".2"/><path d="M25 23.938c1.867-2.116 3-4.894 3-7.938 0-3.043-1.133-5.822-3-7.937A11.954 11.954 0 0 0 22 16c0 3.044 1.133 5.822 3 7.938Z" fill="var(--o-icons-purple-yellow, #912C18)"/><path d="M25 23.938c1.867-2.116 3-4.894 3-7.938 0-3.043-1.133-5.822-3-7.937A11.954 11.954 0 0 0 22 16c0 3.044 1.133 5.822 3 7.938Z" fill="url(#o_icon_website_livechat__c)" fill-opacity=".2"/><path d="M4 38.5C4 32.701 8.701 28 14.5 28S25 32.701 25 38.5V46H4v-7.5Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M4 38.5C4 32.701 8.701 28 14.5 28S25 32.701 25 38.5V46H4v-7.5Z" fill="url(#o_icon_website_livechat__d)" fill-opacity=".2"/><path d="M25 38.5C25 32.701 29.701 28 35.5 28S46 32.701 46 38.5V46H25v-7.5Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M25 38.5C25 32.701 29.701 28 35.5 28S46 32.701 46 38.5V46H25v-7.5Z" fill="url(#o_icon_website_livechat__e)" fill-opacity=".2"/><defs><linearGradient id="o_icon_website_livechat__a" x1="4" y1="4" x2="32.235" y2="11.059" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_livechat__b" x1="22" y1="4" x2="50.235" y2="11.059" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_livechat__c" x1="22" y1="8.063" x2="29.434" y2="8.765" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_livechat__d" x1="4" y1="28" x2="28.192" y2="35.056" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_livechat__e" x1="25" y1="28" x2="49.192" y2="35.056" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/website_livechat/static/src/core_ui/thread_patch.xml b/addons/website_livechat/static/src/core_ui/thread_patch.xml
index 278fefde23d..b217214ecfc 100644
--- a/addons/website_livechat/static/src/core_ui/thread_patch.xml
+++ b/addons/website_livechat/static/src/core_ui/thread_patch.xml
@@ -7,7 +7,7 @@
                 <div class="o-website_livechat-VisitorBanner-sidebar me-2 d-flex justify-content-center">
                     <div class="o-website_livechat-VisitorBanner-avatar mx-1 position-relative">
                         <img class="w-100 h-100 rounded-circle" t-att-src="threadService.avatarUrl(visitor, props.thread)" alt="Avatar"/>
-                        <ImStatus t-if="visitor.isConnected" persona="visitor" className="'bottom-0 end-0 position-absolute'"/>
+                        <ImStatus t-if="visitor.isConnected" persona="visitor"/>
                     </div>
                 </div>
                 <div>
diff --git a/addons/website_mass_mailing/static/description/icon.png b/addons/website_mass_mailing/static/description/icon.png
index eec78b19cc3..fab426357bc 100644
Binary files a/addons/website_mass_mailing/static/description/icon.png and b/addons/website_mass_mailing/static/description/icon.png differ
diff --git a/addons/website_mass_mailing/static/description/icon.svg b/addons/website_mass_mailing/static/description/icon.svg
index 30cfc7cd4a7..c67e3f2e3b4 100644
--- a/addons/website_mass_mailing/static/description/icon.svg
+++ b/addons/website_mass_mailing/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#CD7690"/><stop offset="100%" stop-color="#CA5377"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M29.423 69H4c-2 0-4-.146-4-4.078V40.993l22.445-18.95 7.33-3.392H53.22l1.443 1.761.245 15.702L29.423 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><path fill="#000" d="M48.592 44.35c-.31.781-.682 1.543-1.116 2.285a16.757 16.757 0 0 1-6.14 6.112C38.753 54.25 35.93 55 32.87 55c-3.06 0-5.883-.75-8.467-2.253a16.757 16.757 0 0 1-6.14-6.112C16.754 44.06 16 41.25 16 38.203c0-3.047.754-5.857 2.262-8.43a16.757 16.757 0 0 1 6.14-6.113c1.72-1 3.546-1.667 5.478-2.001v4.28l-.042-.005c-.059 0-.176.015-.352.044a1.64 1.64 0 0 1-.45.022.409.409 0 0 1-.296-.175c-.059-.117-.059-.263 0-.438.014-.058.044-.073.088-.043a3.287 3.287 0 0 1-.242-.208 2.141 2.141 0 0 0-.22-.186c-.673.219-1.362.518-2.064.897a.543.543 0 0 0 .263-.022c.073-.03.169-.077.286-.142.117-.066.19-.106.22-.12.497-.205.805-.256.922-.154l.11-.11c.205.234.351.416.439.548-.103-.059-.322-.066-.659-.022-.293.087-.454.175-.483.262.102.175.139.306.11.394a3.426 3.426 0 0 1-.253-.219 1.741 1.741 0 0 0-.318-.24.88.88 0 0 0-.33-.11c-.234 0-.395.007-.483.022a13.836 13.836 0 0 0-5.162 4.855c.103.102.19.16.264.175.058.015.095.08.11.197a.835.835 0 0 0 .054.24c.022.044.107.023.253-.065.132.117.154.255.066.416.015-.015.337.182.966.59.279.248.432.401.462.46.044.16-.03.291-.22.393a1.12 1.12 0 0 0-.198-.197c-.117-.102-.183-.131-.197-.087-.044.073-.04.208.01.404.052.197.129.288.231.274-.102 0-.172.116-.208.35a5.03 5.03 0 0 0-.055.776c0 .284-.008.456-.022.514l.044.022c-.044.175-.004.426.12.754.125.329.282.47.473.427-.19.044-.044.357.439.94.088.117.146.183.176.197.044.03.131.084.263.164s.242.153.33.219a.934.934 0 0 1 .22.23c.058.072.131.236.219.492.088.255.19.426.308.514-.03.087.04.233.208.437.169.204.245.372.23.503a.107.107 0 0 0-.054.022.107.107 0 0 1-.055.022c.044.102.157.204.34.306.184.102.297.197.34.284.016.044.03.117.045.219a.802.802 0 0 0 .066.24c.029.059.088.073.175.044.03-.291-.146-.743-.527-1.356a17.95 17.95 0 0 1-.373-.634 1.254 1.254 0 0 1-.12-.339 1.662 1.662 0 0 0-.1-.317c.03 0 .073.01.132.033.059.022.12.047.187.076.066.03.12.059.164.088.044.029.06.05.044.065-.044.102-.029.23.044.383.074.153.161.288.264.405a30.038 30.038 0 0 0 .637.7c.088.087.19.23.307.426.118.197.118.295 0 .295.132 0 .279.073.44.22.16.145.285.29.373.436.073.117.132.307.176.57.044.262.08.437.11.524.029.102.091.2.186.295.096.095.187.164.275.208l.351.175.286.153c.073.03.209.106.406.23.092.058.176.107.25.147v.302h1.75c.025.027.05.056.076.087.205.247.359.4.461.459.527.277.93.357 1.208.24-.029.015-.025.07.011.164.037.095.095.208.176.34a21.426 21.426 0 0 0 .318.502c.074.088.205.197.396.328.19.132.322.241.395.329.088-.059.14-.124.154-.197-.044.116.007.262.154.437.146.175.278.248.395.219.205-.044.308-.277.308-.7-.454.219-.813.087-1.077-.394a.425.425 0 0 0-.055-.12 1.39 1.39 0 0 1-.142-.372.309.309 0 0 1 0-.164c.014-.044.05-.065.11-.065.131 0 .204-.026.22-.077.014-.051 0-.142-.045-.273a4.395 4.395 0 0 1-.088-.285c-.014-.116-.095-.262-.241-.437a26.286 26.286 0 0 1-.017-.02h14.246zm-13.285 6.632c1.95-.34 3.714-1.036 5.291-2.088l-3.676-3.675c-.105.08-.168.135-.187.164a1.084 1.084 0 0 0-.132.262 1.32 1.32 0 0 1-.11.241c-.029-.058-.113-.106-.252-.142-.14-.037-.209-.077-.209-.12.03.145.059.4.088.765.03.365.066.642.11.831.102.452.014.802-.264 1.05-.395.364-.608.656-.637.875-.058.32.03.51.264.568 0 .102-.059.252-.176.449-.117.197-.168.353-.154.47 0 .087.015.204.044.35zM55 27.7v10.785c0 .598-.201 1.11-.603 1.535-.402.426-.886.639-1.45.639H34.053c-.565 0-1.049-.213-1.45-.639A2.156 2.156 0 0 1 32 38.486V27.701c.376.443.809.837 1.296 1.181 3.098 2.228 5.224 3.79 6.38 4.687.487.38.883.677 1.186.89.304.212.708.43 1.213.652.505.221.976.332 1.412.332h.026c.436 0 .907-.11 1.412-.332.505-.222.909-.44 1.213-.652.303-.213.7-.51 1.187-.89 1.454-1.114 3.585-2.676 6.392-4.687A7.216 7.216 0 0 0 55 27.701zm0-4.177c0 .715-.21 1.399-.629 2.051a6.297 6.297 0 0 1-1.566 1.67c-3.217 2.364-5.22 3.836-6.006 4.416-.086.063-.268.201-.546.414-.278.213-.509.385-.693.516-.184.131-.406.279-.667.442a3.793 3.793 0 0 1-.738.366 1.94 1.94 0 0 1-.642.123h-.026c-.197 0-.41-.041-.642-.123a3.793 3.793 0 0 1-.738-.366c-.26-.163-.483-.31-.667-.442a26.904 26.904 0 0 1-.693-.516c-.278-.213-.46-.351-.546-.414-.778-.58-1.9-1.406-3.362-2.48a592.34 592.34 0 0 1-2.631-1.935c-.53-.38-1.031-.904-1.502-1.57-.47-.665-.706-1.283-.706-1.853 0-.707.178-1.295.533-1.766.355-.471.862-.707 1.52-.707h18.893c.557 0 1.038.213 1.444.639.407.425.61.937.61 1.535z" opacity=".3"/><path fill="#FFF" d="M48.592 41.35c-.31.781-.682 1.543-1.116 2.285a16.757 16.757 0 0 1-6.14 6.112C38.753 51.25 35.93 52 32.87 52c-3.06 0-5.883-.75-8.467-2.253a16.757 16.757 0 0 1-6.14-6.112C16.754 41.06 16 38.25 16 35.203c0-3.047.754-5.857 2.262-8.43a16.757 16.757 0 0 1 6.14-6.113c1.72-1 3.546-1.667 5.478-2.001v4.28l-.042-.005c-.059 0-.176.015-.352.044a1.64 1.64 0 0 1-.45.022.409.409 0 0 1-.296-.175c-.059-.117-.059-.263 0-.438.014-.058.044-.073.088-.043a3.287 3.287 0 0 1-.242-.208 2.141 2.141 0 0 0-.22-.186c-.673.219-1.362.518-2.064.897a.543.543 0 0 0 .263-.022c.073-.03.169-.077.286-.142.117-.066.19-.106.22-.12.497-.205.805-.256.922-.154l.11-.11c.205.234.351.416.439.548-.103-.059-.322-.066-.659-.022-.293.087-.454.175-.483.262.102.175.139.306.11.394a3.426 3.426 0 0 1-.253-.219 1.741 1.741 0 0 0-.318-.24.88.88 0 0 0-.33-.11c-.234 0-.395.007-.483.022a13.836 13.836 0 0 0-5.162 4.855c.103.102.19.16.264.175.058.015.095.08.11.197a.835.835 0 0 0 .054.24c.022.044.107.023.253-.065.132.117.154.255.066.416.015-.015.337.182.966.59.279.248.432.401.462.46.044.16-.03.291-.22.393a1.12 1.12 0 0 0-.198-.197c-.117-.102-.183-.131-.197-.087-.044.073-.04.208.01.404.052.197.129.288.231.274-.102 0-.172.116-.208.35a5.03 5.03 0 0 0-.055.776c0 .284-.008.456-.022.514l.044.022c-.044.175-.004.426.12.754.125.329.282.47.473.427-.19.044-.044.357.439.94.088.117.146.183.176.197.044.03.131.084.263.164s.242.153.33.219a.934.934 0 0 1 .22.23c.058.072.131.236.219.492.088.255.19.426.308.514-.03.087.04.233.208.437.169.204.245.372.23.503a.107.107 0 0 0-.054.022.107.107 0 0 1-.055.022c.044.102.157.204.34.306.184.102.297.197.34.284.016.044.03.117.045.219a.802.802 0 0 0 .066.24c.029.059.088.073.175.044.03-.291-.146-.743-.527-1.356a17.95 17.95 0 0 1-.373-.634 1.254 1.254 0 0 1-.12-.339 1.662 1.662 0 0 0-.1-.317c.03 0 .073.01.132.033.059.022.12.047.187.076.066.03.12.059.164.088.044.029.06.05.044.065-.044.102-.029.23.044.383.074.153.161.288.264.405a30.038 30.038 0 0 0 .637.7c.088.087.19.23.307.426.118.197.118.295 0 .295.132 0 .279.073.44.22.16.145.285.29.373.436.073.117.132.307.176.57.044.262.08.437.11.524.029.102.091.2.186.295.096.095.187.164.275.208l.351.175.286.153c.073.03.209.106.406.23.092.058.176.107.25.147v.302h1.75c.025.027.05.056.076.087.205.247.359.4.461.459.527.277.93.357 1.208.24-.029.015-.025.07.011.164.037.095.095.208.176.34a21.426 21.426 0 0 0 .318.502c.074.088.205.197.396.328.19.132.322.241.395.329.088-.059.14-.124.154-.197-.044.116.007.262.154.437.146.175.278.248.395.219.205-.044.308-.277.308-.7-.454.219-.813.087-1.077-.394a.425.425 0 0 0-.055-.12 1.39 1.39 0 0 1-.142-.372.309.309 0 0 1 0-.164c.014-.044.05-.065.11-.065.131 0 .204-.026.22-.077.014-.051 0-.142-.045-.273a4.395 4.395 0 0 1-.088-.285c-.014-.116-.095-.262-.241-.437a26.286 26.286 0 0 1-.017-.02h14.246zm-13.285 6.632c1.95-.34 3.714-1.036 5.291-2.088l-3.676-3.675c-.105.08-.168.135-.187.164a1.084 1.084 0 0 0-.132.262 1.32 1.32 0 0 1-.11.241c-.029-.058-.113-.106-.252-.142-.14-.037-.209-.077-.209-.12.03.145.059.4.088.765.03.365.066.642.11.831.102.452.014.802-.264 1.05-.395.364-.608.656-.637.875-.058.32.03.51.264.568 0 .102-.059.252-.176.449-.117.197-.168.353-.154.47 0 .087.015.204.044.35zM55 24.7v10.785c0 .598-.201 1.11-.603 1.535-.402.426-.886.639-1.45.639H34.053c-.565 0-1.049-.213-1.45-.639A2.156 2.156 0 0 1 32 35.486V24.701c.376.443.809.837 1.296 1.181 3.098 2.228 5.224 3.79 6.38 4.687.487.38.883.677 1.186.89.304.212.708.43 1.213.652.505.221.976.332 1.412.332h.026c.436 0 .907-.11 1.412-.332.505-.222.909-.44 1.213-.652.303-.213.7-.51 1.187-.89 1.454-1.114 3.585-2.676 6.392-4.687A7.216 7.216 0 0 0 55 24.701zm0-4.177c0 .715-.21 1.399-.629 2.051a6.297 6.297 0 0 1-1.566 1.67c-3.217 2.364-5.22 3.836-6.006 4.416-.086.063-.268.201-.546.414-.278.213-.509.385-.693.516-.184.131-.406.279-.667.442a3.793 3.793 0 0 1-.738.366 1.94 1.94 0 0 1-.642.123h-.026c-.197 0-.41-.041-.642-.123a3.793 3.793 0 0 1-.738-.366c-.26-.163-.483-.31-.667-.442a26.904 26.904 0 0 1-.693-.516c-.278-.213-.46-.351-.546-.414-.778-.58-1.9-1.406-3.362-2.48a592.34 592.34 0 0 1-2.631-1.935c-.53-.38-1.031-.904-1.502-1.57-.47-.665-.706-1.283-.706-1.853 0-.707.178-1.295.533-1.766.355-.471.862-.707 1.52-.707h18.893c.557 0 1.038.213 1.444.639.407.425.61.937.61 1.535z"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M0 42V8l25 17L0 42Z" fill="var(--o-icons-cyan-cyan, #0382F3)"/><path d="M0 42V8l25 17L0 42Z" fill="url(#o_icon_website_mass_mailing__a)" fill-opacity=".2"/><path d="M25 25 0 8h50L25 25Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path d="M25 25 0 8h50L25 25Z" fill="url(#o_icon_website_mass_mailing__b)" fill-opacity=".2"/><path d="M50 8 0 42h46a4 4 0 0 0 4-4V8Z" fill="var(--o-icons-purple-cyan, #102E7A)"/><path d="M50 8 0 42h46a4 4 0 0 0 4-4V8Z" fill="url(#o_icon_website_mass_mailing__c)" fill-opacity=".3"/><defs><linearGradient id="o_icon_website_mass_mailing__a" x1="0" y1="8" x2="30.229" y2="13.557" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_mass_mailing__b" x1="0" y1="8" x2="40.567" y2="37.829" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_mass_mailing__c" x1="0" y1="8" x2="55.058" y2="28.242" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/website_membership/static/description/icon.png b/addons/website_membership/static/description/icon.png
index bc5a393c313..13e2ad3372c 100644
Binary files a/addons/website_membership/static/description/icon.png and b/addons/website_membership/static/description/icon.png differ
diff --git a/addons/website_membership/static/description/icon.svg b/addons/website_membership/static/description/icon.svg
index a6f0c4fabd5..472b0170e4e 100644
--- a/addons/website_membership/static/description/icon.svg
+++ b/addons/website_membership/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#CD7690"/><stop offset="100%" stop-color="#CA5377"/></linearGradient><filter id="d" width="103.8%" height="108%" x="-1.9%" y="-2%" filterUnits="objectBoundingBox"><feOffset dy="2" in="SourceAlpha" result="shadowOffsetOuter1"/><feColorMatrix in="shadowOffsetOuter1" result="shadowMatrixOuter1" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.253906 0"/><feMerge><feMergeNode in="shadowMatrixOuter1"/><feMergeNode in="SourceGraphic"/></feMerge></filter></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M48 69H4c-2 0-4-.146-4-4.082V42.266l18.588-19.97C26.037 16.512 34.84 15.413 45 19c6.027 3.156 9.921 9.21 11.683 18.161l-3.95 4.878L61 53.694 48 69z" opacity=".324"/><path d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z" fill="#000" fill-opacity=".383"/></g><g filter="url(#d)" mask="url(#b)"><g transform="translate(10 10)"><path d="M0 0L50 0 50 50 0 50z"/><path fill="#FFF" d="M46.788 27.213C40.83 28.398 38.916 22 34 22c-1.414 0-2.704.378-3.922.927a.726.726 0 0 0 .08-.177c.046-.149.116-.242.21-.279.167.223.362.242.585.056.13-.149.14-.298.028-.447.093-.13.284-.228.572-.293.288-.065.46-.153.516-.265.13.038.205.019.223-.055.019-.075.028-.186.028-.335 0-.15.028-.26.084-.335.074-.093.214-.177.419-.251.204-.075.325-.121.362-.14l.475-.307c.055-.074.055-.111 0-.111a1.01 1.01 0 0 0 .865-.307c.186-.205.13-.39-.168-.558.056-.112.028-.2-.084-.265a1.46 1.46 0 0 0-.418-.154c.056-.018.163-.023.32-.014.159.01.257-.004.294-.042.279-.186.214-.334-.196-.446-.316-.093-.716.019-1.2.335-.037.018-.125.107-.264.265-.14.158-.265.246-.377.265.037 0 .079-.047.125-.14.047-.093.093-.195.14-.306a.856.856 0 0 1 .098-.196c.111-.13.316-.27.613-.418.26-.112.745-.224 1.451-.335.633-.149 1.107-.047 1.423.307-.037-.037.052-.158.265-.363.214-.205.35-.316.405-.335.056-.037.195-.079.419-.125.223-.047.362-.117.418-.21l.056-.613c-.223.018-.386-.047-.488-.196-.103-.149-.163-.344-.182-.586 0 .038-.056.112-.167.224 0-.13-.042-.205-.126-.224a.671.671 0 0 0-.32.028c-.13.037-.215.047-.252.028a1.095 1.095 0 0 1-.418-.21c-.093-.083-.168-.236-.223-.46a7.936 7.936 0 0 0-.112-.418c-.037-.093-.126-.19-.265-.293-.14-.102-.228-.2-.265-.293a3.026 3.026 0 0 1-.07-.153 3.41 3.41 0 0 0-.084-.182.589.589 0 0 0-.111-.153.213.213 0 0 0-.154-.07c-.056 0-.12.047-.195.14a5.451 5.451 0 0 0-.21.279c-.064.093-.106.139-.125.139a.228.228 0 0 0-.167-.042.89.89 0 0 0-.126.028.47.47 0 0 0-.125.084.78.78 0 0 1-.14.097.637.637 0 0 1-.237.084 1.824 1.824 0 0 0-.237.056c.279-.093.27-.195-.028-.307-.186-.074-.335-.102-.447-.084.168-.074.238-.186.21-.334a.671.671 0 0 0-.237-.391h.139c-.019-.075-.098-.154-.237-.237a3.42 3.42 0 0 0-.488-.237 2.402 2.402 0 0 1-.363-.168c-.149-.093-.465-.181-.949-.265-.483-.084-.79-.088-.92-.014-.094.112-.135.21-.126.293.01.084.046.214.111.39.066.177.098.294.098.35.019.111-.032.232-.153.362-.121.13-.182.242-.182.335 0 .13.13.274.391.433.26.158.353.358.279.6-.056.148-.205.297-.446.446-.242.149-.391.26-.447.335-.093.148-.107.32-.042.516.065.195.163.349.293.46.037.037.051.075.042.112-.01.037-.042.079-.098.125a1.249 1.249 0 0 1-.153.112c-.047.028-.107.06-.181.098l-.084.055c-.205.093-.395.038-.572-.167a1.804 1.804 0 0 1-.377-.725c-.13-.465-.279-.744-.446-.837-.428-.15-.698-.14-.81.027-.092-.241-.474-.483-1.143-.725-.465-.167-1.005-.205-1.619-.112.112-.018.112-.158 0-.418-.13-.28-.307-.39-.53-.335a1.4 1.4 0 0 0 .112-.488c.018-.214.028-.34.028-.377.056-.242.167-.456.335-.642a5.35 5.35 0 0 0 .46-.614c.065-.111.07-.167.014-.167.651.074 1.116-.028 1.395-.307.093-.093.2-.25.32-.474.122-.223.22-.381.294-.474.167-.112.297-.163.39-.154.093.01.228.06.405.154.177.093.312.139.405.139.26.019.404-.084.432-.307a.606.606 0 0 0-.21-.558c.224.019.252-.14.085-.474a1.065 1.065 0 0 0-.224-.251c-.223-.075-.474-.028-.753.14-.149.074-.13.148.056.222-.019-.018-.107.08-.265.293a2.36 2.36 0 0 1-.46.489c-.15.111-.298.065-.447-.14-.019-.019-.07-.144-.154-.377-.083-.232-.172-.358-.265-.376-.148 0-.297.14-.446.418.056-.149-.047-.288-.307-.418s-.484-.205-.67-.223c.354-.224.28-.475-.223-.754-.13-.074-.32-.12-.572-.14-.25-.018-.432.02-.544.112-.093.13-.144.237-.153.321-.01.084.037.158.14.223.101.065.2.117.292.154.093.037.2.074.321.111.12.038.2.066.237.084.26.186.335.316.223.39a3.374 3.374 0 0 1-.237.098l-.32.126c-.094.037-.15.074-.168.112-.056.074-.056.204 0 .39.056.186.037.316-.056.39-.093-.092-.177-.255-.251-.487-.074-.233-.14-.386-.195-.46.13.167-.103.222-.698.167l-.279-.028c-.074 0-.223.018-.446.055a2.073 2.073 0 0 1-.572.028.519.519 0 0 1-.377-.223c-.074-.149-.074-.335 0-.558.019-.074.056-.093.112-.056a4.18 4.18 0 0 1-.307-.265c-.13-.12-.223-.2-.28-.237-.855.28-1.73.66-2.622 1.144.112.019.223.01.335-.028.093-.037.214-.097.362-.181a9.41 9.41 0 0 1 .28-.154c.632-.26 1.023-.325 1.171-.195l.14-.14c.26.298.446.53.558.698-.13-.074-.41-.084-.837-.028-.372.112-.577.223-.614.335.13.223.177.39.14.502a4.358 4.358 0 0 1-.321-.279 2.213 2.213 0 0 0-.405-.307c-.13-.074-.27-.12-.418-.14-.298 0-.503.01-.614.029-2.716 1.488-4.902 3.552-6.557 6.194.13.13.242.204.335.223.074.019.12.102.14.251.018.149.041.251.069.307.028.056.135.028.32-.084.168.15.196.326.084.53.02-.018.428.233 1.228.754.354.316.549.511.586.586.056.204-.037.372-.279.502-.019-.037-.102-.12-.251-.251-.149-.13-.233-.167-.251-.112-.056.093-.051.265.014.517.065.25.163.367.293.348-.13 0-.219.15-.265.447-.047.297-.07.628-.07.99 0 .363-.01.582-.028.656l.056.028c-.056.223-.005.544.153.962.158.419.358.6.6.545-.242.055-.056.455.558 1.2.112.148.186.232.223.25.056.038.168.107.335.21.168.102.307.195.419.279.111.083.204.181.279.293.074.093.167.302.279.627.111.326.242.545.39.656-.037.112.052.298.266.558.213.26.311.475.292.642a.136.136 0 0 0-.07.028.136.136 0 0 1-.069.028c.056.13.2.26.432.39.233.13.377.251.433.363.019.056.037.149.056.28.018.13.046.232.083.306.038.074.112.093.224.056.037-.372-.186-.949-.67-1.73a22.924 22.924 0 0 1-.474-.81 1.604 1.604 0 0 1-.154-.432 2.128 2.128 0 0 0-.125-.404c.037 0 .093.014.167.042.074.027.154.06.237.097.084.037.154.075.21.112.055.037.074.065.055.084-.056.13-.037.292.056.488.093.195.205.367.335.516a38.267 38.267 0 0 0 .81.893c.11.111.24.293.39.544.149.251.149.377 0 .377.069 0 .14.015.216.047C17.53 30.278 17 31.865 17 34c0 2-2 4.336-2 5v5.17a21.332 21.332 0 0 1-8.126-7.986C4.958 32.903 4 29.317 4 25.43c0-3.888.958-7.473 2.874-10.757a21.332 21.332 0 0 1 7.798-7.798C17.956 4.958 21.541 4 25.43 4c3.887 0 7.473.958 10.756 2.874a21.332 21.332 0 0 1 7.798 7.798c1.916 3.284 2.874 6.869 2.874 10.757 0 .602-.023 1.196-.069 1.784zM34.5 25.25a5.605 5.605 0 1 1 0 11.21 5.605 5.605 0 0 1 0-11.21zm6.057 11.604l-2.134-.533c-2.625 1.888-5.807 1.466-7.846 0l-2.134.533a3.844 3.844 0 0 0-2.912 3.73v3.244c0 1.062.86 1.922 1.922 1.922h14.094c1.061 0 1.922-.86 1.922-1.922v-3.245c0-1.764-1.2-3.301-2.912-3.729zm5.047.995a3.737 3.737 0 1 0 0-7.474 3.737 3.737 0 0 0 0 7.474zm-22.208 0a3.737 3.737 0 1 0 0-7.474 3.737 3.737 0 0 0 0 7.474zm1.281 5.98v-3.246c0-.883.245-1.72.678-2.434-1.6.786-3.381.465-4.574-.394l-1.423.356a2.562 2.562 0 0 0-1.941 2.486v2.163c0 .708.573 1.282 1.28 1.282h5.99a2.798 2.798 0 0 1-.01-.214zm24.965-5.718l-1.423-.356c-1.49 1.073-3.25 1.027-4.58.386a4.69 4.69 0 0 1 .684 2.442v3.245c0 .072-.004.143-.01.214h5.99c.707 0 1.28-.574 1.28-1.282v-2.163c0-1.176-.8-2.2-1.94-2.486z"/></g></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M43 24a5 5 0 1 1-10 0 5 5 0 0 1 10 0Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M43 24a5 5 0 1 1-10 0 5 5 0 0 1 10 0Z" fill="url(#o_icon_website_membership__a)" fill-opacity=".2"/><path d="M28 16c0 5.523-4.477 10-10 10S8 21.523 8 16 12.477 6 18 6s10 4.477 10 10Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M28 16c0 5.523-4.477 10-10 10S8 21.523 8 16 12.477 6 18 6s10 4.477 10 10Z" fill="url(#o_icon_website_membership__b)" fill-opacity=".2"/><path d="M16 31h26a4 4 0 0 1 4 4v5a4 4 0 0 1-4 4H16V31Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M16 31h26a4 4 0 0 1 4 4v5a4 4 0 0 1-4 4H16V31Z" fill="url(#o_icon_website_membership__c)" fill-opacity=".2"/><path d="M4 31h16c7.18 0 13 5.82 13 13H17C9.82 44 4 38.18 4 31Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M4 31h16c7.18 0 13 5.82 13 13H17C9.82 44 4 38.18 4 31Z" fill="url(#o_icon_website_membership__d)" fill-opacity=".2"/><defs><linearGradient id="o_icon_website_membership__a" x1="33" y1="19" x2="44.765" y2="21.941" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_membership__b" x1="8" y1="6" x2="31.529" y2="11.882" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_membership__c" x1="16" y1="31" x2="44.135" y2="47.232" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_membership__d" x1="4" y1="31" x2="31.65" y2="46.42" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/website_partner/static/description/icon.png b/addons/website_partner/static/description/icon.png
index 5db96d350b8..99dae0a2755 100644
Binary files a/addons/website_partner/static/description/icon.png and b/addons/website_partner/static/description/icon.png differ
diff --git a/addons/website_partner/static/description/icon.svg b/addons/website_partner/static/description/icon.svg
index 6cef6cc5949..95c28e19efc 100644
--- a/addons/website_partner/static/description/icon.svg
+++ b/addons/website_partner/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#CDC484"/><stop offset="100%" stop-color="#B5AA59"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M30.227 69H4c-2 0-4-1-4-4V40.15l21.357-22.214L32 27l5.816-2.058 9.877-9.946 8.734 6.18-12.001 12.55-.465 2.115-5.455 7.639v6.29l3.437 6.958L30.227 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><path fill="#000" d="M24.55 31h5.239a7.456 7.456 0 0 1 1.149-3.062l-4.221-4.221a4.39 4.39 0 0 1-1.378.22c-2.405 0-4.355-1.93-4.355-4.312 0-2.382 1.95-4.313 4.355-4.313 2.405 0 4.355 1.931 4.355 4.313 0 .87-.261 1.682-.71 2.36L32.9 25.9a7.637 7.637 0 0 1 4.439-1.412c1.995 0 3.812.76 5.17 2.003l5.768-5.768a5.335 5.335 0 0 1-1.164-3.332c0-2.978 2.437-5.391 5.443-5.391C55.563 12 58 14.413 58 17.39c0 2.978-2.437 5.391-5.444 5.391a5.462 5.462 0 0 1-2.56-.633l-5.788 6.615c.482.99.752 2.1.752 3.272 0 3.603-2.55 6.617-5.96 7.367v7.72c2.634.545 4.613 2.857 4.613 5.628 0 3.176-2.6 5.75-5.807 5.75C34.6 58.5 32 55.926 32 52.75c0-2.905 2.175-5.306 5-5.695v-7.48c-3.725-.161-6.756-2.971-7.22-6.575h-5.285c-.54 2.621-2.882 4.594-5.689 4.594-3.206 0-5.806-2.575-5.806-5.75 0-3.176 2.6-5.75 5.806-5.75 2.918 0 5.333 2.13 5.745 4.906zm12.824 7c3.347 0 6.06-2.686 6.06-6s-2.713-6-6.06-6c-3.346 0-6.058 2.686-6.058 6s2.712 6 6.058 6z" opacity=".3"/><path fill="#FFF" d="M24.55 31h5.239a7.456 7.456 0 0 1 1.149-3.062l-4.221-4.221a4.39 4.39 0 0 1-1.378.22c-2.405 0-4.355-1.93-4.355-4.312 0-2.382 1.95-4.313 4.355-4.313 2.405 0 4.355 1.931 4.355 4.313 0 .87-.261 1.682-.71 2.36L32.9 25.9a7.637 7.637 0 0 1 4.439-1.412c1.995 0 3.812.76 5.17 2.003l5.768-5.768a5.335 5.335 0 0 1-1.164-3.332c0-2.978 2.437-5.391 5.443-5.391C55.563 12 58 14.413 58 17.39c0 2.978-2.437 5.391-5.444 5.391a5.462 5.462 0 0 1-2.56-.633l-5.788 6.615c.482.99.752 2.1.752 3.272 0 3.603-2.55 6.617-5.96 7.367v7.72c2.634.545 4.613 2.857 4.613 5.628 0 3.176-2.6 5.75-5.807 5.75C34.6 58.5 32 55.926 32 52.75c0-2.905 2.175-5.306 5-5.695v-7.48c-3.725-.161-6.756-2.971-7.22-6.575h-5.285c-.54 2.621-2.882 4.594-5.689 4.594-3.206 0-5.806-2.575-5.806-5.75 0-3.176 2.6-5.75 5.806-5.75 2.918 0 5.333 2.13 5.745 4.906zm12.824 7c3.347 0 6.06-2.686 6.06-6s-2.713-6-6.06-6c-3.346 0-6.058 2.686-6.058 6s2.712 6 6.058 6z"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="m26.5 25.621 17.56-17.56-2.12-2.122L25 22.88 14.06 11.94l-2.12 2.122 9.439 9.44H7v3h16.5V42h3V25.62Z" fill="var(--o-icons-purple-purple, #55103D)"/><path fill-rule="evenodd" clip-rule="evenodd" d="m26.5 25.621 17.56-17.56-2.12-2.122L25 22.88 14.06 11.94l-2.12 2.122 9.439 9.44H7v3h16.5V42h3V25.62Z" fill="url(#o_icon_website_partner__a)" fill-opacity=".3"/><path d="M46 8.5a4.5 4.5 0 1 1-9 0 4.5 4.5 0 0 1 9 0Z" fill="var(--o-icons-red-red, #F9383D)"/><path d="M46 8.5a4.5 4.5 0 1 1-9 0 4.5 4.5 0 0 1 9 0Z" fill="url(#o_icon_website_partner__b)" fill-opacity=".2"/><path d="M10 13a3 3 0 1 1 6 0 3 3 0 0 1-6 0Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M10 13a3 3 0 1 1 6 0 3 3 0 0 1-6 0Z" fill="url(#o_icon_website_partner__c)" fill-opacity=".2"/><path d="M4 25a3 3 0 1 1 6 0 3 3 0 0 1-6 0Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M4 25a3 3 0 1 1 6 0 3 3 0 0 1-6 0Z" fill="url(#o_icon_website_partner__d)" fill-opacity=".2"/><path d="M29 25a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M29 25a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z" fill="url(#o_icon_website_partner__e)" fill-opacity=".2"/><path d="M29 42a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M29 42a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z" fill="url(#o_icon_website_partner__f)" fill-opacity=".2"/><defs><linearGradient id="o_icon_website_partner__a" x1="7" y1="5.939" x2="50.457" y2="17.105" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_partner__b" x1="37" y1="4" x2="47.588" y2="6.647" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_partner__c" x1="10" y1="10" x2="17.059" y2="11.765" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_partner__d" x1="4" y1="22" x2="11.059" y2="23.765" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_partner__e" x1="21" y1="21" x2="30.412" y2="23.353" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_partner__f" x1="21" y1="38" x2="30.412" y2="40.353" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/website_payment/static/description/icon.png b/addons/website_payment/static/description/icon.png
index 757c18b6adb..b971dea0220 100644
Binary files a/addons/website_payment/static/description/icon.png and b/addons/website_payment/static/description/icon.png differ
diff --git a/addons/website_payment/static/description/icon.svg b/addons/website_payment/static/description/icon.svg
index bb4a73b0d5f..bfbd3ccf9e3 100644
--- a/addons/website_payment/static/description/icon.svg
+++ b/addons/website_payment/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="98.616%"><stop offset="0%" stop-color="#797C79"/><stop offset="100%" stop-color="#545554"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><g><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/></g><path fill="#393939" d="M54.213 0l-4.77 17.181 9.348 25.707L41.198 69H4c-2 0-4-1-4-4V41.53L10 31l8.041-3.013 12.348-15.18L43 0h11.213z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><path fill="#000" d="M49.376 35.792l-2.476.902c.008-.499.017-1.701.028-3.607l-.004-.18c.005-.135.009-.31.011-.526.003-.216.001-.389-.006-.52l.57.897 1.877 3.034zm-26.333 8.279l-2.946-4.855c-.364-.591-.929-.747-1.694-.468l-4.81 1.75.048.244c4.061-.42 7.195.69 9.402 3.329zm.959-7.361l-.08 8.829-.879-1.468c-.612-.715-1.4-1.296-2.362-1.743a7.412 7.412 0 0 0-2.922-.714l5.716 8.166 3.14-1.143.545-13.077-3.158 1.15zm6.64 10.482l2.979-1.084-2.28-12.07-2.979 1.084 2.28 12.07zm9.74-16.123a7.819 7.819 0 0 0-2.849.495c-1.471.535-2.547 1.322-3.226 2.36-.679 1.037-.822 2.113-.43 3.23.428 1.21 1.67 1.924 3.726 2.14.674.063 1.163.16 1.467.29.305.13.503.319.593.567.13.355.049.692-.241 1.012-.29.32-.668.565-1.135.735-1.029.374-2.033.519-3.013.433l-.465-.051.517 2.705c1.031.08 2.211-.122 3.54-.605 1.559-.555 2.679-1.357 3.36-2.409.68-1.051.818-2.173.411-3.364-.456-1.254-1.668-1.978-3.636-2.173-.694-.082-1.209-.176-1.545-.281-.336-.106-.55-.283-.64-.53-.095-.261-.031-.542.19-.844.223-.302.61-.553 1.16-.753.833-.317 1.626-.445 2.38-.384l.32.044-.484-2.617zm7.523-3.06l-2.297.837c-.778.283-1.182.791-1.212 1.526l-.618 12.039 3.122-1.137.009-1.932 3.804-1.384c.155.238.48.762.979 1.572l2.763-1.006-6.55-10.514zm2.635-7.388l8.266 22.71c.224.614.19 1.23-.1 1.844-.292.615-.748 1.036-1.37 1.262L20.583 59.814c-.622.226-1.242.198-1.86-.086-.619-.284-1.04-.734-1.263-1.349L9.194 35.67c-.224-.614-.19-1.23.1-1.844.292-.615.748-1.036 1.37-1.262l36.753-13.377c.622-.226 1.242-.198 1.86.086.619.284 1.04.734 1.263 1.349z" opacity=".3"/><path fill="#000" d="M55.307 9.908L42.822 23.774a6.488 6.488 0 0 1-9.166.48 6.488 6.488 0 0 1-.48-9.165c5.172-5.693 9.219-10.162 12.14-13.406l7.99-.419c1.141 1.52.789 2.716-.53 4.181l-11.4 12.66a1.627 1.627 0 0 1-2.292.12 1.627 1.627 0 0 1-.12-2.29L49.278 4.48 47.47 2.85 37.156 14.306a4.058 4.058 0 0 0 .3 5.728 4.058 4.058 0 0 0 5.728-.3l11.4-12.66c1.747-1.94 1.628-4.661.666-6.913l-9.986.523c-1.413.16-2.394.545-2.944 1.156-2.466 2.739-6.117 6.612-10.953 11.62a8.919 8.919 0 0 0 .66 12.603 8.919 8.919 0 0 0 12.603-.66l12.486-13.867-1.81-1.628z" opacity=".3"/><path fill="#FFF" d="M49.376 33.792l-2.476.902c.008-.499.017-1.701.028-3.607l-.004-.18c.005-.135.009-.31.011-.526.003-.216.001-.389-.006-.52l.57.897 1.877 3.034zm-26.333 8.279l-2.946-4.855c-.364-.591-.929-.747-1.694-.468l-4.81 1.75.048.244c4.061-.42 7.195.69 9.402 3.329zm.959-7.361l-.08 8.829-.879-1.468c-.612-.715-1.4-1.296-2.362-1.743a7.412 7.412 0 0 0-2.922-.714l5.716 8.166 3.14-1.143.545-13.077-3.158 1.15zm6.64 10.482l2.979-1.084-2.28-12.07-2.979 1.084 2.28 12.07zm9.74-16.123a7.819 7.819 0 0 0-2.849.495c-1.471.535-2.547 1.322-3.226 2.36-.679 1.037-.822 2.113-.43 3.23.428 1.21 1.67 1.924 3.726 2.14.674.063 1.163.16 1.467.29.305.13.503.319.593.567.13.355.049.692-.241 1.012-.29.32-.668.565-1.135.735-1.029.374-2.033.519-3.013.433l-.465-.051.517 2.705c1.031.08 2.211-.122 3.54-.605 1.559-.555 2.679-1.357 3.36-2.409.68-1.051.818-2.173.411-3.364-.456-1.254-1.668-1.978-3.636-2.173-.694-.082-1.209-.176-1.545-.281-.336-.106-.55-.283-.64-.53-.095-.261-.031-.542.19-.844.223-.302.61-.553 1.16-.753.833-.317 1.626-.445 2.38-.384l.32.044-.484-2.617zm7.523-3.06l-2.297.837c-.778.283-1.182.791-1.212 1.526l-.618 12.039 3.122-1.137.009-1.932 3.804-1.384c.155.238.48.762.979 1.572l2.763-1.006-6.55-10.514zm2.635-7.388l8.266 22.71c.224.614.19 1.23-.1 1.844-.292.615-.748 1.036-1.37 1.262L20.583 57.814c-.622.226-1.242.198-1.86-.086-.619-.284-1.04-.734-1.263-1.349L9.194 33.67c-.224-.614-.19-1.23.1-1.844.292-.615.748-1.036 1.37-1.262l36.753-13.377c.622-.226 1.242-.198 1.86.086.619.284 1.04.734 1.263 1.349z"/><path fill="#CCCDCD" d="M55.307 7.908L42.822 21.774a6.488 6.488 0 0 1-9.166.48 6.488 6.488 0 0 1-.48-9.165c5.172-5.693 9.219-10.162 12.14-13.406l7.99-.419c1.141 1.52.789 2.716-.53 4.181l-11.4 12.66a1.627 1.627 0 0 1-2.292.12 1.627 1.627 0 0 1-.12-2.29L49.278 2.48 47.47.85 37.156 12.306a4.058 4.058 0 0 0 .3 5.728 4.058 4.058 0 0 0 5.728-.3l11.4-12.66c1.747-1.94 1.628-4.661.666-6.913l-9.986.523c-1.413.16-2.394.545-2.944 1.156-2.466 2.739-6.117 6.612-10.953 11.62a8.919 8.919 0 0 0 .66 12.603 8.919 8.919 0 0 0 12.603-.66L57.116 9.536l-1.81-1.628z"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#o_icon_website_payment__a)"><path d="M25 50c13.807 0 25-11.193 25-25a24.9 24.9 0 0 0-2.276-10.435C45 13 41.07 11 38 11c-13.807 0-26.5 13.193-26.5 27 0 3.725 2.5 7.5 4.776 10.435A24.947 24.947 0 0 0 25 50Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M25 50c13.807 0 25-11.193 25-25a24.9 24.9 0 0 0-2.276-10.435C45 13 41.07 11 38 11c-13.807 0-26.5 13.193-26.5 27 0 3.725 2.5 7.5 4.776 10.435A24.947 24.947 0 0 0 25 50Z" fill="url(#o_icon_website_payment__b)" fill-opacity=".2"/><path d="M16.276 48.435A24.907 24.907 0 0 1 14 38c0-13.807 11.193-25 25-25 3.069 0 6.008.553 8.724 1.565a24.94 24.94 0 0 0-1.594-2.933C42 8 35.94 3.5 30 3.5c-13.531 0-26.5 13.469-26.5 27 0 5.94 4.5 11.5 8.132 15.63a24.912 24.912 0 0 0 4.644 2.305Z" fill="var(--o-icons-yellow-yellow, #F77B09)"/><path d="M16.276 48.435A24.907 24.907 0 0 1 14 38c0-13.807 11.193-25 25-25 3.069 0 6.008.553 8.724 1.565a24.94 24.94 0 0 0-1.594-2.933C42 8 35.94 3.5 30 3.5c-13.531 0-26.5 13.469-26.5 27 0 5.94 4.5 11.5 8.132 15.63a24.912 24.912 0 0 0 4.644 2.305Z" fill="url(#o_icon_website_payment__c)" fill-opacity=".2"/><path d="M46.13 11.632C41.697 4.641 33.89 0 25 0 11.193 0 0 11.193 0 25c0 8.89 4.64 16.697 11.632 21.13A24.4 24.4 0 0 1 6 30.5C6 16.969 16.969 6 30.5 6a24.4 24.4 0 0 1 15.63 5.632Z" fill="var(--o-icons-purple-yellow, #912C18)"/><path d="M46.13 11.632C41.697 4.641 33.89 0 25 0 11.193 0 0 11.193 0 25c0 8.89 4.64 16.697 11.632 21.13A24.4 24.4 0 0 1 6 30.5C6 16.969 16.969 6 30.5 6a24.4 24.4 0 0 1 15.63 5.632Z" fill="url(#o_icon_website_payment__d)" fill-opacity=".2"/></g><defs><linearGradient id="o_icon_website_payment__b" x1="11.5" y1="11" x2="56.862" y2="22.195" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_payment__c" x1="3.5" y1="3.5" x2="55.625" y2="16.325" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_payment__d" x1="0" y1="0" x2="54.27" y2="13.568" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><clipPath id="o_icon_website_payment__a"><path fill="var(--o-icons-white, #FFFFFF)" d="M0 0h50v50H0z"/></clipPath></defs></svg>
diff --git a/addons/website_payment/views/res_config_settings_views.xml b/addons/website_payment/views/res_config_settings_views.xml
index da1139846af..a3c09bb5073 100644
--- a/addons/website_payment/views/res_config_settings_views.xml
+++ b/addons/website_payment/views/res_config_settings_views.xml
@@ -19,11 +19,11 @@
                                     <button string="Activate Stripe" class="btn-primary pe-none" disabled=""
                                             style="pointer-events: none;"/>
                                 </div>
-                                <button type="action" name="%(payment.action_payment_provider)d" string="View Alternatives" class="btn-link" icon="fa-arrow-right"/>
+                                <button type="action" name="%(payment.action_payment_provider)d" string="View Alternatives" class="btn-link" icon="oi-arrow-right"/>
                             </div>
                             <div class="row mt8 ms-4" attrs="{'invisible': [('providers_state', '!=', 'other_than_paypal')]}">
                                 <button name="action_configure_first_provider" type="object" class="btn-primary col-auto"><field name="first_provider_label" nolabel="1" class="oe_inline"/></button>
-                                <button type="action" name="%(payment.action_payment_provider)d" string="View other providers " class="btn-link col-auto" icon="fa-arrow-right"/>
+                                <button type="action" name="%(payment.action_payment_provider)d" string="View other providers " class="btn-link col-auto" icon="oi-arrow-right"/>
                             </div>
                         </div>
                     </setting>
diff --git a/addons/website_profile/views/website_profile.xml b/addons/website_profile/views/website_profile.xml
index 75b8c051724..0be49697add 100644
--- a/addons/website_profile/views/website_profile.xml
+++ b/addons/website_profile/views/website_profile.xml
@@ -380,9 +380,9 @@
         </div>
         <div class="text-end d-inline-block pull-right">
             <a t-if="not user.badge_ids and badge_category" t-attf-href="/profile/ranks_badges?badge_category=#{badge_category}&amp;url_origin=#{request.httprequest.path}&amp;name_origin=#{user.name}"
-            class="btn btn-link btn-sm"><i class="fa fa-arrow-right"/> All Badges</a>
+            class="btn btn-link btn-sm"><i class="oi oi-arrow-right"/> All Badges</a>
             <a t-else="" t-attf-href="/profile/ranks_badges?url_origin=#{request.httprequest.path}&amp;name_origin=#{user.name}"
-            class="btn btn-link btn-sm"><i class="fa fa-arrow-right me-1"/>All Badges</a>
+            class="btn btn-link btn-sm"><i class="oi oi-arrow-right me-1"/>All Badges</a>
         </div>
     </template>
 
diff --git a/addons/website_sale/static/description/icon.png b/addons/website_sale/static/description/icon.png
index 32a04e3344d..606345e2d8d 100644
Binary files a/addons/website_sale/static/description/icon.png and b/addons/website_sale/static/description/icon.png differ
diff --git a/addons/website_sale/static/description/icon.svg b/addons/website_sale/static/description/icon.svg
index 6c362b44c63..73f07dbc8b5 100644
--- a/addons/website_sale/static/description/icon.svg
+++ b/addons/website_sale/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#94B6C8"/><stop offset="100%" stop-color="#6A9EBA"/></linearGradient><path id="d" d="M50.363 41a1.636 1.636 0 0 1-1.59 1.286L27 43l1 4h19c1 0 1 2 0 2H26l-6-24h-2v1c0 .667-.333 1-1 1s-1-.333-1-1v-2c.066-.667.4-1 1-1h4c.517 0 .85.333 1 1l1 3.281h28.45c1.048 0 1.824.985 1.592 2.019L50.363 41zM45.5 55a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zm-19 0a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5z"/><path id="e" d="M50.363 39a1.636 1.636 0 0 1-1.59 1.286L27 41l1 4h19c1 0 1 2 0 2H26l-6-24h-2v1c0 .667-.333 1-1 1s-1-.333-1-1v-2c.066-.667.4-1 1-1h4c.517 0 .85.333 1 1l1 3.281h28.45c1.048 0 1.824.985 1.592 2.019L50.363 39zM45.5 53a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zm-19 0a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M35 69H4c-2 0-4-1-4-4V37.785l16.292-16.467L21 21l2 5h29l-1.963 13.743L45 45h2l.542 1.59-3.3 3.164 3.3 1.837L35 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M15.724 6.397C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397L37.236 13H41.9c2.46 0 4.367 2.099 4.07 4.481l-3.106 25C42.613 44.49 40.866 46 38.793 46H11.207c-2.074 0-3.82-1.51-4.07-3.519l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603ZM32.917 13H17.082c0-.56.123-1.134.39-1.691l.956-2C19.102 7.9 20.551 7 22.144 7h5.711c1.593 0 3.042.9 3.716 2.308l.957 2c.266.558.39 1.132.39 1.692Z" fill="var(--o-icons-purple-purple, #55103D)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M15.724 6.397C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397L37.236 13H41.9c2.46 0 4.367 2.099 4.07 4.481l-3.106 25C42.613 44.49 40.866 46 38.793 46H11.207c-2.074 0-3.82-1.51-4.07-3.519l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603ZM32.917 13H17.082c0-.56.123-1.134.39-1.691l.956-2C19.102 7.9 20.551 7 22.144 7h5.711c1.593 0 3.042.9 3.716 2.308l.957 2c.266.558.39 1.132.39 1.692Z" fill="url(#o_icon_website_sale__a)" fill-opacity=".3"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8.514 45.016a3.963 3.963 0 0 1-1.377-2.535l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397l2.59 5.777C35.5 28.256 23.848 41.405 8.515 45.016ZM17.082 13h15.835c0-.56-.123-1.134-.39-1.691l-.956-2C30.897 7.9 29.448 7 27.855 7h-5.711c-1.593 0-3.042.9-3.716 2.308l-.956 2a3.904 3.904 0 0 0-.39 1.692Z" fill="var(--o-icons-purple-pure, #93407D)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8.514 45.016a3.963 3.963 0 0 1-1.377-2.535l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397l2.59 5.777C35.5 28.256 23.848 41.405 8.515 45.016ZM17.082 13h15.835c0-.56-.123-1.134-.39-1.691l-.956-2C30.897 7.9 29.448 7 27.855 7h-5.711c-1.593 0-3.042.9-3.716 2.308l-.956 2a3.904 3.904 0 0 0-.39 1.692Z" fill="url(#o_icon_website_sale__b)" fill-opacity=".2"/><defs><linearGradient id="o_icon_website_sale__a" x1="4" y1="4" x2="53.412" y2="16.353" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_sale__b" x1="4" y1="4" x2="43.497" y2="11.912" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/website_sale/static/src/scss/website_sale.scss b/addons/website_sale/static/src/scss/website_sale.scss
index 8ca1b473b2a..18ed412b962 100644
--- a/addons/website_sale/static/src/scss/website_sale.scss
+++ b/addons/website_sale/static/src/scss/website_sale.scss
@@ -733,7 +733,7 @@ a.no-decoration {
     bottom: percentage(1/3);
     width: 2rem;
     border-radius: 5px;
-    background-color: $o-enterprise-primary-color;
+    background-color: $o-enterprise-action-color;
 }
 
 .o_carousel_product_remove {
diff --git a/addons/website_sale/static/src/xml/website_sale_image_viewer.xml b/addons/website_sale/static/src/xml/website_sale_image_viewer.xml
index 0e031fffc1b..9d073e924b0 100644
--- a/addons/website_sale/static/src/xml/website_sale_image_viewer.xml
+++ b/addons/website_sale/static/src/xml/website_sale_image_viewer.xml
@@ -32,10 +32,10 @@
                         </div>
                         <!-- Controls -->
                         <div class="o_wsale_image_viewer_control o_wsale_image_viewer_previous btn btn-dark position-absolute top-0 bottom-0 start-0 align-items-center justify-content-center d-flex my-auto ms-3 rounded-circle" t-on-click="previousImage" title="Previous (Left-Arrow)" role="button">
-                            <span class="fa fa-chevron-left" role="img"/>
+                            <span class="oi oi-chevron-left" role="img"/>
                         </div>
                         <div class="o_wsale_image_viewer_control o_wsale_image_viewer_next btn btn-dark position-absolute top-0 bottom-0 end-0 align-items-center justify-content-center d-flex my-auto me-3 rounded-circle" t-on-click="nextImage" title="Next (Right-Arrow)" role="button">
-                            <span class="fa fa-chevron-right" role="img"/>
+                            <span class="oi oi-chevron-right" role="img"/>
                         </div>
                     </t>
                 </div>
diff --git a/addons/website_sale/static/tests/tours/website_sale_restricted_editor_ui.js b/addons/website_sale/static/tests/tours/website_sale_restricted_editor_ui.js
index ac79218ecfe..ee1effa40a7 100644
--- a/addons/website_sale/static/tests/tours/website_sale_restricted_editor_ui.js
+++ b/addons/website_sale/static/tests/tours/website_sale_restricted_editor_ui.js
@@ -37,7 +37,7 @@ wTourUtils.registerWebsitePreviewTour('website_sale_restricted_editor_ui', {
     },
     {
         content: "Check that you landed on a form view and that the record was unpublished",
-        trigger: '.o_form_sheet [name="is_published"] .fa-globe.text-danger',
+        trigger: '.o-form-buttonbox [name="is_published"] .fa-globe.text-danger',
         run: () => {},
     },
 ]);
diff --git a/addons/website_sale/static/tests/tours/website_sale_shop_cart_recovery.js b/addons/website_sale/static/tests/tours/website_sale_shop_cart_recovery.js
index dd0d7cba263..0cc1c5efe81 100644
--- a/addons/website_sale/static/tests/tours/website_sale_shop_cart_recovery.js
+++ b/addons/website_sale/static/tests/tours/website_sale_shop_cart_recovery.js
@@ -44,7 +44,7 @@ registry.category("web_tour.tours").add('shop_cart_recovery', {
     },
     {
         content: "click action",
-        trigger: '.dropdown-toggle:contains("Action")',
+        trigger: '.o_cp_action_menus .dropdown-toggle',
     },
     {
         content: "click Send a Cart Recovery Email",
diff --git a/addons/website_sale/views/res_config_settings_views.xml b/addons/website_sale/views/res_config_settings_views.xml
index 81c9a32bce2..d7f51e72aac 100644
--- a/addons/website_sale/views/res_config_settings_views.xml
+++ b/addons/website_sale/views/res_config_settings_views.xml
@@ -10,7 +10,7 @@
                 <div class="mt8" attrs="{'invisible': [('terms_type', '!=', 'html')]}" groups="website.group_website_designer">
                     <strong class="align-top">URL: </strong><field name="terms_url"/>
                     <div>
-                        <button name='action_update_terms' icon="fa-arrow-right" type="object" string="Edit in Website Builder" class="btn-link"/>
+                        <button name='action_update_terms' icon="oi-arrow-right" type="object" string="Edit in Website Builder" class="btn-link"/>
                     </div>
                 </div>
             </button>
@@ -49,7 +49,7 @@
                     <setting help="Add a customizable form during checkout (after address)">
                         <field name="enabled_extra_checkout_step"/>
                         <div class="row mt8 ms-4" attrs="{'invisible': [('enabled_extra_checkout_step', '=', False)]}">
-                            <button type="object" name="action_open_extra_info" string="Configure Form " class="btn-link" icon="fa-arrow-right"/>
+                            <button type="object" name="action_open_extra_info" string="Configure Form " class="btn-link" icon="oi-arrow-right"/>
                         </div>
                     </setting>
                     <setting id="digital_content_setting" title="Provide customers with product-specific links or downloadable content in the confirmation page of the checkout process if the payment gets through. To do so, attach some files to a product using the new Files button and publish them." help="Add download link for customers at the end of checkout">
@@ -88,7 +88,7 @@
                             <field name="product_pricelist_setting" class="o_light_label w-75" widget="radio"/>
                         </div>
                         <div attrs="{'invisible': [('group_product_pricelist', '=', False)]}">
-                            <button type="action" name="%(product.product_pricelist_action2)d" string="Pricelists" class="btn-link" icon="fa-arrow-right"/>
+                            <button type="action" name="%(product.product_pricelist_action2)d" string="Pricelists" class="btn-link" icon="oi-arrow-right"/>
                         </div>
                     </setting>
                     <setting help="Add a strikethrough price, as a comparison">
@@ -101,7 +101,7 @@
                         <field name="group_product_variant"/>
                         <div class="content-group" attrs="{'invisible': [('group_product_variant', '=', False)]}">
                             <div class="mt8">
-                                <button type="action" name="%(product.attribute_action)d" string="Attributes" class="btn-link" icon="fa-arrow-right"/>
+                                <button type="action" name="%(product.attribute_action)d" string="Attributes" class="btn-link" icon="oi-arrow-right"/>
                             </div>
                         </div>
                     </setting>
@@ -133,7 +133,7 @@
                              documentation="/applications/inventory_and_mrp/inventory/shipping/setup/third_party_shipper.html">
                         <div class="content-group">
                             <div class="mt16">
-                                <button type="action" name="%(delivery.action_delivery_carrier_form)d" string="Shipping Methods" class="btn-link" icon="fa-arrow-right"/>
+                                <button type="action" name="%(delivery.action_delivery_carrier_form)d" string="Shipping Methods" class="btn-link" icon="oi-arrow-right"/>
                             </div>
                         </div>
                     </setting>
@@ -146,7 +146,7 @@
                         <field name="module_delivery_dhl" widget="upgrade_boolean"/>
                         <div class="content-group">
                             <div class="mt8" attrs="{'invisible': [('module_delivery_dhl', '=', False)]}">
-                                <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="DHL Shipping Methods" class="btn-link" context="{'search_default_delivery_type': 'dhl'}"/>
+                                <button name="%(delivery.action_delivery_carrier_form)d" icon="oi-arrow-right" type="action" string="DHL Shipping Methods" class="btn-link" context="{'search_default_delivery_type': 'dhl'}"/>
                             </div>
                         </div>
                     </setting>
@@ -155,7 +155,7 @@
                         <field name="module_delivery_fedex" widget="upgrade_boolean"/>
                         <div class="content-group">
                             <div class="mt8" attrs="{'invisible': [('module_delivery_fedex', '=', False)]}">
-                                <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="FedEx Shipping Methods" class="btn-link" context="{'search_default_delivery_type': 'fedex'}"/>
+                                <button name="%(delivery.action_delivery_carrier_form)d" icon="oi-arrow-right" type="action" string="FedEx Shipping Methods" class="btn-link" context="{'search_default_delivery_type': 'fedex'}"/>
                             </div>
                         </div>
                     </setting>
@@ -164,7 +164,7 @@
                         <field name="module_delivery_usps" widget="upgrade_boolean"/>
                         <div class="content-group">
                             <div class="mt8" attrs="{'invisible': [('module_delivery_usps', '=', False)]}">
-                                <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="USPS Shipping Methods" class="btn-link" context="{'search_default_delivery_type': 'usps'}"/>
+                                <button name="%(delivery.action_delivery_carrier_form)d" icon="oi-arrow-right" type="action" string="USPS Shipping Methods" class="btn-link" context="{'search_default_delivery_type': 'usps'}"/>
                             </div>
                         </div>
                     </setting>
@@ -173,7 +173,7 @@
                         <field name="module_delivery_bpost" widget="upgrade_boolean"/>
                         <div class="content-group">
                             <div class="mt8" attrs="{'invisible': [('module_delivery_bpost', '=', False)]}">
-                                <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="bpost Shipping Methods" class="btn-link" context="{'search_default_delivery_type': 'bpost'}"/>
+                                <button name="%(delivery.action_delivery_carrier_form)d" icon="oi-arrow-right" type="action" string="bpost Shipping Methods" class="btn-link" context="{'search_default_delivery_type': 'bpost'}"/>
                             </div>
                         </div>
                     </setting>
@@ -182,7 +182,7 @@
                         <field name="module_delivery_easypost" widget="upgrade_boolean"/>
                         <div class="content-group">
                             <div class="mt8" attrs="{'invisible': [('module_delivery_easypost', '=', False)]}">
-                                <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="Easypost Shipping Methods" class="btn-link" context="{'search_default_delivery_type': 'easypost'}"/>
+                                <button name="%(delivery.action_delivery_carrier_form)d" icon="oi-arrow-right" type="action" string="Easypost Shipping Methods" class="btn-link" context="{'search_default_delivery_type': 'easypost'}"/>
                             </div>
                         </div>
                     </setting>
@@ -245,7 +245,7 @@
                         </div>
                     </div>
                     <div attrs="{'invisible': [('send_abandoned_cart_email', '=', False)]}" class="mt8">
-                        <button type="object" name="action_open_abandoned_cart_mail_template" string="Customize Abandoned Email Template" class="btn-link" icon="fa-arrow-right"/>
+                        <button type="object" name="action_open_abandoned_cart_mail_template" string="Customize Abandoned Email Template" class="btn-link" icon="oi-arrow-right"/>
                     </div>
                 </setting>
             </setting>
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 358e50b421a..0746a245eaa 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -1325,8 +1325,8 @@
                                             </div>
                                             <div class="mb-0 py-2 col-12 s_website_form_submit s_website_form_no_submit_options">
                                                 <div style="width: 200px;" class="s_website_form_label"/>
-                                                <a role="button" href="/shop/checkout" class="btn btn-secondary float-start"><span class="fa fa-chevron-left"/> Previous</a>
-                                                <a role="button" class="btn btn-primary float-end s_website_form_send" href="/shop/confirm_order">Next <span class="fa fa-chevron-right" /></a>
+                                                <a role="button" href="/shop/checkout" class="btn btn-secondary float-start"><span class="oi oi-chevron-left"/> Previous</a>
+                                                <a role="button" class="btn btn-primary float-end s_website_form_send" href="/shop/confirm_order">Next <span class="oi oi-chevron-right" /></a>
                                                 <span id="s_website_form_result"></span>
                                             </div>
                                         </div>
@@ -1520,7 +1520,7 @@
                                     <div class="d-flex justify-content-between">
                                         <div>
                                             <a role="button" href="/shop" class="btn btn-secondary mb32">
-                                                <span class="fa fa-chevron-left" />
+                                                <span class="oi oi-chevron-left" />
                                                 <span>Continue<span class="d-none d-md-inline"> Shopping</span></span>
                                             </a>
                                         </div>
@@ -1535,7 +1535,7 @@
                                                 </t>
                                                 <t t-else="">
                                                     <span>Process Checkout</span>
-                                                    <span class="fa fa-chevron-right"/>
+                                                    <span class="oi oi-chevron-right"/>
                                                 </t>
                                             </a>
                                             <t t-call="payment.express_checkout"/>
@@ -1713,12 +1713,12 @@
                             </t>
                             <div class="d-flex justify-content-between mt-3">
                                 <a role="button" href="/shop/cart" class="btn btn-secondary mb32">
-                                    <i class="fa fa-chevron-left"/>
+                                    <i class="oi oi-chevron-left"/>
                                     <span>Return to Cart</span>
                                 </a>
                                 <a role="button" href="/shop/confirm_order" class="btn btn-primary mb32">
                                     <span>Confirm</span>
-                                    <i class="fa fa-chevron-right"/>
+                                    <i class="oi oi-chevron-right"/>
                                 </a>
                             </div>
                         </div>
@@ -1909,12 +1909,12 @@
 
                                     <div class="d-flex justify-content-between">
                                         <a role="button" t-att-href="mode == ('new', 'billing') and '/shop/cart' or '/shop/checkout'" class="btn btn-secondary mb32">
-                                            <i class="fa fa-chevron-left"/>
+                                            <i class="oi oi-chevron-left"/>
                                             <span>Back</span>
                                         </a>
                                         <a role="button" href="#" class="btn btn-primary mb32 a-submit a-submit-disable a-submit-loading">
                                             <span>Next</span>
-                                            <i class="fa fa-chevron-right"/>
+                                            <i class="oi oi-chevron-right"/>
                                         </a>
                                     </div>
                                 </form>
@@ -1996,7 +1996,7 @@
                                 <a role="button" class="btn-link"
                                     groups="base.group_system"
                                     t-attf-href="/web#action=#{payment_action_id}">
-                                        <i class="fa fa-arrow-right"></i> Add payment providers
+                                        <i class="oi oi-arrow-right"></i> Add payment providers
                                 </a>
                             </div>
                             <div class="js_payment mt-3" t-if="not website_sale_order.amount_total" id="payment_method" name="o_website_sale_free_cart">
@@ -2020,7 +2020,7 @@
              class="form-check mt-2 o_accept_tc_button"/>
         <div class="float-start mt-2">
             <a role="button" href="/shop/cart" class="btn btn-secondary">
-                <i class="fa fa-chevron-left"/> Return to Cart
+                <i class="oi oi-chevron-left"/> Return to Cart
             </a>
         </div>
         <div class="float-end mt-2">
@@ -2028,8 +2028,8 @@
                     type="submit"
                     class="btn btn-primary"
                     disabled="true"
-                    data-icon-class="fa-chevron-right">
-                <t t-esc="submit_button_label"/> <i class="fa fa-chevron-right"/>
+                    data-icon-class="oi-chevron-right">
+                <t t-esc="submit_button_label"/> <i class="oi oi-chevron-right"/>
             </button>
         </div>
     </template>
@@ -2063,7 +2063,7 @@
                         </t>
                         <t t-else="">
                             <span>Proceed to Checkout</span>
-                            <span class="fa fa-chevron-right"/>
+                            <span class="oi oi-chevron-right"/>
                         </t>
                     </a>
                 </div>
@@ -2080,7 +2080,7 @@
             <div class="card-body p-xl-0">
                 <div class="toggle_summary d-xl-none">
                     <b>Your order: </b> <span id="amount_total_summary" class="monetary_field" t-field="website_sale_order.amount_total" t-options='{"widget": "monetary", "display_currency": website_sale_order.currency_id}'/>
-                    <span class='fa fa-chevron-down fa-border float-end' role="img" aria-label="Details" title="Details"></span>
+                    <span class='oi oi-chevron-down fa-border float-end' role="img" aria-label="Details" title="Details"></span>
                 </div>
                 <div t-if="not website_sale_order or not website_sale_order.website_order_line" class="alert alert-info">
                     Your cart is empty!
@@ -2360,10 +2360,10 @@
                 </div>
                 <t t-if="len(product_images) > 1">
                     <a class="carousel-control-prev" href="#o-carousel-product" role="button" data-bs-slide="prev">
-                        <span class="fa fa-chevron-left fa-2x oe_unmovable" role="img" aria-label="Previous" title="Previous"/>
+                        <span class="oi oi-chevron-left fa-2x oe_unmovable" role="img" aria-label="Previous" title="Previous"/>
                     </a>
                     <a class="carousel-control-next" href="#o-carousel-product" role="button" data-bs-slide="next">
-                        <span class="fa fa-chevron-right fa-2x oe_unmovable" role="img" aria-label="Next" title="Next"/>
+                        <span class="oi oi-chevron-right fa-2x oe_unmovable" role="img" aria-label="Next" title="Next"/>
                     </a>
                 </t>
             </div>
diff --git a/addons/website_sale_autocomplete/views/res_config_settings_views.xml b/addons/website_sale_autocomplete/views/res_config_settings_views.xml
index 605df28552f..6fcddb7086d 100644
--- a/addons/website_sale_autocomplete/views/res_config_settings_views.xml
+++ b/addons/website_sale_autocomplete/views/res_config_settings_views.xml
@@ -14,12 +14,12 @@
                     </div>
                     <div class="mt8">
                         <a target="_blank" href="https://console.cloud.google.com/getting-started">
-                            <i class="fa fa-arrow-right"/>
+                            <i class="oi oi-arrow-right"/>
                             Create a Google Project and get a key
                         </a>
                         <br/>
                         <a target="_blank" href="https://console.cloud.google.com/billing">
-                            <i class="fa fa-arrow-right"/>
+                            <i class="oi oi-arrow-right"/>
                             Enable billing on your Google Project
                         </a>
                     </div>
diff --git a/addons/website_sale_comparison/static/description/icon.png b/addons/website_sale_comparison/static/description/icon.png
index 47a75192d0a..f42acff3479 100644
Binary files a/addons/website_sale_comparison/static/description/icon.png and b/addons/website_sale_comparison/static/description/icon.png differ
diff --git a/addons/website_sale_comparison/static/description/icon.svg b/addons/website_sale_comparison/static/description/icon.svg
index ce3a5421899..5ff0b5253dd 100644
--- a/addons/website_sale_comparison/static/description/icon.svg
+++ b/addons/website_sale_comparison/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#DA956B"/><stop offset="100%" stop-color="#CC7039"/></linearGradient><path id="d" d="M23 27.281L27 43l1 4h19c1 0 1 2 0 2H26l-6-24h-2v1c0 .667-.333 1-1 1s-1-.333-1-1v-2c.066-.667.4-1 1-1h4c.517 0 .85.333 1 1l1 3.281zM45.5 55a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zm-19 0a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zM50 37.299v2.449c0 .11-.038.206-.115.287a.363.363 0 0 1-.272.121H32.977v2.45c0 .11-.038.206-.114.287a.363.363 0 0 1-.272.121.442.442 0 0 1-.29-.128l-3.857-4.082a.393.393 0 0 1-.11-.28.41.41 0 0 1 .11-.294l3.868-4.083a.366.366 0 0 1 .279-.114c.104 0 .195.04.272.12.076.082.114.177.114.288v2.45h16.636c.105 0 .196.04.272.12.077.081.115.177.115.288zm0-7.199a.41.41 0 0 1-.109.294l-3.869 4.082a.366.366 0 0 1-.278.115.363.363 0 0 1-.272-.121.403.403 0 0 1-.115-.287v-2.45H28.722a.363.363 0 0 1-.272-.12.403.403 0 0 1-.115-.288v-2.45c0-.11.038-.206.115-.286a.363.363 0 0 1 .272-.122h16.635v-2.449a.41.41 0 0 1 .11-.293.366.366 0 0 1 .277-.115c.097 0 .194.042.29.127l3.857 4.07A.41.41 0 0 1 50 30.1z"/><path id="e" d="M23 25.281L27 41l1 3h19c1 0 1 3 0 3H26l-6-24h-2v1c0 .667-.333 1-1 1s-1-.333-1-1v-2c.066-.667.4-1 1-1h4c.517 0 .85.333 1 1l1 3.281zM45.5 53a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zm-19 0a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zM50 34.689v2.45c0 .11-.038.205-.115.286a.363.363 0 0 1-.272.121H32.977v2.45c0 .11-.038.206-.114.287a.363.363 0 0 1-.272.121.442.442 0 0 1-.29-.127l-3.857-4.083a.393.393 0 0 1-.11-.28.41.41 0 0 1 .11-.294l3.868-4.082a.366.366 0 0 1 .279-.115c.104 0 .195.04.272.121.076.08.114.176.114.287v2.45h16.636c.105 0 .196.04.272.12.077.082.115.177.115.288zm0-7.198a.41.41 0 0 1-.109.293l-3.869 4.083a.366.366 0 0 1-.278.114.363.363 0 0 1-.272-.12.403.403 0 0 1-.115-.288v-2.45H28.722a.363.363 0 0 1-.272-.12.403.403 0 0 1-.115-.288v-2.449c0-.11.038-.206.115-.287a.363.363 0 0 1 .272-.121h16.635v-2.45a.41.41 0 0 1 .11-.293.366.366 0 0 1 .277-.115c.097 0 .194.043.29.128l3.857 4.07a.41.41 0 0 1 .109.293z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M32.073 69H4c-2 0-4-1-4-4V38.16l16.339-16.914L21 21l3.218 10.05 4.433-4.928h14.216l2.738-2.955 4.233 4.435-5.877 6.823c3.956-.137 5.915-.137 5.877 0-.013.046-.013 1.01 0 2.894L43.961 45H47l.709.999-3.337 3.855 2.886 2.366L32.073 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M15.724 6.397C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397L37.236 13H41.9c2.46 0 4.367 2.099 4.07 4.481l-3.106 25C42.613 44.49 40.866 46 38.793 46H11.207c-2.074 0-3.82-1.51-4.07-3.519l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603ZM32.917 13H17.082c0-.56.123-1.134.39-1.691l.956-2C19.102 7.9 20.551 7 22.144 7h5.711c1.593 0 3.042.9 3.716 2.308l.957 2c.266.558.39 1.132.39 1.692Z" fill="var(--o-icons-yellow-yellow, #F77B09)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M15.724 6.397C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397L37.236 13H41.9c2.46 0 4.367 2.099 4.07 4.481l-3.106 25C42.613 44.49 40.866 46 38.793 46H11.207c-2.074 0-3.82-1.51-4.07-3.519l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603ZM32.917 13H17.082c0-.56.123-1.134.39-1.691l.956-2C19.102 7.9 20.551 7 22.144 7h5.711c1.593 0 3.042.9 3.716 2.308l.957 2c.266.558.39 1.132.39 1.692Z" fill="url(#o_icon_website_sale_comparison__a)" fill-opacity=".2"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8.514 45.016a3.963 3.963 0 0 1-1.377-2.535l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397l2.59 5.777C35.5 28.256 23.848 41.405 8.515 45.016ZM17.082 13h15.835c0-.56-.123-1.134-.39-1.691l-.956-2C30.897 7.9 29.448 7 27.855 7h-5.711c-1.593 0-3.042.9-3.716 2.308l-.956 2a3.904 3.904 0 0 0-.39 1.692Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8.514 45.016a3.963 3.963 0 0 1-1.377-2.535l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397l2.59 5.777C35.5 28.256 23.848 41.405 8.515 45.016ZM17.082 13h15.835c0-.56-.123-1.134-.39-1.691l-.956-2C30.897 7.9 29.448 7 27.855 7h-5.711c-1.593 0-3.042.9-3.716 2.308l-.956 2a3.904 3.904 0 0 0-.39 1.692Z" fill="url(#o_icon_website_sale_comparison__b)" fill-opacity=".2"/><path d="m14.69 24.972 11.976-6.914-1.265 4.723 7.942 2.128a4 4 0 0 1 2.828 4.899l-.23.858-21.25-5.694Z" fill="var(--o-icons-white, #FFFFFF)"/><path d="M35.308 33.028 23.333 39.94l1.265-4.722-7.942-2.128a4 4 0 0 1-2.828-4.899l.23-.858 21.25 5.694Z" fill="var(--o-icons-white, #FFFFFF)"/><defs><linearGradient id="o_icon_website_sale_comparison__a" x1="4" y1="4" x2="53.412" y2="16.353" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_sale_comparison__b" x1="4" y1="4" x2="43.497" y2="11.912" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/website_sale_digital/static/description/icon.png b/addons/website_sale_digital/static/description/icon.png
index f64578d7ac0..d4f22585b51 100644
Binary files a/addons/website_sale_digital/static/description/icon.png and b/addons/website_sale_digital/static/description/icon.png differ
diff --git a/addons/website_sale_digital/static/description/icon.svg b/addons/website_sale_digital/static/description/icon.svg
index f93ed394c59..77c99780407 100644
--- a/addons/website_sale_digital/static/description/icon.svg
+++ b/addons/website_sale_digital/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#CDC484"/><stop offset="100%" stop-color="#B5AA59"/></linearGradient><path id="d" d="M24.594 27.281l3.284 14.7 24.038-.939c1.441 0 1.441 1.834.088 1.998L28.361 44l.942 3H51.11c.942 0 .942 2 0 2H27.42l-5.652-24h-1.884v1c0 .667-.314 1-.942 1-.628 0-.942-.333-.942-1v-2c.062-.667.376-1 .942-1h3.768c.487 0 .8.333.942 1l.942 3.281zM49.43 55a2.497 2.497 0 0 1-2.494-2.5c0-1.38 1.116-2.5 2.494-2.5a2.497 2.497 0 0 1 2.494 2.5c0 1.38-1.117 2.5-2.494 2.5zm-19.956 0a2.497 2.497 0 0 1-2.494-2.5c0-1.38 1.117-2.5 2.494-2.5a2.497 2.497 0 0 1 2.495 2.5c0 1.38-1.117 2.5-2.495 2.5zm13.851-31.422l-.195-2.227c-.108-1.236-.928-1.158-1.95-1.069l-3.686.323c-1.023.089-1.844.155-1.736 1.391l.195 2.227-5.529.484 1.18 13.477c.107 1.235 1.014 2.155 2.037 2.065l14.744-1.29c1.023-.09 1.756-1.152 1.648-2.388l-1.18-13.477-5.528.484zm-6.448-1.632l5.427-.495.195 2.227-5.454.47-.168-2.202zm.317 13.81l-.712-8.145 8.666 2.89-7.954 5.255z"/><path id="e" d="M24.594 25.281l3.284 14.7 24.038-.939c1.441 0 1.441 1.834.088 1.998L28.361 42l.942 3H51.11c.942 0 .942 2 0 2H27.42l-5.652-24h-1.884v1c0 .667-.314 1-.942 1-.628 0-.942-.333-.942-1v-2c.062-.667.376-1 .942-1h3.768c.487 0 .8.333.942 1l.942 3.281zM49.43 53a2.497 2.497 0 0 1-2.494-2.5c0-1.38 1.116-2.5 2.494-2.5a2.497 2.497 0 0 1 2.494 2.5c0 1.38-1.117 2.5-2.494 2.5zm-19.956 0a2.497 2.497 0 0 1-2.494-2.5c0-1.38 1.117-2.5 2.494-2.5a2.497 2.497 0 0 1 2.495 2.5c0 1.38-1.117 2.5-2.495 2.5zm13.851-31.422l-.195-2.227c-.108-1.236-.928-1.158-1.95-1.069l-3.686.323c-1.023.089-1.844.155-1.736 1.391l.195 2.227-5.529.484 1.18 13.477c.107 1.235 1.014 2.155 2.037 2.065l14.744-1.29c1.023-.09 1.756-1.152 1.648-2.388l-1.18-13.477-5.528.484zm-6.448-1.632l5.427-.495.195 2.227-5.454.47-.168-2.202zm.317 13.81l-.712-8.145 8.666 2.89-7.954 5.255z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M36.154 69H4c-2 0-4-1-4-4V38.622l18.355-17.41h4.96l1.23 7.474 5.835-5.712 2.4-.255 3.374-3.621 6.194-.611.832 3.94 5.577-1.215.993 14.768-5.361 4.836 8.365-.134-4.902 4.372 3.676 1.768-1.935 2.04 1.266 3.581L36.154 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M15.724 6.397C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397L37.236 13H41.9c2.46 0 4.367 2.099 4.07 4.481l-3.106 25C42.613 44.49 40.866 46 38.793 46H11.207c-2.074 0-3.82-1.51-4.07-3.519l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603ZM32.917 13H17.082c0-.56.123-1.134.39-1.691l.956-2C19.102 7.9 20.551 7 22.144 7h5.711c1.593 0 3.042.9 3.716 2.308l.957 2c.266.558.39 1.132.39 1.692Z" fill="var(--o-icons-teal-teal, #00A079)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M15.724 6.397C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397L37.236 13H41.9c2.46 0 4.367 2.099 4.07 4.481l-3.106 25C42.613 44.49 40.866 46 38.793 46H11.207c-2.074 0-3.82-1.51-4.07-3.519l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603ZM32.917 13H17.082c0-.56.123-1.134.39-1.691l.956-2C19.102 7.9 20.551 7 22.144 7h5.711c1.593 0 3.042.9 3.716 2.308l.957 2c.266.558.39 1.132.39 1.692Z" fill="url(#o_icon_website_sale_digital__a)" fill-opacity=".2"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8.514 45.016a3.963 3.963 0 0 1-1.377-2.535l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397l2.59 5.777C35.5 28.256 23.848 41.405 8.515 45.016ZM17.082 13h15.835c0-.56-.123-1.134-.39-1.691l-.956-2C30.897 7.9 29.448 7 27.855 7h-5.711c-1.593 0-3.042.9-3.716 2.308l-.956 2a3.904 3.904 0 0 0-.39 1.692Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8.514 45.016a3.963 3.963 0 0 1-1.377-2.535l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397l2.59 5.777C35.5 28.256 23.848 41.405 8.515 45.016ZM17.082 13h15.835c0-.56-.123-1.134-.39-1.691l-.956-2C30.897 7.9 29.448 7 27.855 7h-5.711c-1.593 0-3.042.9-3.716 2.308l-.956 2a3.904 3.904 0 0 0-.39 1.692Z" fill="url(#o_icon_website_sale_digital__b)" fill-opacity=".2"/><path d="M17.142 20.864a4 4 0 0 1 4.899-2.829l11.59 3.106a4 4 0 0 1 2.83 4.9l-3.106 11.59a4 4 0 0 1-4.9 2.829l-11.59-3.106a4 4 0 0 1-2.829-4.899l3.106-11.591Z" fill="var(--o-icons-white, #FFFFFF)"/><path d="m22 32.727 6.83-2.31L24.07 25 22 32.727Z" fill="var(--o-icons-teal-teal, #00A079)"/><path d="m22 32.727 6.83-2.31L24.07 25 22 32.727Z" fill="url(#o_icon_website_sale_digital__c)" fill-opacity=".2"/><defs><linearGradient id="o_icon_website_sale_digital__a" x1="4" y1="4" x2="53.412" y2="16.353" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_sale_digital__b" x1="4" y1="4" x2="43.497" y2="11.912" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_sale_digital__c" x1="22" y1="25" x2="30.141" y2="26.799" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/website_sale_loyalty/static/description/icon.png b/addons/website_sale_loyalty/static/description/icon.png
index 1833c60a1c1..b8fb36508ac 100644
Binary files a/addons/website_sale_loyalty/static/description/icon.png and b/addons/website_sale_loyalty/static/description/icon.png differ
diff --git a/addons/website_sale_loyalty/static/description/icon.svg b/addons/website_sale_loyalty/static/description/icon.svg
index 4bb830714c8..a631f2dc34c 100644
--- a/addons/website_sale_loyalty/static/description/icon.svg
+++ b/addons/website_sale_loyalty/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="98.162%" x2="0%" y1="1.838%" y2="100%"><stop offset="0%" stop-color="#797DA5"/><stop offset="50.799%" stop-color="#6D7194"/><stop offset="100%" stop-color="#626584"/></linearGradient><path id="d" d="M50 31.035a3.5 3.5 0 1 0 0 6.93v3.06a1.633 1.633 0 0 1-1.588 1.286L26.974 43l.998 4h18.955c.998 0 .998 2 0 2h-20.95L19.99 25h-1.996v1c0 .667-.332 1-.997 1S16 26.667 16 26v-2c.066-.667.398-1 .998-1h3.99c.516 0 .848.333.998 1l.998 3.281 25.428.037c1.045 0 1.588.761 1.588 2.018v1.7zM45.43 55a2.497 2.497 0 0 1-2.493-2.5c0-1.38 1.116-2.5 2.494-2.5a2.497 2.497 0 0 1 2.494 2.5c0 1.38-1.117 2.5-2.494 2.5zm-18.955 0a2.497 2.497 0 0 1-2.494-2.5c0-1.38 1.117-2.5 2.494-2.5a2.497 2.497 0 0 1 2.495 2.5c0 1.38-1.117 2.5-2.495 2.5zm12.7-24.996a.51.51 0 0 0-.409.2l-7.668 9.056c-.233.31.004.738.41.738l.696-.002a.51.51 0 0 0 .409-.2l7.63-9.056c.234-.312-.005-.74-.41-.738l-.658.002zm-5.841 4.371c1.29 0 2.334-.979 2.334-2.188 0-1.208-1.044-2.187-2.334-2.187S31 30.979 31 32.188c0 1.208 1.044 2.187 2.334 2.187zm0-3.125c.552 0 1 .42 1 .938 0 .517-.448.937-1 .937s-1-.42-1-.938c0-.517.448-.937 1-.937zm4.668 4.375c-1.29 0-2.334.979-2.334 2.188 0 1.208 1.044 2.187 2.334 2.187s2.334-.979 2.334-2.188c0-1.208-1.044-2.187-2.334-2.187zm0 3.125c-.553 0-1-.42-1-.938 0-.517.447-.937 1-.937.552 0 1 .42 1 .938 0 .517-.448.937-1 .937z"/><path id="e" d="M50 30a3 3 0 0 0 0 6v3.025a1.633 1.633 0 0 1-1.588 1.286L26.974 41l.998 4h18.955c.998 0 .998 2 0 2h-20.95L19.99 23h-1.996v1c0 .667-.332 1-.997 1S16 24.667 16 24v-2c.066-.667.398-1 .998-1h3.99c.516 0 .848.333.998 1l.998 3.281 25.428.037c1.045 0 1.588.761 1.588 2.018V30zm-4.57 23a2.497 2.497 0 0 1-2.493-2.5c0-1.38 1.116-2.5 2.494-2.5a2.497 2.497 0 0 1 2.494 2.5c0 1.38-1.117 2.5-2.494 2.5zm-18.955 0a2.497 2.497 0 0 1-2.494-2.5c0-1.38 1.117-2.5 2.494-2.5a2.497 2.497 0 0 1 2.495 2.5c0 1.38-1.117 2.5-2.495 2.5zM48 26a1 1 0 1 0 0 2 1 1 0 0 0 0-2zm0 11a1 1 0 1 0 0 2 1 1 0 0 0 0-2zm-8.825-8.996a.51.51 0 0 0-.409.2l-7.668 9.056c-.233.31.004.738.41.738l.696-.002a.51.51 0 0 0 .409-.2l7.63-9.056c.234-.312-.005-.74-.41-.738l-.658.002zm-5.841 4.371c1.29 0 2.334-.979 2.334-2.188 0-1.208-1.044-2.187-2.334-2.187S31 28.979 31 30.188c0 1.208 1.044 2.187 2.334 2.187zm0-3.125c.552 0 1 .42 1 .938 0 .517-.448.937-1 .937s-1-.42-1-.938c0-.517.448-.937 1-.937zm4.668 4.375c-1.29 0-2.334.979-2.334 2.188 0 1.208 1.044 2.187 2.334 2.187s2.334-.979 2.334-2.188c0-1.208-1.044-2.187-2.334-2.187zm0 3.125c-.553 0-1-.42-1-.938 0-.517.447-.937 1-.937.552 0 1 .42 1 .938 0 .517-.448.937-1 .937z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M33.317 69H4c-2 0-4-1-4-4V38.29l16.258-16.95L21 21l2 5h26.583l.371 3.987-3.862 4.883 3.764 1.445-.11 3.27L45.076 45H47l.507 1.61-1.993 1.943 1.815 3.434L33.317 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M15.724 6.397C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397L37.236 13H41.9c2.46 0 4.367 2.099 4.07 4.481l-3.106 25C42.613 44.49 40.866 46 38.793 46H11.207c-2.074 0-3.82-1.51-4.07-3.519l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603ZM32.917 13H17.082c0-.56.123-1.134.39-1.691l.956-2C19.102 7.9 20.551 7 22.144 7h5.711c1.593 0 3.042.9 3.716 2.308l.957 2c.266.558.39 1.132.39 1.692Z" fill="var(--o-icons-red-red, #F9383D)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M15.724 6.397C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397L37.236 13H41.9c2.46 0 4.367 2.099 4.07 4.481l-3.106 25C42.613 44.49 40.866 46 38.793 46H11.207c-2.074 0-3.82-1.51-4.07-3.519l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603ZM32.917 13H17.082c0-.56.123-1.134.39-1.691l.956-2C19.102 7.9 20.551 7 22.144 7h5.711c1.593 0 3.042.9 3.716 2.308l.957 2c.266.558.39 1.132.39 1.692Z" fill="url(#o_icon_website_sale_loyalty__a)" fill-opacity=".2"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8.514 45.016a3.963 3.963 0 0 1-1.377-2.535l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397l2.59 5.777C35.5 28.256 23.848 41.405 8.515 45.016ZM17.082 13h15.835c0-.56-.123-1.134-.39-1.691l-.956-2C30.897 7.9 29.448 7 27.855 7h-5.711c-1.593 0-3.042.9-3.716 2.308l-.956 2a3.904 3.904 0 0 0-.39 1.692Z" fill="var(--o-icons-red-pure, #FC787D)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8.514 45.016a3.963 3.963 0 0 1-1.377-2.535l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397l2.59 5.777C35.5 28.256 23.848 41.405 8.515 45.016ZM17.082 13h15.835c0-.56-.123-1.134-.39-1.691l-.956-2C30.897 7.9 29.448 7 27.855 7h-5.711c-1.593 0-3.042.9-3.716 2.308l-.956 2a3.904 3.904 0 0 0-.39 1.692Z" fill="url(#o_icon_website_sale_loyalty__b)" fill-opacity=".2"/><path d="M17.142 20.864a4 4 0 0 1 4.899-2.829l11.59 3.106a4 4 0 0 1 2.83 4.9l-3.106 11.59a4 4 0 0 1-4.9 2.829l-11.59-3.106a4 4 0 0 1-2.829-4.899l3.106-11.591Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M17.142 20.864a4 4 0 0 1 4.899-2.829l11.59 3.106a4 4 0 0 1 2.83 4.9l-3.106 11.59a4 4 0 0 1-4.9 2.829l-11.59-3.106a4 4 0 0 1-2.829-4.899l3.106-11.591Z" fill="var(--o-icons-white, #FFFFFF)"/><path d="M23.135 28.615A2.828 2.828 0 1 1 26.28 26.8l3.3-1.906c.492-.284 1.056-.23 1.258.122l.919 1.59-5.188 2.996a2.828 2.828 0 1 1-2.726 1.574l-3.666 2.116c-.492.284-1.055.23-1.258-.122L18 31.58l5.135-2.965Z" fill="var(--o-icons-red-red, #F9383D)"/><path d="M23.135 28.615A2.828 2.828 0 1 1 26.28 26.8l3.3-1.906c.492-.284 1.056-.23 1.258.122l.919 1.59-5.188 2.996a2.828 2.828 0 1 1-2.726 1.574l-3.666 2.116c-.492.284-1.055.23-1.258-.122L18 31.58l5.135-2.965Z" fill="url(#o_icon_website_sale_loyalty__c)" fill-opacity=".2"/><defs><linearGradient id="o_icon_website_sale_loyalty__a" x1="4" y1="4" x2="53.412" y2="16.353" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_sale_loyalty__b" x1="4" y1="4" x2="43.497" y2="11.912" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_sale_loyalty__c" x1="18" y1="23" x2="33.939" y2="27.474" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/website_sale_loyalty/wizard/res_config_settings_views.xml b/addons/website_sale_loyalty/wizard/res_config_settings_views.xml
index c20c2109eaa..5193bc5b097 100644
--- a/addons/website_sale_loyalty/wizard/res_config_settings_views.xml
+++ b/addons/website_sale_loyalty/wizard/res_config_settings_views.xml
@@ -12,7 +12,7 @@
                         <button name="%(loyalty.loyalty_program_discount_loyalty_action)d"
                             type="action"
                             string="Loyalty Programs"
-                            icon="fa-arrow-right"
+                            icon="oi-arrow-right"
                             class="btn-link"/>
                     </div>
                 </div>
diff --git a/addons/website_sale_mondialrelay/views/res_config_settings_views.xml b/addons/website_sale_mondialrelay/views/res_config_settings_views.xml
index 8fa40fc4473..aa7ece32436 100644
--- a/addons/website_sale_mondialrelay/views/res_config_settings_views.xml
+++ b/addons/website_sale_mondialrelay/views/res_config_settings_views.xml
@@ -8,7 +8,7 @@
             <setting id="shipping_provider_mondialrelay_setting" position="inside">
                 <div class="content-group">
                     <div class="mt8" attrs="{'invisible': [('module_delivery_mondialrelay', '=', False)]}">
-                        <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="Mondial Relay Shipping Methods" class="btn-link" context="{'search_default_is_mondialrelay': True}"/>
+                        <button name="%(delivery.action_delivery_carrier_form)d" icon="oi-arrow-right" type="action" string="Mondial Relay Shipping Methods" class="btn-link" context="{'search_default_is_mondialrelay': True}"/>
                     </div>
                 </div>
             </setting>
diff --git a/addons/website_sale_picking/views/res_config_settings_views.xml b/addons/website_sale_picking/views/res_config_settings_views.xml
index 2fa95189e03..b32c331dd97 100644
--- a/addons/website_sale_picking/views/res_config_settings_views.xml
+++ b/addons/website_sale_picking/views/res_config_settings_views.xml
@@ -13,7 +13,7 @@
                            context="{'default_website_id': website_id, 'default_product_id': %(website_sale_picking.onsite_delivery_product)d, 'default_delivery_type': 'onsite', 'default_website_published': True, 'default_company_id': company_id}"/>
                 </div>
                 <div class="mt8">
-                    <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="Customize Pickup Sites" class="btn-link" context="{'search_default_delivery_type': 'onsite'}"/>
+                    <button name="%(delivery.action_delivery_carrier_form)d" icon="oi-arrow-right" type="action" string="Customize Pickup Sites" class="btn-link" context="{'search_default_delivery_type': 'onsite'}"/>
                 </div>
             </xpath>
         </field>
diff --git a/addons/website_sale_stock/static/description/icon.png b/addons/website_sale_stock/static/description/icon.png
index 919aab48aef..a3910afef62 100644
Binary files a/addons/website_sale_stock/static/description/icon.png and b/addons/website_sale_stock/static/description/icon.png differ
diff --git a/addons/website_sale_stock/static/description/icon.svg b/addons/website_sale_stock/static/description/icon.svg
index b519bd02d02..9ceb4c949d1 100644
--- a/addons/website_sale_stock/static/description/icon.svg
+++ b/addons/website_sale_stock/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#B06161"/><stop offset="45.785%" stop-color="#984E4E"/><stop offset="100%" stop-color="#7C3838"/></linearGradient><path id="d" d="M24.592 27.281l3.283 14.7L31 41.796V39h19v2.042h1.908c1.441 0 1.441 1.834.088 1.998L28.36 44l.942 3h21.801c.942 0 .942 2 0 2H27.417l-5.65-24h-1.884v1c0 .667-.313 1-.941 1-.628 0-.942-.333-.942-1v-2c.062-.667.376-1 .942-1h3.767c.486 0 .8.333.941 1l.942 3.281zM49.423 55a2.497 2.497 0 0 1-2.493-2.5c0-1.38 1.116-2.5 2.493-2.5a2.497 2.497 0 0 1 2.494 2.5c0 1.38-1.117 2.5-2.494 2.5zm-19.95 0a2.497 2.497 0 0 1-2.494-2.5c0-1.38 1.116-2.5 2.494-2.5a2.497 2.497 0 0 1 2.493 2.5c0 1.38-1.116 2.5-2.493 2.5zM31 35h19v3H31v-3zm0-5h19v4H31v-4zm0-5h19v4H31v-4zm1 1v2h17v-2H32z"/><path id="e" d="M24.592 25.281l3.283 14.7L31 39.796V37h19v2.042h1.908c1.441 0 1.441 1.834.088 1.998L28.36 42l.942 3h21.801c.942 0 .942 2 0 2H27.417l-5.65-24h-1.884v1c0 .667-.313 1-.941 1-.628 0-.942-.333-.942-1v-2c.062-.667.376-1 .942-1h3.767c.486 0 .8.333.941 1l.942 3.281zM49.423 53a2.497 2.497 0 0 1-2.493-2.5c0-1.38 1.116-2.5 2.493-2.5a2.497 2.497 0 0 1 2.494 2.5c0 1.38-1.117 2.5-2.494 2.5zm-19.95 0a2.497 2.497 0 0 1-2.494-2.5c0-1.38 1.116-2.5 2.494-2.5a2.497 2.497 0 0 1 2.493 2.5c0 1.38-1.116 2.5-2.493 2.5zM31 33h19v3H31v-3zm0-5h19v4H31v-4zm0-5h19v4H31v-4zm1 1v2h17v-2H32z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M35.869 69H4c-2 0-4-1-4-4V38.32l18.528-17.185h4.459l2.385 7.467L31 23h19v16l2.5 1.5-9.773 4.8H51V47l-.637 1.385 1.485 2.626-.388.927L35.869 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M15.724 6.397C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397L37.236 13H41.9c2.46 0 4.367 2.099 4.07 4.481l-3.106 25C42.613 44.49 40.866 46 38.793 46H11.207c-2.074 0-3.82-1.51-4.07-3.519l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603ZM32.917 13H17.082c0-.56.123-1.134.39-1.691l.956-2C19.102 7.9 20.551 7 22.144 7h5.711c1.593 0 3.042.9 3.716 2.308l.957 2c.266.558.39 1.132.39 1.692Z" fill="var(--o-icons-cyan-cyan, #0382F3)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M15.724 6.397C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397L37.236 13H41.9c2.46 0 4.367 2.099 4.07 4.481l-3.106 25C42.613 44.49 40.866 46 38.793 46H11.207c-2.074 0-3.82-1.51-4.07-3.519l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603ZM32.917 13H17.082c0-.56.123-1.134.39-1.691l.956-2C19.102 7.9 20.551 7 22.144 7h5.711c1.593 0 3.042.9 3.716 2.308l.957 2c.266.558.39 1.132.39 1.692Z" fill="url(#o_icon_website_sale_stock__a)" fill-opacity=".2"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8.514 45.016a3.963 3.963 0 0 1-1.377-2.535l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397l2.59 5.777C35.5 28.256 23.848 41.405 8.515 45.016ZM17.082 13h15.835c0-.56-.123-1.134-.39-1.691l-.956-2C30.897 7.9 29.448 7 27.855 7h-5.711c-1.593 0-3.042.9-3.716 2.308l-.956 2a3.904 3.904 0 0 0-.39 1.692Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8.514 45.016a3.963 3.963 0 0 1-1.377-2.535l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397l2.59 5.777C35.5 28.256 23.848 41.405 8.515 45.016ZM17.082 13h15.835c0-.56-.123-1.134-.39-1.691l-.956-2C30.897 7.9 29.448 7 27.855 7h-5.711c-1.593 0-3.042.9-3.716 2.308l-.956 2a3.904 3.904 0 0 0-.39 1.692Z" fill="url(#o_icon_website_sale_stock__b)" fill-opacity=".2"/><path d="M17.142 20.864a4 4 0 0 1 4.899-2.829l11.59 3.106a4 4 0 0 1 2.83 4.899l-3.107 11.591a4 4 0 0 1-4.899 2.829l-11.59-3.106a4 4 0 0 1-2.83-4.9l3.107-11.59Z" fill="var(--o-icons-white, #FFFFFF)"/><defs><linearGradient id="o_icon_website_sale_stock__a" x1="4" y1="4" x2="53.412" y2="16.353" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_sale_stock__b" x1="4" y1="4" x2="43.497" y2="11.912" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/website_sale_wishlist/static/description/icon.png b/addons/website_sale_wishlist/static/description/icon.png
index dc661811a8f..038278486f1 100644
Binary files a/addons/website_sale_wishlist/static/description/icon.png and b/addons/website_sale_wishlist/static/description/icon.png differ
diff --git a/addons/website_sale_wishlist/static/description/icon.svg b/addons/website_sale_wishlist/static/description/icon.svg
index 9b04ee49e68..44ee6f7803a 100644
--- a/addons/website_sale_wishlist/static/description/icon.svg
+++ b/addons/website_sale_wishlist/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#269396"/><stop offset="100%" stop-color="#218689"/></linearGradient><path id="d" d="M50.363 41a1.636 1.636 0 0 1-1.59 1.286L27 43l1 4h19c1 0 1 2 0 2H26l-6-24h-2v1c0 .667-.333 1-1 1s-1-.333-1-1v-2c.066-.667.4-1 1-1h4c.517 0 .85.333 1 1l1 3.281h28.45c1.048 0 1.824.985 1.592 2.019L50.363 41zM45.5 55a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zm-19 0a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zm11.375-15c.114 0 .21-.04.289-.118l4.084-3.934c1.001-1.001 1.502-1.985 1.502-2.95 0-.962-.278-1.714-.833-2.256-.555-.542-1.322-.813-2.301-.813-.271 0-.548.047-.83.14-.282.095-.544.221-.786.38a8.39 8.39 0 0 0-.627.45c-.175.14-.34.288-.498.446a6.041 6.041 0 0 0-.498-.446 8.39 8.39 0 0 0-.627-.45 3.357 3.357 0 0 0-.786-.38 2.614 2.614 0 0 0-.83-.14c-.979 0-1.746.27-2.301.813-.555.542-.833 1.294-.833 2.255 0 .293.051.595.154.905.103.31.22.575.35.793.132.219.28.432.447.64.166.207.287.35.364.43.076.078.136.135.18.17l4.091 3.947a.392.392 0 0 0 .289.118z"/><path id="e" d="M50.363 39a1.636 1.636 0 0 1-1.59 1.286L27 41l1 4h19c1 0 1 2 0 2H26l-6-24h-2v1c0 .667-.333 1-1 1s-1-.333-1-1v-2c.066-.667.4-1 1-1h4c.517 0 .85.333 1 1l1 3.281h28.45c1.048 0 1.824.985 1.592 2.019L50.363 39zM45.5 53a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zm-19 0a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zm11.375-15c.114 0 .21-.04.289-.118l4.084-3.934c1.001-1.001 1.502-1.985 1.502-2.95 0-.962-.278-1.714-.833-2.256-.555-.542-1.322-.813-2.301-.813-.271 0-.548.047-.83.14-.282.095-.544.221-.786.38a8.39 8.39 0 0 0-.627.45c-.175.14-.34.288-.498.446a6.041 6.041 0 0 0-.498-.446 8.39 8.39 0 0 0-.627-.45 3.357 3.357 0 0 0-.786-.38 2.614 2.614 0 0 0-.83-.14c-.979 0-1.746.27-2.301.813-.555.542-.833 1.294-.833 2.255 0 .293.051.595.154.905.103.31.22.575.35.793.132.219.28.432.447.64.166.207.287.35.364.43.076.078.136.135.18.17l4.091 3.947a.392.392 0 0 0 .289.118z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M31.59 69H4c-2 0-4-1-4-4V38.29l16.235-16.918L21 21l2 5h29.636L50.23 39.393 45.537 45H47l.511 1.724-2.21 2.392 2.3 2.671L31.59 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M15.724 6.397C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397L37.236 13H41.9c2.46 0 4.367 2.099 4.07 4.481l-3.106 25C42.613 44.49 40.866 46 38.793 46H11.207c-2.074 0-3.82-1.51-4.07-3.519l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603ZM32.917 13H17.082c0-.56.123-1.134.39-1.691l.956-2C19.102 7.9 20.551 7 22.144 7h5.711c1.593 0 3.042.9 3.716 2.308l.957 2c.266.558.39 1.132.39 1.692Z" fill="var(--o-icons-red-red, #F9383D)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M15.724 6.397C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397L37.236 13H41.9c2.46 0 4.367 2.099 4.07 4.481l-3.106 25C42.613 44.49 40.866 46 38.793 46H11.207c-2.074 0-3.82-1.51-4.07-3.519l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603ZM32.917 13H17.082c0-.56.123-1.134.39-1.691l.956-2C19.102 7.9 20.551 7 22.144 7h5.711c1.593 0 3.042.9 3.716 2.308l.957 2c.266.558.39 1.132.39 1.692Z" fill="url(#o_icon_website_sale_wishlist__a)" fill-opacity=".2"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8.514 45.016a3.963 3.963 0 0 1-1.377-2.535l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397l2.59 5.777C35.5 28.256 23.848 41.405 8.515 45.016ZM17.082 13h15.835c0-.56-.123-1.134-.39-1.691l-.956-2C30.897 7.9 29.448 7 27.855 7h-5.711c-1.593 0-3.042.9-3.716 2.308l-.956 2a3.904 3.904 0 0 0-.39 1.692Z" fill="var(--o-icons-red-pure, #FC787D)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8.514 45.016a3.963 3.963 0 0 1-1.377-2.535l-3.107-25C3.734 15.1 5.64 13 8.1 13h4.663l2.961-6.603C16.377 4.94 17.852 4 19.481 4h11.037c1.63 0 3.104.94 3.757 2.397l2.59 5.777C35.5 28.256 23.848 41.405 8.515 45.016ZM17.082 13h15.835c0-.56-.123-1.134-.39-1.691l-.956-2C30.897 7.9 29.448 7 27.855 7h-5.711c-1.593 0-3.042.9-3.716 2.308l-.956 2a3.904 3.904 0 0 0-.39 1.692Z" fill="url(#o_icon_website_sale_wishlist__b)" fill-opacity=".2"/><path d="M36.087 23.945c1.87 3.077.777 7.002-2.44 8.767l-11.084 6.082c-.774.425-1.758.171-2.208-.57L13.913 27.62c-1.87-3.077-.777-7.003 2.44-8.768 3.216-1.765 7.34-.7 9.209 2.377l.483.796.833-.457c3.216-1.765 7.34-.7 9.209 2.377Z" fill="var(--o-icons-white, #FFFFFF)"/><defs><linearGradient id="o_icon_website_sale_wishlist__a" x1="4" y1="4" x2="53.412" y2="16.353" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_sale_wishlist__b" x1="4" y1="4" x2="43.497" y2="11.912" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/website_slides/__manifest__.py b/addons/website_slides/__manifest__.py
index 2eabde65c2b..59fc539da0e 100644
--- a/addons/website_slides/__manifest__.py
+++ b/addons/website_slides/__manifest__.py
@@ -253,7 +253,7 @@ Featuring
             ('include', 'web._assets_helpers'),
             'web/static/src/scss/pre_variables.scss',
             'web/static/lib/bootstrap/scss/_variables.scss',
-            ('include', 'web._assets_bootstrap'),
+            ('include', 'web._assets_bootstrap_frontend'),
             'website_slides/static/src/scss/website_slides.scss',
             ('include', 'web.pdf_js_lib'),
             'website_slides/static/lib/pdfslidesviewer/PDFSlidesViewer.js',
diff --git a/addons/website_slides/static/description/icon.png b/addons/website_slides/static/description/icon.png
index 956b0420048..a35f21b0a2c 100644
Binary files a/addons/website_slides/static/description/icon.png and b/addons/website_slides/static/description/icon.png differ
diff --git a/addons/website_slides/static/description/icon.svg b/addons/website_slides/static/description/icon.svg
index c34e9422f51..bc3742e06ef 100644
--- a/addons/website_slides/static/description/icon.svg
+++ b/addons/website_slides/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#B06161"/><stop offset="45.785%" stop-color="#984E4E"/><stop offset="100%" stop-color="#7C3838"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M44.5 69H4c-2 0-4-1-4-4V37.061L13.363 19H40l3 6-4.495 6.88L53.393 35l-5.208 6.243 10.564 8.238L44.5 69z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><path fill="#000" d="M33.875 44H15a2 2 0 0 1-2-2V22a2 2 0 0 1 2-2h26a2 2 0 0 1 2 2v4.865a7.499 7.499 0 0 0-4 6.635c0 1.946.74 3.718 1.956 5.051a4.099 4.099 0 0 0-.387-.021c-2.049 0-1.256-.22-3.073-2.05-3.187 1.066-6.105 4.876-6.105 5.55.625.317 1.453.973 2.484 1.97zM43 43.132c2.348-1.51 8.09-1.51 10.439 0 1.565 1.007 3.392 3.775 5.48 8.304-1.549 1.77-2.593 2.525-3.132 2.265-1.044-1.51-1.826-2.768-2.348-3.775v5.284c-3.653 1.007-7.306 1.007-10.96 0v-5.284C38.16 45.976 35.334 43.666 34 43c0-.573 0-1 1-2 .667-.667 1.667-1.333 3-2 1.768 3.761 3.434 5.139 5 4.132zm4.74.868l-1.13 4.578 1.695 2.29L50 48.578 48.87 44h-1.13zM22 51l6-7 6 7h-2l-4-5-4 5h-2zm6-31v-2 2zm19.5 21a6.5 6.5 0 1 1 0-13 6.5 6.5 0 0 1 0 13z" opacity=".3"/><path fill="#FFF" d="M33.875 42H15a2 2 0 0 1-2-2V20a2 2 0 0 1 2-2h26a2 2 0 0 1 2 2v4.865a7.499 7.499 0 0 0-4 6.635c0 1.946.74 3.718 1.956 5.051a4.099 4.099 0 0 0-.387-.021c-2.049 0-1.256-.22-3.073-2.05-3.187 1.066-6.105 4.876-6.105 5.55.625.317 1.453.973 2.484 1.97zM43 41.132c2.348-1.51 8.09-1.51 10.439 0 1.565 1.007 3.392 3.775 5.48 8.304-1.549 1.77-2.593 2.525-3.132 2.265-1.044-1.51-1.826-2.768-2.348-3.775v5.284c-3.653 1.007-7.306 1.007-10.96 0v-5.284C38.16 43.976 35.334 41.666 34 41c0-.573 0-1 1-2 .667-.667 1.667-1.333 3-2 1.768 3.761 3.434 5.139 5 4.132zm4.74.868l-1.13 4.578 1.695 2.29L50 46.578 48.87 42h-1.13zM22 49l6-7 6 7h-2l-4-5-4 5h-2zm6-31v-2 2zm19.5 21a6.5 6.5 0 1 1 0-13 6.5 6.5 0 0 1 0 13z"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M41.413 29.672C41.413 38.69 34.065 46 25.001 46c-9.065 0-16.413-7.31-16.413-16.328 0-9.017 7.348-16.327 16.413-16.327 9.064 0 16.412 7.31 16.412 16.327Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path d="M41.413 29.672C41.413 38.69 34.065 46 25.001 46c-9.065 0-16.413-7.31-16.413-16.328 0-9.017 7.348-16.327 16.413-16.327 9.064 0 16.412 7.31 16.412 16.327Z" fill="url(#o_icon_website_slides__a)" fill-opacity=".2"/><path d="M22.637 5.551a5.337 5.337 0 0 1 4.726 0L50 16.921 27.363 28.288a5.337 5.337 0 0 1-4.726 0L0 16.92 22.637 5.551Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M22.637 5.551a5.337 5.337 0 0 1 4.726 0L50 16.921 27.363 28.288a5.337 5.337 0 0 1-4.726 0L0 16.92 22.637 5.551Z" fill="url(#o_icon_website_slides__b)" fill-opacity=".2"/><path d="M39.574 22.157 27.363 28.29a5.336 5.336 0 0 1-4.725 0l-12.212-6.134A16.422 16.422 0 0 1 25 13.345a16.42 16.42 0 0 1 14.574 8.812Z" fill="var(--o-icons-purple-teal, #003458)"/><path d="M39.574 22.157 27.363 28.29a5.336 5.336 0 0 1-4.725 0l-12.212-6.134A16.422 16.422 0 0 1 25 13.345a16.42 16.42 0 0 1 14.574 8.812Z" fill="url(#o_icon_website_slides__c)" fill-opacity=".3"/><defs><linearGradient id="o_icon_website_slides__a" x1="8.588" y1="13.345" x2="47.182" y2="23.044" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_slides__b" x1="0" y1="5" x2="49.023" y2="30.704" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_website_slides__c" x1="10.426" y1="13.345" x2="40.263" y2="27.376" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/addons/website_slides/static/src/scss/slide_views.scss b/addons/website_slides/static/src/scss/slide_views.scss
index 174f5bc65b7..b75247d0fde 100644
--- a/addons/website_slides/static/src/scss/slide_views.scss
+++ b/addons/website_slides/static/src/scss/slide_views.scss
@@ -17,27 +17,3 @@ table.o_section_list_view tr.o_data_row.o_is_section {
     border-top: 1px solid #BBB;
     border-bottom: 1px solid #BBB;
 }
-
-// Ribbon specific style for channel and attendee kanban
-.o_slide_channel_kanban .o_kanban_renderer {
-    .ribbon {
-        &::before, &::after {
-            display: none;
-        }
-
-        span {
-            padding: 5px;
-            font-size: small;
-            z-index: unset;
-            height: auto;
-        }
-    }
-    .ribbon-top-right {
-        margin-top: -$o-kanban-dashboard-vpadding;
-
-        span {
-            left: 0px;
-            right: 30px;
-        }
-    }
-}
diff --git a/addons/website_slides/static/src/views/slide_channel_partner_list/slide_channel_partner_list_controller.js b/addons/website_slides/static/src/views/slide_channel_partner_list/slide_channel_partner_list_controller.js
index 6eae669f38b..90f73289747 100644
--- a/addons/website_slides/static/src/views/slide_channel_partner_list/slide_channel_partner_list_controller.js
+++ b/addons/website_slides/static/src/views/slide_channel_partner_list/slide_channel_partner_list_controller.js
@@ -33,3 +33,4 @@ export default class SlideChannelPartnerListController extends ListController {
         });
     }
 }
+SlideChannelPartnerListController.template = "website_slides.SlideChannelPartnerListView";
diff --git a/addons/website_slides/static/src/views/slide_channel_partner_list/slide_channel_partner_list_view.js b/addons/website_slides/static/src/views/slide_channel_partner_list/slide_channel_partner_list_view.js
index b51068f1aac..f9c177e09ce 100644
--- a/addons/website_slides/static/src/views/slide_channel_partner_list/slide_channel_partner_list_view.js
+++ b/addons/website_slides/static/src/views/slide_channel_partner_list/slide_channel_partner_list_view.js
@@ -8,7 +8,6 @@ import SlideChannelPartnerListController from './slide_channel_partner_list_cont
 export const SlideChannelPartnerListView = {
     ...listView,
     Controller: SlideChannelPartnerListController,
-    buttonTemplate: 'website_slides.SlideChannelPartnerListView.buttons',
 };
 
 registry.category('views').add('slide_channel_partner_enroll_tree', SlideChannelPartnerListView);
diff --git a/addons/website_slides/static/src/views/slide_channel_partner_list/slide_channel_partner_list_view.xml b/addons/website_slides/static/src/views/slide_channel_partner_list/slide_channel_partner_list_view.xml
index 2dfdbdb4408..8a612fd0c8e 100644
--- a/addons/website_slides/static/src/views/slide_channel_partner_list/slide_channel_partner_list_view.xml
+++ b/addons/website_slides/static/src/views/slide_channel_partner_list/slide_channel_partner_list_view.xml
@@ -2,7 +2,7 @@
 
 <templates xml:space="preserve">
 
-    <t t-inherit="web.ListView.Buttons" t-inherit-mode="primary" owl="1" t-name="website_slides.SlideChannelPartnerListView.buttons">
+    <t t-inherit="web.ListView" t-inherit-mode="primary" owl="1" t-name="website_slides.SlideChannelPartnerListView">
         <xpath expr="//t[@t-foreach='archInfo.headerButtons']" position="after">
             <button t-if="channelId" type="button" class="btn btn-primary" t-on-click="_openEnrollWizard">
                 New
diff --git a/addons/website_slides/static/src/xml/slide_quiz.xml b/addons/website_slides/static/src/xml/slide_quiz.xml
index 169cbd9892c..7b9427f7c98 100644
--- a/addons/website_slides/static/src/xml/slide_quiz.xml
+++ b/addons/website_slides/static/src/xml/slide_quiz.xml
@@ -115,7 +115,7 @@
                         Reset
                     </button>
                     <button t-if="widget.slide.completed &amp;&amp; widget.slide.hasNext" class="btn btn-primary o_wslides_quiz_continue">
-                        Continue <i class="fa fa-chevron-right ms-1"/>
+                        Continue <i class="oi oi-chevron-right ms-1"/>
                     </button>
                 </div>
             </div>
@@ -176,7 +176,7 @@
                         <a type="button" target="_blank" t-attf-href="/profile/user/#{widget.userId}" class="btn btn-light border">Check Profile</a>
                     </t>
                     <t t-if="widget.hasNext">
-                        <button type="button" class="btn btn-light border o_wslides_quiz_modal_btn">Next <i class="fa fa-chevron-right"/></button>
+                        <button type="button" class="btn btn-light border o_wslides_quiz_modal_btn">Next <i class="oi oi-chevron-right"/></button>
                     </t>
                     <t t-else="">
                         <a type="button" href="/slides" class="btn btn-light border">End course</a>
diff --git a/addons/website_slides/views/res_config_settings_views.xml b/addons/website_slides/views/res_config_settings_views.xml
index ba7e7da3ea1..794f85385e5 100644
--- a/addons/website_slides/views/res_config_settings_views.xml
+++ b/addons/website_slides/views/res_config_settings_views.xml
@@ -18,7 +18,7 @@
                             <field name="website_slide_google_app_key" class="oe_inline"/>
                         </div>
                         <div class="oe_link">
-                            <a href="https://console.developers.google.com/flows/enableapi?apiid=drive,youtube"><span class="fa fa-arrow-right"/>
+                            <a href="https://console.developers.google.com/flows/enableapi?apiid=drive,youtube"><span class="oi oi-arrow-right"/>
                                 Create a Google Project and Get a Key
                             </a>
                         </div>
diff --git a/addons/website_slides/views/slide_channel_views.xml b/addons/website_slides/views/slide_channel_views.xml
index d7fc4aaa130..f889cfbc413 100644
--- a/addons/website_slides/views/slide_channel_views.xml
+++ b/addons/website_slides/views/slide_channel_views.xml
@@ -13,8 +13,7 @@
                     </header>
                     <sheet>
                         <div class="oe_button_box" name="button_box">
-                            <button
-                                icon="fa-eye"
+                            <button icon="fa-eye"
                                 class="oe_stat_button"
                                 groups="website_slides.group_website_slides_officer"
                                 attrs="{'invisible': [('total_views', '=', 0)]}">
@@ -25,10 +24,7 @@
                                 icon="fa-files-o"
                                 class="oe_stat_button"
                                 groups="website_slides.group_website_slides_officer">
-                                <span>
-                                    <field name="total_slides" widget="statinfo" nolabel="1"/>
-                                    Published Contents
-                                </span>
+                                <field name="total_slides" widget="statinfo" string="Published Contents"/>
                             </button>
                             <button name="action_redirect_to_completed_members"
                                 type="object"
@@ -60,7 +56,7 @@
                             </button>
                             <field name="is_published" widget="website_redirect_button"/>
                         </div>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <field name="image_1920" widget="image" class="oe_avatar" options="{'preview_image': 'image_128'}"/>
                         <div class="oe_title">
                             <label for="name" string="Course Title"/>
@@ -267,12 +263,12 @@
                                 <div class="ribbon ribbon-top-right"
                                     attrs="{'invisible': [('active', '=', True)]}">
                                     <field name="active" invisible="1"/>
-                                    <span class="bg-danger">Archived</span>
+                                    <span class="text-bg-danger">Archived</span>
                                 </div>
                                 <div class="ribbon ribbon-top-right"
                                     attrs="{'invisible': ['|', ('website_published', '!=', True), ('active', '=', False)]}">
                                     <field name="website_published" invisible="1"/>
-                                    <span class="bg-odoo">Published</span>
+                                    <span class="text-bg-success">Published</span>
                                 </div>
                                 <div class="o_kanban_card_header">
                                     <div class="o_kanban_card_header_title mb16">
diff --git a/addons/website_slides/views/slide_slide_views.xml b/addons/website_slides/views/slide_slide_views.xml
index cf20ea7b4d8..20166240e80 100644
--- a/addons/website_slides/views/slide_slide_views.xml
+++ b/addons/website_slides/views/slide_slide_views.xml
@@ -85,7 +85,7 @@
                             <field name="is_published" class="ms-1" widget="website_redirect_button"
                                    attrs="{'invisible': ['|',('is_category', '=', True), ('channel_id', '=', False)]}"/>
                         </div>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <field name="image_1920" widget="image" class="oe_avatar" options='{"preview_image": "image_256"}'
                             attrs="{'invisible': [('is_category', '=', True)]}"/>
                         <div class="oe_title pe-xl-0">
diff --git a/addons/website_slides/views/website_slides_templates_homepage.xml b/addons/website_slides/views/website_slides_templates_homepage.xml
index b52b0ce079c..4e829b561c4 100644
--- a/addons/website_slides/views/website_slides_templates_homepage.xml
+++ b/addons/website_slides/views/website_slides_templates_homepage.xml
@@ -196,7 +196,7 @@
                 <!-- Navbar dynamically composed using displayed channel tag groups. -->
                 <nav class="navbar navbar-expand-md navbar-light shadow-sm ps-0">
                     <div class="navbar-nav border-end">
-                        <a class="nav-link nav-item px-3" href="/slides"><i class="fa fa-chevron-left"/></a>
+                        <a class="nav-link nav-item px-3" href="/slides"><i class="oi oi-chevron-left"/></a>
                     </div>
                     <!-- Clear filtering (mobile)-->
                     <div class="text-nowrap ms-auto d-md-none" t-if="search_slide_category or search_my or search_tags">
diff --git a/addons/website_slides/views/website_slides_templates_lesson.xml b/addons/website_slides/views/website_slides_templates_lesson.xml
index ec63757a64b..5d031ab2b1b 100644
--- a/addons/website_slides/views/website_slides_templates_lesson.xml
+++ b/addons/website_slides/views/website_slides_templates_lesson.xml
@@ -115,7 +115,7 @@
         <div class="bg-100 text-1000 h6 my-0 text-decoration-none border-bottom d-flex align-items-center justify-content-between">
             <span class="p-2">Course content</span>
             <a href="#collapse_slide_aside" data-bs-toggle="collapse" class="d-lg-none p-2 text-decoration-none o_wslides_lesson_aside_collapse">
-                <i class="fa fa-chevron-down d-lg-none"/>
+                <i class="oi oi-chevron-down d-lg-none"/>
             </a>
         </div>
         <ul id="collapse_slide_aside" class="list-unstyled my-0 pb-3 collapse d-lg-block">
@@ -248,7 +248,7 @@
                 <a t-attf-class="o_wslides_nav_button btn btn-light border #{'disabled' if not previous_slide else ''} me-2"
                     role="button" t-att-aria-disabled="'disabled' if not previous_slide else None"
                     t-att-href="'/slides/slide/%s' % (slug(previous_slide)) if previous_slide else '#'">
-                    <i class="fa fa-chevron-left me-2"></i> <span class="d-none d-sm-inline-block">Prev</span>
+                    <i class="oi oi-chevron-left me-2"></i> <span class="d-none d-sm-inline-block">Prev</span>
                 </a>
                 <t t-if="slide.channel_id.channel_type == 'documentation' and slide.channel_id.is_member">
                     <t t-set="is_quiz" t-value="slide.slide_category == 'quiz' or slide.question_ids"/>
@@ -276,7 +276,7 @@
                 <a t-attf-class="o_wslides_nav_button btn btn-light border #{'disabled' if not next_slide else ''}"
                     role="button" t-att-aria-disabled="'disabled' if not next_slide else None"
                     t-att-href="'/slides/slide/%s' % (slug(next_slide)) if next_slide else '#'">
-                    <span class="d-none d-sm-inline-block">Next</span> <i class="fa fa-chevron-right ms-2"></i>
+                    <span class="d-none d-sm-inline-block">Next</span> <i class="oi oi-chevron-right ms-2"></i>
                 </a>
             </div>
             <a class="btn btn-light border ms-2 my-1" role="button" t-att-href="'/slides/slide/%s?fullscreen=1' % (slug(slide))">
diff --git a/addons/website_slides/views/website_slides_templates_profile.xml b/addons/website_slides/views/website_slides_templates_profile.xml
index 9694b033b26..628da07335e 100644
--- a/addons/website_slides/views/website_slides_templates_profile.xml
+++ b/addons/website_slides/views/website_slides_templates_profile.xml
@@ -19,7 +19,7 @@
                     </t>
                     <div t-else="" class="text-muted d-inline-block">No completed courses yet!</div>
                     <div class="text-end d-inline-block pull-right">
-                        <a href="/slides/all" class="btn btn-link btn-sm"><i class="fa fa-arrow-right me-1"/>All Courses</a>
+                        <a href="/slides/all" class="btn btn-link btn-sm"><i class="oi oi-arrow-right me-1"/>All Courses</a>
                     </div>
                 </div>
                 <div class="mb32">
diff --git a/addons/website_slides_forum/views/forum_forum_templates.xml b/addons/website_slides_forum/views/forum_forum_templates.xml
index 2379a21b958..e991fb058fd 100644
--- a/addons/website_slides_forum/views/forum_forum_templates.xml
+++ b/addons/website_slides_forum/views/forum_forum_templates.xml
@@ -67,7 +67,7 @@
                 <div class="d-flex border-bottom pb-1 pt-3 mb-3">
                     <h2 class="h4 mb-0 text-muted">Courses Discussions</h2>
                     <div class="flex-grow-1 text-end">
-                        <a href="/slides" title="See all Courses">Check our Courses <i class="fa fa-chevron-right"/></a>
+                        <a href="/slides" title="See all Courses">Check our Courses <i class="oi oi-chevron-right"/></a>
                     </div>
                 </div>
                 <div class="row">
diff --git a/addons/website_slides_forum/views/res_config_settings_views.xml b/addons/website_slides_forum/views/res_config_settings_views.xml
index 9d631e29fb6..67be5e9e048 100644
--- a/addons/website_slides_forum/views/res_config_settings_views.xml
+++ b/addons/website_slides_forum/views/res_config_settings_views.xml
@@ -8,7 +8,7 @@
         <field name="arch" type="xml">
             <xpath expr="//setting[@id='website_slide_install_website_slides_forum']" position="inside">
                 <div class="mt8">
-                    <button type="action" name="%(website_slides_forum.forum_forum_action_channel)d" string="Manage Forums" class="btn-link" icon="fa-arrow-right"/>
+                    <button type="action" name="%(website_slides_forum.forum_forum_action_channel)d" string="Manage Forums" class="btn-link" icon="oi-arrow-right"/>
                 </div>
             </xpath>
         </field>
diff --git a/addons/website_slides_survey/static/src/xml/website_slides_fullscreen.xml b/addons/website_slides_survey/static/src/xml/website_slides_fullscreen.xml
index 2771c902232..57693381466 100644
--- a/addons/website_slides_survey/static/src/xml/website_slides_fullscreen.xml
+++ b/addons/website_slides_survey/static/src/xml/website_slides_fullscreen.xml
@@ -18,7 +18,7 @@
             </div>
             <div t-if="widget.get('slide').category === 'certification' &amp;&amp; widget.get('slide').canUpload" class="mt-3 h6">
                 <a t-att-href="'/web#id=' + widget.get('slide').certificationId + '&amp;model=survey.survey&amp;view_type=form'">
-                    <i class="fa fa-arrow-right me-1"/>Add Questions to this Survey
+                    <i class="oi oi-arrow-right me-1"/>Add Questions to this Survey
                 </a>
             </div>
         </div>
diff --git a/addons/website_slides_survey/views/res_config_settings_views.xml b/addons/website_slides_survey/views/res_config_settings_views.xml
index 5c092ba13fd..75c603adc82 100644
--- a/addons/website_slides_survey/views/res_config_settings_views.xml
+++ b/addons/website_slides_survey/views/res_config_settings_views.xml
@@ -8,7 +8,7 @@
         <field name="arch" type="xml">
             <xpath expr="//setting[@id='website_slide_install_website_slides_survey']" position="inside">
                 <div class="mt8">
-                    <button type="action" name="%(website_slides_survey.survey_survey_action_slides)d" string="Manage Certifications" class="btn-link" icon="fa-arrow-right"/>
+                    <button type="action" name="%(website_slides_survey.survey_survey_action_slides)d" string="Manage Certifications" class="btn-link" icon="oi-arrow-right"/>
                 </div>
             </xpath>
         </field>
diff --git a/addons/website_slides_survey/views/website_profile.xml b/addons/website_slides_survey/views/website_profile.xml
index a9a4e764478..f85f31c0873 100644
--- a/addons/website_slides_survey/views/website_profile.xml
+++ b/addons/website_slides_survey/views/website_profile.xml
@@ -36,7 +36,7 @@
                     <p t-if="certification_search_terms">No certification found for the given search term.</p>
                     <p t-else="">You have not taken any certification yet.</p>
                     <a href="/slides/all?slide_category=certification">
-                        <i class="fa fa-arrow-right"/> See Certifications
+                        <i class="oi oi-arrow-right"/> See Certifications
                     </a>
                 </t>
                 <div t-else="" class="card p-3 mb-3" t-foreach="user_inputs" t-as="user_input">
@@ -96,7 +96,7 @@
             <div class="text-muted d-inline-block">No certifications yet!</div>
         </t>
         <div class="text-end d-inline-block pull-right">
-            <a href="/slides/all?slide_category=certification" class="btn btn-link btn-sm"><i class="fa fa-arrow-right me-1"/>All Certifications</a>
+            <a href="/slides/all?slide_category=certification" class="btn btn-link btn-sm"><i class="oi oi-arrow-right me-1"/>All Certifications</a>
         </div>
     </template>
 
diff --git a/addons/website_slides_survey/views/website_slides_templates_course.xml b/addons/website_slides_survey/views/website_slides_templates_course.xml
index e2804bd1823..9a5b23442f2 100644
--- a/addons/website_slides_survey/views/website_slides_templates_course.xml
+++ b/addons/website_slides_survey/views/website_slides_templates_course.xml
@@ -12,7 +12,7 @@
                     <div>Begin your <b>certification</b> today!</div>
 
                     <a t-attf-href="#{'/slides_survey/slide/get_certification_url?slide_id=%s' %(first_slide.id) if first_slide.slide_category == 'certification' and channel.total_slides == 1 else '/slides/slide/%s?fullscreen=1' %(slug(first_slide))}" class="btn btn-success mt-2 mt-sm-0">
-                        <span>Start Now</span><i class="fa fa-chevron-right ms-2 align-middle"/>
+                        <span>Start Now</span><i class="oi oi-chevron-right ms-2 align-middle"/>
                     </a>
                 </div>
             </xpath>
diff --git a/addons/website_slides_survey/views/website_slides_templates_lesson.xml b/addons/website_slides_survey/views/website_slides_templates_lesson.xml
index ec4c8d7e021..0cdc3dc8bc4 100644
--- a/addons/website_slides_survey/views/website_slides_templates_lesson.xml
+++ b/addons/website_slides_survey/views/website_slides_templates_lesson.xml
@@ -22,7 +22,7 @@
                 </div>
                 <div t-if="slide.slide_category == 'certification' and slide.channel_id.can_upload" class="col mb8 d-flex justify-content-center">
                     <a class="my-4" t-att-href="'/web#id=' + str(slide.survey_id.id)  + '&amp;model=survey.survey&amp;view_type=form'">
-                        <i class="fa fa-arrow-right me-1"/>Add Questions to this Survey
+                        <i class="oi oi-arrow-right me-1"/>Add Questions to this Survey
                     </a>
                 </div>
             </xpath>
diff --git a/addons/website_twitter/static/description/icon.png b/addons/website_twitter/static/description/icon.png
index a8020eec2ed..dae81bf42cb 100644
Binary files a/addons/website_twitter/static/description/icon.png and b/addons/website_twitter/static/description/icon.png differ
diff --git a/addons/website_twitter/static/description/icon.svg b/addons/website_twitter/static/description/icon.svg
index 384aebf0833..d0f958d626f 100644
--- a/addons/website_twitter/static/description/icon.svg
+++ b/addons/website_twitter/static/description/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#B06161"/><stop offset="45.785%" stop-color="#984E4E"/><stop offset="100%" stop-color="#7C3838"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V41.016L12 28l4 4 6-4 5 5 6-6h20l6 16-16.49 26H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><path fill="#000" d="M33 29h26v16H29c4.667-7.333 6-12.667 4-16zm11 4l-4 4 4 4 1-1-3-3 3-3-1-1zm4 0l-1 1 3 3-3 3 1 1 4-4-4-4zm-19.056-.074c.013.178.013.356.013.533 0 5.42-4.124 11.663-11.663 11.663-2.322 0-4.48-.673-6.294-1.84.33.038.647.05.99.05 1.916 0 3.68-.647 5.089-1.75a4.106 4.106 0 0 1-3.833-2.843c.254.038.508.063.774.063.368 0 .736-.05 1.079-.14a4.1 4.1 0 0 1-3.287-4.022v-.051c.546.304 1.18.495 1.853.52a4.096 4.096 0 0 1-1.827-3.414c0-.761.203-1.459.558-2.068a11.651 11.651 0 0 0 8.452 4.29 4.627 4.627 0 0 1-.102-.94 4.097 4.097 0 0 1 4.1-4.099 4.09 4.09 0 0 1 2.994 1.295 8.07 8.07 0 0 0 2.602-.99 4.088 4.088 0 0 1-1.802 2.259 8.217 8.217 0 0 0 2.36-.635 8.811 8.811 0 0 1-2.056 2.12z" opacity=".3"/><path fill="#FFF" d="M33 27h26v16H29c4.667-7.333 6-12.667 4-16zm11 4l-4 4 4 4 1-1-3-3 3-3-1-1zm4 0l-1 1 3 3-3 3 1 1 4-4-4-4zm-19.056-.074c.013.178.013.356.013.533 0 5.42-4.124 11.663-11.663 11.663-2.322 0-4.48-.673-6.294-1.84.33.038.647.05.99.05 1.916 0 3.68-.647 5.089-1.75a4.106 4.106 0 0 1-3.833-2.843c.254.038.508.063.774.063.368 0 .736-.05 1.079-.14a4.1 4.1 0 0 1-3.287-4.022v-.051c.546.304 1.18.495 1.853.52a4.096 4.096 0 0 1-1.827-3.414c0-.761.203-1.459.558-2.068a11.651 11.651 0 0 0 8.452 4.29 4.627 4.627 0 0 1-.102-.94 4.097 4.097 0 0 1 4.1-4.099 4.09 4.09 0 0 1 2.994 1.295 8.07 8.07 0 0 0 2.602-.99 4.088 4.088 0 0 1-1.802 2.259 8.217 8.217 0 0 0 2.36-.635 8.811 8.811 0 0 1-2.056 2.12z"/></g></g></svg>
\ No newline at end of file
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M41.7 16.713c.026.38.026.76.026 1.143C41.726 29.533 33.058 43 17.208 43v-.007A23.953 23.953 0 0 1 4 39.031c.68.084 1.365.126 2.05.128a17.03 17.03 0 0 0 10.703-3.79c-3.688-.072-6.92-2.538-8.05-6.137a8.38 8.38 0 0 0 3.89-.152c-4.02-.833-6.912-4.456-6.912-8.662v-.112a8.4 8.4 0 0 0 3.91 1.106c-3.786-2.595-4.953-7.761-2.666-11.8 4.375 5.521 10.83 8.877 17.758 9.232-.694-3.069.255-6.285 2.493-8.443a8.475 8.475 0 0 1 12.192.383A17.03 17.03 0 0 0 44.84 8.64a8.834 8.834 0 0 1-3.788 4.888A16.802 16.802 0 0 0 46 12.135a17.762 17.762 0 0 1-4.3 4.578Z" fill="#1D9BF0"/></svg>
diff --git a/addons/website_twitter/views/res_config_settings_views.xml b/addons/website_twitter/views/res_config_settings_views.xml
index 04df4a97e7b..22f6777b65e 100644
--- a/addons/website_twitter/views/res_config_settings_views.xml
+++ b/addons/website_twitter/views/res_config_settings_views.xml
@@ -17,7 +17,7 @@
                             <field name="twitter_api_secret" password="True" class="oe_inline"/>
                         </div>
                         <a data-bs-toggle="collapse" href="#" data-bs-target="#twitter_tutorial" aria-label="Twitter tutorial">
-                            <i class="fa fa-arrow-right"/>
+                            <i class="oi oi-arrow-right"/>
                             Show me how to obtain the Twitter API key and Twitter API secret
                         </a>
                         <div class="row mt16 collapse" id="twitter_tutorial">
diff --git a/odoo/addons/base/data/res_users_demo.xml b/odoo/addons/base/data/res_users_demo.xml
index a18c913111d..22440df6ea0 100644
--- a/odoo/addons/base/data/res_users_demo.xml
+++ b/odoo/addons/base/data/res_users_demo.xml
@@ -36,7 +36,7 @@
             <field name="signature" type="html"><span>-- <br/>+Mr Demo</span></field>
             <field name="company_id" ref="main_company"/>
             <field name="groups_id" eval="[Command.set([ref('base.group_user'), ref('base.group_partner_manager'), ref('base.group_allow_export')])]"/>
-            <field name="image_1920" type="base64" file="base/static/img/user_demo-image.jpg"/>
+            <field name="image_1920" type="base64" file="base/static/img/user_demo-image.png"/>
         </record>
 
         <record model="res.partner" id="base.partner_root">
@@ -55,7 +55,7 @@
             <field name="phone">+1 555-555-5555</field>
             <field name="email">admin@yourcompany.example.com</field>
             <field name="tz">Europe/Brussels</field>
-            <field name="image_1920" type="base64" file="base/static/img/partner_root-image.jpg"/>
+            <field name="image_1920" type="base64" file="base/static/img/partner_root-image.png"/>
         </record>
 
         <record id="base.user_admin" model="res.users">
@@ -72,7 +72,7 @@
             <field name="zip">07002</field>
             <field name="country_id" ref="base.us"/>
             <field name="company_name">YourCompany</field>
-            <field name="image_1920" type="base64" file="base/static/img/partner_demo_portal.jpg"/>
+            <field name="image_1920" type="base64" file="base/static/img/partner_demo_portal.png"/>
             <field name="phone">(683)-556-5104</field>
         </record>
         <record id="demo_user0" model="res.users" context="{'no_reset_password': True}">
diff --git a/odoo/addons/base/static/description/board.png b/odoo/addons/base/static/description/board.png
index 6215e5f9535..c62de1efdae 100644
Binary files a/odoo/addons/base/static/description/board.png and b/odoo/addons/base/static/description/board.png differ
diff --git a/odoo/addons/base/static/description/board.svg b/odoo/addons/base/static/description/board.svg
index d10a2629c41..e0d45a31ace 100644
--- a/odoo/addons/base/static/description/board.svg
+++ b/odoo/addons/base/static/description/board.svg
@@ -1,23 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70">
-    <defs>
-        <path id="board-a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/>
-        <linearGradient id="board-c" x1="100%" x2="0%" y1="0%" y2="100%">
-            <stop offset="0%" stop-color="#CD7690"/>
-            <stop offset="100%" stop-color="#CA5377"/>
-        </linearGradient>
-        <path id="board-d" d="M18.045 57.225a3.829 3.829 0 0 1-3.39-2.068A23.413 23.413 0 0 1 12 44.287C12 31.428 22.297 21 35 21s23 10.426 23 23.288c0 3.926-.96 7.625-2.655 10.87a3.829 3.829 0 0 1-3.39 2.067h-33.91zM52.889 41.7c-1.411 0-2.556 1.158-2.556 2.587 0 1.43 1.145 2.588 2.556 2.588s2.555-1.158 2.555-2.587c0-1.43-1.144-2.588-2.555-2.588zM35 28.762c1.411 0 2.556-1.158 2.556-2.587 0-1.429-1.145-2.588-2.556-2.588s-2.556 1.159-2.556 2.588S33.59 28.762 35 28.762zM17.111 41.7c-1.411 0-2.555 1.158-2.555 2.587 0 1.43 1.144 2.588 2.555 2.588 1.411 0 2.556-1.158 2.556-2.587 0-1.43-1.145-2.588-2.556-2.588zm5.24-12.807c-1.412 0-2.556 1.158-2.556 2.587 0 1.429 1.144 2.588 2.556 2.588 1.411 0 2.555-1.159 2.555-2.588s-1.144-2.587-2.555-2.587zm25.298 0c-1.411 0-2.555 1.158-2.555 2.587 0 1.429 1.144 2.588 2.555 2.588 1.412 0 2.556-1.159 2.556-2.588s-1.144-2.587-2.556-2.587zm-6.954 2.55a1.912 1.912 0 0 0-2.41 1.256l-3.667 11.604c-2.644.198-4.73 2.432-4.73 5.16 0 2.858 2.29 5.175 5.112 5.175 2.823 0 5.111-2.317 5.111-5.175a5.19 5.19 0 0 0-1.842-3.978l3.668-11.603a1.946 1.946 0 0 0-1.242-2.44z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <mask id="board-b" fill="#fff">
-            <use xlink:href="#board-a"/>
-        </mask>
-        <g mask="url(#board-b)">
-            <path fill="url(#board-c)" d="M0 0H70V70H0z"/>
-            <path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/>
-            <path fill="#393939" d="M4 70c-2 0-4-.149-4-4.163V46.394l16.354-17.532C29.45 19.512 39.667 17.612 47 23.163c7.333 5.551 11 11.796 11 18.735-2.132 7.885-3.228 11.878-3.288 11.978-.06.101-4.726 5.476-14 16.124H4z" opacity=".324"/>
-            <path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/>
-            <use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#board-d"/>
-            <path fill="#FFF" fill-rule="nonzero" d="M18.045 55.225a3.829 3.829 0 0 1-3.39-2.068A23.413 23.413 0 0 1 12 42.287C12 29.428 22.297 19 35 19s23 10.426 23 23.288c0 3.926-.96 7.625-2.655 10.87a3.829 3.829 0 0 1-3.39 2.067h-33.91zM52.889 39.7c-1.411 0-2.556 1.158-2.556 2.587 0 1.43 1.145 2.588 2.556 2.588s2.555-1.158 2.555-2.587c0-1.43-1.144-2.588-2.555-2.588zM35 26.762c1.411 0 2.556-1.158 2.556-2.587 0-1.429-1.145-2.588-2.556-2.588s-2.556 1.159-2.556 2.588S33.59 26.762 35 26.762zM17.111 39.7c-1.411 0-2.555 1.158-2.555 2.587 0 1.43 1.144 2.588 2.555 2.588 1.411 0 2.556-1.158 2.556-2.587 0-1.43-1.145-2.588-2.556-2.588zm5.24-12.807c-1.412 0-2.556 1.158-2.556 2.587 0 1.429 1.144 2.588 2.556 2.588 1.411 0 2.555-1.159 2.555-2.588s-1.144-2.587-2.555-2.587zm25.298 0c-1.411 0-2.555 1.158-2.555 2.587 0 1.429 1.144 2.588 2.555 2.588 1.412 0 2.556-1.159 2.556-2.588s-1.144-2.587-2.556-2.587zm-6.954 2.55a1.912 1.912 0 0 0-2.41 1.256l-3.667 11.604c-2.644.198-4.73 2.432-4.73 5.16 0 2.858 2.29 5.175 5.112 5.175 2.823 0 5.111-2.317 5.111-5.175a5.19 5.19 0 0 0-1.842-3.978l3.668-11.603a1.946 1.946 0 0 0-1.242-2.44z"/>
-        </g>
-    </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M4 8a4 4 0 0 1 4-4h17v17a4 4 0 0 1-4 4H4V8Z" fill="var(--o-icons-red-pure, #FC787D)"/><path d="M4 8a4 4 0 0 1 4-4h17v17a4 4 0 0 1-4 4H4V8Z" fill="url(#o_icon_board__a)" fill-opacity=".2"/><path d="M4 35a4 4 0 0 1 4-4h11v11a4 4 0 0 1-4 4H4V35Z" fill="var(--o-icons-red-red, #F9383D)"/><path d="M4 35a4 4 0 0 1 4-4h11v11a4 4 0 0 1-4 4H4V35Z" fill="url(#o_icon_board__b)" fill-opacity=".2"/><path d="M25 46h4a4 4 0 0 0 4-4V31h-4a4 4 0 0 0-4 4v11Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M25 46h4a4 4 0 0 0 4-4V31h-4a4 4 0 0 0-4 4v11Z" fill="url(#o_icon_board__c)" fill-opacity=".2"/><path d="M31 17v4a4 4 0 0 0 4 4h11v-4a4 4 0 0 0-4-4H31Z" fill="var(--o-icons-cyan-cyan, #0382F3)"/><path d="M31 17v4a4 4 0 0 0 4 4h11v-4a4 4 0 0 0-4-4H31Z" fill="url(#o_icon_board__d)" fill-opacity=".2"/><path d="M31 4v4a4 4 0 0 0 4 4h11V8a4 4 0 0 0-4-4H31Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path d="M31 4v4a4 4 0 0 0 4 4h11V8a4 4 0 0 0-4-4H31Z" fill="url(#o_icon_board__e)" fill-opacity=".2"/><path d="M38 46h4a4 4 0 0 0 4-4V31h-4a4 4 0 0 0-4 4v11Z" fill="var(--o-icons-yellow-yellow, #F77B09)"/><path d="M38 46h4a4 4 0 0 0 4-4V31h-4a4 4 0 0 0-4 4v11Z" fill="url(#o_icon_board__f)" fill-opacity=".2"/><defs><linearGradient id="o_icon_board__a" x1="4" y1="4" x2="28.706" y2="10.177" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_board__b" x1="4" y1="31" x2="21.647" y2="35.412" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_board__c" x1="25" y1="31" x2="34.825" y2="32.31" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_board__d" x1="31" y1="17" x2="46.372" y2="24.206" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_board__e" x1="31" y1="4" x2="46.372" y2="11.206" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_board__f" x1="38" y1="31" x2="47.825" y2="32.31" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/odoo/addons/base/static/description/icon.png b/odoo/addons/base/static/description/icon.png
index 840a92dcc0d..5e4b3c88093 100644
Binary files a/odoo/addons/base/static/description/icon.png and b/odoo/addons/base/static/description/icon.png differ
diff --git a/odoo/addons/base/static/description/icon.svg b/odoo/addons/base/static/description/icon.svg
index ad77220dc41..506eee5b908 100644
--- a/odoo/addons/base/static/description/icon.svg
+++ b/odoo/addons/base/static/description/icon.svg
@@ -1,43 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70">
-    <defs>
-        <path id="icon-a" d="M4,5.35309892e-14 C36.4160122,9.87060235e-15 58.0836068,-3.97961823e-14 65,5.07020818e-14 C69,6.733808e-14 70,1 70,5 C70,43.0488877 70,62.4235458 70,65 C70,69 69,70 65,70 C61,70 9,70 4,70 C1,70 7.10542736e-15,69 7.10542736e-15,65 C7.25721566e-15,62.4676575 3.83358709e-14,41.8005206 3.60818146e-14,5 C-1.13686838e-13,1 1,5.75716207e-14 4,5.35309892e-14 Z"/>
-        <linearGradient id="icon-c" x1="73.828%" x2="11.498%" y1="13.431%" y2="62.895%">
-            <stop offset="0%" stop-color="#81D9DD"/>
-            <stop offset="100%" stop-color="#419CA1"/>
-        </linearGradient>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <mask id="icon-b" fill="#fff">
-            <use xlink:href="#icon-a"/>
-        </mask>
-        <g fill-rule="nonzero" mask="url(#icon-b)">
-            <g transform="translate(13 10)">
-                <path fill="url(#icon-c)" d="M44.2198125,12.454875 L22.7750625,0.0736875 C22.604625,-0.02475 22.395375,-0.02475 22.224375,0.0736875 L0.7801875,12.454875 C0.60975,12.5533125 0.505125,12.735 0.505125,12.9313125 L0.505125,37.693125 C0.505125,37.891125 0.60975,38.07225 0.7801875,38.170125 L22.2249375,50.551875 C22.3104375,50.6008125 22.4049375,50.625 22.5,50.625 C22.5950625,50.625 22.690125,50.6008125 22.7750625,50.5513125 L44.2186875,38.1695625 C44.3896875,38.0716875 44.4943125,37.8894375 44.4943125,37.6925625 L44.4943125,12.9313125 C44.494875,12.735 44.39025,12.5533125 44.2198125,12.454875 Z M1.6059375,37.2841875 L1.6059375,13.88475 L21.87,25.5841875 L21.949875,25.7236875 L21.949875,49.123125 L1.68525,37.4214375 L1.6059375,37.2841875 Z M22.5804375,1.231875 L42.8439375,12.9313125 L22.5793125,24.6313125 L22.420125,24.6313125 L2.1555,12.9313125 L22.420125,1.231875 L22.5804375,1.231875 Z M23.0506875,25.7225625 L23.131125,25.58475 L43.3940625,13.8853125 L43.3940625,37.28475 L43.3141875,37.4225625 L23.0506875,49.1214375 L23.0506875,25.7225625 Z"/>
-                <rect width="1" height="1.376" x="22" y="21.878" fill="#5BB4B9" opacity=".288"/>
-                <rect width="1" height="1.376" x="22" y="10.867" fill="#5BB4B9" opacity=".288"/>
-                <rect width="1" height="1.376" x="22" y="19.126" fill="#5BB4B9" opacity=".288"/>
-                <rect width="1" height="1.376" x="22" y="13.62" fill="#5BB4B9" opacity=".288"/>
-                <rect width="1" height="1.376" x="22" y="2.608" fill="#5BB4B9" opacity=".288"/>
-                <rect width="1" height="1.376" x="22" y="5.361" fill="#5BB4B9" opacity=".288"/>
-                <rect width="1" height="1.376" x="22" y="8.114" fill="#5BB4B9" opacity=".288"/>
-                <rect width="1" height="1.376" x="22" y="16.373" fill="#5BB4B9" opacity=".288"/>
-                <rect width="1" height="1.376" x="14.94" y="28.749" fill="#5BB4B9" opacity=".288" transform="rotate(-119.993 15.19 29.437)"/>
-                <rect width="1" height="1.376" x="12.56" y="30.125" fill="#5BB4B9" opacity=".288" transform="rotate(-119.993 12.81 30.814)"/>
-                <rect width="1" height="1.377" x="10.173" y="31.501" fill="#5BB4B9" opacity=".288" transform="rotate(-120.014 10.423 32.19)"/>
-                <rect width="1" height="1.376" x="19.707" y="25.998" fill="#5BB4B9" opacity=".288" transform="rotate(-119.975 19.957 26.686)"/>
-                <rect width="1" height="1.377" x="17.325" y="27.372" fill="#5BB4B9" opacity=".288" transform="rotate(-120.014 17.575 28.06)"/>
-                <rect width="1" height="1.376" x="3.021" y="35.631" fill="#5BB4B9" opacity=".288" transform="rotate(-120.014 3.271 36.32)"/>
-                <rect width="1" height="1.376" x="7.787" y="32.876" fill="#5BB4B9" opacity=".288" transform="rotate(-120.001 8.037 33.564)"/>
-                <rect width="1" height="1.376" x="5.408" y="34.256" fill="#5BB4B9" opacity=".288" transform="rotate(-119.993 5.658 34.944)"/>
-                <rect width="1.376" height="1" x="31.344" y="30.403" fill="#5BB4B9" opacity=".288" transform="rotate(-149.999 32.032 30.653)"/>
-                <rect width="1.375" height="1" x="26.576" y="27.648" fill="#5BB4B9" opacity=".288" transform="rotate(-149.994 27.263 27.898)"/>
-                <rect width="1.376" height="1" x="28.957" y="29.022" fill="#5BB4B9" opacity=".288" transform="rotate(-150.028 29.646 29.272)"/>
-                <rect width="1" height="1" x="41.159" y="35.631" fill="#5BB4B9" opacity=".288" transform="rotate(-59.974 41.41 36.046)"/>
-                <rect width="1.377" height="1" x="24.192" y="26.274" fill="#5BB4B9" opacity=".288" transform="rotate(-149.979 24.88 26.524)"/>
-                <rect width="1.377" height="1" x="36.108" y="33.155" fill="#5BB4B9" opacity=".288" transform="rotate(-149.979 36.796 33.405)"/>
-                <rect width="1.376" height="1" x="38.497" y="34.532" fill="#5BB4B9" opacity=".288" transform="rotate(-149.999 39.185 34.782)"/>
-                <rect width="1.376" height="1" x="33.728" y="31.779" fill="#5BB4B9" opacity=".288" transform="rotate(-150.02 34.416 32.029)"/>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M4 13v25l21 12 21-12V13L25 0 4 13Zm2 2.295v21.544l18 10.286V25.58L6 15.295ZM26 25.58v21.545L44 36.84V15.295L26 25.58Zm-1-1.732L6.943 13.53 25 2.352 43.057 13.53 25 23.848Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M4 13v25l21 12 21-12V13L25 0 4 13Zm2 2.295v21.544l18 10.286V25.58L6 15.295ZM26 25.58v21.545L44 36.84V15.295L26 25.58Zm-1-1.732L6.943 13.53 25 2.352 43.057 13.53 25 23.848Z" fill="url(#o_icon_base_icon__a)" fill-opacity=".2"/><defs><linearGradient id="o_icon_base_icon__a" x1="4" y1="0" x2="54.282" y2="10.559" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/odoo/addons/base/static/description/modules.png b/odoo/addons/base/static/description/modules.png
index 76caa78e1fd..73f63ea48d4 100644
Binary files a/odoo/addons/base/static/description/modules.png and b/odoo/addons/base/static/description/modules.png differ
diff --git a/odoo/addons/base/static/description/modules.svg b/odoo/addons/base/static/description/modules.svg
index 6ebff70bdcd..b6f54c37553 100644
--- a/odoo/addons/base/static/description/modules.svg
+++ b/odoo/addons/base/static/description/modules.svg
@@ -1,23 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70">
-    <defs>
-        <path id="modules-a" d="M4,5.35309892e-14 C36.4160122,9.87060235e-15 58.0836068,-3.97961823e-14 65,5.07020818e-14 C69,6.733808e-14 70,1 70,5 C70,43.0488877 70,62.4235458 70,65 C70,69 69,70 65,70 C61,70 9,70 4,70 C1,70 7.10542736e-15,69 7.10542736e-15,65 C7.25721566e-15,62.4676575 3.83358709e-14,41.8005206 3.60818146e-14,5 C-1.13686838e-13,1 1,5.75716207e-14 4,5.35309892e-14 Z"/>
-        <linearGradient id="modules-c" x1="100%" x2="0%" y1="0%" y2="100%">
-            <stop offset="0%" stop-color="#B06161"/>
-            <stop offset="45.785%" stop-color="#984E4E"/>
-            <stop offset="100%" stop-color="#7C3838"/>
-        </linearGradient>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <mask id="modules-b" fill="#fff">
-            <use xlink:href="#modules-a"/>
-        </mask>
-        <g mask="url(#modules-b)">
-            <rect width="70" height="70" fill="url(#modules-c)"/>
-            <path fill="#FFF" fill-opacity=".383" d="M4,1.8 L65,1.8 C67.6666667,1.8 69.3333333,1.13333333 70,-0.2 C70,2.46666667 70,3.46666667 70,2.8 L1.10547097e-14,2.8 C-1.65952376e-14,3.46666667 -2.9161925e-14,2.46666667 -2.66453526e-14,-0.2 C0.666666667,1.13333333 2,1.8 4,1.8 Z" transform="matrix(1 0 0 -1 0 2.8)"/>
-            <path fill="#393939" d="M4,53 C2,53 1.45716772e-16,52 1.45716772e-16,49 L0,26.5 L24.2967077,3.76847114 L35,0 L45,5 L45,16 L56,21 L56,31.1642772 L38.575061,53 L4,53 Z" opacity=".324" transform="translate(0 16)"/>
-            <path fill="#000" fill-opacity=".383" d="M4,4 L65,4 C67.6666667,4 69.3333333,3 70,1 C70,3.66666667 70,5 70,5 L1.77635684e-15,5 C1.77635684e-15,5 1.77635684e-15,3.66666667 1.77635684e-15,1 C0.666666667,3 2,4 4,4 Z" transform="translate(0 65)"/>
-            <path fill="#000" fill-rule="nonzero" d="M55.9627633,37.3175622 C55.941748,37.257152 55.9136537,37.1990753 55.8789872,37.1443796 L55.8789872,37.1184022 C55.8368853,37.0580162 55.7868543,37.0027487 55.7300518,36.9538787 L55.6881637,36.9192421 C55.6350549,36.8788061 55.5773016,36.8439577 55.5159572,36.8153325 L55.4926861,36.8153325 L46.0027111,32.7412107 L46.0027111,22.1251142 C46.0021217,22.0505133 45.9911711,21.9762961 45.9701315,21.9043063 L45.9701315,21.8523515 C45.9491161,21.7919413 45.9210218,21.7338646 45.8863553,21.6791689 L45.8863553,21.6531915 C45.8442535,21.5928054 45.7942225,21.537538 45.73742,21.488668 L45.6955319,21.4540314 C45.642423,21.4135954 45.5846698,21.378747 45.5233254,21.3501218 L45.5000542,21.3501218 L35.4096836,17.0205556 C35.1629944,16.9151184 34.8791164,16.9151184 34.6324272,17.0205556 L24.5467107,21.3501218 L24.5234396,21.3501218 C24.4620952,21.378747 24.404342,21.4135954 24.3512331,21.4540314 L24.309345,21.488668 C24.2525425,21.537538 24.2025115,21.5928054 24.1604097,21.6531915 L24.1604097,21.6791689 C24.1257431,21.7338646 24.0976488,21.7919413 24.0766335,21.8523515 L24.0766335,21.9043063 C24.0555938,21.9762961 24.0446433,22.0505133 24.0440539,22.1251142 L24.0440539,32.7412107 L14.5028824,36.8023438 L14.4796112,36.8023438 C14.4182668,36.830969 14.3605136,36.8658174 14.3074047,36.9062534 L14.2655167,36.94089 C14.2087141,36.98976 14.1586831,37.0450275 14.1165813,37.1054135 L14.1165813,37.1313909 C14.0819148,37.1860866 14.0538205,37.2441633 14.0328052,37.3045735 L14.0328052,37.3565283 C14.0117655,37.4285181 14.0008149,37.5027353 14.0002255,37.5773362 L14.0002255,48.8039015 C13.9924262,49.1342656 14.1874289,49.4399581 14.5028824,49.5918826 L24.5885988,53.9214489 C24.835288,54.026886 25.119166,54.026886 25.3658552,53.9214489 L34.9814944,49.7910426 L44.6064421,53.9171193 C44.8531313,54.0225564 45.1370093,54.0225564 45.3836985,53.9171193 L55.4601065,49.5918826 C55.7900488,49.4498389 56.0008968,49.1421021 55.9999971,48.8039015 L55.9999971,37.5903249 C55.9994077,37.515724 55.9884572,37.4415068 55.9674175,37.369517 L55.9627633,37.3175622 Z M24.9655914,40.963057 L17.0999427,37.5903249 L24.8399272,34.2738771 L32.7055759,37.629291 L24.9655914,40.963057 Z M34.0506484,48.2843536 L25.8964374,51.7783136 L25.8964374,42.4697461 L34.0506484,38.9757861 L34.0506484,48.2843536 Z M34.9814944,25.5065054 L27.1158457,22.1251142 L34.9814944,18.7523821 L42.8471431,22.1251142 L34.9814944,25.5065054 Z M35.9123404,27.0131945 L44.1410191,23.484598 L44.1410191,32.7931655 L35.9123404,36.3304211 L35.9123404,27.0131945 Z M44.9973974,40.963057 L37.2527587,37.629291 L45.1184074,34.2565589 L52.8583919,37.5730066 L44.9973974,40.963057 Z M54.1522678,48.2497171 L45.9282434,51.7783136 L45.9282434,42.4697461 L54.1522678,38.9281609 L54.1522678,48.2497171 Z" opacity=".3"/>
-            <path fill="#FFF" fill-rule="nonzero" d="M55.9627633,35.4570756 C55.941748,35.3966654 55.9136537,35.3385887 55.8789872,35.283893 L55.8789872,35.2579156 C55.8368853,35.1975296 55.7868543,35.1422621 55.7300518,35.0933921 L55.6881637,35.0587555 C55.6350549,35.0183195 55.5773016,34.9834712 55.5159572,34.9548459 L55.4926861,34.9548459 L46.0027111,30.8807241 L46.0027111,20.2646276 C46.0021217,20.1900267 45.9911711,20.1158095 45.9701315,20.0438197 L45.9701315,19.9918649 C45.9491161,19.9314547 45.9210218,19.873378 45.8863553,19.8186823 L45.8863553,19.7927049 C45.8442535,19.7323188 45.7942225,19.6770514 45.73742,19.6281814 L45.6955319,19.5935448 C45.642423,19.5531088 45.5846698,19.5182604 45.5233254,19.4896352 L45.5000542,19.4896352 L35.4096836,15.160069 C35.1629944,15.0546318 34.8791164,15.0546318 34.6324272,15.160069 L24.5467107,19.4896352 L24.5234396,19.4896352 C24.4620952,19.5182604 24.404342,19.5531088 24.3512331,19.5935448 L24.309345,19.6281814 C24.2525425,19.6770514 24.2025115,19.7323188 24.1604097,19.7927049 L24.1604097,19.8186823 C24.1257431,19.873378 24.0976488,19.9314547 24.0766335,19.9918649 L24.0766335,20.0438197 C24.0555938,20.1158095 24.0446433,20.1900267 24.0440539,20.2646276 L24.0440539,30.8807241 L14.5028824,34.9418572 L14.4796112,34.9418572 C14.4182668,34.9704825 14.3605136,35.0053308 14.3074047,35.0457668 L14.2655167,35.0804034 C14.2087141,35.1292734 14.1586831,35.1845409 14.1165813,35.2449269 L14.1165813,35.2709043 C14.0819148,35.3256 14.0538205,35.3836767 14.0328052,35.4440869 L14.0328052,35.4960417 C14.0117655,35.5680315 14.0008149,35.6422487 14.0002255,35.7168496 L14.0002255,46.9434149 C13.9924262,47.273779 14.1874289,47.5794715 14.5028824,47.731396 L24.5885988,52.0609623 C24.835288,52.1663994 25.119166,52.1663994 25.3658552,52.0609623 L34.9814944,47.9305561 L44.6064421,52.0566327 C44.8531313,52.1620699 45.1370093,52.1620699 45.3836985,52.0566327 L55.4601065,47.731396 C55.7900488,47.5893523 56.0008968,47.2816155 55.9999971,46.9434149 L55.9999971,35.7298383 C55.9994077,35.6552374 55.9884572,35.5810202 55.9674175,35.5090304 L55.9627633,35.4570756 Z M24.9655914,39.1025704 L17.0999427,35.7298383 L24.8399272,32.4133905 L32.7055759,35.7688044 L24.9655914,39.1025704 Z M34.0506484,46.423867 L25.8964374,49.917827 L25.8964374,40.6092595 L34.0506484,37.1152995 L34.0506484,46.423867 Z M34.9814944,23.6460189 L27.1158457,20.2646276 L34.9814944,16.8918955 L42.8471431,20.2646276 L34.9814944,23.6460189 Z M35.9123404,25.1527079 L44.1410191,21.6241114 L44.1410191,30.9326789 L35.9123404,34.4699345 L35.9123404,25.1527079 Z M44.9973974,39.1025704 L37.2527587,35.7688044 L45.1184074,32.3960723 L52.8583919,35.71252 L44.9973974,39.1025704 Z M54.1522678,46.3892305 L45.9282434,49.917827 L45.9282434,40.6092595 L54.1522678,37.0676743 L54.1522678,46.3892305 Z"/>
-        </g>
-    </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M23 .079V19a4 4 0 0 1-4 4H.08C1.045 10.788 10.787 1.046 23 .079Z" fill="var(--o-icons-teal-pure, #00CEB3)"/><path d="M23 .079V19a4 4 0 0 1-4 4H.08C1.045 10.788 10.787 1.046 23 .079Z" fill="url(#o_icon_apps__a)" fill-opacity=".2"/><path d="M49.921 23H31a4 4 0 0 1-4-4V.079C39.212 1.046 48.955 10.788 49.921 23Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M49.921 23H31a4 4 0 0 1-4-4V.079C39.212 1.046 48.955 10.788 49.921 23Z" fill="url(#o_icon_apps__b)" fill-opacity=".2"/><path d="M49.921 27C48.955 39.212 39.212 48.955 27 49.921V31a4 4 0 0 1 4-4h18.921Z" fill="var(--o-icons-cyan-pure, #1BB6F9)"/><path d="M49.921 27C48.955 39.212 39.212 48.955 27 49.921V31a4 4 0 0 1 4-4h18.921Z" fill="url(#o_icon_apps__c)" fill-opacity=".2"/><path d="M23 49.921C10.788 48.955 1.046 39.212.08 27H19a4 4 0 0 1 4 4v18.921Z" fill="var(--o-icons-red-red, #F9383D)"/><path d="M23 49.921C10.788 48.955 1.046 39.212.08 27H19a4 4 0 0 1 4 4v18.921Z" fill="url(#o_icon_apps__d)" fill-opacity=".2"/><defs><linearGradient id="o_icon_apps__a" x1=".079" y1=".079" x2="27.045" y2="6.82" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_apps__b" x1="27" y1=".079" x2="53.966" y2="6.82" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_apps__c" x1="27" y1="27" x2="53.966" y2="33.742" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_apps__d" x1=".079" y1="27" x2="27.045" y2="33.742" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/odoo/addons/base/static/description/settings.png b/odoo/addons/base/static/description/settings.png
index 2822c53f862..30f512c53ed 100644
Binary files a/odoo/addons/base/static/description/settings.png and b/odoo/addons/base/static/description/settings.png differ
diff --git a/odoo/addons/base/static/description/settings.svg b/odoo/addons/base/static/description/settings.svg
index 436a1dff702..90c4b94c6d1 100644
--- a/odoo/addons/base/static/description/settings.svg
+++ b/odoo/addons/base/static/description/settings.svg
@@ -1,24 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70" viewBox="0 0 70 70">
-    <defs>
-        <path id="settings-a" d="M4,1.10374408e-13 C36.4160122,6.67140212e-14 58.0836068,1.70472366e-14 65,1.07545501e-13 C69,1.24181499e-13 70,1 70,5 C70,43.0488877 70,62.4235458 70,65 C70,69 69,70 65,70 C61,70 9,70 4,70 C1,70 7.10542736e-15,69 7.10542736e-15,65 C7.25721566e-15,62.4676575 3.83358709e-14,41.8005206 3.60818146e-14,5 C-1.13686838e-13,1 1,1.1441504e-13 4,1.10374408e-13 Z"/>
-        <linearGradient id="settings-c" x1="100%" x2="0%" y1="0%" y2="100%">
-            <stop offset="0%" stop-color="#CDC484"/>
-            <stop offset="100%" stop-color="#B5AA59"/>
-        </linearGradient>
-        <path id="settings-d" d="M50.3636068,39.8564453 L53.8317057,41.8583171 C54.2277832,42.0869141 54.4116211,42.5596517 54.2759603,42.9964193 C53.3750814,45.8969727 51.8369954,48.5174154 49.8253581,50.6938477 C49.5152922,51.0295003 49.014109,51.1056645 48.6183268,50.8772786 L45.152832,48.8757324 C43.6947482,50.1250461 42.0184303,51.0942695 40.208252,51.7346191 L40.208252,55.7370605 C40.2082586,56.194297 39.8912627,56.5904321 39.4451497,56.6906738 C36.6004232,57.3295085 33.545166,57.3625488 30.5568848,56.6912435 C30.1101074,56.5909017 29.7916667,56.1951497 29.7916667,55.7372233 L29.7916667,51.7346191 C27.9814711,51.094307 26.3051466,50.1250797 24.8470866,48.8757324 L21.3815918,50.8772786 C20.9858097,51.1056645 20.4846265,51.0295003 20.1745605,50.6938477 C18.1630046,48.5174154 16.6248372,45.8969727 15.7239583,42.9964193 C15.5882975,42.5597331 15.7721354,42.0869954 16.1682129,41.8583171 L19.6363932,39.8564453 C19.2880468,37.9681062 19.2880468,36.0319751 19.6363932,34.1436361 L16.1682943,32.1417643 C15.7722168,31.9131673 15.5883789,31.4404297 15.7240397,31.0036621 C16.6249186,28.1031087 18.1630046,25.482666 20.1746419,23.3062337 C20.4847078,22.970581 20.985891,22.8944169 21.3816732,23.1228027 L24.847168,25.124349 C26.3052518,23.8750353 27.9815697,22.9058119 29.791748,22.2654622 L29.791748,18.2629395 C29.7917414,17.805703 30.1087373,17.4095679 30.5548503,17.3093262 C33.3995768,16.6704915 36.454834,16.6374512 39.4431152,17.3087565 C39.8898926,17.4090983 40.2083333,17.8048503 40.2083333,18.2627767 L40.2083333,22.2653809 C42.0185289,22.905693 43.6948534,23.8749203 45.1529134,25.1242676 L48.6184082,23.1227214 C49.0141903,22.8943355 49.5153735,22.9704997 49.8254395,23.3061523 C51.8369954,25.4825846 53.3751628,28.1030273 54.2760417,31.0035807 C54.4117025,31.4402669 54.2278646,31.9130046 53.8317871,32.1416829 L50.3636068,34.1435547 C50.7119541,36.031921 50.7119541,37.968079 50.3636068,39.8564453 Z M41.5104167,37 C41.5104167,33.4101562 38.5898437,30.4895833 35,30.4895833 C31.4101562,30.4895833 28.4895833,33.4101562 28.4895833,37 C28.4895833,40.5898437 31.4101562,43.5104167 35,43.5104167 C38.5898437,43.5104167 41.5104167,40.5898437 41.5104167,37 Z"/>
-        <path id="settings-e" d="M50.3636068,37.8564453 L53.8317057,39.8583171 C54.2277832,40.0869141 54.4116211,40.5596517 54.2759603,40.9964193 C53.3750814,43.8969727 51.8369954,46.5174154 49.8253581,48.6938477 C49.5152922,49.0295003 49.014109,49.1056645 48.6183268,48.8772786 L45.152832,46.8757324 C43.6947482,48.1250461 42.0184303,49.0942695 40.208252,49.7346191 L40.208252,53.7370605 C40.2082586,54.194297 39.8912627,54.5904321 39.4451497,54.6906738 C36.6004232,55.3295085 33.545166,55.3625488 30.5568848,54.6912435 C30.1101074,54.5909017 29.7916667,54.1951497 29.7916667,53.7372233 L29.7916667,49.7346191 C27.9814711,49.094307 26.3051466,48.1250797 24.8470866,46.8757324 L21.3815918,48.8772786 C20.9858097,49.1056645 20.4846265,49.0295003 20.1745605,48.6938477 C18.1630046,46.5174154 16.6248372,43.8969727 15.7239583,40.9964193 C15.5882975,40.5597331 15.7721354,40.0869954 16.1682129,39.8583171 L19.6363932,37.8564453 C19.2880468,35.9681062 19.2880468,34.0319751 19.6363932,32.1436361 L16.1682943,30.1417643 C15.7722168,29.9131673 15.5883789,29.4404297 15.7240397,29.0036621 C16.6249186,26.1031087 18.1630046,23.482666 20.1746419,21.3062337 C20.4847078,20.970581 20.985891,20.8944169 21.3816732,21.1228027 L24.847168,23.124349 C26.3052518,21.8750353 27.9815697,20.9058119 29.791748,20.2654622 L29.791748,16.2629395 C29.7917414,15.805703 30.1087373,15.4095679 30.5548503,15.3093262 C33.3995768,14.6704915 36.454834,14.6374512 39.4431152,15.3087565 C39.8898926,15.4090983 40.2083333,15.8048503 40.2083333,16.2627767 L40.2083333,20.2653809 C42.0185289,20.905693 43.6948534,21.8749203 45.1529134,23.1242676 L48.6184082,21.1227214 C49.0141903,20.8943355 49.5153735,20.9704997 49.8254395,21.3061523 C51.8369954,23.4825846 53.3751628,26.1030273 54.2760417,29.0035807 C54.4117025,29.4402669 54.2278646,29.9130046 53.8317871,30.1416829 L50.3636068,32.1435547 C50.7119541,34.031921 50.7119541,35.968079 50.3636068,37.8564453 Z M41.5104167,35 C41.5104167,31.4101562 38.5898437,28.4895833 35,28.4895833 C31.4101562,28.4895833 28.4895833,31.4101562 28.4895833,35 C28.4895833,38.5898437 31.4101562,41.5104167 35,41.5104167 C38.5898437,41.5104167 41.5104167,38.5898437 41.5104167,35 Z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <mask id="settings-b" fill="#fff">
-            <use xlink:href="#settings-a"/>
-        </mask>
-        <g mask="url(#settings-b)">
-            <rect width="70" height="70" fill="url(#settings-c)"/>
-            <path fill="#FFF" fill-opacity=".383" d="M4,1.8 L65,1.8 C67.6666667,1.8 69.3333333,1.13333333 70,-0.2 C70,2.46666667 70,3.46666667 70,2.8 L1.10547097e-14,2.8 C-1.65952376e-14,3.46666667 -2.9161925e-14,2.46666667 -2.66453526e-14,-0.2 C0.666666667,1.13333333 2,1.8 4,1.8 Z" transform="matrix(1 0 0 -1 0 2.8)"/>
-            <path fill="#393939" d="M4,54 C2,54 0,53 0,50 L0,30.8423884 L20.2271695,6.22078126 L23.2683066,7.93454203 L30.0225921,0.697744573 L41,16 L54.1620484,14.788871 L48.5214124,19.6980082 L47.9771258,26 L54,26 L49.772392,33.6945643 L31.4403528,54 L4,54 Z" opacity=".324" transform="translate(0 15)"/>
-            <path fill="#000" fill-opacity=".383" d="M4,4 L65,4 C67.6666667,4 69.3333333,3 70,1 C70,3.66666667 70,5 70,5 L1.77635684e-15,5 C1.77635684e-15,5 1.77635684e-15,3.66666667 1.77635684e-15,1 C0.666666667,3 2,4 4,4 Z" transform="translate(0 65)"/>
-            <use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#settings-d"/>
-            <use fill="#FFF" fill-rule="nonzero" xlink:href="#settings-e"/>
-        </g>
-    </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><path d="M25 17V4c.795 0 1.59.204 2.303.61l14.394 8.222A4.548 4.548 0 0 1 44 16.778v16.444c0 .752-.188 1.478-.53 2.121L31.981 28.91A8 8 0 0 0 25 17Z" fill="var(--o-icons-yellow-pure, #FBB130)"/><path d="M25 17V4c.795 0 1.59.204 2.303.61l14.394 8.222A4.548 4.548 0 0 1 44 16.778v16.444c0 .752-.188 1.478-.53 2.121L31.981 28.91A8 8 0 0 0 25 17Z" fill="url(#o_icon_settings__a)" fill-opacity=".2"/><path d="M25 17V4c-.795 0-1.59.204-2.303.61L8.303 12.832A4.548 4.548 0 0 0 6 16.778v16.444c0 .752.187 1.478.53 2.121l11.489-6.434A8 8 0 0 1 25 17Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M25 17V4c-.795 0-1.59.204-2.303.61L8.303 12.832A4.548 4.548 0 0 0 6 16.778v16.444c0 .752.187 1.478.53 2.121l11.489-6.434A8 8 0 0 1 25 17Z" fill="url(#o_icon_settings__b)" fill-opacity=".2"/><path d="M6.53 35.343a4.577 4.577 0 0 0 1.773 1.825l14.393 8.221a4.65 4.65 0 0 0 4.607 0l14.393-8.221a4.577 4.577 0 0 0 1.774-1.825L31.98 28.91A7.998 7.998 0 0 1 25 33a7.998 7.998 0 0 1-6.981-4.09l-11.49 6.433Z" fill="var(--o-icons-red-yellow, #F85318)"/><path d="M6.53 35.343a4.577 4.577 0 0 0 1.773 1.825l14.393 8.221a4.65 4.65 0 0 0 4.607 0l14.393-8.221a4.577 4.577 0 0 0 1.774-1.825L31.98 28.91A7.998 7.998 0 0 1 25 33a7.998 7.998 0 0 1-6.981-4.09l-11.49 6.433Z" fill="url(#o_icon_settings__c)" fill-opacity=".2"/><defs><linearGradient id="o_icon_settings__a" x1="25" y1="4" x2="48.217" y2="7.518" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_settings__b" x1="6" y1="4" x2="29.217" y2="7.518" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_settings__c" x1="6.529" y1="28.91" x2="42.269" y2="48.222" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/odoo/addons/base/static/img/onboarding_accounting-periods.png b/odoo/addons/base/static/img/onboarding_accounting-periods.png
new file mode 100644
index 00000000000..ff84edd9c38
Binary files /dev/null and b/odoo/addons/base/static/img/onboarding_accounting-periods.png differ
diff --git a/odoo/addons/base/static/img/onboarding_availabilities.png b/odoo/addons/base/static/img/onboarding_availabilities.png
new file mode 100644
index 00000000000..aa6c29318d4
Binary files /dev/null and b/odoo/addons/base/static/img/onboarding_availabilities.png differ
diff --git a/odoo/addons/base/static/img/onboarding_bank-account.png b/odoo/addons/base/static/img/onboarding_bank-account.png
new file mode 100644
index 00000000000..0bccf4a804f
Binary files /dev/null and b/odoo/addons/base/static/img/onboarding_bank-account.png differ
diff --git a/odoo/addons/base/static/img/onboarding_chart-of-accounts.png b/odoo/addons/base/static/img/onboarding_chart-of-accounts.png
new file mode 100644
index 00000000000..d3dcc30d5aa
Binary files /dev/null and b/odoo/addons/base/static/img/onboarding_chart-of-accounts.png differ
diff --git a/odoo/addons/base/static/img/onboarding_company-data.png b/odoo/addons/base/static/img/onboarding_company-data.png
new file mode 100644
index 00000000000..68575cd90f8
Binary files /dev/null and b/odoo/addons/base/static/img/onboarding_company-data.png differ
diff --git a/odoo/addons/base/static/img/onboarding_connect_calendar.png b/odoo/addons/base/static/img/onboarding_connect_calendar.png
new file mode 100644
index 00000000000..029dea014d9
Binary files /dev/null and b/odoo/addons/base/static/img/onboarding_connect_calendar.png differ
diff --git a/odoo/addons/base/static/img/onboarding_getlink.png b/odoo/addons/base/static/img/onboarding_getlink.png
new file mode 100644
index 00000000000..1ba490db038
Binary files /dev/null and b/odoo/addons/base/static/img/onboarding_getlink.png differ
diff --git a/odoo/addons/base/static/img/onboarding_order-confirmation.png b/odoo/addons/base/static/img/onboarding_order-confirmation.png
new file mode 100644
index 00000000000..9bb2ae77120
Binary files /dev/null and b/odoo/addons/base/static/img/onboarding_order-confirmation.png differ
diff --git a/odoo/addons/base/static/img/onboarding_puzzle.png b/odoo/addons/base/static/img/onboarding_puzzle.png
new file mode 100644
index 00000000000..ee120a2b488
Binary files /dev/null and b/odoo/addons/base/static/img/onboarding_puzzle.png differ
diff --git a/odoo/addons/base/static/img/onboarding_quotation-layout.png b/odoo/addons/base/static/img/onboarding_quotation-layout.png
new file mode 100644
index 00000000000..96723a5997b
Binary files /dev/null and b/odoo/addons/base/static/img/onboarding_quotation-layout.png differ
diff --git a/odoo/addons/base/static/img/onboarding_sample-quotation.png b/odoo/addons/base/static/img/onboarding_sample-quotation.png
new file mode 100644
index 00000000000..faa63673779
Binary files /dev/null and b/odoo/addons/base/static/img/onboarding_sample-quotation.png differ
diff --git a/odoo/addons/base/static/img/onboarding_taxes.png b/odoo/addons/base/static/img/onboarding_taxes.png
new file mode 100644
index 00000000000..305ab78f854
Binary files /dev/null and b/odoo/addons/base/static/img/onboarding_taxes.png differ
diff --git a/odoo/addons/base/static/img/partner_demo_portal.jpg b/odoo/addons/base/static/img/partner_demo_portal.jpg
deleted file mode 100644
index 521f563c1c3..00000000000
Binary files a/odoo/addons/base/static/img/partner_demo_portal.jpg and /dev/null differ
diff --git a/odoo/addons/base/static/img/partner_demo_portal.png b/odoo/addons/base/static/img/partner_demo_portal.png
new file mode 100644
index 00000000000..4f7269cf12b
Binary files /dev/null and b/odoo/addons/base/static/img/partner_demo_portal.png differ
diff --git a/odoo/addons/base/static/img/partner_root-image.jpg b/odoo/addons/base/static/img/partner_root-image.jpg
deleted file mode 100644
index b34e4f7a500..00000000000
Binary files a/odoo/addons/base/static/img/partner_root-image.jpg and /dev/null differ
diff --git a/odoo/addons/base/static/img/partner_root-image.png b/odoo/addons/base/static/img/partner_root-image.png
new file mode 100644
index 00000000000..430190fb73f
Binary files /dev/null and b/odoo/addons/base/static/img/partner_root-image.png differ
diff --git a/odoo/addons/base/static/img/user_demo-image.jpg b/odoo/addons/base/static/img/user_demo-image.jpg
deleted file mode 100644
index 859372c75fc..00000000000
Binary files a/odoo/addons/base/static/img/user_demo-image.jpg and /dev/null differ
diff --git a/odoo/addons/base/static/img/user_demo-image.png b/odoo/addons/base/static/img/user_demo-image.png
new file mode 100644
index 00000000000..2239c21f2b4
Binary files /dev/null and b/odoo/addons/base/static/img/user_demo-image.png differ
diff --git a/odoo/addons/base/static/src/css/modules.css b/odoo/addons/base/static/src/css/modules.css
index d26a9028c06..5f76475e190 100644
--- a/odoo/addons/base/static/src/css/modules.css
+++ b/odoo/addons/base/static/src/css/modules.css
@@ -1,7 +1,7 @@
 
 .oe_module_icon {
-    width: 70px;
-    max-height: 70px;
+    width: 50px;
+    max-height: 50px;
     max-width: 23%;
     float: left;
 }
diff --git a/odoo/addons/base/static/src/scss/onboarding.scss b/odoo/addons/base/static/src/scss/onboarding.scss
index 224d39d9b3a..758391ecc96 100644
--- a/odoo/addons/base/static/src/scss/onboarding.scss
+++ b/odoo/addons/base/static/src/scss/onboarding.scss
@@ -2,32 +2,12 @@
 // ============================================================================
 $o-onboarding-step-width: map-get($container-max-widths, 'lg') / 4 !default;
 
+
 .o_onboarding_main {
-    background: white center top;
-    background-size: cover;
-
-    .o_onboarding_btn_close {
-        color: #fff;
-    }
-
-    // = Color Variations
-    // ------------------------------------------------------------------------
-    @each $key, $values in $o-onboarding-colors {
-        &.o_onboarding_#{$key} {
-            $-bg: map-get($values, 'bg');
-            $-ui: map-get($values, 'ui');
-
-            @include print-variable('o-onboarding-done-color', nth($-ui, 1));
-            @include print-variable('o-onboarding-todo-color', nth($-ui, 2));
-            @include print-variable('o-onboarding-bg_1-color', fade-out(nth($-bg, 1), 0.5));
-            @include print-variable('o-onboarding-bg_2-color', nth($-bg, 2));
-        }
-    }
+    background-color: $o-onboarding-main-bg;
 
     .o_onboarding_wrap {
         overflow-x: auto;
-        background-color: var(--o-onboarding-bg_1-color);
-        background-image: linear-gradient(to bottom, var(--o-onboarding-bg_1-color), var(--o-onboarding-bg_2-color));
     }
 
     .o_onboarding_completed_message {
@@ -46,43 +26,52 @@ $o-onboarding-step-width: map-get($container-max-widths, 'lg') / 4 !default;
             }
         }
 
+        &:first-child, &:last-child {
+            .o_onboarding_line {
+                width: $o-onboarding-line-width / 2 ;
+            }
+        }
+
+        &:first-child {
+            .o_onboarding_line {
+                margin-left: $o-onboarding-line-width / 2;
+            }
+        }
+
+        &:last-child {
+            .o_onboarding_line {
+                margin-right: $o-onboarding-line-width / 2;
+            }
+        }
+
+        .o_onboarding_line {
+            background: linear-gradient(to right, $o-onboarding-color-orange 0%, $o-onboarding-color-blue 100%);
+            height: $o-onboarding-line-height;
+            width: $o-onboarding-line-width;
+            top: $o-onboarding-image-size / 2;
+            background-attachment: fixed;
+        }
+
         .o_onboarding_step_content {
             width: $o-onboarding-step-width;
         }
 
+        .o_onboarding_step_side img {            
+            width: $o-onboarding-image-size;
+            height: $o-onboarding-image-size;
+        }
+
         .o_onboarding_step_action {
             min-width: $o-onboarding-step-width * .5;
-            border: $border-width solid #fff;
+            border: $border-width solid #{$o-onboarding-color-blue};
+            color: $o-onboarding-color-blue;
         }
 
-        .o_onboarding_progress {
-            height: $o-onboarding-progress-size;
-            width: calc(100% - #{$o-onboarding-dot-size});
-            background: var(--o-onboarding-todo-color, #{$o-brand-odoo});
-            transform:
-                translateX(-100%)
-                translateY($o-onboarding-dot-size * .5 - $o-onboarding-progress-size * .5);
-        }
-
-        .o_onboarding_dot {
-            width: $o-onboarding-dot-size;
-            height: $o-onboarding-dot-size;
-            padding-top: .5em;
-            background-color: var(--o-onboarding-todo-color, $o-brand-odoo);
-            color: transparent;
-            transition: all $o-onboarding-base-time ease;
-            transform: scale3d(.5, .5, .5);
-        }
-
-        &:first-of-type .o_onboarding_progress {
-            display: none;
-        }
-
-        .o_onboarding_step_title,
-        .o_onboarding_step_action,
-        .o_onboarding_step_action__done,
-        .o_onboarding_dot_isChecked {
-            color: #fff;
+        .o_onboarding_step_action__done {
+            i {
+                background-color: $o-onboarding-color-orange;
+                color: #FFF;
+            }
         }
 
         // = "To do" Step Design
@@ -99,18 +88,6 @@ $o-onboarding-step-width: map-get($container-max-widths, 'lg') / 4 !default;
             }
         }
 
-        // = "Done" Step Design
-        // --------------------------------------------------------------------
-        &:not([data-step-state="not_done"])  {
-            .o_onboarding_dot, + .o_onboarding_step:not([data-step-state="not_done"]) .o_onboarding_progress {
-                background: var(--o-onboarding-done-color, #{$o-brand-primary});
-            }
-
-            .o_onboarding_dot {
-                transform: scale3d(1, 1, 1);
-            }
-        }
-
         // = "Just Done" Step Design
         // --------------------------------------------------------------------
         &[data-step-state="just_done"] {
diff --git a/odoo/addons/base/static/src/scss/onboarding.variables.dark.scss b/odoo/addons/base/static/src/scss/onboarding.variables.dark.scss
index 779c63f5a7f..27898237a45 100644
--- a/odoo/addons/base/static/src/scss/onboarding.variables.dark.scss
+++ b/odoo/addons/base/static/src/scss/onboarding.variables.dark.scss
@@ -2,17 +2,6 @@
 // ============================================================================
 // No CSS hacks, variables overrides only
 
-$o-onboarding-colors: (
-    'blue': (
-        'bg': (#215e72, #1c3d4e),
-        'ui': (#db851e, #c0ad73),
-    ),
-    'orange': (
-        'bg': (#5c4436, #784536),
-        'ui': ($o-brand-primary, #68B3C9),
-    ),
-    'violet': (
-        'bg': (#424a7d, #333e6a),
-        'ui': (#db851e, #c0ad73),
-    ),
-) !default;
+$o-onboarding-main-bg: $o-gray-100 !default;
+$o-onboarding-color-blue: #516db3 !default;
+$o-onboarding-color-orange: #c67c7a !default;
diff --git a/odoo/addons/base/static/src/scss/onboarding.variables.scss b/odoo/addons/base/static/src/scss/onboarding.variables.scss
index 6f433e6628a..6e885643dad 100644
--- a/odoo/addons/base/static/src/scss/onboarding.variables.scss
+++ b/odoo/addons/base/static/src/scss/onboarding.variables.scss
@@ -1,18 +1,7 @@
 $o-onboarding-base-time: 0.5s !default;
-$o-onboarding-dot-size: 20px !default;
-$o-onboarding-progress-size: 2px !default;
-
-$o-onboarding-colors: (
-    'blue': (
-        'bg': (#60ABC3, #4187AE),
-        'ui': (#fcb157, #FBEEC8),
-    ),
-    'orange': (
-        'bg': (#DA9D77, #B9684F),
-        'ui': (#0774f4, #68B3C9),
-    ),
-    'violet': (
-        'bg': (#6070C3, #475DA4),
-        'ui': (#F39D9B, #FBEEC8),
-    ),
-) !default;
+$o-onboarding-image-size: 64px !default;
+$o-onboarding-line-height: 2px !default;
+$o-onboarding-line-width: 100% !default;
+$o-onboarding-main-bg: $o-gray-200 !default;
+$o-onboarding-color-blue: #374874 !default;
+$o-onboarding-color-orange: #F39D9B !default;
diff --git a/odoo/addons/base/static/src/scss/res_partner.scss b/odoo/addons/base/static/src/scss/res_partner.scss
index 0935e1de1ec..7115b9edcc3 100644
--- a/odoo/addons/base/static/src/scss/res_partner.scss
+++ b/odoo/addons/base/static/src/scss/res_partner.scss
@@ -1,26 +1,4 @@
 .o_kanban_view .o_res_partner_kanban {
-
-    .ribbon {
-        &::before, &::after {
-            display: none;
-        }
-
-        span {
-            padding: 5px;
-            font-size: x-small;
-            z-index: unset;
-            height: auto;
-        }
-    }
-    .ribbon-top-right {
-        margin-top: -$o-kanban-dashboard-vpadding;
-
-        span {
-            top: 15px;
-            left: 10px;
-        }
-    }
-
     .oe_kanban_action_a:hover > .badge {
         background-color: $o-brand-primary;
         color: white;
diff --git a/odoo/addons/base/tests/test_module.py b/odoo/addons/base/tests/test_module.py
index 512d9888ffd..ed14e648655 100644
--- a/odoo/addons/base/tests/test_module.py
+++ b/odoo/addons/base/tests/test_module.py
@@ -48,7 +48,7 @@ class TestModuleManifest(BaseCase):
             'depends': [],
             'description': '',
             'external_dependencies': {},
-            'icon': '/base/static/description/icon.png',
+            'icon': '/base/static/description/icon.svg',
             'init_xml': [],
             'installable': True,
             'images': [],
diff --git a/odoo/addons/base/views/base_menus.xml b/odoo/addons/base/views/base_menus.xml
index 178a975cc85..37ffc32cc7c 100644
--- a/odoo/addons/base/views/base_menus.xml
+++ b/odoo/addons/base/views/base_menus.xml
@@ -4,10 +4,10 @@
       <!-- Top menu item -->
       <menuitem name="Settings"
           id="menu_administration"
-          web_icon="base,static/description/settings.png"
+          web_icon="base,static/description/settings.svg"
           sequence="550"
           groups="base.group_erp_manager"/>
-          <menuitem id="menu_management" name="Apps" sequence="500" web_icon="base,static/description/modules.png" groups="base.group_system"/>
+          <menuitem id="menu_management" name="Apps" sequence="500" web_icon="base,static/description/modules.svg" groups="base.group_system"/>
           <menuitem id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>
           <!-- FYI The group no_one on 'User & Companies' and 'Translations' is a FP/APR request -->
           <menuitem id="menu_users" name="Users &amp; Companies" parent="menu_administration" sequence="1"/>
diff --git a/odoo/addons/base/views/ir_actions_views.xml b/odoo/addons/base/views/ir_actions_views.xml
index 8374f1eff82..980940a1a45 100644
--- a/odoo/addons/base/views/ir_actions_views.xml
+++ b/odoo/addons/base/views/ir_actions_views.xml
@@ -60,15 +60,27 @@
                     <field name="binding_model_id" invisible="1"/>
                     <sheet>
                         <div class="oe_button_box" name="button_box">
-                            <button name="create_action" string="Add in the 'Print' menu" type="object"
+                            <button name="create_action" type="object"
                                     attrs="{'invisible':[('binding_model_id','!=',False)]}" icon="fa-plus-square"
-                                    help="Display an option on related documents to print this report" class="oe_stat_button"/>
-                            <button name="unlink_action" string="Remove from the 'Print' menu" type="object"
+                                    help="Display an option on related documents to print this report" class="oe_stat_button">
+                                    <div class="o_field_widget o_stat_info">
+                                        <span class="o_stat_text">Add to the 'Print' menu</span>
+                                    </div>
+                            </button>
+                            <button name="unlink_action" type="object"
                                     attrs="{'invisible':[('binding_model_id','=',False)]}" icon="fa-minus-square"
-                                    help="Remove the contextual action related to this report" class="oe_stat_button"/>
-                            <button name="associated_view" string="QWeb views" type="object"
+                                    help="Remove the contextual action related to this report" class="oe_stat_button">
+                                    <div class="o_field_widget o_stat_info">
+                                        <span class="o_stat_text">Remove from the 'Print' menu</span>
+                                    </div>
+                            </button>
+                            <button name="associated_view" type="object"
                                     attrs="{'invisible':[('report_type', 'not in', ['qweb-pdf', 'qweb-html', 'qweb-text'])]}" icon='fa-code'
-                                    class="oe_stat_button"/>
+                                    class="oe_stat_button">
+                                    <div class="o_field_widget o_stat_info">
+                                        <span class="o_stat_text">Qweb Views</span>
+                                    </div>
+                            </button>
                         </div>
                         <group>
                             <group>
diff --git a/odoo/addons/base/views/ir_mail_server_views.xml b/odoo/addons/base/views/ir_mail_server_views.xml
index fea86951064..26c53f10e3b 100644
--- a/odoo/addons/base/views/ir_mail_server_views.xml
+++ b/odoo/addons/base/views/ir_mail_server_views.xml
@@ -10,7 +10,7 @@
                             name="test_smtp_connection" class="btn-primary"/>
                     </header>
                     <sheet>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger"
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger"
                             attrs="{'invisible': [('active', '=', True)]}"/>
                         <group>
                             <group>
diff --git a/odoo/addons/base/views/onboarding_views.xml b/odoo/addons/base/views/onboarding_views.xml
index d7ab95f370c..4b27d26b233 100644
--- a/odoo/addons/base/views/onboarding_views.xml
+++ b/odoo/addons/base/views/onboarding_views.xml
@@ -24,14 +24,12 @@
         </div>
 
         <div class="o_onboarding_container collapse show">
-            <div t-att-class="'o_onboarding_main position-relative overflow-hidden ' + classes"
-                 t-att-style="'background-image:url(' + bg_image + ')'">
-
-                <div class="o_onboarding_wrap py-5">
-                    <a href="#" data-bs-toggle="modal" data-bs-target=".o_onboarding_modal" class="o_onboarding_btn_close position-absolute top-0 end-0 py-2 px-3 h2" title="Close the onboarding panel"><i class="oi oi-close"/></a>
-
+            <div class="o_onboarding_main position-relative border-bottom overflow-hidden">
+                <div class="o_onboarding_wrap py-3">
+                    <a href="#" data-bs-toggle="modal" data-bs-target=".o_onboarding_modal" class="o_onboarding_btn_close position-absolute top-0 end-0 py-2 px-3 h2 z-index-1" title="Close the onboarding panel"><i class="oi oi-close"/></a>
                     <div class="o_onboarding_steps d-flex" t-out="0"/>
 
+
                     <div t-if="state.get('onboarding_state') in ('done', 'just_done')"
                          t-att-state="state.get('onboarding_state')"
                          class="o_onboarding_completed_message position-absolute end-0 bottom-0 start-0 border-bottom py-4 bg-white d-flex align-items-center justify-content-center">
@@ -53,17 +51,17 @@
         <div class="o_onboarding_step position-relative d-flex flex-column align-items-center justify-content-start text-center" t-att-data-step-state="state">
             <img t-if="state == 'just_done'" class="o_onboarding_confetti position-absolute w-100" src="/base/static/img/onboarding_confetti.svg" alt="o_onboarding_confetti"/>
 
-            <div class="o_onboarding_step_side d-flex pt-0 flex-grow-1">
-                <div class="o_onboarding_progress position-absolute"/>
-                <span t-attf-class="o_onboarding_dot fa fa-check d-inline-block rounded-circle small {{state != 'not_done' and 'o_onboarding_dot_isChecked' or ''}}"/>
+            <div class="o_onboarding_line position-absolute"/>
+            <div class="o_onboarding_step_side d-flex">
+                <img class="z-index-1" t-attf-src="#{image}" t-attf-alt="#{alt}"/>
             </div>
 
-            <div class="o_onboarding_step_content py-3 flex-grow-1 d-flex flex-column align-items-center justify-content-around">
-                <div class="o_onboarding_step_content_info mb-3">
+            <div class="o_onboarding_step_content position-relative pt-2 flex-grow-1 d-flex flex-column align-items-center justify-content-around">
+                <div class="o_onboarding_step_content_info flex-grow-1 mb-2">
                     <a type="action" data-reload-on-close="true" role="button" t-att-data-method="method" t-att-data-model="model">
-                        <h4 class="o_onboarding_step_title" t-out="title"/>
+                        <h5 class="o_onboarding_step_title mb-1" t-out="title"/>
                     </a>
-                    <p class="text-white-75 m-0" t-out="description"/>
+                    <p class="m-0 small" t-out="description"/>
                 </div>
                 <a t-if="state == 'not_done'" class="o_onboarding_step_action btn px-4" type="action" data-reload-on-close="true" role="button" t-att-data-method="method" t-att-data-model="model">
                     <span>
@@ -73,7 +71,7 @@
                 </a>
                 <a t-else="" class="o_onboarding_step_action__done btn" type="action" data-reload-on-close="true" role="button" t-att-data-method="method" t-att-data-model="model">
                     <span>
-                        <i t-attf-class="me-2 fa #{done_icon if done_icon else 'fa-check'}" />
+                        <i t-attf-class="p-1 me-1 fa #{done_icon if done_icon else 'fa-check'} rounded-circle" />
                         <t t-if="done_text" t-out="done_text" />
                         <t t-else="">All done!</t>
                     </span>
@@ -89,6 +87,8 @@
             <t t-set="description">
                 Set your company's data for documents header/footer.
             </t>
+            <t t-set="image" t-value="'/base/static/img/onboarding_company-data.png'"/>
+            <t t-set="alt" t-value="'Onboarding Company Data'"/>
             <t t-set="btn_text">Let's start!</t>
             <t t-set="method" t-value="'action_open_base_onboarding_company'" />
             <t t-set="model" t-value="'res.company'" />
diff --git a/odoo/addons/base/views/res_bank_views.xml b/odoo/addons/base/views/res_bank_views.xml
index 56aeffa2949..30bd0b4a55d 100644
--- a/odoo/addons/base/views/res_bank_views.xml
+++ b/odoo/addons/base/views/res_bank_views.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Bank">
                     <sheet>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <group name="bank_details" col="4">
                             <field name="name"/>
                             <field name="bic"/>
@@ -81,7 +81,7 @@
             <field name="arch" type="xml">
                 <form string="Bank account" name="bank_account_form">
                 <sheet>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <group>
                         <group>
                             <field name="sequence" invisible="1"/>
diff --git a/odoo/addons/base/views/res_lang_views.xml b/odoo/addons/base/views/res_lang_views.xml
index 80b635a6fe2..52c152e8e3b 100644
--- a/odoo/addons/base/views/res_lang_views.xml
+++ b/odoo/addons/base/views/res_lang_views.xml
@@ -41,11 +41,14 @@
                 <form string="Languages">
                     <sheet>
                         <div class="oe_button_box" name="button_box">
-                            <button string="Activate and Translate"
-                                name="%(base.action_view_base_language_install)d"
+                            <button name="%(base.action_view_base_language_install)d"
                                 type="action"
                                 class="oe_stat_button"
-                                icon="fa-refresh" />
+                                icon="fa-refresh">
+                                <div class="o_field_widget o_stat_info">
+                                    <span class="o_stat_text">Activate and Translate</span>
+                                </div>
+                            </button>
                         </div>
                         <field name="flag_image" widget="image" class="oe_avatar"/>
                         <div class="oe_title">
diff --git a/odoo/addons/base/views/res_partner_views.xml b/odoo/addons/base/views/res_partner_views.xml
index 702c34262c2..5ede699ccf2 100644
--- a/odoo/addons/base/views/res_partner_views.xml
+++ b/odoo/addons/base/views/res_partner_views.xml
@@ -174,7 +174,7 @@
                 </div>
                 <sheet>
                     <div class="oe_button_box" name="button_box"/>
-                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <field name="avatar_128" invisible="1"/>
                     <field name="image_1920" widget='image' class="oe_avatar" options='{"preview_image": "avatar_128"}'/>
                     <div class="oe_title mb24">
@@ -500,7 +500,7 @@
                                     </div>
                                 </t>
                                 <div class="ribbon ribbon-top-right" attrs="{'invisible': [('active', '=', True)]}">
-                                    <span class="bg-danger">Archived</span>
+                                    <span class="text-bg-danger">Archived</span>
                                 </div>
                                 <div class="oe_kanban_details d-flex flex-column justify-content-between">
                                     <div>
diff --git a/odoo/addons/base/views/res_users_views.xml b/odoo/addons/base/views/res_users_views.xml
index 7e2df572041..79abb144ea7 100644
--- a/odoo/addons/base/views/res_users_views.xml
+++ b/odoo/addons/base/views/res_users_views.xml
@@ -209,7 +209,7 @@
                                 <field string="Record Rules" name="rules_count" widget="statinfo"/>
                             </button>
                         </div>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                        <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                         <field name="active_partner" required="0" readonly="1" invisible="1"/>
                         <div class="alert alert-info text-center o_form_header"
                             attrs="{'invisible': [
diff --git a/odoo/addons/test_apikeys/static/tests/apikey_flow.js b/odoo/addons/test_apikeys/static/tests/apikey_flow.js
index 8853a9b830f..c9a212ffa7d 100644
--- a/odoo/addons/test_apikeys/static/tests/apikey_flow.js
+++ b/odoo/addons/test_apikeys/static/tests/apikey_flow.js
@@ -8,7 +8,7 @@ registry.category("web_tour.tours").add('apikeys_tour_setup', {
     url: '/web?debug=1', // Needed as API key part is now only displayed in debug mode
     steps: [{
     content: 'Open user account menu',
-    trigger: '.o_user_menu .oe_topbar_name',
+    trigger: '.o_user_menu .dropdown-toggle',
     run: 'click',
 }, {
     content: "Open preferences / profile screen",
@@ -67,7 +67,7 @@ registry.category("web_tour.tours").add('apikeys_tour_teardown', {
     url: '/web?debug=1', // Needed as API key part is now only displayed in debug mode
     steps: [{
     content: 'Open preferences',
-    trigger: '.o_user_menu .oe_topbar_name',
+    trigger: '.o_user_menu .dropdown-toggle',
 }, {
     trigger: '[data-menu=settings]',
 }, {
@@ -87,7 +87,7 @@ registry.category("web_tour.tours").add('apikeys_tour_teardown', {
     trigger: 'button:contains(Confirm Password)',
 }, {
     content: 'Re-open preferences again',
-    trigger: '.o_user_menu .oe_topbar_name',
+    trigger: '.o_user_menu .dropdown-toggle',
 }, {
     trigger: '[data-menu=settings]',
 }, {
diff --git a/odoo/addons/test_exceptions/static/description/icon.png b/odoo/addons/test_exceptions/static/description/icon.png
index 17b43f06a49..fc36448c23f 100644
Binary files a/odoo/addons/test_exceptions/static/description/icon.png and b/odoo/addons/test_exceptions/static/description/icon.png differ
diff --git a/odoo/addons/test_exceptions/static/description/icon.svg b/odoo/addons/test_exceptions/static/description/icon.svg
index 3d9730426d7..48472470287 100644
--- a/odoo/addons/test_exceptions/static/description/icon.svg
+++ b/odoo/addons/test_exceptions/static/description/icon.svg
@@ -1,31 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 70">
-  <defs>
-    <mask id="mask" x="0" y="0" width="70" height="70.01" maskUnits="userSpaceOnUse">
-      <g id="icon-b">
-        <path id="icon-a" d="M4,0H65c4,0,5,1,5,5V65c0,4-1,5-5,5H4c-3,0-4-1-4-5V5C0,1,1,0,4,0Z" fill="#fff" fill-rule="evenodd"/>
-      </g>
-    </mask>
-    <linearGradient id="linear-gradient" x1="-1172.49" y1="-4.39" x2="-1173.49" y2="-5.38" gradientTransform="matrix(70, 0, 0, -70, 82144.61, -307.17)" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#797c79"/>
-      <stop offset="1" stop-color="#545554"/>
-    </linearGradient>
-  </defs>
-  <g mask="url(#mask)">
-    <g>
-      <path d="M0,0H70V70H0Z" fill-rule="evenodd" fill="url(#linear-gradient)"/>
-      <path d="M4,1H65q4,0,5,2V0H0V3C.66,1.68,2,1,4,1Z" fill="#fff" fill-opacity="0.38" fill-rule="evenodd"/>
-      <path d="M4,69H65q4,0,5-3v4H0V66A3.92,3.92,0,0,0,4,69Z" fill-opacity="0.38" fill-rule="evenodd"/>
-      <path d="M50.48,26.19c-8.22-10.5-17.86-11.65-28.43-6.09l-22,22V64.94C0,68.87,2,69,4,69H28.86L48.79,49.14,51.18,40l-12.3,12.3L28,51.56l7.34-7.3V41.35Z" fill="#393939" fill-rule="evenodd" opacity="0.32" style="isolation: isolate"/>
-      <g>
-        <g opacity="0.4">
-          <path d="M31.53,38.21l-.39-5.9c-.07-1.14-.11-2-.11-2.47a2.26,2.26,0,0,1,.53-1.59A1.85,1.85,0,0,1,33,27.68a1.42,1.42,0,0,1,1.42.73,5.09,5.09,0,0,1,.35,2.11c0,.54,0,1.09-.08,1.65l-.53,6.06a4.75,4.75,0,0,1-.37,1.66,1,1,0,0,1-.94.58.93.93,0,0,1-.92-.56A5.79,5.79,0,0,1,31.53,38.21ZM32.9,46.3a1.91,1.91,0,0,1-1.31-.49A1.69,1.69,0,0,1,31,44.46a1.83,1.83,0,0,1,1.84-1.84,1.83,1.83,0,0,1,1.33.54,1.75,1.75,0,0,1,.54,1.3,1.71,1.71,0,0,1-.55,1.35A1.87,1.87,0,0,1,32.9,46.3Z"/>
-          <path d="M32.89,56.84A19.86,19.86,0,1,1,46,22.09l1.4-1.45a1.5,1.5,0,0,1,2.58,1v5a1.5,1.5,0,0,1-1.5,1.5h0c-.12,0-4.93.13-4.93.13a1.53,1.53,0,0,1-1.4-.9,1.5,1.5,0,0,1,.3-1.64l1.46-1.52a16.85,16.85,0,1,0,5.13,17.54,1.5,1.5,0,1,1,2.87.85A20,20,0,0,1,32.89,56.84Z"/>
-        </g>
-        <g>
-          <path d="M33.52,36.22l-.39-5.89c-.08-1.15-.11-2-.11-2.48a2.26,2.26,0,0,1,.53-1.59A1.85,1.85,0,0,1,35,25.69a1.42,1.42,0,0,1,1.42.73,5.09,5.09,0,0,1,.35,2.11c0,.54,0,1.09-.08,1.65l-.53,6.06a4.75,4.75,0,0,1-.37,1.66,1,1,0,0,1-.94.58.93.93,0,0,1-.92-.56A5.79,5.79,0,0,1,33.52,36.22Zm1.37,8.09a1.94,1.94,0,0,1-1.31-.48A1.7,1.7,0,0,1,33,42.47a1.85,1.85,0,0,1,3.16-1.3,1.74,1.74,0,0,1,.55,1.3,1.71,1.71,0,0,1-.55,1.35A1.87,1.87,0,0,1,34.89,44.31Z" fill="#fff"/>
-          <path d="M34.87,54.85A19.85,19.85,0,1,1,48,20.1l1.4-1.45a1.5,1.5,0,0,1,2.58,1v5a1.5,1.5,0,0,1-1.5,1.5h0c-.12,0-4.93.13-4.93.13a1.53,1.53,0,0,1-1.4-.9,1.5,1.5,0,0,1,.3-1.64l1.46-1.52A16.85,16.85,0,1,0,51,39.8a1.5,1.5,0,1,1,2.87.85A20,20,0,0,1,34.87,54.85Z" fill="#fff"/>
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg"><circle cx="25" cy="25" r="22" fill="#fff"/><path fill-rule="evenodd" clip-rule="evenodd" d="M25 45c11.046 0 20-8.954 20-20S36.046 5 25 5 5 13.954 5 25s8.954 20 20 20Zm0 5c13.807 0 25-11.193 25-25S38.807 0 25 0 0 11.193 0 25s11.193 25 25 25Z" fill="var(--o-icons-red-pure, #FC787D)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M25 45c11.046 0 20-8.954 20-20S36.046 5 25 5 5 13.954 5 25s8.954 20 20 20Zm0 5c13.807 0 25-11.193 25-25S38.807 0 25 0 0 11.193 0 25s11.193 25 25 25Z" fill="url(#o_icon_test_exceptions__a)" fill-opacity=".2"/><path fill-rule="evenodd" clip-rule="evenodd" d="M25 36c6.075 0 11-4.925 11-11s-4.925-11-11-11-11 4.925-11 11 4.925 11 11 11Zm0 5c8.837 0 16-7.163 16-16S33.837 9 25 9 9 16.163 9 25s7.163 16 16 16Z" fill="var(--o-icons-red-red, #F9383D)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M25 36c6.075 0 11-4.925 11-11s-4.925-11-11-11-11 4.925-11 11 4.925 11 11 11Zm0 5c8.837 0 16-7.163 16-16S33.837 9 25 9 9 16.163 9 25s7.163 16 16 16Z" fill="url(#o_icon_test_exceptions__b)" fill-opacity=".2"/><path d="M31 25a6 6 0 1 1-12 0 6 6 0 0 1 12 0Z" fill="var(--o-icons-purple-pure, #93407D)"/><path d="M31 25a6 6 0 1 1-12 0 6 6 0 0 1 12 0Z" fill="url(#o_icon_test_exceptions__c)" fill-opacity=".2"/><defs><linearGradient id="o_icon_test_exceptions__a" x1="0" y1="0" x2="58.824" y2="14.706" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_test_exceptions__b" x1="9" y1="9" x2="46.647" y2="18.412" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="o_icon_test_exceptions__c" x1="19" y1="19" x2="33.118" y2="22.529" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
diff --git a/odoo/addons/test_lint/tests/test_manifests.py b/odoo/addons/test_lint/tests/test_manifests.py
index d5fd176e518..0e8db5c0d37 100644
--- a/odoo/addons/test_lint/tests/test_manifests.py
+++ b/odoo/addons/test_lint/tests/test_manifests.py
@@ -93,7 +93,7 @@ class ManifestLinter(BaseCase):
         )
         self.assertNotEqual(
             value,
-            f"/{module}/static/description/icon.png",
+            f"/{module}/static/description/icon.svg",
             f"Setting manifest key icon to the default manifest value for module {module!r}. "
             "You can remove this key from the dict to reduce noise/inconsistencies between manifests specifications"
             " and ease understanding of manifest content."
diff --git a/odoo/addons/test_main_flows/static/tests/tours/main_flow.js b/odoo/addons/test_main_flows/static/tests/tours/main_flow.js
index 38ec766b6eb..e9fd650e50c 100644
--- a/odoo/addons/test_main_flows/static/tests/tours/main_flow.js
+++ b/odoo/addons/test_main_flows/static/tests/tours/main_flow.js
@@ -10,7 +10,7 @@ registry.category("web_tour.tours").add('main_flow_tour', {
     url: "/web",
     steps: [
 ...stepUtils.goToAppSteps('sale.sale_menu_root', Markup(_t('Organize your sales activities with the <b>Sales app</b>.'))),
-stepUtils.openBurgerMenu("li.breadcrumb-item.active:contains('Quotations')"),
+stepUtils.openBurgerMenu(".o_breadcrumb .active:contains('Quotations')"),
 {
 // Add Stockable product
     mobile: false,
@@ -24,7 +24,7 @@ stepUtils.openBurgerMenu("li.breadcrumb-item.active:contains('Quotations')"),
     position: "bottom"
 }, {
     trigger: '.o-kanban-button-new',
-    extra_trigger: "li.breadcrumb-item.active:contains('Products')",
+    extra_trigger: ".o_breadcrumb .active:contains('Products')",
     content: _t("Let's create your first product."),
     position: 'bottom',
 }, {
@@ -78,7 +78,7 @@ stepUtils.openBurgerMenu("li.breadcrumb-item.active:contains('Quotations')"),
 },
 stepUtils.autoExpandMoreButtons('.o_form_saved'),
 {
-    trigger: ".oe_button_box .oe_stat_button div[name=bom_count]",
+    trigger: ".o-form-buttonbox .oe_stat_button div[name=bom_count]",
     extra_trigger: '.o_form_saved',
     content: _t('See Bill of material'),
     position: 'bottom',
@@ -108,7 +108,6 @@ stepUtils.autoExpandMoreButtons('.o_form_saved'),
     trigger: ".o_selected_row .o_required_modifier[name=product_id] input",
     content: _t("Click here to open kanban search mobile."),
     position: "bottom",
-    run: "click",
 }, {
     mobile: true,
     trigger: ".modal-dialog .btn:contains('New')",
@@ -149,7 +148,7 @@ stepUtils.autoExpandMoreButtons('.o_form_saved'),
 }, {
     mobile: false,
     trigger: ".o_field_widget[name=partner_id] input",
-    extra_trigger: ".breadcrumb-item.active:contains(the_flow.component1)",
+    extra_trigger: ".o_breadcrumb .active:contains(the_flow.component1)",
     content: _t('Select a seller'),
     position: 'top',
     run: "text the_flow.vendor",
@@ -221,7 +220,7 @@ stepUtils.autoExpandMoreButtons('.o_form_saved'),
 // Add second component
     mobile: false,
     trigger: ".o_field_x2many_list_row_add > a",
-    extra_trigger: ".breadcrumb-item.active:contains('the_flow.product')",
+    extra_trigger: ".o_breadcrumb .active:contains('the_flow.product')",
     content: _t("Click here to add some lines."),
     position: "bottom",
 }, {
@@ -289,7 +288,7 @@ stepUtils.autoExpandMoreButtons('.o_form_saved'),
 }, {
     mobile: false,
     trigger: ".o_field_widget[name=partner_id] input",
-    extra_trigger: ".breadcrumb-item.active:contains(the_flow.component2)",
+    extra_trigger: ".o_breadcrumb .active:contains(the_flow.component2)",
     content: _t('Select a seller'),
     position: 'top',
     run: "text the_flow.vendor",
@@ -325,22 +324,26 @@ stepUtils.autoExpandMoreButtons('.o_form_saved'),
     trigger: 'label:contains("Vendor Taxes")',
     // click somewhere else to exit cell focus
 }, {
-    mobile: false,
-    trigger: '.breadcrumb .o_back_button',
+    trigger: '.o_back_button',
     content: _t('Go back'),
     position: 'bottom',
 }, {
     mobile: false,
-    trigger: ".breadcrumb-item:first",
-    content: Markup(_t("Use the breadcrumbs to <b>go back to products</b>.")),
-    position: "bottom"
+    trigger: '.breadcrumb .o_back_button',
+    extra_trigger: ".o_breadcrumb .active:contains('the_flow.product')",
+    content: _t('Go back'),
+    position: 'bottom',
+}, {
+    trigger: '.o_back_button',
+    extra_trigger: ".o_breadcrumb .active:contains('Bill of Materials')",
+    content: _t('Go back'),
+    position: 'bottom',
+}, {
+    trigger: '.o_back_button',
+    extra_trigger: ".o_breadcrumb .active:contains('the_flow.product')",
+    content: _t('Go back'),
+    position: 'bottom',
 },
-...stepUtils.goBackBreadcrumbsMobile(
-        Markup(_t("Use the breadcrumbs to <b>go back to products</b>.")),
-        undefined,
-        ".breadcrumb-item.active:contains('Bill of Materials')",
-        ".breadcrumb-item.active:contains('the_flow.product')"
-    ),
 {
 // Add service product
     trigger: '.o-kanban-button-new',
@@ -416,7 +419,7 @@ stepUtils.autoExpandMoreButtons('.o_form_saved'),
     content: _t('Save'),
     position: 'right',
 }, {
-    trigger: '.o_form_button_save',
+    trigger: '.o_form_status_indicator .o_form_button_save',
     content: _t("Save this product and the modifications you've made to it."),
     position: 'bottom',
 }, {
@@ -613,7 +616,7 @@ stepUtils.autoExpandMoreButtons('.o_form_saved'),
     position: 'bottom',
 },
 ...stepUtils.goToAppSteps('stock.menu_stock_root', _t('Go to Inventory')),
-stepUtils.openBurgerMenu("li.breadcrumb-item.active:contains('Inventory Overview')"),
+stepUtils.openBurgerMenu(".o_breadcrumb .active:contains('Inventory Overview')"),
 {
     mobile: false,
     trigger: ".o_menu_sections button[data-menu-xmlid='stock.menu_stock_config_settings']",
@@ -674,7 +677,7 @@ stepUtils.openBurgerMenu("li.breadcrumb-item.active:contains('Inventory Overview
     content: Markup(_t("<p>Save this reordering rule</p>")),
     position: "bottom"
 },
-stepUtils.openBurgerMenu("li.breadcrumb-item.active:contains('OP/')"),
+stepUtils.openBurgerMenu(".o_breadcrumb .active:contains('OP/')"),
 {
 //Go to purchase:
     edition: "enterprise",
@@ -703,7 +706,7 @@ stepUtils.openBurgerMenu("li.breadcrumb-item.active:contains('OP/')"),
     content: _t("Apply"),
     position: "bottom",
 }, {
-    trigger: ".o_back_button a, .breadcrumb-item:not('.active'):last",
+    trigger: ".o_back_button, .breadcrumb-item:not('.active'):last",
     content: _t('go back to the purchase order'),
     position: 'bottom',
 },
@@ -727,7 +730,7 @@ stepUtils.openBurgerMenu("li.breadcrumb-item.active:contains('OP/')"),
     position: 'bottom',
 },
 ...stepUtils.goToAppSteps('mrp.menu_mrp_root', _t('Go to Manufacturing')),
-stepUtils.openBurgerMenu("li.breadcrumb-item.active:contains('Manufacturing Orders'), li.breadcrumb-item.active:contains('Work Centers Overview')"),
+stepUtils.openBurgerMenu(".o_breadcrumb .active:contains('Manufacturing Orders'), .o_breadcrumb .active:contains('Work Centers Overview')"),
 {
     mobile: false,
     trigger: ".o_menu_sections button[data-menu-xmlid='mrp.menu_mrp_manufacturing']",
@@ -745,7 +748,7 @@ stepUtils.openBurgerMenu("li.breadcrumb-item.active:contains('Manufacturing Orde
 }, {
     mobile: true,
     trigger: '.o_kanban_record .o_kanban_record_title:contains("the_flow.product"):first',
-    extra_trigger: "li.breadcrumb-item.active:contains('Manufacturing Orders')",
+    extra_trigger: ".o_breadcrumb .active:contains('Manufacturing Orders')",
     content: _t('Select the generated manufacturing order'),
     position: 'bottom',
 },
@@ -774,7 +777,7 @@ stepUtils.openBurgerMenu("li.breadcrumb-item.active:contains('Manufacturing Orde
     position: 'bottom',
 },
 ...stepUtils.goToAppSteps('sale.sale_menu_root', Markup(_t('Organize your sales activities with the <b>Sales app</b>.'))),
-stepUtils.openBurgerMenu("li.breadcrumb-item.active:contains('Quotations')"),
+stepUtils.openBurgerMenu(".o_breadcrumb .active:contains('Quotations')"),
 {
     mobile: false,
     trigger: ".o_menu_sections button[data-menu-xmlid='sale.sale_order_menu']",
@@ -787,26 +790,26 @@ stepUtils.openBurgerMenu("li.breadcrumb-item.active:contains('Quotations')"),
 }, {
     mobile: false,
     trigger: ".o_data_cell:contains('the_flow.customer')",
-    extra_trigger: '.o_control_panel .breadcrumb:contains("Sales Orders")',
+    extra_trigger: '.o_control_panel .o_breadcrumb:contains("Sales Orders")',
     content: _t("Go to the last sale order"),
     position: "right"
 }, {
     mobile: true,
     trigger: ".o_kanban_record .o_kanban_record_title:contains('the_flow.customer')",
-    extra_trigger: '.o_control_panel .breadcrumb:contains("Sales Orders")',
+    extra_trigger: '.o_control_panel .o_breadcrumb:contains("Sales Orders")',
     content: _t("Go to the last sale order"),
     position: "bottom"
 },
-stepUtils.mobileModifier(stepUtils.autoExpandMoreButtons('.o_control_panel .breadcrumb:contains("S0")')),
+stepUtils.mobileModifier(stepUtils.autoExpandMoreButtons('.o_control_panel .o_breadcrumb:contains("S0")')),
 {
     mobile: false,
-    trigger: '.oe_button_box .oe_stat_button:has(div[name=tasks_count])',
+    trigger: '.o-form-buttonbox .oe_stat_button:has(div[name=tasks_count])',
     content: _t('See Tasks'),
     position: 'right',
 }, {
     mobile: true,
-    trigger: '.oe_button_box .oe_stat_button:has(div[name=tasks_count])',
-    extra_trigger: '.o_control_panel .breadcrumb:contains("S0")',
+    trigger: '.o-form-buttonbox .oe_stat_button:has(div[name=tasks_count])',
+    extra_trigger: '.o_control_panel .o_breadcrumb:contains("S0")',
     content: _t('See Tasks'),
     position: 'bottom',
 }, {
@@ -849,7 +852,7 @@ stepUtils.mobileModifier(stepUtils.autoExpandMoreButtons('.o_control_panel .brea
 ...stepUtils.goBackBreadcrumbsMobile(
         _t('Back to the sale order'),
         undefined,
-        ".breadcrumb-item.active:contains('the_flow.service')"
+        ".o_breadcrumb .active:contains('the_flow.service')"
     ),
 {
     mobile: false,
@@ -864,7 +867,7 @@ stepUtils.mobileModifier(stepUtils.autoExpandMoreButtons('.o_control_panel .brea
     content: _t("Create and View Invoices"),
     position: "bottom",
 },
-...stepUtils.statusbarButtonsSteps('Confirm', _t("Validate"), ".breadcrumb-item.active:contains('Draft Invoice')"),
+...stepUtils.statusbarButtonsSteps('Confirm', _t("Validate"), ".o_breadcrumb .active:contains('Draft Invoice')"),
 ...stepUtils.statusbarButtonsSteps('Register Payment', _t("Register Payment"), ".o_statusbar_status .btn.dropdown-toggle:contains('Posted')"),
 {
     trigger: ".modal-footer .btn-primary",
@@ -873,7 +876,7 @@ stepUtils.mobileModifier(stepUtils.autoExpandMoreButtons('.o_control_panel .brea
 }, {
     edition: "community",
     content: "wait for payment registration to succeed",
-    trigger: "span.bg-success:contains('Paid')",
+    trigger: "span.text-bg-success:contains('Paid')",
     auto: true,
     run() {}
 },{
diff --git a/odoo/addons/test_main_flows/tests/test_flow.py b/odoo/addons/test_main_flows/tests/test_flow.py
index ac9adde231e..51fbb7b6e46 100644
--- a/odoo/addons/test_main_flows/tests/test_flow.py
+++ b/odoo/addons/test_main_flows/tests/test_flow.py
@@ -1,8 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import odoo
 import odoo.tests
-import unittest
 
 class BaseTestUi(odoo.tests.HttpCase):
 
diff --git a/odoo/addons/test_new_api/static/tests/tours/constraint.js b/odoo/addons/test_new_api/static/tests/tours/constraint.js
index eaba4b4bd52..7121ad312a7 100644
--- a/odoo/addons/test_new_api/static/tests/tours/constraint.js
+++ b/odoo/addons/test_new_api/static/tests/tours/constraint.js
@@ -9,7 +9,7 @@
         steps: [
     {
         content: "wait web client",
-        trigger: '.breadcrumb:contains(Categories)',
+        trigger: '.o_breadcrumb:contains(Categories)',
     }, { // create test category
         content: "create new category",
         trigger: 'button.o_list_button_add',
diff --git a/odoo/addons/test_new_api/static/tests/tours/x2many.js b/odoo/addons/test_new_api/static/tests/tours/x2many.js
index 568a04a0159..17ce6937193 100644
--- a/odoo/addons/test_new_api/static/tests/tours/x2many.js
+++ b/odoo/addons/test_new_api/static/tests/tours/x2many.js
@@ -13,7 +13,7 @@
     /////////////////////////////////////////////////////////////////////////////////////////////
     {
         content: "wait web client",
-        trigger: '.breadcrumb:contains(Discussions)',
+        trigger: '.o_breadcrumb:contains(Discussions)',
     }, { // create test discussion
         content: "create new discussion",
         trigger: 'button.o_list_button_add',
@@ -314,7 +314,7 @@
     }, {
         content: "select previous created record",
         trigger: 'td:contains(test_trigger):last',
-        extra_trigger: '.breadcrumb-item:contains(Discussions 2)',
+        extra_trigger: '.o_breadcrumb:contains(Discussions 2)',
     }, {
         content: "edit content",
         trigger: '.o_field_widget[name=name] input',
@@ -422,7 +422,7 @@
         trigger: '.dropdown-item[data-menu-xmlid="test_new_api.menu_discussions_3"]',
     }, {
         content: "wait web client",
-        trigger: '.breadcrumb:contains(Discussions 3)',
+        trigger: '.o_breadcrumb:contains(Discussions 3)',
     }, {
         content: "create new discussion",
         trigger: 'button.o_list_button_add',
diff --git a/odoo/modules/module.py b/odoo/modules/module.py
index 48ba5d0f752..439c945524b 100644
--- a/odoo/modules/module.py
+++ b/odoo/modules/module.py
@@ -37,7 +37,7 @@ _DEFAULT_MANIFEST = {
     'depends': [],
     'description': '',
     'external_dependencies': {},
-    #icon: f'/{module}/static/description/icon.png',  # automatic
+    #icon: f'/{module}/static/description/icon.svg',  # automatic
     'init_xml': [],
     'installable': True,
     'images': [],  # website
@@ -240,7 +240,7 @@ def get_resource_from_path(path):
     return None
 
 def get_module_icon(module):
-    iconpath = ['static', 'description', 'icon.png']
+    iconpath = ['static', 'description', 'icon.svg']
     if get_module_resource(module, *iconpath):
         return ('/' + module + '/') + '/'.join(iconpath)
     return '/base/'  + '/'.join(iconpath)