diff --git a/addons/account/views/account_portal_templates.xml b/addons/account/views/account_portal_templates.xml
index 18037aa5ec0..c89828524b3 100644
--- a/addons/account/views/account_portal_templates.xml
+++ b/addons/account/views/account_portal_templates.xml
@@ -14,7 +14,7 @@
     <template id="portal_my_home_invoice" name="Portal My Home : invoice entries" inherit_id="portal.portal_my_home" priority="30">
         <xpath expr="//ul[hasclass('o_portal_docs')]" position="inside">
             <li t-if="invoice_count" class="list-group-item">
-                <span class="badge" t-esc="invoice_count"/>
+                <span class="badge badge-pill" t-esc="invoice_count"/>
                 <a href="/my/invoices">Invoices</a>
             </li>
         </xpath>
diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml
index 51ab74c83a8..966db6f4dea 100644
--- a/addons/account/views/account_view.xml
+++ b/addons/account/views/account_view.xml
@@ -117,7 +117,7 @@
                                         <strong><field name="name"/></strong>
                                     </div>
                                     <div class="col-6 text-right">
-                                        <span class="badge"><t t-esc="record.code.value"/></span>
+                                        <span class="badge badge-pill"><t t-esc="record.code.value"/></span>
                                     </div>
                                 </div>
                                 <div>
@@ -1031,7 +1031,7 @@
                                         <strong><span><t t-esc="record.name.value"/></span></strong>
                                     </div>
                                     <div class="col-6 pull-right text-right">
-                                        <span class="badge"><t t-esc="record.type_tax_use.value"/></span>
+                                        <span class="badge badge-pill"><t t-esc="record.type_tax_use.value"/></span>
                                     </div>
                                 </div>
                             </div>
diff --git a/addons/account_asset/views/account_asset_views.xml b/addons/account_asset/views/account_asset_views.xml
index 998cabeedff..1ea79e10423 100644
--- a/addons/account_asset/views/account_asset_views.xml
+++ b/addons/account_asset/views/account_asset_views.xml
@@ -96,7 +96,7 @@
                                     <strong><span><t t-esc="record.name.value"/></span></strong>
                                 </div>
                                 <div class="col-6 text-right">
-                                    <span class="badge"><strong><t t-esc="record.method.value"/></strong></span>
+                                    <span class="badge badge-pill"><strong><t t-esc="record.method.value"/></strong></span>
                                 </div>
                             </div>
                             <div> <t t-esc="record.journal_id.value"/></div>
diff --git a/addons/crm/views/res_partner_views.xml b/addons/crm/views/res_partner_views.xml
index 6e6288ce1c9..e92d74909c6 100644
--- a/addons/crm/views/res_partner_views.xml
+++ b/addons/crm/views/res_partner_views.xml
@@ -70,8 +70,8 @@
                     <field name="meeting_count"/>
                 </field>
                 <xpath expr="//div[hasclass('oe_kanban_partner_links')]" position="inside">
-                    <span class="badge" t-if="record.opportunity_count.value>0"><i class="fa fa-fw fa-star" aria-label="Favorites" role="img" title="Favorites"/><t t-esc="record.opportunity_count.value"/></span>
-                    <span class="badge" t-if="record.meeting_count.value>0"><i class="fa fa-fw fa-calendar" aria-label="Meetings" role="img" title="Meetings"/><t t-esc="record.meeting_count.value"/></span>
+                    <span class="badge badge-pill" t-if="record.opportunity_count.value>0"><i class="fa fa-fw fa-star" aria-label="Favorites" role="img" title="Favorites"/><t t-esc="record.opportunity_count.value"/></span>
+                    <span class="badge badge-pill" t-if="record.meeting_count.value>0"><i class="fa fa-fw fa-calendar" aria-label="Meetings" role="img" title="Meetings"/><t t-esc="record.meeting_count.value"/></span>
                 </xpath>
             </field>
         </record>
diff --git a/addons/hr_holidays/report/hr_leave_reports.xml b/addons/hr_holidays/report/hr_leave_reports.xml
index a1c59ae63fa..b306fcd44ef 100644
--- a/addons/hr_holidays/report/hr_leave_reports.xml
+++ b/addons/hr_holidays/report/hr_leave_reports.xml
@@ -102,7 +102,7 @@
                                     </table>
                                 </div>
                                 <div t-attf-class="oe_kanban_bottom_right #{record.date_from.value ? 'mt8': ''}">
-                                    <span class="badge"><t t-esc="record.number_of_days.value"/> days</span>
+                                    <span class="badge badge-pill"><t t-esc="record.number_of_days.value"/> days</span>
                                 </div>
                             </div>
                         </div>
diff --git a/addons/hr_org_chart/static/src/xml/hr_org_chart.xml b/addons/hr_org_chart/static/src/xml/hr_org_chart.xml
index bcac8eda226..4330255285c 100644
--- a/addons/hr_org_chart/static/src/xml/hr_org_chart.xml
+++ b/addons/hr_org_chart/static/src/xml/hr_org_chart.xml
@@ -22,7 +22,7 @@
         <div class="media-body">
             <span
                     t-if="employee.indirect_sub_count &gt; 0"
-                    class="badge"
+                    class="badge badge-pill"
                     tabindex="0"
                     data-trigger="focus"
                     t-att-data-emp-name="employee.name"
diff --git a/addons/lunch/static/src/xml/lunch.xml b/addons/lunch/static/src/xml/lunch.xml
index a848c029209..76d844cc258 100644
--- a/addons/lunch/static/src/xml/lunch.xml
+++ b/addons/lunch/static/src/xml/lunch.xml
@@ -16,7 +16,7 @@
                 </button>
                 <div>
                     <t t-esc="order.product_name"/>
-                    <span class="badge pull-right">
+                    <span class="badge badge-pill pull-right">
                         <span class="o_lunch_price" t-raw="formatValue(order)"/>
                     </span>
                 </div>
diff --git a/addons/lunch/views/lunch_views.xml b/addons/lunch/views/lunch_views.xml
index c7673e088bd..6db949deb3e 100644
--- a/addons/lunch/views/lunch_views.xml
+++ b/addons/lunch/views/lunch_views.xml
@@ -104,7 +104,7 @@
                                         </span>
                                     </div>
                                     <div class="col-4 text-right">
-                                        <span class="badge">
+                                        <span class="badge badge-pill">
                                             <strong><i class="fa fa-money" role="img" aria-label="Amount" title="Amount"/> <field name="amount"/></strong>
                                         </span>
                                     </div>
@@ -531,7 +531,7 @@
                                     <div class="o_kanban_record_headings">
                                         <strong class="o_kanban_record_title"><t t-esc="record.name.value"/></strong>
                                     </div>
-                                    <span class="badge pull-right">
+                                    <span class="badge badge-pill pull-right">
                                         Price: <t t-esc="record.price.value"/>
                                     </span>
                                 </div>
@@ -643,7 +643,7 @@
                                         <t t-esc="record.end_hour.value"/>
                                     </div>
                                     <div class="col-6">
