diff --git a/LICENSE_BITWARDEN.txt b/LICENSE_BITWARDEN.txt
index fd037c067933..08e09f28639c 100644
--- a/LICENSE_BITWARDEN.txt
+++ b/LICENSE_BITWARDEN.txt
@@ -16,7 +16,7 @@ entity on behalf of whom you are acting (as applicable, "You" or "Your").
 
 1. DEFINITIONS
 
-"Bitwarden Software" means the Bitwarden server software, libraries, and
+"Bitwarden Software" means the Bitwarden client software, libraries, and
 Commercial Modules.
 
 "Commercial Modules" means the modules designed to work with and enhance the
diff --git a/libs/components/src/button/button.directive.ts b/libs/components/src/button/button.directive.ts
index c5853d5bd101..59e7b4269f77 100644
--- a/libs/components/src/button/button.directive.ts
+++ b/libs/components/src/button/button.directive.ts
@@ -9,6 +9,10 @@ const buttonStyles: Record<ButtonTypes, string[]> = {
     "!tw-text-contrast",
     "hover:tw-bg-primary-700",
     "hover:tw-border-primary-700",
+    "disabled:tw-bg-primary-500/60",
+    "disabled:tw-border-primary-500/60",
+    "disabled:!tw-text-contrast/60",
+    "disabled:tw-bg-clip-padding",
   ],
   secondary: [
     "tw-bg-transparent",
@@ -17,6 +21,9 @@ const buttonStyles: Record<ButtonTypes, string[]> = {
     "hover:tw-bg-secondary-500",
     "hover:tw-border-secondary-500",
     "hover:!tw-text-contrast",
+    "disabled:tw-bg-transparent",
+    "disabled:tw-border-text-muted/60",
+    "disabled:!tw-text-muted/60",
   ],
   danger: [
     "tw-bg-transparent",
@@ -25,6 +32,9 @@ const buttonStyles: Record<ButtonTypes, string[]> = {
     "hover:tw-bg-danger-500",
     "hover:tw-border-danger-500",
     "hover:!tw-text-contrast",
+    "disabled:tw-bg-transparent",
+    "disabled:tw-border-danger-500/60",
+    "disabled:!tw-text-danger/60",
   ],
 };
 
@@ -43,9 +53,6 @@ export class ButtonDirective {
       "tw-border-solid",
       "tw-text-center",
       "hover:tw-no-underline",
-      "disabled:tw-bg-secondary-100",
-      "disabled:tw-border-secondary-100",
-      "disabled:!tw-text-main",
       "focus:tw-outline-none",
       "focus-visible:tw-ring",
       "focus-visible:tw-ring-offset-2",