diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 4960217ef5..f131c5476d 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.40.0",
+  "version": "7.40.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.40.0",
+      "version": "7.40.1",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 44b6b4b2c1..65c8d07ae8 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.40.0",
+  "version": "7.40.1",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [
diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md
index 4aeffd5135..3cf3396e78 100644
--- a/packages/components/releaseNotes/components.md
+++ b/packages/components/releaseNotes/components.md
@@ -1,6 +1,13 @@
 # @labkey/components
 Components, models, actions, and utility functions for LabKey applications and pages
 
+### version 7.40.1
+*Released*: 2 June 2026
+- More misc. accessibility improvements
+  - Fix empty buttons for `ExpandableContainer` and `RemoveEntityButton`
+  - Fix color contrast for `.name-id-setting__prefix-example`, `.container-nav` and `.lk-version-nav`
+  - Fix color contrast for `.sr-only` to avoid false positives from WAVE
+
 ### version 7.40.0
 *Released*: 28 May 2026
 - Calculated Column Assistant
diff --git a/packages/components/src/internal/components/ExpandableContainer.tsx b/packages/components/src/internal/components/ExpandableContainer.tsx
index c3c8fe5c79..335ae3c2a5 100644
--- a/packages/components/src/internal/components/ExpandableContainer.tsx
+++ b/packages/components/src/internal/components/ExpandableContainer.tsx
@@ -108,7 +108,9 @@ export const ExpandableContainer: FC<Props> = memo(props => {
                         })}
                         onClick={hasOnClick || isExpandable ? handleClick : undefined}
                         type="button"
-                    />
+                    >
+                        <span className="sr-only">{visible ? 'Collapse' : 'Expand'}</span>
+                    </button>
                 </div>
                 <div className="container-expandable-heading">
                     {clause}
diff --git a/packages/components/src/internal/components/__snapshots__/ExpandableContainer.test.tsx.snap b/packages/components/src/internal/components/__snapshots__/ExpandableContainer.test.tsx.snap
index 9d81e72a07..267fb0b59d 100644
--- a/packages/components/src/internal/components/__snapshots__/ExpandableContainer.test.tsx.snap
+++ b/packages/components/src/internal/components/__snapshots__/ExpandableContainer.test.tsx.snap
@@ -22,7 +22,13 @@ exports[`<ExpandableContainer/> custom props 1`] = `
         <button
           class="clickable-text fa fa-chevron-down"
           type="button"
-        />
+        >
+          <span
+            class="sr-only"
+          >
+            Collapse
+          </span>
+        </button>
       </div>
       <div
         class="container-expandable-heading"
@@ -66,7 +72,13 @@ exports[`<ExpandableContainer/> default props 1`] = `
         <button
           class="clickable-text fa fa-chevron-right"
           type="button"
-        />
+        >
+          <span
+            class="sr-only"
+          >
+            Expand
+          </span>
+        </button>
       </div>
       <div
         class="container-expandable-heading"