-                                        <span class="badge pull-right">
+                                        <span class="badge badge-pill pull-right">
                                             <t t-esc="record.alert_type.value"/>
                                         </span>
                                     </div>
diff --git a/addons/mail/static/src/xml/discuss.xml b/addons/mail/static/src/xml/discuss.xml
index b11ccd5ce93..ad9a809ba03 100644
--- a/addons/mail/static/src/xml/discuss.xml
+++ b/addons/mail/static/src/xml/discuss.xml
@@ -84,7 +84,7 @@
         @param {integer} counter
     -->
     <t t-name="mail.discuss.SidebarCounter">
-        <span t-attf-class="o_mail_sidebar_needaction badge #{(!counter ? 'd-none' : '')}">
+        <span t-attf-class="o_mail_sidebar_needaction badge badge-pill #{(!counter ? 'd-none' : '')}">
             <t t-esc="counter"/>
         </span>
     </t>
diff --git a/addons/mail/static/src/xml/systray.xml b/addons/mail/static/src/xml/systray.xml
index 16fe5c9ef10..afa646d0dff 100644
--- a/addons/mail/static/src/xml/systray.xml
+++ b/addons/mail/static/src/xml/systray.xml
@@ -7,7 +7,7 @@
     <t t-name="mail.systray.MessagingMenu">
         <li class="o_mail_systray_item">
             <a class="dropdown-toggle o-no-caret" data-toggle="dropdown" aria-expanded="false" title="Conversations" href="#">
-                <i class="fa fa-comments" role="img" aria-label="Messages"/> <span class="o_notification_counter badge"/>
+                <i class="fa fa-comments" role="img" aria-label="Messages"/> <span class="o_notification_counter badge badge-pill"/>
             </a>
             <div class="o_mail_systray_dropdown dropdown-menu dropdown-menu-right" role="menu">
                 <t t-if="widget.isMobile()">
@@ -95,7 +95,7 @@
     <t t-name="mail.systray.ActivityMenu">
         <li class="o_mail_systray_item">
             <a class="dropdown-toggle o-no-caret" data-toggle="dropdown" aria-expanded="false" title="Activities" href="#">
-                <i class="fa fa-clock-o" role="img" aria-label="Activities"/> <span class="o_notification_counter badge"/>
+                <i class="fa fa-clock-o" role="img" aria-label="Activities"/> <span class="o_notification_counter badge badge-pill"/>
             </a>
             <div class="o_mail_systray_dropdown dropdown-menu dropdown-menu-right" role="menu">
                 <div class="o_mail_systray_dropdown_items"/>
diff --git a/addons/maintenance/views/maintenance_views.xml b/addons/maintenance/views/maintenance_views.xml
index 9a3319daf2a..58020d90526 100644
--- a/addons/maintenance/views/maintenance_views.xml
+++ b/addons/maintenance/views/maintenance_views.xml
@@ -658,12 +658,12 @@
                             </div>
                             <div class="row mt4">
                                 <div class="col-6">
-                                    <span class="badge">
+                                    <span class="badge badge-pill">
                                         <strong>Equipments:</strong> <field name="equipment_count"/>
                                     </span>
                                 </div>
                                 <div class="col-6 text-right">
-                                    <span class="badge">
+                                    <span class="badge badge-pill">
                                         <strong>Maintenance:</strong> <field name="maintenance_count"/>
                                     </span>
                                 </div>
diff --git a/addons/mass_mailing/views/mass_mailing_views.xml b/addons/mass_mailing/views/mass_mailing_views.xml
index 052ceff552c..5865972e342 100644
--- a/addons/mass_mailing/views/mass_mailing_views.xml
+++ b/addons/mass_mailing/views/mass_mailing_views.xml
@@ -83,7 +83,7 @@
                                             <t t-esc="record.name.value"/>
                                         </strong>
                                     </div>
-                                    <span class="badge" title="Number of bounced email.">
+                                    <span class="badge badge-pill" title="Number of bounced email.">
                                         <i class="fa fa-exclamation-triangle" role="img" aria-label="Warning" title="Warning"/> <t t-esc="record.message_bounce.value" title=""/>
                                     </span>
                                 </div>
@@ -326,7 +326,7 @@
                                 <div class="o_mailing_list_kanban_boxes">
                                     <a class="o_project_kanban_box" name="%(action_view_mass_mailing_contacts_from_list)d" type="action">
                                         <div>
-                                            <span class="badge">
+                                            <span class="badge badge-pill">
                                                 <i class="fa fa-user" role="img" aria-label="Contacts" title="Contacts"/>
                                                 <t t-esc="record.contact_nbr.value"/>
                                             </span>
diff --git a/addons/membership/views/product_views.xml b/addons/membership/views/product_views.xml
index c08473cd647..80192e9bad8 100644
--- a/addons/membership/views/product_views.xml
+++ b/addons/membership/views/product_views.xml
@@ -55,7 +55,7 @@
                                     <div class="o_kanban_record_headings">
                                         <strong class="o_kanban_record_title"><span class="mt4"><field name="name"/></span></strong>
                                     </div>
-                                    <span class="badge"><i class="fa fa-money" role="img" aria-label="Price" title="Price"/> <field name="list_price"/></span>
+                                    <span class="badge badge-pill"><i class="fa fa-money" role="img" aria-label="Price" title="Price"/> <field name="list_price"/></span>
                                 </div>
                                 <div class="o_kanban_record_body">
                                     <i class="fa fa-clock-o" role="img" aria-label="Period" title="Period"></i><strong> From: </strong><field name="membership_date_from"/><strong> To:</strong> <field name="membership_date_to"/>
diff --git a/addons/mrp/views/mrp_bom_views.xml b/addons/mrp/views/mrp_bom_views.xml
index 894e4790c15..460fa62b750 100644
--- a/addons/mrp/views/mrp_bom_views.xml
+++ b/addons/mrp/views/mrp_bom_views.xml
@@ -123,7 +123,7 @@
                                     <div class="o_kanban_record_headings mt4">
                                         <strong class="o_kanban_record_title"><span clatt="mt4"><field name="product_tmpl_id"/></span></strong>
                                     </div>
-                                    <span class="pull-right badge"><t t-esc="record.product_qty.value"/> <small><t t-esc="record.product_uom_id.value"/></small></span>
+                                    <span class="pull-right badge badge-pill"><t t-esc="record.product_qty.value"/> <small><t t-esc="record.product_uom_id.value"/></small></span>
                                 </div>
                             </div>
                         </t>
diff --git a/addons/mrp/views/mrp_routing_views.xml b/addons/mrp/views/mrp_routing_views.xml
index 6829e36c4b0..8a4b55848d8 100644
--- a/addons/mrp/views/mrp_routing_views.xml
+++ b/addons/mrp/views/mrp_routing_views.xml
@@ -129,7 +129,7 @@
                                     <div class="o_kanban_record_headings mt4">
                                         <strong class="o_kanban_record_title"><span><t t-esc="record.name.value"/></span></strong>
                                     </div>
-                                    <span class="badge"><field name="code"/></span>
+                                    <span class="badge badge-pill"><field name="code"/></span>
                                 </div>
                             </div>
                         </t>
