diff --git a/packages/bee-q/src/components/badge/bq-badge.tsx b/packages/bee-q/src/components/badge/bq-badge.tsx
index d1ad15492..c6da4db22 100644
--- a/packages/bee-q/src/components/badge/bq-badge.tsx
+++ b/packages/bee-q/src/components/badge/bq-badge.tsx
@@ -130,7 +130,7 @@ export class BqBadge {
           }}
           part="base"
         >
-          <span ref={(element) => (this.spanElement = element)} class="text-xs font-bold leading-regular" part="number">
+          <span ref={(element) => (this.spanElement = element)} class="text-xs font-bold leading-small" part="number">
             <slot onSlotchange={this.onSlotChange}></slot>
           </span>
         </div>
diff --git a/packages/bee-q/src/components/breadcrumb-item/scss/bq-breadcrumb-item.variables.scss b/packages/bee-q/src/components/breadcrumb-item/scss/bq-breadcrumb-item.variables.scss
index a168b2364..c4cf43762 100644
--- a/packages/bee-q/src/components/breadcrumb-item/scss/bq-breadcrumb-item.variables.scss
+++ b/packages/bee-q/src/components/breadcrumb-item/scss/bq-breadcrumb-item.variables.scss
@@ -24,7 +24,7 @@
 
   --bq-breadcrumb-item--background: theme('colors.transparent');
   --bq-breadcrumb-item--font-size: theme('fontSize.s');
-  --bq-breadcrumb-item--line-height: theme('lineHeight.large');
+  --bq-breadcrumb-item--line-height: theme('lineHeight.regular');
 
   --bq-breadcrumb-item--border-color: theme('colors.transparent');
   --bq-breadcrumb-item--border-style: none;
