diff --git a/packages/ui-library/src/components/actions/buttons/icon-button/index.ts b/packages/ui-library/src/components/actions/buttons/icon-button/index.ts
index bf28c6f76..53331a01e 100644
--- a/packages/ui-library/src/components/actions/buttons/icon-button/index.ts
+++ b/packages/ui-library/src/components/actions/buttons/icon-button/index.ts
@@ -102,6 +102,7 @@ export class BlrIconButton extends LitElement {
         <span
           aria-label=${this.arialabel || nothing}
           class="blr-semantic-action blr-icon-button ${classes}"
+          aria-disabled=${this.disabled ? 'true' : nothing}
           @click=${this.handleClick}
           id=${this.buttonId || nothing}
           tabindex=${this.disabled ? nothing : '0'}
diff --git a/packages/ui-library/src/components/actions/buttons/text-button/index.ts b/packages/ui-library/src/components/actions/buttons/text-button/index.ts
index 190dec431..4607c2a76 100644
--- a/packages/ui-library/src/components/actions/buttons/text-button/index.ts
+++ b/packages/ui-library/src/components/actions/buttons/text-button/index.ts
@@ -148,11 +148,12 @@ export class BlrTextButton extends LitElement {
         </style>
         <span
           class="${classes}"
+          aria-disabled=${this.disabled ? 'true' : nothing}
           @click="${this.handleClick}"
           tabindex=${this.disabled ? nothing : '0'}
           @focus=${this.handleFocus}
           @blur=${this.handleBlur}
-          role=${this.disabled ? nothing : 'button'}
+          role="button"
           @keydown=${(event: KeyboardEvent) => {
             if (event.code === 'Space') {
               this.handleClick(event);
diff --git a/packages/ui-library/src/foundation/semantic-tokens/action.css.ts b/packages/ui-library/src/foundation/semantic-tokens/action.css.ts
index d2221eb97..3337eaa5a 100644
--- a/packages/ui-library/src/foundation/semantic-tokens/action.css.ts
+++ b/packages/ui-library/src/foundation/semantic-tokens/action.css.ts
@@ -10,6 +10,8 @@ export const { tokenizedLight: actionLight, tokenizedDark: actionDark } = render
       &.disabled {
         pointer-events: none;
         cursor: not-allowed;
+        user-select: none;
+        -webkit-user-select: none;
       }
       
       &.xs {