diff --git a/addons/hr_recruitment/static/src/scss/hr_job.scss b/addons/hr_recruitment/static/src/scss/hr_job.scss
index 3f6a48e2b34..ea195c06157 100644
--- a/addons/hr_recruitment/static/src/scss/hr_job.scss
+++ b/addons/hr_recruitment/static/src/scss/hr_job.scss
@@ -60,60 +60,6 @@
             }
         }
     }
-
-    .o_recruitment_kanban_boxes {
-        display: flex;
-        flex-flow: row nowrap;
-
-        .o_recruitment_kanban_box {
-            position: relative;
-            padding: 0 0 0 0;
-            flex: 1 1 auto;
-            display: flex;
-            flex-flow: row nowrap;
-            justify-content: center;
-
-            &:first-child {
-                justify-content: flex-start;
-                padding-left: 16px;
-            }
-            div:last-child {
-                justify-content: flex-end;
-                text-align: right;
-            }
-            .o_link_trackers{
-                .fa{
-                    color: $o-brand-primary;
-                } 
-            }
-            .o_value {
-                font-weight: 800;
-            }
-            &.bottom_block {
-                background-color: unset !important;
-            }
-
-            > a {
-                font-weight: 500;
-
-                &.o_needaction{
-                    font-size: small;
-                    font-weight: 400;
-                    margin-left: 4px;
-                    @include o-hover-opacity(0.5, 1);
-
-                    &:before {
-                        content: "/ ";
-                    }
-
-                    &:after {
-                        content: "\f086";
-                        font: normal normal normal 14px/1 FontAwesome;
-                    }
-                }
-            }
-        }
-    }
 }
 
 .o_kanban_renderer {
diff --git a/addons/hr_recruitment/views/hr_job_views.xml b/addons/hr_recruitment/views/hr_job_views.xml
index 6577e9529c4..e47c6845bea 100644
--- a/addons/hr_recruitment/views/hr_job_views.xml
+++ b/addons/hr_recruitment/views/hr_job_views.xml
@@ -31,16 +31,16 @@
                             <div class="o_kanban_card_header">
                                 <div class="o_kanban_card_header_title">
                                     <field name="is_favorite" widget="boolean_favorite" nolabel="1"/>
-                                    <div class="o_primary col-11">
+                                    <div class="o_primary ps-3">
                                         <t t-esc="record.name.value"/>
                                     </div>
-                                    <div class="col-12 text-muted">
+                                    <div class="ps-3 text-muted">
                                         <field name="user_id" />
                                     </div>
-                                    <div class="col-12 o_secondary" groups="base.group_multi_company">
+                                    <div class="ps-3 o_secondary" groups="base.group_multi_company">
                                         <small><i class="fa fa-building-o" role="img" aria-label="Company" title="Company"></i> <field name="company_id"/></small>
                                     </div>
-                                    <div t-if="record.alias_name.value and record.alias_domain.value" class="col-12 o_secondary o_job_alias">
+                                    <div t-if="record.alias_name.value and record.alias_domain.value" class="ps-3 o_secondary o_job_alias">
                                         <small><i class="fa fa-envelope-o" role="img" aria-label="Alias" title="Alias"></i> <field name="alias_id"/></small>
                                     </div>
                                 </div>
@@ -72,7 +72,7 @@
                                         </li>
                                     </ul>
                                 </div>
-                                <div name="kanban_boxes" class="row o_recruitment_kanban_boxes" groups="hr_recruitment.group_hr_recruitment_user"></div>
+                                <div name="kanban_boxes" class="row flex-nowrap" groups="hr_recruitment.group_hr_recruitment_user"></div>
                             </div>
                             <div class="container o_recruitment_job_container o_kanban_card_manage_pane dropdown-menu" role="menu">
                                 <div class="row">
diff --git a/addons/lunch/static/src/xml/lunch_templates.xml b/addons/lunch/static/src/xml/lunch_templates.xml
index abbca8e6c27..096f29c3be2 100644
--- a/addons/lunch/static/src/xml/lunch_templates.xml
+++ b/addons/lunch/static/src/xml/lunch_templates.xml
@@ -49,7 +49,7 @@
                                             <button t-if="can_modify" t-esc="line.product[1]" t-attf-class="btn btn-link o_lunch_open_wizard" t-attf-data-product-id="{{ line.product[0] }}" t-attf-data-id="{{ line.id }}"/>
                                             <t t-else="" t-esc="line.product[1]" />
                                             <t t-set="state_pill" t-value="states_mapping[line.raw_state]" />
-                                            <span t-esc="line.state" t-attf-class="badge badge-pill badge-{{ state_pill }}" />
+                                            <span t-esc="line.state" t-attf-class="badge rounded-pill bg-{{ state_pill }}" />
                                         </div>
                                         <div class="flex-grow-0">
                                             <t t-call="currency_field">
diff --git a/addons/lunch/views/lunch_product_views.xml b/addons/lunch/views/lunch_product_views.xml
index 791e16c52dc..ab51a3cee40 100644
--- a/addons/lunch/views/lunch_product_views.xml
+++ b/addons/lunch/views/lunch_product_views.xml
@@ -123,7 +123,7 @@
                                                 <div class="float-right text-odoo">
                                                     <field name="price" widget="monetary"/>
                                                 </div>
-                                                <div t-if="record.is_new.raw_value" class="float-right o_lunch_new_product mr-1 badge-pill badge-success">
+                                                <div t-if="record.is_new.raw_value" class="float-end o_lunch_new_product me-1 py-0 border-0 fs-6 badge rounded-pill bg-success">
                                                     New
                                                 </div>
                                                 <strong><span t-esc="record.name.value"/></strong>
diff --git a/addons/portal/static/src/xml/portal_chatter.xml b/addons/portal/static/src/xml/portal_chatter.xml
index 1ec86afdd12..15fc742a355 100644
--- a/addons/portal/static/src/xml/portal_chatter.xml
+++ b/addons/portal/static/src/xml/portal_chatter.xml
@@ -32,7 +32,7 @@
                     Oops! Something went wrong. Try to reload the page and log in.
                 </div>
                 <div class="d-flex">
-                    <img alt="Avatar" class="o_portal_chatter_avatar o_object_fit_cover" t-attf-src="/web/image/res.partner/#{widget.options['partner_id']}/avatar_128"
+                    <img alt="Avatar" class="o_portal_chatter_avatar o_object_fit_cover align-self-start" t-attf-src="/web/image/res.partner/#{widget.options['partner_id']}/avatar_128"
                          t-if="!widget.options['is_user_public'] or !widget.options['token']"/>
                     <div class="flex-grow-1">
                         <div class="o_portal_chatter_composer_input">
diff --git a/addons/project/views/project_portal_templates.xml b/addons/project/views/project_portal_templates.xml
index aa3f02726d6..3e0493a23cb 100644
--- a/addons/project/views/project_portal_templates.xml
+++ b/addons/project/views/project_portal_templates.xml
@@ -231,11 +231,11 @@
                                 </ul>
                             </li>
 
-                            <li t-if="task.user_ids or task.partner_id" class="list-group-item flex-grow-1 pl-0">
+                            <li t-if="task.user_ids or task.partner_id" class="list-group-item flex-grow-1">
                                 <div class="col-12 col-md-12 pb-2" t-if="task.user_ids">
                                     <strong>Assignees</strong>
                                     <t t-foreach="task.user_ids" t-as="user">
-                                        <div class="row pl-3 mb-3 flex-nowrap">
+                                        <div class="d-flex mb-3 flex-nowrap">
                                             <img class="rounded-circle mt-1 o_portal_contact_img" t-att-src="image_data_uri(user.avatar_1024)" alt="Contact"/>
                                             <div class="ml-2">
                                                 <div t-esc="user" t-options='{"widget": "contact", "fields": ["name"]}'/>
@@ -249,7 +249,7 @@
                                 </div>
                                 <div class="col-12 col-md-12 pb-2" t-if="task.partner_id">
                                     <strong>Customer</strong>
-                                    <div class="row pl-3 flex-nowrap">
+                                    <div class="d-flex flex-nowrap">
                                         <img class="rounded-circle mt-1 o_portal_contact_img" t-att-src="image_data_uri(task.partner_id.avatar_1024)" alt="Contact"/>
                                         <div class="ml-2">
                                             <div t-field="task.partner_id" t-options='{"widget": "contact", "fields": ["name"]}'/>
diff --git a/addons/snailmail_account/views/res_config_settings_views.xml b/addons/snailmail_account/views/res_config_settings_views.xml
index dcc7a75d8dc..ef44abaa57a 100644
--- a/addons/snailmail_account/views/res_config_settings_views.xml
+++ b/addons/snailmail_account/views/res_config_settings_views.xml
@@ -7,8 +7,8 @@
         <field name="inherit_id" ref="account.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[@id='send_default']" position="inside">
-                <div class="row" attrs="{'invisible': [('module_snailmail_account', '=', False)]}">
-                    <field name="invoice_is_snailmail" class="col-lg-1 ml16"/>
+                <div attrs="{'invisible': [('module_snailmail_account', '=', False)]}">
+                    <field name="invoice_is_snailmail"/>
                     <label for="invoice_is_snailmail"/>
                     <span class="fa fa-lg fa-building-o" title="Values set here are company-specific."/>
                 </div>
@@ -16,22 +16,20 @@
 
             <div id="snailmail_settings" position="inside">
                 <div class="mt16" attrs="{'invisible': [('module_snailmail_account', '=', False)]}">
-                    <div class="content-group">
-                        <div class="row">
-                            <field name="snailmail_color" class="col-lg-1 ml16"/>
-                            <label for="snailmail_color"/>
-                            <span class="fa fa-lg fa-building-o" title="Values set here are company-specific."/>
-                        </div>
-                        <div class="row">
-                            <field name="snailmail_duplex" class="col-lg-1 ml16"/>
-                            <label for="snailmail_duplex"/>
-                            <span class="fa fa-lg fa-building-o" title="Values set here are company-specific."/>
-                        </div>
-                        <div class="row">
-                            <field name="snailmail_cover" class="col-lg-1 ml16"/>
-                            <label for="snailmail_cover"/>
-                            <span class="fa fa-lg fa-building-o" title="Values set here are company-specific."/>
-                        </div>
+                    <div>
+                        <field name="snailmail_color"/>
+                        <label for="snailmail_color"/>
+                        <span class="fa fa-lg fa-building-o" title="Values set here are company-specific."/>
+                    </div>
+                    <div>
+                        <field name="snailmail_duplex"/>
+                        <label for="snailmail_duplex"/>
+                        <span class="fa fa-lg fa-building-o" title="Values set here are company-specific."/>
+                    </div>
+                    <div>
+                        <field name="snailmail_cover"/>
+                        <label for="snailmail_cover"/>
+                        <span class="fa fa-lg fa-building-o" title="Values set here are company-specific."/>
                     </div>
                 </div>
                 <widget name="iap_buy_more_credits" service_name="snailmail"/>
diff --git a/addons/stock/report/report_stock_forecasted.xml b/addons/stock/report/report_stock_forecasted.xml
index bbbc7d1f601..7fbb198167e 100644
--- a/addons/stock/report/report_stock_forecasted.xml
+++ b/addons/stock/report/report_stock_forecasted.xml
@@ -49,21 +49,21 @@
                 </h6>
             </div>
             <div class="row">
-                <div class="mx-3 text-center">
+                <div class="col text-center">
                     <div class="h3">
                         <t t-esc="docs['quantity_on_hand']" t-options="{'widget': 'float', 'precision': precision}"/>
                         <t t-esc="docs['uom']" groups="uom.group_uom"/>
                     </div>
                     <div>On Hand</div>
                 </div>
-                <div t-attf-class="mx-3 text-center #{docs['virtual_available'] &lt; 0 and 'text-danger'}">
+                <div t-attf-class="col text-center #{docs['virtual_available'] &lt; 0 and 'text-danger'}">
                     <div class="h3">
                         <t t-esc="docs['virtual_available']" t-options="{'widget': 'float', 'precision': precision}"/>
                         <t t-esc="docs['uom']" groups="uom.group_uom"/>
                     </div>
                     <div>Forecasted</div>
                 </div>
-                <div name="pending_forecasted" t-attf-class="mx-3 text-center #{future_virtual_available &lt; 0 and 'text-danger'}">
+                <div name="pending_forecasted" t-attf-class="col text-center #{future_virtual_available &lt; 0 and 'text-danger'}">
                     <div class="h3">
                         <t t-esc="future_virtual_available" t-options="{'widget': 'float', 'precision': precision}"/>
                         <t t-esc="docs['uom']" groups="uom.group_uom"/>
diff --git a/addons/stock_account/report/report_stock_forecasted.xml b/addons/stock_account/report/report_stock_forecasted.xml
index cd2d1ee1150..5d755051480 100644
--- a/addons/stock_account/report/report_stock_forecasted.xml
+++ b/addons/stock_account/report/report_stock_forecasted.xml
@@ -2,7 +2,7 @@
 <odoo>
     <template id="stock_account_report_product_product_replenishment" inherit_id="stock.report_replenishment_header">
         <xpath expr="//div[@name='pending_forecasted']" position="after">
-            <div t-attf-class="mx-3 text-center" t-if="env.user.has_group('stock.group_stock_manager')">
+            <div t-attf-class="col text-center" t-if="env.user.has_group('stock.group_stock_manager')">
                 <div class="h3">
                     <t t-esc="docs['value']"/>
                 </div>
diff --git a/addons/survey/views/survey_templates_statistics.xml b/addons/survey/views/survey_templates_statistics.xml
index dc1a06ce9fa..b12e227449b 100644
--- a/addons/survey/views/survey_templates_statistics.xml
+++ b/addons/survey/views/survey_templates_statistics.xml
@@ -50,7 +50,7 @@
             <t t-if="question_data['is_page']">
                 <h2 class="mt16 text-uppercase text-muted" t-field="question.title"/>
                 <div t-field="question.description" class="oe_no_empty" />
-                <hr class="mt-2 pb-1 mb-1"/>
+                <hr class="mt-2 mb-2"/>
             </t>
             <div t-else="" class="ml-4 mt-5">
                 <t t-call="survey.survey_page_statistics_question" />
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index 0318c891944..0b5d057b2aa 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -141,13 +141,13 @@
                     </div>
                 </div>
 
-                <div class="form-group field-login">
-                    <label for="login">Email</label>
+                <div class="mb-3 field-login">
+                    <label for="login" class="form-label">Email</label>
                     <input type="text" placeholder="Email" name="login" t-att-value="login" id="login" t-attf-class="form-control #{'form-control-sm' if form_small else ''}" required="required" autofocus="autofocus" autocapitalize="off"/>
                 </div>
 
-                <div class="form-group field-password">
-                    <label for="password">Password</label>
+                <div class="mb-3 form-group">
+                    <label for="password" class="form-label">Password</label>
                     <input type="password" placeholder="Password" name="password" id="password" t-attf-class="form-control #{'form-control-sm' if form_small else ''}" required="required" autocomplete="current-password" t-att-autofocus="'autofocus' if login else None" maxlength="4096"/>
                 </div>
 
@@ -158,10 +158,10 @@
                     <t t-esc="message"/>
                 </p>
 
-                <div t-attf-class="clearfix oe_login_buttons text-center mb-1 {{'pt-2' if form_small else 'pt-3'}}">
-                    <button type="submit" class="btn btn-primary btn-block">Log in</button>
+                <div t-attf-class="clearfix oe_login_buttons text-center gap-1 d-grid mb-1 {{'pt-2' if form_small else 'pt-3'}}">
+                    <button type="submit" class="btn btn-primary">Log in</button>
                     <t t-if="debug">
-                        <button type="submit" name="redirect" value="/web/become" class="btn btn-link btn-sm btn-block">Log in as superuser</button>
+                        <button type="submit" name="redirect" value="/web/become" class="btn btn-link btn-sm">Log in as superuser</button>
                     </t>
                     <div class="o_login_auth"/>
                 </div>
diff --git a/addons/website_event/views/event_templates_list.xml b/addons/website_event/views/event_templates_list.xml
index cceaded513b..4dbf3531bde 100644
--- a/addons/website_event/views/event_templates_list.xml
+++ b/addons/website_event/views/event_templates_list.xml
@@ -17,7 +17,7 @@
             <!-- Content -->
             <div t-attf-class="o_wevent_events_list #{opt_events_list_cards and 'opt_event_list_cards_bg'}">
                 <div class="container">
-                    <div class="row">
+                    <div class="d-flex mx-n3">
                         <t t-call="website_event.searched_tags"/>
                     </div>
                     <div class="row">
@@ -177,11 +177,11 @@
                                     <span t-field="event.date_begin" t-options="{'tz_name': event.date_tz, 'format': 'dd'}" class="o_wevent_event_day oe_hide_on_date_edit"/>
                                 </div>
                                 <!-- Participating -->
-                                <small t-if="event.is_participating" class="o_wevent_participating bg-success">
+                                <small t-if="event.is_participating" class="o_wevent_participating text-bg-success">
                                     <i class="fa fa-check mr-2"/>Registered
                                 </small>
                                 <!-- Unpublished -->
-                                <small t-if="not event.website_published" class="o_wevent_unpublished bg-danger">
+                                <small t-if="not event.website_published" class="o_wevent_unpublished text-bg-danger">
                                     <i class="fa fa-ban mr-2"/>Unpublished
                                 </small>
                             </t>
diff --git a/addons/website_event/views/event_templates_page_registration.xml b/addons/website_event/views/event_templates_page_registration.xml
index 8a6535dc39a..888732af729 100644
--- a/addons/website_event/views/event_templates_page_registration.xml
+++ b/addons/website_event/views/event_templates_page_registration.xml
@@ -119,9 +119,9 @@
 <template id="registration_template" name="Registration">
     <div t-if="toast_message" class="o_wevent_register_toaster d-none" t-att-data-message="toast_message"/>
     <div t-if="not event.event_registrations_open" class="bg-white mb-5">
-        <div class="alert alert-info mb-0 d-flex justify-content-between align-items-center" role="status">
+        <div class="alert alert-info mb-0 row g-0 justify-content-between align-items-center" role="status">
             <t t-if="not event.event_registrations_started and not event.event_registrations_sold_out">
-                <div class="col-md-8 d-flex">
+                <div class="col col-md-8 d-flex">
                     <em class="mr-2">Ticket Sales starting on
                         <span class="" t-out="event.start_sale_datetime"
                             t-options="{'widget': 'datetime', 'tz_name': event.date_tz, 'format': 'short'}"/>
@@ -130,14 +130,14 @@
                     <t t-call="website_event.registration_configure_tickets_button"
                         t-if="request.env.user.has_group('event.group_event_manager')"/>
                 </div>
-                <button class="btn btn-danger ml-2 col-md-4"  disabled="1">Registrations not yet open</button>
+                <button class="btn btn-danger col col-md-4"  disabled="1">Registrations not yet open</button>
             </t>
             <t t-else="">
-                <div class="col-md-8">
+                <div class="col col-md-8">
                     <em t-if="event.event_registrations_sold_out">Tickets for this Event are <b>Sold Out</b></em>
                     <em t-else="">Registrations are <b>closed</b></em>
                 </div>
-                <button class="btn btn-danger ml-3 col-md-4 py-2" disabled="1">
+                <button class="btn btn-danger col col-md-4 py-2" disabled="1">
                     <span t-if="event.event_registrations_sold_out">Sold Out</span>
                     <span t-else="">Registrations Closed</span>
                 </button>
@@ -211,8 +211,8 @@
                         </div>
                     </div>
                     <div class="row no-gutters">
-                        <div class="col-md-4 offset-md-8 py-2 pl-md-0 pr-md-2">
-                            <button type="submit" class="btn btn-primary o_wait_lazy_js btn-block a-submit" disabled="" t-attf-id="#{event.id}">
+                        <div class="d-grid col-md-4 offset-md-8 py-2 pl-md-0 pr-md-2">
+                            <button type="submit" class="btn btn-primary o_wait_lazy_js a-submit" disabled="" t-attf-id="#{event.id}">
                                 Register
                                 <t t-if="event.seats_limited and event.seats_max and event.seats_available &lt;= (event.seats_max * 0.2)">
                                     (only <t t-out="event.seats_available"/> available)
@@ -242,7 +242,7 @@
                             <t t-if="event.event_registrations_open">
                                 <span class="text-dark font-weight-bold align-middle px-2">Qty</span>
                                 <link itemprop="availability" content="http://schema.org/InStock"/>
-                                <select t-att-name="'nb_register-%s' % (tickets.id if tickets else 0)" class="w-auto custom-select">
+                                <select t-att-name="'nb_register-%s' % (tickets.id if tickets else 0)" class="d-inline w-auto custom-select">
                                     <t t-set="seats_max_ticket" t-value="(not tickets or not tickets.seats_limited or tickets.seats_available &gt; 9) and 10 or tickets.seats_available + 1"/>
                                     <t t-set="seats_max_event" t-value="(not event.seats_limited or event.seats_available &gt; 9) and 10 or event.seats_available + 1"/>
                                     <t t-set="seats_max" t-value="min(seats_max_ticket, seats_max_event) if tickets else seats_max_event"/>
@@ -258,8 +258,8 @@
                             </t>
                         </div>
                     </div>
-                    <div class="col-lg-4 pt-3 pt-lg-0 pl-2 pl-lg-0">
-                        <button type="submit" class="btn btn-primary o_wait_lazy_js btn-block a-submit" t-attf-id="#{event.id}">
+                    <div class="d-grid col-lg-4 pt-3 pt-lg-0 pl-2 pl-lg-0">
+                        <button type="submit" class="btn btn-primary o_wait_lazy_js a-submit" t-attf-id="#{event.id}">
                             Register
                             <t t-if="event.seats_limited and event.seats_max and event.seats_available &lt;= (event.seats_max * 0.2)">
                                 (only <t t-out="event.seats_available"/> available)
diff --git a/addons/website_event_booth/views/event_booth_templates.xml b/addons/website_event_booth/views/event_booth_templates.xml
index 598c56ab8ef..cd50cabdb8e 100644
--- a/addons/website_event_booth/views/event_booth_templates.xml
+++ b/addons/website_event_booth/views/event_booth_templates.xml
@@ -50,7 +50,7 @@
                     <form method="post" class="form-horizontal justify-content-center mt32 js_website_submit_form o_wbooth_registration_form"
                           t-attf-action="/event/#{slug(event)}/booth/register" t-att-data-event-id="event.id">
                         <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
-                        <div class="row form-group justify-content-center">
+                        <div class="row mb-3 justify-content-center">
                             <t t-foreach="event.event_booth_category_ids" t-as="booth_category">
                                 <t t-set="booth_category_unavailable" t-value="booth_category not in available_booth_category_ids"/>
                                 <div class="col-md-4">
@@ -72,8 +72,8 @@
                         </div>
                         <t t-if="available_booth_category_ids">
                             <div t-if="event.exhibition_map" class="row">
-                                <div class="col-sm-6 offset-sm-3 mb-4">
-                                    <button type="button" class="btn btn-info btn-block" data-toggle="modal" data-target="#mapModal">View Floor Plan</button>
+                                <div class="d-grid col-sm-6 offset-sm-3 mb-4">
+                                    <button type="button" class="btn btn-info" data-toggle="modal" data-target="#mapModal">View Floor Plan</button>
                                     <div role="dialog" id="mapModal" class="modal" tabindex="-1">
                                         <div class="modal-dialog modal-lg">
                                             <div class="modal-content">
diff --git a/addons/website_event_sale/views/website_sale_templates.xml b/addons/website_event_sale/views/website_sale_templates.xml
index 505189ad03f..202e0ff41f5 100644
--- a/addons/website_event_sale/views/website_sale_templates.xml
+++ b/addons/website_event_sale/views/website_sale_templates.xml
@@ -58,11 +58,11 @@
                                             <span t-field="event.with_context(tz=event.date_tz).date_begin" t-options="{'format': 'LLL'}" class="o_wevent_event_month" />
                                             <span t-field="event.with_context(tz=event.date_tz).date_begin" t-options="{'format': 'dd'}" class="o_wevent_event_day oe_hide_on_date_edit" />
                                         </div>
-                                        <small class="o_wevent_participating bg-success">
+                                        <small class="o_wevent_participating text-bg-success">
                                             <i class="fa fa-check mr-2" />
                                             Registered
                                         </small>
-                                        <small t-if="not event.website_published" class="o_wevent_unpublished bg-danger">
+                                        <small t-if="not event.website_published" class="o_wevent_unpublished text-bg-danger">
                                             <i class="fa fa-ban mr-2" />
                                             Unpublished
                                         </small>
diff --git a/addons/website_event_track/views/event_track_templates_agenda.xml b/addons/website_event_track/views/event_track_templates_agenda.xml
index f580cbcf259..fcf48be9ac6 100644
--- a/addons/website_event_track/views/event_track_templates_agenda.xml
+++ b/addons/website_event_track/views/event_track_templates_agenda.xml
@@ -34,7 +34,7 @@
             <div class="d-flex flex-column flex-sm-row justify-content-between w-100">
                 <ul class="o_weagenda_topbar_filters o_wevent_index_topbar_filters nav">
                 </ul>
-                <div class="form-inline pl-sm-3 pr-0">
+                <div class="d-flex pl-sm-3 pr-0">
                     <label class="invisible text-muted mr-2" id="search_summary"><span id="search_number" class="mr-1">0</span>Results</label>
                     <input type="text" class="form-control" placeholder="Filter Tracks..." id="event_track_search"/>
                 </div>
@@ -89,7 +89,7 @@
             </div>
             <small class="float-right text-muted align-self-end"><t t-out="tracks_by_days[day]"/> tracks</small>
         </div>
-        <hr class="mt-2 pb-1 mb-1"/>
+        <hr class="mt-2 mb-2"/>
 
         <!-- Day Agenda -->
         <div class="o_we_online_agenda">
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 86b3c1ef1cd..45fc9b5125e 100644
--- a/addons/website_event_track/views/event_track_templates_list.xml
+++ b/addons/website_event_track/views/event_track_templates_list.xml
@@ -139,7 +139,7 @@
     <div class="row mb-3" t-if="tracks_live">
         <div class="col-12">
             <h5 class="m-0 text-danger">Live Now</h5>
-            <hr class="mt-2 pb-1 mb-1"/>
+            <hr class="mt-2 mb-2"/>
         </div>
         <t t-call="website_event_track.track_cards_section">
             <t t-set="tracks" t-value="tracks_live"/>
@@ -148,7 +148,7 @@
     <div class="row mb-3" t-if="tracks_soon">
         <div class="col-12">
             <h5 class="m-0 text-danger">Coming soon ...</h5>
-            <hr class="mt-2 pb-1 mb-1"/>
+            <hr class="mt-2 mb-2"/>
         </div>
         <t t-call="website_event_track.track_cards_section">
             <t t-set="tracks" t-value="tracks_soon"/>
@@ -195,7 +195,7 @@
                         data-toggle="collapse">
                         <i class="fa fa-2x fa-chevron-down"/>
                     </a>
-                    <hr class="mt-2 pb-1 mb-1"/>
+                    <hr class="mt-2 mb-2"/>
                 </div>
                 <!-- DAY TRACKS LIST -->
                 <div t-attf-class="collapse {{ '' if tracks_info['default_collapsed'] else 'show' }}"
diff --git a/addons/website_event_track/views/event_track_templates_proposal.xml b/addons/website_event_track/views/event_track_templates_proposal.xml
index f607446a502..86c79bbb203 100644
--- a/addons/website_event_track/views/event_track_templates_proposal.xml
+++ b/addons/website_event_track/views/event_track_templates_proposal.xml
@@ -42,7 +42,7 @@
                                     <div class="form-text text-muted mb16">
                                         What is your talk about?
                                     </div>
-                                    <div class="row form-group">
+                                    <div class="row mb-3">
                                         <label class="col-form-label col-sm-auto" for="track_name" style="width: 200px" >
                                             <span class="o_wetrack_proposal_label_content">Talk Title</span>
                                             <span>*</span>
@@ -51,7 +51,7 @@
                                             <input name="track_name" type="text" class="form-control form-field" required="True"/>
                                         </div>
                                     </div>
-                                    <div class="row form-group">
+                                    <div class="row mb-3">
                                         <label class="col-form-label col-sm-auto" for="description" style="width: 200px" >
                                             <span class="o_wetrack_proposal_label_content">Talk Introduction</span>
                                             <span>*</span>
@@ -60,7 +60,7 @@
                                             <textarea name="description" class="form-control" required="True"/>
                                         </div>
                                     </div>    
-                                    <div class="row form-group">
+                                    <div class="row mb-3">
                                         <label class="col-form-label col-sm-auto" for="tags" style="width: 200px">Categories</label>
                                         <div class="col-sm o_website_event_track_proposal_form_tags">
                                             <input name="tags" type="text" class="form-control o_wetrack_select2_tags"/>
@@ -72,27 +72,27 @@
                                     <div class="form-text text-muted mb16">
                                         Who will give this talk? We will show this to attendees to showcase your talk.
                                     </div>
-                                    <div class="row form-group">
+                                    <div class="row mb-3">
                                         <label class="col-form-label col-sm-auto" for="partner_name" style="width: 200px">Name</label>
                                         <div class="col-sm"><input name="partner_name" type="text" class="form-control"/></div>
                                     </div>
-                                    <div class="row form-group">
+                                    <div class="row mb-3">
                                         <label class="col-form-label col-sm-auto" for="partner_email" style="width: 200px">Email</label>
                                         <div class="col-sm"><input name="partner_email" type="email" class="form-control" /></div>
                                     </div>
-                                    <div class="row form-group">
+                                    <div class="row mb-3">
                                         <label class="col-form-label col-sm-auto" for="partner_phone" style="width: 200px">Phone</label>
                                         <div class="col-sm"><input name="partner_phone" type="text" class="form-control"/></div>
                                     </div>
-                                    <div class="row form-group">
+                                    <div class="row mb-3">
                                         <label class="col-form-label col-sm-auto" for="image" style="width: 200px">Picture</label><br/>
                                         <div class="col-sm"><input name="image" type="file" accept="image/*" style="width: 100%"/></div>
                                     </div>
-                                    <div class="row form-group">
+                                    <div class="row mb-3">
                                         <label class="col-form-label col-sm-auto" for="partner_function" style="width: 200px">Job Title</label>
                                         <div class="col-sm"><input name="partner_function" type="text" class="form-control"/></div>
                                     </div>
-                                    <div class="row form-group">
+                                    <div class="row mb-3">
                                         <label class="col-form-label col-sm-auto" for="partner_biography" style="width: 200px" >Biography</label>
                                         <div class="col-sm"><textarea name="partner_biography" class="form-control"/></div>
                                     </div>
@@ -111,7 +111,7 @@
                     <div class="oe_structure" id="oe_structure_website_event_track_proposal_2"/>
                 </div>
                 <div class="col-lg-3">
-                    <div class="card mb-3 bg-secondary">
+                    <div class="card mb-3 text-bg-secondary">
                         <h4 class="card-header">Talks Types</h4>
                         <div class="card-body">
                             <ul class="list-unstyled">
@@ -125,7 +125,7 @@
                             </ul>
                         </div>
                     </div>
-                    <div class="card bg-secondary">
+                    <div class="card text-bg-secondary">
                         <h4 class="card-header">Submission Agreement</h4>
                         <div class="card-body">
                             <p>
@@ -151,7 +151,7 @@
 
 <template id="event_track_proposal_contact_details">
     <div id="event_track_proposal_additional_contact_section">
-        <div class="form-group">
+        <div class="mb-3">
             <input name="add_contact_information" type= "checkbox" class="o_wetrack_add_contact_information_checkbox"/>
             <label class="font-weight-normal" for="add_contact_information">Contact me through a different email/phone</label>
         </div>
@@ -160,18 +160,18 @@
             <div class="form-text text-muted mb16">
                 How can our team get in touch with you?
             </div> 
-            <div class="row form-group">
+            <div class="row mb-3">
                 <label class="col-form-label col-sm-auto" style="width: 200px">
                     <span for="contact_name">Name</span>
                     <span>*</span>
                 </label>
                 <div class="col-sm"><input name="contact_name" type="text" class="form-control o_wetrack_contact_name_input"/></div>
             </div>
-            <div class="row form-group">
+            <div class="row mb-3">
                 <label class="col-form-label col-sm-auto" for="contact_email" style="width: 200px" >Email</label>
                 <div class="col-sm"><input name="contact_email" type="email" class="form-control o_wetrack_contact_mean o_wetrack_contact_email_input"/></div>
             </div>
-            <div class="row form-group">
+            <div class="row mb-3">
                 <label class="col-form-label col-sm-auto" for="contact_phone" style="width: 200px" >Phone</label>
                 <div class="col-sm"><input name="contact_phone" type="text" class="form-control o_wetrack_contact_mean o_wetrack_contact_phone_input"/></div>
             </div>
diff --git a/addons/website_hr_recruitment/views/hr_job_views.xml b/addons/website_hr_recruitment/views/hr_job_views.xml
index 51d0a46703b..4c0b491140d 100644
--- a/addons/website_hr_recruitment/views/hr_job_views.xml
+++ b/addons/website_hr_recruitment/views/hr_job_views.xml
@@ -11,18 +11,17 @@
                     <span class="bg-odoo">Published</span>
                 </div>
             </xpath>
+            <xpath expr="//div[@name='kanban_boxes']" position="attributes">
+                <attribute name="class" add="border-top pt-2" separator=" "/>
+            </xpath>
             <xpath expr="//div[@name='kanban_boxes']" position="inside">
                 <field name="website_url" invisible="1"/>
-                <div class="o_recruitment_kanban_box o_kanban_primary_bottom bottom_block">
-                    <div class="col-6 pl-0">
-                        <field name="is_published" widget='boolean_toggle'/>
-                        <span class="mr-2">
-                            <t t-if="record.is_published.raw_value">Published</t>
-                            <t t-else="">Not published</t>
-                        </span>
-                    </div>
-                    <div class="col-6" name="bottom_right"></div>
+                <div class="col-6">
+                    <field name="is_published" widget='boolean_toggle'/>
+                    <t t-if="record.is_published.raw_value">Published</t>
+                    <t t-else="">Not published</t>
                 </div>
+                <div class="col-6" name="bottom_right"></div>
             </xpath>
         </field>
     </record>
@@ -34,7 +33,7 @@
         <field name="arch" type="xml">
             <xpath expr="//div[@name='bottom_right']" position="replace">
                 <field name="website_url" invisible="1"/>
-                <div class="o_link_trackers col-6">
+                <div class="o_link_trackers col-6 text-end">
                     <a t-att-href="record.website_url.raw_value" target="_blank">
                         <i class="fa fa-fw fa-external-link" role="img"></i>
                         Job Page
diff --git a/addons/website_slides/views/website_slides_templates_homepage.xml b/addons/website_slides/views/website_slides_templates_homepage.xml
index 35a0c6647e9..a021e8d26fb 100644
--- a/addons/website_slides/views/website_slides_templates_homepage.xml
+++ b/addons/website_slides/views/website_slides_templates_homepage.xml
@@ -113,7 +113,7 @@
                                     <div class="col">
                                         <a href="/slides/all?my=1" class="float-right">View all</a>
                                         <h5 class="m-0">My courses</h5>
-                                        <hr class="mt-2 pb-1 mb-1"/>
+                                        <hr class="mt-2 mb-2"/>
                                     </div>
                                 </div>
                                 <div class="row mx-n2 mt8">
@@ -131,7 +131,7 @@
                                 <div class="col">
                                     <a href="slides/all" class="float-right">View all</a>
                                     <h5 class="m-0">Most popular courses</h5>
-                                    <hr class="mt-2 pb-1 mb-1"/>
+                                    <hr class="mt-2 mb-2"/>
                                 </div>
                             </div>
                             <div class="row mx-n2 mt8">
@@ -148,7 +148,7 @@
                                 <div class="col">
                                     <a href="slides/all" class="float-right">View all</a>
                                     <h5 class="m-0">Newest courses</h5>
-                                    <hr class="mt-2 pb-1 mb-1"/>
+                                    <hr class="mt-2 mb-2"/>
                                 </div>
                             </div>
                             <div class="row mx-n2 mt8">
@@ -225,8 +225,8 @@
                         <ul class="navbar-nav flex-grow-1">
                             <t t-foreach="tag_groups" t-as="tag_group">
                                 <t t-set="group_frontend_tags" t-value="tag_group.tag_ids.filtered(lambda tag: tag.color)"/>
-                                <li t-att-class="'nav-item dropdown ml16 %s' % ('active' if tag_group in search_tag_groups else '')" t-if="group_frontend_tags">
-                                    <a class="nav-link dropdown-toggle"
+                                <li class="nav-item dropdown ml16" t-if="group_frontend_tags">
+                                    <a t-att-class="'nav-link dropdown-toggle %s' % ('active' if tag_group in search_tag_groups else '')"
                                         href="/slides/all"
                                         t-att-data-target="'#navToogleTagGroup%s' % tag_group.id"
                                         role="button" data-toggle="dropdown"
@@ -309,7 +309,7 @@
                     </div>
                     <div class="row mx-n2">
                         <t t-foreach="channels" t-as="channel">
-                            <div class="col-12 col-sm-6 col-md-4 col-lg-3 px-2 d-flex flex-grow-1">
+                            <div class="col-12 col-sm-6 col-md-4 col-lg-3 px-2 d-flex">
                                 <t t-call="website_slides.course_card"/>
                             </div>
                         </t>