diff --git a/packages/bee-q/src/components/button/scss/bq-button.scss b/packages/bee-q/src/components/button/scss/bq-button.scss
index 11c58f18a..d09e34c61 100644
--- a/packages/bee-q/src/components/button/scss/bq-button.scss
+++ b/packages/bee-q/src/components/button/scss/bq-button.scss
@@ -7,7 +7,7 @@
 @layer components {
   // Common button base style
   .bq-button {
-    @apply box-border flex cursor-[inherit] items-center justify-center rounded-m border-2 border-solid border-transparent text-m font-medium leading-large;
+    @apply box-border flex cursor-[inherit] items-center justify-center rounded-m border-2 border-solid border-transparent text-m font-medium leading-regular;
     @apply transition-[background-color,border-color,color] duration-300;
     @apply disabled:cursor-not-allowed;
     @apply focus-visible:focus;
diff --git a/packages/bee-q/src/components/checkbox/bq-checkbox.tsx b/packages/bee-q/src/components/checkbox/bq-checkbox.tsx
index 6a30ec2fe..9cd4f9fed 100644
--- a/packages/bee-q/src/components/checkbox/bq-checkbox.tsx
+++ b/packages/bee-q/src/components/checkbox/bq-checkbox.tsx
@@ -246,7 +246,7 @@ export class BqCheckbox {
           </span>
         </div>
         <span
-          class="bq-checkbox__label ml-xs2 text-start font-medium leading-large text-text-primary group-hover-[&:not(.is-disabled)]:text-text-primary-hover group-[.is-disabled]:text-text-primary-disabled"
+          class="bq-checkbox__label ml-xs2 text-start font-medium leading-regular text-text-primary group-hover-[&:not(.is-disabled)]:text-text-primary-hover group-[.is-disabled]:text-text-primary-disabled"
           part="label"
         >
           <slot />
diff --git a/packages/bee-q/src/components/notification/bq-notification.tsx b/packages/bee-q/src/components/notification/bq-notification.tsx
index fbe960883..4bcaaf5aa 100644
--- a/packages/bee-q/src/components/notification/bq-notification.tsx
+++ b/packages/bee-q/src/components/notification/bq-notification.tsx
@@ -247,7 +247,7 @@ export class BqNotification {
           <div class="flex flex-col items-start gap-[var(--bq-notification--content-footer-gap)]" part="main">
             <div class="flex flex-col gap-[var(--bq-notification--title-body-gap)]" part="content">
               {/* TITLE */}
-              <div class="title-font font-semibold leading-large" part="title">
+              <div class="title-font font-semibold leading-regular" part="title">
                 <slot />
               </div>
               {/* BODY */}
diff --git a/packages/bee-q/src/components/radio/scss/bq-radio.scss b/packages/bee-q/src/components/radio/scss/bq-radio.scss
index 6248e7fc6..7f5428914 100644
--- a/packages/bee-q/src/components/radio/scss/bq-radio.scss
+++ b/packages/bee-q/src/components/radio/scss/bq-radio.scss
@@ -75,7 +75,7 @@
 }
 
 .bq-radio__label {
-  @apply font-medium leading-large text-text-primary;
+  @apply font-medium leading-regular text-text-primary;
 }
 
 .bq-radio__circle,
diff --git a/packages/bee-q/src/components/spinner/bq-spinner.tsx b/packages/bee-q/src/components/spinner/bq-spinner.tsx
index e4500ab53..a52931aa1 100644
--- a/packages/bee-q/src/components/spinner/bq-spinner.tsx
+++ b/packages/bee-q/src/components/spinner/bq-spinner.tsx
@@ -198,7 +198,7 @@ export class BqSpinner {
         </span>
         {this.isTextDisplayed && (
           <span
-            class="bq-spinner--text font-medium leading-large text-text-primary"
+            class="bq-spinner--text font-medium leading-regular text-text-primary"
             part="text"
             ref={(spanElem) => (this.slotElem = spanElem)}
           >
diff --git a/packages/bee-q/src/components/status/bq-status.tsx b/packages/bee-q/src/components/status/bq-status.tsx
index 3aa91c63a..0b65a788d 100644
--- a/packages/bee-q/src/components/status/bq-status.tsx
+++ b/packages/bee-q/src/components/status/bq-status.tsx
@@ -71,7 +71,7 @@ export class BqStatus {
       <div class="bq-status inline-flex items-center gap-xs" part="base" role="status">
         <bq-badge class={`bq-status__circle rounded-full ${this.type}`} size="medium" part="circle" role="img" />
         <div
-          class="bq-status__text m-0 max-h-[20px] p-0 text-s font-medium leading-large text-text-primary"
+          class="bq-status__text m-0 max-h-[20px] p-0 text-s font-medium leading-regular text-text-primary"
           part="text"
         >
           <slot />
diff --git a/packages/bee-q/src/components/switch/scss/bq-switch.scss b/packages/bee-q/src/components/switch/scss/bq-switch.scss
index 33ebc13a6..0806e16ac 100644
--- a/packages/bee-q/src/components/switch/scss/bq-switch.scss
+++ b/packages/bee-q/src/components/switch/scss/bq-switch.scss
@@ -63,5 +63,5 @@
 }
 
 .bq-switch--label {
-  @apply text-m font-medium leading-large text-text-primary transition-colors duration-300 group-[.is-disabled]:text-text-primary-disabled;
+  @apply text-m font-medium leading-regular text-text-primary transition-colors duration-300 group-[.is-disabled]:text-text-primary-disabled;
 }
diff --git a/packages/bee-q/src/components/tab/scss/bq-tab-variables.scss b/packages/bee-q/src/components/tab/scss/bq-tab-variables.scss
index e3ded5a9b..864c2baee 100644
--- a/packages/bee-q/src/components/tab/scss/bq-tab-variables.scss
+++ b/packages/bee-q/src/components/tab/scss/bq-tab-variables.scss
@@ -20,7 +20,7 @@
    */
   --bq-tab--font-size: theme('fontSize.m');
   --bq-tab--font-weight: theme('fontWeight.medium');
-  --bq-tab--line-height: theme('lineHeight.large');
+  --bq-tab--line-height: theme('lineHeight.regular');
 
   --bq-tab--label-icon-gap: theme('spacing.xs');
 
diff --git a/packages/bee-q/src/components/tooltip/scss/bq-tooltip.variables.scss b/packages/bee-q/src/components/tooltip/scss/bq-tooltip.variables.scss
index 0bf02e6ed..95d96c12a 100644
--- a/packages/bee-q/src/components/tooltip/scss/bq-tooltip.variables.scss
+++ b/packages/bee-q/src/components/tooltip/scss/bq-tooltip.variables.scss
@@ -7,7 +7,7 @@
   --bq-tooltip--box-shadow: theme('boxShadow.m');
 
   --bq-tooltip--font-size: theme('fontSize.m');
-  --bq-tooltip--line-height: theme('lineHeight.large');
+  --bq-tooltip--line-height: theme('lineHeight.regular');
   --bq-tooltip--text-color: theme('colors.text.inverse');
 
   --bq-tooltip--paddingX: theme('padding.xs');