@@ -177,4 +177,4 @@
           groups="group_mrp_routings"
           sequence="50"/>
     </data>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/addons/point_of_sale/views/pos_order_view.xml b/addons/point_of_sale/views/pos_order_view.xml
index 3f92650c3a8..9a120389630 100644
--- a/addons/point_of_sale/views/pos_order_view.xml
+++ b/addons/point_of_sale/views/pos_order_view.xml
@@ -122,7 +122,7 @@
                                 <div class="o_kanban_record_headings">
                                     <strong class="o_kanban_record_title"><span><t t-esc="record.user_id.value"/></span></strong>
                                 </div>
-                                <strong><span class="badge"><i class="fa fa-money" role="img" aria-label="Amount" title="Amount"/> <field name="amount_total"/></span></strong>
+                                <strong><span class="badge badge-pill"><i class="fa fa-money" role="img" aria-label="Amount" title="Amount"/> <field name="amount_total"/></span></strong>
                             </div>
                             <div class="row">
                                 <div class="col-12">
diff --git a/addons/point_of_sale/views/res_partner_view.xml b/addons/point_of_sale/views/res_partner_view.xml
index ed09836a96e..c537a7dda5c 100644
--- a/addons/point_of_sale/views/res_partner_view.xml
+++ b/addons/point_of_sale/views/res_partner_view.xml
@@ -27,7 +27,7 @@
                     <field name="pos_order_count"/>
                 </field>
                 <xpath expr="//div[hasclass('oe_kanban_partner_links')]" position="inside">
-                    <span t-if="record.pos_order_count.value>0" class="badge"><i class="fa fa-fw fa-shopping-bag" role="img" aria-label="Shopping cart" title="Shopping cart"/><t t-esc="record.pos_order_count.value"/></span>
+                    <span t-if="record.pos_order_count.value>0" class="badge badge-pill"><i class="fa fa-fw fa-shopping-bag" role="img" aria-label="Shopping cart" title="Shopping cart"/><t t-esc="record.pos_order_count.value"/></span>
                 </xpath>
             </field>
         </record>
diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml
index c0684eb7611..5222c4c73d0 100644
--- a/addons/portal/views/portal_templates.xml
+++ b/addons/portal/views/portal_templates.xml
@@ -255,12 +255,12 @@
             <t t-foreach="archive_groups" t-as="group">
                 <t t-if="group['date_begin'] == date">
                     <li class="nav-item">
-                        <a t-att-href="default_url" class="nav-link active" t-ignore="True"><t t-esc="group['name']"/><span class="pull-right badge" t-esc="group['item_count']"/></a>
+                        <a t-att-href="default_url" class="nav-link active" t-ignore="True"><t t-esc="group['name']"/><span class="pull-right badge badge-pill" t-esc="group['item_count']"/></a>
                     </li>
                 </t>
                 <t t-if="group['date_begin'] != date">
                     <li class="nav-item">
-                        <a t-ignore="True" t-attf-href="#{default_url}?date_begin=#{group['date_begin']}&amp;date_end=#{group['date_end']}" class="nav-link"><t t-esc="group['name']"/><span class="pull-right badge" t-esc="group['item_count']"/></a>
+                        <a t-ignore="True" t-attf-href="#{default_url}?date_begin=#{group['date_begin']}&amp;date_end=#{group['date_end']}" class="nav-link"><t t-esc="group['name']"/><span class="pull-right badge badge-pill" t-esc="group['item_count']"/></a>
                     </li>
                 </t>
             </t>
diff --git a/addons/project/views/project_portal_templates.xml b/addons/project/views/project_portal_templates.xml
index 3211922fc49..8cc18b33232 100644
--- a/addons/project/views/project_portal_templates.xml
+++ b/addons/project/views/project_portal_templates.xml
@@ -22,11 +22,11 @@
     <template id="portal_my_home" name="Portal My Home: project entries" inherit_id="portal.portal_my_home" priority="40">
         <xpath expr="//ul[hasclass('o_portal_docs')]" position="inside">
             <li t-if="project_count" class="list-group-item">
-                <span class="badge" t-esc="project_count"/>
+                <span class="badge badge-pill" t-esc="project_count"/>
                 <a href="/my/projects">Projects</a>
             </li>
             <li t-if="task_count" class="list-group-item">
-                <span class="badge" t-esc="task_count"/>
+                <span class="badge badge-pill" t-esc="task_count"/>
                 <a href="/my/tasks">Tasks</a>
             </li>
         </xpath>
diff --git a/addons/purchase/views/portal_templates.xml b/addons/purchase/views/portal_templates.xml
index bcc62dc0f2a..d849861f397 100644
--- a/addons/purchase/views/portal_templates.xml
+++ b/addons/purchase/views/portal_templates.xml
@@ -16,7 +16,7 @@
   <template id="portal_my_home_purchase" name="Portal My Home : purchase entry" inherit_id="portal.portal_my_home" priority="25">
     <xpath expr="//ul[hasclass('o_portal_docs')]" position="inside">
         <li t-if="purchase_count" class="list-group-item">
-          <span class="badge" t-esc="purchase_count"/>
+          <span class="badge badge-pill" t-esc="purchase_count"/>
           <a href="/my/purchase">Purchase Orders</a>
         </li>
     </xpath>
diff --git a/addons/purchase/views/res_partner_views.xml b/addons/purchase/views/res_partner_views.xml
index be6356fd001..d125006be9a 100644
--- a/addons/purchase/views/res_partner_views.xml
+++ b/addons/purchase/views/res_partner_views.xml
@@ -42,11 +42,11 @@
                     <field name="purchase_order_count"/>
                 </field>
                 <xpath expr="//div[hasclass('oe_kanban_partner_links')]" position="inside">
-                    <span t-if="record.purchase_order_count.value>0" class="badge"><i class="fa fa-fw fa-shopping-cart" role="img" aria-label="Shopping cart" title="Shopping cart"/><t t-esc="record.purchase_order_count.value"/></span>
+                    <span t-if="record.purchase_order_count.value>0" class="badge badge-pill"><i class="fa fa-fw fa-shopping-cart" role="img" aria-label="Shopping cart" title="Shopping cart"/><t t-esc="record.purchase_order_count.value"/></span>
                 </xpath>
             </field>
         </record>
-        
+
     <record id="act_res_partner_2_supplier_invoices" model="ir.actions.act_window">
             <field name="name">Vendor Bills</field>
             <field name="res_model">account.invoice</field>
@@ -84,13 +84,13 @@
                     <group colspan="2" col="2" groups="purchase.group_warning_purchase">
                         <separator string="Warning on the Purchase Order" colspan="4"/>
                         <field name="purchase_warn" nolabel="1" />
-                        <field name="purchase_warn_msg" colspan="3" nolabel="1" 
+                        <field name="purchase_warn_msg" colspan="3" nolabel="1"
                                 attrs="{'required':[('purchase_warn', '!=', False), ('purchase_warn','!=','no-message')],'readonly':[('purchase_warn','=','no-message')]}"/>
                     </group>
                 </page>
             </field>
         </record>
