From 4956b8db553deef386e55760f81942c2fab7e399 Mon Sep 17 00:00:00 2001
From: Sascha Eggenberger <seggenberger@gitlab.com>
Date: Tue, 22 Aug 2023 08:05:23 +0000
Subject: [PATCH] Reduce the amount of variants for GitLab UI badges

See also:
- https://gitlab.com/gitlab-org/gitlab-ui/-/merge_requests/3307
- https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140231

Changelog: changed
---
 .../add_context_commits_modal_wrapper.vue     |  2 +-
 .../abuse_report/components/report_header.vue |  8 +-
 .../components/stage_table.vue                |  4 +-
 .../components/devops_score.vue               |  2 +-
 .../badges/components/badge_list.vue          |  2 +-
 .../batch_comments/components/draft_note.vue  |  1 -
 .../components/drafts_count.vue               |  2 +-
 .../ci/artifacts/components/artifact_row.vue  |  4 +-
 .../components/details/ci_resource_header.vue |  1 -
 .../catalog/components/list/catalog_tabs.vue  |  2 +-
 .../list/ci_resources_list_item.vue           |  4 +-
 .../components/ci_variable_table.vue          |  1 -
 .../sidebar/sidebar_job_details_container.vue |  2 +-
 .../ci/job_details/components/stuck_block.vue |  2 +-
 .../components/job_cells/job_cell.vue         | 34 ++------
 .../jobs_page/components/jobs_table_tabs.vue  |  2 +-
 .../graph/components/job_item.vue             |  1 -
 .../graph/components/linked_pipeline.vue      |  2 +-
 .../header/components/header_badges.vue       | 19 +----
 .../pipeline_details/tabs/pipeline_tabs.vue   |  6 +-
 .../components/ui/editor_tab.vue              |  2 +-
 .../components/pipeline_schedules.vue         |  2 +-
 .../components/pipeline_labels.vue            | 22 +-----
 .../components/cells/runner_summary_cell.vue  |  6 +-
 .../runner/components/runner_details_tabs.vue |  7 +-
 .../ci/runner/components/runner_tag.vue       |  6 --
 .../ci/runner/components/runner_tags.vue      | 13 +---
 .../ci/runner/components/runner_type_tabs.vue |  1 -
 .../agent_integration_status_row.vue          |  1 -
 .../clusters/agents/components/show.vue       |  4 +-
 .../code_navigation/components/popover.vue    |  2 +-
 .../commit/components/signature_badge.vue     |  2 +-
 .../custom_emoji/components/list.vue          |  2 +-
 .../components/approvals_empty_state.vue      |  2 +-
 .../components/design_notes/design_note.vue   |  2 +-
 .../components/toolbar/index.vue              |  1 -
 .../diffs/components/tree_list.vue            |  2 +-
 .../components/environment_folder.vue         |  2 +-
 .../components/environments_app.vue           |  4 +-
 .../environments_app_skeleton_loader.vue      |  4 +-
 .../components/kubernetes/kubernetes_pods.vue |  2 +-
 .../kubernetes/kubernetes_services.vue        |  2 +-
 .../environment_details/index.vue             |  4 +-
 .../folder/environments_folder_app.vue        |  4 +-
 .../folder/environments_folder_view.vue       |  2 +-
 .../components/gitlab_version_check_badge.vue |  6 --
 .../javascripts/gitlab_version_check/index.js |  3 +-
 .../groups/components/group_item.vue          |  2 +-
 .../ide/components/activity_bar.vue           |  1 -
 .../ide/components/pipelines/list.vue         |  6 +-
 .../components/import_status.vue              |  2 +-
 .../components/import_status.vue              |  2 +-
 .../overrides/components/integration_tabs.vue |  1 -
 .../issuable/components/status_badge.vue      |  2 +-
 .../issues/show/components/sticky_header.vue  |  8 +-
 .../components/workload_details.vue           |  4 +-
 .../components/workload_table.vue             |  9 +--
 .../components/avatars/user_avatar.vue        |  2 +-
 .../members/components/members_tabs.vue       |  2 +-
 .../members/components/placeholders/app.vue   |  4 +-
 .../components/table/members_table.vue        |  2 +-
 .../components/table/role_details_drawer.vue  |  2 +-
 .../components/collapsible_section.vue        |  2 +-
 .../components/sticky_header.vue              |  2 +-
 .../components/milestone_combobox.vue         |  2 +-
 .../components/model_experiments_header.vue   |  2 +-
 .../ml/model_registry/apps/show_ml_model.vue  |  4 +-
 .../notes/components/note_header.vue          |  3 +-
 .../components/details/package_title.vue      |  2 -
 .../components/list/package_list_row.vue      |  1 -
 .../package_registry/pages/details.vue        |  6 +-
 .../shared/components/package_tags.vue        |  2 -
 .../profile/components/followers_tab.vue      |  2 +-
 .../profile/components/following_tab.vue      |  2 +-
 .../profile/components/user_achievements.vue  |  4 +-
 .../commit_box/info/components/refs_list.vue  |  2 -
 .../branch_rules/components/branch_rule.vue   |  4 +-
 .../ref/components/ref_selector.vue           | 10 +--
 .../releases/components/issuable_stats.vue    |  2 +-
 .../components/release_block_assets.vue       |  4 +-
 .../repository/components/table/row.vue       |  4 +-
 .../components/feature_card_badge.vue         |  2 +-
 .../assignees/sidebar_participant.vue         |  2 +-
 .../assignees/user_name_with_status.vue       |  2 +-
 .../super_sidebar/components/help_center.vue  |  4 +-
 .../components/merge_request_menu.vue         |  2 +-
 .../super_sidebar/components/nav_item.vue     |  1 -
 .../super_sidebar/components/user_bar.vue     |  1 -
 .../components/user_menu_profile_item.vue     |  2 +-
 .../components/mr_widget_migrate_jenkins.vue  |  1 -
 .../components/badges/beta_badge.stories.js   |  2 +-
 .../components/badges/beta_badge.vue          |  9 +--
 .../badges/experiment_badge.stories.js        |  2 +-
 .../components/badges/experiment_badge.vue    |  9 +--
 .../components/badges/hover_badge.vue         |  7 +-
 .../vue_shared/components/ci_icon/ci_icon.vue |  1 -
 .../groups_list/groups_list_item.vue          |  1 -
 .../vue_shared/components/imported_badge.vue  |  7 +-
 .../vue_shared/components/navigation_tabs.vue |  2 +-
 .../paginated_table_with_search_and_tabs.vue  |  2 +-
 .../project_list_item_inactive_badge.vue      |  2 +-
 .../projects_list/projects_list_item.vue      | 13 +---
 .../components/user_access_role_badge.vue     |  9 +--
 .../components/user_popover/user_popover.vue  |  2 +-
 .../components/users_table/user_avatar.vue    |  4 +-
 .../list/components/issuable_item.vue         |  2 +-
 .../list/components/issuable_tabs.vue         |  1 -
 .../show/components/issuable_header.vue       |  7 +-
 .../whats_new/components/feature.vue          |  1 -
 .../design_preview/design_toolbar.vue         |  1 -
 .../work_item_ancestors.vue                   |  2 +-
 .../components/work_item_state_badge.vue      |  2 +-
 .../components/hierarchy.vue                  |  1 -
 app/assets/stylesheets/framework.scss         |  1 -
 app/assets/stylesheets/framework/badges.scss  | 78 -------------------
 .../stylesheets/page_bundles/issuable.scss    |  2 +-
 .../subscription_details_history.vue          |  2 +-
 .../components/list/dashboard_list_item.vue   |  8 +-
 .../code_review_analytics/components/app.vue  |  2 +-
 .../components/stream/stream_item.vue         |  1 -
 .../components/merge_train_tabs.vue           |  4 +-
 .../pipeline_details/tabs/pipeline_tabs.vue   |  4 +-
 .../runner_upgrade_status_badge.vue           | 17 +---
 .../components/policies_section.vue           |  2 +-
 .../framework_info_drawer.vue                 |  6 +-
 .../components/deployment_timeline.vue        |  1 -
 .../deployment_frequency_charts.vue           |  4 +-
 .../components/geo_sites_filters.vue          |  2 +-
 .../components/iteration_report_issues.vue    |  2 +-
 .../components/iteration_report_tabs.vue      |  2 +-
 .../components/summarize_code_changes.vue     |  2 +-
 .../components/tabs/base_tab.vue              |  2 +-
 .../pending_members/components/app.vue        |  2 +-
 .../components/epic_health_status.vue         |  6 +-
 .../components/issue_health_status.vue        |  8 +-
 .../components/requirements_tabs.vue          |  8 +-
 .../components/dast_configuration_header.vue  |  2 +-
 .../components/pre_scan_verification_icon.vue |  2 +-
 .../components/dast_scan_type_badge.vue       |  2 +-
 .../components/dast_site_validation_badge.vue |  2 +-
 .../vulnerability_list_status.vue             |  4 +-
 .../vulnerability_report_tab.vue              |  2 +-
 .../scan_execution/humanized_actions/tags.vue |  2 +-
 .../policy_editor/scan_filter_selector.vue    |  1 -
 .../tracing/details/tracing_header.vue        |  2 +-
 .../tracing/list/tracing_table.vue            |  6 +-
 .../saas_add_on_eligible_user_list.vue        |  2 +-
 .../components/subscription_seat_details.vue  |  2 +-
 .../components/subscription_user_list.vue     |  4 +-
 .../components/ai_commit_message.vue          |  4 +-
 .../components/code_owners/code_owners.vue    |  2 +-
 .../group_list_item_inactive_badge.vue        |  2 +-
 .../project_list_item_inactive_badge.vue      |  2 +-
 .../components/tier_badge/tier_badge.vue      |  2 +-
 .../components/split_button.vue               |  4 +-
 .../explain_vulnerability_deprecated.vue      |  2 +-
 .../explain_vulnerability_drawer.vue          |  2 +-
 .../components/agent_mapping.vue              |  4 +-
 .../list/dashboard_list_item_spec.js          |  1 -
 .../runner_upgrade_status_badge_spec.js       |  6 --
 .../environment_header_spec.js.snap           |  1 -
 .../table/role_details_drawer_spec.js         |  1 -
 .../vulnerability_list_status_spec.js         |  2 +-
 .../__snapshots__/details_drawer_spec.js.snap |  2 +-
 .../components/split_button_spec.js           |  2 -
 .../false_positive_badge_spec.js.snap         |  1 -
 .../explain_vulnerability_deprecated_spec.js  |  5 +-
 .../explain_vulnerability_drawer_spec.js      |  5 +-
 .../workspace_state_indicator_spec.js         |  1 -
 .../components/report_header_spec.js          |  5 +-
 .../runner_job_status_badge_spec.js           |  2 +-
 .../components/runner_managers_badge_spec.js  |  6 --
 .../components/runner_paused_badge_spec.js    |  6 --
 .../ci/runner/components/runner_tag_spec.js   |  9 ---
 .../ci/runner/components/runner_tags_spec.js  | 13 ----
 .../agent_integration_status_row_spec.js      |  1 -
 .../toolbar/__snapshots__/index_spec.js.snap  |  1 -
 .../findings_drawer_spec.js.snap              |  4 +-
 .../show/components/sticky_header_spec.js     |  4 +-
 .../components/table/members_table_spec.js    |  1 -
 .../collapsible_section_spec.js.snap          |  1 -
 .../profile/components/followers_tab_spec.js  |  3 +-
 .../profile/components/following_tab_spec.js  |  3 +-
 .../__snapshots__/issuable_stats_spec.js.snap |  2 +-
 .../dynamic_content_spec.js.snap              |  1 -
 .../__snapshots__/beta_badge_spec.js.snap     |  2 +-
 .../experiment_badge_spec.js.snap             |  2 +-
 .../components/badges/beta_badge_spec.js      | 14 ----
 .../badges/experiment_badge_spec.js           | 14 ----
 .../components/badges/hover_badge_spec.js     | 12 ---
 .../components/ci_icon/ci_icon_spec.js        |  1 -
 .../show/components/issuable_header_spec.js   |  2 +-
 192 files changed, 192 insertions(+), 593 deletions(-)
 delete mode 100644 app/assets/stylesheets/framework/badges.scss

diff --git a/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue b/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue
index b5239b437d683a..206e053192c273 100644
--- a/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue
+++ b/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue
@@ -337,7 +337,7 @@ export default {
       <gl-tab>
         <template #title>
           {{ __('Selected commits') }}
-          <gl-badge size="sm" class="gl-ml-2">{{ selectedCommitsCount }}</gl-badge>
+          <gl-badge class="gl-ml-2">{{ selectedCommitsCount }}</gl-badge>
         </template>
         <review-tab-container
           :is-loading="isLoadingContextCommits"
diff --git a/app/assets/javascripts/admin/abuse_report/components/report_header.vue b/app/assets/javascripts/admin/abuse_report/components/report_header.vue
index 5b53841a7f83d6..83dae99a65c605 100644
--- a/app/assets/javascripts/admin/abuse_report/components/report_header.vue
+++ b/app/assets/javascripts/admin/abuse_report/components/report_header.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlBadge, GlIcon, GlAvatar, GlButton, GlLink } from '@gitlab/ui';
+import { GlBadge, GlAvatar, GlButton, GlLink } from '@gitlab/ui';
 import { REPORT_HEADER_I18N, STATUS_OPEN, STATUS_CLOSED } from '../constants';
 import ReportActions from './report_actions.vue';
 
