diff --git a/addons/calendar/static/src/scss/calendar.scss b/addons/calendar/static/src/scss/calendar.scss
index 314a417b4f6..75c806b290f 100644
--- a/addons/calendar/static/src/scss/calendar.scss
+++ b/addons/calendar/static/src/scss/calendar.scss
@@ -1,9 +1,5 @@
 .o_calendar_invitation {
-    display: inline-block;
-    width: 10px;
-    height: 10px;
-    border-radius: 5px;
-    vertical-align: middle;
+    @extend .o_status;
 
     &.accepted {
         background-color: theme-color('success');
diff --git a/addons/calendar/static/src/xml/base_calendar.xml b/addons/calendar/static/src/xml/base_calendar.xml
index b87fa243da4..dfa1513efb7 100644
--- a/addons/calendar/static/src/xml/base_calendar.xml
+++ b/addons/calendar/static/src/xml/base_calendar.xml
@@ -3,7 +3,7 @@
     <t t-name="Many2ManyAttendeeTag" t-extend="FieldMany2ManyTagAvatar">
         <t t-jquery="span:first" t-operation="prepend">
             <span t-if="attendeesData[el_index] and attendeesData[el_index].status and attendeesData[el_index].status !== 'needsAction'"
-                t-attf-class="o_calendar_invitation #{attendeesData[el_index].status}"/>
+                t-attf-class="o_calendar_invitation d-inline-block align-middle #{attendeesData[el_index].status}"/>
         </t>
     </t>
 
diff --git a/addons/web/static/src/legacy/js/views/calendar/calendar_popover.js b/addons/web/static/src/legacy/js/views/calendar/calendar_popover.js
index 7f54bb5144d..f7e2fa7a53f 100644
--- a/addons/web/static/src/legacy/js/views/calendar/calendar_popover.js
+++ b/addons/web/static/src/legacy/js/views/calendar/calendar_popover.js
@@ -200,7 +200,7 @@ var CalendarPopover = Widget.extend(WidgetAdapterMixin, StandaloneFieldManagerMi
                 }
                 self._registerWidget(recordID, field.name, fieldWidget);
                 // Only display the fields whose attributes does not make them invisible
-                let fieldClass = "list-group-item flex-shrink-0 d-flex flex-wrap";
+                let fieldClass = "list-group-item flex-shrink-0 d-flex flex-wrap align-items-center";
                 if (fieldWidget.attrs && fieldWidget.attrs.modifiers) {
                     const fieldModifier = record.evalModifiers(_.pick(fieldWidget.attrs.modifiers, 'invisible'));
                     fieldClass += fieldModifier.invisible ? ' o_invisible_modifier' : '';
diff --git a/addons/web/static/src/legacy/scss/bootstrap_overridden.scss b/addons/web/static/src/legacy/scss/bootstrap_overridden.scss
index d452bb0de76..c1e3e70d954 100644
--- a/addons/web/static/src/legacy/scss/bootstrap_overridden.scss
+++ b/addons/web/static/src/legacy/scss/bootstrap_overridden.scss
@@ -161,10 +161,6 @@ $toast-font-size: $font-size-base !default;
 $toast-background-color: rgba($white, .7) !default;
 $toast-header-background-color: $toast-background-color !default;
 
-// Badges
-
-$badge-font-weight: normal !default;
-
 // Modals
 
 // Padding applied to the modal body
diff --git a/addons/web/static/src/legacy/scss/fields.scss b/addons/web/static/src/legacy/scss/fields.scss
index 38eb50277a4..022c35e8513 100644
--- a/addons/web/static/src/legacy/scss/fields.scss
+++ b/addons/web/static/src/legacy/scss/fields.scss
@@ -277,29 +277,23 @@
         }
         // Many2many tags avatar
         &.avatar {
-            align-items: center;
             .badge {
-                padding: 0 0.6em 0 0;
+                align-items: center;
+
                 img {
-                    height: 17px;
-                    width: 17px;
+                    height: 1.2em;
+                    width: 1.2em;
                     object-fit: cover;
-                    margin-top: 1px;
-                    margin-left: 1px;
                 }
-                .o_badge_text {
-                    display: flex;
-                    align-items:center;
+
+                .o_badge_text, .o_delete {
                     padding-top: 0.25em;
                     padding-bottom: 0.25em;
                 }
+
                 .o_tag_badge_text {
                     padding-left:2px;
                 }
-                .o_delete {
-                    padding-top: 0.25em;
-                    padding-bottom: 0.25em;
-                }
             }
         }
     }