diff --git a/libs/components/src/button/button.component.ts b/libs/components/src/button/button.component.ts
index daa03f81b5a..037aedd12d7 100644
--- a/libs/components/src/button/button.component.ts
+++ b/libs/components/src/button/button.component.ts
@@ -4,7 +4,7 @@ import { Input, HostBinding, Component } from "@angular/core";
 import { ButtonLikeAbstraction, ButtonType } from "../shared/button-like.abstraction";
 
 const focusRing = [
-  "focus-visible:tw-ring",
+  "focus-visible:tw-ring-2",
   "focus-visible:tw-ring-offset-2",
   "focus-visible:tw-ring-primary-500",
   "focus-visible:tw-z-10",
diff --git a/libs/components/src/icon-button/icon-button.component.ts b/libs/components/src/icon-button/icon-button.component.ts
index 0b26ebd948d..c1b808cf583 100644
--- a/libs/components/src/icon-button/icon-button.component.ts
+++ b/libs/components/src/icon-button/icon-button.component.ts
@@ -15,10 +15,10 @@ const focusRing = [
   "before:tw-content-['']",
   "before:tw-block",
   "before:tw-absolute",
-  "before:-tw-inset-[3px]",
-  "before:tw-rounded-md",
+  "before:-tw-inset-[2px]",
+  "before:tw-rounded-lg",
   "before:tw-transition",
-  "before:tw-ring",
+  "before:tw-ring-2",
   "before:tw-ring-transparent",
   "focus-visible:tw-z-10",
 ];
@@ -41,9 +41,9 @@ const styles: Record<IconButtonType, string[]> = {
     "!tw-text-main",
     "tw-border-transparent",
     "hover:tw-bg-transparent-hover",
-    "hover:tw-border-text-main",
-    "focus-visible:before:tw-ring-text-main",
-    "disabled:tw-opacity-60",
+    "hover:tw-border-primary-500",
+    "focus-visible:before:tw-ring-primary-500",
+    "disabled:!tw-text-secondary-300",
     "disabled:hover:tw-border-transparent",
     "disabled:hover:tw-bg-transparent",
     ...focusRing,
@@ -53,9 +53,9 @@ const styles: Record<IconButtonType, string[]> = {
     "!tw-text-muted",
     "tw-border-transparent",
     "hover:tw-bg-transparent-hover",
-    "hover:tw-border-primary-700",
-    "focus-visible:before:tw-ring-primary-700",
-    "disabled:tw-opacity-60",
+    "hover:tw-border-primary-500",
+    "focus-visible:before:tw-ring-primary-500",
+    "disabled:!tw-text-secondary-300",
     "disabled:hover:tw-border-transparent",
     "disabled:hover:tw-bg-transparent",
     ...focusRing,
@@ -64,9 +64,9 @@ const styles: Record<IconButtonType, string[]> = {
     "tw-bg-primary-600",
     "!tw-text-contrast",
     "tw-border-primary-600",
-    "hover:tw-bg-primary-700",
-    "hover:tw-border-primary-700",
-    "focus-visible:before:tw-ring-primary-700",
+    "hover:tw-bg-primary-500",
+    "hover:tw-border-primary-500",
+    "focus-visible:before:tw-ring-primary-500",
     "disabled:tw-opacity-60",
     "disabled:hover:tw-border-primary-600",
     "disabled:hover:tw-bg-primary-600",
@@ -78,26 +78,25 @@ const styles: Record<IconButtonType, string[]> = {
     "tw-border-text-muted",
     "hover:!tw-text-contrast",
     "hover:tw-bg-text-muted",
-    "focus-visible:before:tw-ring-primary-700",
+    "focus-visible:before:tw-ring-primary-500",
     "disabled:tw-opacity-60",
     "disabled:hover:tw-border-text-muted",
     "disabled:hover:tw-bg-transparent",
     "disabled:hover:!tw-text-muted",
-    "disabled:hover:tw-border-text-muted",
     ...focusRing,
   ],
   danger: [
     "tw-bg-transparent",
-    "!tw-text-danger",
-    "tw-border-danger-600",
-    "hover:!tw-text-contrast",
-    "hover:tw-bg-danger-600",
-    "focus-visible:before:tw-ring-primary-700",
-    "disabled:tw-opacity-60",
-    "disabled:hover:tw-border-danger-600",
+    "!tw-text-danger-600",
+    "tw-border-transparent",
+    "hover:!tw-text-danger-600",
+    "hover:tw-bg-transparent",
+    "hover:tw-border-primary-500",
+    "focus-visible:before:tw-ring-primary-500",
+    "disabled:!tw-text-secondary-300",
+    "disabled:hover:tw-border-transparent",
     "disabled:hover:tw-bg-transparent",
-    "disabled:hover:!tw-text-danger",
-    "disabled:hover:tw-border-danger-600",
+    "disabled:hover:!tw-text-secondary-300",
     ...focusRing,
   ],
   light: [
@@ -107,6 +106,7 @@ const styles: Record<IconButtonType, string[]> = {
     "hover:tw-bg-transparent-hover",
     "hover:tw-border-text-alt2",
     "focus-visible:before:tw-ring-text-alt2",
+    "disabled:tw-opacity-60",
     "disabled:hover:tw-border-transparent",
     "disabled:hover:tw-bg-transparent",
     ...focusRing,
@@ -141,7 +141,7 @@ export class BitIconButtonComponent implements ButtonLikeAbstraction, FocusableE
       "tw-font-semibold",
       "tw-border",
       "tw-border-solid",
-      "tw-rounded",
+      "tw-rounded-lg",
       "tw-transition",
       "hover:tw-no-underline",
       "focus:tw-outline-none",
diff --git a/libs/components/src/icon-button/icon-button.stories.ts b/libs/components/src/icon-button/icon-button.stories.ts
index 0f25d2de583..6fe16fe6b14 100644
--- a/libs/components/src/icon-button/icon-button.stories.ts
+++ b/libs/components/src/icon-button/icon-button.stories.ts
@@ -133,6 +133,6 @@ export const Disabled: Story = {
   ...Default,
   args: {
     disabled: true,
-    loading: true,
+    loading: false,
   },
 };
diff --git a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-form.component.ts b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-form.component.ts
index fa3a915f227..027c155ab53 100644
--- a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-form.component.ts
+++ b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-form.component.ts
@@ -76,6 +76,7 @@ import { KitchenSinkSharedModule } from "../kitchen-sink-shared.module";
             linkType="primary"
             [bitPopoverTriggerFor]="myPopover"
             #triggerRef="popoverTrigger"
+            type="button"
           >
             <i class="bwi bwi-question-circle"></i>
           </button>
diff --git a/libs/components/src/tw-theme.css b/libs/components/src/tw-theme.css
index 66a393fb543..b88912453d2 100644
--- a/libs/components/src/tw-theme.css
+++ b/libs/components/src/tw-theme.css
@@ -1,7 +1,7 @@
 @import "./reset.css";
 
 :root {
-  --color-transparent-hover: rgb(0 0 0 / 0.03);
+  --color-transparent-hover: rgb(0 0 0 / 0.02);
 
   --color-background: 255 255 255;
   --color-background-alt: 246 247 249;
@@ -52,7 +52,7 @@
 }
 
 .theme_dark {
-  --color-transparent-hover: rgb(255 255 255 / 0.12);
+  --color-transparent-hover: rgb(255 255 255 / 0.02);
 
   --color-background: 32 39 51;
   --color-background-alt: 18 26 39;
diff --git a/libs/components/tailwind.config.base.js b/libs/components/tailwind.config.base.js
index 7f5449b69ba..7b6d30115d8 100644
--- a/libs/components/tailwind.config.base.js
+++ b/libs/components/tailwind.config.base.js
@@ -107,6 +107,7 @@ module.exports = {
         700: rgba("--color-primary-700"),
       },
       secondary: {
+        300: rgba("--color-secondary-300"),
         700: rgba("--color-secondary-700"),
       },
     },