From 994c0fc7df8b3d2b5b22683e210d58f9ac8fc409 Mon Sep 17 00:00:00 2001
From: Camille TJHOA <camille.tjhoa@outlook.com>
Date: Tue, 27 Feb 2024 19:48:21 +0100
Subject: [PATCH] tests: update tests and snapshots

---
 .../cluster-action-toolbar.spec.tsx.snap      |  16 +-
 .../__snapshots__/cluster-type.spec.tsx.snap  |   8 +-
 .../environment-action-toolbar.spec.tsx.snap  |  12 +-
 .../environment-list.spec.tsx.snap            | 104 ++++++-----
 .../environment-list.spec.tsx                 |  18 +-
 .../environment-mode.spec.tsx.snap            |   8 +-
 .../git-token-list.spec.tsx.snap              |   8 +-
 .../networking-setting.spec.tsx.snap          |  12 +-
 ...s-override-arguments-setting.spec.tsx.snap |  12 +-
 ...alues-override-files-setting.spec.tsx.snap |   2 +-
 ...values-override-yaml-setting.spec.tsx.snap |   2 +-
 .../__snapshots__/last-commit.spec.tsx.snap   |   2 +-
 .../__snapshots__/pod-details.spec.tsx.snap   |   8 +-
 .../__snapshots__/pods-metrics.spec.tsx.snap  |   4 +-
 .../select-commit-modal.spec.tsx.snap         |   4 +-
 .../select-version-modal.spec.tsx.snap        |   4 +-
 .../service-action-toolbar.spec.tsx.snap      |  12 +-
 .../service-list-action-bar.spec.tsx.snap     |   4 +-
 .../__snapshots__/service-list.spec.tsx.snap  | 162 ++++++++++--------
 .../lib/service-list/service-list.spec.tsx    |  18 +-
 .../update-all-modal.spec.tsx.snap            |   6 +-
 .../page-settings-resources.spec.tsx.snap     |   2 +-
 .../page-settings-kubeconfig.spec.tsx.snap    |   2 +-
 .../button-popover-subnets.spec.tsx.snap      |  10 +-
 .../step-kubeconfig.spec.tsx.snap             |  10 +-
 .../step-general-feature.spec.tsx.snap        |   8 +-
 ...alues-override-files-feature.spec.tsx.snap |  10 +-
 .../badge/__snapshots__/badge.spec.tsx.snap   |   6 +-
 .../button-primitive.spec.tsx.snap            |   2 +-
 .../button/__snapshots__/button.spec.tsx.snap |   4 +-
 30 files changed, 262 insertions(+), 218 deletions(-)