-        
+
         <record id="res_partner_view_purchase_account_buttons" model="ir.ui.view">
             <field name="name">res.partner.view.purchase.account.buttons</field>
             <field name="model">res.partner</field>
diff --git a/addons/sale/views/res_partner_views.xml b/addons/sale/views/res_partner_views.xml
index e258e3f649d..a135b9cf86c 100644
--- a/addons/sale/views/res_partner_views.xml
+++ b/addons/sale/views/res_partner_views.xml
@@ -28,7 +28,7 @@
                     <field name="sale_order_count"/>
                 </field>
                 <xpath expr="//div[hasclass('oe_kanban_partner_links')]" position="inside">
-                    <span t-if="record.sale_order_count.value>0" class="badge"><i class="fa fa-fw fa-usd" role="img" aria-label="Sale orders" title="Sales orders"/><t t-esc="record.sale_order_count.value"/></span>
+                    <span t-if="record.sale_order_count.value>0" class="badge badge-pill"><i class="fa fa-fw fa-usd" role="img" aria-label="Sale orders" title="Sales orders"/><t t-esc="record.sale_order_count.value"/></span>
                 </xpath>
             </field>
         </record>
@@ -46,13 +46,13 @@
                         attrs="{'invisible': [('customer', '=', False)]}"
                         icon="fa-usd">
                         <field string="Sales" name="sale_order_count" widget="statinfo"/>
-                    </button>     
+                    </button>
                 </button>
                 <page name="internal_notes" position="inside">
                     <group colspan="2" col="2" groups="sale.group_warning_sale">
                         <separator string="Warning on the Sales Order" colspan="4" />
                             <field name="sale_warn" nolabel="1" />
-                            <field name="sale_warn_msg" colspan="3" nolabel="1" 
+                            <field name="sale_warn_msg" colspan="3" nolabel="1"
                                     attrs="{'required':[('sale_warn', '!=', False), ('sale_warn','!=','no-message')],'readonly':[('sale_warn','=','no-message')]}"/>
                     </group>
                 </page>
diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml
index 609aa1db4e3..bd743596760 100644
--- a/addons/sale/views/sale_portal_templates.xml
+++ b/addons/sale/views/sale_portal_templates.xml
@@ -20,11 +20,11 @@
     <template id="portal_my_home_sale" name="Portal My Home : sales entries" inherit_id="portal.portal_my_home" priority="20">
         <xpath expr="//ul[hasclass('o_portal_docs')]" position="inside">
             <li t-if="quotation_count" class="list-group-item">
-                <span class="badge" t-esc="quotation_count"/>
+                <span class="badge badge-pill" t-esc="quotation_count"/>
                 <a href="/my/quotes">Quotations</a>
             </li>
             <li t-if="order_count" class="list-group-item">
-                <span class="badge" t-esc="order_count"/>
+                <span class="badge badge-pill" t-esc="order_count"/>
                 <a href="/my/orders">Sales Orders</a>
             </li>
         </xpath>
diff --git a/addons/sale_timesheet/views/hr_timesheet_templates.xml b/addons/sale_timesheet/views/hr_timesheet_templates.xml
index 31b334132d4..786f578b97e 100644
--- a/addons/sale_timesheet/views/hr_timesheet_templates.xml
+++ b/addons/sale_timesheet/views/hr_timesheet_templates.xml
@@ -160,16 +160,16 @@
                             </t>
                             <t t-if="repartition_employee">
                                 <div class="pull-right o_timesheet_plan_badge">
-                                    <span class="badge o_progress_billable_fixed">
+                                    <span class="badge badge-pill o_progress_billable_fixed">
                                         <a type="action" t-att-domain="json.dumps(timesheet_domain + [('timesheet_invoice_type','=','billable_fixed')])">Billable fixed</a>
                                     </span>
-                                    <span class="badge o_progress_billable_time">
+                                    <span class="badge badge-pill o_progress_billable_time">
                                         <a type="action" t-att-domain="json.dumps(timesheet_domain + [('timesheet_invoice_type','=','billable_time')])">Billable time</a>
                                     </span>
-                                    <span class="badge o_progress_non_billable_project">
+                                    <span class="badge badge-pill o_progress_non_billable_project">
                                         <a type="action" t-att-domain="json.dumps(timesheet_domain + [('timesheet_invoice_type','=','non_billable_project')])">No task found</a>
                                     </span>
-                                    <span class="badge o_progress_non_billable">
+                                    <span class="badge badge-pill o_progress_non_billable">
                                         <a type="action" t-att-domain="json.dumps(timesheet_domain + [('timesheet_invoice_type','=','non_billable')])">Non billable</a>
                                     </span>
                                 </div>
diff --git a/addons/stock/views/stock_warehouse_views.xml b/addons/stock/views/stock_warehouse_views.xml
index 71950b168a5..a3f3ca106e9 100644
--- a/addons/stock/views/stock_warehouse_views.xml
+++ b/addons/stock/views/stock_warehouse_views.xml
@@ -139,14 +139,14 @@
                                     <div class="o_kanban_record_headings">
                                         <strong class="o_kanban_record_title"><t t-esc="record.name.value"/></strong>
                                     </div>
-                                    <span class="badge"><strong>Min qty :</strong><t t-esc="record.product_min_qty.value"/></span>
+                                    <span class="badge badge-pill"><strong>Min qty :</strong><t t-esc="record.product_min_qty.value"/></span>
                                 </div>
                                 <div class="o_kanban_record_bottom">
                                     <div class="oe_kanban_bottom_left">
                                         <span><t t-esc="record.product_id.value"/></span>
                                     </div>
                                     <div class="oe_kanban_bottom_right">
-                                        <span class="badge"><strong>Max qty :</strong><t t-esc="record.product_max_qty.value"/></span>
+                                        <span class="badge badge-pill"><strong>Max qty :</strong><t t-esc="record.product_max_qty.value"/></span>
                                     </div>
                                 </div>
                             </div>
diff --git a/addons/survey/views/survey_templates.xml b/addons/survey/views/survey_templates.xml
index f4bd6c58057..684031255a2 100644
--- a/addons/survey/views/survey_templates.xml
+++ b/addons/survey/views/survey_templates.xml
@@ -353,7 +353,7 @@
                                         <h2>
                                             <span t-field='question.question' />
                                             <span t-if="question.constr_mandatory" class="text-danger">*</span>
-                                            <span t-if="quizz_correction" class="badge" t-att-data-score-question="question.id"></span>
+                                            <span t-if="quizz_correction" class="badge badge-pill" t-att-data-score-question="question.id"></span>
                                         </h2>
                                         <t t-if="question.description"><div class="text-muted oe_no_empty" t-field='question.description'/></t>
                                         <t t-if="question.type == 'free_text'"><t t-call="survey.free_text"/></t>
diff --git a/addons/survey/views/survey_views.xml b/addons/survey/views/survey_views.xml
index 246769dc88b..49d03a59380 100644
--- a/addons/survey/views/survey_views.xml
+++ b/addons/survey/views/survey_views.xml
@@ -101,7 +101,7 @@
                                     <div class="o_kanban_record_headings">
                                         <strong class="o_kanban_record_title"><t t-esc="record.survey_id.value"/></strong>
                                     </div>