@@ -7,7 +7,6 @@ export default {
   name: 'ReportHeader',
   components: {
     GlBadge,
-    GlIcon,
     GlAvatar,
     GlButton,
     GlLink,
@@ -56,9 +55,8 @@ export default {
     class="gl-py-4 gl-border-b gl-display-flex gl-justify-content-space-between gl-flex-direction-column gl-sm-flex-direction-row"
   >
     <div class="gl-display-flex gl-align-items-center gl-gap-3">
-      <gl-badge :variant="badgeVariant" :aria-label="badgeText">
-        <gl-icon :name="badgeIcon" class="gl-badge-icon" />
-        <span class="gl-hidden sm:gl-block gl-ml-2">{{ badgeText }}</span>
+      <gl-badge :variant="badgeVariant" :icon="badgeIcon" :aria-label="badgeText">
+        {{ badgeText }}
       </gl-badge>
       <gl-avatar :size="48" :src="user.avatarUrl" />
       <h1 class="gl-font-size-h-display gl-my-0">
diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/stage_table.vue b/app/assets/javascripts/analytics/cycle_analytics/components/stage_table.vue
index 5c5d56625562f4..498fbf792f9bd7 100644
--- a/app/assets/javascripts/analytics/cycle_analytics/components/stage_table.vue
+++ b/app/assets/javascripts/analytics/cycle_analytics/components/stage_table.vue
@@ -211,9 +211,7 @@ export default {
     >
       <template v-if="stageCount" #head(title)="data">
         <span>{{ data.label }}</span
-        ><gl-badge class="gl-ml-3" size="sm"
-          ><formatted-stage-count :stage-count="stageCount"
-        /></gl-badge>
+        ><gl-badge class="gl-ml-3"><formatted-stage-count :stage-count="stageCount" /></gl-badge>
       </template>
       <template #head(duration)="data">
         <span data-testid="vsa-stage-header-duration">{{ data.label }}</span>
diff --git a/app/assets/javascripts/analytics/devops_reports/components/devops_score.vue b/app/assets/javascripts/analytics/devops_reports/components/devops_score.vue
index 593de1dcee7207..a841555000ed4b 100644
--- a/app/assets/javascripts/analytics/devops_reports/components/devops_score.vue
+++ b/app/assets/javascripts/analytics/devops_reports/components/devops_score.vue
@@ -103,7 +103,7 @@ export default {
         <template #cell(usage)="{ item }">
           <div data-testid="usageCol">
             <span>{{ item.usage }}</span>
-            <gl-badge :variant="item.scoreLevel.variant" size="sm" class="gl-ml-1">{{
+            <gl-badge :variant="item.scoreLevel.variant" class="gl-ml-1">{{
               item.scoreLevel.label
             }}</gl-badge>
           </div>
diff --git a/app/assets/javascripts/badges/components/badge_list.vue b/app/assets/javascripts/badges/components/badge_list.vue
index b574d9df1ac11b..33257e78aa4698 100644
--- a/app/assets/javascripts/badges/components/badge_list.vue
+++ b/app/assets/javascripts/badges/components/badge_list.vue
@@ -116,7 +116,7 @@ export default {
           <label v-gl-tooltip class="label-bold str-truncated mb-0" :title="item.name">{{
             item.name
           }}</label>
-          <gl-badge size="sm">{{ badgeKindText(item) }}</gl-badge>
+          <gl-badge>{{ badgeKindText(item) }}</gl-badge>
         </template>
 
         <template #cell(badge)="{ item }">
diff --git a/app/assets/javascripts/batch_comments/components/draft_note.vue b/app/assets/javascripts/batch_comments/components/draft_note.vue
index f231db33b1eb74..5e8414dcdfb20f 100644
--- a/app/assets/javascripts/batch_comments/components/draft_note.vue
+++ b/app/assets/javascripts/batch_comments/components/draft_note.vue
@@ -100,7 +100,6 @@ export default {
       <gl-badge
         v-gl-tooltip
         variant="warning"
-        size="sm"
         class="gl-mr-2"
         :title="__('Pending comments are hidden until you submit your review.')"
       >
diff --git a/app/assets/javascripts/batch_comments/components/drafts_count.vue b/app/assets/javascripts/batch_comments/components/drafts_count.vue
index d7a8c09565a5b8..2430b5e5a5a652 100644
--- a/app/assets/javascripts/batch_comments/components/drafts_count.vue
+++ b/app/assets/javascripts/batch_comments/components/drafts_count.vue
@@ -20,7 +20,7 @@ export default {
 };
 </script>
 <template>
-  <gl-badge size="sm" :variant="variant" class="gl-ml-2">
+  <gl-badge :variant="variant" class="gl-ml-2">
     {{ draftsCount }}
     <span class="sr-only"> {{ n__('draft', 'drafts', draftsCount) }} </span>
   </gl-badge>
diff --git a/app/assets/javascripts/ci/artifacts/components/artifact_row.vue b/app/assets/javascripts/ci/artifacts/components/artifact_row.vue
index 026f64be10d591..eebf13b9c540c1 100644
--- a/app/assets/javascripts/ci/artifacts/components/artifact_row.vue
+++ b/app/assets/javascripts/ci/artifacts/components/artifact_row.vue
@@ -100,10 +100,10 @@ export default {
         data-testid="job-artifact-row-name"
       >
         <gl-friendly-wrap :text="artifact.name" />
-        <gl-badge size="sm" variant="neutral" class="gl-ml-2">
+        <gl-badge variant="neutral" class="gl-ml-2">
           {{ artifact.fileType.toLowerCase() }}
         </gl-badge>
-        <gl-badge v-if="isExpired" size="sm" variant="warning" icon="expire" class="gl-ml-2">
+        <gl-badge v-if="isExpired" variant="warning" icon="expire" class="gl-ml-2">
           {{ $options.i18n.expired }}
         </gl-badge>
       </span>
diff --git a/app/assets/javascripts/ci/catalog/components/details/ci_resource_header.vue b/app/assets/javascripts/ci/catalog/components/details/ci_resource_header.vue
index a31057c62c44e8..e08526247a224f 100644
--- a/app/assets/javascripts/ci/catalog/components/details/ci_resource_header.vue
+++ b/app/assets/javascripts/ci/catalog/components/details/ci_resource_header.vue
@@ -133,7 +133,6 @@ export default {
             <gl-badge
               v-if="hasLatestVersion"
               v-gl-tooltip
-              size="sm"
               class="gl-ml-3 gl-my-1"
               variant="info"
               :href="latestVersion.path"
diff --git a/app/assets/javascripts/ci/catalog/components/list/catalog_tabs.vue b/app/assets/javascripts/ci/catalog/components/list/catalog_tabs.vue
index 47795106e05f2d..17ae084b737055 100644
--- a/app/assets/javascripts/ci/catalog/components/list/catalog_tabs.vue
+++ b/app/assets/javascripts/ci/catalog/components/list/catalog_tabs.vue
@@ -57,7 +57,7 @@ export default {
           <span>{{ tab.text }}</span>
           <gl-loading-icon v-if="showLoadingIcon" class="gl-ml-3" />
 
-          <gl-badge v-else size="sm" class="gl-tab-counter-badge">
+          <gl-badge v-else class="gl-tab-counter-badge">
             {{ tab.count }}
           </gl-badge>
         </template>
diff --git a/app/assets/javascripts/ci/catalog/components/list/ci_resources_list_item.vue b/app/assets/javascripts/ci/catalog/components/list/ci_resources_list_item.vue
index be230543d44bf0..1de15b2271dcb6 100644
--- a/app/assets/javascripts/ci/catalog/components/list/ci_resources_list_item.vue
+++ b/app/assets/javascripts/ci/catalog/components/list/ci_resources_list_item.vue
@@ -176,9 +176,7 @@ export default {
           <b> {{ resource.name }}</b>
         </gl-link>
         <div class="gl-display-flex gl-flex-grow-1 gl-md-justify-content-space-between">
-          <gl-badge size="sm" class="gl-h-5 gl-align-self-center" variant="info">{{
-            name
-          }}</gl-badge>
+          <gl-badge class="gl-h-5 gl-align-self-center" variant="info">{{ name }}</gl-badge>
           <div class="gl-display-flex gl-align-items-center gl-ml-3">
             <div
               v-gl-tooltip.top
diff --git a/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_table.vue b/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_table.vue
index cd15f38e9231ce..473ba5058eba10 100644
--- a/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_table.vue
+++ b/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_table.vue
@@ -302,7 +302,6 @@ export default {
                 :key="`${item.key}-${attribute}`"
                 class="gl-mr-2"
                 variant="info"
-                size="sm"
               >
                 {{ attribute }}
               </gl-badge>
diff --git a/app/assets/javascripts/ci/job_details/components/sidebar/sidebar_job_details_container.vue b/app/assets/javascripts/ci/job_details/components/sidebar/sidebar_job_details_container.vue
index 7b582d94c69a63..d7c14a1c205ad9 100644
--- a/app/assets/javascripts/ci/job_details/components/sidebar/sidebar_job_details_container.vue
+++ b/app/assets/javascripts/ci/job_details/components/sidebar/sidebar_job_details_container.vue
@@ -159,7 +159,7 @@ export default {
 
     <p v-if="hasTags" class="build-detail-row" data-testid="job-tags">
       <span class="font-weight-bold">{{ $options.i18n.TAGS }}:</span>
-      <gl-badge v-for="(tag, i) in job.tags" :key="i" variant="info" size="sm">{{ tag }}</gl-badge>
+      <gl-badge v-for="(tag, i) in job.tags" :key="i" variant="info">{{ tag }}</gl-badge>
     </p>
   </div>
 </template>
diff --git a/app/assets/javascripts/ci/job_details/components/stuck_block.vue b/app/assets/javascripts/ci/job_details/components/stuck_block.vue
index b8ff0b032cc523..8c73f09daea4db 100644
--- a/app/assets/javascripts/ci/job_details/components/stuck_block.vue
+++ b/app/assets/javascripts/ci/job_details/components/stuck_block.vue
@@ -78,7 +78,7 @@ export default {
         </template>
       </gl-sprintf>
       <template v-if="stuckData.showTags">
-        <gl-badge v-for="tag in tags" :key="tag" size="sm" variant="info">
+        <gl-badge v-for="tag in tags" :key="tag" variant="info">
           {{ tag }}
         </gl-badge>
       </template>
diff --git a/app/assets/javascripts/ci/jobs_page/components/job_cells/job_cell.vue b/app/assets/javascripts/ci/jobs_page/components/job_cells/job_cell.vue
index 01d409f68f6969..b72a9778e90663 100644
--- a/app/assets/javascripts/ci/jobs_page/components/job_cells/job_cell.vue
+++ b/app/assets/javascripts/ci/jobs_page/components/job_cells/job_cell.vue
@@ -6,7 +6,6 @@ import { SUCCESS_STATUS } from '../../../constants';
 
 export default {
   iconSize: 12,
-  badgeSize: 'sm',
   i18n: {
     stuckText: s__('Jobs|Job is stuck. Check runners.'),
   },
@@ -123,42 +122,19 @@ export default {
     </div>
 
     <div class="gl-mt-2">
-      <gl-badge
-        v-for="tag in jobTags"
-        :key="tag"
-        variant="info"
-        :size="$options.badgeSize"
-        data-testid="job-tag-badge"
-      >
+      <gl-badge v-for="tag in jobTags" :key="tag" variant="info" data-testid="job-tag-badge">
         {{ tag }}
       </gl-badge>
-      <gl-badge
-        v-if="triggered"
-        variant="info"
-        :size="$options.badgeSize"
-        data-testid="trigger-token-job-badge"
+      <gl-badge v-if="triggered" variant="info" data-testid="trigger-token-job-badge"
         >{{ s__('Job|trigger token') }}
       </gl-badge>
-      <gl-badge
-        v-if="showAllowedToFailBadge"
-        variant="warning"
-        :size="$options.badgeSize"
-        data-testid="fail-job-badge"
+      <gl-badge v-if="showAllowedToFailBadge" variant="warning" data-testid="fail-job-badge"
         >{{ s__('Job|allowed to fail') }}
       </gl-badge>
-      <gl-badge
-        v-if="isScheduledJob"
-        variant="info"
-        :size="$options.badgeSize"
-        data-testid="delayed-job-badge"
+      <gl-badge v-if="isScheduledJob" variant="info" data-testid="delayed-job-badge"
         >{{ s__('Job|delayed') }}
       </gl-badge>
-      <gl-badge
-        v-if="isManualJob"
-        variant="info"
-        :size="$options.badgeSize"
-        data-testid="manual-job-badge"
-      >
+      <gl-badge v-if="isManualJob" variant="info" data-testid="manual-job-badge">
         {{ s__('Job|manual') }}
       </gl-badge>
     </div>
diff --git a/app/assets/javascripts/ci/jobs_page/components/jobs_table_tabs.vue b/app/assets/javascripts/ci/jobs_page/components/jobs_table_tabs.vue
index b753195da9ab93..7dbf6e7823a3d9 100644
--- a/app/assets/javascripts/ci/jobs_page/components/jobs_table_tabs.vue
+++ b/app/assets/javascripts/ci/jobs_page/components/jobs_table_tabs.vue
@@ -76,7 +76,7 @@ export default {
           <span>{{ tab.text }}</span>
           <gl-loading-icon v-if="showLoadingIcon && tab.showBadge" class="gl-ml-2" />
 
-          <gl-badge v-else-if="tab.showBadge" size="sm" class="gl-tab-counter-badge">
+          <gl-badge v-else-if="tab.showBadge" class="gl-tab-counter-badge">
             {{ tab.count }}
           </gl-badge>
         </template>
diff --git a/app/assets/javascripts/ci/pipeline_details/graph/components/job_item.vue b/app/assets/javascripts/ci/pipeline_details/graph/components/job_item.vue
index 801da4d5f56574..885f2a05538949 100644
--- a/app/assets/javascripts/ci/pipeline_details/graph/components/job_item.vue
+++ b/app/assets/javascripts/ci/pipeline_details/graph/components/job_item.vue
@@ -366,7 +366,6 @@ export default {
         v-if="isBridge"
         class="gl-mt-3 gl-ml-7"
         variant="info"
-        size="sm"
         data-testid="job-bridge-badge"
       >
         {{ $options.i18n.bridgeBadgeText }}
diff --git a/app/assets/javascripts/ci/pipeline_details/graph/components/linked_pipeline.vue b/app/assets/javascripts/ci/pipeline_details/graph/components/linked_pipeline.vue
index 1d23dbeb78566a..053c13e488821d 100644
--- a/app/assets/javascripts/ci/pipeline_details/graph/components/linked_pipeline.vue
+++ b/app/assets/javascripts/ci/pipeline_details/graph/components/linked_pipeline.vue
@@ -279,7 +279,7 @@ export default {
         <div v-else :class="$options.styles.actionSizeClasses"></div>
       </div>
       <div class="gl-pt-2 gl-ml-7">
-        <gl-badge size="sm" variant="info" data-testid="downstream-pipeline-label">
+        <gl-badge variant="info" data-testid="downstream-pipeline-label">
           {{ label }}
         </gl-badge>
       </div>
diff --git a/app/assets/javascripts/ci/pipeline_details/header/components/header_badges.vue b/app/assets/javascripts/ci/pipeline_details/header/components/header_badges.vue
index 0e08347ac6ad43..6ce8c874a79080 100644
--- a/app/assets/javascripts/ci/pipeline_details/header/components/header_badges.vue
+++ b/app/assets/javascripts/ci/pipeline_details/header/components/header_badges.vue
@@ -78,7 +78,6 @@ export default {
       v-gl-tooltip
       :title="__('This pipeline was created by a schedule')"
       variant="info"
-      size="sm"
     >
       {{ s__('Pipelines|Scheduled') }}
     </gl-badge>
@@ -87,7 +86,6 @@ export default {
       v-gl-tooltip
       :title="__('This pipeline was created by an API call authenticated with a trigger token')"
       variant="info"
-      size="sm"
     >
       {{ __('trigger token') }}
     </gl-badge>
@@ -96,7 +94,6 @@ export default {
       v-gl-tooltip
       :title="__('This is a child pipeline within the parent pipeline')"
       variant="info"
-      size="sm"
     >
       <gl-sprintf :message="s__('Pipelines|Child pipeline (%{linkStart}parent%{linkEnd})')">
         <template #link="{ content }">
@@ -111,7 +108,6 @@ export default {
       v-gl-tooltip
       :title="__('Latest pipeline for the most recent commit on this branch')"
       variant="success"
-      size="sm"
     >
       {{ s__('Pipelines|latest') }}
     </gl-badge>
@@ -124,20 +120,13 @@ export default {
         )
       "
       variant="info"
-      size="sm"
     >
       {{ s__('Pipelines|merge train') }}
     </gl-badge>
-    <gl-badge
-      v-if="badges.invalid"
-      v-gl-tooltip
-      :title="yamlErrorMessages"
-      variant="danger"
-      size="sm"
-    >
+    <gl-badge v-if="badges.invalid" v-gl-tooltip :title="yamlErrorMessages" variant="danger">
       {{ s__('Pipelines|yaml invalid') }}
     </gl-badge>
-    <gl-badge v-if="badges.failed" v-gl-tooltip :title="failureReason" variant="danger" size="sm">
+    <gl-badge v-if="badges.failed" v-gl-tooltip :title="failureReason" variant="danger">
       {{ s__('Pipelines|error') }}
     </gl-badge>
     <gl-badge
@@ -147,7 +136,6 @@ export default {
         __('This pipeline makes use of a predefined CI/CD configuration enabled by Auto DevOps.')
       "
       variant="info"
-      size="sm"
     >
       {{ s__('Pipelines|Auto DevOps') }}
     </gl-badge>
@@ -160,7 +148,6 @@ export default {
         )
       "
       variant="info"
-      size="sm"
     >
       {{ s__('Pipelines|merge request') }}
     </gl-badge>
@@ -173,7 +160,6 @@ export default {
         )
       "
       variant="info"
-      size="sm"
     >
       {{ s__('Pipelines|merged results') }}
     </gl-badge>
@@ -182,7 +168,6 @@ export default {
       v-gl-tooltip
       :title="s__('Pipelines|This pipeline is stuck')"
       variant="warning"
-      size="sm"
     >
       {{ s__('Pipelines|stuck') }}
     </gl-badge>
diff --git a/app/assets/javascripts/ci/pipeline_details/tabs/pipeline_tabs.vue b/app/assets/javascripts/ci/pipeline_details/tabs/pipeline_tabs.vue
index 9783a9b5937cce..35d0166ac47f07 100644
--- a/app/assets/javascripts/ci/pipeline_details/tabs/pipeline_tabs.vue
+++ b/app/assets/javascripts/ci/pipeline_details/tabs/pipeline_tabs.vue
@@ -103,7 +103,7 @@ export default {
     >
       <template #title>
         <span class="gl-mr-2">{{ $options.i18n.tabs.jobsTitle }}</span>
-        <gl-badge size="sm" data-testid="builds-counter">{{ totalJobCount }}</gl-badge>
+        <gl-badge data-testid="builds-counter">{{ totalJobCount }}</gl-badge>
       </template>
       <router-view />
     </gl-tab>
@@ -117,7 +117,7 @@ export default {
     >
       <template #title>
         <span class="gl-mr-2">{{ $options.i18n.tabs.failedJobsTitle }}</span>
-        <gl-badge size="sm" data-testid="failed-builds-counter">{{ failedJobsCount }}</gl-badge>
+        <gl-badge data-testid="failed-builds-counter">{{ failedJobsCount }}</gl-badge>
       </template>
       <router-view />
     </gl-tab>
@@ -129,7 +129,7 @@ export default {
     >
       <template #title>
         <span class="gl-mr-2">{{ $options.i18n.tabs.testsTitle }}</span>
-        <gl-badge size="sm" data-testid="tests-counter">{{ testsCount }}</gl-badge>
+        <gl-badge data-testid="tests-counter">{{ testsCount }}</gl-badge>
       </template>
       <router-view />
     </gl-tab>
diff --git a/app/assets/javascripts/ci/pipeline_editor/components/ui/editor_tab.vue b/app/assets/javascripts/ci/pipeline_editor/components/ui/editor_tab.vue
index 22b82f2e96f3f2..17fcfe54cf8ebc 100644
--- a/app/assets/javascripts/ci/pipeline_editor/components/ui/editor_tab.vue
+++ b/app/assets/javascripts/ci/pipeline_editor/components/ui/editor_tab.vue
@@ -139,7 +139,7 @@ export default {
   <gl-tab :lazy="isLazy" v-bind="$attrs" v-on="$listeners">
     <template #title>
       <span>{{ title }}</span>
-      <gl-badge v-if="hasBadgeTitle" class="gl-ml-2" size="sm" :variant="badgeVariant">{{
+      <gl-badge v-if="hasBadgeTitle" class="gl-ml-2" :variant="badgeVariant">{{
         badgeTitle
       }}</gl-badge>
     </template>
diff --git a/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules.vue b/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules.vue
index 9db20f93e3e22d..dea1de07edd499 100644
--- a/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules.vue
+++ b/app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules.vue
@@ -396,7 +396,7 @@ export default {
           <template v-if="tab.showBadge">
             <gl-loading-icon v-if="tab.scope === scope && isLoading" class="gl-ml-2" />
 
-            <gl-badge v-else-if="tab.count" size="sm" class="gl-tab-counter-badge">
+            <gl-badge v-else-if="tab.count" class="gl-tab-counter-badge">
               {{ tab.count }}
             </gl-badge>
           </template>
diff --git a/app/assets/javascripts/ci/pipelines_page/components/pipeline_labels.vue b/app/assets/javascripts/ci/pipelines_page/components/pipeline_labels.vue
index 058bd8942aeda9..690006796077ff 100644
--- a/app/assets/javascripts/ci/pipelines_page/components/pipeline_labels.vue
+++ b/app/assets/javascripts/ci/pipelines_page/components/pipeline_labels.vue
@@ -74,7 +74,6 @@ export default {
       target="__blank"
       :title="__('This pipeline was created by a schedule.')"
       variant="info"
-      size="sm"
       data-testid="pipeline-url-scheduled"
       >{{ __('scheduled') }}</gl-badge
     >
@@ -83,7 +82,6 @@ export default {
       v-gl-tooltip
       :title="__('This pipeline was created by an API call authenticated with a trigger token')"
       variant="info"
-      size="sm"
       data-testid="pipeline-url-triggered"
       >{{ __('trigger token') }}</gl-badge
     >
@@ -92,7 +90,6 @@ export default {
       v-gl-tooltip
       :title="__('Latest pipeline for the most recent commit on this branch')"
       variant="success"
-      size="sm"
       data-testid="pipeline-url-latest"
       >{{ __('latest') }}</gl-badge
     >
@@ -105,7 +102,6 @@ export default {
         )
       "
       variant="info"
-      size="sm"
       data-testid="pipeline-url-train"
       >{{ s__('Pipeline|merge train') }}</gl-badge
     >
@@ -114,7 +110,6 @@ export default {
       v-gl-tooltip
       :title="pipeline.yaml_errors"
       variant="danger"
-      size="sm"
       data-testid="pipeline-url-yaml"
       >{{ __('yaml invalid') }}</gl-badge
     >
@@ -123,7 +118,6 @@ export default {
       v-gl-tooltip
       :title="pipeline.failure_reason"
       variant="danger"
-      size="sm"
       data-testid="pipeline-url-failure"
       >{{ __('error') }}</gl-badge
     >
@@ -134,7 +128,7 @@ export default {
         data-testid="pipeline-url-autodevops"
         role="button"
       >
-        <gl-badge variant="info" size="sm">
+        <gl-badge variant="info">
           {{ __('Auto DevOps') }}
         </gl-badge>
       </gl-link>
@@ -164,13 +158,9 @@ export default {
       </gl-popover>
     </template>
 
-    <gl-badge
-      v-if="pipeline.flags.stuck"
-      variant="warning"
-      size="sm"
-      data-testid="pipeline-url-stuck"
-      >{{ __('stuck') }}</gl-badge
-    >
+    <gl-badge v-if="pipeline.flags.stuck" variant="warning" data-testid="pipeline-url-stuck">{{
+      __('stuck')
+    }}</gl-badge>
     <gl-badge
       v-if="pipeline.flags.detached_merge_request_pipeline"
       v-gl-tooltip
@@ -180,7 +170,6 @@ export default {
         )
       "
       variant="info"
-      size="sm"
       data-testid="pipeline-url-detached"
       >{{ s__('Pipeline|merge request') }}</gl-badge
     >
@@ -193,7 +182,6 @@ export default {
         )
       "
       variant="info"
-      size="sm"
       data-testid="pipeline-url-merged-results"
       >{{ s__('Pipeline|merged results') }}</gl-badge
     >
@@ -202,7 +190,6 @@ export default {
       v-gl-tooltip
       :title="__('Pipeline ran in fork of project')"
       variant="info"
-      size="sm"
       data-testid="pipeline-url-fork"
       >{{ __('fork') }}</gl-badge
     >
@@ -211,7 +198,6 @@ export default {
       v-gl-tooltip
       :title="__('This pipeline was triggered using the api')"
       variant="info"
-      size="sm"
       data-testid="pipeline-api-badge"
       >{{ s__('Pipeline|api') }}</gl-badge
     >
diff --git a/app/assets/javascripts/ci/runner/components/cells/runner_summary_cell.vue b/app/assets/javascripts/ci/runner/components/cells/runner_summary_cell.vue
index 6d39b3872e7246..930876e62cbbba 100644
--- a/app/assets/javascripts/ci/runner/components/cells/runner_summary_cell.vue
+++ b/app/assets/javascripts/ci/runner/components/cells/runner_summary_cell.vue
@@ -84,14 +84,14 @@ export default {
         <runner-name :runner="runner" />
       </slot>
 
-      <runner-managers-badge :count="managersCount" size="sm" class="gl-align-middle" />
+      <runner-managers-badge :count="managersCount" class="gl-align-middle" />
       <gl-icon
         v-if="runner.locked"
         v-gl-tooltip
         :title="$options.i18n.I18N_LOCKED_RUNNER_DESCRIPTION"
         name="lock"
       />
-      <runner-type-badge :type="runner.runnerType" size="sm" class="gl-align-middle" />
+      <runner-type-badge :type="runner.runnerType" class="gl-align-middle" />
     </div>
 
     <div
@@ -143,6 +143,6 @@ export default {
       </runner-summary-field>
     </div>
 
-    <runner-tags class="gl-block" :tag-list="runner.tagList" size="sm" />
+    <runner-tags class="gl-block" :tag-list="runner.tagList" />
   </div>
 </template>
diff --git a/app/assets/javascripts/ci/runner/components/runner_details_tabs.vue b/app/assets/javascripts/ci/runner/components/runner_details_tabs.vue
index e4190a4dffd995..e054d7a0cf11c1 100644
--- a/app/assets/javascripts/ci/runner/components/runner_details_tabs.vue
+++ b/app/assets/javascripts/ci/runner/components/runner_details_tabs.vue
@@ -76,12 +76,7 @@ export default {
     <gl-tab @click="goTo($options.ROUTE_JOBS)">
       <template #title>
         {{ $options.I18N_JOBS }}
-        <gl-badge
-          v-if="jobCount"
-          data-testid="job-count-badge"
-          class="gl-tab-counter-badge"
-          size="sm"
-        >
+        <gl-badge v-if="jobCount" data-testid="job-count-badge" class="gl-tab-counter-badge">
           {{ jobCount }}
         </gl-badge>
         <help-popover v-if="showAccessHelp" class="gl-ml-3">
diff --git a/app/assets/javascripts/ci/runner/components/runner_tag.vue b/app/assets/javascripts/ci/runner/components/runner_tag.vue
index 6ad2023a866ad3..3fe09e03001c5a 100644
--- a/app/assets/javascripts/ci/runner/components/runner_tag.vue
+++ b/app/assets/javascripts/ci/runner/components/runner_tag.vue
@@ -15,11 +15,6 @@ export default {
       type: String,
       required: true,
     },
-    size: {
-      type: String,
-      required: false,
-      default: 'sm',
-    },
   },
   data() {
     return {
@@ -48,7 +43,6 @@ export default {
     v-gl-tooltip="tooltip"
     v-gl-resize-observer="onResize"
     class="gl-display-inline-block gl-max-w-full gl-text-truncate"
-    :size="size"
     :variant="$options.RUNNER_TAG_BADGE_VARIANT"
   >
     {{ tag }}
diff --git a/app/assets/javascripts/ci/runner/components/runner_tags.vue b/app/assets/javascripts/ci/runner/components/runner_tags.vue
index 38e566f9f53441..7d762d792a433b 100644
--- a/app/assets/javascripts/ci/runner/components/runner_tags.vue
+++ b/app/assets/javascripts/ci/runner/components/runner_tags.vue
@@ -11,22 +11,11 @@ export default {
       required: false,
       default: () => [],
     },
-    size: {
-      type: String,
-      required: false,
-      default: 'sm',
-    },
   },
 };
 </script>
 <template>
   <span v-if="tagList && tagList.length">
-    <runner-tag
-      v-for="tag in tagList"
-      :key="tag"
-      class="gl-display-inline gl-mr-1"
-      :tag="tag"
-      :size="size"
-    />
+    <runner-tag v-for="tag in tagList" :key="tag" class="gl-display-inline gl-mr-1" :tag="tag" />
   </span>
 </template>
diff --git a/app/assets/javascripts/ci/runner/components/runner_type_tabs.vue b/app/assets/javascripts/ci/runner/components/runner_type_tabs.vue
index 3af10c59e31712..aa3b71ad226f53 100644
--- a/app/assets/javascripts/ci/runner/components/runner_type_tabs.vue
+++ b/app/assets/javascripts/ci/runner/components/runner_type_tabs.vue
@@ -115,7 +115,6 @@ export default {
           <gl-badge
             v-if="tabCount(count)"
             class="gl-ml-1"
-            size="sm"
             :data-testid="`runner-count-${tab.title.toLowerCase()}`"
           >
             {{ tabCount(count) }}
diff --git a/app/assets/javascripts/clusters/agents/components/agent_integration_status_row.vue b/app/assets/javascripts/clusters/agents/components/agent_integration_status_row.vue
index 3c4fd8592f1188..e4afdbe6fbbd54 100644
--- a/app/assets/javascripts/clusters/agents/components/agent_integration_status_row.vue
+++ b/app/assets/javascripts/clusters/agents/components/agent_integration_status_row.vue
@@ -56,7 +56,6 @@ export default {
 
     <gl-badge
       v-if="showPremiumBadge"
-      size="md"
       class="gl-ml-2 gl-align-middle"
       icon="license"
       variant="tier"
diff --git a/app/assets/javascripts/clusters/agents/components/show.vue b/app/assets/javascripts/clusters/agents/components/show.vue
index c1a6f7e0800503..9d4a720c4163ea 100644
--- a/app/assets/javascripts/clusters/agents/components/show.vue
+++ b/app/assets/javascripts/clusters/agents/components/show.vue
@@ -145,9 +145,7 @@ export default {
             <span data-testid="cluster-agent-token-count">
               {{ $options.i18n.tokens }}
 
-              <gl-badge v-if="tokenCount" size="sm" class="gl-tab-counter-badge">{{
-                tokenCount
-              }}</gl-badge>
+              <gl-badge v-if="tokenCount" class="gl-tab-counter-badge">{{ tokenCount }}</gl-badge>
             </span>
           </template>
 
diff --git a/app/assets/javascripts/code_navigation/components/popover.vue b/app/assets/javascripts/code_navigation/components/popover.vue
index b558dbeb486319..79b8f62fdabd87 100644
--- a/app/assets/javascripts/code_navigation/components/popover.vue
+++ b/app/assets/javascripts/code_navigation/components/popover.vue
@@ -128,7 +128,7 @@ export default {
       <gl-tab data-testid="references-tab" class="py-2">
         <template #title>
           {{ __('References') }}
-          <gl-badge size="sm" class="gl-tab-counter-badge">{{ references.length }}</gl-badge>
+          <gl-badge class="gl-tab-counter-badge">{{ references.length }}</gl-badge>
         </template>
         <template v-if="references.length">
           <div v-for="(reference, index) in references" :key="index" class="gl-dropdown-item">
diff --git a/app/assets/javascripts/commit/components/signature_badge.vue b/app/assets/javascripts/commit/components/signature_badge.vue
index 21aec39a75d0f5..a263fddb138f80 100644
--- a/app/assets/javascripts/commit/components/signature_badge.vue
+++ b/app/assets/javascripts/commit/components/signature_badge.vue
@@ -51,7 +51,7 @@ export default {
       class="gl-border-0 gl-outline-none gl-p-0 gl-bg-transparent"
       :aria-label="statusConfig.label"
     >
-      <gl-badge :variant="statusConfig.variant" size="md">
+      <gl-badge :variant="statusConfig.variant">
         {{ statusConfig.label }}
       </gl-badge>
     </button>
diff --git a/app/assets/javascripts/custom_emoji/components/list.vue b/app/assets/javascripts/custom_emoji/components/list.vue
index 9dcd355e09ab47..db3c2dc85ecd6c 100644
--- a/app/assets/javascripts/custom_emoji/components/list.vue
+++ b/app/assets/javascripts/custom_emoji/components/list.vue
@@ -105,7 +105,7 @@ export default {
         <gl-tab>
           <template #title>
             {{ __('Emoji') }}
-            <gl-badge size="sm" class="gl-tab-counter-badge">{{ count }}</gl-badge>
+            <gl-badge class="gl-tab-counter-badge">{{ count }}</gl-badge>
           </template>
           <gl-table-lite
             :items="customEmojis"
diff --git a/app/assets/javascripts/deployments/components/approvals_empty_state.vue b/app/assets/javascripts/deployments/components/approvals_empty_state.vue
index e23956ee8098e9..83a89d5cf9b451 100644
--- a/app/assets/javascripts/deployments/components/approvals_empty_state.vue
+++ b/app/assets/javascripts/deployments/components/approvals_empty_state.vue
@@ -70,7 +70,7 @@ export default {
         <div class="gl-border-l gl-border-t gl-border-r gl-rounded-base gl-mb-5">
           <div class="gl-m-5">
             <slot name="table-header">
-              <gl-badge size="md" class="gl-mr-2 gl-align-middle" icon="license" variant="tier">{{
+              <gl-badge class="gl-mr-2 gl-align-middle" icon="license" variant="tier">{{
                 $options.i18n.premiumTitle
               }}</gl-badge>
               <strong class="gl-align-middle">{{ $options.i18n.tableHeader }}</strong>
diff --git a/app/assets/javascripts/design_management/components/design_notes/design_note.vue b/app/assets/javascripts/design_management/components/design_notes/design_note.vue
index 30e800a783449e..41e537d2f9f1af 100644
--- a/app/assets/javascripts/design_management/components/design_notes/design_note.vue
+++ b/app/assets/javascripts/design_management/components/design_notes/design_note.vue
@@ -306,7 +306,7 @@ export default {
           >
             <time-ago-tooltip :time="note.createdAt" tooltip-placement="bottom" />
           </gl-link>
-          <imported-badge v-if="isImported" :importable-type="$options.TYPE_COMMENT" size="sm" />
+          <imported-badge v-if="isImported" :importable-type="$options.TYPE_COMMENT" />
         </span>
       </div>
       <div class="gl-display-flex gl-align-items-flex-start -gl-mt-2 -gl-mr-2">
diff --git a/app/assets/javascripts/design_management/components/toolbar/index.vue b/app/assets/javascripts/design_management/components/toolbar/index.vue
index c9938e7c55a809..2fd7706d59776a 100644
--- a/app/assets/javascripts/design_management/components/toolbar/index.vue
+++ b/app/assets/javascripts/design_management/components/toolbar/index.vue
@@ -155,7 +155,6 @@ export default {
           <imported-badge
             v-if="isImported"
             :importable-type="$options.TYPE_DESIGN"
-            size="sm"
             class="gl-ml-2"
           />
         </h2>
diff --git a/app/assets/javascripts/diffs/components/tree_list.vue b/app/assets/javascripts/diffs/components/tree_list.vue
index 4128f2814ba7de..0cb5bb33a9bcf8 100644
--- a/app/assets/javascripts/diffs/components/tree_list.vue
+++ b/app/assets/javascripts/diffs/components/tree_list.vue
@@ -153,7 +153,7 @@ export default {
   <div class="tree-list-holder gl-flex flex-column" data-testid="file-tree-container">
     <div class="gl-flex gl-items-center gl-mb-3">
       <h5 class="gl-display-inline-block gl-my-0">{{ __('Files') }}</h5>
-      <gl-badge size="sm" class="gl-ml-2" data-testid="file-count">{{ realSize }}</gl-badge>
+      <gl-badge class="gl-ml-2" data-testid="file-count">{{ realSize }}</gl-badge>
       <gl-button-group class="gl-ml-auto">
         <gl-button
           v-gl-tooltip.hover
diff --git a/app/assets/javascripts/environments/components/environment_folder.vue b/app/assets/javascripts/environments/components/environment_folder.vue
index 57583afc0ba7dd..2bf682cc23f8c1 100644
--- a/app/assets/javascripts/environments/components/environment_folder.vue
+++ b/app/assets/javascripts/environments/components/environment_folder.vue
@@ -118,7 +118,7 @@ export default {
       <div class="gl-mr-2 gl-text-gray-500" :class="folderClass">
         {{ nestedEnvironment.name }}
       </div>
-      <gl-badge size="sm" class="gl-mr-auto">{{ totalEnvironmentsCount }}</gl-badge>
+      <gl-badge class="gl-mr-auto">{{ totalEnvironmentsCount }}</gl-badge>
     </div>
     <gl-collapse :visible="visible">
       <environment-item
diff --git a/app/assets/javascripts/environments/components/environments_app.vue b/app/assets/javascripts/environments/components/environments_app.vue
index c70f9a90dfb21b..0b8dfcda9f8cb5 100644
--- a/app/assets/javascripts/environments/components/environments_app.vue
+++ b/app/assets/javascripts/environments/components/environments_app.vue
@@ -290,7 +290,7 @@ export default {
         >
           <template #title>
             <span>{{ $options.i18n.active }}</span>
-            <gl-badge size="sm" class="gl-tab-counter-badge">
+            <gl-badge class="gl-tab-counter-badge">
               {{ activeCount }}
             </gl-badge>
           </template>
@@ -301,7 +301,7 @@ export default {
         >
           <template #title>
             <span>{{ $options.i18n.stopped }}</span>
-            <gl-badge size="sm" class="gl-tab-counter-badge">
+            <gl-badge class="gl-tab-counter-badge">
               {{ stoppedCount }}
             </gl-badge>
           </template>
diff --git a/app/assets/javascripts/environments/components/environments_app_skeleton_loader.vue b/app/assets/javascripts/environments/components/environments_app_skeleton_loader.vue
index 7d114da07fa022..d50a4ce471350f 100644
--- a/app/assets/javascripts/environments/components/environments_app_skeleton_loader.vue
+++ b/app/assets/javascripts/environments/components/environments_app_skeleton_loader.vue
@@ -36,7 +36,7 @@ export default {
       <gl-tab :disabled="true">
         <template #title>
           <span>{{ $props.i18n.active }}</span>
-          <gl-badge size="sm" class="gl-tab-counter-badge">
+          <gl-badge class="gl-tab-counter-badge">
             <gl-loading-icon label="" size="sm" color="dark" variant="dots" :inline="true" />
           </gl-badge>
         </template>
@@ -44,7 +44,7 @@ export default {
       <gl-tab :disabled="true">
         <template #title>
           <span>{{ $props.i18n.stopped }}</span>
-          <gl-badge size="sm" class="gl-tab-counter-badge">
+          <gl-badge class="gl-tab-counter-badge">
             <gl-loading-icon label="" size="sm" color="dark" variant="dots" :inline="true" />
           </gl-badge>
         </template>
diff --git a/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_pods.vue b/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_pods.vue
index a82a45dac12a73..d3c3390d931d8c 100644
--- a/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_pods.vue
+++ b/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_pods.vue
@@ -140,7 +140,7 @@ export default {
   <gl-tab>
     <template #title>
       {{ $options.i18n.podsTitle }}
-      <gl-badge size="sm" class="gl-tab-counter-badge">{{ podsCount }}</gl-badge>
+      <gl-badge class="gl-tab-counter-badge">{{ podsCount }}</gl-badge>
     </template>
 
     <gl-loading-icon v-if="loading" />
diff --git a/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_services.vue b/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_services.vue
index 09022b59ce53ae..9a9d3c0f6e3c32 100644
--- a/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_services.vue
+++ b/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_services.vue
@@ -88,7 +88,7 @@ export default {
   <gl-tab>
     <template #title>
       {{ $options.i18n.servicesTitle }}
-      <gl-badge size="sm" class="gl-tab-counter-badge">{{ servicesItems.length }}</gl-badge>
+      <gl-badge class="gl-tab-counter-badge">{{ servicesItems.length }}</gl-badge>
     </template>
 
     <gl-loading-icon v-if="servicesLoading" />
diff --git a/app/assets/javascripts/environments/environment_details/index.vue b/app/assets/javascripts/environments/environment_details/index.vue
index f87723b33e9a6f..73c34500a86872 100644
--- a/app/assets/javascripts/environments/environment_details/index.vue
+++ b/app/assets/javascripts/environments/environment_details/index.vue
@@ -117,9 +117,7 @@ export default {
     <gl-tab :query-param-value="$options.params.deployments" :title-link-class="linkClass(1)">
       <template #title>
         {{ $options.i18n.deploymentHistory }}
-        <gl-badge size="sm" class="gl-tab-counter-badge">{{
-          environment.deploymentsDisplayCount
-        }}</gl-badge>
+        <gl-badge class="gl-tab-counter-badge">{{ environment.deploymentsDisplayCount }}</gl-badge>
       </template>
 
       <deployment-history
diff --git a/app/assets/javascripts/environments/folder/environments_folder_app.vue b/app/assets/javascripts/environments/folder/environments_folder_app.vue
index fd28de8a2ae98d..1a0ab0d9b3a5f2 100644
--- a/app/assets/javascripts/environments/folder/environments_folder_app.vue
+++ b/app/assets/javascripts/environments/folder/environments_folder_app.vue
@@ -202,7 +202,7 @@ export default {
       >
         <template #title>
           <span>{{ $options.i18n.active }}</span>
-          <gl-badge size="sm" class="gl-tab-counter-badge">
+          <gl-badge class="gl-tab-counter-badge">
             {{ activeCount }}
           </gl-badge>
         </template>
@@ -213,7 +213,7 @@ export default {
       >
         <template #title>
           <span>{{ $options.i18n.stopped }}</span>
-          <gl-badge size="sm" class="gl-tab-counter-badge">
+          <gl-badge class="gl-tab-counter-badge">
             {{ stoppedCount }}
           </gl-badge>
         </template>
diff --git a/app/assets/javascripts/environments/folder/environments_folder_view.vue b/app/assets/javascripts/environments/folder/environments_folder_view.vue
index 5b9b110c8c9d47..5139286b0beae3 100644
--- a/app/assets/javascripts/environments/folder/environments_folder_view.vue
+++ b/app/assets/javascripts/environments/folder/environments_folder_view.vue
@@ -64,7 +64,7 @@ export default {
       >
         <template #title>
           <span>{{ tab.name }}</span>
-          <gl-badge size="sm" class="gl-tab-counter-badge">{{ tab.count }}</gl-badge>
+          <gl-badge class="gl-tab-counter-badge">{{ tab.count }}</gl-badge>
         </template>
       </gl-tab>
     </gl-tabs>
diff --git a/app/assets/javascripts/gitlab_version_check/components/gitlab_version_check_badge.vue b/app/assets/javascripts/gitlab_version_check/components/gitlab_version_check_badge.vue
index 5ae40417cf49ac..ce1ef81082c9f1 100644
--- a/app/assets/javascripts/gitlab_version_check/components/gitlab_version_check_badge.vue
+++ b/app/assets/javascripts/gitlab_version_check/components/gitlab_version_check_badge.vue
@@ -11,11 +11,6 @@ export default {
   },
   mixins: [Tracking.mixin()],
   props: {
-    size: {
-      type: String,
-      required: false,
-      default: 'md',
-    },
     actionable: {
       type: Boolean,
       required: false,
@@ -69,7 +64,6 @@ export default {
     :href="badgeUrl"
     class="gl-align-middle"
     :variant="status"
-    :size="size"
     data-testid="check-version-badge"
     @click.native="onClick"
     >{{ title }}</gl-badge
diff --git a/app/assets/javascripts/gitlab_version_check/index.js b/app/assets/javascripts/gitlab_version_check/index.js
index 9d442e45bbf68a..abfef943b112df 100644
--- a/app/assets/javascripts/gitlab_version_check/index.js
+++ b/app/assets/javascripts/gitlab_version_check/index.js
@@ -4,7 +4,7 @@ import GitlabVersionCheckBadge from './components/gitlab_version_check_badge.vue
 import SecurityPatchUpgradeAlertModal from './components/security_patch_upgrade_alert_modal.vue';
 
 const mountGitlabVersionCheckBadge = (el) => {
-  const { size, version } = el.dataset;
+  const { version } = el.dataset;
   const actionable = parseBoolean(el.dataset.actionable);
 
   try {
@@ -20,7 +20,6 @@ const mountGitlabVersionCheckBadge = (el) => {
       render(createElement) {
         return createElement(GitlabVersionCheckBadge, {
           props: {
-            size,
             actionable,
             status: severity,
           },
diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue
index b6231cbc1baf22..b8ae5af319095f 100644
--- a/app/assets/javascripts/groups/components/group_item.vue
+++ b/app/assets/javascripts/groups/components/group_item.vue
@@ -239,7 +239,7 @@ export default {
                 </div>
               </gl-popover>
             </template>
-            <user-access-role-badge v-if="group.permission" size="sm" class="gl-mr-2">
+            <user-access-role-badge v-if="group.permission" class="gl-mr-2">
               {{ group.permission }}
             </user-access-role-badge>
           </div>
diff --git a/app/assets/javascripts/ide/components/activity_bar.vue b/app/assets/javascripts/ide/components/activity_bar.vue
index 73620b573b41b0..903bba7b606fc7 100644
--- a/app/assets/javascripts/ide/components/activity_bar.vue
+++ b/app/assets/javascripts/ide/components/activity_bar.vue
@@ -88,7 +88,6 @@ export default {
           <gl-badge
             v-if="stagedFiles.length"
             class="gl-absolute gl-px-2 gl-top-3 gl-right-3 gl-font-bold gl-bg-gray-900! gl-text-white!"
-            size="sm"
           >
             {{ stagedFiles.length }}
           </gl-badge>
diff --git a/app/assets/javascripts/ide/components/pipelines/list.vue b/app/assets/javascripts/ide/components/pipelines/list.vue
index 5f0030b07951f5..419ae38549519b 100644
--- a/app/assets/javascripts/ide/components/pipelines/list.vue
+++ b/app/assets/javascripts/ide/components/pipelines/list.vue
@@ -91,16 +91,14 @@ export default {
         <gl-tab :active="!pipelineFailed">
           <template #title>
             {{ __('Jobs') }}
-            <gl-badge v-if="jobsCount" size="sm" class="gl-tab-counter-badge">{{
-              jobsCount
-            }}</gl-badge>
+            <gl-badge v-if="jobsCount" class="gl-tab-counter-badge">{{ jobsCount }}</gl-badge>
           </template>
           <jobs-list :loading="isLoadingJobs" :stages="stages" />
         </gl-tab>
         <gl-tab :active="pipelineFailed">
           <template #title>
             {{ __('Failed Jobs') }}
-            <gl-badge v-if="failedJobsCount" size="sm" class="gl-tab-counter-badge">{{
+            <gl-badge v-if="failedJobsCount" class="gl-tab-counter-badge">{{
               failedJobsCount
             }}</gl-badge>
           </template>
diff --git a/app/assets/javascripts/import_entities/components/import_status.vue b/app/assets/javascripts/import_entities/components/import_status.vue
index b4c361182f344b..a2e29f5f7fe779 100644
--- a/app/assets/javascripts/import_entities/components/import_status.vue
+++ b/app/assets/javascripts/import_entities/components/import_status.vue
@@ -104,7 +104,7 @@ export default {
 <template>
   <div>
     <div class="gl-display-inline-block">
-      <gl-badge :icon="mappedStatus.icon" :variant="mappedStatus.variant" size="md" icon-size="sm">
+      <gl-badge :icon="mappedStatus.icon" :variant="mappedStatus.variant" icon-size="sm">
         {{ mappedStatus.text }}
       </gl-badge>
     </div>
diff --git a/app/assets/javascripts/import_entities/import_groups/components/import_status.vue b/app/assets/javascripts/import_entities/import_groups/components/import_status.vue
index c04a98b37709e5..4ab336e6492186 100644
--- a/app/assets/javascripts/import_entities/import_groups/components/import_status.vue
+++ b/app/assets/javascripts/import_entities/import_groups/components/import_status.vue
@@ -43,7 +43,7 @@ export default {
 
 <template>
   <div>
-    <gl-badge :icon="mappedStatus.icon" :variant="mappedStatus.variant" size="md" icon-size="sm">
+    <gl-badge :icon="mappedStatus.icon" :variant="mappedStatus.variant" icon-size="sm">
       {{ mappedStatus.text }}
     </gl-badge>
 
diff --git a/app/assets/javascripts/integrations/overrides/components/integration_tabs.vue b/app/assets/javascripts/integrations/overrides/components/integration_tabs.vue
index 3f67c987231d5b..a59399d9b516c0 100644
--- a/app/assets/javascripts/integrations/overrides/components/integration_tabs.vue
+++ b/app/assets/javascripts/integrations/overrides/components/integration_tabs.vue
@@ -42,7 +42,6 @@ export default {
         <gl-badge
           v-if="projectOverridesCount !== null"
           variant="muted"
-          size="sm"
           class="gl-tab-counter-badge"
           >{{ projectOverridesCount }}</gl-badge
         >
diff --git a/app/assets/javascripts/issuable/components/status_badge.vue b/app/assets/javascripts/issuable/components/status_badge.vue
index 598de439845fbf..aa3049e05dbb19 100644
--- a/app/assets/javascripts/issuable/components/status_badge.vue
+++ b/app/assets/javascripts/issuable/components/status_badge.vue
@@ -93,6 +93,6 @@ export default {
 <template>
   <gl-badge :variant="badgeProperties.variant" :aria-label="badgeProperties.text">
     <gl-icon :name="badgeProperties.icon" />
-    <span class="gl-hidden sm:gl-block gl-ml-2">{{ badgeProperties.text }}</span>
+    {{ badgeProperties.text }}
   </gl-badge>
 </template>
diff --git a/app/assets/javascripts/issues/show/components/sticky_header.vue b/app/assets/javascripts/issues/show/components/sticky_header.vue
index fb03e3dcda9b0a..24f520c43ca65e 100644
--- a/app/assets/javascripts/issues/show/components/sticky_header.vue
+++ b/app/assets/javascripts/issues/show/components/sticky_header.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlBadge, GlIcon, GlIntersectionObserver, GlLink } from '@gitlab/ui';
+import { GlBadge, GlIntersectionObserver, GlLink } from '@gitlab/ui';
 import HiddenBadge from '~/issuable/components/hidden_badge.vue';
 import LockedBadge from '~/issuable/components/locked_badge.vue';
 import { issuableStatusText, STATUS_CLOSED, WORKSPACE_PROJECT } from '~/issues/constants';
@@ -11,7 +11,6 @@ export default {
   components: {
     ConfidentialityBadge,
     GlBadge,
-    GlIcon,
     GlIntersectionObserver,
     GlLink,
     HiddenBadge,
@@ -85,9 +84,8 @@ export default {
         <div
           class="issue-sticky-header-text gl-display-flex gl-align-items-center gl-gap-2 gl-mx-auto"
         >
-          <gl-badge :variant="statusVariant">
-            <gl-icon :name="statusIcon" />
-            <span class="gl-block gl-ml-2">{{ statusText }}</span>
+          <gl-badge :variant="statusVariant" :icon="statusIcon">
+            {{ statusText }}
           </gl-badge>
           <confidentiality-badge
             v-if="isConfidential"
diff --git a/app/assets/javascripts/kubernetes_dashboard/components/workload_details.vue b/app/assets/javascripts/kubernetes_dashboard/components/workload_details.vue
index 447812f1711cc4..722081532d67a5 100644
--- a/app/assets/javascripts/kubernetes_dashboard/components/workload_details.vue
+++ b/app/assets/javascripts/kubernetes_dashboard/components/workload_details.vue
@@ -92,14 +92,14 @@ export default {
       </div>
     </workload-details-item>
     <workload-details-item v-if="item.status && !item.fullStatus" :label="$options.i18n.status">
-      <gl-badge :variant="$options.WORKLOAD_STATUS_BADGE_VARIANTS[item.status]" size="sm">{{
+      <gl-badge :variant="$options.WORKLOAD_STATUS_BADGE_VARIANTS[item.status]">{{
         item.status
       }}</gl-badge>
     </workload-details-item>
     <workload-details-item v-if="item.fullStatus" :label="$options.i18n.status" collapsible>
       <template v-if="item.status" #label>
         <span class="gl-mr-2 gl-font-bold">{{ $options.i18n.status }}</span>
-        <gl-badge :variant="$options.WORKLOAD_STATUS_BADGE_VARIANTS[item.status]" size="sm">{{
+        <gl-badge :variant="$options.WORKLOAD_STATUS_BADGE_VARIANTS[item.status]">{{
           item.status
         }}</gl-badge>
       </template>
diff --git a/app/assets/javascripts/kubernetes_dashboard/components/workload_table.vue b/app/assets/javascripts/kubernetes_dashboard/components/workload_table.vue
index 5de86eed1f7470..affb9397d0ade5 100644
--- a/app/assets/javascripts/kubernetes_dashboard/components/workload_table.vue
+++ b/app/assets/javascripts/kubernetes_dashboard/components/workload_table.vue
@@ -86,12 +86,9 @@ export default {
       @row-selected="selectItem"
     >
       <template #cell(status)="{ item: { status } }">
-        <gl-badge
-          :variant="$options.WORKLOAD_STATUS_BADGE_VARIANTS[status]"
-          size="sm"
-          class="gl-ml-2"
-          >{{ status }}</gl-badge
-        >
+        <gl-badge :variant="$options.WORKLOAD_STATUS_BADGE_VARIANTS[status]" class="gl-ml-2">{{
+          status
+        }}</gl-badge>
       </template>
 
       <template #cell(logs)="{ item: { name, namespace, containers } }">
diff --git a/app/assets/javascripts/members/components/avatars/user_avatar.vue b/app/assets/javascripts/members/components/avatars/user_avatar.vue
index 96d90434cff204..98453aa364f663 100644
--- a/app/assets/javascripts/members/components/avatars/user_avatar.vue
+++ b/app/assets/javascripts/members/components/avatars/user_avatar.vue
@@ -94,7 +94,7 @@ export default {
           ></span>
         </div>
         <div v-for="badge in badges" :key="badge.text" class="gl-p-1">
-          <gl-badge size="sm" :variant="badge.variant">
+          <gl-badge :variant="badge.variant">
             {{ badge.text }}
           </gl-badge>
         </div>
diff --git a/app/assets/javascripts/members/components/members_tabs.vue b/app/assets/javascripts/members/components/members_tabs.vue
index 05fde6369d167d..1f53354fcb28b2 100644
--- a/app/assets/javascripts/members/components/members_tabs.vue
+++ b/app/assets/javascripts/members/components/members_tabs.vue
@@ -99,7 +99,7 @@ export default {
     >
       <template #title>
         <span>{{ tab.title }}</span>
-        <gl-badge size="sm" class="gl-tab-counter-badge">{{ getTabCount(tab) }}</gl-badge>
+        <gl-badge class="gl-tab-counter-badge">{{ getTabCount(tab) }}</gl-badge>
       </template>
       <component
         :is="tab.component"
diff --git a/app/assets/javascripts/members/components/placeholders/app.vue b/app/assets/javascripts/members/components/placeholders/app.vue
index ee435cd8154d39..9ced8a0d6bde3e 100644
--- a/app/assets/javascripts/members/components/placeholders/app.vue
+++ b/app/assets/javascripts/members/components/placeholders/app.vue
@@ -31,7 +31,7 @@ export default {
     <gl-tab>
       <template #title>
         <span>{{ s__('UserMapping|Awaiting reassignment') }}</span>
-        <gl-badge size="sm" class="gl-tab-counter-badge">{{ tabCount }}</gl-badge>
+        <gl-badge class="gl-tab-counter-badge">{{ tabCount }}</gl-badge>
       </template>
 
       <placeholders-table key="unassigned" />
@@ -40,7 +40,7 @@ export default {
     <gl-tab>
       <template #title>
         <span>{{ s__('UserMapping|Reassigned') }}</span>
-        <gl-badge size="sm" class="gl-tab-counter-badge">{{ tabCount }}</gl-badge>
+        <gl-badge class="gl-tab-counter-badge">{{ tabCount }}</gl-badge>
       </template>
 
       <placeholders-table key="assigned" reassigned />
diff --git a/app/assets/javascripts/members/components/table/members_table.vue b/app/assets/javascripts/members/components/table/members_table.vue
index 59bcbb7bb52fac..69e94c3b91a7cf 100644
--- a/app/assets/javascripts/members/components/table/members_table.vue
+++ b/app/assets/javascripts/members/components/table/members_table.vue
@@ -299,7 +299,7 @@ export default {
             >
               {{ member.accessLevel.stringValue }}
             </gl-button>
-            <gl-badge v-if="member.accessLevel.memberRoleId" class="gl-mt-3" size="sm">
+            <gl-badge v-if="member.accessLevel.memberRoleId" class="gl-mt-3">
               {{ s__('MemberRole|Custom role') }}
             </gl-badge>
           </div>
diff --git a/app/assets/javascripts/members/components/table/role_details_drawer.vue b/app/assets/javascripts/members/components/table/role_details_drawer.vue
index 7aa490c0fbeae8..90267358b230e6 100644
--- a/app/assets/javascripts/members/components/table/role_details_drawer.vue
+++ b/app/assets/javascripts/members/components/table/role_details_drawer.vue
@@ -203,7 +203,7 @@ export default {
             />
             <span v-else class="gl-mr-1" data-testid="role-text">{{ selectedRole.text }}</span>
 
-            <gl-badge v-if="selectedRole.memberRoleId" size="sm">
+            <gl-badge v-if="selectedRole.memberRoleId">
               {{ s__('MemberRole|Custom role') }}
             </gl-badge>
           </dd>
diff --git a/app/assets/javascripts/merge_request_dashboard/components/collapsible_section.vue b/app/assets/javascripts/merge_request_dashboard/components/collapsible_section.vue
index 90874004389d0b..769e279a7828a6 100644
--- a/app/assets/javascripts/merge_request_dashboard/components/collapsible_section.vue
+++ b/app/assets/javascripts/merge_request_dashboard/components/collapsible_section.vue
@@ -65,7 +65,7 @@ export default {
         @click="toggleOpen"
       />
       <strong>{{ title }}</strong>
-      <gl-badge class="gl-ml-3" variant="neutral" size="sm">{{ count }}</gl-badge>
+      <gl-badge class="gl-ml-3" variant="neutral">{{ count }}</gl-badge>
     </header>
     <div v-if="open" class="gl-mt-3" data-testid="section-content">
       <slot></slot>
diff --git a/app/assets/javascripts/merge_requests/components/sticky_header.vue b/app/assets/javascripts/merge_requests/components/sticky_header.vue
index fc199f589c017a..5c5e4fb0eeec5f 100644
--- a/app/assets/javascripts/merge_requests/components/sticky_header.vue
+++ b/app/assets/javascripts/merge_requests/components/sticky_header.vue
@@ -228,7 +228,7 @@ export default {
             >
               <gl-link :href="tab[2]" :data-action="tab[0]" class="!gl-py-4" @click="visitTab">
                 {{ tab[1] }}
-                <gl-badge variant="muted" size="sm">
+                <gl-badge variant="muted">
                   <template v-if="index === 0 && discussionCounter !== 0">
                     {{ discussionCounter }}
                   </template>
diff --git a/app/assets/javascripts/milestones/components/milestone_combobox.vue b/app/assets/javascripts/milestones/components/milestone_combobox.vue
index a5e306b5372e03..205a09dbfe88f9 100644
--- a/app/assets/javascripts/milestones/components/milestone_combobox.vue
+++ b/app/assets/javascripts/milestones/components/milestone_combobox.vue
@@ -166,7 +166,7 @@ export default {
   >
     <template #group-label="{ group }">
       <span :data-testid="`${group.id}-section`"
-        >{{ group.text }}<gl-badge size="sm" class="gl-ml-2">{{ group.totalCount }}</gl-badge></span
+        >{{ group.text }}<gl-badge class="gl-ml-2">{{ group.totalCount }}</gl-badge></span
       >
     </template>
     <template #footer>
diff --git a/app/assets/javascripts/ml/experiment_tracking/components/model_experiments_header.vue b/app/assets/javascripts/ml/experiment_tracking/components/model_experiments_header.vue
index 02869bacb669d8..b6877f0d746ca5 100644
--- a/app/assets/javascripts/ml/experiment_tracking/components/model_experiments_header.vue
+++ b/app/assets/javascripts/ml/experiment_tracking/components/model_experiments_header.vue
@@ -25,7 +25,7 @@ export default {
     <div class="detail-page-header-body">
       <div class="page-title gl-flex-grow-1 gl-display-flex gl-align-items-center">
         <h3 class="gl-font-size-h-display gl-my-0">{{ pageTitle }}</h3>
-        <gl-badge class="gl-mx-4" variant="info" size="lg" :href="$options.experimentDocHref">
+        <gl-badge class="gl-mx-4" variant="info" :href="$options.experimentDocHref">
           {{ $options.i18n.experimentBadgeLabel }}
         </gl-badge>
       </div>
diff --git a/app/assets/javascripts/ml/model_registry/apps/show_ml_model.vue b/app/assets/javascripts/ml/model_registry/apps/show_ml_model.vue
index d66518e839e857..0f62e0e35118f9 100644
--- a/app/assets/javascripts/ml/model_registry/apps/show_ml_model.vue
+++ b/app/assets/javascripts/ml/model_registry/apps/show_ml_model.vue
@@ -219,13 +219,13 @@ export default {
             <gl-tab @click="goTo($options.ROUTE_VERSIONS)">
               <template #title>
                 {{ s__('MlModelRegistry|Versions') }}
-                <gl-badge size="sm" class="gl-tab-counter-badge">{{ versionCount }}</gl-badge>
+                <gl-badge class="gl-tab-counter-badge">{{ versionCount }}</gl-badge>
               </template>
             </gl-tab>
             <gl-tab @click="goTo($options.ROUTE_CANDIDATES)">
               <template #title>
                 {{ s__('MlModelRegistry|Version candidates') }}
-                <gl-badge size="sm" class="gl-tab-counter-badge">{{ candidateCount }}</gl-badge>
+                <gl-badge class="gl-tab-counter-badge">{{ candidateCount }}</gl-badge>
               </template>
             </gl-tab>
 
diff --git a/app/assets/javascripts/notes/components/note_header.vue b/app/assets/javascripts/notes/components/note_header.vue
index f66dc29e0da7bf..1c645fb7333dea 100644
--- a/app/assets/javascripts/notes/components/note_header.vue
+++ b/app/assets/javascripts/notes/components/note_header.vue
@@ -248,7 +248,7 @@ export default {
 
       <template v-if="isImported">
         <span v-if="isSystemNote">&middot;</span>
-        <imported-badge :text-only="isSystemNote" :importable-type="importableType" size="sm" />
+        <imported-badge :text-only="isSystemNote" :importable-type="importableType" />
       </template>
 
       <gl-badge
@@ -256,7 +256,6 @@ export default {
         v-gl-tooltip:tooltipcontainer.bottom
         data-testid="internal-note-indicator"
         variant="warning"
-        size="sm"
         class="gl-ml-2"
         :title="internalNoteTooltip"
       >
diff --git a/app/assets/javascripts/packages_and_registries/package_registry/components/details/package_title.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/details/package_title.vue
index 9a9e3ecbbaaeb3..9d636667e871e1 100644
--- a/app/assets/javascripts/packages_and_registries/package_registry/components/details/package_title.vue
+++ b/app/assets/javascripts/packages_and_registries/package_registry/components/details/package_title.vue
@@ -116,7 +116,6 @@ export default {
             class="gl-my-1"
             data-testid="tag-badge"
             variant="info"
-            size="sm"
           >
             {{ tag.name }}
           </gl-badge>
@@ -126,7 +125,6 @@ export default {
           v-if="showBadgeProtected"
           v-gl-tooltip="{ title: $options.i18n.badgeProtectedTooltipText }"
           icon-size="sm"
-          size="sm"
           variant="neutral"
         >
           {{ __('protected') }}
diff --git a/app/assets/javascripts/packages_and_registries/package_registry/components/list/package_list_row.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/list/package_list_row.vue
index 9361e03b02a681..ee92c908113290 100644
--- a/app/assets/javascripts/packages_and_registries/package_registry/components/list/package_list_row.vue
+++ b/app/assets/javascripts/packages_and_registries/package_registry/components/list/package_list_row.vue
@@ -157,7 +157,6 @@ export default {
             v-gl-tooltip="{ title: $options.i18n.badgeProtectedTooltipText }"
             class="gl-ml-2"
             icon-size="sm"
-            size="sm"
             variant="neutral"
           >
             {{ __('protected') }}
diff --git a/app/assets/javascripts/packages_and_registries/package_registry/pages/details.vue b/app/assets/javascripts/packages_and_registries/package_registry/pages/details.vue
index c3c95b809ec7e1..2b97c72c140710 100644
--- a/app/assets/javascripts/packages_and_registries/package_registry/pages/details.vue
+++ b/app/assets/javascripts/packages_and_registries/package_registry/pages/details.vue
@@ -317,9 +317,7 @@ export default {
       <gl-tab v-if="showDependencies">
         <template #title>
           <span>{{ __('Dependencies') }}</span>
-          <gl-badge size="sm" data-testid="dependencies-badge">{{
-            packageDependencies.length
-          }}</gl-badge>
+          <gl-badge data-testid="dependencies-badge">{{ packageDependencies.length }}</gl-badge>
         </template>
 
         <template v-if="packageDependencies.length > 0">
@@ -334,7 +332,7 @@ export default {
       <gl-tab title-item-class="js-versions-tab" lazy>
         <template #title>
           <span>{{ $options.i18n.otherVersionsTabTitle }}</span>
-          <gl-badge size="sm" class="gl-tab-counter-badge" data-testid="other-versions-badge">{{
+          <gl-badge class="gl-tab-counter-badge" data-testid="other-versions-badge">{{
             packageVersionsCount
           }}</gl-badge>
         </template>
diff --git a/app/assets/javascripts/packages_and_registries/shared/components/package_tags.vue b/app/assets/javascripts/packages_and_registries/shared/components/package_tags.vue
index 5530bd94bd02ed..41b7825736f1db 100644
--- a/app/assets/javascripts/packages_and_registries/shared/components/package_tags.vue
+++ b/app/assets/javascripts/packages_and_registries/shared/components/package_tags.vue
@@ -80,7 +80,6 @@ export default {
       data-testid="tagBadge"
       :class="tagBadgeClass(index)"
       variant="info"
-      size="sm"
       >{{ tag.name }}</gl-badge
     >
 
@@ -90,7 +89,6 @@ export default {
       data-testid="moreBadge"
       variant="muted"
       :title="moreTagsTooltip"
-      size="sm"
       class="gl-hidden md:gl-flex gl-ml-2"
       ><gl-sprintf :message="__('+%{tags} more')">
         <template #tags>
diff --git a/app/assets/javascripts/profile/components/followers_tab.vue b/app/assets/javascripts/profile/components/followers_tab.vue
index 927424d6c3feff..ff582da44ce9a1 100644
--- a/app/assets/javascripts/profile/components/followers_tab.vue
+++ b/app/assets/javascripts/profile/components/followers_tab.vue
@@ -63,7 +63,7 @@ export default {
   <gl-tab>
     <template #title>
       <span>{{ $options.i18n.title }}</span>
-      <gl-badge size="sm" class="gl-ml-2">{{ followersCount }}</gl-badge>
+      <gl-badge class="gl-ml-2">{{ followersCount }}</gl-badge>
     </template>
     <follow
       :users="followers"
diff --git a/app/assets/javascripts/profile/components/following_tab.vue b/app/assets/javascripts/profile/components/following_tab.vue
index 66c7ee42a3f64a..51b06c59752c9e 100644
--- a/app/assets/javascripts/profile/components/following_tab.vue
+++ b/app/assets/javascripts/profile/components/following_tab.vue
@@ -64,7 +64,7 @@ export default {
   <gl-tab>
     <template #title>
       <span>{{ $options.i18n.title }}</span>
-      <gl-badge size="sm" class="gl-ml-2">{{ followeesCount }}</gl-badge>
+      <gl-badge class="gl-ml-2">{{ followeesCount }}</gl-badge>
     </template>
     <follow
       :users="following"
diff --git a/app/assets/javascripts/profile/components/user_achievements.vue b/app/assets/javascripts/profile/components/user_achievements.vue
index 0fb9340240d804..cd36f39add90a2 100644
--- a/app/assets/javascripts/profile/components/user_achievements.vue
+++ b/app/assets/javascripts/profile/components/user_achievements.vue
@@ -100,13 +100,13 @@ export default {
         class="gl-p-1 gl-border-none"
       />
       <br />
-      <gl-badge v-if="showCountBadge(userAchievement.count)" variant="info" size="sm">{{
+      <gl-badge v-if="showCountBadge(userAchievement.count)" variant="info">{{
         getCountBadge(userAchievement.count)
       }}</gl-badge>
       <gl-popover :target="userAchievement.id">
         <div>
           <span class="gl-font-bold">{{ userAchievement.name }}</span>
-          <gl-badge v-if="showCountBadge(userAchievement.count)" variant="info" size="sm">{{
+          <gl-badge v-if="showCountBadge(userAchievement.count)" variant="info">{{
             getCountBadge(userAchievement.count)
           }}</gl-badge>
         </div>
diff --git a/app/assets/javascripts/projects/commit_box/info/components/refs_list.vue b/app/assets/javascripts/projects/commit_box/info/components/refs_list.vue
index bd351e9930e76b..8d88d9b727bc87 100644
--- a/app/assets/javascripts/projects/commit_box/info/components/refs_list.vue
+++ b/app/assets/javascripts/projects/commit_box/info/components/refs_list.vue
@@ -86,7 +86,6 @@ export default {
       :key="ref"
       :href="getRefUrl(ref)"
       class="gl-mt-2 gl-mr-2"
-      size="sm"
       >{{ ref }}</gl-badge
     >
     <gl-button
@@ -107,7 +106,6 @@ export default {
           :key="ref"
           :href="getRefUrl(ref)"
           class="gl-mt-3 gl-mr-2"
-          size="sm"
           >{{ ref }}</gl-badge
         >
       </template>
diff --git a/app/assets/javascripts/projects/settings/repository/branch_rules/components/branch_rule.vue b/app/assets/javascripts/projects/settings/repository/branch_rules/components/branch_rule.vue
index 8e53141cb2ab18..dd91daeacd24d7 100644
--- a/app/assets/javascripts/projects/settings/repository/branch_rules/components/branch_rule.vue
+++ b/app/assets/javascripts/projects/settings/repository/branch_rules/components/branch_rule.vue
@@ -162,11 +162,11 @@ export default {
       <div>
         <strong class="gl-font-monospace">{{ name }}</strong>
 
-        <gl-badge v-if="isDefault" variant="info" size="sm" class="gl-ml-2">{{
+        <gl-badge v-if="isDefault" variant="info" class="gl-ml-2">{{
           $options.i18n.defaultLabel
         }}</gl-badge>
 
-        <gl-badge v-if="isProtected" variant="neutral" size="sm" class="gl-ml-2">{{
+        <gl-badge v-if="isProtected" variant="neutral" class="gl-ml-2">{{
           $options.i18n.protectedLabel
         }}</gl-badge>
 
diff --git a/app/assets/javascripts/ref/components/ref_selector.vue b/app/assets/javascripts/ref/components/ref_selector.vue
index e2ac3ea5667f10..5e057bbec3bb37 100644
--- a/app/assets/javascripts/ref/components/ref_selector.vue
+++ b/app/assets/javascripts/ref/components/ref_selector.vue
@@ -279,16 +279,12 @@ export default {
       @select="selectRef"
     >
       <template #group-label="{ group }">
-        {{ group.text }} <gl-badge size="sm">{{ totalCountText(group.options.length) }}</gl-badge>
+        {{ group.text }} <gl-badge>{{ totalCountText(group.options.length) }}</gl-badge>
       </template>
       <template #list-item="{ item }">
         {{ item.text }}
-        <gl-badge v-if="item.default" size="sm" variant="info">{{
-          i18n.defaultLabelText
-        }}</gl-badge>
-        <gl-badge v-if="item.protected" size="sm" variant="neutral">{{
-          i18n.protectedLabelText
-        }}</gl-badge>
+        <gl-badge v-if="item.default" variant="info">{{ i18n.defaultLabelText }}</gl-badge>
+        <gl-badge v-if="item.protected" variant="neutral">{{ i18n.protectedLabelText }}</gl-badge>
       </template>
       <template #footer>
         <slot name="footer" v-bind="footerSlotProps"></slot>
diff --git a/app/assets/javascripts/releases/components/issuable_stats.vue b/app/assets/javascripts/releases/components/issuable_stats.vue
index d005d8e10dd272..07ef679dd41e26 100644
--- a/app/assets/javascripts/releases/components/issuable_stats.vue
+++ b/app/assets/javascripts/releases/components/issuable_stats.vue
@@ -57,7 +57,7 @@ export default {
   <div class="gl-display-flex gl-flex-direction-column gl-flex-shrink-0 gl-mr-6 gl-mb-5">
     <span class="gl-mb-2">
       {{ label }}
-      <gl-badge variant="muted" size="sm">{{ total }}</gl-badge>
+      <gl-badge variant="muted">{{ total }}</gl-badge>
     </span>
     <div class="gl-display-flex">
       <span class="gl-white-space-pre-wrap" data-testid="open-stat">
diff --git a/app/assets/javascripts/releases/components/release_block_assets.vue b/app/assets/javascripts/releases/components/release_block_assets.vue
index 2871dfbd52cce8..c64192d9d388b9 100644
--- a/app/assets/javascripts/releases/components/release_block_assets.vue
+++ b/app/assets/javascripts/releases/components/release_block_assets.vue
@@ -112,9 +112,7 @@ export default {
         :class="{ 'gl-rotate-90': isAssetsExpanded }"
       />
       {{ __('Assets') }}
-      <gl-badge size="sm" variant="neutral" class="gl-display-inline-block">{{
-        assets.count
-      }}</gl-badge>
+      <gl-badge variant="neutral" class="gl-display-inline-block">{{ assets.count }}</gl-badge>
     </gl-button>
     <gl-collapse v-model="isAssetsExpanded">
       <div class="gl-pl-6 gl-pt-3 js-assets-list">
diff --git a/app/assets/javascripts/repository/components/table/row.vue b/app/assets/javascripts/repository/components/table/row.vue
index d5c60c49591f57..bc6101c134cc4a 100644
--- a/app/assets/javascripts/repository/components/table/row.vue
+++ b/app/assets/javascripts/repository/components/table/row.vue
@@ -232,9 +232,7 @@ export default {
         /><span class="position-relative">{{ fullPath }}</span>
       </component>
       <!-- eslint-disable @gitlab/vue-require-i18n-strings -->
-      <gl-badge v-if="lfsOid" variant="muted" size="sm" class="ml-1" data-testid="label-lfs"
-        >LFS</gl-badge
-      >
+      <gl-badge v-if="lfsOid" variant="muted" class="ml-1" data-testid="label-lfs">LFS</gl-badge>
       <!-- eslint-enable @gitlab/vue-require-i18n-strings -->
       <template v-if="isSubmodule">
         @ <gl-link :href="submoduleTreeUrl" class="commit-sha">{{ shortSha }}</gl-link>
diff --git a/app/assets/javascripts/security_configuration/components/feature_card_badge.vue b/app/assets/javascripts/security_configuration/components/feature_card_badge.vue
index 8d34f26b525c29..262d84176e1817 100644
--- a/app/assets/javascripts/security_configuration/components/feature_card_badge.vue
+++ b/app/assets/javascripts/security_configuration/components/feature_card_badge.vue
@@ -30,7 +30,7 @@ export default {
       :target="() => $refs.badge"
     />
     <span ref="badge">
-      <gl-badge size="sm" class="gl-cursor-pointer" :href="badgeHref" :variant="badge.variant">
+      <gl-badge class="gl-cursor-pointer" :href="badgeHref" :variant="badge.variant">
         {{ badge.text }}
       </gl-badge>
     </span>
diff --git a/app/assets/javascripts/sidebar/components/assignees/sidebar_participant.vue b/app/assets/javascripts/sidebar/components/assignees/sidebar_participant.vue
index da1423535f1f94..7106ab8a3bed70 100644
--- a/app/assets/javascripts/sidebar/components/assignees/sidebar_participant.vue
+++ b/app/assets/javascripts/sidebar/components/assignees/sidebar_participant.vue
@@ -61,7 +61,7 @@ export default {
         :class="{ '!gl-left-6': selected }"
         :size="12"
       />
-      <gl-badge v-if="isBusy" size="sm" variant="warning" class="gl-ml-2">
+      <gl-badge v-if="isBusy" variant="warning" class="gl-ml-2">
         {{ $options.i18n.busy }}
       </gl-badge>
     </template>
diff --git a/app/assets/javascripts/sidebar/components/assignees/user_name_with_status.vue b/app/assets/javascripts/sidebar/components/assignees/user_name_with_status.vue
index 5a5a562cd99fb3..7a9fcd4adcfcc5 100644
--- a/app/assets/javascripts/sidebar/components/assignees/user_name_with_status.vue
+++ b/app/assets/javascripts/sidebar/components/assignees/user_name_with_status.vue
@@ -49,7 +49,7 @@ export default {
         ></template
       >
       <template #badge="{ content }">
-        <gl-badge v-if="isBusy" size="sm" variant="warning" class="gl-ml-2">
+        <gl-badge v-if="isBusy" variant="warning" class="gl-ml-2">
           {{ content }}
         </gl-badge>
       </template>
diff --git a/app/assets/javascripts/super_sidebar/components/help_center.vue b/app/assets/javascripts/super_sidebar/components/help_center.vue
index e9b39f58401390..2d0d7e83cec822 100644
--- a/app/assets/javascripts/super_sidebar/components/help_center.vue
+++ b/app/assets/javascripts/super_sidebar/components/help_center.vue
@@ -240,7 +240,7 @@ export default {
           </span>
           <span>
             <span class="gl-mr-2">{{ item.version }}</span>
-            <gitlab-version-check-badge v-if="updateSeverity" :status="updateSeverity" size="sm" />
+            <gitlab-version-check-badge v-if="updateSeverity" :status="updateSeverity" />
           </span>
         </span>
       </template>
@@ -264,7 +264,7 @@ export default {
           class="gl-display-flex gl-justify-content-space-between gl-align-items-center -gl-my-1"
         >
           {{ item.text }}
-          <gl-badge v-if="item.count" pill size="sm" variant="info">{{ item.count }}</gl-badge>
+          <gl-badge v-if="item.count" pill variant="info">{{ item.count }}</gl-badge>
           <kbd v-else-if="item.shortcut" class="flat">?</kbd>
         </span>
       </template>
diff --git a/app/assets/javascripts/super_sidebar/components/merge_request_menu.vue b/app/assets/javascripts/super_sidebar/components/merge_request_menu.vue
index d24d2651923f7d..50d225916c32dd 100644
--- a/app/assets/javascripts/super_sidebar/components/merge_request_menu.vue
+++ b/app/assets/javascripts/super_sidebar/components/merge_request_menu.vue
@@ -34,7 +34,7 @@ export default {
     <template #list-item="{ item }">
       <span class="gl-display-flex gl-align-items-center gl-justify-content-space-between">
         {{ item.text }}
-        <gl-badge pill size="sm" variant="neutral">{{ getCount(item) }}</gl-badge>
+        <gl-badge pill variant="neutral">{{ getCount(item) }}</gl-badge>
       </span>
     </template>
   </gl-disclosure-dropdown>
diff --git a/app/assets/javascripts/super_sidebar/components/nav_item.vue b/app/assets/javascripts/super_sidebar/components/nav_item.vue
index ea63738146d2dd..2218eec374ac9d 100644
--- a/app/assets/javascripts/super_sidebar/components/nav_item.vue
+++ b/app/assets/javascripts/super_sidebar/components/nav_item.vue
@@ -274,7 +274,6 @@ export default {
       >
         <gl-badge
           v-if="hasPill"
-          size="sm"
           variant="neutral"
           :class="{
             'hide-on-focus-or-hover--target transition-opacity-on-hover--target': isPinnable,
diff --git a/app/assets/javascripts/super_sidebar/components/user_bar.vue b/app/assets/javascripts/super_sidebar/components/user_bar.vue
index f89bbd6ec7e73b..4dd227745aca09 100644
--- a/app/assets/javascripts/super_sidebar/components/user_bar.vue
+++ b/app/assets/javascripts/super_sidebar/components/user_bar.vue
@@ -122,7 +122,6 @@ export default {
           variant="success"
           data-testid="canary-badge-link"
           :href="sidebarData.canary_toggle_com_url"
-          size="sm"
         >
           {{ $options.NEXT_LABEL }}
         </gl-badge>
diff --git a/app/assets/javascripts/super_sidebar/components/user_menu_profile_item.vue b/app/assets/javascripts/super_sidebar/components/user_menu_profile_item.vue
index ee387fa383aca3..7a69b6de8a2b6c 100644
--- a/app/assets/javascripts/super_sidebar/components/user_menu_profile_item.vue
+++ b/app/assets/javascripts/super_sidebar/components/user_menu_profile_item.vue
@@ -53,7 +53,7 @@ export default {
           <span class="gl-font-bold">
             {{ user.name }}
           </span>
-          <gl-badge v-if="user.status.busy" size="sm" variant="warning">
+          <gl-badge v-if="user.status.busy" variant="warning">
             {{ $options.i18n.user.busy }}
           </gl-badge>
         </span>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_migrate_jenkins.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_migrate_jenkins.vue
index 5e8c1d80cfa758..b734f822b4462b 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_migrate_jenkins.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_migrate_jenkins.vue
@@ -52,7 +52,6 @@ export default {
         variant="info"
         :title="$options.i18n.information"
         :href="$options.MIGRATION_LINK"
-        size="md"
         data-testid="ci-icon"
       >
         <span class="ci-icon-gl-icon-wrapper"
diff --git a/app/assets/javascripts/vue_shared/components/badges/beta_badge.stories.js b/app/assets/javascripts/vue_shared/components/badges/beta_badge.stories.js
index 805a32273f4c5e..a2cd10f9d5621f 100644
--- a/app/assets/javascripts/vue_shared/components/badges/beta_badge.stories.js
+++ b/app/assets/javascripts/vue_shared/components/badges/beta_badge.stories.js
@@ -7,7 +7,7 @@ export default {
 
 const template = `
     <div style="height:600px;" class="gl-display-flex gl-justify-content-center gl-align-items-center">
-      <beta-badge :size="size" />
+      <beta-badge />
     </div>
   `;
 
diff --git a/app/assets/javascripts/vue_shared/components/badges/beta_badge.vue b/app/assets/javascripts/vue_shared/components/badges/beta_badge.vue
index 4fdad6128e57ba..f4f9bf9a9e77c1 100644
--- a/app/assets/javascripts/vue_shared/components/badges/beta_badge.vue
+++ b/app/assets/javascripts/vue_shared/components/badges/beta_badge.vue
@@ -19,13 +19,6 @@ export default {
     listItemNearCompletion: s__('BetaBadge|Have a near complete user experience.'),
     listItemTestAgreement: s__('BetaBadge|Are subject to the GitLab Testing Agreement.'),
   },
-  props: {
-    size: {
-      type: String,
-      required: false,
-      default: 'md',
-    },
-  },
   methods: {
     target() {
       /**
@@ -43,7 +36,7 @@ export default {
 </script>
 
 <template>
-  <hover-badge :label="$options.i18n.badgeLabel" :size="size" :title="$options.i18n.popoverTitle">
+  <hover-badge :label="$options.i18n.badgeLabel" :title="$options.i18n.popoverTitle">
     <p>{{ $options.i18n.descriptionParagraph }}</p>
 
     <p class="gl-mb-0">{{ $options.i18n.listIntroduction }}</p>
diff --git a/app/assets/javascripts/vue_shared/components/badges/experiment_badge.stories.js b/app/assets/javascripts/vue_shared/components/badges/experiment_badge.stories.js
index 8e964c9bdf8681..b136ec0b828e5c 100644
--- a/app/assets/javascripts/vue_shared/components/badges/experiment_badge.stories.js
+++ b/app/assets/javascripts/vue_shared/components/badges/experiment_badge.stories.js
@@ -7,7 +7,7 @@ export default {
 
 const template = `
     <div style="height:600px;" class="gl-display-flex gl-justify-content-center gl-align-items-center">
-      <experiment-badge :size="size" />
+      <experiment-badge />
     </div>
   `;
 
diff --git a/app/assets/javascripts/vue_shared/components/badges/experiment_badge.vue b/app/assets/javascripts/vue_shared/components/badges/experiment_badge.vue
index c9b20619e4fe95..6e0d74762d54d8 100644
--- a/app/assets/javascripts/vue_shared/components/badges/experiment_badge.vue
+++ b/app/assets/javascripts/vue_shared/components/badges/experiment_badge.vue
@@ -17,18 +17,11 @@ export default {
     listItemCanBeRemoved: s__('ExperimentBadge|Could be changed or removed at any time.'),
     listItemTestAgreement: s__('ExperimentBadge|Are subject to the GitLab Testing Agreement.'),
   },
-  props: {
-    size: {
-      type: String,
-      required: false,
-      default: 'md',
-    },
-  },
 };
 </script>
 
 <template>
-  <hover-badge :label="$options.i18n.badgeLabel" :size="size" :title="$options.i18n.popoverTitle">
+  <hover-badge :label="$options.i18n.badgeLabel" :title="$options.i18n.popoverTitle">
     <p>{{ $options.i18n.descriptionParagraph }}</p>
 
     <p class="gl-mb-0">{{ $options.i18n.listIntroduction }}</p>
diff --git a/app/assets/javascripts/vue_shared/components/badges/hover_badge.vue b/app/assets/javascripts/vue_shared/components/badges/hover_badge.vue
index 351c7bd9da07f7..c301de5c75001a 100644
--- a/app/assets/javascripts/vue_shared/components/badges/hover_badge.vue
+++ b/app/assets/javascripts/vue_shared/components/badges/hover_badge.vue
@@ -13,11 +13,6 @@ export default {
       type: String,
       required: true,
     },
-    size: {
-      type: String,
-      required: false,
-      default: 'md',
-    },
   },
   methods: {
     target() {
@@ -37,7 +32,7 @@ export default {
 
 <template>
   <div>
-    <gl-badge ref="badge" href="#" :size="size" variant="neutral" class="gl-cursor-pointer">{{
+    <gl-badge ref="badge" href="#" variant="neutral" class="gl-cursor-pointer">{{
       label
     }}</gl-badge>
     <gl-popover
diff --git a/app/assets/javascripts/vue_shared/components/ci_icon/ci_icon.vue b/app/assets/javascripts/vue_shared/components/ci_icon/ci_icon.vue
index 85dc1f0c0d41f7..2e16cb026c835b 100644
--- a/app/assets/javascripts/vue_shared/components/ci_icon/ci_icon.vue
+++ b/app/assets/javascripts/vue_shared/components/ci_icon/ci_icon.vue
@@ -103,7 +103,6 @@ export default {
     :title="title"
     :aria-label="ariaLabel"
     :href="href"
-    size="md"
     data-testid="ci-icon"
     @click="$emit('ciStatusBadgeClick')"
   >
diff --git a/app/assets/javascripts/vue_shared/components/groups_list/groups_list_item.vue b/app/assets/javascripts/vue_shared/components/groups_list/groups_list_item.vue
index ec7e431e275879..f6847bfeb8351e 100644
--- a/app/assets/javascripts/vue_shared/components/groups_list/groups_list_item.vue
+++ b/app/assets/javascripts/vue_shared/components/groups_list/groups_list_item.vue
@@ -167,7 +167,6 @@ export default {
                 <div class="gl-px-2">
                   <gl-badge
                     v-if="shouldShowAccessLevel"
-                    size="sm"
                     class="gl-block"
                     data-testid="access-level-badge"
                     >{{ accessLevelLabel }}</gl-badge
diff --git a/app/assets/javascripts/vue_shared/components/imported_badge.vue b/app/assets/javascripts/vue_shared/components/imported_badge.vue
index 2b415383be41f3..a82e84e78bc636 100644
--- a/app/assets/javascripts/vue_shared/components/imported_badge.vue
+++ b/app/assets/javascripts/vue_shared/components/imported_badge.vue
@@ -28,11 +28,6 @@ export default {
       required: false,
       default: '',
     },
-    size: {
-      type: String,
-      required: false,
-      default: undefined,
-    },
     textOnly: {
       type: Boolean,
       required: false,
@@ -53,7 +48,7 @@ export default {
   <span v-if="textOnly" v-gl-tooltip="title">
     {{ __('Imported') }}
   </span>
-  <gl-badge v-else v-gl-tooltip="title" :size="size">
+  <gl-badge v-else v-gl-tooltip="title">
     {{ __('Imported') }}
   </gl-badge>
 </template>
diff --git a/app/assets/javascripts/vue_shared/components/navigation_tabs.vue b/app/assets/javascripts/vue_shared/components/navigation_tabs.vue
index c83643ca4de95d..72d2368545ca75 100644
--- a/app/assets/javascripts/vue_shared/components/navigation_tabs.vue
+++ b/app/assets/javascripts/vue_shared/components/navigation_tabs.vue
@@ -69,7 +69,7 @@ export default {
     >
       <template #title>
         <span class="gl-mr-2"> {{ tab.name }} </span>
-        <gl-badge v-if="shouldRenderBadge(tab.count)" size="sm" class="gl-tab-counter-badge">{{
+        <gl-badge v-if="shouldRenderBadge(tab.count)" class="gl-tab-counter-badge">{{
           tab.count
         }}</gl-badge>
       </template>
diff --git a/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue b/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue
index 2d70a322ed558a..57d6b8f240b2e0 100644
--- a/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue
+++ b/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue
@@ -284,7 +284,7 @@ export default {
         <gl-tab v-for="tab in statusTabs" :key="tab.status" :data-testid="tab.status">
           <template #title>
             <span>{{ tab.title }}</span>
-            <gl-badge v-if="itemsCount" pill size="sm" class="gl-tab-counter-badge">
+            <gl-badge v-if="itemsCount" pill class="gl-tab-counter-badge">
               {{ itemsCount[tab.status.toLowerCase()] }}
             </gl-badge>
           </template>
diff --git a/app/assets/javascripts/vue_shared/components/projects_list/project_list_item_inactive_badge.vue b/app/assets/javascripts/vue_shared/components/projects_list/project_list_item_inactive_badge.vue
index f41fb665cd07b3..96f18fd83129a9 100644
--- a/app/assets/javascripts/vue_shared/components/projects_list/project_list_item_inactive_badge.vue
+++ b/app/assets/javascripts/vue_shared/components/projects_list/project_list_item_inactive_badge.vue
@@ -32,7 +32,7 @@ export default {
 </script>
 
 <template>
-  <gl-badge v-if="inactiveBadge" :variant="inactiveBadge.variant" size="sm">{{
+  <gl-badge v-if="inactiveBadge" :variant="inactiveBadge.variant">{{
     inactiveBadge.text
   }}</gl-badge>
 </template>
diff --git a/app/assets/javascripts/vue_shared/components/projects_list/projects_list_item.vue b/app/assets/javascripts/vue_shared/components/projects_list/projects_list_item.vue
index 7e1a8e76db0a49..cfea2a728f18b3 100644
--- a/app/assets/javascripts/vue_shared/components/projects_list/projects_list_item.vue
+++ b/app/assets/javascripts/vue_shared/components/projects_list/projects_list_item.vue
@@ -280,7 +280,6 @@ export default {
                 <div class="gl-px-2">
                   <gl-badge
                     v-if="shouldShowAccessLevel"
-                    size="sm"
                     class="gl-block"
                     data-testid="access-level-badge"
                     >{{ accessLevelLabel }}</gl-badge
@@ -310,11 +309,7 @@ export default {
             >
               <span class="gl-p-2 gl-font-sm gl-text-secondary">{{ $options.i18n.topics }}:</span>
               <div v-for="topic in visibleTopics" :key="topic" class="gl-p-2">
-                <gl-badge
-                  v-gl-tooltip="topicTooltipTitle(topic)"
-                  size="sm"
-                  :href="topicPath(topic)"
-                >
+                <gl-badge v-gl-tooltip="topicTooltipTitle(topic)" :href="topicPath(topic)">
                   {{ topicTitle(topic) }}
                 </gl-badge>
               </div>
@@ -336,11 +331,7 @@ export default {
                       :key="topic"
                       class="gl-p-2 gl-display-inline-block"
                     >
-                      <gl-badge
-                        v-gl-tooltip="topicTooltipTitle(topic)"
-                        size="sm"
-                        :href="topicPath(topic)"
-                      >
+                      <gl-badge v-gl-tooltip="topicTooltipTitle(topic)" :href="topicPath(topic)">
                         {{ topicTitle(topic) }}
                       </gl-badge>
                     </div>
diff --git a/app/assets/javascripts/vue_shared/components/user_access_role_badge.vue b/app/assets/javascripts/vue_shared/components/user_access_role_badge.vue
index 5c62233b6b497e..0569e4d61cfdee 100644
--- a/app/assets/javascripts/vue_shared/components/user_access_role_badge.vue
+++ b/app/assets/javascripts/vue_shared/components/user_access_role_badge.vue
@@ -12,18 +12,11 @@ export default {
   components: {
     GlBadge,
   },
-  props: {
-    size: {
-      type: String,
-      required: false,
-      default: 'md',
-    },
-  },
 };
 </script>
 
 <template>
-  <gl-badge :size="size" class="gl-bg-transparent! !gl-shadow-inner-1-gray-100">
+  <gl-badge class="gl-bg-transparent! !gl-shadow-inner-1-gray-100">
     <slot></slot>
   </gl-badge>
 </template>
diff --git a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
index 36167aa9eaeddb..31d6b151649f76 100644
--- a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
+++ b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
@@ -249,7 +249,7 @@ export default {
             data-testid="user-popover-pronouns"
             >({{ user.pronouns }})</span
           >
-          <gl-badge v-if="isBusy" size="sm" variant="warning" class="gl-ml-1">
+          <gl-badge v-if="isBusy" variant="warning" class="gl-ml-1">
             {{ $options.I18N_USER_BUSY }}
           </gl-badge>
         </template>
diff --git a/app/assets/javascripts/vue_shared/components/users_table/user_avatar.vue b/app/assets/javascripts/vue_shared/components/users_table/user_avatar.vue
index 8011b42785c9aa..f16688ca3e9cd8 100644
--- a/app/assets/javascripts/vue_shared/components/users_table/user_avatar.vue
+++ b/app/assets/javascripts/vue_shared/components/users_table/user_avatar.vue
@@ -73,9 +73,7 @@ export default {
           class="gl-p-1"
           :class="{ 'gl-pb-0': glFeatures.simplifiedBadges }"
         >
-          <gl-badge class="gl-display-flex!" size="sm" :variant="badge.variant">{{
-            badge.text
-          }}</gl-badge>
+          <gl-badge class="gl-display-flex!" :variant="badge.variant">{{ badge.text }}</gl-badge>
         </div>
       </template>
     </gl-avatar-labeled>
diff --git a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue
index a3254e96d717bf..231cca5b0c36cb 100644
--- a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue
+++ b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue
@@ -379,7 +379,7 @@ export default {
       <ul v-if="showIssuableMeta" class="controls gl-gap-3">
         <!-- eslint-disable-next-line @gitlab/vue-prefer-dollar-scopedslots -->
         <li v-if="$slots.status" data-testid="issuable-status" class="gl-mr-0!">
-          <gl-badge v-if="isNotOpen" size="sm" :variant="statusBadgeVariant">
+          <gl-badge v-if="isNotOpen" :variant="statusBadgeVariant">
             <slot name="status"></slot>
           </gl-badge>
           <slot v-else name="status"></slot>
diff --git a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_tabs.vue b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_tabs.vue
index ab71842ae13ade..943d3f6ac78d87 100644
--- a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_tabs.vue
+++ b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_tabs.vue
@@ -62,7 +62,6 @@ export default {
           <gl-badge
             v-if="tabCounts && isTabCountNumeric(tab)"
             variant="muted"
-            size="sm"
             class="gl-tab-counter-badge"
           >
             {{ formatNumber(tabCounts[tab.name]) }}
diff --git a/app/assets/javascripts/vue_shared/issuable/show/components/issuable_header.vue b/app/assets/javascripts/vue_shared/issuable/show/components/issuable_header.vue
index 577ef3c2e4b519..1bc662e092fdff 100644
--- a/app/assets/javascripts/vue_shared/issuable/show/components/issuable_header.vue
+++ b/app/assets/javascripts/vue_shared/issuable/show/components/issuable_header.vue
@@ -164,11 +164,8 @@ export default {
 <template>
   <div class="detail-page-header gl-flex-direction-column gl-md-flex-direction-row">
     <div class="detail-page-header-body gl-flex-wrap gl-gap-x-2">
-      <gl-badge :variant="badgeVariant" data-testid="issue-state-badge">
-        <gl-icon v-if="statusIcon" :name="statusIcon" :class="statusIconClass" />
-        <span class="gl-block" :class="{ 'gl-ml-2': statusIcon }">
-          <slot name="status-badge">{{ badgeText }}</slot>
-        </span>
+      <gl-badge :variant="badgeVariant" :icon="statusIcon" data-testid="issue-state-badge">
+        <slot name="status-badge">{{ badgeText }}</slot>
       </gl-badge>
       <confidentiality-badge
         v-if="confidential"
diff --git a/app/assets/javascripts/whats_new/components/feature.vue b/app/assets/javascripts/whats_new/components/feature.vue
index bc275e34880e1d..01c998ec8f4095 100644
--- a/app/assets/javascripts/whats_new/components/feature.vue
+++ b/app/assets/javascripts/whats_new/components/feature.vue
@@ -69,7 +69,6 @@ export default {
       <gl-badge
         v-for="packageName in feature.available_in"
         :key="packageName"
-        size="md"
         variant="tier"
         icon="license"
         class="gl-mr-2"
diff --git a/app/assets/javascripts/work_items/components/design_management/design_preview/design_toolbar.vue b/app/assets/javascripts/work_items/components/design_management/design_preview/design_toolbar.vue
index 438d76af4af8db..8684c930f38053 100644
--- a/app/assets/javascripts/work_items/components/design_management/design_preview/design_toolbar.vue
+++ b/app/assets/javascripts/work_items/components/design_management/design_preview/design_toolbar.vue
@@ -77,7 +77,6 @@ export default {
           <imported-badge
             v-if="design.imported"
             :importable-type="$options.TYPE_DESIGN"
-            size="sm"
             class="gl-ml-2"
           />
         </h2>
diff --git a/app/assets/javascripts/work_items/components/work_item_ancestors/work_item_ancestors.vue b/app/assets/javascripts/work_items/components/work_item_ancestors/work_item_ancestors.vue
index 1b6e3a14734cef..c295dbb5678297 100644
--- a/app/assets/javascripts/work_items/components/work_item_ancestors/work_item_ancestors.vue
+++ b/app/assets/javascripts/work_items/components/work_item_ancestors/work_item_ancestors.vue
@@ -83,7 +83,7 @@ export default {
     <template #default="{ item, itemId }">
       <gl-popover triggers="hover focus" placement="bottom" :target="itemId">
         <template #title>
-          <gl-badge variant="muted" size="sm">{{ $options.i18n.ancestorLabel }}</gl-badge>
+          <gl-badge variant="muted">{{ $options.i18n.ancestorLabel }}</gl-badge>
           <div class="gl-pt-3">
             {{ item.title }}
           </div>
diff --git a/app/assets/javascripts/work_items/components/work_item_state_badge.vue b/app/assets/javascripts/work_items/components/work_item_state_badge.vue
index e4076629b2eb3f..95ee75fb92ea40 100644
--- a/app/assets/javascripts/work_items/components/work_item_state_badge.vue
+++ b/app/assets/javascripts/work_items/components/work_item_state_badge.vue
@@ -34,6 +34,6 @@ export default {
 <template>
   <gl-badge :variant="workItemStateVariant" class="gl-align-middle">
     <gl-icon :name="workItemStateIcon" :size="16" />
-    <span class="gl-hidden sm:gl-block gl-ml-2">{{ stateText }}</span>
+    {{ stateText }}
   </gl-badge>
 </template>
diff --git a/app/assets/javascripts/work_items_hierarchy/components/hierarchy.vue b/app/assets/javascripts/work_items_hierarchy/components/hierarchy.vue
index c7841045556ac4..cd237c95281c2a 100644
--- a/app/assets/javascripts/work_items_hierarchy/components/hierarchy.vue
+++ b/app/assets/javascripts/work_items_hierarchy/components/hierarchy.vue
@@ -62,7 +62,6 @@ export default {
         v-if="!workItem.available"
         variant="info"
         icon="license"
-        size="sm"
         class="gl-ml-3 gl-align-self-center"
         >{{ workItem.license }}</gl-badge
       >
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss
index 3d65d1babdba19..432f36180ad844 100644
--- a/app/assets/stylesheets/framework.scss
+++ b/app/assets/stylesheets/framework.scss
@@ -12,7 +12,6 @@
 @import 'framework/blocks';
 @import 'framework/breadcrumbs';
 @import 'framework/buttons';
-@import 'framework/badges';
 @import 'framework/calendar';
 @import 'framework/callout';
 @import 'framework/common';
diff --git a/app/assets/stylesheets/framework/badges.scss b/app/assets/stylesheets/framework/badges.scss
deleted file mode 100644
index fb2c3f14938b52..00000000000000
--- a/app/assets/stylesheets/framework/badges.scss
+++ /dev/null
@@ -1,78 +0,0 @@
-.badge.badge-pill:not(.gl-badge) {
-  font-weight: $gl-font-weight-normal;
-  background-color: $badge-bg;
-  color: $gray-700;
-  vertical-align: baseline;
-
-  // Do not use this!
-  // This is a temporary workaround until the new GlBadge component
-  // is available: https://gitlab.com/gitlab-org/gitlab-ui/-/issues/481
-  &.badge-pill-success {
-    background-color: rgba($green-500, 0.2);
-    color: $green;
-  }
-}
-
-// FF :simplified_badges
-//
-// Temporarily override badge styles
-// globally
-//
-// Once verified we will update the
-// badge component in GitLab UI
-// refactor GitLab and remove this
-// custom code
-//
-// see https://gitlab.com/gitlab-org/gitlab-ui/-/merge_requests/3307
-.ff-simplified-badges-enabled {
-  // These changes will be moved to
-  // GitLab UI's badge component
-  .gl-badge,
-  .gl-badge.sm,
-  .gl-badge.md,
-  .gl-badge.lg {
-    font-size: $gl-font-size-sm;
-    padding-block: $gl-spacing-scale-1;
-    padding-inline: calc(#{$gl-spacing-scale-3} - 2px);
-
-    > .gl-icon {
-      margin-left: 0;
-
-      // Issuables status adjustments
-      // Adjust left alignment for issuables
-      // status open & closed
-      // We have to rely on the testid
-      // until Gitlab UI MR !3307 is merged
-      &[data-testid="issue-open-m-icon"],
-      &[data-testid="issue-close-icon"] {
-        @apply -gl-ml-2;
-      }
-    }
-  }
-
-  // These changes will be moved to
-  // GitLab UI's button component
-  .gl-button .gl-badge {
-    padding-top: 0;
-    padding-bottom: 0;
-  }
-
-  // These changes will be moved to
-  // app/assets/stylesheets/framework/super_sidebar.scss
-  .super-sidebar-nav-item .gl-badge {
-    vertical-align: 2px;
-  }
-
-  // These changes will be moved to
-  // GitLab UI's tab component
-  .gl-tab-nav-item .gl-badge {
-    margin-block: -2px;
-  }
-
-  // Temporarily needed because of the
-  // speciality this FF adds
-  // the utility class gets overriden
-  .gl-badge.ci-icon {
-    padding: $gl-spacing-scale-2;
-  }
-}
diff --git a/app/assets/stylesheets/page_bundles/issuable.scss b/app/assets/stylesheets/page_bundles/issuable.scss
index 96c5e9d4f19df8..78225eb75f35b0 100644
--- a/app/assets/stylesheets/page_bundles/issuable.scss
+++ b/app/assets/stylesheets/page_bundles/issuable.scss
@@ -108,7 +108,7 @@
 
 .comment-templates-modal {
   padding: 3rem 0.5rem 0;
-  
+
   &.gl-modal .modal-dialog {
     align-items: flex-start;
   }
diff --git a/ee/app/assets/javascripts/admin/subscriptions/show/components/subscription_details_history.vue b/ee/app/assets/javascripts/admin/subscriptions/show/components/subscription_details_history.vue
index f670cf07939669..20b5ad02c1940e 100644
--- a/ee/app/assets/javascripts/admin/subscriptions/show/components/subscription_details_history.vue
+++ b/ee/app/assets/javascripts/admin/subscriptions/show/components/subscription_details_history.vue
@@ -140,7 +140,7 @@ export default {
         </span>
       </template>
       <template #cell(type)="{ value }">
-        <gl-badge size="md" variant="info">{{ value }}</gl-badge>
+        <gl-badge variant="info">{{ value }}</gl-badge>
       </template>
     </gl-table-lite>
   </section>
diff --git a/ee/app/assets/javascripts/analytics/analytics_dashboards/components/list/dashboard_list_item.vue b/ee/app/assets/javascripts/analytics/analytics_dashboards/components/list/dashboard_list_item.vue
index 426f494d7e3f5d..9457bf0ffd8697 100644
--- a/ee/app/assets/javascripts/analytics/analytics_dashboards/components/list/dashboard_list_item.vue
+++ b/ee/app/assets/javascripts/analytics/analytics_dashboards/components/list/dashboard_list_item.vue
@@ -81,19 +81,13 @@ export default {
             :to="dashboard.slug"
             >{{ dashboard.title }}</router-link
           >
-          <gl-badge
-            v-if="showBetaBadge"
-            data-testid="dashboard-beta-badge"
-            class="gl-ml-2"
-            size="sm"
-          >
+          <gl-badge v-if="showBetaBadge" data-testid="dashboard-beta-badge" class="gl-ml-2">
             {{ __('Beta') }}
           </gl-badge>
           <gl-badge
             v-if="showErrorsBadge"
             data-testid="dashboard-errors-badge"
             class="gl-ml-2"
-            size="sm"
             icon="error"
             icon-size="sm"
             variant="danger"
diff --git a/ee/app/assets/javascripts/analytics/code_review_analytics/components/app.vue b/ee/app/assets/javascripts/analytics/code_review_analytics/components/app.vue
index 7fecb3f5524526..74be0e626a7569 100644
--- a/ee/app/assets/javascripts/analytics/code_review_analytics/components/app.vue
+++ b/ee/app/assets/javascripts/analytics/code_review_analytics/components/app.vue
@@ -89,7 +89,7 @@ export default {
         <template v-else>
           <div>
             <span class="gl-font-bold">{{ __('Merge Requests in Review') }}</span>
-            <gl-badge size="sm">{{ totalItems }}</gl-badge>
+            <gl-badge>{{ totalItems }}</gl-badge>
           </div>
           <merge-request-table />
           <gl-pagination
diff --git a/ee/app/assets/javascripts/audit_events/components/stream/stream_item.vue b/ee/app/assets/javascripts/audit_events/components/stream/stream_item.vue
index 0a44907e4d80ce..9e68bfc1865f1b 100644
--- a/ee/app/assets/javascripts/audit_events/components/stream/stream_item.vue
+++ b/ee/app/assets/javascripts/audit_events/components/stream/stream_item.vue
@@ -128,7 +128,6 @@ export default {
           icon="filter"
           variant="neutral"
           data-testid="filter-badge"
-          size="sm"
           class="gl-ml-3 gl-mr-auto"
         >
           {{ $options.i18n.FILTER_BADGE_LABEL }}
diff --git a/ee/app/assets/javascripts/ci/merge_trains/components/merge_train_tabs.vue b/ee/app/assets/javascripts/ci/merge_trains/components/merge_train_tabs.vue
index c27a881ce357a2..8b75b21dbd852d 100644
--- a/ee/app/assets/javascripts/ci/merge_trains/components/merge_train_tabs.vue
+++ b/ee/app/assets/javascripts/ci/merge_trains/components/merge_train_tabs.vue
@@ -34,7 +34,7 @@ export default {
     <gl-tab data-testid="active-cars-tab" @click="$emit('activeTabClicked')">
       <template #title>
         <span class="gl-mr-2">{{ s__('Pipelines|Active') }}</span>
-        <gl-badge size="sm">
+        <gl-badge>
           {{ activeCarCount }}
         </gl-badge>
       </template>
@@ -43,7 +43,7 @@ export default {
     <gl-tab data-testid="merged-cars-tab" @click="$emit('mergedTabClicked')">
       <template #title>
         <span class="gl-mr-2">{{ s__('Pipelines|Merged') }}</span>
-        <gl-badge size="sm">
+        <gl-badge>
           {{ mergedCarCount }}
         </gl-badge>
       </template>
diff --git a/ee/app/assets/javascripts/ci/pipeline_details/tabs/pipeline_tabs.vue b/ee/app/assets/javascripts/ci/pipeline_details/tabs/pipeline_tabs.vue
index f7c639cc237abf..aaa0f1ec09ed10 100644
--- a/ee/app/assets/javascripts/ci/pipeline_details/tabs/pipeline_tabs.vue
+++ b/ee/app/assets/javascripts/ci/pipeline_details/tabs/pipeline_tabs.vue
@@ -118,7 +118,7 @@ export default {
     >
       <template #title>
         <span class="gl-mr-2">{{ $options.i18n.tabs.licensesTitle }}</span>
-        <gl-badge v-if="showLicenseCount" size="sm" data-testid="license-counter">{{
+        <gl-badge v-if="showLicenseCount" data-testid="license-counter">{{
           licenseCount
         }}</gl-badge>
       </template>
@@ -146,7 +146,7 @@ export default {
     >
       <template #title>
         <span class="gl-mr-2">{{ $options.i18n.tabs.codeQualityTitle }}</span>
-        <gl-badge v-if="codeQualityCountFetched" size="sm" data-testid="codequality-counter">{{
+        <gl-badge v-if="codeQualityCountFetched" data-testid="codequality-counter">{{
           codeQualityCount
         }}</gl-badge>
       </template>
diff --git a/ee/app/assets/javascripts/ci/runner/components/runner_upgrade_status_badge.vue b/ee/app/assets/javascripts/ci/runner/components/runner_upgrade_status_badge.vue
index 5c45c5f0f331d3..c0fdf4162d7fc2 100644
--- a/ee/app/assets/javascripts/ci/runner/components/runner_upgrade_status_badge.vue
+++ b/ee/app/assets/javascripts/ci/runner/components/runner_upgrade_status_badge.vue
@@ -27,11 +27,6 @@ export default {
       required: true,
       type: Object,
     },
-    size: {
-      type: String,
-      default: null,
-      required: false,
-    },
   },
   computed: {
     shouldShowUpgradeStatus() {
@@ -71,9 +66,6 @@ export default {
           return null;
       }
     },
-    icon() {
-      return this.size === 'sm' ? null : 'upgrade';
-    },
   },
   RUNNER_UPGRADE_HELP_PATH,
   RUNNER_VERSION_HELP_PATH,
@@ -81,14 +73,7 @@ export default {
 </script>
 <template>
   <div v-if="badge" class="gl-display-inline-flex gl-align-bottom">
-    <gl-badge
-      ref="badgeRef"
-      href="#"
-      :variant="badge.variant"
-      :size="size"
-      :icon="icon"
-      v-bind="$attrs"
-    >
+    <gl-badge ref="badgeRef" href="#" :variant="badge.variant" icon="upgrade" v-bind="$attrs">
       {{ badge.label }}
     </gl-badge>
     <gl-popover triggers="focus" :target="() => $refs.badgeRef.$el" :title="badge.label">
diff --git a/ee/app/assets/javascripts/compliance_dashboard/components/frameworks_report/edit_framework/components/policies_section.vue b/ee/app/assets/javascripts/compliance_dashboard/components/frameworks_report/edit_framework/components/policies_section.vue
index 5bd6aaa3e219ca..6cb6570535c901 100644
--- a/ee/app/assets/javascripts/compliance_dashboard/components/frameworks_report/edit_framework/components/policies_section.vue
+++ b/ee/app/assets/javascripts/compliance_dashboard/components/frameworks_report/edit_framework/components/policies_section.vue
@@ -258,7 +258,7 @@ export default {
       <template #cell(name)="{ item }">
         {{ item.name }}
         <div v-if="!item.enabled">
-          <gl-badge variant="muted" size="sm">
+          <gl-badge variant="muted">
             {{ __('Disabled') }}
           </gl-badge>
         </div>
diff --git a/ee/app/assets/javascripts/compliance_dashboard/components/frameworks_report/framework_info_drawer.vue b/ee/app/assets/javascripts/compliance_dashboard/components/frameworks_report/framework_info_drawer.vue
index 6cdb20df6df5ef..6fe73186431a75 100644
--- a/ee/app/assets/javascripts/compliance_dashboard/components/frameworks_report/framework_info_drawer.vue
+++ b/ee/app/assets/javascripts/compliance_dashboard/components/frameworks_report/framework_info_drawer.vue
@@ -181,11 +181,7 @@ export default {
               class="gl-m-4 gl-display-flex gl-flex-direction-column gl-align-items-flex-start"
             >
               <gl-link :href="getPolicyEditUrl(policy)">{{ policy.name }}</gl-link>
-              <gl-badge
-                v-if="policy.source.namespace.fullPath !== groupPath"
-                variant="muted"
-                size="sm"
-              >
+              <gl-badge v-if="policy.source.namespace.fullPath !== groupPath" variant="muted">
                 {{ policy.source.namespace.name }}
               </gl-badge>
             </div>
diff --git a/ee/app/assets/javascripts/deployments/components/deployment_timeline.vue b/ee/app/assets/javascripts/deployments/components/deployment_timeline.vue
index bb6070d761100f..84a5f265d44416 100644
--- a/ee/app/assets/javascripts/deployments/components/deployment_timeline.vue
+++ b/ee/app/assets/javascripts/deployments/components/deployment_timeline.vue
@@ -115,7 +115,6 @@ export default {
                 v-gl-tooltip
                 :variant="badgeVariant(approval)"
                 :title="badgeTooltip(approval)"
-                size="sm"
               >
                 {{ badgeText(approval) }}
               </gl-badge>
diff --git a/ee/app/assets/javascripts/dora/components/deployment_frequency_charts.vue b/ee/app/assets/javascripts/dora/components/deployment_frequency_charts.vue
index 382050c27d855b..959d0f3561a136 100644
--- a/ee/app/assets/javascripts/dora/components/deployment_frequency_charts.vue
+++ b/ee/app/assets/javascripts/dora/components/deployment_frequency_charts.vue
@@ -386,9 +386,7 @@ export default {
             data-testid="data-forecast-toggle"
             @change="onToggleForecast"
           />
-          <gl-badge size="md" variant="neutral" class="gl-ml-3">{{
-            $options.i18n.badgeTitle
-          }}</gl-badge>
+          <gl-badge variant="neutral" class="gl-ml-3">{{ $options.i18n.badgeTitle }}</gl-badge>
         </div>
       </template>
       <template #alerts>
diff --git a/ee/app/assets/javascripts/geo_sites/components/geo_sites_filters.vue b/ee/app/assets/javascripts/geo_sites/components/geo_sites_filters.vue
index 5ea059aac79b7b..b40a169c9068e4 100644
--- a/ee/app/assets/javascripts/geo_sites/components/geo_sites_filters.vue
+++ b/ee/app/assets/javascripts/geo_sites/components/geo_sites_filters.vue
@@ -77,7 +77,7 @@ export default {
     <gl-tab v-for="tab in tabs" :key="tab.text" :query-param-value="tab.status">
       <template #title>
         <span>{{ tab.text }}</span>
-        <gl-badge size="sm" class="gl-tab-counter-badge">{{ tab.count }}</gl-badge>
+        <gl-badge class="gl-tab-counter-badge">{{ tab.count }}</gl-badge>
       </template>
     </gl-tab>
     <div class="gl-pb-3 gl-border-b-1 gl-border-b-solid gl-border-gray-100">
diff --git a/ee/app/assets/javascripts/iterations/components/iteration_report_issues.vue b/ee/app/assets/javascripts/iterations/components/iteration_report_issues.vue
index db8032fd761889..bb072d0f966a63 100644
--- a/ee/app/assets/javascripts/iterations/components/iteration_report_issues.vue
+++ b/ee/app/assets/javascripts/iterations/components/iteration_report_issues.vue
@@ -258,7 +258,7 @@ export default {
         :title="label.title"
         @close="$emit('removeLabel', label.id)"
       />
-      <gl-badge class="gl-ml-2" size="sm" variant="muted" :aria-label="badgeAriaLabel">
+      <gl-badge class="gl-ml-2" variant="muted" :aria-label="badgeAriaLabel">
         {{ issues.count }}
       </gl-badge>
     </div>
diff --git a/ee/app/assets/javascripts/iterations/components/iteration_report_tabs.vue b/ee/app/assets/javascripts/iterations/components/iteration_report_tabs.vue
index 916d55430b3d3e..5d7688211689b2 100644
--- a/ee/app/assets/javascripts/iterations/components/iteration_report_tabs.vue
+++ b/ee/app/assets/javascripts/iterations/components/iteration_report_tabs.vue
@@ -137,7 +137,7 @@ export default {
     <gl-tab title="Issues">
       <template #title>
         <h3 class="gl-font-base gl-m-0">{{ __('Issues') }}</h3>
-        <gl-badge class="gl-ml-2" size="sm" variant="muted">{{ issueCount }}</gl-badge>
+        <gl-badge class="gl-ml-2" variant="muted">{{ issueCount }}</gl-badge>
       </template>
 
       <div class="card gl-bg-gray-10 gl-display-flex gl-flex-direction-row gl-flex-wrap gl-px-4">
diff --git a/ee/app/assets/javascripts/merge_requests/components/summarize_code_changes.vue b/ee/app/assets/javascripts/merge_requests/components/summarize_code_changes.vue
index 047f5da430b2fc..498724d076f9a6 100644
--- a/ee/app/assets/javascripts/merge_requests/components/summarize_code_changes.vue
+++ b/ee/app/assets/javascripts/merge_requests/components/summarize_code_changes.vue
@@ -96,7 +96,7 @@ export default {
       @click="onClick"
     >
       {{ __('Summarize code changes') }}
-      <gl-badge size="sm" variants="neutral" class="gl-ml-2">{{ __('Beta') }}</gl-badge>
+      <gl-badge variants="neutral" class="gl-ml-2">{{ __('Beta') }}</gl-badge>
     </gl-button>
     <user-callout-dismisser feature-name="summarize_code_changes">
       <template #default="{ dismiss, shouldShowCallout }">
diff --git a/ee/app/assets/javascripts/on_demand_scans/components/tabs/base_tab.vue b/ee/app/assets/javascripts/on_demand_scans/components/tabs/base_tab.vue
index 17785f4b56d8be..5a905c7f85d417 100644
--- a/ee/app/assets/javascripts/on_demand_scans/components/tabs/base_tab.vue
+++ b/ee/app/assets/javascripts/on_demand_scans/components/tabs/base_tab.vue
@@ -223,7 +223,7 @@ export default {
     <template #title>
       <span class="gl-whitespace-nowrap">
         {{ title }}
-        <gl-badge size="sm" class="gl-tab-counter-badge">{{ formattedCount }}</gl-badge>
+        <gl-badge class="gl-tab-counter-badge">{{ formattedCount }}</gl-badge>
       </span>
     </template>
     <template v-if="$apollo.queries.pipelines.loading || hasPipelines">
diff --git a/ee/app/assets/javascripts/pending_members/components/app.vue b/ee/app/assets/javascripts/pending_members/components/app.vue
index 8823c38b37b28b..4f5cde5716f1c1 100644
--- a/ee/app/assets/javascripts/pending_members/components/app.vue
+++ b/ee/app/assets/javascripts/pending_members/components/app.vue
@@ -301,7 +301,7 @@ export default {
               :label="avatarLabel(item)"
             >
               <template #meta>
-                <gl-badge v-if="item.invited && item.approved" size="sm" variant="muted">
+                <gl-badge v-if="item.invited && item.approved" variant="muted">
                   {{ $options.AWAITING_MEMBER_SIGNUP_TEXT }}
                 </gl-badge>
               </template>
diff --git a/ee/app/assets/javascripts/related_items_tree/components/epic_health_status.vue b/ee/app/assets/javascripts/related_items_tree/components/epic_health_status.vue
index 0e5d4e24aad06f..a9da702bd392b5 100644
--- a/ee/app/assets/javascripts/related_items_tree/components/epic_health_status.vue
+++ b/ee/app/assets/javascripts/related_items_tree/components/epic_health_status.vue
@@ -52,17 +52,17 @@ export default {
       </gl-alert>
     </gl-popover>
 
-    <gl-badge :class="$options.badgeClasses" size="sm" variant="success">
+    <gl-badge :class="$options.badgeClasses" variant="success">
       {{ healthStatus.issuesOnTrack }}
       <span class="gl-sr-only">&nbsp;{{ __('issues on track') }}</span>
     </gl-badge>
 
-    <gl-badge :class="$options.badgeClasses" size="sm" variant="warning">
+    <gl-badge :class="$options.badgeClasses" variant="warning">
       {{ healthStatus.issuesNeedingAttention }}
       <span class="gl-sr-only">&nbsp;{{ __('issues need attention') }}</span>
     </gl-badge>
 
-    <gl-badge :class="$options.badgeClasses" size="sm" variant="danger">
+    <gl-badge :class="$options.badgeClasses" variant="danger">
       {{ healthStatus.issuesAtRisk }}
       <span class="gl-sr-only">&nbsp;{{ __('issues at risk') }}</span>
     </gl-badge>
diff --git a/ee/app/assets/javascripts/related_items_tree/components/issue_health_status.vue b/ee/app/assets/javascripts/related_items_tree/components/issue_health_status.vue
index d84bcc25f97ad3..25fa11247f53e3 100644
--- a/ee/app/assets/javascripts/related_items_tree/components/issue_health_status.vue
+++ b/ee/app/assets/javascripts/related_items_tree/components/issue_health_status.vue
@@ -28,13 +28,7 @@ export default {
 </script>
 
 <template>
-  <gl-badge
-    v-gl-tooltip
-    class="gl-font-bold"
-    size="sm"
-    :title="__('Health status')"
-    :variant="statusClass"
-  >
+  <gl-badge v-gl-tooltip class="gl-font-bold" :title="__('Health status')" :variant="statusClass">
     {{ statusText }}
   </gl-badge>
 </template>
diff --git a/ee/app/assets/javascripts/requirements/components/requirements_tabs.vue b/ee/app/assets/javascripts/requirements/components/requirements_tabs.vue
index 61cb2707408a35..aefd52e2e4c30d 100644
--- a/ee/app/assets/javascripts/requirements/components/requirements_tabs.vue
+++ b/ee/app/assets/javascripts/requirements/components/requirements_tabs.vue
@@ -90,7 +90,7 @@ export default {
       >
         <template #title>
           <span>{{ __('Open') }}</span>
-          <gl-badge size="sm" class="gl-tab-counter-badge">{{ requirementsCount.OPENED }}</gl-badge>
+          <gl-badge class="gl-tab-counter-badge">{{ requirementsCount.OPENED }}</gl-badge>
         </template>
       </gl-tab>
       <gl-tab
@@ -102,9 +102,7 @@ export default {
       >
         <template #title>
           <span>{{ __('Archived') }}</span>
-          <gl-badge size="sm" class="gl-tab-counter-badge">{{
-            requirementsCount.ARCHIVED
-          }}</gl-badge>
+          <gl-badge class="gl-tab-counter-badge">{{ requirementsCount.ARCHIVED }}</gl-badge>
         </template>
       </gl-tab>
       <gl-tab
@@ -116,7 +114,7 @@ export default {
       >
         <template #title>
           <span>{{ __('All') }}</span>
-          <gl-badge size="sm" class="gl-tab-counter-badge">{{ requirementsCount.ALL }}</gl-badge>
+          <gl-badge class="gl-tab-counter-badge">{{ requirementsCount.ALL }}</gl-badge>
         </template>
       </gl-tab>
     </gl-tabs>
diff --git a/ee/app/assets/javascripts/security_configuration/dast/components/dast_configuration_header.vue b/ee/app/assets/javascripts/security_configuration/dast/components/dast_configuration_header.vue
index 27de9dbe29cd66..24ad46b3374c0a 100644
--- a/ee/app/assets/javascripts/security_configuration/dast/components/dast_configuration_header.vue
+++ b/ee/app/assets/javascripts/security_configuration/dast/components/dast_configuration_header.vue
@@ -73,7 +73,7 @@ export default {
 
 <template>
   <div class="gl-py-5 gl-border-b gl-border-b-gray-100">
-    <gl-badge :variant="badgeVariant" size="md">{{ badgeText }}</gl-badge>
+    <gl-badge :variant="badgeVariant">{{ badgeText }}</gl-badge>
     <span class="gl-ml-2">
       <span data-testid="dast-header-text">{{ headerText }}</span>
       <gl-link v-if="showPipelineLink" :href="pipelinePath" data-testid="help-page-link">
diff --git a/ee/app/assets/javascripts/security_configuration/dast_pre_scan_verification/components/pre_scan_verification_icon.vue b/ee/app/assets/javascripts/security_configuration/dast_pre_scan_verification/components/pre_scan_verification_icon.vue
index 898d232b58af38..83a0d169046e07 100644
--- a/ee/app/assets/javascripts/security_configuration/dast_pre_scan_verification/components/pre_scan_verification_icon.vue
+++ b/ee/app/assets/javascripts/security_configuration/dast_pre_scan_verification/components/pre_scan_verification_icon.vue
@@ -34,5 +34,5 @@ export default {
 
 <template>
   <gl-loading-icon v-if="isInProgress" :title="status" size="lg" />
-  <gl-badge v-else :variant="iconVariant" size="lg" :icon="statusIcon" />
+  <gl-badge v-else :variant="iconVariant" :icon="statusIcon" />
 </template>
diff --git a/ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_scan_type_badge.vue b/ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_scan_type_badge.vue
index 96b694f697fd26..b4530546dfe58a 100644
--- a/ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_scan_type_badge.vue
+++ b/ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_scan_type_badge.vue
@@ -34,7 +34,7 @@ export default {
 </script>
 
 <template>
-  <gl-badge size="sm" :variant="variant">
+  <gl-badge :variant="variant">
     {{ label }}
   </gl-badge>
 </template>
diff --git a/ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_site_validation_badge.vue b/ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_site_validation_badge.vue
index fcb316a57542f9..5e9314c363e0ce 100644
--- a/ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_site_validation_badge.vue
+++ b/ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_site_validation_badge.vue
@@ -30,7 +30,7 @@ export default {
 </script>
 
 <template>
-  <gl-badge size="sm" :variant="variant">
+  <gl-badge :variant="variant">
     {{ label }}
   </gl-badge>
 </template>
diff --git a/ee/app/assets/javascripts/security_dashboard/components/shared/vulnerability_report/vulnerability_list_status.vue b/ee/app/assets/javascripts/security_dashboard/components/shared/vulnerability_report/vulnerability_list_status.vue
index 92c04be5340d76..64679a32c44e37 100644
--- a/ee/app/assets/javascripts/security_dashboard/components/shared/vulnerability_report/vulnerability_list_status.vue
+++ b/ee/app/assets/javascripts/security_dashboard/components/shared/vulnerability_report/vulnerability_list_status.vue
@@ -34,8 +34,6 @@ export default {
 <template>
   <span class="gl-display-flex gl-flex-wrap gl-gap-2">
     <span class="gl-capitalize" data-testid="state-text">{{ stateText }}</span>
-    <gl-badge v-if="showDismissalReason" size="sm" variant="neutral">{{
-      dismissalReasonText
-    }}</gl-badge>
+    <gl-badge v-if="showDismissalReason" variant="neutral">{{ dismissalReasonText }}</gl-badge>
   </span>
 </template>
diff --git a/ee/app/assets/javascripts/security_dashboard/components/shared/vulnerability_report/vulnerability_report_tab.vue b/ee/app/assets/javascripts/security_dashboard/components/shared/vulnerability_report/vulnerability_report_tab.vue
index 6b30ced45e0418..98e50262ec834d 100644
--- a/ee/app/assets/javascripts/security_dashboard/components/shared/vulnerability_report/vulnerability_report_tab.vue
+++ b/ee/app/assets/javascripts/security_dashboard/components/shared/vulnerability_report/vulnerability_report_tab.vue
@@ -56,7 +56,7 @@ export default {
   <gl-tab>
     <template #title>
       <span>{{ title }}</span>
-      <gl-badge size="sm" class="gl-tab-counter-badge">{{ countsSum }}</gl-badge>
+      <gl-badge class="gl-tab-counter-badge">{{ countsSum }}</gl-badge>
     </template>
 
     <slot name="header"></slot>
diff --git a/ee/app/assets/javascripts/security_orchestration/components/policy_drawer/scan_execution/humanized_actions/tags.vue b/ee/app/assets/javascripts/security_orchestration/components/policy_drawer/scan_execution/humanized_actions/tags.vue
index ed7edc80277ea5..7d664167e6b551 100644
--- a/ee/app/assets/javascripts/security_orchestration/components/policy_drawer/scan_execution/humanized_actions/tags.vue
+++ b/ee/app/assets/javascripts/security_orchestration/components/policy_drawer/scan_execution/humanized_actions/tags.vue
@@ -17,7 +17,7 @@ export default {
 
 <template>
   <div v-if="criteria.tags.length" class="gl-mt-2 gl-display-flex gl-gap-2 gl-flex-wrap">
-    <gl-badge v-for="tag in criteria.tags" :key="tag" variant="info" size="sm">
+    <gl-badge v-for="tag in criteria.tags" :key="tag" variant="info">
       {{ tag }}
     </gl-badge>
   </div>
diff --git a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_filter_selector.vue b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_filter_selector.vue
index a5262929837667..8fdf625ebba243 100644
--- a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_filter_selector.vue
+++ b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_filter_selector.vue
@@ -104,7 +104,6 @@ export default {
               v-if="filterDisabled(item.value)"
               v-gl-tooltip.right.viewport
               class="gl-ml-auto"
-              size="sm"
               variant="neutral"
               :title="filterTooltip(item)"
             >
diff --git a/ee/app/assets/javascripts/tracing/details/tracing_header.vue b/ee/app/assets/javascripts/tracing/details/tracing_header.vue
index 56e647b9797d73..ddc9e8d68417d1 100644
--- a/ee/app/assets/javascripts/tracing/details/tracing_header.vue
+++ b/ee/app/assets/javascripts/tracing/details/tracing_header.vue
@@ -51,7 +51,7 @@ export default {
   <div class="gl-mb-6">
     <h1>
       {{ title }}
-      <gl-badge v-if="incomplete" variant="warning" size="md" class="gl-ml-3 gl-align-middle">{{
+      <gl-badge v-if="incomplete" variant="warning" class="gl-ml-3 gl-align-middle">{{
         $options.i18n.inProgress
       }}</gl-badge>
     </h1>
diff --git a/ee/app/assets/javascripts/tracing/list/tracing_table.vue b/ee/app/assets/javascripts/tracing/list/tracing_table.vue
index 14be9226cb36fd..4b0be615084ef2 100644
--- a/ee/app/assets/javascripts/tracing/list/tracing_table.vue
+++ b/ee/app/assets/javascripts/tracing/list/tracing_table.vue
@@ -110,11 +110,11 @@ export default {
       <template #cell(timestamp)="{ item }">
         {{ item.timestamp }}
         <div class="gl-mt-4 gl-display-flex">
-          <gl-badge variant="info" size="md">{{ matchesBadgeContent(item) }}</gl-badge>
-          <gl-badge v-if="item.in_progress" variant="warning" size="md" class="gl-ml-3">{{
+          <gl-badge variant="info">{{ matchesBadgeContent(item) }}</gl-badge>
+          <gl-badge v-if="item.in_progress" variant="warning" class="gl-ml-3">{{
             $options.i18n.inProgress
           }}</gl-badge>
-          <gl-badge v-if="hasError(item)" variant="danger" size="md" class="gl-ml-2">
+          <gl-badge v-if="hasError(item)" variant="danger" class="gl-ml-2">
             <gl-icon name="status-alert" class="gl-mr-2 gl-text-red-500" />
             {{ errorBadgeContent(item) }}
           </gl-badge>
diff --git a/ee/app/assets/javascripts/usage_quotas/code_suggestions/components/saas_add_on_eligible_user_list.vue b/ee/app/assets/javascripts/usage_quotas/code_suggestions/components/saas_add_on_eligible_user_list.vue
index 96668fd92989da..4940acc6be6b57 100644
--- a/ee/app/assets/javascripts/usage_quotas/code_suggestions/components/saas_add_on_eligible_user_list.vue
+++ b/ee/app/assets/javascripts/usage_quotas/code_suggestions/components/saas_add_on_eligible_user_list.vue
@@ -236,7 +236,7 @@ export default {
             :sub-label="item.usernameWithHandle"
           >
             <template #meta>
-              <gl-badge v-if="userMembershipType(item)" size="sm" variant="muted">
+              <gl-badge v-if="userMembershipType(item)" variant="muted">
                 {{ userMembershipType(item) }}
               </gl-badge>
             </template>
diff --git a/ee/app/assets/javascripts/usage_quotas/seats/components/subscription_seat_details.vue b/ee/app/assets/javascripts/usage_quotas/seats/components/subscription_seat_details.vue
index b6a06c88800ef0..4cfa94490f4a48 100644
--- a/ee/app/assets/javascripts/usage_quotas/seats/components/subscription_seat_details.vue
+++ b/ee/app/assets/javascripts/usage_quotas/seats/components/subscription_seat_details.vue
@@ -62,7 +62,7 @@ export default {
     <template #cell(role)="{ item }">
       <template v-if="item.access_level.custom_role">
         <div>{{ item.access_level.custom_role.name }}</div>
-        <gl-badge size="sm" class="gl-mt-3">{{ s__('MemberRole|Custom role') }}</gl-badge>
+        <gl-badge class="gl-mt-3">{{ s__('MemberRole|Custom role') }}</gl-badge>
       </template>
       <template v-else>{{ item.access_level.string_value }}</template>
     </template>
diff --git a/ee/app/assets/javascripts/usage_quotas/seats/components/subscription_user_list.vue b/ee/app/assets/javascripts/usage_quotas/seats/components/subscription_user_list.vue
index 947a950b3c06f9..b1fca65e7c6c2c 100644
--- a/ee/app/assets/javascripts/usage_quotas/seats/components/subscription_user_list.vue
+++ b/ee/app/assets/javascripts/usage_quotas/seats/components/subscription_user_list.vue
@@ -175,10 +175,10 @@ export default {
               :sub-label="item.user.username"
             >
               <template #meta>
-                <gl-badge v-if="isGroupInvite(item.user)" size="sm" variant="muted">
+                <gl-badge v-if="isGroupInvite(item.user)" variant="muted">
                   {{ s__('Billing|Group invite') }}
                 </gl-badge>
-                <gl-badge v-if="isProjectInvite(item.user)" size="sm" variant="muted">
+                <gl-badge v-if="isProjectInvite(item.user)" variant="muted">
                   {{ s__('Billing|Project invite') }}
                 </gl-badge>
               </template>
diff --git a/ee/app/assets/javascripts/vue_merge_request_widget/components/ai_commit_message.vue b/ee/app/assets/javascripts/vue_merge_request_widget/components/ai_commit_message.vue
index 747a85a029293d..ca0ec8fa90a4fa 100644
--- a/ee/app/assets/javascripts/vue_merge_request_widget/components/ai_commit_message.vue
+++ b/ee/app/assets/javascripts/vue_merge_request_widget/components/ai_commit_message.vue
@@ -126,7 +126,7 @@ export default {
     >
       {{ __('Generate commit message') }}
     </gl-button>
-    <gl-badge class="gl-ml-2" size="sm">
+    <gl-badge class="gl-ml-2">
       {{ __('Experiment') }}
     </gl-badge>
     <gl-modal
@@ -139,7 +139,7 @@ export default {
     >
       <template #modal-title>
         {{ __('Commit message') }}
-        <gl-badge class="gl-ml-2" size="sm">
+        <gl-badge class="gl-ml-2">
           {{ __('Experiment') }}
         </gl-badge>
       </template>
diff --git a/ee/app/assets/javascripts/vue_shared/components/code_owners/code_owners.vue b/ee/app/assets/javascripts/vue_shared/components/code_owners/code_owners.vue
index 7a65fb1b7efcb5..8764e16ce8b944 100644
--- a/ee/app/assets/javascripts/vue_shared/components/code_owners/code_owners.vue
+++ b/ee/app/assets/javascripts/vue_shared/components/code_owners/code_owners.vue
@@ -163,7 +163,7 @@ export default {
       </div>
 
       <template v-if="hasCodeOwners && !isLoading">
-        <gl-badge class="gl-mx-3" size="sm">{{ codeOwnersTotal }}</gl-badge>
+        <gl-badge class="gl-mx-3">{{ codeOwnersTotal }}</gl-badge>
         <gl-button
           variant="link"
           size="small"
diff --git a/ee/app/assets/javascripts/vue_shared/components/groups_list/group_list_item_inactive_badge.vue b/ee/app/assets/javascripts/vue_shared/components/groups_list/group_list_item_inactive_badge.vue
index cc87c2c35aa192..e9600d6dece25d 100644
--- a/ee/app/assets/javascripts/vue_shared/components/groups_list/group_list_item_inactive_badge.vue
+++ b/ee/app/assets/javascripts/vue_shared/components/groups_list/group_list_item_inactive_badge.vue
@@ -35,7 +35,7 @@ export default {
 </script>
 
 <template>
-  <gl-badge v-if="inactiveBadge" :variant="inactiveBadge.variant" size="sm">{{
+  <gl-badge v-if="inactiveBadge" :variant="inactiveBadge.variant">{{
     inactiveBadge.text
   }}</gl-badge>
 </template>
diff --git a/ee/app/assets/javascripts/vue_shared/components/projects_list/project_list_item_inactive_badge.vue b/ee/app/assets/javascripts/vue_shared/components/projects_list/project_list_item_inactive_badge.vue
index 11d5f87d4f2faa..2f0f5c6cfed023 100644
--- a/ee/app/assets/javascripts/vue_shared/components/projects_list/project_list_item_inactive_badge.vue
+++ b/ee/app/assets/javascripts/vue_shared/components/projects_list/project_list_item_inactive_badge.vue
@@ -43,7 +43,7 @@ export default {
 </script>
 
 <template>
-  <gl-badge v-if="inactiveBadge" :variant="inactiveBadge.variant" size="sm">{{
+  <gl-badge v-if="inactiveBadge" :variant="inactiveBadge.variant">{{
     inactiveBadge.text
   }}</gl-badge>
 </template>
diff --git a/ee/app/assets/javascripts/vue_shared/components/tier_badge/tier_badge.vue b/ee/app/assets/javascripts/vue_shared/components/tier_badge/tier_badge.vue
index 354a97522bc019..70e0c207c0e140 100644
--- a/ee/app/assets/javascripts/vue_shared/components/tier_badge/tier_badge.vue
+++ b/ee/app/assets/javascripts/vue_shared/components/tier_badge/tier_badge.vue
@@ -33,7 +33,7 @@ export default {
 </script>
 <template>
   <span class="gl-display-flex gl-align-items-center gl-ml-2" @mouseover="trackHover">
-    <gl-badge :id="$options.popoverTriggerId" data-testid="tier-badge" variant="tier" size="md">
+    <gl-badge :id="$options.popoverTriggerId" data-testid="tier-badge" variant="tier">
       {{ tier }}
     </gl-badge>
     <tier-badge-popover
diff --git a/ee/app/assets/javascripts/vue_shared/security_reports/components/split_button.vue b/ee/app/assets/javascripts/vue_shared/security_reports/components/split_button.vue
index 5c4f78cb7569be..3162d49eb92079 100644
--- a/ee/app/assets/javascripts/vue_shared/security_reports/components/split_button.vue
+++ b/ee/app/assets/javascripts/vue_shared/security_reports/components/split_button.vue
@@ -87,7 +87,7 @@ export default {
       @click="handleClick"
     >
       {{ selectedButton.name }}
-      <gl-badge v-if="selectedButton.badge" class="gl-ml-1" size="sm" variant="info">
+      <gl-badge v-if="selectedButton.badge" class="gl-ml-1" variant="info">
         {{ selectedButton.badge }}
       </gl-badge>
     </gl-button>
@@ -107,7 +107,7 @@ export default {
           </strong>
           <p class="gl-m-0">
             {{ item.tagline }}
-            <gl-badge v-if="item.badge" variant="info" size="sm">{{ item.badge }}</gl-badge>
+            <gl-badge v-if="item.badge" variant="info">{{ item.badge }}</gl-badge>
           </p>
         </div>
       </template>
diff --git a/ee/app/assets/javascripts/vulnerabilities/components/explain_vulnerability/explain_vulnerability_deprecated.vue b/ee/app/assets/javascripts/vulnerabilities/components/explain_vulnerability/explain_vulnerability_deprecated.vue
index a0217bd7e473ec..92ef0b15bae3de 100644
--- a/ee/app/assets/javascripts/vulnerabilities/components/explain_vulnerability/explain_vulnerability_deprecated.vue
+++ b/ee/app/assets/javascripts/vulnerabilities/components/explain_vulnerability/explain_vulnerability_deprecated.vue
@@ -57,7 +57,7 @@ export default {
   <gl-card>
     <div class="gl-mb-3">
       <span class="gl-font-bold">{{ $options.i18n.cardTitle }}</span>
-      <gl-badge variant="neutral" size="sm" class="gl-ml-2" :href="$options.maturityDocHref">
+      <gl-badge variant="neutral" class="gl-ml-2" :href="$options.maturityDocHref">
         {{ $options.i18n.maturityLabel }}
       </gl-badge>
     </div>
diff --git a/ee/app/assets/javascripts/vulnerabilities/components/explain_vulnerability/explain_vulnerability_drawer.vue b/ee/app/assets/javascripts/vulnerabilities/components/explain_vulnerability/explain_vulnerability_drawer.vue
index 974e2221cf22fa..bfc16d90d3d01c 100644
--- a/ee/app/assets/javascripts/vulnerabilities/components/explain_vulnerability/explain_vulnerability_drawer.vue
+++ b/ee/app/assets/javascripts/vulnerabilities/components/explain_vulnerability/explain_vulnerability_drawer.vue
@@ -153,7 +153,7 @@ export default {
         <span class="gl-text-lg gl-font-bold gl-mx-3">
           {{ s__('Vulnerability|Explain this vulnerability') }}
         </span>
-        <gl-badge variant="neutral" size="sm">{{ $options.i18n.maturityLabel }}</gl-badge>
+        <gl-badge variant="neutral">{{ $options.i18n.maturityLabel }}</gl-badge>
       </div>
     </template>
 
diff --git a/ee/app/assets/javascripts/workspaces/agent_mapping/components/agent_mapping.vue b/ee/app/assets/javascripts/workspaces/agent_mapping/components/agent_mapping.vue
index 4c46b585c67885..298863244b0795 100644
--- a/ee/app/assets/javascripts/workspaces/agent_mapping/components/agent_mapping.vue
+++ b/ee/app/assets/javascripts/workspaces/agent_mapping/components/agent_mapping.vue
@@ -79,7 +79,7 @@ export default {
           <gl-tab data-testid="allowed-agents-tab">
             <template #title>
               <span>{{ s__('Workspaces|Allowed agents') }}</span>
-              <gl-badge size="sm" class="gl-tab-counter-badge">{{ allowedAgents.length }}</gl-badge>
+              <gl-badge class="gl-tab-counter-badge">{{ allowedAgents.length }}</gl-badge>
               <span class="sr-only">{{ __('agents') }}</span>
             </template>
             <agents-table
@@ -94,7 +94,7 @@ export default {
           <gl-tab data-testid="all-agents-tab">
             <template #title>
               <span>{{ s__('Workspaces|All agents') }}</span>
-              <gl-badge size="sm" class="gl-tab-counter-badge">{{ agents.length }}</gl-badge>
+              <gl-badge class="gl-tab-counter-badge">{{ agents.length }}</gl-badge>
               <span class="sr-only">{{ __('agents') }}</span>
             </template>
             <agents-table
diff --git a/ee/spec/frontend/analytics/analytics_dashboards/components/list/dashboard_list_item_spec.js b/ee/spec/frontend/analytics/analytics_dashboards/components/list/dashboard_list_item_spec.js
index 80e05c2e70a435..c7a3683dee90f0 100644
--- a/ee/spec/frontend/analytics/analytics_dashboards/components/list/dashboard_list_item_spec.js
+++ b/ee/spec/frontend/analytics/analytics_dashboards/components/list/dashboard_list_item_spec.js
@@ -150,7 +150,6 @@ describe('DashboardsListItem', () => {
 
     it('renders the errors badge', () => {
       expect(findErrorsBadge().props()).toMatchObject({
-        size: 'sm',
         icon: 'error',
         iconSize: 'sm',
         variant: 'danger',
diff --git a/ee/spec/frontend/ci/runner/components/runner_upgrade_status_badge_spec.js b/ee/spec/frontend/ci/runner/components/runner_upgrade_status_badge_spec.js
index fe5ea4227bd987..6cb5b9013c3ead 100644
--- a/ee/spec/frontend/ci/runner/components/runner_upgrade_status_badge_spec.js
+++ b/ee/spec/frontend/ci/runner/components/runner_upgrade_status_badge_spec.js
@@ -129,12 +129,6 @@ describe('RunnerUpgradeStatusBadge', () => {
 
         expect(findBadge().exists()).toBe(false);
       });
-
-      it('Displays no icon when size is "sm"', () => {
-        createComponent({ props: { size: 'sm' } });
-
-        expect(findBadge().props('icon')).toBe(null);
-      });
     },
   );
 });
diff --git a/ee/spec/frontend/environments_dashboard/components/__snapshots__/environment_header_spec.js.snap b/ee/spec/frontend/environments_dashboard/components/__snapshots__/environment_header_spec.js.snap
index 1bb83aa08df27b..75b094f08de82e 100644
--- a/ee/spec/frontend/environments_dashboard/components/__snapshots__/environment_header_spec.js.snap
+++ b/ee/spec/frontend/environments_dashboard/components/__snapshots__/environment_header_spec.js.snap
@@ -124,7 +124,6 @@ exports[`Environment Header with environments grouped into a folder matches the
     <gl-badge-stub
       class="dashboard-card-icon"
       iconsize="md"
-      size="md"
       variant="muted"
     >
       5
diff --git a/ee/spec/frontend/members/components/table/role_details_drawer_spec.js b/ee/spec/frontend/members/components/table/role_details_drawer_spec.js
index e3033eb7ada6c5..1b5ed127212c61 100644
--- a/ee/spec/frontend/members/components/table/role_details_drawer_spec.js
+++ b/ee/spec/frontend/members/components/table/role_details_drawer_spec.js
@@ -108,7 +108,6 @@ describe('Role details drawer', () => {
     });
 
     it('shows the custom role badge', () => {
-      expect(findCustomRoleBadge().props('size')).toBe('sm');
       expect(findCustomRoleBadge().text()).toBe('Custom role');
     });
 
diff --git a/ee/spec/frontend/security_dashboard/components/shared/vulnerability_report/vulnerability_list_status_spec.js b/ee/spec/frontend/security_dashboard/components/shared/vulnerability_report/vulnerability_list_status_spec.js
index 44df623411e7fc..19a168dbb32b17 100644
--- a/ee/spec/frontend/security_dashboard/components/shared/vulnerability_report/vulnerability_list_status_spec.js
+++ b/ee/spec/frontend/security_dashboard/components/shared/vulnerability_report/vulnerability_list_status_spec.js
@@ -52,7 +52,7 @@ describe('Vulnerability list status component', () => {
         const badge = findGlBadge();
 
         expect(badge.isVisible()).toBe(true);
-        expect(badge.props()).toMatchObject({ variant: 'neutral', size: 'sm' });
+        expect(badge.props()).toMatchObject({ variant: 'neutral' });
         expect(badge.text()).toBe('Used in tests');
       });
     });
diff --git a/ee/spec/frontend/security_orchestration/components/policy_drawer/scan_execution/__snapshots__/details_drawer_spec.js.snap b/ee/spec/frontend/security_orchestration/components/policy_drawer/scan_execution/__snapshots__/details_drawer_spec.js.snap
index 33fecf0a2c2f81..1abb28c986a655 100644
--- a/ee/spec/frontend/security_orchestration/components/policy_drawer/scan_execution/__snapshots__/details_drawer_spec.js.snap
+++ b/ee/spec/frontend/security_orchestration/components/policy_drawer/scan_execution/__snapshots__/details_drawer_spec.js.snap
@@ -180,7 +180,7 @@ exports[`DetailsDrawer component policy with tags and CI variables renders the c
             class="gl-display-flex gl-flex-wrap gl-gap-2 gl-mt-2"
           >
             <span
-              class="badge badge-info badge-pill gl-badge sm"
+              class="badge badge-info badge-pill gl-badge"
             >
               default
             </span>
diff --git a/ee/spec/frontend/vue_shared/security_reports/components/split_button_spec.js b/ee/spec/frontend/vue_shared/security_reports/components/split_button_spec.js
index 1fe13dfcd719bd..6938acbf86166d 100644
--- a/ee/spec/frontend/vue_shared/security_reports/components/split_button_spec.js
+++ b/ee/spec/frontend/vue_shared/security_reports/components/split_button_spec.js
@@ -99,7 +99,6 @@ describe('Split Button', () => {
       createComponent({ buttons: [{ ...buttons[0], badge }] }, mountExtended);
 
       expect(findButtonBadge().text()).toBe(badge);
-      expect(findButtonBadge().props('size')).toBe('sm');
     });
 
     it('renders the tooltip', () => {
@@ -147,7 +146,6 @@ describe('Split Button', () => {
       createComponent({ buttons: [{ ...buttons[0], badge }, buttons[1]] }, mountExtended);
 
       expect(findListboxBadge().text()).toBe(badge);
-      expect(findListboxBadge().props('size')).toBe('sm');
     });
   });
 });
diff --git a/ee/spec/frontend/vulnerabilities/__snapshots__/false_positive_badge_spec.js.snap b/ee/spec/frontend/vulnerabilities/__snapshots__/false_positive_badge_spec.js.snap
index df6bcf7ce434cb..febd6a25145d8f 100644
--- a/ee/spec/frontend/vulnerabilities/__snapshots__/false_positive_badge_spec.js.snap
+++ b/ee/spec/frontend/vulnerabilities/__snapshots__/false_positive_badge_spec.js.snap
@@ -7,7 +7,6 @@ exports[`False positive badge component should render the alert badge 1`] = `
   <gl-badge-stub
     icon="false-positive"
     iconsize="md"
-    size="md"
     variant="warning"
   />
   <gl-popover-stub
diff --git a/ee/spec/frontend/vulnerabilities/explain_vulnerability/explain_vulnerability_deprecated_spec.js b/ee/spec/frontend/vulnerabilities/explain_vulnerability/explain_vulnerability_deprecated_spec.js
index ba35272607d181..4b5463485c659b 100644
--- a/ee/spec/frontend/vulnerabilities/explain_vulnerability/explain_vulnerability_deprecated_spec.js
+++ b/ee/spec/frontend/vulnerabilities/explain_vulnerability/explain_vulnerability_deprecated_spec.js
@@ -38,10 +38,7 @@ describe('Explain Vulnerability component (deprecated)', () => {
 
       expect(badge.text()).toBe('Beta');
       expect(badge.attributes('href')).toBe(ExplainVulnerability.maturityDocHref);
-      expect(badge.props()).toMatchObject({
-        variant: 'neutral',
-        size: 'sm',
-      });
+      expect(badge.props()).toMatchObject({ variant: 'neutral' });
     });
 
     it('shows the card body text', () => {
diff --git a/ee/spec/frontend/vulnerabilities/explain_vulnerability/explain_vulnerability_drawer_spec.js b/ee/spec/frontend/vulnerabilities/explain_vulnerability/explain_vulnerability_drawer_spec.js
index 95966a39d5a718..62f88dd36bfba8 100644
--- a/ee/spec/frontend/vulnerabilities/explain_vulnerability/explain_vulnerability_drawer_spec.js
+++ b/ee/spec/frontend/vulnerabilities/explain_vulnerability/explain_vulnerability_drawer_spec.js
@@ -135,10 +135,7 @@ describe('Explain Vulnerability Drawer component', () => {
         const badge = wrapper.findComponent(GlBadge);
 
         expect(badge.text()).toBe('Beta');
-        expect(badge.props()).toMatchObject({
-          variant: 'neutral',
-          size: 'sm',
-        });
+        expect(badge.props()).toMatchObject({ variant: 'neutral' });
       });
 
       it('shows the drawer subtitle', () => {
diff --git a/ee/spec/frontend/workspaces/common/components/workspace_state_indicator_spec.js b/ee/spec/frontend/workspaces/common/components/workspace_state_indicator_spec.js
index 56adac9d441075..c1b46b875f1eb0 100644
--- a/ee/spec/frontend/workspaces/common/components/workspace_state_indicator_spec.js
+++ b/ee/spec/frontend/workspaces/common/components/workspace_state_indicator_spec.js
@@ -38,7 +38,6 @@ describe('WorkspaceStateIndicator', () => {
       expect(badge.props()).toEqual({
         icon: iconName,
         iconSize: 'md',
-        size: 'md',
         variant,
       });
       expect(badge.text()).toBe(label);
diff --git a/spec/frontend/admin/abuse_report/components/report_header_spec.js b/spec/frontend/admin/abuse_report/components/report_header_spec.js
index 6ec380f038736b..10510554647801 100644
--- a/spec/frontend/admin/abuse_report/components/report_header_spec.js
+++ b/spec/frontend/admin/abuse_report/components/report_header_spec.js
@@ -1,4 +1,4 @@
-import { GlBadge, GlIcon, GlAvatar, GlLink, GlButton } from '@gitlab/ui';
+import { GlBadge, GlAvatar, GlLink, GlButton } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import ReportHeader from '~/admin/abuse_report/components/report_header.vue';
 import ReportActions from '~/admin/abuse_report/components/report_actions.vue';
@@ -11,7 +11,6 @@ describe('ReportHeader', () => {
   const { user, report } = mockAbuseReport;
 
   const findBadge = () => wrapper.findComponent(GlBadge);
-  const findIcon = () => wrapper.findComponent(GlIcon);
   const findAvatar = () => wrapper.findComponent(GlAvatar);
   const findLink = () => wrapper.findComponent(GlLink);
   const findButton = () => wrapper.findComponent(GlButton);
@@ -75,7 +74,7 @@ describe('ReportHeader', () => {
     });
 
     it(`has an icon with the ${badgeIcon} name`, () => {
-      expect(findIcon().props('name')).toBe(badgeIcon);
+      expect(findBadge().props('icon')).toBe(badgeIcon);
     });
   });
 
diff --git a/spec/frontend/ci/runner/components/runner_job_status_badge_spec.js b/spec/frontend/ci/runner/components/runner_job_status_badge_spec.js
index 336a6c4538244a..185db9f9350e21 100644
--- a/spec/frontend/ci/runner/components/runner_job_status_badge_spec.js
+++ b/spec/frontend/ci/runner/components/runner_job_status_badge_spec.js
@@ -31,7 +31,7 @@ describe('RunnerTypeBadge', () => {
     ({ jobStatus, classes, text }) => {
       createComponent({ props: { jobStatus } });
 
-      expect(findBadge().props()).toMatchObject({ size: 'md', variant: 'muted' });
+      expect(findBadge().props()).toMatchObject({ variant: 'muted' });
       expect(findBadge().classes().sort()).toEqual(
         [
           ...classes,
diff --git a/spec/frontend/ci/runner/components/runner_managers_badge_spec.js b/spec/frontend/ci/runner/components/runner_managers_badge_spec.js
index 185172ba02bea5..32a1d962473f1f 100644
--- a/spec/frontend/ci/runner/components/runner_managers_badge_spec.js
+++ b/spec/frontend/ci/runner/components/runner_managers_badge_spec.js
@@ -48,10 +48,4 @@ describe('RunnerTypeBadge', () => {
     expect(findBadge().text()).toBe('1,000');
     expect(getTooltip().value).toContain('1,000');
   });
-
-  it('passes arbitrary attributes to badge', () => {
-    createComponent({ props: { count: 2, size: 'sm' } });
-
-    expect(findBadge().props('size')).toBe('sm');
-  });
 });
diff --git a/spec/frontend/ci/runner/components/runner_paused_badge_spec.js b/spec/frontend/ci/runner/components/runner_paused_badge_spec.js
index 54768ea50da720..220f8967d139a7 100644
--- a/spec/frontend/ci/runner/components/runner_paused_badge_spec.js
+++ b/spec/frontend/ci/runner/components/runner_paused_badge_spec.js
@@ -33,10 +33,4 @@ describe('RunnerTypeBadge', () => {
   it('renders tooltip', () => {
     expect(getTooltip().value).toBeDefined();
   });
-
-  it('passes arbitrary attributes to the badge', () => {
-    createComponent({ props: { size: 'sm' } });
-
-    expect(findBadge().props('size')).toBe('sm');
-  });
 });
diff --git a/spec/frontend/ci/runner/components/runner_tag_spec.js b/spec/frontend/ci/runner/components/runner_tag_spec.js
index e3d46e5d6dff24..5f653ec38ccacf 100644
--- a/spec/frontend/ci/runner/components/runner_tag_spec.js
+++ b/spec/frontend/ci/runner/components/runner_tag_spec.js
@@ -45,19 +45,10 @@ describe('RunnerTag', () => {
 
   it('Displays tags with correct style', () => {
     expect(findBadge().props()).toMatchObject({
-      size: 'sm',
       variant: RUNNER_TAG_BADGE_VARIANT,
     });
   });
 
-  it('Displays tags with md size', () => {
-    createComponent({
-      props: { size: 'md' },
-    });
-
-    expect(findBadge().props('size')).toBe('md');
-  });
-
   it.each`
     case                    | scrollWidth | offsetWidth | expectedTooltip
     ${'overflowing'}        | ${110}      | ${100}      | ${mockTag}
diff --git a/spec/frontend/ci/runner/components/runner_tags_spec.js b/spec/frontend/ci/runner/components/runner_tags_spec.js
index bcb1d1f9e132ed..40c5c2fe8a2e76 100644
--- a/spec/frontend/ci/runner/components/runner_tags_spec.js
+++ b/spec/frontend/ci/runner/components/runner_tags_spec.js
@@ -5,7 +5,6 @@ import RunnerTags from '~/ci/runner/components/runner_tags.vue';
 describe('RunnerTags', () => {
   let wrapper;
 
-  const findBadge = () => wrapper.findComponent(GlBadge);
   const findBadgesAt = (i = 0) => wrapper.findAllComponents(GlBadge).at(i);
 
   const createComponent = ({ props = {} } = {}) => {
@@ -28,18 +27,6 @@ describe('RunnerTags', () => {
     expect(findBadgesAt(1).text()).toBe('tag2');
   });
 
-  it('Displays tags with correct style', () => {
-    expect(findBadge().props('size')).toBe('sm');
-  });
-
-  it('Displays tags with md size', () => {
-    createComponent({
-      props: { size: 'md' },
-    });
-
-    expect(findBadge().props('size')).toBe('md');
-  });
-
   it('Is empty when there are no tags', () => {
     createComponent({
       props: { tagList: null },
diff --git a/spec/frontend/clusters/agents/components/agent_integration_status_row_spec.js b/spec/frontend/clusters/agents/components/agent_integration_status_row_spec.js
index ac0ce89f334f8d..94a2fee8c03cbf 100644
--- a/spec/frontend/clusters/agents/components/agent_integration_status_row_spec.js
+++ b/spec/frontend/clusters/agents/components/agent_integration_status_row_spec.js
@@ -84,7 +84,6 @@ describe('IntegrationStatus', () => {
       expect(findBadge().props()).toMatchObject({
         icon: 'license',
         variant: 'tier',
-        size: 'md',
       });
       expect(findBadge().text()).toBe(wrapper.vm.$options.i18n.premiumTitle);
     });
diff --git a/spec/frontend/design_management/components/toolbar/__snapshots__/index_spec.js.snap b/spec/frontend/design_management/components/toolbar/__snapshots__/index_spec.js.snap
index a0156f686386c2..a287314a9b15e7 100644
--- a/spec/frontend/design_management/components/toolbar/__snapshots__/index_spec.js.snap
+++ b/spec/frontend/design_management/components/toolbar/__snapshots__/index_spec.js.snap
@@ -32,7 +32,6 @@ exports[`Design management toolbar component renders design and updated data 1`]
         <imported-badge-stub
           class="gl-ml-2"
           importabletype="design"
-          size="sm"
         />
       </h2>
       <small
diff --git a/spec/frontend/diffs/components/shared/__snapshots__/findings_drawer_spec.js.snap b/spec/frontend/diffs/components/shared/__snapshots__/findings_drawer_spec.js.snap
index b1395f5a0869bc..fbc258c6d0f1a9 100644
--- a/spec/frontend/diffs/components/shared/__snapshots__/findings_drawer_spec.js.snap
+++ b/spec/frontend/diffs/components/shared/__snapshots__/findings_drawer_spec.js.snap
@@ -92,7 +92,7 @@ exports[`FindingsDrawer General Rendering matches the snapshot with detected bad
               Status
             </span>
             <span
-              class="badge badge-pill badge-warning gl-badge md text-capitalize"
+              class="badge badge-pill badge-warning gl-badge text-capitalize"
             >
               detected
             </span>
@@ -312,7 +312,7 @@ exports[`FindingsDrawer General Rendering matches the snapshot with dismissed ba
               Status
             </span>
             <span
-              class="badge badge-pill badge-warning gl-badge md text-capitalize"
+              class="badge badge-pill badge-warning gl-badge text-capitalize"
             >
               detected
             </span>
diff --git a/spec/frontend/issues/show/components/sticky_header_spec.js b/spec/frontend/issues/show/components/sticky_header_spec.js
index 3208dd315fbb5f..e6244e3be107f6 100644
--- a/spec/frontend/issues/show/components/sticky_header_spec.js
+++ b/spec/frontend/issues/show/components/sticky_header_spec.js
@@ -1,4 +1,4 @@
-import { GlIcon, GlLink } from '@gitlab/ui';
+import { GlBadge, GlLink } from '@gitlab/ui';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import HiddenBadge from '~/issuable/components/hidden_badge.vue';
 import LockedBadge from '~/issuable/components/locked_badge.vue';
@@ -49,7 +49,7 @@ describe('StickyHeader component', () => {
     ({ issuableType, issuableStatus, statusIcon }) => {
       createComponent({ issuableType, issuableStatus });
 
-      expect(wrapper.findComponent(GlIcon).props('name')).toBe(statusIcon);
+      expect(wrapper.findComponent(GlBadge).props('icon')).toBe(statusIcon);
     },
   );
 
diff --git a/spec/frontend/members/components/table/members_table_spec.js b/spec/frontend/members/components/table/members_table_spec.js
index 0a052733e80ba7..1800b5c5e0accc 100644
--- a/spec/frontend/members/components/table/members_table_spec.js
+++ b/spec/frontend/members/components/table/members_table_spec.js
@@ -142,7 +142,6 @@ describe('MembersTable', () => {
           member.accessLevel.memberRoleId = 1;
           createMaxRoleComponent(member);
 
-          expect(findCustomRoleBadge().props('size')).toBe('sm');
           expect(findCustomRoleBadge().text()).toBe('Custom role');
         });
 
diff --git a/spec/frontend/merge_request_dashboard/components/__snapshots__/collapsible_section_spec.js.snap b/spec/frontend/merge_request_dashboard/components/__snapshots__/collapsible_section_spec.js.snap
index 66e40e29b76105..a05402c7be7c98 100644
--- a/spec/frontend/merge_request_dashboard/components/__snapshots__/collapsible_section_spec.js.snap
+++ b/spec/frontend/merge_request_dashboard/components/__snapshots__/collapsible_section_spec.js.snap
@@ -23,7 +23,6 @@ exports[`Merge request dashboard collapsible section renders section 1`] = `
     <gl-badge-stub
       class="gl-ml-3"
       iconsize="md"
-      size="sm"
       variant="neutral"
     >
       3
diff --git a/spec/frontend/profile/components/followers_tab_spec.js b/spec/frontend/profile/components/followers_tab_spec.js
index 75586a2c9eaa4e..692f01b296c814 100644
--- a/spec/frontend/profile/components/followers_tab_spec.js
+++ b/spec/frontend/profile/components/followers_tab_spec.js
@@ -64,8 +64,7 @@ describe('FollowersTab', () => {
       expect(wrapper.findComponent(GlTab).text()).toContain(s__('UserProfile|Followers'));
     });
 
-    it('renders `GlBadge`, sets size and content', () => {
-      expect(findGlBadge().props('size')).toBe('sm');
+    it('renders `GlBadge`, sets content', () => {
       expect(findGlBadge().text()).toBe('2');
     });
 
diff --git a/spec/frontend/profile/components/following_tab_spec.js b/spec/frontend/profile/components/following_tab_spec.js
index 48d84187739e48..933805a9107f46 100644
--- a/spec/frontend/profile/components/following_tab_spec.js
+++ b/spec/frontend/profile/components/following_tab_spec.js
@@ -57,8 +57,7 @@ describe('FollowingTab', () => {
       expect(wrapper.findComponent(GlTab).text()).toContain(s__('UserProfile|Following'));
     });
 
-    it('renders `GlBadge`, sets size and content', () => {
-      expect(findGlBadge().props('size')).toBe('sm');
+    it('renders `GlBadge`, sets content', () => {
       expect(findGlBadge().text()).toBe(`${MOCK_FOLLOWEES_COUNT}`);
     });
 
diff --git a/spec/frontend/releases/components/__snapshots__/issuable_stats_spec.js.snap b/spec/frontend/releases/components/__snapshots__/issuable_stats_spec.js.snap
index 8f811d31af8aab..a20e7c00238cdc 100644
--- a/spec/frontend/releases/components/__snapshots__/issuable_stats_spec.js.snap
+++ b/spec/frontend/releases/components/__snapshots__/issuable_stats_spec.js.snap
@@ -9,7 +9,7 @@ exports[`~/releases/components/issuable_stats.vue matches snapshot 1`] = `
   >
     Items
     <span
-      class="badge badge-muted badge-pill gl-badge sm"
+      class="badge badge-muted badge-pill gl-badge"
     >
       10
     </span>
diff --git a/spec/frontend/vue_merge_request_widget/components/widget/__snapshots__/dynamic_content_spec.js.snap b/spec/frontend/vue_merge_request_widget/components/widget/__snapshots__/dynamic_content_spec.js.snap
index 8069241806607b..d99d5d8870fd18 100644
--- a/spec/frontend/vue_merge_request_widget/components/widget/__snapshots__/dynamic_content_spec.js.snap
+++ b/spec/frontend/vue_merge_request_widget/components/widget/__snapshots__/dynamic_content_spec.js.snap
@@ -72,7 +72,6 @@ exports[`~/vue_merge_request_widget/components/widget/dynamic_content.vue render
             </div>
             <gl-badge-stub
               iconsize="md"
-              size="md"
               variant="info"
             >
               Badge is optional. Text to be displayed inside badge
diff --git a/spec/frontend/vue_shared/components/badges/__snapshots__/beta_badge_spec.js.snap b/spec/frontend/vue_shared/components/badges/__snapshots__/beta_badge_spec.js.snap
index a2c4e7c439432e..c601d5dac9290d 100644
--- a/spec/frontend/vue_shared/components/badges/__snapshots__/beta_badge_spec.js.snap
+++ b/spec/frontend/vue_shared/components/badges/__snapshots__/beta_badge_spec.js.snap
@@ -3,7 +3,7 @@
 exports[`Beta badge component renders the badge 1`] = `
 <div>
   <a
-    class="badge badge-neutral badge-pill gl-badge gl-cursor-pointer md"
+    class="badge badge-neutral badge-pill gl-badge gl-cursor-pointer"
     href="#"
     target="_self"
   >
diff --git a/spec/frontend/vue_shared/components/badges/__snapshots__/experiment_badge_spec.js.snap b/spec/frontend/vue_shared/components/badges/__snapshots__/experiment_badge_spec.js.snap
index 42d301149fa33b..bd293777a07885 100644
--- a/spec/frontend/vue_shared/components/badges/__snapshots__/experiment_badge_spec.js.snap
+++ b/spec/frontend/vue_shared/components/badges/__snapshots__/experiment_badge_spec.js.snap
@@ -3,7 +3,7 @@
 exports[`Experiment badge component renders the badge 1`] = `
 <div>
   <a
-    class="badge badge-neutral badge-pill gl-badge gl-cursor-pointer md"
+    class="badge badge-neutral badge-pill gl-badge gl-cursor-pointer"
     href="#"
     target="_self"
   >
diff --git a/spec/frontend/vue_shared/components/badges/beta_badge_spec.js b/spec/frontend/vue_shared/components/badges/beta_badge_spec.js
index d826ca5c7c0cd9..f98c7a0289a4f2 100644
--- a/spec/frontend/vue_shared/components/badges/beta_badge_spec.js
+++ b/spec/frontend/vue_shared/components/badges/beta_badge_spec.js
@@ -1,11 +1,9 @@
 import { mount } from '@vue/test-utils';
-import { GlBadge } from '@gitlab/ui';
 import BetaBadge from '~/vue_shared/components/badges/beta_badge.vue';
 
 describe('Beta badge component', () => {
   let wrapper;
 
-  const findBadge = () => wrapper.findComponent(GlBadge);
   const createWrapper = (props = {}) => {
     wrapper = mount(BetaBadge, {
       propsData: { ...props },
@@ -17,16 +15,4 @@ describe('Beta badge component', () => {
 
     expect(wrapper.element).toMatchSnapshot();
   });
-
-  it('passes default size to badge', () => {
-    createWrapper();
-
-    expect(findBadge().props('size')).toBe('md');
-  });
-
-  it('passes given size to badge', () => {
-    createWrapper({ size: 'sm' });
-
-    expect(findBadge().props('size')).toBe('sm');
-  });
 });
diff --git a/spec/frontend/vue_shared/components/badges/experiment_badge_spec.js b/spec/frontend/vue_shared/components/badges/experiment_badge_spec.js
index 3239578a17318d..060943ca17c030 100644
--- a/spec/frontend/vue_shared/components/badges/experiment_badge_spec.js
+++ b/spec/frontend/vue_shared/components/badges/experiment_badge_spec.js
@@ -1,11 +1,9 @@
 import { mount } from '@vue/test-utils';
-import { GlBadge } from '@gitlab/ui';
 import ExperimentBadge from '~/vue_shared/components/badges/experiment_badge.vue';
 
 describe('Experiment badge component', () => {
   let wrapper;
 
-  const findBadge = () => wrapper.findComponent(GlBadge);
   const createWrapper = (props = {}) => {
     wrapper = mount(ExperimentBadge, {
       propsData: { ...props },
@@ -17,16 +15,4 @@ describe('Experiment badge component', () => {
 
     expect(wrapper.element).toMatchSnapshot();
   });
-
-  it('passes default size to badge', () => {
-    createWrapper();
-
-    expect(findBadge().props('size')).toBe('md');
-  });
-
-  it('passes given size to badge', () => {
-    createWrapper({ size: 'sm' });
-
-    expect(findBadge().props('size')).toBe('sm');
-  });
 });
diff --git a/spec/frontend/vue_shared/components/badges/hover_badge_spec.js b/spec/frontend/vue_shared/components/badges/hover_badge_spec.js
index 68f368215c08e3..aa0a3ebc4f08d5 100644
--- a/spec/frontend/vue_shared/components/badges/hover_badge_spec.js
+++ b/spec/frontend/vue_shared/components/badges/hover_badge_spec.js
@@ -35,16 +35,4 @@ describe('Hover badge component', () => {
 
     expect(findPopover().text()).toContain('This is an awesome content');
   });
-
-  it('passes default size to badge', () => {
-    createWrapper();
-
-    expect(findBadge().props('size')).toBe('md');
-  });
-
-  it('passes given size to badge', () => {
-    createWrapper({ props: { size: 'sm' } });
-
-    expect(findBadge().props('size')).toBe('sm');
-  });
 });
diff --git a/spec/frontend/vue_shared/components/ci_icon/ci_icon_spec.js b/spec/frontend/vue_shared/components/ci_icon/ci_icon_spec.js
index c5215958ccb2da..51d44d2c16f3d5 100644
--- a/spec/frontend/vue_shared/components/ci_icon/ci_icon_spec.js
+++ b/spec/frontend/vue_shared/components/ci_icon/ci_icon_spec.js
@@ -25,7 +25,6 @@ describe('CI Icon component', () => {
   it('should render a span element and an icon', () => {
     createComponent();
 
-    expect(wrapper.attributes('size')).toBe('md');
     expect(findIcon().exists()).toBe(true);
   });
 
diff --git a/spec/frontend/vue_shared/issuable/show/components/issuable_header_spec.js b/spec/frontend/vue_shared/issuable/show/components/issuable_header_spec.js
index 42548e70a68c02..23bf6bbccea707 100644
--- a/spec/frontend/vue_shared/issuable/show/components/issuable_header_spec.js
+++ b/spec/frontend/vue_shared/issuable/show/components/issuable_header_spec.js
@@ -80,7 +80,7 @@ describe('IssuableHeader component', () => {
       it('renders when statusIcon prop exists', () => {
         createComponent({ statusIcon: 'issues' });
 
-        expect(findStatusBadge().findComponent(GlIcon).props('name')).toBe('issues');
+        expect(findStatusBadge().props('icon')).toBe('issues');
       });
 
       it('does not render when statusIcon prop does not exist', () => {
-- 
GitLab