diff --git a/libs/domains/clusters/feature/src/lib/cluster-action-toolbar/__snapshots__/cluster-action-toolbar.spec.tsx.snap b/libs/domains/clusters/feature/src/lib/cluster-action-toolbar/__snapshots__/cluster-action-toolbar.spec.tsx.snap
index 96f9d7d9da7..8204684a719 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-action-toolbar/__snapshots__/cluster-action-toolbar.spec.tsx.snap
+++ b/libs/domains/clusters/feature/src/lib/cluster-action-toolbar/__snapshots__/cluster-action-toolbar.spec.tsx.snap
@@ -26,7 +26,7 @@ exports[`ClusterActionToolbar 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 h-8 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
+      class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
       data-orientation="horizontal"
       data-radix-collection-item=""
       data-state="open"
@@ -49,7 +49,7 @@ exports[`ClusterActionToolbar should match manage deployment snapshot 1`] = `
       </div>
     </button>
     <button
-      class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
+      class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
       data-orientation="horizontal"
       data-radix-collection-item=""
       data-state="closed"
@@ -62,7 +62,7 @@ exports[`ClusterActionToolbar should match manage deployment snapshot 1`] = `
       />
     </button>
     <button
-      class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
+      class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
       data-orientation="horizontal"
       data-radix-collection-item=""
       data-state="closed"
@@ -78,7 +78,7 @@ exports[`ClusterActionToolbar 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 h-8 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
+      class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
       data-orientation="horizontal"
       data-radix-collection-item=""
       data-state="closed"
@@ -196,7 +196,7 @@ exports[`ClusterActionToolbar 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 h-8 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
+      class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
       data-orientation="horizontal"
       data-radix-collection-item=""
       data-state="closed"
@@ -219,7 +219,7 @@ exports[`ClusterActionToolbar should match other actions snapshot 1`] = `
       </div>
     </button>
     <button
-      class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
+      class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
       data-orientation="horizontal"
       data-radix-collection-item=""
       data-state="closed"
@@ -232,7 +232,7 @@ exports[`ClusterActionToolbar should match other actions snapshot 1`] = `
       />
     </button>
     <button
-      class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
+      class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
       data-orientation="horizontal"
       data-radix-collection-item=""
       data-state="closed"
@@ -249,7 +249,7 @@ exports[`ClusterActionToolbar 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 h-8 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
+      class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
       data-orientation="horizontal"
       data-radix-collection-item=""
       data-state="open"
diff --git a/libs/domains/clusters/feature/src/lib/cluster-type/__snapshots__/cluster-type.spec.tsx.snap b/libs/domains/clusters/feature/src/lib/cluster-type/__snapshots__/cluster-type.spec.tsx.snap
index 1297b88fead..ded3c1ccdcf 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-type/__snapshots__/cluster-type.spec.tsx.snap
+++ b/libs/domains/clusters/feature/src/lib/cluster-type/__snapshots__/cluster-type.spec.tsx.snap
@@ -4,7 +4,7 @@ exports[`ClusterType should render as EKS 1`] = `
 <body>
   <div>
     <span
-      class="inline-flex items-center shrink-0 font-medium border text-sm py-1 px-2 rounded border-neutral-250 text-neutral-350 dark:border-neutral-350"
+      class="inline-flex items-center shrink-0 font-medium border text-xs h-7 px-2 rounded border-neutral-250 text-neutral-350 dark:border-neutral-350"
       data-accent-color="neutral"
     >
       EKS
@@ -17,7 +17,7 @@ exports[`ClusterType should render as GCP 1`] = `
 <body>
   <div>
     <span
-      class="inline-flex items-center shrink-0 font-medium border text-sm py-1 px-2 rounded border-neutral-250 text-neutral-350 dark:border-neutral-350"
+      class="inline-flex items-center shrink-0 font-medium border text-xs h-7 px-2 rounded border-neutral-250 text-neutral-350 dark:border-neutral-350"
       data-accent-color="neutral"
     >
       GKE (Autopilot)
@@ -30,7 +30,7 @@ exports[`ClusterType should render as K3S 1`] = `
 <body>
   <div>
     <span
-      class="inline-flex items-center shrink-0 font-medium border text-sm py-1 px-2 rounded border-neutral-250 text-neutral-350 dark:border-neutral-350"
+      class="inline-flex items-center shrink-0 font-medium border text-xs h-7 px-2 rounded border-neutral-250 text-neutral-350 dark:border-neutral-350"
       data-accent-color="neutral"
     >
       EC2 (K3S)
@@ -43,7 +43,7 @@ exports[`ClusterType should render as SCW 1`] = `
 <body>
   <div>
     <span
-      class="inline-flex items-center shrink-0 font-medium border text-sm py-1 px-2 rounded border-neutral-250 text-neutral-350 dark:border-neutral-350"
+      class="inline-flex items-center shrink-0 font-medium border text-xs h-7 px-2 rounded border-neutral-250 text-neutral-350 dark:border-neutral-350"
       data-accent-color="neutral"
     >
       Kapsule
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 637717d9bda..3764686e111 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
@@ -26,7 +26,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 h-8 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
+      class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
       data-orientation="horizontal"
       data-radix-collection-item=""
       data-state="open"
@@ -49,7 +49,7 @@ exports[`EnvironmentActionToolbar should match manage deployment snapshot 1`] =
       </div>
     </button>
     <button
-      class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
+      class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
       data-orientation="horizontal"
       data-radix-collection-item=""
       data-state="closed"
@@ -65,7 +65,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 h-8 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
+      class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
       data-orientation="horizontal"
       data-radix-collection-item=""
       data-state="closed"
@@ -201,7 +201,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 h-8 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
+      class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
       data-orientation="horizontal"
       data-radix-collection-item=""
       data-state="closed"
@@ -224,7 +224,7 @@ exports[`EnvironmentActionToolbar should match other actions snapshot 1`] = `
       </div>
     </button>
     <button
-      class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
+      class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
       data-orientation="horizontal"
       data-radix-collection-item=""
       data-state="closed"
@@ -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 h-8 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
+      class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
       data-orientation="horizontal"
       data-radix-collection-item=""
       data-state="open"
diff --git a/libs/domains/environments/feature/src/lib/environment-list/__snapshots__/environment-list.spec.tsx.snap b/libs/domains/environments/feature/src/lib/environment-list/__snapshots__/environment-list.spec.tsx.snap
index 6de5505604d..c4d3d08deb6 100644
--- a/libs/domains/environments/feature/src/lib/environment-list/__snapshots__/environment-list.spec.tsx.snap
+++ b/libs/domains/environments/feature/src/lib/environment-list/__snapshots__/environment-list.spec.tsx.snap
@@ -18,7 +18,7 @@ exports[`EnvironmentList should match snapshot 1`] = `
               aria-controls="radix-:r1m:"
               aria-expanded="false"
               aria-haspopup="dialog"
-              class="inline-flex items-center shrink-0 font-medium transition h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 text-xs gap-1 whitespace-nowrap"
+              class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 text-xs gap-1 whitespace-nowrap"
               data-state="closed"
               type="button"
             >
@@ -41,7 +41,7 @@ exports[`EnvironmentList should match snapshot 1`] = `
               aria-controls="radix-:r1p:"
               aria-expanded="false"
               aria-haspopup="dialog"
-              class="inline-flex items-center shrink-0 font-medium transition h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 text-xs gap-1 whitespace-nowrap"
+              class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 text-xs gap-1 whitespace-nowrap"
               data-state="closed"
               type="button"
             >
@@ -64,7 +64,7 @@ exports[`EnvironmentList should match snapshot 1`] = `
               aria-controls="radix-:r1s:"
               aria-expanded="false"
               aria-haspopup="dialog"
-              class="inline-flex items-center shrink-0 font-medium transition h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 text-xs gap-1 whitespace-nowrap"
+              class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 text-xs gap-1 whitespace-nowrap"
               data-state="closed"
               type="button"
             >
@@ -87,7 +87,7 @@ exports[`EnvironmentList should match snapshot 1`] = `
               aria-controls="radix-:r1v:"
               aria-expanded="false"
               aria-haspopup="dialog"
-              class="inline-flex items-center shrink-0 font-medium transition h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 text-xs gap-1 whitespace-nowrap"
+              class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 text-xs gap-1 whitespace-nowrap"
               data-state="closed"
               type="button"
             >
@@ -167,9 +167,11 @@ exports[`EnvironmentList should match snapshot 1`] = `
           class="h-14 px-4 py-0 first:border-r"
           style="width: 15%;"
         >
-          <button
-            class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
+          <a
+            as="button"
+            class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
             data-state="closed"
+            href="/organization/3d542888-3d2c-474a-b1ad-712556db66da/project/a021261e-4318-4f2f-b480-169ab62efc28/environment/893c68cb-d1f7-498b-9e00-be841c8d38c3/services/general"
           >
             <div
               class=""
@@ -204,15 +206,17 @@ exports[`EnvironmentList should match snapshot 1`] = `
               </svg>
             </div>
             Stopped
-          </button>
+          </a>
         </td>
         <td
           class="h-14 px-4 py-0 first:border-r"
           style="width: 15%;"
         >
-          <button
-            class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
+          <a
+            as="button"
+            class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
             data-state="closed"
+            href="/organization/3d542888-3d2c-474a-b1ad-712556db66da/project/a021261e-4318-4f2f-b480-169ab62efc28/environment/893c68cb-d1f7-498b-9e00-be841c8d38c3/logs"
           >
             <div
               class=""
@@ -247,15 +251,17 @@ exports[`EnvironmentList should match snapshot 1`] = `
               </svg>
             </div>
             Never deployed
-          </button>
+          </a>
         </td>
         <td
           class="h-14 px-4 py-0 first:border-r"
           style="width: 20%;"
         >
-          <button
-            class="inline-flex items-center shrink-0 font-medium transition text-xs px-1 py-0.5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
+          <a
+            as="button"
+            class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-5 px-1 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
             data-state="closed"
+            href="/organization/3d542888-3d2c-474a-b1ad-712556db66da/cluster/28480911-95f9-48c9-8e58-2685dbfc9004"
           >
             <svg
               class="shrink-0 mr-2"
@@ -282,7 +288,7 @@ exports[`EnvironmentList should match snapshot 1`] = `
               />
             </svg>
             GCP cluster
-          </button>
+          </a>
         </td>
         <td
           class="h-14 px-4 py-0 first:border-r"
@@ -348,9 +354,11 @@ exports[`EnvironmentList should match snapshot 1`] = `
           class="h-14 px-4 py-0 first:border-r"
           style="width: 15%;"
         >
-          <button
-            class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
+          <a
+            as="button"
+            class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
             data-state="closed"
+            href="/organization/3d542888-3d2c-474a-b1ad-712556db66da/project/a021261e-4318-4f2f-b480-169ab62efc28/environment/2fe51760-af0b-4f2f-b752-88a813e1375d/services/general"
           >
             <div
               class=""
@@ -385,15 +393,17 @@ exports[`EnvironmentList should match snapshot 1`] = `
               </svg>
             </div>
             Stopped
-          </button>
+          </a>
         </td>
         <td
           class="h-14 px-4 py-0 first:border-r"
           style="width: 15%;"
         >
-          <button
-            class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
+          <a
+            as="button"
+            class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
             data-state="closed"
+            href="/organization/3d542888-3d2c-474a-b1ad-712556db66da/project/a021261e-4318-4f2f-b480-169ab62efc28/environment/2fe51760-af0b-4f2f-b752-88a813e1375d/logs"
           >
             <div
               class=""
@@ -414,15 +424,17 @@ exports[`EnvironmentList should match snapshot 1`] = `
               </svg>
             </div>
             Canceled
-          </button>
+          </a>
         </td>
         <td
           class="h-14 px-4 py-0 first:border-r"
           style="width: 20%;"
         >
-          <button
-            class="inline-flex items-center shrink-0 font-medium transition text-xs px-1 py-0.5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
+          <a
+            as="button"
+            class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-5 px-1 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
             data-state="closed"
+            href="/organization/3d542888-3d2c-474a-b1ad-712556db66da/cluster/c531a994-603f-4edf-86cd-bdaea66a46a9"
           >
             <svg
               class="shrink-0 mr-2"
@@ -442,7 +454,7 @@ exports[`EnvironmentList should match snapshot 1`] = `
               />
             </svg>
             Undeletable_cluster
-          </button>
+          </a>
         </td>
         <td
           class="h-14 px-4 py-0 first:border-r"
@@ -508,9 +520,11 @@ exports[`EnvironmentList should match snapshot 1`] = `
           class="h-14 px-4 py-0 first:border-r"
           style="width: 15%;"
         >
-          <button
-            class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
+          <a
+            as="button"
+            class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
             data-state="closed"
+            href="/organization/3d542888-3d2c-474a-b1ad-712556db66da/project/a021261e-4318-4f2f-b480-169ab62efc28/environment/0cd5d05e-0839-48ff-be67-ca3f4fcf8250/services/general"
           >
             <div
               class=""
@@ -545,15 +559,17 @@ exports[`EnvironmentList should match snapshot 1`] = `
               </svg>
             </div>
             Stopped
-          </button>
+          </a>
         </td>
         <td
           class="h-14 px-4 py-0 first:border-r"
           style="width: 15%;"
         >
-          <button
-            class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
+          <a
+            as="button"
+            class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
             data-state="closed"
+            href="/organization/3d542888-3d2c-474a-b1ad-712556db66da/project/a021261e-4318-4f2f-b480-169ab62efc28/environment/0cd5d05e-0839-48ff-be67-ca3f4fcf8250/logs"
           >
             <div
               class=""
@@ -574,15 +590,17 @@ exports[`EnvironmentList should match snapshot 1`] = `
               </svg>
             </div>
             Canceled
-          </button>
+          </a>
         </td>
         <td
           class="h-14 px-4 py-0 first:border-r"
           style="width: 20%;"
         >
-          <button
-            class="inline-flex items-center shrink-0 font-medium transition text-xs px-1 py-0.5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
+          <a
+            as="button"
+            class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-5 px-1 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
             data-state="closed"
+            href="/organization/3d542888-3d2c-474a-b1ad-712556db66da/cluster/c531a994-603f-4edf-86cd-bdaea66a46a9"
           >
             <svg
               class="shrink-0 mr-2"
@@ -602,7 +620,7 @@ exports[`EnvironmentList should match snapshot 1`] = `
               />
             </svg>
             Undeletable_cluster
-          </button>
+          </a>
         </td>
         <td
           class="h-14 px-4 py-0 first:border-r"
@@ -668,9 +686,11 @@ exports[`EnvironmentList should match snapshot 1`] = `
           class="h-14 px-4 py-0 first:border-r"
           style="width: 15%;"
         >
-          <button
-            class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
+          <a
+            as="button"
+            class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
             data-state="closed"
+            href="/organization/3d542888-3d2c-474a-b1ad-712556db66da/project/a021261e-4318-4f2f-b480-169ab62efc28/environment/c1567d73-b9cd-4664-8aa0-5c71e2bfd74a/services/general"
           >
             <div
               class=""
@@ -705,15 +725,17 @@ exports[`EnvironmentList should match snapshot 1`] = `
               </svg>
             </div>
             Stopped
-          </button>
+          </a>
         </td>
         <td
           class="h-14 px-4 py-0 first:border-r"
           style="width: 15%;"
         >
-          <button
-            class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
+          <a
+            as="button"
+            class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
             data-state="closed"
+            href="/organization/3d542888-3d2c-474a-b1ad-712556db66da/project/a021261e-4318-4f2f-b480-169ab62efc28/environment/c1567d73-b9cd-4664-8aa0-5c71e2bfd74a/logs"
           >
             <div
               class=""
@@ -748,15 +770,17 @@ exports[`EnvironmentList should match snapshot 1`] = `
               </svg>
             </div>
             Deployed
-          </button>
+          </a>
         </td>
         <td
           class="h-14 px-4 py-0 first:border-r"
           style="width: 20%;"
         >
-          <button
-            class="inline-flex items-center shrink-0 font-medium transition text-xs px-1 py-0.5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
+          <a
+            as="button"
+            class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-5 px-1 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
             data-state="closed"
+            href="/organization/3d542888-3d2c-474a-b1ad-712556db66da/cluster/c531a994-603f-4edf-86cd-bdaea66a46a9"
           >
             <svg
               class="shrink-0 mr-2"
@@ -776,7 +800,7 @@ exports[`EnvironmentList should match snapshot 1`] = `
               />
             </svg>
             Undeletable_cluster
-          </button>
+          </a>
         </td>
         <td
           class="h-14 px-4 py-0 first:border-r"
diff --git a/libs/domains/environments/feature/src/lib/environment-list/environment-list.spec.tsx b/libs/domains/environments/feature/src/lib/environment-list/environment-list.spec.tsx
index b97222d4b74..1f864894de6 100644
--- a/libs/domains/environments/feature/src/lib/environment-list/environment-list.spec.tsx
+++ b/libs/domains/environments/feature/src/lib/environment-list/environment-list.spec.tsx
@@ -243,19 +243,17 @@ describe('EnvironmentList', () => {
       '/organization/3d542888-3d2c-474a-b1ad-712556db66da/project/a021261e-4318-4f2f-b480-169ab62efc28/environment/893c68cb-d1f7-498b-9e00-be841c8d38c3/services/general'
     )
   })
-  it('should navigate to environment live logs on environment status click', async () => {
-    const { userEvent } = renderWithProviders(<EnvironmentList {...environmentListProps} />)
-    await userEvent.click(screen.getAllByRole('button', { name: /stopped/i })[0])
-
-    expect(mockNavigate).toHaveBeenCalledWith(
+  it('should navigate to environment live logs on environment status click', () => {
+    renderWithProviders(<EnvironmentList {...environmentListProps} />)
+    expect(screen.getAllByRole('link', { name: /stopped/i })[0]).toHaveAttribute(
+      'href',
       '/organization/3d542888-3d2c-474a-b1ad-712556db66da/project/a021261e-4318-4f2f-b480-169ab62efc28/environment/893c68cb-d1f7-498b-9e00-be841c8d38c3/services/general'
     )
   })
-  it('should navigate to environment deployment logs on environment deployment status click', async () => {
-    const { userEvent } = renderWithProviders(<EnvironmentList {...environmentListProps} />)
-    await userEvent.click(screen.getAllByRole('button', { name: /deployed/i })[1])
-
-    expect(mockNavigate).toHaveBeenCalledWith(
+  it('should navigate to environment deployment logs on environment deployment status click', () => {
+    renderWithProviders(<EnvironmentList {...environmentListProps} />)
+    expect(screen.getAllByRole('link', { name: /deployed/i })[1]).toHaveAttribute(
+      'href',
       '/organization/3d542888-3d2c-474a-b1ad-712556db66da/project/a021261e-4318-4f2f-b480-169ab62efc28/environment/c1567d73-b9cd-4664-8aa0-5c71e2bfd74a/logs'
     )
   })
diff --git a/libs/domains/environments/feature/src/lib/environment-mode/__snapshots__/environment-mode.spec.tsx.snap b/libs/domains/environments/feature/src/lib/environment-mode/__snapshots__/environment-mode.spec.tsx.snap
index c3c62928a6d..2b830bb2dec 100644
--- a/libs/domains/environments/feature/src/lib/environment-mode/__snapshots__/environment-mode.spec.tsx.snap
+++ b/libs/domains/environments/feature/src/lib/environment-mode/__snapshots__/environment-mode.spec.tsx.snap
@@ -4,7 +4,7 @@ exports[`EnvironmentMode should render as development mode 1`] = `
 <body>
   <div>
     <span
-      class="inline-flex items-center shrink-0 font-medium border text-sm py-1 px-2 rounded bg-neutral-100 border-neutral-200 text-neutral-400"
+      class="inline-flex items-center shrink-0 font-medium border text-xs h-7 px-2 rounded border-neutral-250 text-neutral-350 dark:border-neutral-350"
       data-accent-color="neutral"
     >
       Development
@@ -17,7 +17,7 @@ exports[`EnvironmentMode should render as preview mode 1`] = `
 <body>
   <div>
     <span
-      class="inline-flex items-center shrink-0 font-medium text-purple-500 border text-sm py-1 px-2 rounded bg-purple-50 border-purple-500"
+      class="inline-flex items-center shrink-0 font-medium text-purple-500 border text-xs h-7 px-2 rounded border-purple-500"
       data-accent-color="purple"
     >
       Preview
@@ -30,7 +30,7 @@ exports[`EnvironmentMode should render as production mode 1`] = `
 <body>
   <div>
     <span
-      class="inline-flex items-center shrink-0 font-medium text-red-500 border text-sm py-1 px-2 rounded bg-red-50 border-red-500"
+      class="inline-flex items-center shrink-0 font-medium text-red-500 border text-xs h-7 px-2 rounded border-red-500"
       data-accent-color="red"
     >
       Production
@@ -43,7 +43,7 @@ exports[`EnvironmentMode should render as staging mode 1`] = `
 <body>
   <div>
     <span
-      class="inline-flex items-center shrink-0 font-medium border text-sm py-1 px-2 rounded bg-neutral-100 border-neutral-200 text-neutral-400"
+      class="inline-flex items-center shrink-0 font-medium border text-xs h-7 px-2 rounded border-neutral-250 text-neutral-350 dark:border-neutral-350"
       data-accent-color="neutral"
     >
       Staging
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 bd99c55ce2c..a569c3a2aea 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 text-xs h-8 px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent mr-2"
+                class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-9 px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent mr-2"
               >
                 <i
                   aria-hidden="true"
@@ -78,7 +78,7 @@ exports[`GitTokenList should match snapshot 1`] = `
                 />
               </button>
               <button
-                class="inline-flex items-center shrink-0 font-medium transition text-xs h-8 px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent"
+                class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-9 px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent"
               >
                 <i
                   aria-hidden="true"
@@ -175,7 +175,7 @@ exports[`GitTokenList should match snapshot 1`] = `
             </div>
             <div>
               <button
-                class="inline-flex items-center shrink-0 font-medium transition text-xs h-8 px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent mr-2"
+                class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-9 px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent mr-2"
               >
                 <i
                   aria-hidden="true"
@@ -183,7 +183,7 @@ exports[`GitTokenList should match snapshot 1`] = `
                 />
               </button>
               <button
-                class="inline-flex items-center shrink-0 font-medium transition text-xs h-8 px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent"
+                class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-9 px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent"
               >
                 <i
                   aria-hidden="true"
diff --git a/libs/domains/service-helm/feature/src/lib/networking-setting/__snapshots__/networking-setting.spec.tsx.snap b/libs/domains/service-helm/feature/src/lib/networking-setting/__snapshots__/networking-setting.spec.tsx.snap
index 711d72b403d..0d90026ad69 100644
--- a/libs/domains/service-helm/feature/src/lib/networking-setting/__snapshots__/networking-setting.spec.tsx.snap
+++ b/libs/domains/service-helm/feature/src/lib/networking-setting/__snapshots__/networking-setting.spec.tsx.snap
@@ -36,7 +36,7 @@ exports[`NetworkingSetting should match snapshot in empty state 1`] = `
           </span>
         </div>
         <button
-          class="inline-flex items-center shrink-0 font-medium transition border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
+          class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
         >
           Add port
         </button>
@@ -117,7 +117,7 @@ exports[`NetworkingSetting should match snapshot with ports 1`] = `
           </span>
         </div>
         <button
-          class="inline-flex items-center shrink-0 font-medium transition border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
+          class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
         >
           Add port
         </button>
@@ -173,7 +173,7 @@ exports[`NetworkingSetting should match snapshot with ports 1`] = `
                 class="flex gap-2"
               >
                 <button
-                  class="inline-flex items-center shrink-0 font-medium transition text-xs h-8 px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent"
+                  class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-9 px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent"
                   data-testid="edit-port"
                   type="button"
                 >
@@ -183,7 +183,7 @@ exports[`NetworkingSetting should match snapshot with ports 1`] = `
                   />
                 </button>
                 <button
-                  class="inline-flex items-center shrink-0 font-medium transition text-xs h-8 px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent"
+                  class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-9 px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent"
                   data-testid="remove-port"
                   type="button"
                 >
@@ -225,7 +225,7 @@ exports[`NetworkingSetting should match snapshot with ports 1`] = `
                 class="flex gap-2"
               >
                 <button
-                  class="inline-flex items-center shrink-0 font-medium transition text-xs h-8 px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent"
+                  class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-9 px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent"
                   data-testid="edit-port"
                   type="button"
                 >
@@ -235,7 +235,7 @@ exports[`NetworkingSetting should match snapshot with ports 1`] = `
                   />
                 </button>
                 <button
-                  class="inline-flex items-center shrink-0 font-medium transition text-xs h-8 px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent"
+                  class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-9 px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent"
                   data-testid="remove-port"
                   type="button"
                 >
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 fb30ada51ba..c391a45e3c2 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 border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
+          class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
         >
           Add variable
         </button>
@@ -42,7 +42,7 @@ exports[`ValuesOverrideArgumentsSetting should match snapshot 1`] = `
         />
       </span>
       <button
-        class="inline-flex items-center shrink-0 font-medium transition text-sm h-11 px-5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 mb-10"
+        class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-sm h-11 px-5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 mb-10"
       >
         See default values.yaml 
         <i
@@ -150,7 +150,7 @@ exports[`ValuesOverrideArgumentsSetting should match snapshot 1`] = `
                 </div>
               </div>
               <button
-                class="inline-flex items-center shrink-0 font-medium transition text-xs px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent w-full h-[36px]"
+                class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent w-full h-[36px]"
                 type="button"
               >
                 <i
@@ -216,7 +216,7 @@ exports[`ValuesOverrideArgumentsSetting should match snapshot 1`] = `
                 </div>
               </div>
               <button
-                class="inline-flex items-center shrink-0 font-medium transition text-xs px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 justify-between h-[36px]"
+                class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 justify-between h-[36px]"
                 type="button"
               >
                 Close json
@@ -226,7 +226,7 @@ exports[`ValuesOverrideArgumentsSetting should match snapshot 1`] = `
                 />
               </button>
               <button
-                class="inline-flex items-center shrink-0 font-medium transition text-xs px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent w-full h-[36px]"
+                class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent w-full h-[36px]"
                 type="button"
               >
                 <i
@@ -328,7 +328,7 @@ exports[`ValuesOverrideArgumentsSetting should match snapshot 1`] = `
                 </div>
               </div>
               <button
-                class="inline-flex items-center shrink-0 font-medium transition text-xs px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent w-full h-[36px]"
+                class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent w-full h-[36px]"
                 type="button"
               >
                 <i
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 7e0bc1783ec..2bc70ef7e7b 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
@@ -582,7 +582,7 @@ exports[`ValuesOverrideFilesSetting should match snapshot with YAML type 1`] = `
                     No override defined.
                   </p>
                   <button
-                    class="inline-flex items-center shrink-0 font-medium transition border text-xs h-8 px-3 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
+                    class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none border text-xs h-9 px-3 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
                     type="button"
                   >
                     Create override 
diff --git a/libs/domains/service-helm/feature/src/lib/values-override-yaml-setting/__snapshots__/values-override-yaml-setting.spec.tsx.snap b/libs/domains/service-helm/feature/src/lib/values-override-yaml-setting/__snapshots__/values-override-yaml-setting.spec.tsx.snap
index 73b0a4d729d..5e33940b435 100644
--- a/libs/domains/service-helm/feature/src/lib/values-override-yaml-setting/__snapshots__/values-override-yaml-setting.spec.tsx.snap
+++ b/libs/domains/service-helm/feature/src/lib/values-override-yaml-setting/__snapshots__/values-override-yaml-setting.spec.tsx.snap
@@ -32,7 +32,7 @@ exports[`ValuesOverrideAsYamlSetting should match snapshot 1`] = `
             No override defined.
           </p>
           <button
-            class="inline-flex items-center shrink-0 font-medium transition border text-xs h-8 px-3 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
+            class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none border text-xs h-9 px-3 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
             type="button"
           >
             Create override 
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 099af8d95a8..61d2aa4ab6c 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
@@ -8,7 +8,7 @@ exports[`LastCommit should match snapshot 1`] = `
       data-state="closed"
     >
       <button
-        class="inline-flex items-center shrink-0 font-medium transition text-xs px-1 py-0.5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 group justify-between"
+        class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-5 px-1 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 group justify-between"
         type="button"
       >
         <i
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 998b1c7befa..9dfb09f7ec2 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
@@ -11,7 +11,7 @@ exports[`PodDetails should match snapshot with container based pod and with mult
         href="/organization//project//environment//logs/1/live-logs"
       >
         <button
-          class="inline-flex items-center shrink-0 font-medium transition text-xs h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 gap-2"
+          class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 gap-2"
           type="button"
         >
           Logs
@@ -184,7 +184,7 @@ exports[`PodDetails should match snapshot with git based pod and with last_termi
         href="/organization//project//environment//logs/1/live-logs"
       >
         <button
-          class="inline-flex items-center shrink-0 font-medium transition text-xs h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 gap-2"
+          class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 gap-2"
           type="button"
         >
           Logs
@@ -356,7 +356,7 @@ exports[`PodDetails should match snapshot with git based pod and without last_te
         href="/organization//project//environment//logs/1/live-logs"
       >
         <button
-          class="inline-flex items-center shrink-0 font-medium transition text-xs h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 gap-2"
+          class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 gap-2"
           type="button"
         >
           Logs
@@ -480,7 +480,7 @@ exports[`PodDetails should match snapshot with pod error with 0 containers 1`] =
         href="/organization//project//environment//logs/1/live-logs?pod_name=app-z0fb41d62-5c7fdb6f5f-44wpd"
       >
         <button
-          class="inline-flex items-center shrink-0 font-medium transition text-xs h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 gap-2"
+          class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 gap-2"
           type="button"
         >
           Logs
diff --git a/libs/domains/services/feature/src/lib/pods-metrics/__snapshots__/pods-metrics.spec.tsx.snap b/libs/domains/services/feature/src/lib/pods-metrics/__snapshots__/pods-metrics.spec.tsx.snap
index cf9a40a2d20..413b29550bc 100644
--- a/libs/domains/services/feature/src/lib/pods-metrics/__snapshots__/pods-metrics.spec.tsx.snap
+++ b/libs/domains/services/feature/src/lib/pods-metrics/__snapshots__/pods-metrics.spec.tsx.snap
@@ -105,7 +105,7 @@ exports[`PodsMetrics should match snapshot with data 1`] = `
               />
             </button>
             <button
-              class="inline-flex items-center shrink-0 font-medium transition text-xs px-1 py-0.5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
+              class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-5 px-1 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
             >
               foobar
             </button>
@@ -114,7 +114,7 @@ exports[`PodsMetrics should match snapshot with data 1`] = `
             class="h-14 px-4 py-0"
           >
             <span
-              class="inline-flex items-center shrink-0 font-medium border text-sm py-1 px-2 rounded-full border-neutral-250 text-neutral-350 dark:border-neutral-350 gap-2 capitalize"
+              class="inline-flex items-center shrink-0 font-medium border text-xs h-7 px-2 rounded-full border-neutral-250 text-neutral-350 dark:border-neutral-350 gap-2 capitalize"
             >
               <div
                 class=""
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 0fd67c191c8..836e3e7d4b9 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
@@ -277,12 +277,12 @@ exports[`SelectCommitModal should match snapshot 1`] = `
       class="flex gap-3 justify-end"
     >
       <button
-        class="inline-flex items-center shrink-0 font-medium transition text-sm h-11 px-5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent"
+        class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-sm h-11 px-5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent"
       >
         Cancel
       </button>
       <button
-        class="inline-flex items-center shrink-0 font-medium transition border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
+        class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
         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 19f211f899f..a11278e90d4 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
@@ -56,12 +56,12 @@ exports[`SelectVersionModal should match snapshot 1`] = `
       class="flex gap-3 justify-end"
     >
       <button
-        class="inline-flex items-center shrink-0 font-medium transition text-sm h-11 px-5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent"
+        class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-sm h-11 px-5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent"
       >
         Cancel
       </button>
       <button
-        class="inline-flex items-center shrink-0 font-medium transition border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
+        class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
         disabled=""
       >
         Deploy
diff --git a/libs/domains/services/feature/src/lib/service-action-toolbar/__snapshots__/service-action-toolbar.spec.tsx.snap b/libs/domains/services/feature/src/lib/service-action-toolbar/__snapshots__/service-action-toolbar.spec.tsx.snap
index 3d53793c065..d9baaa1384b 100644
--- a/libs/domains/services/feature/src/lib/service-action-toolbar/__snapshots__/service-action-toolbar.spec.tsx.snap
+++ b/libs/domains/services/feature/src/lib/service-action-toolbar/__snapshots__/service-action-toolbar.spec.tsx.snap
@@ -26,7 +26,7 @@ exports[`ServiceActionToolbar 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 h-8 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
+      class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
       data-orientation="horizontal"
       data-radix-collection-item=""
       data-state="open"
@@ -49,7 +49,7 @@ exports[`ServiceActionToolbar should match manage deployment snapshot 1`] = `
       </div>
     </button>
     <button
-      class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
+      class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
       data-orientation="horizontal"
       data-radix-collection-item=""
       data-state="closed"
@@ -65,7 +65,7 @@ exports[`ServiceActionToolbar 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 h-8 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
+      class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
       data-orientation="horizontal"
       data-radix-collection-item=""
       data-state="closed"
@@ -188,7 +188,7 @@ exports[`ServiceActionToolbar 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 h-8 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
+      class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
       data-orientation="horizontal"
       data-radix-collection-item=""
       data-state="closed"
@@ -211,7 +211,7 @@ exports[`ServiceActionToolbar should match other actions snapshot 1`] = `
       </div>
     </button>
     <button
-      class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
+      class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
       data-orientation="horizontal"
       data-radix-collection-item=""
       data-state="closed"
@@ -228,7 +228,7 @@ exports[`ServiceActionToolbar 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 h-8 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
+      class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 border border-neutral-250 dark:border-neutral-350 dark:text-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent first:rounded-l last:rounded-r first:border-x border-l-0 hover:[&:not(:active)]:border-neutral-250 text-neutral-350 hover:bg-neutral-150 hover:text-brand-400 data-[state=open]:bg-neutral-150 data-[state=open]:text-brand-400 text-2xs outline-0"
       data-orientation="horizontal"
       data-radix-collection-item=""
       data-state="open"
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 46ba613d000..f0cf32559c8 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
@@ -30,7 +30,7 @@ exports[`ServiceListActionBar should match snapshot 1`] = `
               class="flex gap-3"
             >
               <button
-                class="inline-flex shrink-0 font-medium transition border text-xs h-8 px-3 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none items-center gap-2"
+                class="inline-flex shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none border text-xs h-9 px-3 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none items-center gap-2"
               >
                 Deploy selected 
                 <i
@@ -41,7 +41,7 @@ exports[`ServiceListActionBar should match snapshot 1`] = `
               <button
                 aria-expanded="false"
                 aria-haspopup="menu"
-                class="inline-flex shrink-0 font-medium transition text-xs h-8 px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 items-center gap-2"
+                class="inline-flex shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-9 px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 items-center gap-2"
                 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 7e65beda898..93d03191272 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
@@ -38,7 +38,7 @@ exports[`ServiceList should match snapshot 1`] = `
                 aria-controls="radix-:r1v:"
                 aria-expanded="false"
                 aria-haspopup="dialog"
-                class="inline-flex items-center shrink-0 font-medium transition h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 text-xs gap-1 whitespace-nowrap"
+                class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 text-xs gap-1 whitespace-nowrap"
                 data-state="closed"
                 type="button"
               >
@@ -61,7 +61,7 @@ exports[`ServiceList should match snapshot 1`] = `
                 aria-controls="radix-:r22:"
                 aria-expanded="false"
                 aria-haspopup="dialog"
-                class="inline-flex items-center shrink-0 font-medium transition h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 text-xs gap-1 whitespace-nowrap"
+                class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 text-xs gap-1 whitespace-nowrap"
                 data-state="closed"
                 type="button"
               >
@@ -84,7 +84,7 @@ exports[`ServiceList should match snapshot 1`] = `
                 aria-controls="radix-:r25:"
                 aria-expanded="false"
                 aria-haspopup="dialog"
-                class="inline-flex items-center shrink-0 font-medium transition h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 text-xs gap-1 whitespace-nowrap"
+                class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 text-xs gap-1 whitespace-nowrap"
                 data-state="closed"
                 type="button"
               >
@@ -249,7 +249,7 @@ exports[`ServiceList should match snapshot 1`] = `
                     aria-controls="radix-:r26:"
                     aria-expanded="false"
                     aria-haspopup="dialog"
-                    class="inline-flex items-center shrink-0 font-medium transition text-xs px-1 py-0.5 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
+                    class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-5 px-1 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
                     data-state="closed"
                     type="button"
                   >
@@ -286,9 +286,11 @@ exports[`ServiceList should match snapshot 1`] = `
             class="h-14 px-4 py-0 first:relative"
             style="width: 15%;"
           >
-            <button
-              class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
+            <a
+              as="button"
+              class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
               data-state="closed"
+              href="/organization/1/project/cf021d82-2c5e-41de-96eb-eb69c022eddc/environment/55867c71-56f9-4b4f-ab22-5904c9dbafda/application/037c9e87-e098-4970-8b1f-9a5ffe9e4b89/services/general"
             >
               <div
                 class=""
@@ -323,15 +325,17 @@ exports[`ServiceList should match snapshot 1`] = `
                 </svg>
               </div>
               Stopped
-            </button>
+            </a>
           </td>
           <td
             class="h-14 px-4 py-0 first:relative"
             style="width: 15%;"
           >
-            <button
-              class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
+            <a
+              as="button"
+              class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
               data-state="closed"
+              href="/organization/1/project/cf021d82-2c5e-41de-96eb-eb69c022eddc/environment/55867c71-56f9-4b4f-ab22-5904c9dbafda/logs/037c9e87-e098-4970-8b1f-9a5ffe9e4b89/deployment-logs"
             >
               <div
                 class=""
@@ -366,7 +370,7 @@ exports[`ServiceList should match snapshot 1`] = `
                 </svg>
               </div>
               Stopped
-            </button>
+            </a>
           </td>
           <td
             class="h-14 px-4 py-0 first:relative"
@@ -399,7 +403,7 @@ exports[`ServiceList should match snapshot 1`] = `
                   data-state="closed"
                 >
                   <button
-                    class="inline-flex items-center shrink-0 font-medium transition text-xs px-1 py-0.5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 group justify-between"
+                    class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-5 px-1 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 group justify-between"
                     type="button"
                   >
                     <i
@@ -413,13 +417,15 @@ exports[`ServiceList should match snapshot 1`] = `
                     2f74448
                   </button>
                 </span>
-                <a
-                  href="https://github.com/acarranoqovery/javascript-tetris/tree/master/"
-                  rel="noopener noreferrer"
-                  target="_blank"
+                <span
+                  class="inline-block"
                 >
-                  <span
-                    class="inline-flex items-center shrink-0 font-medium border text-xs px-1 py-0.5 rounded bg-neutral-100 border-neutral-200 text-neutral-400 gap-1 whitespace-nowrap"
+                  <a
+                    as="button"
+                    class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-5 px-1 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 gap-1 whitespace-nowrap"
+                    href="https://github.com/acarranoqovery/javascript-tetris/tree/master/"
+                    rel="noopener noreferrer"
+                    target="_blank"
                   >
                     <i
                       aria-hidden="true"
@@ -428,8 +434,8 @@ exports[`ServiceList should match snapshot 1`] = `
                       width="14"
                     />
                     master
-                  </span>
-                </a>
+                  </a>
+                </span>
               </div>
             </div>
           </td>
@@ -576,7 +582,7 @@ exports[`ServiceList should match snapshot 1`] = `
                     aria-controls="radix-:r2f:"
                     aria-expanded="false"
                     aria-haspopup="dialog"
-                    class="inline-flex items-center shrink-0 font-medium transition text-xs px-1 py-0.5 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
+                    class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-5 px-1 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
                     data-state="closed"
                     type="button"
                   >
@@ -622,9 +628,11 @@ exports[`ServiceList should match snapshot 1`] = `
             class="h-14 px-4 py-0 first:relative"
             style="width: 15%;"
           >
-            <button
-              class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
+            <a
+              as="button"
+              class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
               data-state="closed"
+              href="/organization/1/project/cf021d82-2c5e-41de-96eb-eb69c022eddc/environment/55867c71-56f9-4b4f-ab22-5904c9dbafda/application/04308de2-af27-405f-9e95-570fa94ed577/services/general"
             >
               <div
                 class=""
@@ -659,15 +667,17 @@ exports[`ServiceList should match snapshot 1`] = `
                 </svg>
               </div>
               Stopped
-            </button>
+            </a>
           </td>
           <td
             class="h-14 px-4 py-0 first:relative"
             style="width: 15%;"
           >
-            <button
-              class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
+            <a
+              as="button"
+              class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
               data-state="closed"
+              href="/organization/1/project/cf021d82-2c5e-41de-96eb-eb69c022eddc/environment/55867c71-56f9-4b4f-ab22-5904c9dbafda/logs/04308de2-af27-405f-9e95-570fa94ed577/deployment-logs"
             >
               <div
                 class=""
@@ -702,7 +712,7 @@ exports[`ServiceList should match snapshot 1`] = `
                 </svg>
               </div>
               Stopped
-            </button>
+            </a>
           </td>
           <td
             class="h-14 px-4 py-0 first:relative"
@@ -711,13 +721,15 @@ exports[`ServiceList should match snapshot 1`] = `
             <div
               class="flex flex-col gap-1 ml-7"
             >
-              <a
-                href="https://docker.io"
-                rel="noopener noreferrer"
-                target="_blank"
+              <span
+                class="inline-block"
               >
-                <span
-                  class="inline-flex shrink-0 font-medium border text-xs px-1 py-0.5 rounded bg-neutral-100 border-neutral-200 text-neutral-400 items-center gap-1 capitalize whitespace-nowrap"
+                <a
+                  as="button"
+                  class="inline-flex shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-5 px-1 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 items-center gap-1 capitalize whitespace-nowrap"
+                  href="https://docker.io"
+                  rel="noopener noreferrer"
+                  target="_blank"
                 >
                   <svg
                     class="shrink-0 "
@@ -734,11 +746,11 @@ exports[`ServiceList should match snapshot 1`] = `
                     />
                   </svg>
                   dockerhub public
-                </span>
-              </a>
+                </a>
+              </span>
               <div>
                 <span
-                  class="inline-flex items-center shrink-0 font-medium border text-xs px-1 py-0.5 rounded bg-neutral-100 border-neutral-200 text-neutral-400 gap-1 whitespace-nowrap"
+                  class="inline-flex items-center shrink-0 font-medium border text-xs h-5 px-1 rounded bg-neutral-100 border-neutral-200 text-neutral-400 gap-1 whitespace-nowrap"
                 >
                   <svg
                     class="shrink-0 "
@@ -1196,7 +1208,7 @@ exports[`ServiceList should match snapshot 1`] = `
                     aria-controls="radix-:r2n:"
                     aria-expanded="false"
                     aria-haspopup="dialog"
-                    class="inline-flex items-center shrink-0 font-medium transition text-xs px-1 py-0.5 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
+                    class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-5 px-1 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
                     data-state="closed"
                     type="button"
                   >
@@ -1242,9 +1254,11 @@ exports[`ServiceList should match snapshot 1`] = `
             class="h-14 px-4 py-0 first:relative"
             style="width: 15%;"
           >
-            <button
-              class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
+            <a
+              as="button"
+              class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
               data-state="closed"
+              href="/organization/1/project/cf021d82-2c5e-41de-96eb-eb69c022eddc/environment/55867c71-56f9-4b4f-ab22-5904c9dbafda/application/ebd8be35-d7a2-4d4f-ad82-de4378a83ef4/services/general"
             >
               <div
                 class=""
@@ -1279,15 +1293,17 @@ exports[`ServiceList should match snapshot 1`] = `
                 </svg>
               </div>
               Stopped
-            </button>
+            </a>
           </td>
           <td
             class="h-14 px-4 py-0 first:relative"
             style="width: 15%;"
           >
-            <button
-              class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
+            <a
+              as="button"
+              class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
               data-state="closed"
+              href="/organization/1/project/cf021d82-2c5e-41de-96eb-eb69c022eddc/environment/55867c71-56f9-4b4f-ab22-5904c9dbafda/logs/ebd8be35-d7a2-4d4f-ad82-de4378a83ef4/deployment-logs"
             >
               <div
                 class=""
@@ -1322,7 +1338,7 @@ exports[`ServiceList should match snapshot 1`] = `
                 </svg>
               </div>
               Stopped
-            </button>
+            </a>
           </td>
           <td
             class="h-14 px-4 py-0 first:relative"
@@ -1355,7 +1371,7 @@ exports[`ServiceList should match snapshot 1`] = `
                   data-state="closed"
                 >
                   <button
-                    class="inline-flex items-center shrink-0 font-medium transition text-xs px-1 py-0.5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 group justify-between"
+                    class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-5 px-1 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 group justify-between"
                     type="button"
                   >
                     <i
@@ -1369,13 +1385,15 @@ exports[`ServiceList should match snapshot 1`] = `
                     10ad354
                   </button>
                 </span>
-                <a
-                  href="https://github.com/acarranoqovery/test_script/tree/main/"
-                  rel="noopener noreferrer"
-                  target="_blank"
+                <span
+                  class="inline-block"
                 >
-                  <span
-                    class="inline-flex items-center shrink-0 font-medium border text-xs px-1 py-0.5 rounded bg-neutral-100 border-neutral-200 text-neutral-400 gap-1 whitespace-nowrap"
+                  <a
+                    as="button"
+                    class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-5 px-1 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 gap-1 whitespace-nowrap"
+                    href="https://github.com/acarranoqovery/test_script/tree/main/"
+                    rel="noopener noreferrer"
+                    target="_blank"
                   >
                     <i
                       aria-hidden="true"
@@ -1384,8 +1402,8 @@ exports[`ServiceList should match snapshot 1`] = `
                       width="14"
                     />
                     main
-                  </span>
-                </a>
+                  </a>
+                </span>
               </div>
             </div>
           </td>
@@ -1619,7 +1637,7 @@ exports[`ServiceList should match snapshot 1`] = `
                     aria-controls="radix-:r31:"
                     aria-expanded="false"
                     aria-haspopup="dialog"
-                    class="inline-flex items-center shrink-0 font-medium transition text-xs px-1 py-0.5 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
+                    class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-5 px-1 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
                     data-state="closed"
                     type="button"
                   >
@@ -1665,9 +1683,11 @@ exports[`ServiceList should match snapshot 1`] = `
             class="h-14 px-4 py-0 first:relative"
             style="width: 15%;"
           >
-            <button
-              class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
+            <a
+              as="button"
+              class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
               data-state="closed"
+              href="/organization/1/project/cf021d82-2c5e-41de-96eb-eb69c022eddc/environment/55867c71-56f9-4b4f-ab22-5904c9dbafda/application/33962e52-7883-42fd-8613-85e04229a9b6/services/general"
             >
               <div
                 class=""
@@ -1702,15 +1722,17 @@ exports[`ServiceList should match snapshot 1`] = `
                 </svg>
               </div>
               Stopped
-            </button>
+            </a>
           </td>
           <td
             class="h-14 px-4 py-0 first:relative"
             style="width: 15%;"
           >
-            <button
-              class="inline-flex items-center shrink-0 font-medium transition h-8 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
+            <a
+              as="button"
+              class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none h-9 px-3 rounded-full border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent text-xs gap-2 whitespace-nowrap"
               data-state="closed"
+              href="/organization/1/project/cf021d82-2c5e-41de-96eb-eb69c022eddc/environment/55867c71-56f9-4b4f-ab22-5904c9dbafda/logs/33962e52-7883-42fd-8613-85e04229a9b6/deployment-logs"
             >
               <div
                 class=""
@@ -1745,7 +1767,7 @@ exports[`ServiceList should match snapshot 1`] = `
                 </svg>
               </div>
               Never deployed
-            </button>
+            </a>
           </td>
           <td
             class="h-14 px-4 py-0 first:relative"
@@ -1778,7 +1800,7 @@ exports[`ServiceList should match snapshot 1`] = `
                   data-state="closed"
                 >
                   <button
-                    class="inline-flex items-center shrink-0 font-medium transition text-xs px-1 py-0.5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 group justify-between"
+                    class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-5 px-1 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 group justify-between"
                     type="button"
                   >
                     <i
@@ -1792,13 +1814,15 @@ exports[`ServiceList should match snapshot 1`] = `
                     10ad354
                   </button>
                 </span>
-                <a
-                  href="https://github.com/acarranoqovery/test_script/tree/main/"
-                  rel="noopener noreferrer"
-                  target="_blank"
+                <span
+                  class="inline-block"
                 >
-                  <span
-                    class="inline-flex items-center shrink-0 font-medium border text-xs px-1 py-0.5 rounded bg-neutral-100 border-neutral-200 text-neutral-400 gap-1 whitespace-nowrap"
+                  <a
+                    as="button"
+                    class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-5 px-1 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 gap-1 whitespace-nowrap"
+                    href="https://github.com/acarranoqovery/test_script/tree/main/"
+                    rel="noopener noreferrer"
+                    target="_blank"
                   >
                     <i
                       aria-hidden="true"
@@ -1807,8 +1831,8 @@ exports[`ServiceList should match snapshot 1`] = `
                       width="14"
                     />
                     main
-                  </span>
-                </a>
+                  </a>
+                </span>
               </div>
             </div>
           </td>
@@ -1853,7 +1877,7 @@ exports[`ServiceList should match snapshot 1`] = `
               class="flex gap-3"
             >
               <button
-                class="inline-flex shrink-0 font-medium transition border text-xs h-8 px-3 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none items-center gap-2"
+                class="inline-flex shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none border text-xs h-9 px-3 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none items-center gap-2"
                 data-state="closed"
                 disabled=""
               >
@@ -1866,7 +1890,7 @@ exports[`ServiceList should match snapshot 1`] = `
               <button
                 aria-expanded="false"
                 aria-haspopup="menu"
-                class="inline-flex shrink-0 font-medium transition text-xs h-8 px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 items-center gap-2"
+                class="inline-flex shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-9 px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550 items-center gap-2"
                 data-state="closed"
                 id="radix-:r3c:"
                 type="button"
diff --git a/libs/domains/services/feature/src/lib/service-list/service-list.spec.tsx b/libs/domains/services/feature/src/lib/service-list/service-list.spec.tsx
index 888c1609990..75afbcd48da 100644
--- a/libs/domains/services/feature/src/lib/service-list/service-list.spec.tsx
+++ b/libs/domains/services/feature/src/lib/service-list/service-list.spec.tsx
@@ -427,19 +427,17 @@ describe('ServiceList', () => {
       '/organization/1/project/cf021d82-2c5e-41de-96eb-eb69c022eddc/environment/55867c71-56f9-4b4f-ab22-5904c9dbafda/application/037c9e87-e098-4970-8b1f-9a5ffe9e4b89/services/general'
     )
   })
-  it('should navigate to service live logs on service status click', async () => {
-    const { userEvent } = renderWithProviders(<ServiceList {...serviceListProps} />)
-    await userEvent.click(screen.getAllByRole('button', { name: /stopped/i })[0])
-
-    expect(mockNavigate).toHaveBeenCalledWith(
+  it('should navigate to service live logs on service status click', () => {
+    renderWithProviders(<ServiceList {...serviceListProps} />)
+    expect(screen.getAllByRole('link', { name: /stopped/i })[0]).toHaveAttribute(
+      'href',
       '/organization/1/project/cf021d82-2c5e-41de-96eb-eb69c022eddc/environment/55867c71-56f9-4b4f-ab22-5904c9dbafda/application/037c9e87-e098-4970-8b1f-9a5ffe9e4b89/services/general'
     )
   })
-  it('should navigate to service deployment logs on service deployment status click', async () => {
-    const { userEvent } = renderWithProviders(<ServiceList {...serviceListProps} />)
-    await userEvent.click(screen.getAllByRole('button', { name: /stopped/i })[1])
-
-    expect(mockNavigate).toHaveBeenCalledWith(
+  it('should navigate to service deployment logs on service deployment status click', () => {
+    renderWithProviders(<ServiceList {...serviceListProps} />)
+    expect(screen.getAllByRole('link', { name: /stopped/i })[1]).toHaveAttribute(
+      'href',
       '/organization/1/project/cf021d82-2c5e-41de-96eb-eb69c022eddc/environment/55867c71-56f9-4b4f-ab22-5904c9dbafda/logs/037c9e87-e098-4970-8b1f-9a5ffe9e4b89/deployment-logs'
     )
   })
diff --git a/libs/domains/services/feature/src/lib/update-all-modal/__snapshots__/update-all-modal.spec.tsx.snap b/libs/domains/services/feature/src/lib/update-all-modal/__snapshots__/update-all-modal.spec.tsx.snap
index 8b61f8d6cf2..93fc571b82f 100644
--- a/libs/domains/services/feature/src/lib/update-all-modal/__snapshots__/update-all-modal.spec.tsx.snap
+++ b/libs/domains/services/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 text-xs h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
+          class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
           data-testid="deselect-all"
         >
           Deselect All
@@ -384,13 +384,13 @@ exports[`UpdateAllModal should reduce opacity of commit blocks 1`] = `
         class="flex gap-3 justify-end -mb-6 py-6 bg-white sticky bottom-0"
       >
         <button
-          class="inline-flex items-center shrink-0 font-medium transition text-sm h-11 px-5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
+          class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-sm h-11 px-5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
           data-testid="cancel-button"
         >
           Cancel
         </button>
         <button
-          class="inline-flex items-center shrink-0 font-medium transition border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
+          class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
           data-testid="submit-button"
           type="submit"
         >
diff --git a/libs/pages/application/src/lib/ui/page-settings-resources/__snapshots__/page-settings-resources.spec.tsx.snap b/libs/pages/application/src/lib/ui/page-settings-resources/__snapshots__/page-settings-resources.spec.tsx.snap
index eccefed63a9..ebbd9a608d2 100644
--- a/libs/pages/application/src/lib/ui/page-settings-resources/__snapshots__/page-settings-resources.spec.tsx.snap
+++ b/libs/pages/application/src/lib/ui/page-settings-resources/__snapshots__/page-settings-resources.spec.tsx.snap
@@ -270,7 +270,7 @@ exports[`PageSettingsResources should render warning box and icon for cpu 1`] =
           class="flex justify-end"
         >
           <button
-            class="inline-flex items-center shrink-0 font-medium transition border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
+            class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
             type="submit"
           >
             Save
diff --git a/libs/pages/cluster/src/lib/ui/page-settings-kubeconfig/__snapshots__/page-settings-kubeconfig.spec.tsx.snap b/libs/pages/cluster/src/lib/ui/page-settings-kubeconfig/__snapshots__/page-settings-kubeconfig.spec.tsx.snap
index 68b1cdc59ff..6fb0f7bc444 100644
--- a/libs/pages/cluster/src/lib/ui/page-settings-kubeconfig/__snapshots__/page-settings-kubeconfig.spec.tsx.snap
+++ b/libs/pages/cluster/src/lib/ui/page-settings-kubeconfig/__snapshots__/page-settings-kubeconfig.spec.tsx.snap
@@ -58,7 +58,7 @@ exports[`PageSettingsKubeconfig should match snapshot 1`] = `
           class="flex gap-2"
         >
           <button
-            class="inline-flex items-center shrink-0 font-medium transition text-xs h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent"
+            class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent"
             role="presentation"
             tabindex="0"
             type="button"
diff --git a/libs/pages/clusters/src/lib/ui/page-clusters-create/step-features/button-popover-subnets/__snapshots__/button-popover-subnets.spec.tsx.snap b/libs/pages/clusters/src/lib/ui/page-clusters-create/step-features/button-popover-subnets/__snapshots__/button-popover-subnets.spec.tsx.snap
index a1fc3e5067e..d72a6011d7a 100644
--- a/libs/pages/clusters/src/lib/ui/page-clusters-create/step-features/button-popover-subnets/__snapshots__/button-popover-subnets.spec.tsx.snap
+++ b/libs/pages/clusters/src/lib/ui/page-clusters-create/step-features/button-popover-subnets/__snapshots__/button-popover-subnets.spec.tsx.snap
@@ -11,7 +11,7 @@ exports[`ButtonPopoverSubnets should match snapshot 1`] = `
     aria-controls="radix-:rd:"
     aria-expanded="true"
     aria-haspopup="dialog"
-    class="inline-flex items-center shrink-0 font-medium transition text-xs h-7 px-2 rounded-full border dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none self-start bg-white border-green-500"
+    class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-7 px-2 rounded-full border dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none self-start bg-white border-green-500"
     data-state="open"
     type="button"
   >
@@ -123,7 +123,7 @@ exports[`ButtonPopoverSubnets should match snapshot 1`] = `
             </div>
           </div>
           <button
-            class="inline-flex items-center shrink-0 font-medium transition text-xs px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent w-full h-[36px]"
+            class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs px-3 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent w-full h-[36px]"
             type="button"
           >
             <span
@@ -137,7 +137,7 @@ exports[`ButtonPopoverSubnets should match snapshot 1`] = `
         class="flex flex-col gap-4 text-right text-base"
       >
         <button
-          class="inline-flex items-center shrink-0 font-medium transition text-xs h-8 px-3 rounded self-end"
+          class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-9 px-3 rounded self-end"
           type="button"
         >
           Add subnets
@@ -148,13 +148,13 @@ exports[`ButtonPopoverSubnets should match snapshot 1`] = `
         </button>
         <div>
           <button
-            class="inline-flex items-center shrink-0 font-medium transition text-xs h-8 px-3 rounded"
+            class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-9 px-3 rounded"
             type="button"
           >
             Clear
           </button>
           <button
-            class="inline-flex items-center shrink-0 font-medium transition border text-xs h-8 px-3 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
+            class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none border text-xs h-9 px-3 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
             type="button"
           >
             Confirm
diff --git a/libs/pages/clusters/src/lib/ui/page-clusters-create/step-kubeconfig/__snapshots__/step-kubeconfig.spec.tsx.snap b/libs/pages/clusters/src/lib/ui/page-clusters-create/step-kubeconfig/__snapshots__/step-kubeconfig.spec.tsx.snap
index fa1e9a101f2..4dfb3a76ed9 100644
--- a/libs/pages/clusters/src/lib/ui/page-clusters-create/step-kubeconfig/__snapshots__/step-kubeconfig.spec.tsx.snap
+++ b/libs/pages/clusters/src/lib/ui/page-clusters-create/step-kubeconfig/__snapshots__/step-kubeconfig.spec.tsx.snap
@@ -60,13 +60,13 @@ exports[`StepKubeconfig should match snapshot 1`] = `
         class="flex justify-between"
       >
         <button
-          class="inline-flex items-center shrink-0 font-medium transition text-sm h-11 px-5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
+          class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-sm h-11 px-5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
           type="button"
         >
           Back
         </button>
         <button
-          class="inline-flex items-center shrink-0 font-medium transition border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
+          class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
           data-testid="button-submit"
           disabled=""
           type="submit"
@@ -130,7 +130,7 @@ exports[`StepKubeconfig should match snapshot 2`] = `
           </div>
           <div>
             <button
-              class="inline-flex items-center shrink-0 font-medium transition text-xs h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent"
+              class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-7 px-2 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-transparent"
               type="button"
             >
               <i
@@ -145,13 +145,13 @@ exports[`StepKubeconfig should match snapshot 2`] = `
         class="flex justify-between"
       >
         <button
-          class="inline-flex items-center shrink-0 font-medium transition text-sm h-11 px-5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
+          class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-sm h-11 px-5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
           type="button"
         >
           Back
         </button>
         <button
-          class="inline-flex items-center shrink-0 font-medium transition border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
+          class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
           data-testid="button-submit"
           disabled=""
           type="submit"
diff --git a/libs/pages/services/src/lib/feature/page-helm-create-feature/step-general-feature/__snapshots__/step-general-feature.spec.tsx.snap b/libs/pages/services/src/lib/feature/page-helm-create-feature/step-general-feature/__snapshots__/step-general-feature.spec.tsx.snap
index 91c61ed40e3..04895f2f911 100644
--- a/libs/pages/services/src/lib/feature/page-helm-create-feature/step-general-feature/__snapshots__/step-general-feature.spec.tsx.snap
+++ b/libs/pages/services/src/lib/feature/page-helm-create-feature/step-general-feature/__snapshots__/step-general-feature.spec.tsx.snap
@@ -508,13 +508,13 @@ exports[`StepGeneralFeature should submit a form with a git repository 1`] = `
                 class="flex justify-between mt-10"
               >
                 <button
-                  class="inline-flex items-center shrink-0 font-medium transition text-sm h-11 px-5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
+                  class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-sm h-11 px-5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
                   type="button"
                 >
                   Cancel
                 </button>
                 <button
-                  class="inline-flex items-center shrink-0 font-medium transition border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
+                  class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
                   disabled=""
                   type="submit"
                 >
@@ -997,13 +997,13 @@ exports[`StepGeneralFeature should submit a form with a helm repository and matc
                 class="flex justify-between mt-10"
               >
                 <button
-                  class="inline-flex items-center shrink-0 font-medium transition text-sm h-11 px-5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
+                  class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-sm h-11 px-5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
                   type="button"
                 >
                   Cancel
                 </button>
                 <button
-                  class="inline-flex items-center shrink-0 font-medium transition border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
+                  class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
                   disabled=""
                   type="submit"
                 >
diff --git a/libs/pages/services/src/lib/feature/page-helm-create-feature/step-values-override-files-feature/__snapshots__/step-values-override-files-feature.spec.tsx.snap b/libs/pages/services/src/lib/feature/page-helm-create-feature/step-values-override-files-feature/__snapshots__/step-values-override-files-feature.spec.tsx.snap
index 8e67fbc69f8..8eda338d817 100644
--- a/libs/pages/services/src/lib/feature/page-helm-create-feature/step-values-override-files-feature/__snapshots__/step-values-override-files-feature.spec.tsx.snap
+++ b/libs/pages/services/src/lib/feature/page-helm-create-feature/step-values-override-files-feature/__snapshots__/step-values-override-files-feature.spec.tsx.snap
@@ -390,7 +390,7 @@ exports[`StepValuesOverrideFilesFeature should submit a form with a git reposito
                 class="flex justify-between mt-10"
               >
                 <button
-                  class="inline-flex items-center shrink-0 font-medium transition text-sm h-11 px-5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
+                  class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-sm h-11 px-5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
                   type="button"
                 >
                   Back
@@ -399,7 +399,7 @@ exports[`StepValuesOverrideFilesFeature should submit a form with a git reposito
                   class="flex gap-3"
                 >
                   <button
-                    class="inline-flex items-center shrink-0 font-medium transition border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
+                    class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
                     type="submit"
                   >
                     Continue
@@ -716,7 +716,7 @@ exports[`StepValuesOverrideFilesFeature should submit a form with a yaml 1`] = `
                         Raw YAML
                       </h2>
                       <button
-                        class="inline-flex items-center shrink-0 font-medium transition text-xs px-1 py-0.5 rounded hover:text-neutral-400"
+                        class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-xs h-5 px-1 rounded hover:text-neutral-400"
                         type="button"
                       >
                         <i
@@ -751,7 +751,7 @@ exports[`StepValuesOverrideFilesFeature should submit a form with a yaml 1`] = `
                 class="flex justify-between mt-10"
               >
                 <button
-                  class="inline-flex items-center shrink-0 font-medium transition text-sm h-11 px-5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
+                  class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none text-sm h-11 px-5 rounded border border-neutral-250 dark:border-neutral-350 text-neutral-400 dark:text-neutral-300 hover:[&:not(:active)]:border-neutral-300 active:bg-neutral-150 disabled:text-neutral-300 disabled:bg-neutral-150 disabled:border-none bg-neutral-100 dark:bg-neutral-500 dark:hover:bg-neutral-550"
                   type="button"
                 >
                   Back
@@ -760,7 +760,7 @@ exports[`StepValuesOverrideFilesFeature should submit a form with a yaml 1`] = `
                   class="flex gap-3"
                 >
                   <button
-                    class="inline-flex items-center shrink-0 font-medium transition border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
+                    class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none border text-sm h-11 px-5 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
                     type="submit"
                   >
                     Continue
diff --git a/libs/shared/ui/src/lib/components/badge/__snapshots__/badge.spec.tsx.snap b/libs/shared/ui/src/lib/components/badge/__snapshots__/badge.spec.tsx.snap
index 0b020ef2d6c..c94ab3fe31c 100644
--- a/libs/shared/ui/src/lib/components/badge/__snapshots__/badge.spec.tsx.snap
+++ b/libs/shared/ui/src/lib/components/badge/__snapshots__/badge.spec.tsx.snap
@@ -4,7 +4,7 @@ exports[`Badge shoud match color snapshot 1`] = `
 <body>
   <div>
     <span
-      class="inline-flex items-center shrink-0 font-medium text-green-500 border text-sm py-1 px-2 rounded border-green-500"
+      class="inline-flex items-center shrink-0 font-medium text-green-500 border text-xs h-7 px-2 rounded border-green-500"
       data-accent-color="green"
     >
       Foobar
@@ -17,7 +17,7 @@ exports[`Badge shoud match size snapshot 1`] = `
 <body>
   <div>
     <span
-      class="inline-flex items-center shrink-0 font-medium border text-xs px-1 py-0.5 rounded border-neutral-250 text-neutral-350 dark:border-neutral-350"
+      class="inline-flex items-center shrink-0 font-medium border text-xs h-5 px-1 rounded border-neutral-250 text-neutral-350 dark:border-neutral-350"
     >
       Foobar
     </span>
@@ -29,7 +29,7 @@ exports[`Badge shoud match variant snapshot 1`] = `
 <body>
   <div>
     <span
-      class="inline-flex items-center shrink-0 font-medium border text-sm py-1 px-2 rounded bg-neutral-100 border-neutral-200 text-neutral-400"
+      class="inline-flex items-center shrink-0 font-medium border text-xs h-7 px-2 rounded bg-neutral-100 border-neutral-200 text-neutral-400"
     >
       Foobar
     </span>
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 0f80a4bc2cd..043a095beb6 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 border text-xs h-7 px-2 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
+      class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none border text-xs h-7 px-2 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
       type="button"
     >
       Foobar
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 f00f9a4c76f..733f3dd2458 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 border text-xs h-7 px-2 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
+      class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none border text-xs h-7 px-2 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 text-white disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none"
       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 border text-xs h-7 px-2 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none relative pointer-events-none text-transparent"
+      class="inline-flex items-center shrink-0 font-medium transition shadow-sm disabled:shadow-none active:shadow-none border text-xs h-7 px-2 rounded bg-brand-500 border-brand-500 hover:border-brand-600 hover:bg-brand-600 disabled:text-brand-300 disabled:bg-brand-100 disabled:border-none relative pointer-events-none text-transparent"
       type="button"
     >
       <div