-                                    <span class="badge"><t t-esc="record.type.value"/></span>
+                                    <span class="badge badge-pill"><t t-esc="record.type.value"/></span>
                                 </div>
                                 <div class="o_kanban_record_bottom">
                                     <div class="oe_kanban_bottom_left">
diff --git a/addons/web/static/src/scss/webclient.scss b/addons/web/static/src/scss/webclient.scss
index dc116ae0d20..8c213a57682 100644
--- a/addons/web/static/src/scss/webclient.scss
+++ b/addons/web/static/src/scss/webclient.scss
@@ -155,8 +155,6 @@ div.o_boolean_toggle {
 //== Badges
 .badge {
     margin: 1px 2px 1px 0;
-    padding-top: 0;
-    padding-bottom: 0;
 }
 
 // Btn-link variations
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 2a07ccaffeb..f5a0f08f408 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -700,7 +700,7 @@
             <t t-else="">
                 <t t-if="_.contains(['in', 'not in'], widget.operator)">
                     <div class="o_domain_leaf_value_input">
-                        <span class="badge" t-foreach="widget.displayValue" t-as="val">
+                        <span class="badge badge-pill" t-foreach="widget.displayValue" t-as="val">
                             <t t-esc="val"/> <i class="o_domain_leaf_value_remove_tag_button fa fa-times" t-att-data-value="val" role="img" aria-label="Remove tag" title="Remove tag"/>
                         </span>
                     </div>
@@ -844,7 +844,7 @@
     <t t-foreach="elements" t-as="el">
         <t t-set="color" t-value="el[colorField] || 0"/>
         <t t-set="colornames" t-value="['No color', 'Red', 'Orange', 'Yellow', 'Light blue', 'Dark purple', 'Salmon pink', 'Medium blue', 'Dark blue', 'Fushia', 'Green', 'Purple']"/>
-        <button t-attf-class="badge dropdown o_tag_color_#{color}" t-att-data-color="color" t-att-data-index="el_index" t-att-data-id="el.id" t-attf-title="Tag color: #{colornames[color]}">
+        <button t-attf-class="badge badge-pill dropdown o_tag_color_#{color}" t-att-data-color="color" t-att-data-index="el_index" t-att-data-id="el.id" t-attf-title="Tag color: #{colornames[color]}">
             <span class="o_badge_text"><span role="img" t-attf-aria-label="Tag color: #{colornames[color]}"/><t t-esc="el.display_name"/></span>
             <a t-if="!readonly" class="fa fa-times o_delete" title="Delete" aria-label="Delete"/>
         </button>
diff --git a/addons/web_settings_dashboard/static/src/xml/dashboard.xml b/addons/web_settings_dashboard/static/src/xml/dashboard.xml
index 55d191fe3c1..d718b314d67 100644
--- a/addons/web_settings_dashboard/static/src/xml/dashboard.xml
+++ b/addons/web_settings_dashboard/static/src/xml/dashboard.xml
@@ -48,7 +48,7 @@
     </t>
 
     <t t-name="EmailBadge">
-        <span t-foreach="emails" t-as="email" class="badge">
+        <span t-foreach="emails" t-as="email" class="badge badge-pill">
             <span class="o_badge_text">
                 <t t-esc='email'/>
             </span>
@@ -81,7 +81,7 @@
                 <t t-if="pending_users.length">
                     <p><strong>Pending invitations:</strong></p>
                     <span t-foreach="pending_users" t-as="pending">
-                        <a href="#" class="badge o_web_settings_dashboard_user" t-att-data-user-id="pending[0]"> <t t-esc="pending[1]"/> </a>
+                        <a href="#" class="badge badge-pill o_web_settings_dashboard_user" t-att-data-user-id="pending[0]"> <t t-esc="pending[1]"/> </a>
                     </span>
                     <t t-if="pending_users.length &lt; widget.data.pending_count">
                         <br/>
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 4fa040b1086..eb1807a4398 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -444,10 +444,10 @@
                 <ul t-attf-class="blog_post_year collapse nav nav-pills flex-column #{not date and year_index == 0 and 'in'}" t-att-id="year" role="menu">
                     <t t-foreach="nav_list[year]" t-as="months">
                         <li t-if="months['date_begin'] == date" class="nav-item">
-                            <a role="menuitem" t-ignore="True" t-attf-href="#{blog_url(date_begin=False, date_end=False)}" class="nav-link active"><t t-esc="months['month']"/><span class="pull-right badge" t-esc="months['post_date_count']"/></a>
+                            <a role="menuitem" t-ignore="True" t-attf-href="#{blog_url(date_begin=False, date_end=False)}" class="nav-link active"><t t-esc="months['month']"/><span class="pull-right badge badge-pill" t-esc="months['post_date_count']"/></a>
                         </li>
                         <li t-else="1" class="nav-item">
-                            <a role="menuitem" t-ignore="True" t-attf-href="#{blog_url(date_begin=months['date_begin'], date_end=months['date_end'])}" class="nav-link"><t t-esc="months['month']"/><span class="pull-right badge" t-esc="months['post_date_count']"/></a>
+                            <a role="menuitem" t-ignore="True" t-attf-href="#{blog_url(date_begin=months['date_begin'], date_end=months['date_end'])}" class="nav-link"><t t-esc="months['month']"/><span class="pull-right badge badge-pill" t-esc="months['post_date_count']"/></a>
                         </li>
                     </t>
                 </ul>
@@ -517,10 +517,10 @@
         <ul class="nav nav-pills flex-column">
             <t t-set="state" t-value="state_info['state']"/>
             <li class="nav-item">
-                <a t-attf-href="#{state == 'published' and blog_url(state='') or blog_url(state='published')}" t-attf-class="nav-link#{state == 'published' and ' active' or ''}">Published <span class="pull-right badge" t-esc="state_info['published']" /></a>
+                <a t-attf-href="#{state == 'published' and blog_url(state='') or blog_url(state='published')}" t-attf-class="nav-link#{state == 'published' and ' active' or ''}">Published <span class="pull-right badge badge-pill" t-esc="state_info['published']" /></a>
             </li>
             <li class="nav-item">
-                <a t-attf-href="#{state == 'unpublished' and blog_url(state='') or blog_url(state='unpublished')}" t-attf-class="nav-link#{state == 'unpublished' and ' active' or ''}">Unpublished <span class="pull-right badge" t-esc="state_info['unpublished']" /></a>
+                <a t-attf-href="#{state == 'unpublished' and blog_url(state='') or blog_url(state='unpublished')}" t-attf-class="nav-link#{state == 'unpublished' and ' active' or ''}">Unpublished <span class="pull-right badge badge-pill" t-esc="state_info['unpublished']" /></a>
             </li>
         </ul>
         </section>
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 9e41da035a8..8fe82cacd82 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
@@ -36,7 +36,7 @@
                         <li class="nav-item">
                             <a t-attf-href="/partners#{ grade['grade_id'][0] and '/grade/%s' % grade['grade_id'][0] or '' }#{ current_country and '/country/%s' % slug(current_country) or '' }#{ '?' + (search_path or '') }"
                                t-attf-class="nav-link#{grade['active'] and ' active' or ''}">
-                                <span class="badge pull-right" t-esc="grade['grade_id_count'] or ''"/>
+                                <span class="badge badge-pill pull-right" t-esc="grade['grade_id_count'] or ''"/>
                                 <t t-esc="grade['grade_id'][1]"/>
                             </a>
                         </li>
@@ -49,7 +49,7 @@
                         <li t-if="country['country_id']" class="nav-item">
                             <a t-attf-href="/partners#{ current_grade and '/grade/%s' % slug(current_grade) or ''}#{country['country_id'][0] and '/country/%s' % country['country_id'][0] or '' }#{ '?' + (search_path or '') + (country['country_id'][0] == 0 and '&amp;country_all=True' or '')}"
                                t-attf-class="nav-link#{country['active'] and ' active' or ''}">
-                                <span class="badge pull-right" t-esc="country['country_id_count'] or ''"/>
+                                <span class="badge badge-pill pull-right" t-esc="country['country_id_count'] or ''"/>
                                 <t t-esc="country['country_id'][1]"/>
                             </a>
                         </li>
@@ -217,11 +217,11 @@
     <template id="portal_my_home_lead" name="Portal My Home : lead entries" inherit_id="portal.portal_my_home" priority="15">
         <xpath expr="//ul[hasclass('o_portal_docs')]" position="inside">
             <li t-if="lead_count" class="list-group-item">
-                <span class="badge" t-esc="lead_count"/>
+                <span class="badge badge-pill" t-esc="lead_count"/>
                 <a href="/my/leads">My Leads</a>
             </li>
             <li class="list-group-item">
-                <span class="badge" t-esc="opp_count"/>
+                <span class="badge badge-pill" t-esc="opp_count"/>
                 <a href="/my/opportunities">My Opportunities</a>
             </li>
         </xpath>
diff --git a/addons/website_customer/views/website_customer_templates.xml b/addons/website_customer/views/website_customer_templates.xml
index a5f11dc6e95..b40caac2ffa 100644
--- a/addons/website_customer/views/website_customer_templates.xml
+++ b/addons/website_customer/views/website_customer_templates.xml
@@ -96,7 +96,7 @@
                     <li class="nav-item">
                         <a t-attf-href="/customers/#{ industry_dict['industry_id'][0] and 'industry/%s/' % slug(industry_dict['industry_id']) or '' }#{ current_country_id and 'country/%s' % current_country_id or '' }#{ search_path }"
                            t-attf-class="nav-link#{industry_dict['industry_id'][0] == current_industry_id and ' active' or ''}">
-                            <span class="badge pull-right" t-esc="industry_dict['industry_id_count'] or '0'"/>
+                            <span class="badge badge-pill pull-right" t-esc="industry_dict['industry_id_count'] or '0'"/>
                             <t t-esc="industry_dict['industry_id'][1]"/>
                         </a>
                     </li>
@@ -115,7 +115,7 @@
                     <li class="nav-item">
                         <a t-attf-href="/customers/#{ current_industry_id and 'industry/%s/' % slug(current_industry) or '' }#{ country_dict['country_id'][0] and 'country/%s' % slug(country_dict['country_id']) or '' }#{ search_path }"
                            t-attf-class="nav-link#{country_dict['country_id'][0] == current_country_id and ' active' or ''}">
-                            <span class="badge pull-right" t-esc="country_dict['country_id_count'] or '0'"/>
+                            <span class="badge badge-pill pull-right" t-esc="country_dict['country_id_count'] or '0'"/>
                             <t t-esc="country_dict['country_id'][1]"/>
                         </a>
                     </li>
diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml
index 665e7275a9e..5fb504ced94 100644
--- a/addons/website_event/views/event_templates.xml
+++ b/addons/website_event/views/event_templates.xml
@@ -150,7 +150,7 @@
                 <t t-foreach="dates" t-as="date">
                     <li class="nav-item" t-if="date[3] or (date[0] in ('old','all'))">
                         <a t-attf-href="/event?{{ keep_query('country', 'type', date=date[0]) }}" t-attf-class="nav-link#{searches.get('date') == date[0] and ' active' or ''}"><t t-esc="date[1]"/>
-                            <span t-if="date[3]" class="badge pull-right"><t t-esc="date[3]"/></span>
+                            <span t-if="date[3]" class="badge badge-pill pull-right"><t t-esc="date[3]"/></span>
                         </a>
                     </li>
                 </t>
@@ -166,7 +166,7 @@
                 <li t-if="type['event_type_id']"
                     class="nav-item">
                     <a t-attf-href="/event?{{ keep_query('country', 'date', type=type['event_type_id'][0]) }}" t-attf-class="nav-link#{searches.get('type') == str(type['event_type_id'] and type['event_type_id'][0]) and ' active' or ''}"><t t-esc="type['event_type_id'][1]"/>
-                        <span class="badge pull-right"><t t-esc="type['event_type_id_count']"/></span>
+                        <span class="badge badge-pill pull-right"><t t-esc="type['event_type_id_count']"/></span>
                     </a>
                 </li>
             </t>
@@ -180,13 +180,13 @@
             <t t-foreach="countries" t-as="country">
                 <li t-if="country['country_id']" class="nav-item">
                     <a t-attf-href="/event?{{ keep_query('type', 'date', country=country['country_id'][0]) }}" t-attf-class="nav-link#{searches.get('country') == str(country['country_id'] and country['country_id'][0]) and ' active' or ''}"><t t-esc="country['country_id'][1]"/>
-                        <span class="badge pull-right"><t t-esc="country['country_id_count']"/></span>
+                        <span class="badge badge-pill pull-right"><t t-esc="country['country_id_count']"/></span>
                     </a>
                 </li>
                 <li t-if="not country['country_id']" class="nav-item">
                     <a t-attf-href="/event?{{ keep_query('type', 'date', country='online') }}" t-attf-class="nav-link#{searches.get('country') == 'online' and ' active' or ''}">
                         <span>Online Events</span>
-                        <span class="badge pull-right"><t t-esc="country['country_id_count']"/></span>
+                        <span class="badge badge-pill pull-right"><t t-esc="country['country_id_count']"/></span>
                     </a>
                 </li>
             </t>
diff --git a/addons/website_event_sale/views/event_templates.xml b/addons/website_event_sale/views/event_templates.xml
index 8fb76a35a6d..d874f337c52 100644
--- a/addons/website_event_sale/views/event_templates.xml
+++ b/addons/website_event_sale/views/event_templates.xml
@@ -61,7 +61,7 @@
                     <t t-if="not ticket.price and not editable">
                         <span>Free</span>
                     </t>
-                    <span t-if="ticket.seats_max and ((ticket.seats_reserved or 0)*100 / ticket.seats_max)&gt;75" class="badge" itemprop="availability" content="http://schema.org/LimitedAvailability">
+                    <span t-if="ticket.seats_max and ((ticket.seats_reserved or 0)*100 / ticket.seats_max)&gt;75" class="badge badge-pill" itemprop="availability" content="http://schema.org/LimitedAvailability">
                         <t t-esc="ticket.seats_max - ticket.seats_reserved"/>
                         <span>left</span>
                     </span>
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 9dd3d7f7fd8..d2678e38b3f 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -1166,7 +1166,7 @@
         <table class="table mt32 mb64">
             <tr t-foreach="badges" t-as="badge">
                 <td>
-                    <span class="badge pull-left">
+                    <span class="badge badge-pill pull-left">
                         <span t-if="badge.level == 'gold'" class="fa fa-circle badge-gold" title="Gold badge" role="img" aria-label="Gold badge"/>
                         <span t-if="badge.level == 'silver'" class="fa fa-circle badge-silver" title="Silver badge" role="img" aria-label="Silver badge"/>
                         <span t-if="badge.level == 'bronze'" class="fa fa-circle badge-bronze" title="Bronze badge" role="img" aria-label="Bronwe badge"/>
@@ -1498,7 +1498,7 @@
     <table class="table mt32 mb64">
         <tr t-foreach="user.badge_ids" t-as="badge">
             <td>
-                <span class="badge pull-left">
+                <span class="badge badge-pill pull-left">
                     <span t-if="badge.badge_id.level == 'gold'" class="fa fa-circle badge-gold" role="img" aria-label="Gold badge" title="Gold badge"/>
                     <span t-if="badge.badge_id.level == 'silver'" class="fa fa-circle badge-silver" role="img" aria-label="Silver badge" title="Silver badge"/>
                     <span t-if="badge.badge_id.level == 'bronze'" class="fa fa-circle badge-bronze" role="img" aria-label="Bronze badge" title="Bronze badge"/>
diff --git a/addons/website_mail_channel/views/website_mail_channel_templates.xml b/addons/website_mail_channel/views/website_mail_channel_templates.xml
index 651b3852cbf..7dc09b1979d 100644
--- a/addons/website_mail_channel/views/website_mail_channel_templates.xml
+++ b/addons/website_mail_channel/views/website_mail_channel_templates.xml
@@ -115,7 +115,7 @@
                                     <a t-ignore="True" t-attf-href="/groups/#{ slug(group) }?mode=date&amp;date_begin=#{ month_archive['date_begin'] }&amp;date_end=#{month_archive['date_end']}"
                                         t-attf-class="nav-link#{month_archive['date_begin'] == date_begin and ' active' or ''}">
                                         <t t-esc="month_archive['date']"/>
-                                        <span class="pull-right badge" t-esc="month_archive['date_count']"/>
+                                        <span class="pull-right badge badge-pill" t-esc="month_archive['date_count']"/>
                                     </a>
                                 </li>
                                 </t>
@@ -177,7 +177,7 @@
                                     <a t-ignore="True" t-attf-href="/groups/#{ slug(group) }?mode=date&amp;date_begin=#{ month_archive['date_begin'] }&amp;date_end=#{month_archive['date_end']}"
                                         t-attf-class="nav-link#{month_archive['date_begin'] == date_begin and ' active' or ''}">
                                         <t t-esc="month_archive['date']"/>
-                                        <span class="pull-right badge" t-esc="month_archive['date_count']"/>
+                                        <span class="pull-right badge badge-pill" t-esc="month_archive['date_count']"/>
                                     </a>
                                 </li>
                                 </t>
diff --git a/addons/website_membership/views/website_membership_templates.xml b/addons/website_membership/views/website_membership_templates.xml
index ee317698c1a..fc5d17c6652 100644
--- a/addons/website_membership/views/website_membership_templates.xml
+++ b/addons/website_membership/views/website_membership_templates.xml
@@ -86,7 +86,7 @@
                 <li t-if="country['country_id']" class="nav-item">
                     <a t-attf-href="/members#{ membership_id and '/association/%s' % membership_id or '' }#{ country['country_id'][0] and '/country/%s' % slug(country['country_id']) or '' }#{ search }"
                         t-attf-class="nav-link#{country['country_id'] and country['country_id'][0] == current_country_id and ' active' or ''}"><t t-esc="country['country_id'][1]"/>
-                        <span class="badge pull-right"><t t-esc="country['country_id_count'] or '0'"/></span>
+                        <span class="badge badge-pill pull-right"><t t-esc="country['country_id_count'] or '0'"/></span>
                     </a>
                 </li>
             </t>
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 3a5383bd62d..7b70f556cd5 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -623,7 +623,7 @@
             <input type="radio" name="product_id" class="js_product_change" t-att-checked="'checked' if variant_id_index == 0 else None" t-att-value="variant_id.id" t-att-data-lst_price="compute_currency(variant_id.lst_price)" t-att-data-price="variant_id.price"/>
             <span t-esc="variant_id.name_get()[0][1]"/>
             <t t-set="diff_price" t-value="variant_id.price - variant_id.product_tmpl_id.price"/>
-            <span class="badge" t-if="diff_price != 0">
+            <span class="badge badge-pill" t-if="diff_price != 0">
               <t t-esc="diff_price > 0 and '+' or '-'"/><span t-esc="abs(diff_price)" t-options="{'widget': 'monetary', 'display_currency': website.currency_id}"/>
             </span>
           </label>
@@ -664,7 +664,7 @@
                           <label class="col-form-label" style="margin: 0 20px;">
                               <input type="radio" t-att-class="'js_variant_change' if variant_id.attribute_id.create_variant else None" t-att-checked="'checked' if not inc else None" t-att-name="'attribute-%s-%s' % (product.id, variant_id.attribute_id.id)" t-att-value="value_id.id" style="vertical-align: top; margin-right: 10px;"/>
                               <span t-field="value_id.name"/>
-                              <span class="badge" t-if="value_id.price_extra">
+                              <span class="badge badge-pill" t-if="value_id.price_extra">
                                   <t t-esc="value_id.price_extra > 0 and '+' or ''"/><span t-field="value_id.price_extra" style="white-space: nowrap;" t-options='{
                                           "widget": "monetary",
                                           "from_currency": product.currency_id,
diff --git a/addons/website_slides/views/website_slides.xml b/addons/website_slides/views/website_slides.xml
index c743014b519..f34ca15d69b 100644
--- a/addons/website_slides/views/website_slides.xml
+++ b/addons/website_slides/views/website_slides.xml
@@ -130,25 +130,25 @@
                         <li t-if="header_object.nbr_presentations" class="nav-item">
                             <a t-attf-href="/slides/#{slug(channel)}#{category and '/category/' + slug(category) or ''}/presentation"
                                 t-attf-class="nav-link#{slide_type == 'presentation' and ' active' or ''}">
-                                <span class="badge" t-esc="header_object.nbr_presentations"/> Presentations
+                                <span class="badge badge-pill" t-esc="header_object.nbr_presentations"/> Presentations
                             </a>
                         </li>
                         <li t-if="header_object.nbr_videos" class="nav-item">
                             <a t-attf-href="/slides/#{slug(channel)}#{category and '/category/' + slug(category) or ''}/video"
                                 t-attf-class="nav-link#{slide_type == 'video' and ' active' or ''}">
-                                <span class="badge" t-esc="header_object.nbr_videos"/> Videos
+                                <span class="badge badge-pill" t-esc="header_object.nbr_videos"/> Videos
                             </a>
                         </li>
                         <li t-if="header_object.nbr_documents" class="li nav-item">
                             <a t-attf-href="/slides/#{slug(channel)}#{category and '/category/' + slug(category) or ''}/document"
                                 t-attf-class="nav-link#{slide_type == 'document' and ' active' or ''}">
-                                <span class="badge" t-esc="header_object.nbr_documents"/> Documents
+                                <span class="badge badge-pill" t-esc="header_object.nbr_documents"/> Documents
                             </a>
                         </li>
                         <li t-if="header_object.nbr_infographics" class="nav-item">
                             <a t-attf-href="/slides/#{slug(channel)}#{category and '/category/' + slug(category) or ''}/infographic"
                                 t-attf-class="nav-link#{slide_type == 'infographic' and ' active' or ''}">
-                                <span class="badge" t-esc="header_object.nbr_infographics"/> Infographics
+                                <span class="badge badge-pill" t-esc="header_object.nbr_infographics"/> Infographics
                             </a>
                         </li>
                     </ul>
@@ -548,15 +548,15 @@
                                             <h4 class="mt0 oe_slides_statistics_title">Views</h4>
                                             <ul class="list-group">
                                                 <li class="list-group-item">
-                                                    <span class="badge"><t t-esc="slide.total_views"/></span>
+                                                    <span class="badge badge-pill"><t t-esc="slide.total_views"/></span>
                                                     <i class="fa fa-play"></i> Total Views
                                                 </li>
                                                 <li class="list-group-item">
-                                                    <span class="badge"><t t-esc="slide.slide_views"/></span>
+                                                    <span class="badge badge-pill"><t t-esc="slide.slide_views"/></span>
                                                     <i class="fa fa-circle-o"></i> Website Views
                                                 </li>
                                                 <li class="list-group-item" t-if="not slide.document_id">
-                                                    <span class="badge"><t t-esc="slide.embed_views"/></span>
+                                                    <span class="badge badge-pill"><t t-esc="slide.embed_views"/></span>
                                                     <i class="fa fa-code"></i> Embedded Views
                                                 </li>
                                             </ul>
@@ -566,19 +566,19 @@
                                             <h4 class="mt0 oe_slides_statistics_title">Actions</h4>
                                             <ul class="list-group">
                                                 <li class="list-group-item">
-                                                    <span class="badge" id="total-share">0</span>
+                                                    <span class="badge badge-pill" id="total-share">0</span>
                                                     <i class="fa fa-share-alt"></i> Social Shares
                                                 </li>
                                                 <li class="list-group-item">
-                                                    <span class="badge"><t t-esc="slide.likes"/></span>
+                                                    <span class="badge badge-pill"><t t-esc="slide.likes"/></span>
                                                     <i class="fa fa-thumbs-up"></i> Likes
                                                 </li>
                                                 <li class="list-group-item">
-                                                    <span class="badge"><t t-esc="slide.dislikes"/></span>
+                                                    <span class="badge badge-pill"><t t-esc="slide.dislikes"/></span>
                                                     <i class="fa fa-thumbs-down"></i> Dislikes
                                                 </li>
                                                 <li class="list-group-item">
-                                                    <span class="badge"><t t-esc="len(slide.website_message_ids)"/></span>
+                                                    <span class="badge badge-pill"><t t-esc="len(slide.website_message_ids)"/></span>
                                                     <i class="fa fa-comments-o"></i> Comments
                                                 </li>
                                             </ul>
@@ -588,19 +588,19 @@
                                             <h4 class="mt0 oe_slides_statistics_title">Share count</h4>
                                             <ul class="list-group">
                                                 <li class="list-group-item">
-                                                    <span class="badge" id="facebook-badge">0</span>
+                                                    <span class="badge badge-pill" id="facebook-badge">0</span>
                                                     <i class="fa fa-facebook-square"></i> Facebook
                                                 </li>
                                                 <li class="list-group-item">
-                                                    <span class="badge" id="twitter-badge">0</span>
+                                                    <span class="badge badge-pill" id="twitter-badge">0</span>
                                                     <i class="fa fa-twitter-square"></i> Twitter
                                                 </li>
                                                 <li class="list-group-item">
-                                                    <span class="badge" id="linkedin-badge">0</span>
+                                                    <span class="badge badge-pill" id="linkedin-badge">0</span>
                                                     <i class="fa fa-linkedin-square"></i> LinkedIn
                                                 </li>
                                                 <li class="list-group-item">
-                                                    <span class="badge" id="google-badge">0</span>
+                                                    <span class="badge badge-pill" id="google-badge">0</span>
                                                     <i class="fa fa-google-plus-square"></i> Google+
                                                 </li>
                                             </ul>
@@ -609,13 +609,13 @@
                                     <div class="row" t-if="not slide.document_id and slide.embedcount_ids">
                                         <div class="col-lg-12">
                                             <h4 class="mt0"> Embeds
-                                                <span class="badge pull-right">
+                                                <span class="badge badge-pill pull-right">
                                                     <t t-esc="len(slide.embedcount_ids)"/>
                                                 </span>
                                             </h4>
                                             <ul class="list-group" style="height: 150px;overflow: auto;">
                                                 <li class="list-group-item" t-foreach="slide.embedcount_ids" t-as="count">
-                                                    <span class="badge"><t t-esc="count.count_views"/></span>
+                                                    <span class="badge badge-pill"><t t-esc="count.count_views"/></span>
                                                     <t t-esc="count.url"/>
                                                 </li>
                                             </ul>
diff --git a/odoo/addons/base/views/res_currency_views.xml b/odoo/addons/base/views/res_currency_views.xml
index 4b1bf985fe1..657f8b924b0 100644
--- a/odoo/addons/base/views/res_currency_views.xml
+++ b/odoo/addons/base/views/res_currency_views.xml
@@ -97,7 +97,7 @@
                                         <strong><span><t t-esc="record.name.value"/></span></strong>
                                     </div>
                                     <div class="col-6 pull-right text-right">
-                                        <span class="badge"><t t-esc="record.symbol.value"/></span>
+                                        <span class="badge badge-pill"><t t-esc="record.symbol.value"/></span>
                                     </div>
                                 </div>
                                 <div class="row">
diff --git a/odoo/addons/base/views/res_users_views.xml b/odoo/addons/base/views/res_users_views.xml
index ea676aac324..85f5ccf2f97 100644
--- a/odoo/addons/base/views/res_users_views.xml
+++ b/odoo/addons/base/views/res_users_views.xml
@@ -292,7 +292,7 @@
                                         <li class="mb4">
                                             <strong><field name="name"/></strong>
                                         </li>
-                                        <li class="badge pull-right mb4" t-if="record.lang.raw_value"><field name="lang"/></li>
+                                        <li class="badge badge-pill pull-right mb4" t-if="record.lang.raw_value"><field name="lang"/></li>
                                         <li class="mb4" t-if="record.login.raw_value" title="Login"><i class="fa fa-envelope" role="img" aria-label="Login"/> <field name="login"/></li>
                                     </ul>
                                 </div>