diff --git a/.agents/skills/qovery-ui/references/spacing-layout.md b/.agents/skills/qovery-ui/references/spacing-layout.md
index c6dcf6481a0..cb8a9448145 100644
--- a/.agents/skills/qovery-ui/references/spacing-layout.md
+++ b/.agents/skills/qovery-ui/references/spacing-layout.md
@@ -93,15 +93,7 @@ Example: a card with `rounded-2xl` (16px) and `p-2` (8px) padding → the inner
 Geometric centering often looks off. Adjust for perceived visual weight.
 
 - **Play triangle in a circle:** nudge right — the triangle's visual center is not its geometric center.
-- **Button with icon + text:** use slightly less padding on the icon side. Rule of thumb: icon-side padding = text-side padding − 2px.
-
-```tsx
-<button className="flex items-center gap-2 pl-4 pr-3.5">
-  <span>Continue</span>
-  <ArrowRightIcon />
-</button>
-```
-
+- **Button with icon + text:** use `<Button>`. Do not add manual icon margins or custom gaps inside buttons.
 - **Asymmetric icons** (stars, arrows, carets): best fixed in the SVG directly. Fallback: `margin-left: 1px` or similar.
 - **Heavy glyph next to a light one:** optical baseline shift.
 
diff --git a/apps/console/src/routes/_authenticated/organization/$organizationId/cluster/$clusterId/settings/general.tsx b/apps/console/src/routes/_authenticated/organization/$organizationId/cluster/$clusterId/settings/general.tsx
index b94f1b051a8..33d25ed6998 100644
--- a/apps/console/src/routes/_authenticated/organization/$organizationId/cluster/$clusterId/settings/general.tsx
+++ b/apps/console/src/routes/_authenticated/organization/$organizationId/cluster/$clusterId/settings/general.tsx
@@ -90,7 +90,7 @@ function ClusterGeneralSettingsForm({ cluster }: { cluster: Cluster }) {
           <SettingsHeading title="General settings" />
           <div className="max-w-content-with-navigation-left">
             {cluster.cloud_provider !== 'ON_PREMISE' && (
-              <Callout.Root color="sky" className="mb-4">
+              <Callout.Root color="sky" className="mb-4 items-start">
                 <Callout.Icon>
                   <Icon iconName="circle-exclamation" iconStyle="regular" />
                 </Callout.Icon>
diff --git a/apps/console/src/routes/_authenticated/organization/$organizationId/clusters.tsx b/apps/console/src/routes/_authenticated/organization/$organizationId/clusters.tsx
index 6687fa6f389..aa914b677a4 100644
--- a/apps/console/src/routes/_authenticated/organization/$organizationId/clusters.tsx
+++ b/apps/console/src/routes/_authenticated/organization/$organizationId/clusters.tsx
@@ -24,7 +24,9 @@ const Clusters = () => {
           to="/organization/$organizationId/cluster/new"
           params={{ organizationId }}
           as="button"
-          className="items-center gap-2"
+          className="items-center"
+          color="neutral"
+          variant="outline"
           size="md"
         >
           <Icon iconName="circle-plus" iconStyle="regular" />
@@ -57,13 +59,7 @@ function RouteComponent() {
         <div className="flex flex-col gap-6">
           <div className="flex justify-between">
             <Heading>Clusters</Heading>
-            <Link
-              to="/organization/$organizationId/cluster/new"
-              params={{ organizationId }}
-              as="button"
-              className="gap-2"
-              size="md"
-            >
+            <Link to="/organization/$organizationId/cluster/new" params={{ organizationId }} as="button" size="md">
               <Icon iconName="circle-plus" iconStyle="regular" />
               Add cluster
             </Link>
diff --git a/apps/console/src/routes/_authenticated/organization/$organizationId/project/$projectId/environment/$environmentId/overview/route.tsx b/apps/console/src/routes/_authenticated/organization/$organizationId/project/$projectId/environment/$environmentId/overview/route.tsx
index c5d0fdf235f..ea8ee3b6953 100644
--- a/apps/console/src/routes/_authenticated/organization/$organizationId/project/$projectId/environment/$environmentId/overview/route.tsx
+++ b/apps/console/src/routes/_authenticated/organization/$organizationId/project/$projectId/environment/$environmentId/overview/route.tsx
@@ -117,7 +117,6 @@ function RouteComponent() {
               <Link
                 as="button"
                 variant="outline"
-                className="gap-2"
                 to="/organization/$organizationId/project/$projectId/environment/$environmentId/service/new"
                 params={{ organizationId, projectId, environmentId }}
               >
diff --git a/apps/console/src/routes/login/index.tsx b/apps/console/src/routes/login/index.tsx
index d7cac8d28a6..55bf2a37bf3 100644
--- a/apps/console/src/routes/login/index.tsx
+++ b/apps/console/src/routes/login/index.tsx
@@ -381,14 +381,14 @@ function RouteComponent() {
                         variant="outline"
                         color="neutral"
                         size="lg"
-                        className="relative w-full justify-center"
+                        className="relative w-full justify-center gap-x-2"
                         onClick={() => onClickAuthLogin(AuthEnum.GOOGLE_SSO)}
                         loading={loading?.provider === AuthEnum.GOOGLE_SSO ? loading.active : false}
                       >
                         <Icon
                           width="16"
                           className={clsx(
-                            'mr-2 text-neutral-subtle',
+                            'text-neutral-subtle',
                             loading?.provider === AuthEnum.GOOGLE_SSO && 'opacity-0'
                           )}
                           name={IconEnum.GOOGLE}
@@ -401,16 +401,13 @@ function RouteComponent() {
                         variant="solid"
                         color="neutral"
                         size="lg"
-                        className="relative w-full justify-center"
+                        className="relative w-full justify-center gap-x-2"
                         onClick={() => onClickAuthLogin(AuthEnum.GITHUB)}
                         loading={loading?.provider === AuthEnum.GITHUB ? loading.active : false}
                       >
                         <Icon
                           width="16"
-                          className={clsx(
-                            'mr-2 text-neutralInvert',
-                            loading?.provider === AuthEnum.GITHUB && 'opacity-0'
-                          )}
+                          className={clsx('text-neutralInvert', loading?.provider === AuthEnum.GITHUB && 'opacity-0')}
                           fill="currentColor"
                           name={IconEnum.GITHUB_WHITE}
                         />
@@ -429,7 +426,7 @@ function RouteComponent() {
                           setAuth0Error(null)
                         }}
                       >
-                        <Icon iconName="lock" className="mr-1.5 text-sm text-neutral-subtle" />
+                        <Icon iconName="lock" className="text-sm text-neutral-subtle" />
                         Continue with SAML SSO
                         <LastUsedBadge visible={lastUsedLoginAtPageLoad === 'saml_sso'} />
                       </Button>
diff --git a/libs/domains/audit-logs/feature/src/lib/audit-logs/audit-logs.tsx b/libs/domains/audit-logs/feature/src/lib/audit-logs/audit-logs.tsx
index c8adf0d54c6..6c50201c72c 100644
--- a/libs/domains/audit-logs/feature/src/lib/audit-logs/audit-logs.tsx
+++ b/libs/domains/audit-logs/feature/src/lib/audit-logs/audit-logs.tsx
@@ -329,7 +329,7 @@ export function AuditLogs({
               <div className="flex h-14 items-center justify-center border-b border-neutral">
                 <p className="flex items-center gap-3 text-sm text-neutral">
                   {auditLogsRetentionInDays} days limit reached.
-                  <Button type="button" variant="outline" className="gap-1.5" onClick={() => showIntercom()}>
+                  <Button type="button" variant="outline" onClick={() => showIntercom()}>
                     <span>Upgrade plan</span>
                     <Icon iconName="arrow-up-right-from-square" className="text-neutral" />
                   </Button>
diff --git a/libs/domains/audit-logs/feature/src/lib/filter-section/filter-section.tsx b/libs/domains/audit-logs/feature/src/lib/filter-section/filter-section.tsx
index 66a49f44208..2c83f038ef6 100644
--- a/libs/domains/audit-logs/feature/src/lib/filter-section/filter-section.tsx
+++ b/libs/domains/audit-logs/feature/src/lib/filter-section/filter-section.tsx
@@ -183,7 +183,7 @@ export function FilterSection({ clearFilter, queryParams, targetTypeSelectedItem
               variant="surface"
               color="neutral"
               size="xs"
-              className="pl-9.5 justify-center gap-1.5 active:scale-[1]"
+              className="pl-9.5 justify-center active:scale-[1]"
               key={badge.key}
             >
               {`${badge.displayedName}: `}
@@ -225,7 +225,7 @@ export function FilterSection({ clearFilter, queryParams, targetTypeSelectedItem
                     variant="surface"
                     color="neutral"
                     size="xs"
-                    className={clsx('justify-center gap-1.5 active:scale-[1]', {
+                    className={clsx('justify-center active:scale-[1]', {
                       'rounded-l-full rounded-r-none border-r-0 pr-4': isFirst && !isLast,
                       'rounded-full': isFirst && isLast,
                       'rounded-l-none rounded-r-full border-l-0 pl-4': isLast && !isFirst,
@@ -269,7 +269,7 @@ export function FilterSection({ clearFilter, queryParams, targetTypeSelectedItem
 
       {/* RIGHT: Button stays fixed at top-right */}
       {badges.filter((b) => b.isDeletable).length > 0 && (
-        <Button className="gap-2" size="xs" color="neutral" variant="surface" onClick={clearFilter}>
+        <Button size="xs" color="neutral" variant="surface" onClick={clearFilter}>
           Clear all filters
           <Icon iconName="xmark" iconStyle="regular" />
         </Button>
diff --git a/libs/domains/cloud-providers/feature/src/lib/cluster-scw-control-plane-feature/cluster-scw-control-plane-feature.tsx b/libs/domains/cloud-providers/feature/src/lib/cluster-scw-control-plane-feature/cluster-scw-control-plane-feature.tsx
index c80474f4d32..59237bbbc30 100644
--- a/libs/domains/cloud-providers/feature/src/lib/cluster-scw-control-plane-feature/cluster-scw-control-plane-feature.tsx
+++ b/libs/domains/cloud-providers/feature/src/lib/cluster-scw-control-plane-feature/cluster-scw-control-plane-feature.tsx
@@ -71,6 +71,7 @@ export function ClusterSCWControlPlaneFeature({ production }: ClusterSCWControlP
               <ExternalLink
                 size="xs"
                 href="https://www.scaleway.com/en/docs/kubernetes/reference-content/kubernetes-control-plane-offers/"
+                className="text-infoInvert"
               >
                 Scaleway documentation
               </ExternalLink>
diff --git a/libs/domains/clusters/feature/src/lib/cluster-access-modal/__snapshots__/cluster-access-modal.spec.tsx.snap b/libs/domains/clusters/feature/src/lib/cluster-access-modal/__snapshots__/cluster-access-modal.spec.tsx.snap
index e8e4946d6b2..2de98ac1947 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-access-modal/__snapshots__/cluster-access-modal.spec.tsx.snap
+++ b/libs/domains/clusters/feature/src/lib/cluster-access-modal/__snapshots__/cluster-access-modal.spec.tsx.snap
@@ -70,7 +70,7 @@ exports[`ClusterAccessModal should match snapshot 1`] = `
               qovery cluster kubeconfig --cluster-id 000
             </div>
             <button
-              class="inline-flex items-center shrink-0 transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 px-2 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral cursor-pointer gap-2 font-sans font-medium"
+              class="inline-flex items-center shrink-0 transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 px-2 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral cursor-pointer font-sans font-medium"
               type="button"
             >
               Copy
@@ -108,7 +108,7 @@ exports[`ClusterAccessModal should match snapshot 1`] = `
               export KUBECONFIG=&lt;path&gt;
             </div>
             <button
-              class="inline-flex items-center shrink-0 transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 px-2 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral cursor-pointer gap-2 font-sans font-medium"
+              class="inline-flex items-center shrink-0 transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 px-2 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral cursor-pointer font-sans font-medium"
               type="button"
             >
               Copy
@@ -141,7 +141,7 @@ exports[`ClusterAccessModal should match snapshot 1`] = `
               kubectl
             </div>
             <button
-              class="inline-flex items-center shrink-0 transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 px-2 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral cursor-pointer gap-2 font-sans font-medium"
+              class="inline-flex items-center shrink-0 transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 px-2 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral cursor-pointer font-sans font-medium"
               type="button"
             >
               Copy
@@ -163,7 +163,7 @@ exports[`ClusterAccessModal should match snapshot 1`] = `
               k9s
             </div>
             <button
-              class="inline-flex items-center shrink-0 transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 px-2 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral cursor-pointer gap-2 font-sans font-medium"
+              class="inline-flex items-center shrink-0 transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 px-2 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral cursor-pointer font-sans font-medium"
               type="button"
             >
               Copy
@@ -251,7 +251,7 @@ exports[`ClusterAccessModal should match snapshot with SELF_MANAGED type 1`] = `
               qovery cluster debug-pod --cluster-id 000
             </div>
             <button
-              class="inline-flex items-center shrink-0 transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 px-2 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral cursor-pointer gap-2 font-sans font-medium"
+              class="inline-flex items-center shrink-0 transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 px-2 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral cursor-pointer font-sans font-medium"
               type="button"
             >
               Copy
@@ -284,7 +284,7 @@ exports[`ClusterAccessModal should match snapshot with SELF_MANAGED type 1`] = `
               kubectl
             </div>
             <button
-              class="inline-flex items-center shrink-0 transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 px-2 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral cursor-pointer gap-2 font-sans font-medium"
+              class="inline-flex items-center shrink-0 transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 px-2 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral cursor-pointer font-sans font-medium"
               type="button"
             >
               Copy
@@ -306,7 +306,7 @@ exports[`ClusterAccessModal should match snapshot with SELF_MANAGED type 1`] = `
               k9s
             </div>
             <button
-              class="inline-flex items-center shrink-0 transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 px-2 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral cursor-pointer gap-2 font-sans font-medium"
+              class="inline-flex items-center shrink-0 transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 px-2 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral cursor-pointer font-sans font-medium"
               type="button"
             >
               Copy
diff --git a/libs/domains/clusters/feature/src/lib/cluster-actions/__snapshots__/cluster-actions.spec.tsx.snap b/libs/domains/clusters/feature/src/lib/cluster-actions/__snapshots__/cluster-actions.spec.tsx.snap
index f70503b6120..c512b522e00 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-actions/__snapshots__/cluster-actions.spec.tsx.snap
+++ b/libs/domains/clusters/feature/src/lib/cluster-actions/__snapshots__/cluster-actions.spec.tsx.snap
@@ -22,13 +22,13 @@ exports[`ClusterActions should match manage deployment snapshot 1`] = `
       aria-expanded="true"
       aria-haspopup="menu"
       aria-label="Manage Deployment"
-      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 justify-center px-0 rounded w-7 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
+      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 gap-x-1 justify-center px-0 rounded w-7 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
       data-state="open"
       id="radix-:r6:"
       type="button"
     >
       <div
-        class="flex h-full w-full items-center justify-center gap-1.5"
+        class="flex h-full w-full items-center justify-center"
         data-state="closed"
       >
         <i
@@ -41,7 +41,7 @@ exports[`ClusterActions should match manage deployment snapshot 1`] = `
       aria-expanded="false"
       aria-haspopup="menu"
       aria-label="Other actions"
-      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 justify-center px-0 rounded w-7 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
+      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 gap-x-1 justify-center px-0 rounded w-7 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
       data-state="closed"
       id="radix-:r9:"
       type="button"
@@ -137,13 +137,13 @@ exports[`ClusterActions should match other actions snapshot 1`] = `
       aria-expanded="false"
       aria-haspopup="menu"
       aria-label="Manage Deployment"
-      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 justify-center px-0 rounded w-7 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
+      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 gap-x-1 justify-center px-0 rounded w-7 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
       data-state="closed"
       id="radix-:rk:"
       type="button"
     >
       <div
-        class="flex h-full w-full items-center justify-center gap-1.5"
+        class="flex h-full w-full items-center justify-center"
         data-state="closed"
       >
         <i
@@ -157,7 +157,7 @@ exports[`ClusterActions should match other actions snapshot 1`] = `
       aria-expanded="true"
       aria-haspopup="menu"
       aria-label="Other actions"
-      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 justify-center px-0 rounded w-7 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
+      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 gap-x-1 justify-center px-0 rounded w-7 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
       data-state="open"
       id="radix-:rn:"
       type="button"
@@ -297,13 +297,13 @@ exports[`ClusterActions should match outdated snapshot 1`] = `
       aria-expanded="false"
       aria-haspopup="menu"
       aria-label="Manage Deployment"
-      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-warning-strong text-xs h-7 justify-center px-0 rounded w-7 border border-warning-subtle text-warning hover:border-warning-component hover:bg-surface-warning-subtle data-[state=open]:bg-surface-warning-subtle"
+      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-warning-strong text-ssm h-7 gap-x-1 justify-center px-0 rounded w-7 border border-warning-subtle text-warning hover:border-warning-component hover:bg-surface-warning-subtle data-[state=open]:bg-surface-warning-subtle"
       data-state="closed"
       id="radix-:r15:"
       type="button"
     >
       <div
-        class="flex h-full w-full items-center justify-center gap-1.5"
+        class="flex h-full w-full items-center justify-center"
         data-state="closed"
       >
         <i
@@ -317,7 +317,7 @@ exports[`ClusterActions should match outdated snapshot 1`] = `
       aria-expanded="true"
       aria-haspopup="menu"
       aria-label="Other actions"
-      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 justify-center px-0 rounded w-7 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
+      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 gap-x-1 justify-center px-0 rounded w-7 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
       data-state="open"
       id="radix-:r18:"
       type="button"
diff --git a/libs/domains/clusters/feature/src/lib/cluster-actions/cluster-actions.tsx b/libs/domains/clusters/feature/src/lib/cluster-actions/cluster-actions.tsx
index 27b82cf25d3..4298b5a979a 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-actions/cluster-actions.tsx
+++ b/libs/domains/clusters/feature/src/lib/cluster-actions/cluster-actions.tsx
@@ -241,7 +241,7 @@ function MenuManageDeployment({
           iconOnly={!hasTextActionButton}
         >
           <Tooltip content="Manage Deployment">
-            <div className="flex h-full w-full items-center justify-center gap-1.5">
+            <div className="flex h-full w-full items-center justify-center">
               <Icon iconName="rocket" />
               {hasTextActionButton && (
                 <>
diff --git a/libs/domains/clusters/feature/src/lib/cluster-card-feature/cluster-card-feature.tsx b/libs/domains/clusters/feature/src/lib/cluster-card-feature/cluster-card-feature.tsx
index ef15aa9e0bf..d85792b9635 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-card-feature/cluster-card-feature.tsx
+++ b/libs/domains/clusters/feature/src/lib/cluster-card-feature/cluster-card-feature.tsx
@@ -86,7 +86,7 @@ export function ClusterCardFeature({
                 <ExternalLink
                   as="button"
                   href={feature.cloud_provider_feature_documentation ?? undefined}
-                  className="gap-1 px-1.5 text-neutralInvert"
+                  className="px-1.5 text-neutralInvert"
                   color="neutral"
                   variant="surface"
                   size="xs"
diff --git a/libs/domains/clusters/feature/src/lib/cluster-card/__snapshots__/cluster-card.spec.tsx.snap b/libs/domains/clusters/feature/src/lib/cluster-card/__snapshots__/cluster-card.spec.tsx.snap
index 48760e60c24..a732bcece59 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-card/__snapshots__/cluster-card.spec.tsx.snap
+++ b/libs/domains/clusters/feature/src/lib/cluster-card/__snapshots__/cluster-card.spec.tsx.snap
@@ -141,13 +141,13 @@ exports[`ClusterCard should match snapshot 1`] = `
               aria-expanded="false"
               aria-haspopup="menu"
               aria-label="Manage Deployment"
-              class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-warning-strong text-sm h-8 justify-center px-0 rounded-md w-8 border border-warning-subtle text-warning hover:border-warning-component hover:bg-surface-warning-subtle data-[state=open]:bg-surface-warning-subtle"
+              class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-warning-strong text-sm h-8 gap-x-1.5 justify-center px-0 rounded-md w-8 border border-warning-subtle text-warning hover:border-warning-component hover:bg-surface-warning-subtle data-[state=open]:bg-surface-warning-subtle"
               data-state="closed"
               id="radix-:rn:"
               type="button"
             >
               <div
-                class="flex h-full w-full items-center justify-center gap-1.5"
+                class="flex h-full w-full items-center justify-center"
                 data-state="closed"
               >
                 <i
@@ -158,7 +158,7 @@ exports[`ClusterCard should match snapshot 1`] = `
             </button>
             <button
               aria-label="Logs"
-              class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 justify-center px-0 rounded-md w-8 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
+              class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 gap-x-1.5 justify-center px-0 rounded-md w-8 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
               data-state="closed"
             >
               <i
@@ -170,7 +170,7 @@ exports[`ClusterCard should match snapshot 1`] = `
               aria-expanded="false"
               aria-haspopup="menu"
               aria-label="Other actions"
-              class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 justify-center px-0 rounded-md w-8 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
+              class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 gap-x-1.5 justify-center px-0 rounded-md w-8 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
               data-state="closed"
               id="radix-:rr:"
               type="button"
diff --git a/libs/domains/clusters/feature/src/lib/cluster-creation-flow/cluster-new/cluster-new.tsx b/libs/domains/clusters/feature/src/lib/cluster-creation-flow/cluster-new/cluster-new.tsx
index 53fe342a077..c43fcd5e48b 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-creation-flow/cluster-new/cluster-new.tsx
+++ b/libs/domains/clusters/feature/src/lib/cluster-creation-flow/cluster-new/cluster-new.tsx
@@ -658,7 +658,7 @@ export function ClusterNew() {
                     params={{ organizationId }}
                   >
                     Add credit card
-                    <Icon iconName="arrow-right" className="ml-1" iconStyle="regular" />
+                    <Icon iconName="arrow-right" iconStyle="regular" />
                   </ButtonLink>
                 </Callout.TextDescription>
               </Callout.Text>
diff --git a/libs/domains/clusters/feature/src/lib/cluster-creation-flow/step-features/button-popover-subnets/button-popover-subnets.tsx b/libs/domains/clusters/feature/src/lib/cluster-creation-flow/step-features/button-popover-subnets/button-popover-subnets.tsx
index 191196315f5..64828ea8517 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-creation-flow/step-features/button-popover-subnets/button-popover-subnets.tsx
+++ b/libs/domains/clusters/feature/src/lib/cluster-creation-flow/step-features/button-popover-subnets/button-popover-subnets.tsx
@@ -132,7 +132,7 @@ export function SubnetsForm({ control, name, title, callout, required = false }:
         onClick={() => append({ A: '', B: '', C: '' })}
       >
         Add subnets
-        <Icon iconName="plus" className="ml-2 text-base" />
+        <Icon iconName="plus" />
       </Button>
     </div>
   )
diff --git a/libs/domains/clusters/feature/src/lib/cluster-creation-flow/step-summary/step-summary-presentation.tsx b/libs/domains/clusters/feature/src/lib/cluster-creation-flow/step-summary/step-summary-presentation.tsx
index 01b4172759e..0505a3238ab 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-creation-flow/step-summary/step-summary-presentation.tsx
+++ b/libs/domains/clusters/feature/src/lib/cluster-creation-flow/step-summary/step-summary-presentation.tsx
@@ -92,7 +92,7 @@ export function StepSummaryPresentation(props: StepSummaryPresentationProps) {
 
       <div className="mb-10">
         {props.generalData.installation_type === 'MANAGED' && (
-          <Callout.Root color="sky" className="mb-5">
+          <Callout.Root color="sky" className="mb-5 items-start">
             <Callout.Icon>
               <Icon iconName="circle-exclamation" iconStyle="regular" />
             </Callout.Icon>
@@ -111,7 +111,7 @@ export function StepSummaryPresentation(props: StepSummaryPresentationProps) {
           </Callout.Root>
         )}
         {props.generalData.cloud_provider === 'GCP' && (
-          <Callout.Root color="yellow" className="mb-2">
+          <Callout.Root color="yellow" className="mb-2 items-start">
             <Callout.Icon>
               <Icon iconName="triangle-exclamation" iconStyle="regular" />
             </Callout.Icon>
diff --git a/libs/domains/clusters/feature/src/lib/cluster-delete-modal/__snapshots__/cluster-delete-modal.spec.tsx.snap b/libs/domains/clusters/feature/src/lib/cluster-delete-modal/__snapshots__/cluster-delete-modal.spec.tsx.snap
index ef1c7c42134..e1c5370d698 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-delete-modal/__snapshots__/cluster-delete-modal.spec.tsx.snap
+++ b/libs/domains/clusters/feature/src/lib/cluster-delete-modal/__snapshots__/cluster-delete-modal.spec.tsx.snap
@@ -144,7 +144,7 @@ exports[`ClusterDeleteModal should match snapshot 1`] = `
             </div>
           </div>
           <div
-            class="flex flex-row gap-x-4 p-4 border rounded-md text-sm items-center border-info-component bg-surface-info-subtle text-info mb-3"
+            class="flex flex-row gap-x-3 p-4 border rounded-md text-sm items-center border-info-component bg-surface-info-subtle text-info mb-3"
             data-accent-color="sky"
           >
             <div
@@ -156,7 +156,7 @@ exports[`ClusterDeleteModal should match snapshot 1`] = `
               />
             </div>
             <div
-              class="-order-1 mr-auto gap-x-4 text-neutral"
+              class="-order-1 mr-auto gap-x-3 text-neutral"
             >
               Before deleting, Qovery reconciles the cluster state. Missing managed resources can be recreated temporarily so the deletion workflow can clean everything up and avoid orphan cloud resources.
             </div>
@@ -234,7 +234,7 @@ exports[`ClusterDeleteModal should match snapshot 1`] = `
             </div>
           </div>
           <div
-            class="flex flex-row gap-x-4 p-4 border rounded-md text-sm items-center border-warning-component bg-surface-warning-subtle text-warning mt-3"
+            class="flex flex-row gap-x-3 p-4 border rounded-md text-sm items-center border-warning-component bg-surface-warning-subtle text-warning mt-3"
             data-accent-color="yellow"
           >
             <div
@@ -246,7 +246,7 @@ exports[`ClusterDeleteModal should match snapshot 1`] = `
               />
             </div>
             <div
-              class="-order-1 mr-auto gap-x-4 text-neutral"
+              class="-order-1 mr-auto gap-x-3 text-neutral"
             >
               <p>
                 Please note that you will have to manually delete on your cloud account:
@@ -271,13 +271,13 @@ exports[`ClusterDeleteModal should match snapshot 1`] = `
           class="flex justify-end gap-3"
         >
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
             type="button"
           >
             Cancel
           </button>
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-negative-strong text-sm h-10 px-3 rounded-lg bg-surface-negative-solid hover:bg-surface-negative-solidHover border border-negative-component text-neutral-contrasted"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-negative-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-negative-solid hover:bg-surface-negative-solidHover border border-negative-component text-neutral-contrasted"
             disabled=""
             type="submit"
           >
diff --git a/libs/domains/clusters/feature/src/lib/cluster-installation-guide-modal/cluster-installation-guide-modal.tsx b/libs/domains/clusters/feature/src/lib/cluster-installation-guide-modal/cluster-installation-guide-modal.tsx
index 2a4850a12cf..2a2f6e64864 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-installation-guide-modal/cluster-installation-guide-modal.tsx
+++ b/libs/domains/clusters/feature/src/lib/cluster-installation-guide-modal/cluster-installation-guide-modal.tsx
@@ -65,7 +65,6 @@ export function ClusterInstallationGuideModal({ type, onClose, ...props }: Clust
                   color="brand"
                   onClick={downloadInstallationValues}
                   loading={isLoading}
-                  className="gap-1"
                 >
                   Download configuration
                   <Icon iconName="download" />
diff --git a/libs/domains/clusters/feature/src/lib/cluster-logs/cluster-logs-list/cluster-logs-list.tsx b/libs/domains/clusters/feature/src/lib/cluster-logs/cluster-logs-list/cluster-logs-list.tsx
index c0d7f7dd23f..f1469890fec 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-logs/cluster-logs-list/cluster-logs-list.tsx
+++ b/libs/domains/clusters/feature/src/lib/cluster-logs/cluster-logs-list/cluster-logs-list.tsx
@@ -93,7 +93,7 @@ export function ClusterLogsList({ logs, firstDate, refScrollSection }: ClusterLo
       </div>
       {isScrolledUp && (
         <Button
-          className="absolute bottom-[7px] left-1/2 flex w-72 -translate-x-1/2 items-center justify-center gap-2 text-sm"
+          className="absolute bottom-[7px] left-1/2 flex w-72 -translate-x-1/2 items-center justify-center text-sm"
           variant="solid"
           radius="full"
           size="md"
diff --git a/libs/domains/clusters/feature/src/lib/cluster-migration-modal/__snapshots__/cluster-migration-modal.spec.tsx.snap b/libs/domains/clusters/feature/src/lib/cluster-migration-modal/__snapshots__/cluster-migration-modal.spec.tsx.snap
index e53f606dd74..e3a5ad72763 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-migration-modal/__snapshots__/cluster-migration-modal.spec.tsx.snap
+++ b/libs/domains/clusters/feature/src/lib/cluster-migration-modal/__snapshots__/cluster-migration-modal.spec.tsx.snap
@@ -182,14 +182,14 @@ exports[`ClusterMigrationModal should match snapshot 1`] = `
           class="mt-6 flex justify-end gap-3"
         >
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
             data-testid="cancel-button"
             type="button"
           >
             Cancel
           </button>
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
             data-testid="submit-button"
             disabled=""
             type="submit"
diff --git a/libs/domains/clusters/feature/src/lib/cluster-network-settings/cluster-network-settings.tsx b/libs/domains/clusters/feature/src/lib/cluster-network-settings/cluster-network-settings.tsx
index e06c22651dc..0c5587cd39d 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-network-settings/cluster-network-settings.tsx
+++ b/libs/domains/clusters/feature/src/lib/cluster-network-settings/cluster-network-settings.tsx
@@ -53,7 +53,7 @@ function Subnets({ title, value }: { title: string; value?: string[] | null }) {
 
 function AWSExistingVPC({ feature }: { feature: ClusterFeatureAwsExistingVpc }) {
   return (
-    <div className="mb-5 flex flex-col justify-between rounded border border-neutral bg-surface-neutral-component p-4">
+    <div className="mb-5 flex flex-col justify-between rounded border border-neutral bg-surface-neutral-subtle p-4">
       <h4 className="mb-1 text-sm font-medium text-neutral">Deploy on an existing VPC</h4>
       <p className="mb-4 text-sm text-neutral-subtle">In your VPC settings, you have to enable DNS hostnames.</p>
       <InputText name="vpc_id" label="VPC ID" value={feature.aws_vpc_eks_id} className="mb-4" disabled />
@@ -130,7 +130,7 @@ function AWSExistingVPC({ feature }: { feature: ClusterFeatureAwsExistingVpc })
 
 function GcpExistingVPC({ feature }: { feature: ClusterFeatureGcpExistingVpc }) {
   return (
-    <div className="flex flex-col justify-between gap-4 rounded border border-neutral bg-surface-neutral-component p-4">
+    <div className="flex flex-col justify-between gap-4 rounded border border-neutral bg-surface-neutral-subtle p-4">
       <div>
         <h4 className="mb-1 text-sm font-medium text-neutral">Deploy on an existing VPC</h4>
         <ExternalLink
@@ -557,7 +557,7 @@ export function ClusterNetworkSettings({ organizationId, clusterId }: ClusterNet
                       type="button"
                     >
                       Add route
-                      <Icon iconName="circle-plus" iconStyle="regular" className="ml-1" />
+                      <Icon iconName="circle-plus" iconStyle="regular" />
                     </Button>
                   </div>
                 </BlockContent>
diff --git a/libs/domains/clusters/feature/src/lib/cluster-resources-settings/cluster-resources-settings.tsx b/libs/domains/clusters/feature/src/lib/cluster-resources-settings/cluster-resources-settings.tsx
index 7673368b5d6..c9f92a4ad0d 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-resources-settings/cluster-resources-settings.tsx
+++ b/libs/domains/clusters/feature/src/lib/cluster-resources-settings/cluster-resources-settings.tsx
@@ -304,9 +304,8 @@ export function ClusterResourcesSettings(props: ClusterResourcesSettingsProps) {
                               <Button
                                 type="button"
                                 color="neutral"
-                                variant="surface"
+                                variant="outline"
                                 size="md"
-                                className="gap-2"
                                 onClick={() => {
                                   openModal({
                                     options: {
@@ -331,7 +330,7 @@ export function ClusterResourcesSettings(props: ClusterResourcesSettingsProps) {
                                   })
                                 }}
                               >
-                                Edit <Icon iconName="pen" iconStyle="solid" />
+                                Edit <Icon iconName="pen" />
                               </Button>
                             </div>
                             <div className="flex flex-col gap-4 border-t border-neutral p-4">
diff --git a/libs/domains/clusters/feature/src/lib/cluster-setup/__snapshots__/cluster-setup.spec.tsx.snap b/libs/domains/clusters/feature/src/lib/cluster-setup/__snapshots__/cluster-setup.spec.tsx.snap
index 9f8c747dbf7..6227332cbac 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-setup/__snapshots__/cluster-setup.spec.tsx.snap
+++ b/libs/domains/clusters/feature/src/lib/cluster-setup/__snapshots__/cluster-setup.spec.tsx.snap
@@ -4,7 +4,7 @@ exports[`ClusterSetup should match manage deployment snapshot 1`] = `
 <body>
   <div>
     <div
-      class="flex flex-row gap-x-4 p-4 border rounded-md text-sm items-center border-info-component bg-surface-info-subtle text-info"
+      class="flex flex-row gap-x-3 p-4 border rounded-md text-sm border-info-component bg-surface-info-subtle text-info items-start"
       data-accent-color="sky"
     >
       <div
@@ -16,7 +16,7 @@ exports[`ClusterSetup should match manage deployment snapshot 1`] = `
         />
       </div>
       <div
-        class="-order-1 mr-auto gap-x-4 text-neutral"
+        class="-order-1 mr-auto gap-x-3 text-neutral"
       >
         <p>
           This guide walks you through the process of installing Qovery on your existing Kubernetes cluster, where you will have full control over the infrastructure. You will be responsible for managing updates and upgrades. Please note that advanced Kubernetes knowledge is required.
@@ -78,7 +78,7 @@ exports[`ClusterSetup should match manage deployment snapshot 1`] = `
             qovery cluster install
           </span>
           <button
-            class="inline-flex items-center shrink-0 transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 px-2 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral cursor-pointer gap-2 font-sans font-medium"
+            class="inline-flex items-center shrink-0 transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 px-2 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral cursor-pointer font-sans font-medium"
             type="button"
           >
             Copy
diff --git a/libs/domains/clusters/feature/src/lib/cluster-setup/cluster-setup.tsx b/libs/domains/clusters/feature/src/lib/cluster-setup/cluster-setup.tsx
index 6d45318a8ce..99e71b2984d 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-setup/cluster-setup.tsx
+++ b/libs/domains/clusters/feature/src/lib/cluster-setup/cluster-setup.tsx
@@ -4,7 +4,7 @@ export function ClusterSetup({ type }: { type: 'LOCAL_DEMO' | 'SELF_MANAGED' })
   return (
     <>
       {type === 'SELF_MANAGED' && (
-        <Callout.Root color="sky">
+        <Callout.Root color="sky" className="items-start">
           <Callout.Icon>
             <Icon iconName="info-circle" iconStyle="regular" />
           </Callout.Icon>
diff --git a/libs/domains/clusters/feature/src/lib/gpu-resources-settings/gpu-resources-settings.tsx b/libs/domains/clusters/feature/src/lib/gpu-resources-settings/gpu-resources-settings.tsx
index c2b8886757f..7f9eef69f1a 100644
--- a/libs/domains/clusters/feature/src/lib/gpu-resources-settings/gpu-resources-settings.tsx
+++ b/libs/domains/clusters/feature/src/lib/gpu-resources-settings/gpu-resources-settings.tsx
@@ -40,7 +40,6 @@ export const GpuResourcesSettings = ({ cluster, clusterRegion = '' }: GpuResourc
         color="neutral"
         variant="surface"
         size="md"
-        className="gap-2"
         onClick={() => {
           openModal({
             options: {
@@ -74,7 +73,7 @@ export const GpuResourcesSettings = ({ cluster, clusterRegion = '' }: GpuResourc
           })
         }}
       >
-        Edit <Icon iconName="pen" iconStyle="solid" />
+        Edit <Icon iconName="pen" />
       </Button>
     </div>
   )
diff --git a/libs/domains/clusters/feature/src/lib/scaleway-static-ip/scaleway-static-ip.tsx b/libs/domains/clusters/feature/src/lib/scaleway-static-ip/scaleway-static-ip.tsx
index ffa1591e8f9..a21179264a5 100644
--- a/libs/domains/clusters/feature/src/lib/scaleway-static-ip/scaleway-static-ip.tsx
+++ b/libs/domains/clusters/feature/src/lib/scaleway-static-ip/scaleway-static-ip.tsx
@@ -72,7 +72,7 @@ export function ScalewayStaticIp({
                     <ExternalLink
                       as="button"
                       href={staticIpFeature.cloud_provider_feature_documentation ?? undefined}
-                      className="relative -top-1 gap-1 px-1.5"
+                      className="relative -top-1 px-1.5"
                       color="neutral"
                       variant="surface"
                       size="xs"
diff --git a/libs/domains/clusters/feature/src/lib/section-production-health/section-production-health.tsx b/libs/domains/clusters/feature/src/lib/section-production-health/section-production-health.tsx
index 1a6484a5058..5557bef3cc0 100644
--- a/libs/domains/clusters/feature/src/lib/section-production-health/section-production-health.tsx
+++ b/libs/domains/clusters/feature/src/lib/section-production-health/section-production-health.tsx
@@ -197,7 +197,6 @@ export function SectionProductionHealth() {
               as="button"
               color="neutral"
               size="md"
-              className="gap-1.5"
               to="/organization/$organizationId/cluster/new"
               params={{ organizationId }}
             >
diff --git a/libs/domains/environment-logs/feature/src/lib/environment-stages/environment-stages.tsx b/libs/domains/environment-logs/feature/src/lib/environment-stages/environment-stages.tsx
index fd9e062cd92..de7d70e5660 100644
--- a/libs/domains/environment-logs/feature/src/lib/environment-stages/environment-stages.tsx
+++ b/libs/domains/environment-logs/feature/src/lib/environment-stages/environment-stages.tsx
@@ -70,7 +70,7 @@ export function EnvironmentStages({
         <div className="flex items-center gap-2">
           <DropdownMenu.Root>
             <DropdownMenu.Trigger asChild>
-              <Button variant="outline" className="gap-1.5" size="md">
+              <Button variant="outline" size="md">
                 <Icon iconName="clock-rotate-left" className="text-neutral-subtle" />
                 {isLastVersion
                   ? 'Latest'
diff --git a/libs/domains/environment-logs/feature/src/lib/list-pre-check-logs/list-pre-check-logs.tsx b/libs/domains/environment-logs/feature/src/lib/list-pre-check-logs/list-pre-check-logs.tsx
index f1319b30355..cf9ee4d549d 100644
--- a/libs/domains/environment-logs/feature/src/lib/list-pre-check-logs/list-pre-check-logs.tsx
+++ b/libs/domains/environment-logs/feature/src/lib/list-pre-check-logs/list-pre-check-logs.tsx
@@ -100,7 +100,7 @@ export function ListPreCheckLogs({ environment, environmentStatus, preCheckStage
           <div className="flex items-center gap-4">
             <DropdownMenu.Root>
               <DropdownMenu.Trigger asChild>
-                <Button variant="outline" className="gap-1.5">
+                <Button variant="outline">
                   <Icon iconName="clock-rotate-left" className="text-neutral-subtle" />
                   {isLastVersion
                     ? 'Latest'
diff --git a/libs/domains/environments/feature/src/lib/create-clone-environment-modal/__snapshots__/create-clone-environment-modal.spec.tsx.snap b/libs/domains/environments/feature/src/lib/create-clone-environment-modal/__snapshots__/create-clone-environment-modal.spec.tsx.snap
index 3d62f71a3a2..15937c0f0f6 100644
--- a/libs/domains/environments/feature/src/lib/create-clone-environment-modal/__snapshots__/create-clone-environment-modal.spec.tsx.snap
+++ b/libs/domains/environments/feature/src/lib/create-clone-environment-modal/__snapshots__/create-clone-environment-modal.spec.tsx.snap
@@ -275,14 +275,14 @@ exports[`CreateCloneEnvironmentModal should match snapshots 1`] = `
           class="mt-6 flex justify-end gap-3"
         >
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
             data-testid="cancel-button"
             type="button"
           >
             Cancel
           </button>
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
             data-testid="submit-button"
             disabled=""
             type="submit"
diff --git a/libs/domains/environments/feature/src/lib/environment-action-toolbar/__snapshots__/environment-action-toolbar.spec.tsx.snap b/libs/domains/environments/feature/src/lib/environment-action-toolbar/__snapshots__/environment-action-toolbar.spec.tsx.snap
index d19fc7ec35d..f42fbb9b6ef 100644
--- a/libs/domains/environments/feature/src/lib/environment-action-toolbar/__snapshots__/environment-action-toolbar.spec.tsx.snap
+++ b/libs/domains/environments/feature/src/lib/environment-action-toolbar/__snapshots__/environment-action-toolbar.spec.tsx.snap
@@ -24,7 +24,7 @@ exports[`EnvironmentActionToolbar should match manage deployment snapshot 1`] =
         aria-expanded="true"
         aria-haspopup="menu"
         aria-label="Manage Deployment"
-        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-warning-strong text-xs h-7 justify-center px-0 rounded w-7 border border-warning-subtle text-warning hover:border-warning-component hover:bg-surface-warning-subtle data-[state=open]:bg-surface-warning-subtle"
+        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-warning-strong text-ssm h-7 gap-x-1 justify-center px-0 rounded w-7 border border-warning-subtle text-warning hover:border-warning-component hover:bg-surface-warning-subtle data-[state=open]:bg-surface-warning-subtle"
         data-state="open"
         id="radix-:r6:"
         type="button"
@@ -40,7 +40,7 @@ exports[`EnvironmentActionToolbar should match manage deployment snapshot 1`] =
         </div>
       </button>
       <a
-        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-6 px-1.5 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-7"
+        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-6 px-1.5 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-7"
         data-state="closed"
         params="[object Object]"
         to="/organization/$organizationId/project/$projectId/environment/$environmentId/service/$serviceId/deployments"
@@ -54,7 +54,7 @@ exports[`EnvironmentActionToolbar should match manage deployment snapshot 1`] =
         aria-expanded="false"
         aria-haspopup="menu"
         aria-label="Other actions"
-        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 justify-center px-0 rounded w-7 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
+        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 gap-x-1 justify-center px-0 rounded w-7 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
         data-state="closed"
         id="radix-:ra:"
         type="button"
@@ -210,7 +210,7 @@ exports[`EnvironmentActionToolbar should match other actions snapshot 1`] = `
         aria-expanded="false"
         aria-haspopup="menu"
         aria-label="Manage Deployment"
-        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-warning-strong text-xs h-7 justify-center px-0 rounded w-7 border border-warning-subtle text-warning hover:border-warning-component hover:bg-surface-warning-subtle data-[state=open]:bg-surface-warning-subtle"
+        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-warning-strong text-ssm h-7 gap-x-1 justify-center px-0 rounded w-7 border border-warning-subtle text-warning hover:border-warning-component hover:bg-surface-warning-subtle data-[state=open]:bg-surface-warning-subtle"
         data-state="closed"
         id="radix-:rq:"
         type="button"
@@ -226,7 +226,7 @@ exports[`EnvironmentActionToolbar should match other actions snapshot 1`] = `
         </div>
       </button>
       <a
-        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-6 px-1.5 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-7"
+        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-6 px-1.5 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-7"
         data-state="closed"
         params="[object Object]"
         to="/organization/$organizationId/project/$projectId/environment/$environmentId/service/$serviceId/deployments"
@@ -241,7 +241,7 @@ exports[`EnvironmentActionToolbar should match other actions snapshot 1`] = `
         aria-expanded="true"
         aria-haspopup="menu"
         aria-label="Other actions"
-        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 justify-center px-0 rounded w-7 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
+        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 gap-x-1 justify-center px-0 rounded w-7 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
         data-state="open"
         id="radix-:ru:"
         type="button"
diff --git a/libs/domains/environments/feature/src/lib/environment-deployment-list/table-filter-trigger-by/table-filter-trigger-by.tsx b/libs/domains/environments/feature/src/lib/environment-deployment-list/table-filter-trigger-by/table-filter-trigger-by.tsx
index 632b5f0535b..d1f32bda327 100644
--- a/libs/domains/environments/feature/src/lib/environment-deployment-list/table-filter-trigger-by/table-filter-trigger-by.tsx
+++ b/libs/domains/environments/feature/src/lib/environment-deployment-list/table-filter-trigger-by/table-filter-trigger-by.tsx
@@ -79,7 +79,7 @@ export function TableFilterTriggerBy({
         <div className="relative inline-block">
           <Popover.Trigger>
             <Button
-              className={twMerge('gap-1 whitespace-nowrap text-xs', column.getIsFiltered() ? 'pr-6' : '')}
+              className={twMerge('whitespace-nowrap text-xs', column.getIsFiltered() ? 'pr-6' : '')}
               color={column.getIsFiltered() ? 'brand' : 'neutral'}
               variant={column.getIsFiltered() ? 'solid' : 'surface'}
             >
diff --git a/libs/domains/environments/feature/src/lib/environment-last-deployment-section/environment-last-deployment-section.tsx b/libs/domains/environments/feature/src/lib/environment-last-deployment-section/environment-last-deployment-section.tsx
index d795dadfc0a..d8c2738e815 100644
--- a/libs/domains/environments/feature/src/lib/environment-last-deployment-section/environment-last-deployment-section.tsx
+++ b/libs/domains/environments/feature/src/lib/environment-last-deployment-section/environment-last-deployment-section.tsx
@@ -201,7 +201,7 @@ const EnvironmentLastDeploymentContent = () => {
           description="Create and deploy your first service"
         >
           {serviceCount > 0 && (
-            <Button onClick={handleDeploy} color="neutral" size="md" className="gap-1.5">
+            <Button onClick={handleDeploy} color="neutral" size="md">
               <Icon iconName="rocket" />
               Deploy environment
             </Button>
diff --git a/libs/domains/environments/feature/src/lib/environments-table/environment-section/environment-section.tsx b/libs/domains/environments/feature/src/lib/environments-table/environment-section/environment-section.tsx
index 001645ad956..ddc0f72950f 100644
--- a/libs/domains/environments/feature/src/lib/environments-table/environment-section/environment-section.tsx
+++ b/libs/domains/environments/feature/src/lib/environments-table/environment-section/environment-section.tsx
@@ -188,7 +188,7 @@ export function EnvironmentSection({
         return (
           <>
             <span className="text-sm text-neutral-subtle">No {title.toLowerCase()} environment created yet</span>
-            <Button size="md" variant="outline" className="gap-2" onClick={onCreateEnvClicked}>
+            <Button size="md" variant="outline" onClick={onCreateEnvClicked}>
               <Icon iconName="circle-plus" iconStyle="regular" />
               Create
             </Button>
diff --git a/libs/domains/environments/feature/src/lib/environments-table/environments-table.tsx b/libs/domains/environments/feature/src/lib/environments-table/environments-table.tsx
index e4f6979fd7c..3d1884b4ed8 100644
--- a/libs/domains/environments/feature/src/lib/environments-table/environments-table.tsx
+++ b/libs/domains/environments/feature/src/lib/environments-table/environments-table.tsx
@@ -172,7 +172,6 @@ function EnvironmentsTableContent() {
                 onCreateEnvClicked()
               }}
               variant="solid"
-              className="gap-1.5"
               size="md"
             >
               <Icon iconName="circle-plus" iconStyle="regular" />
diff --git a/libs/domains/environments/feature/src/lib/terraform-export-modal/__snapshots__/terraform-export-modal.spec.tsx.snap b/libs/domains/environments/feature/src/lib/terraform-export-modal/__snapshots__/terraform-export-modal.spec.tsx.snap
index be43a407d3e..ad31b5994da 100644
--- a/libs/domains/environments/feature/src/lib/terraform-export-modal/__snapshots__/terraform-export-modal.spec.tsx.snap
+++ b/libs/domains/environments/feature/src/lib/terraform-export-modal/__snapshots__/terraform-export-modal.spec.tsx.snap
@@ -62,14 +62,14 @@ exports[`TerraformExportModal should match with snapshots 1`] = `
           class="mt-6 flex justify-end gap-3"
         >
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
             data-testid="cancel-button"
             type="button"
           >
             Cancel
           </button>
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
             data-testid="submit-button"
             disabled=""
             type="submit"
diff --git a/libs/domains/environments/feature/src/lib/update-all-modal/__snapshots__/update-all-modal.spec.tsx.snap b/libs/domains/environments/feature/src/lib/update-all-modal/__snapshots__/update-all-modal.spec.tsx.snap
index 1f90b10c0a6..032ac287df3 100644
--- a/libs/domains/environments/feature/src/lib/update-all-modal/__snapshots__/update-all-modal.spec.tsx.snap
+++ b/libs/domains/environments/feature/src/lib/update-all-modal/__snapshots__/update-all-modal.spec.tsx.snap
@@ -29,7 +29,7 @@ exports[`UpdateAllModal should reduce opacity of commit blocks 1`] = `
           </strong>
         </p>
         <button
-          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 px-2 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
+          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 px-2 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
           data-testid="deselect-all"
         >
           Deselect All
@@ -377,13 +377,13 @@ exports[`UpdateAllModal should reduce opacity of commit blocks 1`] = `
         class="sticky bottom-0 -mb-6 flex justify-end gap-3 bg-background py-6"
       >
         <button
-          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
+          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
           data-testid="cancel-button"
         >
           Cancel
         </button>
         <button
-          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
+          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
           data-testid="submit-button"
           type="submit"
         >
diff --git a/libs/domains/observability/feature/src/lib/alerting/alert-rules-overview/alert-rules-action-bar/alert-rules-action-bar.tsx b/libs/domains/observability/feature/src/lib/alerting/alert-rules-overview/alert-rules-action-bar/alert-rules-action-bar.tsx
index b9523656a67..8b4519ac28c 100644
--- a/libs/domains/observability/feature/src/lib/alerting/alert-rules-overview/alert-rules-action-bar/alert-rules-action-bar.tsx
+++ b/libs/domains/observability/feature/src/lib/alerting/alert-rules-overview/alert-rules-action-bar/alert-rules-action-bar.tsx
@@ -85,14 +85,14 @@ export function AlertRulesActionBar({
                 Unselect
               </button>
               <div className="flex gap-3">
-                <Button size="md" variant="outline" className="items-center gap-2" onClick={handleCloneAlertRules}>
+                <Button size="md" variant="outline" className="items-center" onClick={handleCloneAlertRules}>
                   <Icon iconName="clone" />
                   Clone
                 </Button>
                 <Button
                   size="md"
                   variant="outline"
-                  className="items-center gap-2 text-negative"
+                  className="items-center text-negative"
                   onClick={handleDeleteAllAlertRules}
                   disabled={deletableAlertRules.length === 0}
                 >
diff --git a/libs/domains/observability/feature/src/lib/alerting/alert-rules-overview/alert-rules-overview.tsx b/libs/domains/observability/feature/src/lib/alerting/alert-rules-overview/alert-rules-overview.tsx
index bd6ba970db3..04272fb985b 100644
--- a/libs/domains/observability/feature/src/lib/alerting/alert-rules-overview/alert-rules-overview.tsx
+++ b/libs/domains/observability/feature/src/lib/alerting/alert-rules-overview/alert-rules-overview.tsx
@@ -255,7 +255,7 @@ export function AlertRulesOverview({
       {onCreateKeyAlerts && (
         <Tooltip content="You need to deploy your service to create alerts" disabled={canCreateAlerts}>
           <div>
-            <Button size="md" className="gap-1.5" onClick={onCreateKeyAlerts} disabled={!canCreateAlerts}>
+            <Button size="md" onClick={onCreateKeyAlerts} disabled={!canCreateAlerts}>
               <Icon iconName="plus-large" className="text-xs" />
               New alert
             </Button>
@@ -393,7 +393,7 @@ export function AlertRulesOverview({
                       variant="surface"
                       color="neutral"
                       size="xs"
-                      className="justify-center gap-1.5 pl-0.5"
+                      className="justify-center pl-0.5"
                       to="/organization/$organizationId/project/$projectId/environment/$environmentId/service/$serviceId/monitoring/alerts"
                       params={{
                         organizationId,
diff --git a/libs/domains/observability/feature/src/lib/alerting/issue-overview/issue-overview.tsx b/libs/domains/observability/feature/src/lib/alerting/issue-overview/issue-overview.tsx
index 77a0da50df7..dfa5ff0bb7d 100644
--- a/libs/domains/observability/feature/src/lib/alerting/issue-overview/issue-overview.tsx
+++ b/libs/domains/observability/feature/src/lib/alerting/issue-overview/issue-overview.tsx
@@ -95,7 +95,7 @@ export function IssueOverview() {
                         variant="surface"
                         color="neutral"
                         size="xs"
-                        className="justify-center gap-1.5 pl-0.5"
+                        className="justify-center pl-0.5"
                         to="/organization/$organizationId/project/$projectId/environment/$environmentId/service/$serviceId/monitoring/alerts"
                         params={{
                           organizationId,
diff --git a/libs/domains/observability/feature/src/lib/alerting/notification-channel-overview/notification-channel-overview.tsx b/libs/domains/observability/feature/src/lib/alerting/notification-channel-overview/notification-channel-overview.tsx
index 632259575eb..51149222b50 100644
--- a/libs/domains/observability/feature/src/lib/alerting/notification-channel-overview/notification-channel-overview.tsx
+++ b/libs/domains/observability/feature/src/lib/alerting/notification-channel-overview/notification-channel-overview.tsx
@@ -82,7 +82,7 @@ export function NotificationChannelOverview() {
       <div className="mt-8 flex flex-col gap-3">
         <div className="flex items-center justify-between">
           <Heading level={2}>Slack channels</Heading>
-          <Button variant="plain" color="brand" size="md" className="gap-1.5" onClick={createSlackChannelModal}>
+          <Button variant="plain" color="brand" size="md" onClick={createSlackChannelModal}>
             <Icon iconName="circle-plus" iconStyle="regular" />
             Add channel
           </Button>
@@ -94,7 +94,7 @@ export function NotificationChannelOverview() {
             </div>
             <p className="font-medium">No slack channel added yet</p>
             <p className="mb-3 text-sm text-neutral-subtle">Add your first channel to start sending notifications</p>
-            <Button size="md" variant="outline" color="neutral" className="gap-1.5" onClick={createSlackChannelModal}>
+            <Button size="md" variant="outline" color="neutral" onClick={createSlackChannelModal}>
               <Icon iconName="circle-plus" iconStyle="regular" />
               Add channel
             </Button>
@@ -155,7 +155,7 @@ export function NotificationChannelOverview() {
       <div className="mt-8 flex flex-col gap-3">
         <div className="flex items-center justify-between">
           <Heading level={2}>Email</Heading>
-          <Button variant="plain" color="brand" size="md" className="gap-1.5" onClick={createEmailChannelModal}>
+          <Button variant="plain" color="brand" size="md" onClick={createEmailChannelModal}>
             <Icon iconName="circle-plus" iconStyle="regular" />
             New email
           </Button>
@@ -167,7 +167,7 @@ export function NotificationChannelOverview() {
             </div>
             <p className="font-medium">No email group added yet</p>
             <p className="mb-3 text-sm text-neutral-subtle">Add your first email to start sending notifications</p>
-            <Button size="md" variant="outline" color="neutral" className="gap-1.5" onClick={createEmailChannelModal}>
+            <Button size="md" variant="outline" color="neutral" onClick={createEmailChannelModal}>
               <Icon iconName="circle-plus" iconStyle="regular" />
               Add email group
             </Button>
diff --git a/libs/domains/observability/feature/src/lib/database/database-rds-dashboard/database-rds-dashboard.tsx b/libs/domains/observability/feature/src/lib/database/database-rds-dashboard/database-rds-dashboard.tsx
index eb516e65883..54e97f92bc1 100644
--- a/libs/domains/observability/feature/src/lib/database/database-rds-dashboard/database-rds-dashboard.tsx
+++ b/libs/domains/observability/feature/src/lib/database/database-rds-dashboard/database-rds-dashboard.tsx
@@ -67,7 +67,7 @@ function DatabaseRdsDashboardContent() {
                 variant={isLiveUpdateEnabled ? 'solid' : 'surface'}
                 color={isLiveUpdateEnabled ? 'brand' : 'neutral'}
                 size="md"
-                className={clsx('gap-1.5 pl-2.5', isLiveUpdateEnabled && 'border border-transparent')}
+                className={clsx('pl-2.5', isLiveUpdateEnabled && 'border border-transparent')}
                 onClick={() => {
                   if (!isLiveUpdateEnabled) {
                     if (timeRange !== '5m' && timeRange !== '15m' && timeRange !== '30m' && timeRange !== '1h') {
@@ -95,19 +95,14 @@ function DatabaseRdsDashboardContent() {
             />
           </div>
           <div className="flex flex-wrap gap-2">
-            <Button
-              variant="plain"
-              size="xs"
-              className="flex items-center gap-1"
-              onClick={() => setHideEvents(!hideEvents)}
-            >
+            <Button variant="plain" size="xs" className="flex items-center" onClick={() => setHideEvents(!hideEvents)}>
               {hideEvents ? 'Show events' : 'Hide events'}
               <Icon iconName={hideEvents ? 'eye' : 'eye-slash'} iconStyle="regular" />
             </Button>
             <Button
               variant="plain"
               size="xs"
-              className="flex items-center gap-1"
+              className="flex items-center"
               onClick={() => setExpandCharts(!expandCharts)}
             >
               {expandCharts ? 'Collapse charts' : 'Expand charts'}
diff --git a/libs/domains/observability/feature/src/lib/modal-chart/modal-chart.tsx b/libs/domains/observability/feature/src/lib/modal-chart/modal-chart.tsx
index 1c24ba2d1ca..5b268fa289d 100644
--- a/libs/domains/observability/feature/src/lib/modal-chart/modal-chart.tsx
+++ b/libs/domains/observability/feature/src/lib/modal-chart/modal-chart.tsx
@@ -52,7 +52,7 @@ export function ModalChart({ children, open, onOpenChange, title, description }:
                   <Button
                     variant="plain"
                     size="xs"
-                    className="flex items-center gap-1"
+                    className="flex items-center"
                     onClick={() => setHideEvents(!hideEvents)}
                   >
                     {hideEvents ? 'Show events' : 'Hide events'}
diff --git a/libs/domains/observability/feature/src/lib/service/service-alerting/service-alerting.tsx b/libs/domains/observability/feature/src/lib/service/service-alerting/service-alerting.tsx
index f4a2148a9be..7c4cf93532f 100644
--- a/libs/domains/observability/feature/src/lib/service/service-alerting/service-alerting.tsx
+++ b/libs/domains/observability/feature/src/lib/service/service-alerting/service-alerting.tsx
@@ -48,7 +48,6 @@ export function ServiceAlerting({ children }: PropsWithChildren) {
                 variant="outline"
                 color="neutral"
                 size="md"
-                className="gap-1.5"
                 onClick={createKeyAlertsModal}
                 disabled={!canCreateAlerts}
               >
diff --git a/libs/domains/observability/feature/src/lib/service/service-dashboard/service-dashboard.tsx b/libs/domains/observability/feature/src/lib/service/service-dashboard/service-dashboard.tsx
index 2630a4ca888..d89b9172f61 100644
--- a/libs/domains/observability/feature/src/lib/service/service-dashboard/service-dashboard.tsx
+++ b/libs/domains/observability/feature/src/lib/service/service-dashboard/service-dashboard.tsx
@@ -187,7 +187,7 @@ function ServiceDashboardContent({ environmentId, serviceId }: { environmentId:
                 variant={isLiveUpdateEnabled ? 'solid' : 'surface'}
                 color={isLiveUpdateEnabled ? 'brand' : 'neutral'}
                 size="md"
-                className={clsx('gap-1.5 pl-2.5', isLiveUpdateEnabled && 'border border-transparent')}
+                className={clsx('pl-2.5', isLiveUpdateEnabled && 'border border-transparent')}
                 onClick={() => {
                   // If timeRange is '30m' or greater, set to '15m' when enabling live update
                   if (!isLiveUpdateEnabled) {
@@ -216,19 +216,14 @@ function ServiceDashboardContent({ environmentId, serviceId }: { environmentId:
             />
           </div>
           <div className="flex gap-2">
-            <Button
-              variant="plain"
-              size="xs"
-              className="flex items-center gap-1"
-              onClick={() => setHideEvents(!hideEvents)}
-            >
+            <Button variant="plain" size="xs" className="flex items-center" onClick={() => setHideEvents(!hideEvents)}>
               {hideEvents ? 'Show events' : 'Hide events'}
               <Icon iconName={hideEvents ? 'eye' : 'eye-slash'} iconStyle="regular" />
             </Button>
             <Button
               variant="plain"
               size="xs"
-              className="flex items-center gap-1"
+              className="flex items-center"
               onClick={() => setExpandCharts(!expandCharts)}
             >
               {expandCharts ? 'Collapse charts' : 'Expand charts'}
diff --git a/libs/domains/onboarding/feature/src/lib/step-personalize/step-personalize.tsx b/libs/domains/onboarding/feature/src/lib/step-personalize/step-personalize.tsx
index 430a0744e08..b0d7c1fcb5a 100644
--- a/libs/domains/onboarding/feature/src/lib/step-personalize/step-personalize.tsx
+++ b/libs/domains/onboarding/feature/src/lib/step-personalize/step-personalize.tsx
@@ -163,14 +163,7 @@ export function StepPersonalize(props: StepPersonalizeProps) {
           )}
         />
         <div className="mt-10 flex justify-between border-t border-surface-neutral-subtle pt-5">
-          <Button
-            className="gap-2"
-            type="button"
-            color="neutral"
-            variant="surface"
-            size="lg"
-            onClick={() => authLogout()}
-          >
+          <Button type="button" color="neutral" variant="surface" size="lg" onClick={() => authLogout()}>
             <Icon iconName="arrow-left" />
             Disconnect
           </Button>
diff --git a/libs/domains/onboarding/feature/src/lib/step-plans/step-plans.tsx b/libs/domains/onboarding/feature/src/lib/step-plans/step-plans.tsx
index c645cf82277..da59819dd1a 100644
--- a/libs/domains/onboarding/feature/src/lib/step-plans/step-plans.tsx
+++ b/libs/domains/onboarding/feature/src/lib/step-plans/step-plans.tsx
@@ -167,7 +167,6 @@ export default function StepPlans(props: StepPlansProps) {
                     size="lg"
                     color="neutral"
                     variant="surface"
-                    className="gap-2"
                     onClick={() => navigate({ to: '/onboarding/personalize' })}
                   >
                     <Icon iconName="arrow-left" iconStyle="solid" />
@@ -179,7 +178,6 @@ export default function StepPlans(props: StepPlansProps) {
                     size="lg"
                     color="neutral"
                     variant="surface"
-                    className="gap-2"
                     onClick={() => {
                       if (currentOrganizationId) {
                         navigate({ to: ENVIRONMENTS_URL(currentOrganizationId, currentProjectId) })
diff --git a/libs/domains/onboarding/feature/src/lib/step-project/step-project.tsx b/libs/domains/onboarding/feature/src/lib/step-project/step-project.tsx
index 609e73a4136..f382ffb45a2 100644
--- a/libs/domains/onboarding/feature/src/lib/step-project/step-project.tsx
+++ b/libs/domains/onboarding/feature/src/lib/step-project/step-project.tsx
@@ -62,14 +62,7 @@ export function StepProject(props: StepProjectProps) {
         />
         <div className="mt-10 flex justify-between border-t border-neutral pt-5">
           {onFirstStepBack ? (
-            <Button
-              type="button"
-              size="lg"
-              color="neutral"
-              variant="surface"
-              className="gap-2"
-              onClick={onFirstStepBack}
-            >
+            <Button type="button" size="lg" color="neutral" variant="surface" onClick={onFirstStepBack}>
               <Icon iconName="arrow-left" iconStyle="solid" />
               Back
             </Button>
diff --git a/libs/domains/organizations/feature/src/lib/annotation-create-edit-modal/__snapshots__/annotation-create-edit-modal.spec.tsx.snap b/libs/domains/organizations/feature/src/lib/annotation-create-edit-modal/__snapshots__/annotation-create-edit-modal.spec.tsx.snap
index 2528c487fb8..8f794cc3a78 100644
--- a/libs/domains/organizations/feature/src/lib/annotation-create-edit-modal/__snapshots__/annotation-create-edit-modal.spec.tsx.snap
+++ b/libs/domains/organizations/feature/src/lib/annotation-create-edit-modal/__snapshots__/annotation-create-edit-modal.spec.tsx.snap
@@ -127,7 +127,7 @@ exports[`AnnotationCreateEditModal should match with snatpshot 1`] = `
                   </div>
                 </div>
                 <button
-                  class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 rounded-md text-neutral-subtle hover:bg-surface-neutral-subtle"
+                  class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md text-neutral-subtle hover:bg-surface-neutral-subtle"
                   type="button"
                 >
                   <i
@@ -139,13 +139,13 @@ exports[`AnnotationCreateEditModal should match with snatpshot 1`] = `
             </li>
           </ul>
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-xs h-7 px-2 rounded bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert mt-3"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-ssm h-7 px-2 gap-x-1 rounded bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert mt-3"
             type="button"
           >
             Add annotation
             <i
               aria-hidden="true"
-              class="fa-regular fa-plus ml-2"
+              class="fa-regular fa-plus "
             />
           </button>
         </div>
@@ -432,14 +432,14 @@ exports[`AnnotationCreateEditModal should match with snatpshot 1`] = `
           class="mt-6 flex justify-end gap-3"
         >
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
             data-testid="cancel-button"
             type="button"
           >
             Cancel
           </button>
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
             data-testid="submit-button"
             disabled=""
             type="submit"
diff --git a/libs/domains/organizations/feature/src/lib/annotation-create-edit-modal/annotation-create-edit-modal.tsx b/libs/domains/organizations/feature/src/lib/annotation-create-edit-modal/annotation-create-edit-modal.tsx
index e47c97714e7..f7405dd1c5e 100644
--- a/libs/domains/organizations/feature/src/lib/annotation-create-edit-modal/annotation-create-edit-modal.tsx
+++ b/libs/domains/organizations/feature/src/lib/annotation-create-edit-modal/annotation-create-edit-modal.tsx
@@ -181,7 +181,7 @@ export function AnnotationCreateEditModal({
             }
           >
             Add annotation
-            <Icon iconName="plus" className="ml-2" />
+            <Icon iconName="plus" />
           </Button>
         </div>
         <span className="mb-2 mt-4 block text-sm text-neutral">Select scope (Kubernetes objects)</span>
diff --git a/libs/domains/organizations/feature/src/lib/git-repository-service-settings/git-repository-service-settings.tsx b/libs/domains/organizations/feature/src/lib/git-repository-service-settings/git-repository-service-settings.tsx
index ff13fcf66b9..b54e671d062 100644
--- a/libs/domains/organizations/feature/src/lib/git-repository-service-settings/git-repository-service-settings.tsx
+++ b/libs/domains/organizations/feature/src/lib/git-repository-service-settings/git-repository-service-settings.tsx
@@ -140,7 +140,7 @@ export function GitRepositoryServiceSettings({
             }
           >
             Edit
-            <Icon iconName="triangle-exclamation" className="ml-2 text-sm text-yellow-500" />
+            <Icon iconName="triangle-exclamation" className="text-sm text-yellow-500" />
           </Button>
         </div>
       )}
diff --git a/libs/domains/organizations/feature/src/lib/git-repository-service-settings/git-repository-settings.tsx b/libs/domains/organizations/feature/src/lib/git-repository-service-settings/git-repository-settings.tsx
index 9e7b1e7cf7b..87dcdd949d6 100644
--- a/libs/domains/organizations/feature/src/lib/git-repository-service-settings/git-repository-settings.tsx
+++ b/libs/domains/organizations/feature/src/lib/git-repository-service-settings/git-repository-settings.tsx
@@ -133,7 +133,7 @@ export function GitRepositorySettings({
             type="button"
             variant="surface"
             size="md"
-            className="gap-1 pr-2"
+            className="pr-2"
             onClick={() =>
               openModal({
                 content: (
diff --git a/libs/domains/organizations/feature/src/lib/git-token-list/__snapshots__/git-token-list.spec.tsx.snap b/libs/domains/organizations/feature/src/lib/git-token-list/__snapshots__/git-token-list.spec.tsx.snap
index e110426eea8..a2c30cf9be1 100644
--- a/libs/domains/organizations/feature/src/lib/git-token-list/__snapshots__/git-token-list.spec.tsx.snap
+++ b/libs/domains/organizations/feature/src/lib/git-token-list/__snapshots__/git-token-list.spec.tsx.snap
@@ -70,7 +70,7 @@ exports[`GitTokenList should match snapshot 1`] = `
             </div>
             <div>
               <button
-                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 justify-center px-0 rounded-md w-8 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral relative mr-2"
+                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 gap-x-1.5 justify-center px-0 rounded-md w-8 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral relative mr-2"
                 disabled=""
               >
                 <span
@@ -84,7 +84,7 @@ exports[`GitTokenList should match snapshot 1`] = `
                 />
               </button>
               <button
-                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 justify-center px-0 rounded-md w-8 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral mr-2"
+                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 gap-x-1.5 justify-center px-0 rounded-md w-8 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral mr-2"
               >
                 <i
                   aria-hidden="true"
@@ -92,7 +92,7 @@ exports[`GitTokenList should match snapshot 1`] = `
                 />
               </button>
               <button
-                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 justify-center px-0 rounded-md w-8 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
+                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 gap-x-1.5 justify-center px-0 rounded-md w-8 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
               >
                 <i
                   aria-hidden="true"
@@ -162,7 +162,7 @@ exports[`GitTokenList should match snapshot 1`] = `
             </div>
             <div>
               <button
-                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 justify-center px-0 rounded-md w-8 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral relative mr-2"
+                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 gap-x-1.5 justify-center px-0 rounded-md w-8 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral relative mr-2"
                 disabled=""
               >
                 <span
@@ -176,7 +176,7 @@ exports[`GitTokenList should match snapshot 1`] = `
                 />
               </button>
               <button
-                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 justify-center px-0 rounded-md w-8 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral mr-2"
+                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 gap-x-1.5 justify-center px-0 rounded-md w-8 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral mr-2"
               >
                 <i
                   aria-hidden="true"
@@ -184,7 +184,7 @@ exports[`GitTokenList should match snapshot 1`] = `
                 />
               </button>
               <button
-                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 justify-center px-0 rounded-md w-8 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
+                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 gap-x-1.5 justify-center px-0 rounded-md w-8 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
               >
                 <i
                   aria-hidden="true"
diff --git a/libs/domains/organizations/feature/src/lib/label-create-edit-modal/__snapshots__/label-create-edit-modal.spec.tsx.snap b/libs/domains/organizations/feature/src/lib/label-create-edit-modal/__snapshots__/label-create-edit-modal.spec.tsx.snap
index ac55bba9e9a..604233a3d46 100644
--- a/libs/domains/organizations/feature/src/lib/label-create-edit-modal/__snapshots__/label-create-edit-modal.spec.tsx.snap
+++ b/libs/domains/organizations/feature/src/lib/label-create-edit-modal/__snapshots__/label-create-edit-modal.spec.tsx.snap
@@ -166,7 +166,7 @@ exports[`LabelCreateEditModal should match with snatpshot 1`] = `
                   </div>
                 </div>
                 <button
-                  class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 rounded-md text-neutral-subtle hover:bg-surface-neutral-subtle"
+                  class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md text-neutral-subtle hover:bg-surface-neutral-subtle"
                   type="button"
                 >
                   <i
@@ -178,13 +178,13 @@ exports[`LabelCreateEditModal should match with snatpshot 1`] = `
             </li>
           </ul>
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-xs h-7 px-2 rounded bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert mt-3"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-ssm h-7 px-2 gap-x-1 rounded bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert mt-3"
             type="button"
           >
             Add label
             <i
               aria-hidden="true"
-              class="fa-regular fa-plus ml-2"
+              class="fa-regular fa-plus "
             />
           </button>
         </div>
@@ -192,14 +192,14 @@ exports[`LabelCreateEditModal should match with snatpshot 1`] = `
           class="mt-6 flex justify-end gap-3"
         >
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
             data-testid="cancel-button"
             type="button"
           >
             Cancel
           </button>
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
             data-testid="submit-button"
             disabled=""
             type="submit"
diff --git a/libs/domains/organizations/feature/src/lib/label-create-edit-modal/label-create-edit-modal.tsx b/libs/domains/organizations/feature/src/lib/label-create-edit-modal/label-create-edit-modal.tsx
index 3369682d3bc..2954f7e727d 100644
--- a/libs/domains/organizations/feature/src/lib/label-create-edit-modal/label-create-edit-modal.tsx
+++ b/libs/domains/organizations/feature/src/lib/label-create-edit-modal/label-create-edit-modal.tsx
@@ -164,7 +164,7 @@ export function LabelCreateEditModal({ isEdit, labelsGroup, organizationId, onCl
             }
           >
             Add label
-            <Icon iconName="plus" className="ml-2" />
+            <Icon iconName="plus" />
           </Button>
         </div>
       </ModalCrud>
diff --git a/libs/domains/organizations/feature/src/lib/settings-api-token/settings-api-token.tsx b/libs/domains/organizations/feature/src/lib/settings-api-token/settings-api-token.tsx
index b7e188fb5b9..c794dc8bcc6 100644
--- a/libs/domains/organizations/feature/src/lib/settings-api-token/settings-api-token.tsx
+++ b/libs/domains/organizations/feature/src/lib/settings-api-token/settings-api-token.tsx
@@ -128,7 +128,7 @@ export function SettingsApiToken() {
           />
 
           <Button
-            className="absolute right-0 top-0 gap-2"
+            className="absolute right-0 top-0"
             size="md"
             onClick={() => {
               openModal({ content: <CrudModalFeature organizationId={organizationId} onClose={closeModal} /> })
diff --git a/libs/domains/organizations/feature/src/lib/settings-argocd-integration/settings-argocd-integration.tsx b/libs/domains/organizations/feature/src/lib/settings-argocd-integration/settings-argocd-integration.tsx
index 301528a0b33..29b94a683b8 100644
--- a/libs/domains/organizations/feature/src/lib/settings-argocd-integration/settings-argocd-integration.tsx
+++ b/libs/domains/organizations/feature/src/lib/settings-argocd-integration/settings-argocd-integration.tsx
@@ -308,7 +308,7 @@ function SettingsArgoCdIntegrationCreateButton() {
   }
 
   return (
-    <Button className="gap-1.5" size="md" onClick={openCreateModal}>
+    <Button size="md" onClick={openCreateModal}>
       <Icon iconName="circle-plus" iconStyle="regular" />
       Add ArgoCD
     </Button>
@@ -420,7 +420,7 @@ function SettingsArgoCdIntegrationContent() {
         icon="link"
         className="h-auto min-h-[146px] w-full max-w-[648px] p-8"
       >
-        <Button variant="outline" color="neutral" size="md" className="gap-2" onClick={openCreateModal}>
+        <Button variant="outline" color="neutral" size="md" onClick={openCreateModal}>
           <Icon iconName="circle-plus" iconStyle="regular" />
           Add ArgoCD
         </Button>
diff --git a/libs/domains/organizations/feature/src/lib/settings-billing-details/settings-billing-details.tsx b/libs/domains/organizations/feature/src/lib/settings-billing-details/settings-billing-details.tsx
index 978b4609816..49e05fec0ad 100644
--- a/libs/domains/organizations/feature/src/lib/settings-billing-details/settings-billing-details.tsx
+++ b/libs/domains/organizations/feature/src/lib/settings-billing-details/settings-billing-details.tsx
@@ -245,7 +245,6 @@ function SettingsBillingDetailsContent({ organizationId }: { organizationId: str
                         onClick={() => handleAddCard()}
                         size="md"
                         variant="outline"
-                        className="gap-2"
                         data-testid="add-new-card-button"
                       >
                         Add new card
diff --git a/libs/domains/organizations/feature/src/lib/settings-billing-summary/settings-billing-summary.tsx b/libs/domains/organizations/feature/src/lib/settings-billing-summary/settings-billing-summary.tsx
index f4dfcac5640..9c06ebd0c38 100644
--- a/libs/domains/organizations/feature/src/lib/settings-billing-summary/settings-billing-summary.tsx
+++ b/libs/domains/organizations/feature/src/lib/settings-billing-summary/settings-billing-summary.tsx
@@ -125,7 +125,7 @@ export function PageOrganizationBillingSummary(props: PageOrganizationBillingSum
         <div className="relative">
           <SettingsHeading title="Plan details" showNeedHelp={false} />
           <div className="absolute right-0 top-0 flex shrink-0 gap-3">
-            <Button className="gap-1" variant="surface" color="neutral" size="md" onClick={props.onShowUsageClick}>
+            <Button variant="surface" color="neutral" size="md" onClick={props.onShowUsageClick}>
               Show usage
               <Icon iconName="gauge-high" iconStyle="regular" />
             </Button>
diff --git a/libs/domains/organizations/feature/src/lib/settings-cloud-credentials/settings-cloud-credentials.tsx b/libs/domains/organizations/feature/src/lib/settings-cloud-credentials/settings-cloud-credentials.tsx
index a1757caf15e..12611afebc2 100644
--- a/libs/domains/organizations/feature/src/lib/settings-cloud-credentials/settings-cloud-credentials.tsx
+++ b/libs/domains/organizations/feature/src/lib/settings-cloud-credentials/settings-cloud-credentials.tsx
@@ -410,7 +410,7 @@ export function SettingsCloudCredentials() {
 
           <DropdownMenu.Root open={isCreateMenuOpen} onOpenChange={setIsCreateMenuOpen}>
             <DropdownMenu.Trigger asChild>
-              <Button size="md" className="absolute right-0 top-0 shrink-0 gap-2">
+              <Button size="md" className="absolute right-0 top-0 shrink-0">
                 <Icon iconName="circle-plus" iconStyle="regular" />
                 New credential
               </Button>
diff --git a/libs/domains/organizations/feature/src/lib/settings-container-registries/settings-container-registries.tsx b/libs/domains/organizations/feature/src/lib/settings-container-registries/settings-container-registries.tsx
index cfa1b628475..da66f6c7376 100644
--- a/libs/domains/organizations/feature/src/lib/settings-container-registries/settings-container-registries.tsx
+++ b/libs/domains/organizations/feature/src/lib/settings-container-registries/settings-container-registries.tsx
@@ -268,7 +268,7 @@ export function SettingsContainerRegistries() {
             description="Define and manage the container registry to be used within your organization to deploy applications."
           />
 
-          <Button className="absolute right-0 top-0 gap-2" size="md" onClick={() => onAddRegistry()}>
+          <Button className="absolute right-0 top-0" size="md" onClick={() => onAddRegistry()}>
             <Icon iconName="circle-plus" iconStyle="regular" />
             Add registry
           </Button>
diff --git a/libs/domains/organizations/feature/src/lib/settings-git-repository-access/section-github-app/section-github-app.tsx b/libs/domains/organizations/feature/src/lib/settings-git-repository-access/section-github-app/section-github-app.tsx
index 3ed3590b6f3..78fc8550c0b 100644
--- a/libs/domains/organizations/feature/src/lib/settings-git-repository-access/section-github-app/section-github-app.tsx
+++ b/libs/domains/organizations/feature/src/lib/settings-git-repository-access/section-github-app/section-github-app.tsx
@@ -43,7 +43,6 @@ export function SectionGithubApp(props: SectionGithubAppProps) {
               <div className="flex gap-2">
                 <Button
                   data-testid="disconnect-button"
-                  className="gap-1"
                   type="button"
                   size="md"
                   onClick={() => props.onDisconnect && props.onDisconnect(false)}
diff --git a/libs/domains/organizations/feature/src/lib/settings-git-repository-access/settings-git-repository-access.tsx b/libs/domains/organizations/feature/src/lib/settings-git-repository-access/settings-git-repository-access.tsx
index f3c6776554e..9b120ffb33f 100644
--- a/libs/domains/organizations/feature/src/lib/settings-git-repository-access/settings-git-repository-access.tsx
+++ b/libs/domains/organizations/feature/src/lib/settings-git-repository-access/settings-git-repository-access.tsx
@@ -107,7 +107,7 @@ export function SettingsGitRepositoryAccess() {
 
           <Button
             size="md"
-            className="absolute right-0 top-0 shrink-0 gap-2"
+            className="absolute right-0 top-0 shrink-0"
             onClick={() => {
               openModal({
                 content: <GitTokenCreateEditModal organizationId={organizationId} onClose={closeModal} />,
diff --git a/libs/domains/organizations/feature/src/lib/settings-helm-repositories/settings-helm-repositories.tsx b/libs/domains/organizations/feature/src/lib/settings-helm-repositories/settings-helm-repositories.tsx
index 53fbb4e775e..44574c6a3ea 100644
--- a/libs/domains/organizations/feature/src/lib/settings-helm-repositories/settings-helm-repositories.tsx
+++ b/libs/domains/organizations/feature/src/lib/settings-helm-repositories/settings-helm-repositories.tsx
@@ -143,7 +143,7 @@ export function PageOrganizationHelmRepositories({
             title="Helm repositories"
             description="Define and manage the helm repository to be used within your organization to deploy applications."
           />
-          <Button size="md" className="absolute right-0 top-0 shrink-0 gap-2" onClick={() => onAddRepository()}>
+          <Button size="md" className="absolute right-0 top-0 shrink-0" onClick={() => onAddRepository()}>
             Add repository
             <Icon iconName="circle-plus" iconStyle="regular" />
           </Button>
diff --git a/libs/domains/organizations/feature/src/lib/settings-labels-annotations/settings-labels-annotations.tsx b/libs/domains/organizations/feature/src/lib/settings-labels-annotations/settings-labels-annotations.tsx
index fbb8aee066b..2412332d493 100644
--- a/libs/domains/organizations/feature/src/lib/settings-labels-annotations/settings-labels-annotations.tsx
+++ b/libs/domains/organizations/feature/src/lib/settings-labels-annotations/settings-labels-annotations.tsx
@@ -253,7 +253,7 @@ export function SettingsLabelsAnnotations() {
 
           <DropdownMenu.Root>
             <DropdownMenu.Trigger asChild>
-              <Button size="md" className="absolute right-0 top-0 shrink-0 gap-2">
+              <Button size="md" className="absolute right-0 top-0 shrink-0">
                 <Icon iconName="circle-plus" iconStyle="regular" />
                 Add new
               </Button>
diff --git a/libs/domains/organizations/feature/src/lib/settings-members/settings-members.tsx b/libs/domains/organizations/feature/src/lib/settings-members/settings-members.tsx
index d7c99d79387..1a65775803e 100644
--- a/libs/domains/organizations/feature/src/lib/settings-members/settings-members.tsx
+++ b/libs/domains/organizations/feature/src/lib/settings-members/settings-members.tsx
@@ -469,7 +469,7 @@ export function SettingsMembers() {
               role to each of them. You can invite someone to join your organization via email."
           />
 
-          <Button className="absolute right-0 top-0 gap-2" size="md" onClick={onAddMember}>
+          <Button className="absolute right-0 top-0" size="md" onClick={onAddMember}>
             <Icon iconName="circle-plus" iconStyle="regular" />
             Add member
           </Button>
diff --git a/libs/domains/organizations/feature/src/lib/settings-roles/settings-roles.tsx b/libs/domains/organizations/feature/src/lib/settings-roles/settings-roles.tsx
index 68804dca614..8ee7ae3b1ba 100644
--- a/libs/domains/organizations/feature/src/lib/settings-roles/settings-roles.tsx
+++ b/libs/domains/organizations/feature/src/lib/settings-roles/settings-roles.tsx
@@ -182,7 +182,7 @@ export function SettingsRoles() {
             description="Manage the existing custom roles or create a new one."
           />
 
-          <Button className="absolute right-0 top-0 gap-2" size="md" onClick={onAddRole}>
+          <Button className="absolute right-0 top-0" size="md" onClick={onAddRole}>
             <Icon iconName="circle-plus" iconStyle="regular" />
             Add new role
           </Button>
diff --git a/libs/domains/organizations/feature/src/lib/settings-webhook/settings-webhook.tsx b/libs/domains/organizations/feature/src/lib/settings-webhook/settings-webhook.tsx
index 3675fe9f7e6..bff317e5325 100644
--- a/libs/domains/organizations/feature/src/lib/settings-webhook/settings-webhook.tsx
+++ b/libs/domains/organizations/feature/src/lib/settings-webhook/settings-webhook.tsx
@@ -184,7 +184,7 @@ export function SettingsWebhook() {
             description="Qovery allows you to create webhooks at organization-level so that, when an event happens on an
               environment within your organization, you can get notified on external applications (for instance, Slack)."
           />
-          <Button size="md" className="absolute right-0 top-0 shrink-0 gap-2" onClick={openAddNew}>
+          <Button size="md" className="absolute right-0 top-0 shrink-0" onClick={openAddNew}>
             <Icon iconName="circle-plus" iconStyle="regular" />
             Add new
           </Button>
diff --git a/libs/domains/projects/feature/src/lib/deployment-rules/deployement-rules.tsx b/libs/domains/projects/feature/src/lib/deployment-rules/deployement-rules.tsx
index d3643a03d7a..03fbcbcb3e5 100644
--- a/libs/domains/projects/feature/src/lib/deployment-rules/deployement-rules.tsx
+++ b/libs/domains/projects/feature/src/lib/deployment-rules/deployement-rules.tsx
@@ -198,7 +198,6 @@ function DeploymentRulesContent({ organizationId, projectId, linkNewRule }: Depl
       }
     >
       <Button
-        className="gap-2"
         size="md"
         variant="outline"
         onClick={() =>
@@ -253,7 +252,7 @@ export function DeploymentRules() {
             <NeedHelp className="mt-2" />
           </div>
           <Button size="md" onClick={() => navigate({ to: linkNewRule })}>
-            Add rule <Icon className="ml-2" iconName="circle-plus" iconStyle="regular" />
+            Add rule <Icon iconName="circle-plus" iconStyle="regular" />
           </Button>
         </div>
         <div className="max-w-content-with-navigation-left">
diff --git a/libs/domains/projects/feature/src/lib/project-list/project-list.tsx b/libs/domains/projects/feature/src/lib/project-list/project-list.tsx
index fee227422bc..c2de8bdb513 100644
--- a/libs/domains/projects/feature/src/lib/project-list/project-list.tsx
+++ b/libs/domains/projects/feature/src/lib/project-list/project-list.tsx
@@ -27,7 +27,7 @@ export function ProjectList() {
         <Heading className="flex items-center gap-2">
           Your {pluralize(projects?.length ?? 0, 'project', 'projects')}
         </Heading>
-        <Button type="button" color="brand" size="sm" className="gap-1.5" onClick={() => createProjectModal()}>
+        <Button type="button" color="brand" size="sm" onClick={() => createProjectModal()}>
           <Icon iconName="circle-plus" />
           New project
         </Button>
@@ -38,7 +38,7 @@ export function ProjectList() {
           description="Create your first project and environments to start deploying apps"
           icon="folder-closed"
         >
-          <Button color="neutral" size="md" className="gap-1.5" onClick={() => createProjectModal()}>
+          <Button color="neutral" size="md" onClick={() => createProjectModal()}>
             <Icon iconName="circle-plus" />
             Create project
           </Button>
diff --git a/libs/domains/service-helm/feature/src/lib/networking-port-setting-modal/__snapshots__/networking-port-setting-modal.spec.tsx.snap b/libs/domains/service-helm/feature/src/lib/networking-port-setting-modal/__snapshots__/networking-port-setting-modal.spec.tsx.snap
index 7429deea20f..ec2b2811cdc 100644
--- a/libs/domains/service-helm/feature/src/lib/networking-port-setting-modal/__snapshots__/networking-port-setting-modal.spec.tsx.snap
+++ b/libs/domains/service-helm/feature/src/lib/networking-port-setting-modal/__snapshots__/networking-port-setting-modal.spec.tsx.snap
@@ -273,14 +273,14 @@ port from the internet. Default value is p&lt;port_number&gt;-&lt;service_name&g
           class="mt-6 flex justify-end gap-3"
         >
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
             data-testid="cancel-button"
             type="button"
           >
             Cancel
           </button>
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
             data-testid="submit-button"
             disabled=""
             type="submit"
@@ -600,14 +600,14 @@ port from the internet. Default value is p&lt;port_number&gt;-&lt;service_name&g
           class="mt-6 flex justify-end gap-3"
         >
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
             data-testid="cancel-button"
             type="button"
           >
             Cancel
           </button>
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
             data-testid="submit-button"
             disabled=""
             type="submit"
diff --git a/libs/domains/service-helm/feature/src/lib/values-override-arguments-setting/__snapshots__/values-override-arguments-setting.spec.tsx.snap b/libs/domains/service-helm/feature/src/lib/values-override-arguments-setting/__snapshots__/values-override-arguments-setting.spec.tsx.snap
index ccb5a997960..c1e363afc45 100644
--- a/libs/domains/service-helm/feature/src/lib/values-override-arguments-setting/__snapshots__/values-override-arguments-setting.spec.tsx.snap
+++ b/libs/domains/service-helm/feature/src/lib/values-override-arguments-setting/__snapshots__/values-override-arguments-setting.spec.tsx.snap
@@ -22,7 +22,7 @@ exports[`ValuesOverrideArgumentsSetting should match snapshot 1`] = `
           </p>
         </div>
         <button
-          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert gap-2"
+          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
           type="button"
         >
           Add Variable
@@ -47,7 +47,7 @@ exports[`ValuesOverrideArgumentsSetting should match snapshot 1`] = `
         />
       </span>
       <button
-        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral mb-10 gap-2"
+        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral mb-10"
         type="button"
       >
         See default values.yaml 
@@ -144,7 +144,7 @@ exports[`ValuesOverrideArgumentsSetting should match snapshot 1`] = `
                 value="test"
               />
               <button
-                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm px-2.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral h-[36px] w-[36px]"
+                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm px-2.5 gap-x-1.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral h-[36px] w-[36px]"
                 type="button"
               >
                 <i
@@ -212,7 +212,7 @@ exports[`ValuesOverrideArgumentsSetting should match snapshot 1`] = `
                 </div>
               </div>
               <button
-                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm px-2.5 rounded-md bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral h-[36px] justify-between"
+                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm px-2.5 gap-x-1.5 rounded-md bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral h-[36px] justify-between"
                 type="button"
               >
                 Close json
@@ -222,7 +222,7 @@ exports[`ValuesOverrideArgumentsSetting should match snapshot 1`] = `
                 />
               </button>
               <button
-                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm px-2.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral h-[36px] w-[36px]"
+                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm px-2.5 gap-x-1.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral h-[36px] w-[36px]"
                 type="button"
               >
                 <i
@@ -301,7 +301,7 @@ exports[`ValuesOverrideArgumentsSetting should match snapshot 1`] = `
                 value="test"
               />
               <button
-                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm px-2.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral h-[36px] w-[36px]"
+                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm px-2.5 gap-x-1.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral h-[36px] w-[36px]"
                 type="button"
               >
                 <i
@@ -340,7 +340,7 @@ exports[`ValuesOverrideArgumentsSetting should match snapshot for the v5-compati
           </p>
         </div>
         <button
-          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert gap-2"
+          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
           type="button"
         >
           Add Variable
@@ -365,7 +365,7 @@ exports[`ValuesOverrideArgumentsSetting should match snapshot for the v5-compati
         />
       </span>
       <button
-        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral mb-10 gap-2"
+        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral mb-10"
         type="button"
       >
         See default values.yaml 
@@ -462,7 +462,7 @@ exports[`ValuesOverrideArgumentsSetting should match snapshot for the v5-compati
                 value="test"
               />
               <button
-                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm px-2.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral h-[36px] w-[36px]"
+                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm px-2.5 gap-x-1.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral h-[36px] w-[36px]"
                 type="button"
               >
                 <i
diff --git a/libs/domains/service-helm/feature/src/lib/values-override-arguments-setting/values-override-arguments-setting.tsx b/libs/domains/service-helm/feature/src/lib/values-override-arguments-setting/values-override-arguments-setting.tsx
index 97882bf42f0..ed915d6b11f 100644
--- a/libs/domains/service-helm/feature/src/lib/values-override-arguments-setting/values-override-arguments-setting.tsx
+++ b/libs/domains/service-helm/feature/src/lib/values-override-arguments-setting/values-override-arguments-setting.tsx
@@ -183,7 +183,6 @@ export function ValuesOverrideArgumentsSetting({
   const addVariableButton = (
     <Button
       type="button"
-      className="gap-2"
       size={isSetting ? 'md' : 'lg'}
       onClick={() =>
         append({
@@ -247,7 +246,7 @@ export function ValuesOverrideArgumentsSetting({
         size="md"
         variant="outline"
         color="neutral"
-        className="mb-10 gap-2"
+        className="mb-10"
         onClick={() => createHelmDefaultValuesMutation()}
       >
         See default values.yaml <Icon className="text-xs" iconName="arrow-up-right-from-square" />
diff --git a/libs/domains/service-helm/feature/src/lib/values-override-files-setting/__snapshots__/values-override-files-setting.spec.tsx.snap b/libs/domains/service-helm/feature/src/lib/values-override-files-setting/__snapshots__/values-override-files-setting.spec.tsx.snap
index ed559636f45..76822c43b1a 100644
--- a/libs/domains/service-helm/feature/src/lib/values-override-files-setting/__snapshots__/values-override-files-setting.spec.tsx.snap
+++ b/libs/domains/service-helm/feature/src/lib/values-override-files-setting/__snapshots__/values-override-files-setting.spec.tsx.snap
@@ -483,12 +483,12 @@ exports[`ValuesOverrideFilesSetting should match snapshot with YAML type 1`] = `
                     No override defined.
                   </p>
                   <button
-                    class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
+                    class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
                     type="button"
                   >
                     <i
                       aria-hidden="true"
-                      class="fa-regular fa-plus mr-2"
+                      class="fa-regular fa-plus "
                     />
                     Create override
                   </button>
diff --git a/libs/domains/service-helm/feature/src/lib/values-override-yaml-modal/__snapshots__/values-override-yaml-modal.spec.tsx.snap b/libs/domains/service-helm/feature/src/lib/values-override-yaml-modal/__snapshots__/values-override-yaml-modal.spec.tsx.snap
index 93e380f375c..9a86e316c72 100644
--- a/libs/domains/service-helm/feature/src/lib/values-override-yaml-modal/__snapshots__/values-override-yaml-modal.spec.tsx.snap
+++ b/libs/domains/service-helm/feature/src/lib/values-override-yaml-modal/__snapshots__/values-override-yaml-modal.spec.tsx.snap
@@ -94,14 +94,14 @@ exports[`ValuesOverrideYamlModal should match snapshot 1`] = `
           class="mt-6 flex justify-end gap-3"
         >
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
             data-testid="cancel-button"
             type="button"
           >
             Cancel
           </button>
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
             data-testid="submit-button"
             disabled=""
             type="submit"
diff --git a/libs/domains/service-job/feature/src/lib/dockerfile-settings/dockerfile-settings.tsx b/libs/domains/service-job/feature/src/lib/dockerfile-settings/dockerfile-settings.tsx
index afa3c031107..15c06e97a42 100644
--- a/libs/domains/service-job/feature/src/lib/dockerfile-settings/dockerfile-settings.tsx
+++ b/libs/domains/service-job/feature/src/lib/dockerfile-settings/dockerfile-settings.tsx
@@ -200,7 +200,7 @@ export function DockerfileSettings({
                       <Icon iconName="wave-pulse" className="text-neutral-subtle" />
                       <p className="mb-3 mt-1 text-xs font-medium text-neutral-subtle">No Dockerfile defined</p>
                       <Button type="button" size="md" onClick={() => openModalDockerfileRaw(field)}>
-                        Create Dockerfile <Icon iconName="pen" className="ml-2" />
+                        Create Dockerfile <Icon iconName="pen" />
                       </Button>
                     </div>
                   )}
diff --git a/libs/domains/service-logs/feature/src/lib/deployment-logs/deployment-logs-placeholder/deployment-logs-placeholder.tsx b/libs/domains/service-logs/feature/src/lib/deployment-logs/deployment-logs-placeholder/deployment-logs-placeholder.tsx
index fafd802f197..d3e1231a51e 100644
--- a/libs/domains/service-logs/feature/src/lib/deployment-logs/deployment-logs-placeholder/deployment-logs-placeholder.tsx
+++ b/libs/domains/service-logs/feature/src/lib/deployment-logs/deployment-logs-placeholder/deployment-logs-placeholder.tsx
@@ -190,7 +190,6 @@ export function DeploymentLogsPlaceholder({
         <ErrorIcon />
         <span className="text-neutral">An error occurred during the precheck step.</span>
         <Link
-          className="gap-1.5"
           as="button"
           variant="surface"
           color="neutral"
@@ -220,7 +219,6 @@ export function DeploymentLogsPlaceholder({
         <ErrorIcon />
         <span className="text-neutral">An error occurred during deployment of another service.</span>
         <Link
-          className="gap-1.5"
           as="button"
           variant="surface"
           color="neutral"
diff --git a/libs/domains/service-logs/feature/src/lib/header-logs/header-logs.tsx b/libs/domains/service-logs/feature/src/lib/header-logs/header-logs.tsx
index cea6bc81c9e..d2bdf9180d4 100644
--- a/libs/domains/service-logs/feature/src/lib/header-logs/header-logs.tsx
+++ b/libs/domains/service-logs/feature/src/lib/header-logs/header-logs.tsx
@@ -105,7 +105,7 @@ export function HeaderLogs({
                         align="start"
                       >
                         <Button variant="outline" color="neutral" size="sm" className="relative">
-                          <div className="flex items-center gap-1">
+                          <div className="flex items-center">
                             <Icon iconName="link" iconStyle="regular" />
                             {pluralize(filteredLinks.length, 'Link', 'Links')}
                             <Icon iconName="angle-down" />
@@ -176,7 +176,7 @@ export function HeaderLogs({
                         align="start"
                       >
                         <Button variant="outline" color="neutral" size="sm" className="relative">
-                          <div className="flex items-center gap-1">
+                          <div className="flex items-center">
                             <Icon iconName="link" iconStyle="regular" />
                             {pluralize(filteredLinks.length, 'Link', 'Links')}
                             <Icon iconName="angle-down" />
diff --git a/libs/domains/service-logs/feature/src/lib/list-deployment-logs/list-deployment-logs.tsx b/libs/domains/service-logs/feature/src/lib/list-deployment-logs/list-deployment-logs.tsx
index cdaa08ddd26..672e04370f4 100644
--- a/libs/domains/service-logs/feature/src/lib/list-deployment-logs/list-deployment-logs.tsx
+++ b/libs/domains/service-logs/feature/src/lib/list-deployment-logs/list-deployment-logs.tsx
@@ -188,7 +188,7 @@ const DeploymentLogsHeader = memo(function DeploymentLogsHeader({
       <div className="flex items-center gap-4">
         <DropdownMenu.Root open={open} onOpenChange={setOpen}>
           <DropdownMenu.Trigger asChild>
-            <Button variant="outline" className="gap-1.5">
+            <Button variant="outline">
               <Icon iconName="clock-rotate-left" className="text-neutral-subtle" />
               {isLastVersion
                 ? 'Latest'
@@ -478,7 +478,6 @@ function DeploymentLogsBody({
             <Button
               color="brand"
               variant="surface"
-              className="gap-1.5"
               onClick={() => {
                 posthog.capture('ai-copilot-troubleshoot-triggered', {
                   source: 'deployment-logs',
diff --git a/libs/domains/service-logs/feature/src/lib/list-service-logs/header-service-logs/header-service-logs.tsx b/libs/domains/service-logs/feature/src/lib/list-service-logs/header-service-logs/header-service-logs.tsx
index 46b96249992..babd51393cf 100644
--- a/libs/domains/service-logs/feature/src/lib/list-service-logs/header-service-logs/header-service-logs.tsx
+++ b/libs/domains/service-logs/feature/src/lib/list-service-logs/header-service-logs/header-service-logs.tsx
@@ -89,7 +89,7 @@ export function HeaderServiceLogs({ logs, isLiveMode, refetchHistoryLogs }: Head
             variant="surface"
             color={isLiveMode ? 'brand' : 'neutral'}
             size="md"
-            className={clsx('gap-1.5 pl-2.5', {
+            className={clsx('pl-2.5', {
               'bg-surface-brand-subtle hover:!bg-surface-brand-component focus:!bg-surface-brand-component': isLiveMode,
             })}
             onClick={() => {
@@ -136,7 +136,6 @@ export function HeaderServiceLogs({ logs, isLiveMode, refetchHistoryLogs }: Head
                 type="button"
                 variant="outline"
                 color="neutral"
-                className="gap-2"
                 size="md"
                 onClick={() => setIsOpenDatePicker(!isOpenDatePicker)}
               >
@@ -171,7 +170,7 @@ export function HeaderServiceLogs({ logs, isLiveMode, refetchHistoryLogs }: Head
           </DatePicker>
           <DropdownMenu.Root>
             <DropdownMenu.Trigger asChild>
-              <Button size="md" variant="outline" color="neutral" className="gap-1.5">
+              <Button size="md" variant="outline" color="neutral">
                 {updateTimeContextValue.utc ? 'UTC' : 'Browser time'}
                 <Icon iconName="chevron-down" iconStyle="regular" />
               </Button>
diff --git a/libs/domains/service-logs/feature/src/lib/service-logs-placeholder/service-logs-placeholder.tsx b/libs/domains/service-logs/feature/src/lib/service-logs-placeholder/service-logs-placeholder.tsx
index b68cc9f8f38..e5b615cabe5 100644
--- a/libs/domains/service-logs/feature/src/lib/service-logs-placeholder/service-logs-placeholder.tsx
+++ b/libs/domains/service-logs/feature/src/lib/service-logs-placeholder/service-logs-placeholder.tsx
@@ -296,7 +296,7 @@ export function ServiceLogsPlaceholder({
               }}
             >
               Go to latest deployment
-              <Icon iconName="arrow-right" className="ml-1" />
+              <Icon iconName="arrow-right" />
             </Link>
           </>
         ) : (
diff --git a/libs/domains/service-logs/feature/src/lib/show-new-logs-button/show-new-logs-button.tsx b/libs/domains/service-logs/feature/src/lib/show-new-logs-button/show-new-logs-button.tsx
index fe941c78735..e42a1d6b2be 100644
--- a/libs/domains/service-logs/feature/src/lib/show-new-logs-button/show-new-logs-button.tsx
+++ b/libs/domains/service-logs/feature/src/lib/show-new-logs-button/show-new-logs-button.tsx
@@ -15,7 +15,7 @@ export function ShowNewLogsButton({ pauseLogs, setPauseLogs, bufferedLogsCount }
   if (pauseLogs) {
     return (
       <Button
-        className="absolute bottom-[7px] left-1/2 flex w-72 -translate-x-1/2 items-center justify-center gap-2 text-sm"
+        className="absolute bottom-[7px] left-1/2 flex w-72 -translate-x-1/2 items-center justify-center text-sm"
         variant="solid"
         radius="full"
         size="md"
diff --git a/libs/domains/service-settings/feature/src/lib/application-container-port-settings/application-container-port-settings/application-container-port-settings-list.tsx b/libs/domains/service-settings/feature/src/lib/application-container-port-settings/application-container-port-settings/application-container-port-settings-list.tsx
index e0b1e8b4d38..33727ce11b2 100644
--- a/libs/domains/service-settings/feature/src/lib/application-container-port-settings/application-container-port-settings/application-container-port-settings-list.tsx
+++ b/libs/domains/service-settings/feature/src/lib/application-container-port-settings/application-container-port-settings/application-container-port-settings-list.tsx
@@ -30,7 +30,7 @@ export function ApplicationContainerPortSettingsList({
         >
           <Button size="md" variant="solid" color="brand" type="button" data-testid="add-button" onClick={onAddPort}>
             Add port
-            <Icon iconName="circle-plus" iconStyle="regular" className="ml-2" />
+            <Icon iconName="circle-plus" iconStyle="regular" />
           </Button>
         </SettingsHeading>
       </div>
diff --git a/libs/domains/service-settings/feature/src/lib/application-container-storage-settings/application-container-storage-settings/application-container-storage-settings.tsx b/libs/domains/service-settings/feature/src/lib/application-container-storage-settings/application-container-storage-settings/application-container-storage-settings.tsx
index 7c4daffe139..abc727f789d 100644
--- a/libs/domains/service-settings/feature/src/lib/application-container-storage-settings/application-container-storage-settings/application-container-storage-settings.tsx
+++ b/libs/domains/service-settings/feature/src/lib/application-container-storage-settings/application-container-storage-settings/application-container-storage-settings.tsx
@@ -193,7 +193,6 @@ export function ApplicationContainerStorageSettings() {
               type="button"
               onClick={() => openStorageModal()}
               disabled={disableAdd}
-              className="gap-2"
             >
               Add Storage
               <Icon iconName="circle-plus" iconStyle="regular" />
diff --git a/libs/domains/service-settings/feature/src/lib/helm-networking-settings/helm-networking-settings.tsx b/libs/domains/service-settings/feature/src/lib/helm-networking-settings/helm-networking-settings.tsx
index 2dfd57a84e9..b69af6658c0 100644
--- a/libs/domains/service-settings/feature/src/lib/helm-networking-settings/helm-networking-settings.tsx
+++ b/libs/domains/service-settings/feature/src/lib/helm-networking-settings/helm-networking-settings.tsx
@@ -142,7 +142,7 @@ export function HelmNetworkingSettings({ children }: HelmNetworkingSettingsProps
           title="Networking"
           description="You can expose publicly over HTTP/gRPC the Kubernetes services deployed."
         >
-          <Button className="gap-2" size="md" variant="solid" color="brand" onClick={onAddPortClick}>
+          <Button size="md" variant="solid" color="brand" onClick={onAddPortClick}>
             Add Port
             <Icon iconName="plus-circle" iconStyle="regular" />
           </Button>
diff --git a/libs/domains/service-settings/feature/src/lib/service-deployment-restrictions-settings/service-deployment-restrictions-settings/service-deployment-restrictions-settings.tsx b/libs/domains/service-settings/feature/src/lib/service-deployment-restrictions-settings/service-deployment-restrictions-settings/service-deployment-restrictions-settings.tsx
index 5c70c234828..6252e35c408 100644
--- a/libs/domains/service-settings/feature/src/lib/service-deployment-restrictions-settings/service-deployment-restrictions-settings/service-deployment-restrictions-settings.tsx
+++ b/libs/domains/service-settings/feature/src/lib/service-deployment-restrictions-settings/service-deployment-restrictions-settings/service-deployment-restrictions-settings.tsx
@@ -82,7 +82,6 @@ export function ServiceDeploymentRestrictionsSettings() {
             variant="solid"
             color="brand"
             type="button"
-            className="gap-2"
             onClick={() => openCrudModal()}
             disabled={!isSupportedService(service)}
           >
diff --git a/libs/domains/service-settings/feature/src/lib/service-domain-settings/service-domain-settings/service-domain-settings.tsx b/libs/domains/service-settings/feature/src/lib/service-domain-settings/service-domain-settings/service-domain-settings.tsx
index ed11e4c1025..bf8aa907913 100644
--- a/libs/domains/service-settings/feature/src/lib/service-domain-settings/service-domain-settings/service-domain-settings.tsx
+++ b/libs/domains/service-settings/feature/src/lib/service-domain-settings/service-domain-settings/service-domain-settings.tsx
@@ -80,7 +80,7 @@ export function ServiceDomainSettings() {
             disabled={!canAddDomain}
           >
             Add Domain
-            <Icon iconName="circle-plus" iconStyle="regular" className="ml-2" />
+            <Icon iconName="circle-plus" iconStyle="regular" />
           </Button>
         </SettingsHeading>
 
@@ -281,7 +281,6 @@ function ServiceDomainSettingsContent({
             <Link
               to={noPublicLinkCta.to}
               params={{ organizationId, projectId, environmentId, serviceId }}
-              className="gap-1"
               variant="solid"
               color="brand"
               as="button"
diff --git a/libs/domains/service-settings/feature/src/lib/terraform-variables-settings/terraform-tfvars-popover/terraform-tfvars-popover.tsx b/libs/domains/service-settings/feature/src/lib/terraform-variables-settings/terraform-tfvars-popover/terraform-tfvars-popover.tsx
index 1d297993fa9..942e9927689 100644
--- a/libs/domains/service-settings/feature/src/lib/terraform-variables-settings/terraform-tfvars-popover/terraform-tfvars-popover.tsx
+++ b/libs/domains/service-settings/feature/src/lib/terraform-variables-settings/terraform-tfvars-popover/terraform-tfvars-popover.tsx
@@ -157,19 +157,13 @@ export const TfvarsFilesPopover = () => {
                 </span>
               }
             >
-              <Button
-                size="md"
-                variant="outline"
-                className="gap-1.5"
-                type="button"
-                data-testid="open-tfvars-files-button"
-              >
+              <Button size="md" variant="outline" type="button" data-testid="open-tfvars-files-button">
                 <Icon iconName="file-lines" iconStyle="regular" />
                 .tfvars files
               </Button>
             </Indicator>
           ) : (
-            <Button size="md" variant="solid" className="gap-1.5" type="button" data-testid="open-tfvars-files-button">
+            <Button size="md" variant="solid" type="button" data-testid="open-tfvars-files-button">
               <Icon iconName="file-lines" iconStyle="regular" />
               .tfvars files
             </Button>
diff --git a/libs/domains/service-terraform/feature/src/lib/terraform-variables-settings/dockerfile-fragment-inline-setting/__snapshots__/dockerfile-fragment-inline-setting.spec.tsx.snap b/libs/domains/service-terraform/feature/src/lib/terraform-variables-settings/dockerfile-fragment-inline-setting/__snapshots__/dockerfile-fragment-inline-setting.spec.tsx.snap
index 59731808ac1..b0805812c08 100644
--- a/libs/domains/service-terraform/feature/src/lib/terraform-variables-settings/dockerfile-fragment-inline-setting/__snapshots__/dockerfile-fragment-inline-setting.spec.tsx.snap
+++ b/libs/domains/service-terraform/feature/src/lib/terraform-variables-settings/dockerfile-fragment-inline-setting/__snapshots__/dockerfile-fragment-inline-setting.spec.tsx.snap
@@ -22,7 +22,7 @@ exports[`DockerfileFragmentInlineSetting should match snapshot with content 1`]
         </h2>
         <button
           aria-label="Edit Commands"
-          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-6 rounded w-6 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral justify-center p-0"
+          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-6 gap-x-1 rounded w-6 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral justify-center p-0"
           type="button"
         >
           <i
@@ -92,12 +92,12 @@ exports[`DockerfileFragmentInlineSetting should match snapshot without content 1
             No commands defined.
           </p>
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
             type="button"
           >
             <i
               aria-hidden="true"
-              class="fa-regular fa-plus mr-2"
+              class="fa-regular fa-plus "
             />
             Add commands
           </button>
diff --git a/libs/domains/service-terraform/feature/src/lib/terraform-variables-settings/terraform-tfvars-popover/terraform-tfvars-popover.tsx b/libs/domains/service-terraform/feature/src/lib/terraform-variables-settings/terraform-tfvars-popover/terraform-tfvars-popover.tsx
index 500d2819ba3..c02e1df83e4 100644
--- a/libs/domains/service-terraform/feature/src/lib/terraform-variables-settings/terraform-tfvars-popover/terraform-tfvars-popover.tsx
+++ b/libs/domains/service-terraform/feature/src/lib/terraform-variables-settings/terraform-tfvars-popover/terraform-tfvars-popover.tsx
@@ -156,19 +156,13 @@ export const TfvarsFilesPopover = () => {
                 </span>
               }
             >
-              <Button
-                size="md"
-                variant="outline"
-                className="gap-1.5"
-                type="button"
-                data-testid="open-tfvars-files-button"
-              >
+              <Button size="md" variant="outline" type="button" data-testid="open-tfvars-files-button">
                 <Icon iconName="file-lines" iconStyle="regular" />
                 .tfvars files
               </Button>
             </Indicator>
           ) : (
-            <Button size="md" variant="solid" className="gap-1.5" type="button" data-testid="open-tfvars-files-button">
+            <Button size="md" variant="solid" type="button" data-testid="open-tfvars-files-button">
               <Icon iconName="file-lines" iconStyle="regular" />
               .tfvars files
             </Button>
diff --git a/libs/domains/service-terraform/feature/src/lib/terraform-variables-settings/terraform-variables-table/terraform-variables-table.tsx b/libs/domains/service-terraform/feature/src/lib/terraform-variables-settings/terraform-variables-table/terraform-variables-table.tsx
index 54f074336f4..4934d7455c6 100644
--- a/libs/domains/service-terraform/feature/src/lib/terraform-variables-settings/terraform-variables-table/terraform-variables-table.tsx
+++ b/libs/domains/service-terraform/feature/src/lib/terraform-variables-settings/terraform-variables-table/terraform-variables-table.tsx
@@ -406,12 +406,12 @@ export const TerraformVariablesTable = () => {
         className={twMerge('flex items-center px-4 py-3', selectedRows.length > 0 ? 'justify-between' : 'justify-end')}
       >
         {selectedRows.length > 0 && (
-          <Button size="md" variant="solid" color="red" className="gap-1.5" type="button" onClick={deleteSelectedRows}>
+          <Button size="md" variant="solid" color="red" type="button" onClick={deleteSelectedRows}>
             <Icon iconName="trash-can" iconStyle="regular" />
             Delete selected
           </Button>
         )}
-        <Button size="md" variant="outline" className="gap-1.5" type="button" onClick={onAddVariable}>
+        <Button size="md" variant="outline" type="button" onClick={onAddVariable}>
           Add variable
           <Icon iconName="plus" iconStyle="regular" />
         </Button>
diff --git a/libs/domains/services/feature/src/lib/auto-deploy-badge/auto-deploy-badge.tsx b/libs/domains/services/feature/src/lib/auto-deploy-badge/auto-deploy-badge.tsx
index 440c807f008..c43aed27fdc 100644
--- a/libs/domains/services/feature/src/lib/auto-deploy-badge/auto-deploy-badge.tsx
+++ b/libs/domains/services/feature/src/lib/auto-deploy-badge/auto-deploy-badge.tsx
@@ -68,7 +68,7 @@ export function AutoDeployBadge({ serviceId }: AutoDeployBadgeProps) {
         {isLoading ? (
           <LoaderSpinner classWidth="w-3 ml-0.5" />
         ) : (
-          config && <Icon iconName={config.icon} className={`ml-1 text-xs ${config.iconClassName}`} />
+          config && <Icon iconName={config.icon} className={`text-xs ${config.iconClassName}`} />
         )}
       </Link>
     </Tooltip>
diff --git a/libs/domains/services/feature/src/lib/confirmation-cancel-lifecycle-modal/__snapshots__/confirmation-cancel-lifecycle-modal.spec.tsx.snap b/libs/domains/services/feature/src/lib/confirmation-cancel-lifecycle-modal/__snapshots__/confirmation-cancel-lifecycle-modal.spec.tsx.snap
index 4669c0b9747..cc930d4ce09 100644
--- a/libs/domains/services/feature/src/lib/confirmation-cancel-lifecycle-modal/__snapshots__/confirmation-cancel-lifecycle-modal.spec.tsx.snap
+++ b/libs/domains/services/feature/src/lib/confirmation-cancel-lifecycle-modal/__snapshots__/confirmation-cancel-lifecycle-modal.spec.tsx.snap
@@ -56,14 +56,14 @@ exports[`ConfirmationCancelLifecycleModal should match snapshot 1`] = `
         class="mt-6 flex justify-end gap-3"
       >
         <button
-          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
+          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
           data-testid="cancel-button"
           type="button"
         >
           Cancel
         </button>
         <button
-          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
+          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
           data-testid="submit-button"
           disabled=""
           type="submit"
diff --git a/libs/domains/services/feature/src/lib/force-unlock-modal/__snapshots__/force-unlock-modal.spec.tsx.snap b/libs/domains/services/feature/src/lib/force-unlock-modal/__snapshots__/force-unlock-modal.spec.tsx.snap
index 7bf90b15b8a..68a2f1ea741 100644
--- a/libs/domains/services/feature/src/lib/force-unlock-modal/__snapshots__/force-unlock-modal.spec.tsx.snap
+++ b/libs/domains/services/feature/src/lib/force-unlock-modal/__snapshots__/force-unlock-modal.spec.tsx.snap
@@ -67,14 +67,14 @@ exports[`ForceUnlockModal should match snapshot 1`] = `
         class="mt-6 flex justify-end gap-3"
       >
         <button
-          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
+          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
           data-testid="cancel-button"
           type="button"
         >
           Cancel
         </button>
         <button
-          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
+          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
           data-testid="submit-button"
           disabled=""
           type="submit"
diff --git a/libs/domains/services/feature/src/lib/last-commit/__snapshots__/last-commit.spec.tsx.snap b/libs/domains/services/feature/src/lib/last-commit/__snapshots__/last-commit.spec.tsx.snap
index 0c8783bc3d4..d80ee23e3ce 100644
--- a/libs/domains/services/feature/src/lib/last-commit/__snapshots__/last-commit.spec.tsx.snap
+++ b/libs/domains/services/feature/src/lib/last-commit/__snapshots__/last-commit.spec.tsx.snap
@@ -11,7 +11,7 @@ exports[`LastCommit should match snapshot 1`] = `
         data-state="closed"
       >
         <button
-          class="items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-6 px-1.5 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral flex min-w-[81px] justify-center gap-1 pl-1 rounded-r-none border-r-0"
+          class="items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-6 px-1.5 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral flex min-w-[81px] justify-center pl-1 rounded-r-none border-r-0"
           type="button"
         >
           <i
@@ -23,7 +23,7 @@ exports[`LastCommit should match snapshot 1`] = `
       </span>
       <button
         aria-label="Deploy from another version"
-        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-6 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-7 justify-center gap-1 rounded-l-none px-1.5"
+        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-6 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-7 justify-center rounded-l-none px-1.5"
         data-state="closed"
         type="button"
       >
diff --git a/libs/domains/services/feature/src/lib/last-commit/last-commit.tsx b/libs/domains/services/feature/src/lib/last-commit/last-commit.tsx
index d66b8647aa6..bbcd1d26a4d 100644
--- a/libs/domains/services/feature/src/lib/last-commit/last-commit.tsx
+++ b/libs/domains/services/feature/src/lib/last-commit/last-commit.tsx
@@ -91,7 +91,7 @@ export function LastCommit({
               variant="outline"
               color="neutral"
               size="xs"
-              className={clsx('gap-1 pl-1', {
+              className={clsx('pl-1', {
                 'rounded-r-none border-r-0': showDeployFromAnotherVersionButton,
               })}
               onMouseEnter={() => setHover(true)}
@@ -111,7 +111,8 @@ export function LastCommit({
             variant={delta > 0 ? 'solid' : 'outline'}
             color={delta > 0 ? 'brand' : 'neutral'}
             size="xs"
-            className="w-7 justify-center gap-1 rounded-l-none px-1.5"
+            iconOnly
+            className="w-7 justify-center rounded-l-none px-1.5"
             onClick={deployCommitVersion}
           >
             <span className="flex h-full items-center justify-center">
diff --git a/libs/domains/services/feature/src/lib/last-version/__snapshots__/last-version.spec.tsx.snap b/libs/domains/services/feature/src/lib/last-version/__snapshots__/last-version.spec.tsx.snap
index 91429d75203..fa25e27a034 100644
--- a/libs/domains/services/feature/src/lib/last-version/__snapshots__/last-version.spec.tsx.snap
+++ b/libs/domains/services/feature/src/lib/last-version/__snapshots__/last-version.spec.tsx.snap
@@ -16,7 +16,8 @@ exports[`LastVersion should match snapshot 1`] = `
         </span>
       </span>
       <button
-        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-6 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-7 justify-center gap-1 rounded-l-none px-1.5"
+        aria-label="Deploy from another version"
+        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-6 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-7 justify-center rounded-l-none px-1.5"
         data-state="closed"
         type="button"
       >
diff --git a/libs/domains/services/feature/src/lib/last-version/last-version.tsx b/libs/domains/services/feature/src/lib/last-version/last-version.tsx
index 0110e39d7a0..e18f75bf9b0 100644
--- a/libs/domains/services/feature/src/lib/last-version/last-version.tsx
+++ b/libs/domains/services/feature/src/lib/last-version/last-version.tsx
@@ -125,9 +125,11 @@ export function LastVersion({ organizationId, projectId, service, version }: Las
       <Tooltip content="Deploy from another version">
         <Button
           type="button"
+          aria-label="Deploy from another version"
           variant="outline"
           size="xs"
-          className="w-7 justify-center gap-1 rounded-l-none px-1.5"
+          iconOnly
+          className="w-7 justify-center rounded-l-none px-1.5"
           onClick={(e) => deployVersion(e)}
         >
           <span className="flex h-full items-center justify-center">
diff --git a/libs/domains/services/feature/src/lib/pod-details/__snapshots__/pod-details.spec.tsx.snap b/libs/domains/services/feature/src/lib/pod-details/__snapshots__/pod-details.spec.tsx.snap
index 9ea17abdbff..a748a11ce3f 100644
--- a/libs/domains/services/feature/src/lib/pod-details/__snapshots__/pod-details.spec.tsx.snap
+++ b/libs/domains/services/feature/src/lib/pod-details/__snapshots__/pod-details.spec.tsx.snap
@@ -7,7 +7,7 @@ exports[`PodDetails should match snapshot with container based pod and with mult
       class="relative flex flex-col gap-y-3 overflow-hidden bg-surface-neutral-subtle pb-4 pl-4 pr-20 pt-3"
     >
       <a
-        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 px-2 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral relative z-dropdown max-w-fit gap-0.5"
+        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 px-2 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral relative z-dropdown max-w-fit"
         params="[object Object]"
         search="[object Object]"
         to="/organization/$organizationId/project/$projectId/environment/$environmentId/service/$serviceId/service-logs"
@@ -143,7 +143,7 @@ exports[`PodDetails should match snapshot with git based pod and with last_termi
       class="relative flex flex-col gap-y-3 overflow-hidden bg-surface-neutral-subtle pb-4 pl-4 pr-20 pt-3"
     >
       <a
-        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 px-2 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral relative z-dropdown max-w-fit gap-0.5"
+        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 px-2 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral relative z-dropdown max-w-fit"
         params="[object Object]"
         search="[object Object]"
         to="/organization/$organizationId/project/$projectId/environment/$environmentId/service/$serviceId/service-logs"
@@ -270,7 +270,7 @@ exports[`PodDetails should match snapshot with git based pod and without last_te
       class="relative flex flex-col gap-y-3 overflow-hidden bg-surface-neutral-subtle pb-4 pl-4 pr-20 pt-3"
     >
       <a
-        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 px-2 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral relative z-dropdown max-w-fit gap-0.5"
+        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 px-2 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral relative z-dropdown max-w-fit"
         params="[object Object]"
         search="[object Object]"
         to="/organization/$organizationId/project/$projectId/environment/$environmentId/service/$serviceId/service-logs"
@@ -366,7 +366,7 @@ exports[`PodDetails should match snapshot with pod error with 0 containers 1`] =
       class="relative flex flex-col gap-y-3 overflow-hidden bg-surface-neutral-subtle pb-4 pl-4 pr-20 pt-3"
     >
       <a
-        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 px-2 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral relative z-dropdown max-w-fit gap-0.5"
+        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 px-2 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral relative z-dropdown max-w-fit"
         params="[object Object]"
         search="[object Object]"
         to="/organization/$organizationId/project/$projectId/environment/$environmentId/service/$serviceId/service-logs"
diff --git a/libs/domains/services/feature/src/lib/pod-details/pod-details.tsx b/libs/domains/services/feature/src/lib/pod-details/pod-details.tsx
index e3e5ba30ac8..15361ba02f3 100644
--- a/libs/domains/services/feature/src/lib/pod-details/pod-details.tsx
+++ b/libs/domains/services/feature/src/lib/pod-details/pod-details.tsx
@@ -62,7 +62,7 @@ export function PodDetails({ pod, serviceId, serviceType }: PodDetailsProps) {
         size="sm"
         color="neutral"
         variant="outline"
-        className="relative z-dropdown max-w-fit gap-0.5"
+        className="relative z-dropdown max-w-fit"
       >
         Logs
         <Icon iconName="scroll" />
diff --git a/libs/domains/services/feature/src/lib/redeploy-modal/__snapshots__/redeploy-modal.spec.tsx.snap b/libs/domains/services/feature/src/lib/redeploy-modal/__snapshots__/redeploy-modal.spec.tsx.snap
index c4aeea47b42..6ce6059d4f3 100644
--- a/libs/domains/services/feature/src/lib/redeploy-modal/__snapshots__/redeploy-modal.spec.tsx.snap
+++ b/libs/domains/services/feature/src/lib/redeploy-modal/__snapshots__/redeploy-modal.spec.tsx.snap
@@ -71,14 +71,14 @@ exports[`RedeployModal should match snapshot 1`] = `
           class="mt-6 flex justify-end gap-3"
         >
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
             data-testid="cancel-button"
             type="button"
           >
             Cancel
           </button>
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
             data-testid="submit-button"
             disabled=""
             type="submit"
diff --git a/libs/domains/services/feature/src/lib/select-commit-modal/__snapshots__/select-commit-modal.spec.tsx.snap b/libs/domains/services/feature/src/lib/select-commit-modal/__snapshots__/select-commit-modal.spec.tsx.snap
index 606bccaa0a3..38729b58872 100644
--- a/libs/domains/services/feature/src/lib/select-commit-modal/__snapshots__/select-commit-modal.spec.tsx.snap
+++ b/libs/domains/services/feature/src/lib/select-commit-modal/__snapshots__/select-commit-modal.spec.tsx.snap
@@ -258,12 +258,12 @@ exports[`SelectCommitModal should match snapshot 1`] = `
       class="absolute bottom-0 left-0 flex w-full justify-end gap-3 rounded-b-md bg-background p-5"
     >
       <button
-        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 rounded-lg bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
+        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
       >
         Cancel
       </button>
       <button
-        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
+        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
         disabled=""
       >
         Deploy
diff --git a/libs/domains/services/feature/src/lib/select-version-modal/__snapshots__/select-version-modal.spec.tsx.snap b/libs/domains/services/feature/src/lib/select-version-modal/__snapshots__/select-version-modal.spec.tsx.snap
index 371b52416f6..36e75e65886 100644
--- a/libs/domains/services/feature/src/lib/select-version-modal/__snapshots__/select-version-modal.spec.tsx.snap
+++ b/libs/domains/services/feature/src/lib/select-version-modal/__snapshots__/select-version-modal.spec.tsx.snap
@@ -136,12 +136,12 @@ exports[`SelectVersionModal should match snapshot 1`] = `
       class="flex justify-end gap-3"
     >
       <button
-        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
+        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
       >
         Cancel
       </button>
       <button
-        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
+        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
         disabled=""
       >
         Deploy
@@ -280,12 +280,12 @@ exports[`SelectVersionModal should match snapshot with helm version 1`] = `
       class="flex justify-end gap-3"
     >
       <button
-        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
+        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
       >
         Cancel
       </button>
       <button
-        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
+        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
       >
         Deploy
       </button>
diff --git a/libs/domains/services/feature/src/lib/service-access-modal/copy-button/copy-button.tsx b/libs/domains/services/feature/src/lib/service-access-modal/copy-button/copy-button.tsx
index 66ba297c8f1..d05d7699fdc 100644
--- a/libs/domains/services/feature/src/lib/service-access-modal/copy-button/copy-button.tsx
+++ b/libs/domains/services/feature/src/lib/service-access-modal/copy-button/copy-button.tsx
@@ -25,7 +25,7 @@ export function CopyButton({ content }: CopyButtonProps) {
       color="neutral"
       variant="surface"
       onClick={() => onClickCopyToClipboard(content)}
-      className="cursor-pointer gap-2 font-sans font-medium"
+      className="cursor-pointer font-sans font-medium"
     >
       Copy
       <Icon iconName={icon} className="text-xs" />
diff --git a/libs/domains/services/feature/src/lib/service-access-modal/service-access-modal.tsx b/libs/domains/services/feature/src/lib/service-access-modal/service-access-modal.tsx
index dc6ee918f40..0b88601809b 100644
--- a/libs/domains/services/feature/src/lib/service-access-modal/service-access-modal.tsx
+++ b/libs/domains/services/feature/src/lib/service-access-modal/service-access-modal.tsx
@@ -81,7 +81,7 @@ function SectionDatabaseConnectionUri({ service }: { service: Database }) {
         Get the connection URI and connect to the database with your favourite client.
       </p>
       <Button
-        className="max-w-max gap-2"
+        className="max-w-max"
         color="neutral"
         variant="outline"
         size="md"
diff --git a/libs/domains/services/feature/src/lib/service-actions/__snapshots__/service-actions.spec.tsx.snap b/libs/domains/services/feature/src/lib/service-actions/__snapshots__/service-actions.spec.tsx.snap
index fcd5520a9cf..23e31f75301 100644
--- a/libs/domains/services/feature/src/lib/service-actions/__snapshots__/service-actions.spec.tsx.snap
+++ b/libs/domains/services/feature/src/lib/service-actions/__snapshots__/service-actions.spec.tsx.snap
@@ -22,7 +22,7 @@ exports[`ServiceActions should match manage deployment snapshot 1`] = `
       aria-expanded="true"
       aria-haspopup="menu"
       aria-label="Manage Deployment"
-      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-warning-strong text-xs h-7 justify-center px-0 rounded w-7 border border-warning-subtle text-warning hover:border-warning-component hover:bg-surface-warning-subtle data-[state=open]:bg-surface-warning-subtle"
+      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-warning-strong text-ssm h-7 gap-x-1 justify-center px-0 rounded w-7 border border-warning-subtle text-warning hover:border-warning-component hover:bg-surface-warning-subtle data-[state=open]:bg-surface-warning-subtle"
       data-state="open"
       id="radix-:r6:"
       type="button"
@@ -38,7 +38,7 @@ exports[`ServiceActions should match manage deployment snapshot 1`] = `
       </div>
     </button>
     <a
-      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 justify-center px-0 rounded w-7 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
+      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 gap-x-1 justify-center px-0 rounded w-7 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
       data-state="closed"
       to="/organization/$organizationId/project/$projectId/environment/$environmentId/service/$serviceId/service-logs"
     >
@@ -51,7 +51,7 @@ exports[`ServiceActions should match manage deployment snapshot 1`] = `
       aria-expanded="false"
       aria-haspopup="menu"
       aria-label="Other actions"
-      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 justify-center px-0 rounded w-7 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
+      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 gap-x-1 justify-center px-0 rounded w-7 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
       data-state="closed"
       id="radix-:ra:"
       type="button"
@@ -160,7 +160,7 @@ exports[`ServiceActions should match other actions snapshot 1`] = `
       aria-expanded="false"
       aria-haspopup="menu"
       aria-label="Manage Deployment"
-      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-warning-strong text-xs h-7 justify-center px-0 rounded w-7 border border-warning-subtle text-warning hover:border-warning-component hover:bg-surface-warning-subtle data-[state=open]:bg-surface-warning-subtle"
+      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-warning-strong text-ssm h-7 gap-x-1 justify-center px-0 rounded w-7 border border-warning-subtle text-warning hover:border-warning-component hover:bg-surface-warning-subtle data-[state=open]:bg-surface-warning-subtle"
       data-state="closed"
       id="radix-:rm:"
       type="button"
@@ -176,7 +176,7 @@ exports[`ServiceActions should match other actions snapshot 1`] = `
       </div>
     </button>
     <a
-      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 justify-center px-0 rounded w-7 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
+      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 gap-x-1 justify-center px-0 rounded w-7 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
       data-state="closed"
       to="/organization/$organizationId/project/$projectId/environment/$environmentId/service/$serviceId/service-logs"
     >
@@ -190,7 +190,7 @@ exports[`ServiceActions should match other actions snapshot 1`] = `
       aria-expanded="true"
       aria-haspopup="menu"
       aria-label="Other actions"
-      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 justify-center px-0 rounded w-7 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
+      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 gap-x-1 justify-center px-0 rounded w-7 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral"
       data-state="open"
       id="radix-:rq:"
       type="button"
diff --git a/libs/domains/services/feature/src/lib/service-clone-modal/__snapshots__/service-clone-modal.spec.tsx.snap b/libs/domains/services/feature/src/lib/service-clone-modal/__snapshots__/service-clone-modal.spec.tsx.snap
index f776982e7e0..ad2503ba96e 100644
--- a/libs/domains/services/feature/src/lib/service-clone-modal/__snapshots__/service-clone-modal.spec.tsx.snap
+++ b/libs/domains/services/feature/src/lib/service-clone-modal/__snapshots__/service-clone-modal.spec.tsx.snap
@@ -317,14 +317,14 @@ exports[`ServiceCloneModal should match snapshot 1`] = `
         class="mt-6 flex justify-end gap-3"
       >
         <button
-          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
+          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
           data-testid="cancel-button"
           type="button"
         >
           Cancel
         </button>
         <button
-          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
+          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
           data-testid="submit-button"
           disabled=""
           type="submit"
diff --git a/libs/domains/services/feature/src/lib/service-creation-flow/application-container/application-container-port/application-container-port-list/application-container-port-list.tsx b/libs/domains/services/feature/src/lib/service-creation-flow/application-container/application-container-port/application-container-port-list/application-container-port-list.tsx
index 3ad8ba3c855..dd04b450a64 100644
--- a/libs/domains/services/feature/src/lib/service-creation-flow/application-container/application-container-port/application-container-port-list/application-container-port-list.tsx
+++ b/libs/domains/services/feature/src/lib/service-creation-flow/application-container/application-container-port/application-container-port-list/application-container-port-list.tsx
@@ -64,7 +64,7 @@ export function ApplicationContainerPortList({
           <div className="flex items-center justify-end px-4 py-3">
             <Button data-testid="add-button" size="md" variant="solid" color="brand" type="button" onClick={onAddPort}>
               Add port
-              <Icon iconName="circle-plus" iconStyle="regular" className="ml-2" />
+              <Icon iconName="circle-plus" iconStyle="regular" />
             </Button>
           </div>
         </BlockContent>
diff --git a/libs/domains/services/feature/src/lib/service-deployment-list/service-deployment-list.tsx b/libs/domains/services/feature/src/lib/service-deployment-list/service-deployment-list.tsx
index 7a711477b07..83284bfea58 100644
--- a/libs/domains/services/feature/src/lib/service-deployment-list/service-deployment-list.tsx
+++ b/libs/domains/services/feature/src/lib/service-deployment-list/service-deployment-list.tsx
@@ -326,7 +326,7 @@ export function ServiceDeploymentList({ environment, serviceId }: ServiceDeploym
                 >
                   <span>
                     <CopyToClipboard text={commit.git_commit_id} className="inline-flex justify-center">
-                      <Button type="button" variant="surface" color="neutral" size="xs" className="group gap-1">
+                      <Button type="button" variant="surface" color="neutral" size="xs" className="group">
                         <span className="group-hover:hidden">
                           <Icon iconName="copy" iconStyle="solid" className="w-4" />
                         </span>
@@ -359,7 +359,7 @@ export function ServiceDeploymentList({ environment, serviceId }: ServiceDeploym
                   >
                     <span>
                       <CopyToClipboard text={repository.chart_version} className="inline-flex justify-center">
-                        <Button type="button" variant="surface" color="neutral" size="xs" className="group gap-1">
+                        <Button type="button" variant="surface" color="neutral" size="xs" className="group">
                           <span className="group-hover:hidden">
                             <Icon iconName="copy" iconStyle="solid" className="w-4" />
                           </span>
@@ -391,7 +391,7 @@ export function ServiceDeploymentList({ environment, serviceId }: ServiceDeploym
                   >
                     <span>
                       <CopyToClipboard text={tag} className="inline-flex justify-center">
-                        <Button type="button" variant="surface" color="neutral" size="xs" className="group gap-1">
+                        <Button type="button" variant="surface" color="neutral" size="xs" className="group">
                           <span className="group-hover:hidden">
                             <Icon iconName="copy" iconStyle="solid" className="w-4" />
                           </span>
diff --git a/libs/domains/services/feature/src/lib/service-deployment-list/table-filter-trigger-by/table-filter-trigger-by.tsx b/libs/domains/services/feature/src/lib/service-deployment-list/table-filter-trigger-by/table-filter-trigger-by.tsx
index eeb3a6e6416..5653f4dd8e8 100644
--- a/libs/domains/services/feature/src/lib/service-deployment-list/table-filter-trigger-by/table-filter-trigger-by.tsx
+++ b/libs/domains/services/feature/src/lib/service-deployment-list/table-filter-trigger-by/table-filter-trigger-by.tsx
@@ -79,7 +79,7 @@ export function TableFilterTriggerBy({
         <div className="relative inline-block">
           <Popover.Trigger>
             <Button
-              className={twMerge('gap-1 whitespace-nowrap text-xs', column.getIsFiltered() ? 'pr-6' : '')}
+              className={twMerge('whitespace-nowrap text-xs', column.getIsFiltered() ? 'pr-6' : '')}
               color={column.getIsFiltered() ? 'brand' : 'neutral'}
               variant={column.getIsFiltered() ? 'solid' : 'surface'}
             >
diff --git a/libs/domains/services/feature/src/lib/service-list/__snapshots__/service-list-action-bar.spec.tsx.snap b/libs/domains/services/feature/src/lib/service-list/__snapshots__/service-list-action-bar.spec.tsx.snap
index 4f328389e0f..d7c575164c9 100644
--- a/libs/domains/services/feature/src/lib/service-list/__snapshots__/service-list-action-bar.spec.tsx.snap
+++ b/libs/domains/services/feature/src/lib/service-list/__snapshots__/service-list-action-bar.spec.tsx.snap
@@ -29,7 +29,7 @@ exports[`ServiceListActionBar should match snapshot 1`] = `
             class="flex gap-3"
           >
             <button
-              class="inline-flex shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-8 px-2.5 rounded-md bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert items-center gap-2"
+              class="inline-flex shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert items-center"
             >
               Deploy selected 
               <i
@@ -40,7 +40,7 @@ exports[`ServiceListActionBar should match snapshot 1`] = `
             <button
               aria-expanded="false"
               aria-haspopup="menu"
-              class="inline-flex shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 rounded-md bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral items-center gap-2"
+              class="inline-flex shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral items-center"
               data-state="closed"
               id="radix-:rf:"
               type="button"
diff --git a/libs/domains/services/feature/src/lib/service-list/__snapshots__/service-list.spec.tsx.snap b/libs/domains/services/feature/src/lib/service-list/__snapshots__/service-list.spec.tsx.snap
index d8c876a09e9..5e401915a88 100644
--- a/libs/domains/services/feature/src/lib/service-list/__snapshots__/service-list.spec.tsx.snap
+++ b/libs/domains/services/feature/src/lib/service-list/__snapshots__/service-list.spec.tsx.snap
@@ -237,7 +237,7 @@ exports[`ServiceList should match snapshot 1`] = `
                         aria-expanded="false"
                         aria-haspopup="dialog"
                         aria-label="Links"
-                        class="items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-6 rounded-full justify-center px-0 w-6 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral hidden"
+                        class="items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-6 gap-x-1 rounded-full justify-center px-0 w-6 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral hidden"
                         data-state="closed"
                         type="button"
                       >
@@ -424,7 +424,7 @@ exports[`ServiceList should match snapshot 1`] = `
                         data-state="closed"
                       >
                         <button
-                          class="items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-6 px-1.5 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral flex min-w-[81px] justify-center gap-1 pl-1 rounded-r-none border-r-0"
+                          class="items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-6 px-1.5 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral flex min-w-[81px] justify-center pl-1 rounded-r-none border-r-0"
                           type="button"
                         >
                           <i
@@ -436,7 +436,7 @@ exports[`ServiceList should match snapshot 1`] = `
                       </span>
                       <button
                         aria-label="Deploy from another version"
-                        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-6 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-7 justify-center gap-1 rounded-l-none px-1.5"
+                        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-6 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-7 justify-center rounded-l-none px-1.5"
                         data-state="closed"
                         type="button"
                       >
@@ -624,7 +624,7 @@ exports[`ServiceList should match snapshot 1`] = `
                         aria-expanded="false"
                         aria-haspopup="dialog"
                         aria-label="Links"
-                        class="items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-6 rounded-full justify-center px-0 w-6 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral hidden"
+                        class="items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-6 gap-x-1 rounded-full justify-center px-0 w-6 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral hidden"
                         data-state="closed"
                         type="button"
                       >
@@ -810,7 +810,8 @@ exports[`ServiceList should match snapshot 1`] = `
                         </span>
                       </span>
                       <button
-                        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-6 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-7 justify-center gap-1 rounded-l-none px-1.5"
+                        aria-label="Deploy from another version"
+                        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-6 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-7 justify-center rounded-l-none px-1.5"
                         data-state="closed"
                         type="button"
                       >
@@ -1300,7 +1301,7 @@ exports[`ServiceList should match snapshot 1`] = `
                         aria-expanded="false"
                         aria-haspopup="dialog"
                         aria-label="Links"
-                        class="items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-6 rounded-full justify-center px-0 w-6 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral hidden"
+                        class="items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-6 gap-x-1 rounded-full justify-center px-0 w-6 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral hidden"
                         data-state="closed"
                         type="button"
                       >
@@ -1496,7 +1497,7 @@ exports[`ServiceList should match snapshot 1`] = `
                         data-state="closed"
                       >
                         <button
-                          class="items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-6 px-1.5 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral flex min-w-[81px] justify-center gap-1 pl-1 rounded-r-none border-r-0"
+                          class="items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-6 px-1.5 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral flex min-w-[81px] justify-center pl-1 rounded-r-none border-r-0"
                           type="button"
                         >
                           <i
@@ -1508,7 +1509,7 @@ exports[`ServiceList should match snapshot 1`] = `
                       </span>
                       <button
                         aria-label="Deploy from another version"
-                        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-6 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-7 justify-center gap-1 rounded-l-none px-1.5"
+                        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-6 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-7 justify-center rounded-l-none px-1.5"
                         data-state="closed"
                         type="button"
                       >
@@ -1791,7 +1792,7 @@ exports[`ServiceList should match snapshot 1`] = `
                         aria-expanded="false"
                         aria-haspopup="dialog"
                         aria-label="Links"
-                        class="items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-6 rounded-full justify-center px-0 w-6 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral hidden"
+                        class="items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-6 gap-x-1 rounded-full justify-center px-0 w-6 bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral hidden"
                         data-state="closed"
                         type="button"
                       >
@@ -1987,7 +1988,7 @@ exports[`ServiceList should match snapshot 1`] = `
                         data-state="closed"
                       >
                         <button
-                          class="items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-6 px-1.5 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral flex min-w-[81px] justify-center gap-1 pl-1 rounded-r-none border-r-0"
+                          class="items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-6 px-1.5 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral flex min-w-[81px] justify-center pl-1 rounded-r-none border-r-0"
                           type="button"
                         >
                           <i
@@ -1999,7 +2000,7 @@ exports[`ServiceList should match snapshot 1`] = `
                       </span>
                       <button
                         aria-label="Deploy from another version"
-                        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-6 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-7 justify-center gap-1 rounded-l-none px-1.5"
+                        class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-6 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-7 justify-center rounded-l-none px-1.5"
                         data-state="closed"
                         type="button"
                       >
@@ -2059,7 +2060,7 @@ exports[`ServiceList should match snapshot 1`] = `
               class="flex gap-3"
             >
               <button
-                class="inline-flex shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-8 px-2.5 rounded-md bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert items-center gap-2"
+                class="inline-flex shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert items-center"
                 data-state="closed"
                 disabled=""
               >
@@ -2072,7 +2073,7 @@ exports[`ServiceList should match snapshot 1`] = `
               <button
                 aria-expanded="false"
                 aria-haspopup="menu"
-                class="inline-flex shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 rounded-md bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral items-center gap-2"
+                class="inline-flex shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral items-center"
                 data-state="closed"
                 id="radix-:r2g:"
                 type="button"
diff --git a/libs/domains/services/feature/src/lib/service-list/service-list-action-bar.tsx b/libs/domains/services/feature/src/lib/service-list/service-list-action-bar.tsx
index b316ca632d9..024c9ba5c4b 100644
--- a/libs/domains/services/feature/src/lib/service-list/service-list-action-bar.tsx
+++ b/libs/domains/services/feature/src/lib/service-list/service-list-action-bar.tsx
@@ -362,7 +362,7 @@ export function ServiceListActionBar({ environment, selectedRows, resetRowSelect
               <Button
                 color="brand"
                 size="md"
-                className="items-center gap-2"
+                className="items-center"
                 onClick={() => handleDeployAllServices()}
                 disabled={deployableServices.length === 0}
               >
@@ -371,7 +371,7 @@ export function ServiceListActionBar({ environment, selectedRows, resetRowSelect
             </Tooltip>
             <DropdownMenu.Root modal={false}>
               <DropdownMenu.Trigger asChild>
-                <Button color="neutral" size="md" variant="surface" className="items-center gap-2">
+                <Button color="neutral" size="md" variant="surface" className="items-center">
                   More <Icon iconName="angle-down" />
                 </Button>
               </DropdownMenu.Trigger>
diff --git a/libs/domains/services/feature/src/lib/service-list/service-list.tsx b/libs/domains/services/feature/src/lib/service-list/service-list.tsx
index a532d0fb00f..f9fec42e3ee 100644
--- a/libs/domains/services/feature/src/lib/service-list/service-list.tsx
+++ b/libs/domains/services/feature/src/lib/service-list/service-list.tsx
@@ -351,7 +351,6 @@ export function ServiceList({ className, containerClassName, environment, ...pro
           as="button"
           size="md"
           color="neutral"
-          className="gap-1.5"
           to="/organization/$organizationId/project/$projectId/environment/$environmentId/service/new"
           params={{ organizationId, projectId, environmentId }}
         >
diff --git a/libs/domains/services/feature/src/lib/service-overview/instance-metrics/__snapshots__/instance-metrics.spec.tsx.snap b/libs/domains/services/feature/src/lib/service-overview/instance-metrics/__snapshots__/instance-metrics.spec.tsx.snap
index 7888d5e6672..f2d2a5a167c 100644
--- a/libs/domains/services/feature/src/lib/service-overview/instance-metrics/__snapshots__/instance-metrics.spec.tsx.snap
+++ b/libs/domains/services/feature/src/lib/service-overview/instance-metrics/__snapshots__/instance-metrics.spec.tsx.snap
@@ -127,7 +127,7 @@ exports[`InstanceMetrics should match snapshot with data 1`] = `
                 />
               </button>
               <button
-                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 px-2 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral truncate"
+                class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 px-2 gap-x-1 rounded bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral truncate"
               >
                 foobar
               </button>
diff --git a/libs/domains/services/feature/src/lib/service-overview/service-header/service-header.tsx b/libs/domains/services/feature/src/lib/service-overview/service-header/service-header.tsx
index cba58aae750..1348f4e2e4f 100644
--- a/libs/domains/services/feature/src/lib/service-overview/service-header/service-header.tsx
+++ b/libs/domains/services/feature/src/lib/service-overview/service-header/service-header.tsx
@@ -54,7 +54,7 @@ export function GitRepository({ gitRepository }: { gitRepository: ApplicationGit
           target="_blank"
           rel="noopener noreferrer"
         >
-          <Button color="neutral" variant="outline" size="xs" className="gap-1">
+          <Button color="neutral" variant="outline" size="xs">
             <Icon iconName="code-branch" iconStyle="regular" height={14} width={14} />
             <Truncate text={gitRepository.branch} truncateLimit={17} />
           </Button>
@@ -234,7 +234,6 @@ function ServiceHeaderMetadata({ service }: ServiceHeaderMetadataProps) {
               color="neutral"
               size="xs"
               as="button"
-              className="gap-1"
             >
               <Icon width={16} height={16} name={containerRegistryKindToIcon(containerImage.registry.kind)} />
               <span className="truncate">
@@ -261,7 +260,6 @@ function ServiceHeaderMetadata({ service }: ServiceHeaderMetadataProps) {
               color="neutral"
               size="xs"
               as="button"
-              className="gap-1"
             >
               <Icon width={16} name={IconEnum.HELM_OFFICIAL} />
               <Truncate text={helmRepository.repository.name ?? ''} truncateLimit={18} />
@@ -288,7 +286,6 @@ function ServiceHeaderMetadata({ service }: ServiceHeaderMetadataProps) {
               color="neutral"
               variant="outline"
               size="xs"
-              className="gap-1"
               onClick={() => {
                 if (!databaseSource.masterCredentials) {
                   return
@@ -342,7 +339,7 @@ function ServiceHeaderMetadata({ service }: ServiceHeaderMetadataProps) {
           environmentId={environmentId}
           serviceId={serviceId}
         >
-          <Button className="gap-1" size="xs" color="neutral" variant="outline">
+          <Button size="xs" color="neutral" variant="outline">
             <Icon iconName="link" iconStyle="regular" />
             Links
             <Icon iconName="angle-down" iconStyle="regular" />
diff --git a/libs/domains/services/feature/src/lib/service-overview/service-last-deployment/service-last-deployment.tsx b/libs/domains/services/feature/src/lib/service-overview/service-last-deployment/service-last-deployment.tsx
index bca9b1f62bc..fd8da016a3d 100644
--- a/libs/domains/services/feature/src/lib/service-overview/service-last-deployment/service-last-deployment.tsx
+++ b/libs/domains/services/feature/src/lib/service-overview/service-last-deployment/service-last-deployment.tsx
@@ -101,7 +101,6 @@ function ServiceLastDeploymentContent({ serviceId, serviceType, service }: Servi
         description={`Deploy the ${service?.serviceType.toLowerCase() ?? 'service'} first`}
       >
         <Button
-          className="gap-1"
           color="neutral"
           variant="outline"
           size="md"
@@ -137,7 +136,7 @@ function ServiceLastDeploymentContent({ serviceId, serviceType, service }: Servi
         .with({ repository: P.select({ chart_name: P.string, chart_version: P.string }) }, ({ chart_version }) => (
           <Tooltip content={`Chart version: ${chart_version}`}>
             <span className="inline-flex" onClick={preventParentLinkNavigation}>
-              <Button type="button" variant="surface" color="neutral" size="xs" className="gap-1">
+              <Button type="button" variant="surface" color="neutral" size="xs">
                 <Icon iconName="code-commit" className="w-4" />
                 {chart_version.length >= 18 ? `${chart_version.slice(0, 15)}…` : chart_version}
               </Button>
@@ -148,7 +147,7 @@ function ServiceLastDeploymentContent({ serviceId, serviceType, service }: Servi
           <Tooltip content={`Image tag: ${tag}`}>
             <span className="inline-flex" onClick={preventParentLinkNavigation}>
               <CopyToClipboard text={tag} className="inline-flex justify-center">
-                <Button type="button" variant="surface" color="neutral" size="xs" className="gap-1">
+                <Button type="button" variant="surface" color="neutral" size="xs">
                   <Icon iconName="code-commit" className="w-4" />
                   {tag.length >= 8 ? `${tag.slice(0, 8)}…` : tag}
                 </Button>
diff --git a/libs/domains/services/feature/src/lib/service-terminal/__snapshots__/service-terminal.spec.tsx.snap b/libs/domains/services/feature/src/lib/service-terminal/__snapshots__/service-terminal.spec.tsx.snap
index 7fd1770aaf0..072f64039f3 100644
--- a/libs/domains/services/feature/src/lib/service-terminal/__snapshots__/service-terminal.spec.tsx.snap
+++ b/libs/domains/services/feature/src/lib/service-terminal/__snapshots__/service-terminal.spec.tsx.snap
@@ -19,12 +19,12 @@ exports[`ServiceTerminal should match snapshot 1`] = `
               class="relative z-10"
             >
               <button
-                class="items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 rounded-md bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral hidden"
+                class="items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral hidden"
               >
                 <span>
                   <i
                     aria-hidden="true"
-                    class="fa-regular fa-xmark ml-2 text-sm"
+                    class="fa-regular fa-xmark text-sm"
                   />
                 </span>
               </button>
@@ -81,7 +81,7 @@ exports[`ServiceTerminal should match snapshot 1`] = `
           </div>
         </div>
         <a
-          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 rounded-md bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral gap-1.5"
+          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral"
           href="https://www.qovery.com/docs/cli/overview"
           rel="noopener noreferrer"
           target="_blank"
diff --git a/libs/domains/services/feature/src/lib/service-terminal/input-search/__snapshots__/input-search.spec.tsx.snap b/libs/domains/services/feature/src/lib/service-terminal/input-search/__snapshots__/input-search.spec.tsx.snap
index da21d40c04c..56b5227ffeb 100644
--- a/libs/domains/services/feature/src/lib/service-terminal/input-search/__snapshots__/input-search.spec.tsx.snap
+++ b/libs/domains/services/feature/src/lib/service-terminal/input-search/__snapshots__/input-search.spec.tsx.snap
@@ -7,13 +7,13 @@ exports[`InputSearch should match snapshot 1`] = `
       class="relative z-10"
     >
       <button
-        class="items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 rounded-md bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral hidden"
+        class="items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral hidden"
       >
         my-value
         <span>
           <i
             aria-hidden="true"
-            class="fa-regular fa-xmark ml-2 text-sm"
+            class="fa-regular fa-xmark text-sm"
           />
         </span>
       </button>
@@ -70,13 +70,13 @@ exports[`InputSearch should match with snapshot 1`] = `
       class="relative z-10"
     >
       <button
-        class="items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 rounded-md bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral hidden"
+        class="items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral hidden"
       >
         my-value
         <span>
           <i
             aria-hidden="true"
-            class="fa-regular fa-xmark ml-2 text-sm"
+            class="fa-regular fa-xmark text-sm"
           />
         </span>
       </button>
diff --git a/libs/domains/services/feature/src/lib/service-terminal/input-search/input-search.tsx b/libs/domains/services/feature/src/lib/service-terminal/input-search/input-search.tsx
index d0444a94f05..2d3a434d0c8 100644
--- a/libs/domains/services/feature/src/lib/service-terminal/input-search/input-search.tsx
+++ b/libs/domains/services/feature/src/lib/service-terminal/input-search/input-search.tsx
@@ -45,7 +45,7 @@ export function InputSearch({ data, value, onChange, placeholder, trimLabel }: I
       >
         {value}
         <span>
-          <Icon iconName="xmark" className="ml-2 text-sm" />
+          <Icon iconName="xmark" className="text-sm" />
         </span>
       </Button>
       <div className={clsx({ hidden: selectedItem }, 'relative')}>
diff --git a/libs/domains/services/feature/src/lib/service-terminal/service-terminal.tsx b/libs/domains/services/feature/src/lib/service-terminal/service-terminal.tsx
index dcc7dc1ef82..d603434de20 100644
--- a/libs/domains/services/feature/src/lib/service-terminal/service-terminal.tsx
+++ b/libs/domains/services/feature/src/lib/service-terminal/service-terminal.tsx
@@ -240,7 +240,6 @@ export function ServiceTerminal({
           variant="surface"
           color="neutral"
           size="md"
-          className="gap-1.5"
         >
           <Icon iconName="book" />
           CLI docs
diff --git a/libs/domains/services/feature/src/lib/services-deployment-pipeline/services-deployment-pipeline/services-deployment-pipeline.tsx b/libs/domains/services/feature/src/lib/services-deployment-pipeline/services-deployment-pipeline/services-deployment-pipeline.tsx
index 8ec72594f39..88cb181187a 100644
--- a/libs/domains/services/feature/src/lib/services-deployment-pipeline/services-deployment-pipeline/services-deployment-pipeline.tsx
+++ b/libs/domains/services/feature/src/lib/services-deployment-pipeline/services-deployment-pipeline/services-deployment-pipeline.tsx
@@ -191,7 +191,6 @@ export function ServicesDeploymentPipeline() {
             size="sm"
             variant="outline"
             color="neutral"
-            className="gap-1.5"
             onClick={() =>
               openModal({
                 content: <ServicesDeploymentStageModal environmentId={environmentId} onClose={closeModal} />,
diff --git a/libs/domains/variables/feature/src/lib/create-update-variable-modal/create-update-variable-modal.tsx b/libs/domains/variables/feature/src/lib/create-update-variable-modal/create-update-variable-modal.tsx
index 8fcd97dc45c..bdfa719c393 100644
--- a/libs/domains/variables/feature/src/lib/create-update-variable-modal/create-update-variable-modal.tsx
+++ b/libs/domains/variables/feature/src/lib/create-update-variable-modal/create-update-variable-modal.tsx
@@ -411,13 +411,7 @@ export function CreateUpdateVariableModal(props: CreateUpdateVariableModalProps)
             render={({ field: { name, onChange, value }, fieldState: { error } }) => (
               <>
                 <div className="mb-2 flex justify-end">
-                  <Button
-                    type="button"
-                    size="sm"
-                    variant="outline"
-                    className="gap-1.5"
-                    onClick={() => setIsValueEditorOpen(true)}
-                  >
+                  <Button type="button" size="sm" variant="outline" onClick={() => setIsValueEditorOpen(true)}>
                     <Icon iconName="arrows-maximize" iconStyle="regular" className="text-xs" />
                     Open editor
                   </Button>
diff --git a/libs/domains/variables/feature/src/lib/flow-create-variable/flow-create-variable.tsx b/libs/domains/variables/feature/src/lib/flow-create-variable/flow-create-variable.tsx
index c5a7099be8b..2d9d43be2e6 100644
--- a/libs/domains/variables/feature/src/lib/flow-create-variable/flow-create-variable.tsx
+++ b/libs/domains/variables/feature/src/lib/flow-create-variable/flow-create-variable.tsx
@@ -33,7 +33,7 @@ export function FlowCreateVariable({
     <Section>
       <div className="flex justify-between">
         <Heading className="mb-2">Environment variables</Heading>
-        <Button className="gap-2" size="md" onClick={onAdd}>
+        <Button size="md" onClick={onAdd}>
           Add Variable
           <Icon iconName="plus-circle" iconStyle="regular" />
         </Button>
diff --git a/libs/domains/variables/feature/src/lib/variable-list/__snapshots__/variable-list.spec.tsx.snap b/libs/domains/variables/feature/src/lib/variable-list/__snapshots__/variable-list.spec.tsx.snap
index 4f6b1b6c22e..e9b7169a2d9 100644
--- a/libs/domains/variables/feature/src/lib/variable-list/__snapshots__/variable-list.spec.tsx.snap
+++ b/libs/domains/variables/feature/src/lib/variable-list/__snapshots__/variable-list.spec.tsx.snap
@@ -86,7 +86,7 @@ exports[`VariableList should match snapshot 1`] = `
                       aria-controls="radix-:r28:"
                       aria-expanded="false"
                       aria-haspopup="dialog"
-                      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong h-7 px-2 rounded bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral gap-1 whitespace-nowrap text-xs"
+                      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong h-7 px-2 gap-x-1 rounded bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral whitespace-nowrap text-xs"
                       data-state="closed"
                       type="button"
                     >
@@ -108,7 +108,7 @@ exports[`VariableList should match snapshot 1`] = `
                       aria-controls="radix-:r2b:"
                       aria-expanded="false"
                       aria-haspopup="dialog"
-                      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong h-7 px-2 rounded bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral gap-1 whitespace-nowrap text-xs"
+                      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong h-7 px-2 gap-x-1 rounded bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral whitespace-nowrap text-xs"
                       data-state="closed"
                       type="button"
                     >
@@ -130,7 +130,7 @@ exports[`VariableList should match snapshot 1`] = `
                       aria-controls="radix-:r2e:"
                       aria-expanded="false"
                       aria-haspopup="dialog"
-                      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong h-7 px-2 rounded bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral gap-1 whitespace-nowrap text-xs"
+                      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong h-7 px-2 gap-x-1 rounded bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral whitespace-nowrap text-xs"
                       data-state="closed"
                       type="button"
                     >
@@ -225,7 +225,7 @@ exports[`VariableList should match snapshot 1`] = `
                     aria-expanded="false"
                     aria-haspopup="menu"
                     aria-label="actions"
-                    class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-8 justify-center"
+                    class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-8 justify-center"
                     data-state="closed"
                     id="radix-:r2g:"
                     type="button"
@@ -327,7 +327,7 @@ exports[`VariableList should match snapshot 1`] = `
                     aria-expanded="false"
                     aria-haspopup="menu"
                     aria-label="actions"
-                    class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-8 justify-center"
+                    class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-8 justify-center"
                     data-state="closed"
                     id="radix-:r2k:"
                     type="button"
@@ -418,7 +418,7 @@ exports[`VariableList should match snapshot 1`] = `
                     aria-expanded="false"
                     aria-haspopup="menu"
                     aria-label="actions"
-                    class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-8 justify-center"
+                    class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-8 justify-center"
                     data-state="closed"
                     id="radix-:r2o:"
                     type="button"
@@ -612,7 +612,7 @@ exports[`VariableList should match snapshot 1`] = `
                     aria-expanded="false"
                     aria-haspopup="menu"
                     aria-label="actions"
-                    class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-8 justify-center"
+                    class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-8 justify-center"
                     data-state="closed"
                     id="radix-:r2s:"
                     type="button"
@@ -719,7 +719,7 @@ exports[`VariableList should match snapshot 1`] = `
                     aria-expanded="false"
                     aria-haspopup="menu"
                     aria-label="actions"
-                    class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-8 justify-center"
+                    class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-8 justify-center"
                     data-state="closed"
                     id="radix-:r31:"
                     type="button"
@@ -969,7 +969,7 @@ exports[`VariableList should match snapshot 1`] = `
                     aria-expanded="false"
                     aria-haspopup="menu"
                     aria-label="actions"
-                    class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-8 justify-center"
+                    class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-8 justify-center"
                     data-state="closed"
                     id="radix-:r37:"
                     type="button"
@@ -1178,7 +1178,7 @@ exports[`VariableList should match snapshot 1`] = `
                     aria-expanded="false"
                     aria-haspopup="menu"
                     aria-label="actions"
-                    class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-8 justify-center"
+                    class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-8 justify-center"
                     data-state="closed"
                     id="radix-:r3d:"
                     type="button"
@@ -1301,7 +1301,7 @@ exports[`VariableList should match snapshot 1`] = `
                     aria-expanded="false"
                     aria-haspopup="menu"
                     aria-label="actions"
-                    class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-8 justify-center"
+                    class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-8 justify-center"
                     data-state="closed"
                     id="radix-:r3i:"
                     type="button"
@@ -1409,7 +1409,7 @@ exports[`VariableList should match snapshot 1`] = `
                       aria-controls="radix-:r3n:"
                       aria-expanded="false"
                       aria-haspopup="dialog"
-                      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong h-7 px-2 rounded bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral gap-1 whitespace-nowrap text-xs"
+                      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong h-7 px-2 gap-x-1 rounded bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral whitespace-nowrap text-xs"
                       data-state="closed"
                       type="button"
                     >
@@ -1431,7 +1431,7 @@ exports[`VariableList should match snapshot 1`] = `
                       aria-controls="radix-:r3q:"
                       aria-expanded="false"
                       aria-haspopup="dialog"
-                      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong h-7 px-2 rounded bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral gap-1 whitespace-nowrap text-xs"
+                      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong h-7 px-2 gap-x-1 rounded bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral whitespace-nowrap text-xs"
                       data-state="closed"
                       type="button"
                     >
@@ -1494,7 +1494,7 @@ exports[`VariableList should match snapshot 1`] = `
                     aria-expanded="false"
                     aria-haspopup="menu"
                     aria-label="actions"
-                    class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-8 justify-center"
+                    class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md bg-surface-neutral border border-neutral hover:border-neutral-component hover:bg-surface-neutral-subtle data-[state=open]:bg-surface-neutral-subtle text-neutral w-8 justify-center"
                     data-state="closed"
                     id="radix-:r3s:"
                     type="button"
@@ -1578,7 +1578,7 @@ exports[`VariableList should match snapshot 1`] = `
             Deselect
           </button>
           <button
-            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-negative-strong text-sm h-8 px-2.5 rounded-md bg-surface-negative-solid hover:bg-surface-negative-solidHover border border-negative-component text-neutral-contrasted"
+            class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-negative-strong text-sm h-8 px-2.5 gap-x-1.5 rounded-md bg-surface-negative-solid hover:bg-surface-negative-solidHover border border-negative-component text-neutral-contrasted"
             data-testid="submit-button"
             disabled=""
             type="button"
diff --git a/libs/domains/variables/feature/src/lib/variables-action-toolbar/variables-action-toolbar.tsx b/libs/domains/variables/feature/src/lib/variables-action-toolbar/variables-action-toolbar.tsx
index 484b616e45c..3328e893741 100644
--- a/libs/domains/variables/feature/src/lib/variables-action-toolbar/variables-action-toolbar.tsx
+++ b/libs/domains/variables/feature/src/lib/variables-action-toolbar/variables-action-toolbar.tsx
@@ -58,7 +58,7 @@ export function VariablesActionToolbar({
       <DropdownMenu.Root>
         {showImportButton ? (
           <DropdownMenu.Trigger asChild>
-            <Button color="neutral" variant="outline" size="md" className="gap-2">
+            <Button color="neutral" variant="outline" size="md">
               <Icon iconName="arrow-up-from-line" iconStyle="regular" />
               Import variable
             </Button>
@@ -102,7 +102,7 @@ export function VariablesActionToolbar({
       </DropdownMenu.Root>
       <DropdownMenu.Root>
         <DropdownMenu.Trigger asChild>
-          <Button color="brand" variant="solid" size="md" className="gap-2">
+          <Button color="brand" variant="solid" size="md">
             <Icon iconName="circle-plus" iconStyle="regular" />
             New variable
           </Button>
diff --git a/libs/shared/assistant/feature/src/lib/need-help/need-help.tsx b/libs/shared/assistant/feature/src/lib/need-help/need-help.tsx
index a7f211e67fa..f9ec0f19628 100644
--- a/libs/shared/assistant/feature/src/lib/need-help/need-help.tsx
+++ b/libs/shared/assistant/feature/src/lib/need-help/need-help.tsx
@@ -14,7 +14,7 @@ export function NeedHelp({ className }: NeedHelpProps) {
       size="xs"
       color="brand"
       variant="surface"
-      className={twMerge('w-fit items-center gap-1', className)}
+      className={twMerge('w-fit items-center', className)}
       onClick={toggleAssistantOpen}
     >
       <Icon iconName="circle-question" iconStyle="regular" className="p-0.5 text-xs" />
diff --git a/libs/shared/devops-copilot/feature/src/lib/ai-copilot-settings/section-ai-copilot-configuration/section-ai-copilot-configuration.tsx b/libs/shared/devops-copilot/feature/src/lib/ai-copilot-settings/section-ai-copilot-configuration/section-ai-copilot-configuration.tsx
index 3b565eb5132..c49c892e8b8 100644
--- a/libs/shared/devops-copilot/feature/src/lib/ai-copilot-settings/section-ai-copilot-configuration/section-ai-copilot-configuration.tsx
+++ b/libs/shared/devops-copilot/feature/src/lib/ai-copilot-settings/section-ai-copilot-configuration/section-ai-copilot-configuration.tsx
@@ -139,7 +139,7 @@ export function SectionAICopilotConfiguration({
               {hasUnsavedChanges && (
                 <div className="flex items-center gap-3">
                   <Button size="md" color="brand" onClick={handleSaveMode} loading={isUpdating}>
-                    <Icon iconName="check" className="mr-2" />
+                    <Icon iconName="check" />
                     Save changes
                   </Button>
                   <Button size="md" color="neutral" variant="outline" onClick={handleCancelMode} disabled={isUpdating}>
diff --git a/libs/shared/devops-copilot/feature/src/lib/ai-copilot-settings/section-ai-copilot-opt-in/section-ai-copilot-opt-in.tsx b/libs/shared/devops-copilot/feature/src/lib/ai-copilot-settings/section-ai-copilot-opt-in/section-ai-copilot-opt-in.tsx
index b6ceb8c9d87..35f41f653f2 100644
--- a/libs/shared/devops-copilot/feature/src/lib/ai-copilot-settings/section-ai-copilot-opt-in/section-ai-copilot-opt-in.tsx
+++ b/libs/shared/devops-copilot/feature/src/lib/ai-copilot-settings/section-ai-copilot-opt-in/section-ai-copilot-opt-in.tsx
@@ -489,7 +489,7 @@ export function SectionAICopilotOptIn({ organization, isLoading, onEnable }: Sec
                   />
 
                   <Button type="submit" size="md" color="brand" disabled={!isValid} className="mt-4">
-                    <Icon iconName="circle-check" className="mr-2" />
+                    <Icon iconName="circle-check" />
                     Enable AI Copilot
                   </Button>
                 </div>
diff --git a/libs/shared/devops-copilot/feature/src/lib/devops-copilot-button/devops-copilot-button.tsx b/libs/shared/devops-copilot/feature/src/lib/devops-copilot-button/devops-copilot-button.tsx
index 133e7d0301b..6d5b8001cee 100644
--- a/libs/shared/devops-copilot/feature/src/lib/devops-copilot-button/devops-copilot-button.tsx
+++ b/libs/shared/devops-copilot/feature/src/lib/devops-copilot-button/devops-copilot-button.tsx
@@ -33,7 +33,6 @@ export function DevopsCopilotButton() {
           trigger: 'button-click',
         })
       }}
-      className="gap-1.5"
     >
       <Icon iconName="sparkles" iconStyle="solid" className="text-xs text-brand" />
       AI Copilot
diff --git a/libs/shared/devops-copilot/feature/src/lib/devops-copilot-panel/assistant-message/assistant-message.tsx b/libs/shared/devops-copilot/feature/src/lib/devops-copilot-panel/assistant-message/assistant-message.tsx
index acfeea84c19..7615e1945c2 100644
--- a/libs/shared/devops-copilot/feature/src/lib/devops-copilot-panel/assistant-message/assistant-message.tsx
+++ b/libs/shared/devops-copilot/feature/src/lib/devops-copilot-panel/assistant-message/assistant-message.tsx
@@ -28,7 +28,7 @@ function VoteButtons({ messageId }: { messageId: string }) {
       <Button
         type="button"
         variant="surface"
-        className={clsx('flex items-center gap-1 px-2 py-1', {
+        className={clsx('flex items-center px-2 py-1', {
           'text-brand-500': response === 'up',
         })}
         onClick={() => respond('up')}
@@ -38,7 +38,7 @@ function VoteButtons({ messageId }: { messageId: string }) {
       <Button
         type="button"
         variant="surface"
-        className={clsx('flex items-center gap-1 px-2 py-1', {
+        className={clsx('flex items-center px-2 py-1', {
           'text-brand-500': response === 'down',
         })}
         onClick={() => respond('down')}
@@ -64,7 +64,7 @@ export function AssistantMessage({ message, plan, showPlans, setShowPlans }: Ass
           onClick={() => setShowPlans((prev) => ({ ...prev, [message.id]: !prev[message.id] }))}
         >
           <div className="w-fit text-ssm font-medium italic text-neutral-subtle">Plan steps</div>
-          <div className="">
+          <div>
             <Icon
               iconName={isPlanVisible ? 'chevron-circle-up' : 'chevron-circle-down'}
               iconStyle="regular"
diff --git a/libs/shared/devops-copilot/feature/src/lib/devops-copilot-panel/devops-copilot-panel.tsx b/libs/shared/devops-copilot/feature/src/lib/devops-copilot-panel/devops-copilot-panel.tsx
index d49a13efb99..9fc49da220a 100644
--- a/libs/shared/devops-copilot/feature/src/lib/devops-copilot-panel/devops-copilot-panel.tsx
+++ b/libs/shared/devops-copilot/feature/src/lib/devops-copilot-panel/devops-copilot-panel.tsx
@@ -430,7 +430,7 @@ export function DevopsCopilotPanel({ onClose, style }: DevopsCopilotPanelProps)
                             key={`${label}${link}`}
                             type="button"
                             variant="surface"
-                            className="inline-flex max-w-max gap-2 truncate"
+                            className="inline-flex max-w-max truncate"
                             onClick={() => {
                               setInputMessage(label)
                               handleSendMessage(label)
diff --git a/libs/shared/devops-copilot/feature/src/lib/devops-copilot-panel/enable-copilot-screen/enable-copilot-screen.tsx b/libs/shared/devops-copilot/feature/src/lib/devops-copilot-panel/enable-copilot-screen/enable-copilot-screen.tsx
index 47d8900a2a3..b9781512955 100644
--- a/libs/shared/devops-copilot/feature/src/lib/devops-copilot-panel/enable-copilot-screen/enable-copilot-screen.tsx
+++ b/libs/shared/devops-copilot/feature/src/lib/devops-copilot-panel/enable-copilot-screen/enable-copilot-screen.tsx
@@ -21,7 +21,7 @@ export function EnableCopilotScreen({ organizationId, onClose }: EnableCopilotSc
       className="h-full w-full rounded-none border-none"
     >
       <Link to="/organization/$organizationId/settings/ai-copilot" params={{ organizationId }} onClick={onClose}>
-        <Button className="flex gap-2" size="md">
+        <Button className="flex" size="md">
           <Icon iconName="sparkles" />
           Enable AI Copilot
         </Button>
diff --git a/libs/shared/devops-copilot/feature/src/lib/devops-copilot-panel/input/__snapshots__/input.spec.tsx.snap b/libs/shared/devops-copilot/feature/src/lib/devops-copilot-panel/input/__snapshots__/input.spec.tsx.snap
index 7bca95144b1..d0b0e164be8 100644
--- a/libs/shared/devops-copilot/feature/src/lib/devops-copilot-panel/input/__snapshots__/input.spec.tsx.snap
+++ b/libs/shared/devops-copilot/feature/src/lib/devops-copilot-panel/input/__snapshots__/input.spec.tsx.snap
@@ -14,7 +14,7 @@ exports[`Input should match snapshot when loading 1`] = `
         class="flex items-end justify-end p-2"
       >
         <button
-          class="inline-flex items-center shrink-0 font-medium active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs px-2 rounded-full bg-surface-neutral-component hover:bg-surface-neutral-componentHover group relative bottom-0.5 h-7 w-7 min-w-7 justify-center text-neutral-subtle transition-colors hover:text-neutral"
+          class="inline-flex items-center shrink-0 font-medium active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm px-2 gap-x-1 rounded-full bg-surface-neutral-component hover:bg-surface-neutral-componentHover group relative bottom-0.5 h-7 w-7 min-w-7 justify-center text-neutral-subtle transition-colors hover:text-neutral"
           data-state="closed"
           type="button"
         >
@@ -47,7 +47,7 @@ exports[`Input should match snapshot when not loading 1`] = `
         class="flex items-end justify-end p-2"
       >
         <button
-          class="inline-flex items-center shrink-0 font-medium active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs px-2 rounded-full bg-surface-neutral-component hover:bg-surface-neutral-componentHover group relative bottom-0.5 h-7 w-7 min-w-7 justify-center text-neutral-subtle transition-colors hover:text-neutral"
+          class="inline-flex items-center shrink-0 font-medium active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm px-2 gap-x-1 rounded-full bg-surface-neutral-component hover:bg-surface-neutral-componentHover group relative bottom-0.5 h-7 w-7 min-w-7 justify-center text-neutral-subtle transition-colors hover:text-neutral"
           data-state="closed"
           type="button"
         >
diff --git a/libs/shared/ui/src/lib/components/banner/banner.tsx b/libs/shared/ui/src/lib/components/banner/banner.tsx
index c4923b920f3..fd17d3bdcee 100644
--- a/libs/shared/ui/src/lib/components/banner/banner.tsx
+++ b/libs/shared/ui/src/lib/components/banner/banner.tsx
@@ -55,7 +55,7 @@ export const Banner = forwardRef<HTMLDivElement, PropsWithChildren<BannerProps>>
     <div className={twMerge(bannerVariants({ color }), 'relative', className)} ref={forwardedRef} {...props}>
       {children}
       {buttonLabel && (
-        <Button type="button" className="ml-4 gap-1" variant="solid" color={buttonColor} onClick={onClickButton}>
+        <Button type="button" className="ml-4" variant="solid" color={buttonColor} onClick={onClickButton}>
           {buttonLabel}
           {buttonIconRight && <Icon iconName={buttonIconRight} />}
         </Button>
diff --git a/libs/shared/ui/src/lib/components/button-primitive/__snapshots__/button-primitive.spec.tsx.snap b/libs/shared/ui/src/lib/components/button-primitive/__snapshots__/button-primitive.spec.tsx.snap
index 6d4eba94ae1..bb2f0145e5d 100644
--- a/libs/shared/ui/src/lib/components/button-primitive/__snapshots__/button-primitive.spec.tsx.snap
+++ b/libs/shared/ui/src/lib/components/button-primitive/__snapshots__/button-primitive.spec.tsx.snap
@@ -4,7 +4,7 @@ exports[`ButtonPrimitive should match snapshot 1`] = `
 <body>
   <div>
     <button
-      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-xs h-7 px-2 rounded bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
+      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-ssm h-7 px-2 gap-x-1 rounded bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
       type="button"
     >
       Foobar
diff --git a/libs/shared/ui/src/lib/components/button-primitive/button-primitive.spec.tsx b/libs/shared/ui/src/lib/components/button-primitive/button-primitive.spec.tsx
index 13675875875..5c3cdbc0d7e 100644
--- a/libs/shared/ui/src/lib/components/button-primitive/button-primitive.spec.tsx
+++ b/libs/shared/ui/src/lib/components/button-primitive/button-primitive.spec.tsx
@@ -1,4 +1,4 @@
-import { renderWithProviders } from '@qovery/shared/util-tests'
+import { renderWithProviders, screen } from '@qovery/shared/util-tests'
 import { ButtonPrimitive } from './button-primitive'
 
 describe('ButtonPrimitive', () => {
@@ -6,4 +6,52 @@ describe('ButtonPrimitive', () => {
     const { baseElement } = renderWithProviders(<ButtonPrimitive type="button">Foobar</ButtonPrimitive>)
     expect(baseElement).toMatchSnapshot()
   })
+
+  it('should render children with icon spacing', () => {
+    renderWithProviders(
+      <ButtonPrimitive type="button">
+        <span>Prefix</span>
+        Foobar
+        <span>Suffix</span>
+      </ButtonPrimitive>
+    )
+
+    expect(screen.getByRole('button')).toHaveTextContent('PrefixFoobarSuffix')
+  })
+
+  it('should use compact icon gaps for xs and sm buttons', () => {
+    renderWithProviders(
+      <>
+        <ButtonPrimitive type="button" size="xs">
+          <span>Prefix</span>
+          Extra small
+        </ButtonPrimitive>
+        <ButtonPrimitive type="button" size="sm">
+          Small
+          <span>Suffix</span>
+        </ButtonPrimitive>
+      </>
+    )
+
+    expect(screen.getByRole('button', { name: /Extra small/ })).toHaveClass('gap-x-1')
+    expect(screen.getByRole('button', { name: /Small/ })).toHaveClass('gap-x-1')
+  })
+
+  it('should use larger icon gaps for md and lg buttons', () => {
+    renderWithProviders(
+      <>
+        <ButtonPrimitive type="button" size="md">
+          <span>Prefix</span>
+          Medium
+        </ButtonPrimitive>
+        <ButtonPrimitive type="button" size="lg">
+          Large
+          <span>Suffix</span>
+        </ButtonPrimitive>
+      </>
+    )
+
+    expect(screen.getByRole('button', { name: /Medium/ })).toHaveClass('gap-x-1.5')
+    expect(screen.getByRole('button', { name: /Large/ })).toHaveClass('gap-x-1.5')
+  })
 })
diff --git a/libs/shared/ui/src/lib/components/button-primitive/button-primitive.tsx b/libs/shared/ui/src/lib/components/button-primitive/button-primitive.tsx
index 10a3453b498..84d1f015313 100644
--- a/libs/shared/ui/src/lib/components/button-primitive/button-primitive.tsx
+++ b/libs/shared/ui/src/lib/components/button-primitive/button-primitive.tsx
@@ -37,10 +37,10 @@ const _buttonVariants = cva(
         current: [''],
       },
       size: {
-        xs: ['text-xs', 'h-6', 'px-1.5'],
-        sm: ['text-xs', 'h-7', 'px-2'],
-        md: ['text-sm', 'h-8', 'px-2.5'],
-        lg: ['text-sm', 'h-10', 'px-3'],
+        xs: ['text-ssm', 'h-6', 'px-1.5', 'gap-x-1'],
+        sm: ['text-ssm', 'h-7', 'px-2', 'gap-x-1'],
+        md: ['text-sm', 'h-8', 'px-2.5', 'gap-x-1.5'],
+        lg: ['text-sm', 'h-10', 'px-3', 'gap-x-1.5'],
       },
       radius: {
         none: [],
diff --git a/libs/shared/ui/src/lib/components/button/__snapshots__/button.spec.tsx.snap b/libs/shared/ui/src/lib/components/button/__snapshots__/button.spec.tsx.snap
index 5e796d30950..38416947f42 100644
--- a/libs/shared/ui/src/lib/components/button/__snapshots__/button.spec.tsx.snap
+++ b/libs/shared/ui/src/lib/components/button/__snapshots__/button.spec.tsx.snap
@@ -4,7 +4,7 @@ exports[`Button should match snapshot 1`] = `
 <body>
   <div>
     <button
-      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-xs h-7 px-2 rounded bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
+      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-ssm h-7 px-2 gap-x-1 rounded bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
       type="button"
     >
       Foobar
@@ -17,7 +17,7 @@ exports[`Button should match snapshot with loading 1`] = `
 <body>
   <div>
     <button
-      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-xs h-7 px-2 rounded bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert pointer-events-none relative !text-transparent"
+      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-ssm h-7 px-2 gap-x-1 rounded bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert pointer-events-none relative !text-transparent"
       type="button"
     >
       <div
diff --git a/libs/shared/ui/src/lib/components/button/button.spec.tsx b/libs/shared/ui/src/lib/components/button/button.spec.tsx
index 02f77d7253d..61c3ef67679 100644
--- a/libs/shared/ui/src/lib/components/button/button.spec.tsx
+++ b/libs/shared/ui/src/lib/components/button/button.spec.tsx
@@ -1,4 +1,4 @@
-import { renderWithProviders } from '@qovery/shared/util-tests'
+import { renderWithProviders, screen } from '@qovery/shared/util-tests'
 import { Button } from './button'
 
 describe('Button', () => {
@@ -15,4 +15,17 @@ describe('Button', () => {
     )
     expect(baseElement).toMatchSnapshot()
   })
+
+  it('should support icon spacing', () => {
+    renderWithProviders(
+      <Button type="button">
+        <span>Prefix</span>
+        Foobar
+        <span>Suffix</span>
+      </Button>
+    )
+
+    expect(screen.getByRole('button')).toHaveTextContent('PrefixFoobarSuffix')
+    expect(screen.getByRole('button')).toHaveClass('gap-x-1')
+  })
 })
diff --git a/libs/shared/ui/src/lib/components/button/button.stories.tsx b/libs/shared/ui/src/lib/components/button/button.stories.tsx
index a0d6b876afe..e5e41004bec 100644
--- a/libs/shared/ui/src/lib/components/button/button.stories.tsx
+++ b/libs/shared/ui/src/lib/components/button/button.stories.tsx
@@ -1,4 +1,5 @@
 import type { Meta } from '@storybook/react-webpack5'
+import { Icon } from '../icon/icon'
 import { Button } from './button'
 
 const Story: Meta<typeof Button> = {
@@ -19,4 +20,16 @@ export const Primary = {
   },
 }
 
+export const WithIcons = {
+  args: {
+    children: (
+      <>
+        <Icon iconName="arrow-left" />
+        Upload
+        <Icon iconName="arrow-right" />
+      </>
+    ),
+  },
+}
+
 export default Story
diff --git a/libs/shared/ui/src/lib/components/callout/callout.tsx b/libs/shared/ui/src/lib/components/callout/callout.tsx
index 4155de9c166..35f1f0811e4 100644
--- a/libs/shared/ui/src/lib/components/callout/callout.tsx
+++ b/libs/shared/ui/src/lib/components/callout/callout.tsx
@@ -3,7 +3,7 @@ import { type ComponentPropsWithoutRef, type ElementRef, forwardRef } from 'reac
 import { twMerge } from '@qovery/shared/util-js'
 
 const calloutRootVariants = cva(
-  ['flex', 'flex-row', 'gap-x-4', 'p-4', 'border', 'rounded-md', 'text-sm', 'items-center'],
+  ['flex', 'flex-row', 'gap-x-3', 'p-4', 'border', 'rounded-md', 'text-sm', 'items-center'],
   {
     variants: {
       color: {
@@ -53,7 +53,7 @@ const CalloutText = forwardRef<ElementRef<'div'>, CalloutTextProps>(function Cal
   ref
 ) {
   return (
-    <div {...props} className={twMerge('-order-1 mr-auto gap-x-4 text-neutral', className)} ref={ref}>
+    <div {...props} className={twMerge('-order-1 mr-auto gap-x-3 text-neutral', className)} ref={ref}>
       {children}
     </div>
   )
diff --git a/libs/shared/ui/src/lib/components/code-editor-inline-setting/code-editor-inline-setting.tsx b/libs/shared/ui/src/lib/components/code-editor-inline-setting/code-editor-inline-setting.tsx
index 8ef30bef11b..1519e7eecac 100644
--- a/libs/shared/ui/src/lib/components/code-editor-inline-setting/code-editor-inline-setting.tsx
+++ b/libs/shared/ui/src/lib/components/code-editor-inline-setting/code-editor-inline-setting.tsx
@@ -49,7 +49,7 @@ export function CodeEditorInlineSetting({
           <Icon iconName="wave-pulse" className="text-neutral-subtle" />
           <p className="mb-3 mt-1 text-xs font-medium text-neutral-subtle">{emptyStateText}</p>
           <Button type="button" size="md" variant="outline" onClick={onOpenModal}>
-            <Icon iconName="plus" className="mr-2" />
+            <Icon iconName="plus" />
             {addButtonLabel}
           </Button>
         </div>
diff --git a/libs/shared/ui/src/lib/components/copy-button/copy-button.tsx b/libs/shared/ui/src/lib/components/copy-button/copy-button.tsx
index f367ef3e49e..7263bc46dd3 100644
--- a/libs/shared/ui/src/lib/components/copy-button/copy-button.tsx
+++ b/libs/shared/ui/src/lib/components/copy-button/copy-button.tsx
@@ -26,7 +26,7 @@ export function CopyButton({ content }: CopyButtonProps) {
       color="neutral"
       variant="outline"
       onClick={() => onClickCopyToClipboard(content)}
-      className="cursor-pointer gap-2 font-sans font-medium"
+      className="cursor-pointer font-sans font-medium"
     >
       Copy
       <Icon iconName={icon} className="text-xs" />
diff --git a/libs/shared/ui/src/lib/components/error-boundary/error-boundary.tsx b/libs/shared/ui/src/lib/components/error-boundary/error-boundary.tsx
index ebd62988a1d..6a2e9221131 100644
--- a/libs/shared/ui/src/lib/components/error-boundary/error-boundary.tsx
+++ b/libs/shared/ui/src/lib/components/error-boundary/error-boundary.tsx
@@ -15,7 +15,7 @@ export function ErrorFallback({ className, error, resetErrorBoundary }: Fallback
           <Heading className="font-medium text-neutral">Something went wrong</Heading>
           <p className="text-sm text-neutral-subtle">{error.message}</p>
         </div>
-        <Button onClick={resetErrorBoundary} size="md" className="flex gap-2">
+        <Button onClick={resetErrorBoundary} size="md" className="flex">
           Try again
           <Icon iconName="refresh" />
         </Button>
diff --git a/libs/shared/ui/src/lib/components/funnel-flow/funnel-flow.tsx b/libs/shared/ui/src/lib/components/funnel-flow/funnel-flow.tsx
index 88454bdd80a..a244822eac2 100644
--- a/libs/shared/ui/src/lib/components/funnel-flow/funnel-flow.tsx
+++ b/libs/shared/ui/src/lib/components/funnel-flow/funnel-flow.tsx
@@ -31,7 +31,7 @@ const FunnelFlowContent = (props: FunnelFlowProps) => {
         {props.onExit && (
           <div className="flex h-full items-center border-l border-l-neutral pl-5">
             <Button onClick={props.onExit} variant="surface" size="md">
-              Close <Icon iconName="xmark" iconStyle="regular" className="ml-2 text-base" />
+              Close <Icon iconName="xmark" iconStyle="regular" className="text-base" />
             </Button>
           </div>
         )}
diff --git a/libs/shared/ui/src/lib/components/inputs/input-filter/__snapshots__/input-filter.spec.tsx.snap b/libs/shared/ui/src/lib/components/inputs/input-filter/__snapshots__/input-filter.spec.tsx.snap
index ec825b47a72..4a7a8de884e 100644
--- a/libs/shared/ui/src/lib/components/inputs/input-filter/__snapshots__/input-filter.spec.tsx.snap
+++ b/libs/shared/ui/src/lib/components/inputs/input-filter/__snapshots__/input-filter.spec.tsx.snap
@@ -4,7 +4,7 @@ exports[`InputFilter should match input filter with loading 1`] = `
 <div>
   <div>
     <button
-      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 px-2 rounded bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral"
+      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 px-2 gap-x-1 rounded bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral"
       type="button"
     >
       <div
@@ -24,7 +24,7 @@ exports[`InputFilter should match input filter with value 1`] = `
 <div>
   <div>
     <button
-      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 px-2 rounded bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral"
+      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 px-2 gap-x-1 rounded bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral"
       type="button"
     >
       Option 1
@@ -47,7 +47,7 @@ exports[`InputFilter should match input filter without value 1`] = `
 <div>
   <div>
     <button
-      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-xs h-7 px-2 rounded bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral gap-2"
+      class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-ssm h-7 px-2 gap-x-1 rounded bg-surface-neutral-component hover:bg-surface-neutral-componentHover text-neutral"
       type="button"
     >
       Filter
diff --git a/libs/shared/ui/src/lib/components/inputs/input-filter/input-filter.tsx b/libs/shared/ui/src/lib/components/inputs/input-filter/input-filter.tsx
index e70f6d43b96..7054ed6d348 100644
--- a/libs/shared/ui/src/lib/components/inputs/input-filter/input-filter.tsx
+++ b/libs/shared/ui/src/lib/components/inputs/input-filter/input-filter.tsx
@@ -34,7 +34,7 @@ export function InputFilter({ name, nameKey, options, onChange, defaultValue, is
   return (
     <div>
       {!isOpen && (
-        <Button onClick={() => setIsOpen(true)} type="button" variant="surface" color="neutral" className="gap-2">
+        <Button onClick={() => setIsOpen(true)} type="button" variant="surface" color="neutral">
           {name}
           <Icon iconName="magnifying-glass" />
         </Button>
diff --git a/libs/shared/ui/src/lib/components/modals/modal-confirmation/__snapshots__/modal-confirmation.spec.tsx.snap b/libs/shared/ui/src/lib/components/modals/modal-confirmation/__snapshots__/modal-confirmation.spec.tsx.snap
index 07658740b2c..239b1e4c1ee 100644
--- a/libs/shared/ui/src/lib/components/modals/modal-confirmation/__snapshots__/modal-confirmation.spec.tsx.snap
+++ b/libs/shared/ui/src/lib/components/modals/modal-confirmation/__snapshots__/modal-confirmation.spec.tsx.snap
@@ -55,13 +55,13 @@ exports[`ModalConfirmation should match confirm mode with description 1`] = `
         class="flex justify-end gap-3"
       >
         <button
-          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
+          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
           type="button"
         >
           Cancel
         </button>
         <button
-          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
+          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-brand-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-brand-solid hover:bg-surface-brand-solidHover border border-brand-component text-neutralInvert"
           type="submit"
         >
           Confirm
@@ -115,13 +115,13 @@ exports[`ModalConfirmation should match delete mode with description 1`] = `
         class="flex justify-end gap-3"
       >
         <button
-          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
+          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
           type="button"
         >
           Cancel
         </button>
         <button
-          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-negative-strong text-sm h-10 px-3 rounded-lg bg-surface-negative-solid hover:bg-surface-negative-solidHover border border-negative-component text-neutral-contrasted"
+          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-negative-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-negative-solid hover:bg-surface-negative-solidHover border border-negative-component text-neutral-contrasted"
           type="submit"
         >
           Confirm
@@ -179,13 +179,13 @@ exports[`ModalConfirmation should match delete mode without description 1`] = `
         class="flex justify-end gap-3"
       >
         <button
-          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
+          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
           type="button"
         >
           Cancel
         </button>
         <button
-          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-negative-strong text-sm h-10 px-3 rounded-lg bg-surface-negative-solid hover:bg-surface-negative-solidHover border border-negative-component text-neutral-contrasted"
+          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-negative-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-negative-solid hover:bg-surface-negative-solidHover border border-negative-component text-neutral-contrasted"
           type="submit"
         >
           Confirm
diff --git a/libs/shared/ui/src/lib/components/modals/modal-multi-confirmation/__snapshots__/modal-multi-confirmation.spec.tsx.snap b/libs/shared/ui/src/lib/components/modals/modal-multi-confirmation/__snapshots__/modal-multi-confirmation.spec.tsx.snap
index fc7e9416113..d312fc1ef5d 100644
--- a/libs/shared/ui/src/lib/components/modals/modal-multi-confirmation/__snapshots__/modal-multi-confirmation.spec.tsx.snap
+++ b/libs/shared/ui/src/lib/components/modals/modal-multi-confirmation/__snapshots__/modal-multi-confirmation.spec.tsx.snap
@@ -17,7 +17,7 @@ exports[`ModalMultiConfirmation should match delete mode without description 1`]
     />
     <form>
       <div
-        class="flex-row gap-x-4 p-4 border rounded-md text-sm items-center border-negative-component bg-surface-negative-subtle text-negative mb-5 grid grid-cols-[1fr_auto] gap-y-3"
+        class="flex-row gap-x-3 p-4 border rounded-md text-sm items-center border-negative-component bg-surface-negative-subtle text-negative mb-5 grid grid-cols-[1fr_auto] gap-y-3"
         data-accent-color="red"
       >
         <div
@@ -29,7 +29,7 @@ exports[`ModalMultiConfirmation should match delete mode without description 1`]
           />
         </div>
         <div
-          class="-order-1 mr-auto gap-x-4 text-neutral"
+          class="-order-1 mr-auto gap-x-3 text-neutral"
         >
           <div
             class="flex flex-col gap-3"
@@ -112,13 +112,13 @@ exports[`ModalMultiConfirmation should match delete mode without description 1`]
         class="flex justify-end gap-3"
       >
         <button
-          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
+          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-neutral-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg text-neutral-subtle hover:bg-surface-neutral-subtle"
           type="button"
         >
           Cancel
         </button>
         <button
-          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-negative-strong text-sm h-10 px-3 rounded-lg bg-surface-negative-solid hover:bg-surface-negative-solidHover border border-negative-component text-neutral-contrasted"
+          class="inline-flex items-center shrink-0 font-medium transition-[background-color,transform] active:scale-[0.97] disabled:scale-100 disabled:pointer-events-none disabled:border disabled:border-neutral disabled:text-neutral-disabled disabled:bg-surface-neutral-component focus-visible:[&:not(:active)]:outline-2 outline-0 select-none outline-negative-strong text-sm h-10 px-3 gap-x-1.5 rounded-lg bg-surface-negative-solid hover:bg-surface-negative-solidHover border border-negative-component text-neutral-contrasted"
           disabled=""
           type="submit"
         >
diff --git a/libs/shared/ui/src/lib/components/table-filter/table-filter.tsx b/libs/shared/ui/src/lib/components/table-filter/table-filter.tsx
index 2562a69b420..13c95c071d8 100644
--- a/libs/shared/ui/src/lib/components/table-filter/table-filter.tsx
+++ b/libs/shared/ui/src/lib/components/table-filter/table-filter.tsx
@@ -39,7 +39,7 @@ export function TableFilter({ column }: { column: Column<any, unknown> }) {
         <div className="relative inline-block">
           <Popover.Trigger>
             <Button
-              className={twMerge('gap-1 whitespace-nowrap text-xs', column.getIsFiltered() ? 'pr-6' : '')}
+              className={twMerge('whitespace-nowrap text-xs', column.getIsFiltered() ? 'pr-6' : '')}
               color={column.getIsFiltered() ? 'brand' : 'neutral'}
               variant={column.getIsFiltered() ? 'solid' : 'surface'}
             >
diff --git a/libs/shared/ui/src/lib/components/table/table-head-datepicker/table-head-datepicker.tsx b/libs/shared/ui/src/lib/components/table/table-head-datepicker/table-head-datepicker.tsx
index 937570a4c35..7621bf3761c 100644
--- a/libs/shared/ui/src/lib/components/table/table-head-datepicker/table-head-datepicker.tsx
+++ b/libs/shared/ui/src/lib/components/table/table-head-datepicker/table-head-datepicker.tsx
@@ -117,8 +117,8 @@ export function TableHeadDatePickerFilter({
               type="button"
               color="neutral"
               size="sm"
-              className="gap-1.5 whitespace-nowrap"
-              onClick={() => setIsOpenTimestamp((isOpenTimestamp) => !isOpenTimestamp)}
+              className="whitespace-nowrap"
+              onClick={() => setIsOpenTimestamp(!isOpenTimestamp)}
             >
               {title}
               <span
@@ -134,7 +134,7 @@ export function TableHeadDatePickerFilter({
               type="button"
               color="neutral"
               size="sm"
-              className="items-center gap-1.5 font-code"
+              className="items-center font-code"
               onClick={() => {
                 setIsOpenTimestamp((isOpenTimestamp) => !isOpenTimestamp)
               }}
diff --git a/libs/shared/ui/src/lib/components/table/table-head-filter/table-head-filter.tsx b/libs/shared/ui/src/lib/components/table/table-head-filter/table-head-filter.tsx
index c3e77a055e6..26de6b854e0 100644
--- a/libs/shared/ui/src/lib/components/table/table-head-filter/table-head-filter.tsx
+++ b/libs/shared/ui/src/lib/components/table/table-head-filter/table-head-filter.tsx
@@ -269,20 +269,14 @@ export function TableHeadFilter<T>({
         trigger={
           <div className="flex">
             {hasFilter ? (
-              <Button type="button" color="neutral" size="sm" className="gap-1.5 whitespace-nowrap font-code">
+              <Button type="button" color="neutral" size="sm" className="whitespace-nowrap font-code">
                 {title} {!hideFilterNumber ? `(${dataFilterNumber})` : ''}
                 <span role="button" className="flex" onClick={(event) => cleanFilter(event)}>
                   <Icon iconName="xmark" />
                 </span>
               </Button>
             ) : (
-              <Button
-                type="button"
-                variant="surface"
-                color="neutral"
-                size="sm"
-                className="items-center gap-1.5 font-code"
-              >
+              <Button type="button" variant="surface" color="neutral" size="sm" className="items-center font-code">
                 {title}
                 <Icon iconName="angle-down" />
               </Button>
diff --git a/libs/shared/ui/src/lib/components/table/table-head-hierarchical-filter/table-head-hierarchical-filter.tsx b/libs/shared/ui/src/lib/components/table/table-head-hierarchical-filter/table-head-hierarchical-filter.tsx
index 9b0a4e5a8e4..7b125b286dc 100644
--- a/libs/shared/ui/src/lib/components/table/table-head-hierarchical-filter/table-head-hierarchical-filter.tsx
+++ b/libs/shared/ui/src/lib/components/table/table-head-hierarchical-filter/table-head-hierarchical-filter.tsx
@@ -379,7 +379,7 @@ export function TableHeadHierarchicalFilter({
         trigger={
           <div className="flex">
             {hasFilter ? (
-              <Button type="button" color="neutral" size="sm" className="gap-1.5 whitespace-nowrap font-code">
+              <Button type="button" color="neutral" size="sm" className="whitespace-nowrap font-code">
                 {title}
                 <span
                   role="button"
@@ -390,13 +390,7 @@ export function TableHeadHierarchicalFilter({
                 </span>
               </Button>
             ) : (
-              <Button
-                type="button"
-                variant="surface"
-                color="neutral"
-                size="sm"
-                className="items-center gap-1.5 font-code"
-              >
+              <Button type="button" variant="surface" color="neutral" size="sm" className="items-center font-code">
                 {title}
                 <Icon iconName="angle-down" />
               </Button>