diff --git a/packages/components/src/internal/components/buttons/RemoveEntityButton.tsx b/packages/components/src/internal/components/buttons/RemoveEntityButton.tsx
index 9e20395bbe..0c60f34874 100644
--- a/packages/components/src/internal/components/buttons/RemoveEntityButton.tsx
+++ b/packages/components/src/internal/components/buttons/RemoveEntityButton.tsx
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import React from 'react';
+import { Icon } from '../../Icon';
 
 interface RemoveEntityButtonProps {
     entity?: string;
@@ -29,12 +30,12 @@ export class RemoveEntityButton extends React.Component<RemoveEntityButtonProps,
 
     render() {
         const { entity, index, labelClass, onClick } = this.props;
-
+        const buttonText = entity ? ' Remove ' + entity + ' ' + (index || '') : '';
         return (
             <div className={labelClass}>
-                <button className="clickable-text container--action-button" onClick={onClick} type="button">
-                    <i className="fa fa-times container--removal-icon" />
-                    {entity ? ' Remove ' + entity + ' ' + (index || '') : ''}
+                <button aria-label={entity ? buttonText : 'Remove'} className="clickable-text container--action-button" onClick={onClick} type="button">
+                    <span className="fa fa-times container--removal-icon" aria-hidden="true" />
+                    {buttonText}
                 </button>
             </div>
         );
diff --git a/packages/components/src/internal/components/forms/input/__snapshots__/ColorPickerInput.test.tsx.snap b/packages/components/src/internal/components/forms/input/__snapshots__/ColorPickerInput.test.tsx.snap
index 3aa4e45fac..516962580a 100644
--- a/packages/components/src/internal/components/forms/input/__snapshots__/ColorPickerInput.test.tsx.snap
+++ b/packages/components/src/internal/components/forms/input/__snapshots__/ColorPickerInput.test.tsx.snap
@@ -22,10 +22,12 @@ exports[`ColorPickerInput allowRemove 1`] = `
       class="color-picker__remove"
     >
       <button
+        aria-label="Remove"
         class="clickable-text container--action-button"
         type="button"
       >
-        <i
+        <span
+          aria-hidden="true"
           class="fa fa-times container--removal-icon"
         />
       </button>
diff --git a/packages/components/src/theme/form.scss b/packages/components/src/theme/form.scss
index c03d42c581..a4407213ec 100644
--- a/packages/components/src/theme/form.scss
+++ b/packages/components/src/theme/form.scss
@@ -146,6 +146,10 @@
           border-bottom: 3px solid white
       }
   }
+  &.list-group-item.disabled {
+      background-color: $gray-shadow;
+      color: $text-color-light;
+  }
 }
 
 
diff --git a/packages/components/src/theme/navbar.scss b/packages/components/src/theme/navbar.scss
index 2937583108..3ee83a9cf4 100644
--- a/packages/components/src/theme/navbar.scss
+++ b/packages/components/src/theme/navbar.scss
@@ -446,7 +446,7 @@
 
 .container-nav {
     padding: 10px 0 8px 10px;
-    color: $text-color-gray;
+    color: $text-muted;
     position: relative;
 }
 .container-nav:before {
@@ -470,7 +470,7 @@
 
 .lk-version-nav {
     padding: 8px 0 8px 10px;
-    color: $text-color-gray;
+    color: $text-muted;
     position: relative;
 }
 
diff --git a/packages/components/src/theme/settings.scss b/packages/components/src/theme/settings.scss
index 53fa51cd2b..3e9fd25021 100644
--- a/packages/components/src/theme/settings.scss
+++ b/packages/components/src/theme/settings.scss
@@ -24,7 +24,7 @@
 .name-id-setting__prefix-example {
     margin-top: 10px;
     margin-left: 48px;
-    color: #999999;
+    color: $text-muted;
 }
 
 .name-id-setting__error {
diff --git a/packages/components/src/theme/utils.scss b/packages/components/src/theme/utils.scss
index c7616336dc..0b3adb28bb 100644
--- a/packages/components/src/theme/utils.scss
+++ b/packages/components/src/theme/utils.scss
@@ -197,3 +197,9 @@
 .pointer {
     cursor: pointer;
 }
+
+/** This is used to get around WAVE false-positives that flag the sr-only text as low contrast **/
+.sr-only {
+    color: black;
+    background: white;
+}
diff --git a/packages/components/src/theme/variables.scss b/packages/components/src/theme/variables.scss
index 888eec216b..7e99c2528e 100644
--- a/packages/components/src/theme/variables.scss
+++ b/packages/components/src/theme/variables.scss
@@ -26,6 +26,7 @@ $badge-color:         #D43F3A;
 $blue-highlight:       #2980B9;
 $gray-no-highlight:    $gray-lighten;
 $blue-icon-background: #CCE5FF;
+$gray-icon-background: #767676;
 
 $blue-dark:        #1e4f6f;
 $text-color-gray:  #9d9d9d;