diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 416931ae6e..ba2c99754a 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.38.0",
+  "version": "7.38.1-moreAccessibility.11",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.38.0",
+      "version": "7.38.1-moreAccessibility.11",
       "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 23faf43b45..def4bdbd30 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.38.0",
+  "version": "7.38.1-moreAccessibility.11",
   "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 1c04d7cf6f..e54d7ba173 100644
--- a/packages/components/releaseNotes/components.md
+++ b/packages/components/releaseNotes/components.md
@@ -1,6 +1,17 @@
 # @labkey/components
 Components, models, actions, and utility functions for LabKey applications and pages
 
+### version TBD
+*Released*: TBD
+- Misc. accessibility improvements
+  - Auto-link to study input field labels
+  - Remove tabIndex value from `DomainRow`
+  - Add labels for text choice input fields
+  - Use button instead of i for expandable container chevrons
+  - Update LabelOverlay and DetailEditor with ids for labeling elements
+  - Add `labelId` getter method in `QueryColumn`
+  - Add `data-fieldkey` to some labels to help with locators
+
 ### version 7.38.0
 *Released*: 21 May 2026
 - Accessibility improvements for app pages: Keyboard Interactions
diff --git a/packages/components/src/internal/components/buttons/ToggleButtons.tsx b/packages/components/src/internal/components/buttons/ToggleButtons.tsx
index fd3cb7aeee..5050da8068 100644
--- a/packages/components/src/internal/components/buttons/ToggleButtons.tsx
+++ b/packages/components/src/internal/components/buttons/ToggleButtons.tsx
@@ -105,10 +105,24 @@ export const ToggleIcon: FC<Props> = memo(props => {
     const body = (
         <>
             {firstActive && (
-                <button className="clickable-text fa fa-toggle-on" onClick={secondBtnClick} type="button" />
+                <button
+                    aria-pressed="true"
+                    className="clickable-text fa fa-toggle-on"
+                    onClick={secondBtnClick}
+                    type="button"
+                >
+                    <span className="sr-only">Toggle On {inputFieldName}</span>
+                </button>
             )}
             {secondActive && (
-                <button className="clickable-text fa fa-toggle-off" onClick={firstBtnClick} type="button" />
+                <button
+                    aria-pressed="true"
+                    className="clickable-text fa fa-toggle-off"
+                    onClick={firstBtnClick}
+                    type="button"
+                >
+                    <span className="sr-only">Toggle Off {inputFieldName}</span>
+                </button>
             )}
         </>
     );
diff --git a/packages/components/src/internal/components/domainproperties/AutoLinkToStudyDropdown.tsx b/packages/components/src/internal/components/domainproperties/AutoLinkToStudyDropdown.tsx
index f457321e15..2c338942b7 100644
--- a/packages/components/src/internal/components/domainproperties/AutoLinkToStudyDropdown.tsx
+++ b/packages/components/src/internal/components/domainproperties/AutoLinkToStudyDropdown.tsx
@@ -4,16 +4,23 @@ import { Container } from '../base/models/Container';
 import { LoadingSpinner } from '../base/LoadingSpinner';
 
 interface Props {
+    ariaLabelledBy: string;
     autoLinkTarget: string;
     containers: Container[];
     onChange: (evt: any) => void;
     value: string;
 }
 
-export const AutoLinkToStudyDropdown: FC<Props> = memo(({ autoLinkTarget, containers, onChange, value }) => {
+export const AutoLinkToStudyDropdown: FC<Props> = memo(({ ariaLabelledBy, autoLinkTarget, containers, onChange, value }) => {
     if (containers === undefined) return <LoadingSpinner />;
     return (
-        <select className="form-control" id={autoLinkTarget} onChange={onChange} value={value || ''}>
+            <select
+                aria-labelledby={ariaLabelledBy}
+                className="form-control"
+                id={autoLinkTarget}
+                onChange={onChange}
+                value={value || ''}
+            >
             <option value={null} />
             {containers.map(container => (
                 <option key={container.id} value={container.id}>
diff --git a/packages/components/src/internal/components/domainproperties/DomainRow.tsx b/packages/components/src/internal/components/domainproperties/DomainRow.tsx
index e601e1d45f..b0380dfa6d 100644
--- a/packages/components/src/internal/components/domainproperties/DomainRow.tsx
+++ b/packages/components/src/internal/components/domainproperties/DomainRow.tsx
@@ -412,7 +412,6 @@ export class DomainRow extends React.PureComponent<DomainRowProps, DomainRowStat
                         className={this.getRowCssClasses(expanded, dragging, selected, fieldError)}
                         {...provided.draggableProps}
                         ref={provided.innerRef}
-                        tabIndex={index}
                     >
                         <div
                             className="row domain-row-container"
diff --git a/packages/components/src/internal/components/domainproperties/TextChoiceOptions.tsx b/packages/components/src/internal/components/domainproperties/TextChoiceOptions.tsx
index f34e1989f2..388b042e48 100644
--- a/packages/components/src/internal/components/domainproperties/TextChoiceOptions.tsx
+++ b/packages/components/src/internal/components/domainproperties/TextChoiceOptions.tsx
@@ -247,6 +247,7 @@ export const TextChoiceOptionsImpl: FC<ImplProps> = memo(props => {
                         <div className="list-group domain-text-choices-list">
                             {validValues.length > MIN_VALUES_FOR_SEARCH_COUNT && (
                                 <input
+                                    aria-label="Search for a value"
                                     autoFocus
                                     className="form-control domain-text-choices-search"
                                     onChange={onSearchChange}
@@ -319,10 +320,11 @@ export const TextChoiceOptionsImpl: FC<ImplProps> = memo(props => {
                         {selectedIndex !== undefined && (!currentInUse || !isMultiChoiceField) && (
                             <>
                                 <div className="domain-field-label">
-                                    <DomainFieldLabel label="Value" />
+                                    <DomainFieldLabel id={'text-choice-value-label-' + selectedIndex} label="Value" />
                                 </div>
                                 <div className="domain-field-padding-bottom">
                                     <DisableableInput
+                                        aria-labelledby={'text-choice-value-label-' + selectedIndex}
                                         className="form-control full-width"
                                         disabledMsg={currentLocked ? LOCKED_TIP : undefined}
                                         name="value"
diff --git a/packages/components/src/internal/components/domainproperties/assay/AssayPropertiesInput.tsx b/packages/components/src/internal/components/domainproperties/assay/AssayPropertiesInput.tsx
index d24bd7e97b..4ec9de9885 100644
--- a/packages/components/src/internal/components/domainproperties/assay/AssayPropertiesInput.tsx
+++ b/packages/components/src/internal/components/domainproperties/assay/AssayPropertiesInput.tsx
@@ -358,9 +358,11 @@ export class AutoLinkDataInput extends React.PureComponent<InputProps, AutoLinkD
                         </p>
                     </>
                 }
+                id="auto-link-data-input"
                 label="Auto-Link Data to Study"
             >
                 <AutoLinkToStudyDropdown
+                    ariaLabelledBy="auto-link-data-input"
                     autoLinkTarget={FORM_IDS.AUTO_LINK_TARGET}
                     containers={containers}
                     onChange={onChange}
diff --git a/packages/components/src/internal/components/domainproperties/samples/SampleTypePropertiesPanel.tsx b/packages/components/src/internal/components/domainproperties/samples/SampleTypePropertiesPanel.tsx
index fdb01af8da..77ad37e629 100644
--- a/packages/components/src/internal/components/domainproperties/samples/SampleTypePropertiesPanel.tsx
+++ b/packages/components/src/internal/components/domainproperties/samples/SampleTypePropertiesPanel.tsx
@@ -547,12 +547,14 @@ class SampleTypePropertiesPanelImpl extends PureComponent<InjectedDomainProperti
                         <div className="row margin-top">
                             <div className="col-xs-2">
                                 <DomainFieldLabel
+                                    id="linked-study-label"
                                     helpTipBody={<AutoLinkDataToStudyHelpTip />}
                                     label="Auto-Link Data to Study"
                                 />
                             </div>
                             <div className="col-xs-5">
                                 <AutoLinkToStudyDropdown
+                                    ariaLabelledBy="linked-study-label"
                                     autoLinkTarget={ENTITY_FORM_IDS.AUTO_LINK_TARGET}
                                     containers={containers}
                                     onChange={this.onFormChange}
diff --git a/packages/components/src/internal/components/forms/LabelOverlay.test.tsx b/packages/components/src/internal/components/forms/LabelOverlay.test.tsx
index 0489905123..4de4f0a48d 100644
--- a/packages/components/src/internal/components/forms/LabelOverlay.test.tsx
+++ b/packages/components/src/internal/components/forms/LabelOverlay.test.tsx
@@ -5,51 +5,51 @@ import { LabelOverlay } from './LabelOverlay';
 describe('LabelOverlay', () => {
     it('renders label with overlay, not formsy', () => {
         render(<LabelOverlay isFormsy={false} label="Test Label" />);
-        expect(document.querySelector('label')?.textContent).toBe('Test Label ');
+        expect(document.querySelector('.control-label')?.textContent).toBe('Test Label ');
         expect(document.querySelectorAll('.fa-question-circle')).toHaveLength(1);
     });
 
     it('renders label with overlay and required symbol when required, not formsy', () => {
         render(<LabelOverlay isFormsy={false} label="Test Label" required={true} />);
-        expect(document.querySelector('label')?.textContent).toBe('Test Label * ');
+        expect(document.querySelector('.control-label')?.textContent).toBe('Test Label * ');
         expect(document.querySelectorAll('.fa-question-circle')).toHaveLength(1);
     });
 
     it('renders label with overlay and required, but addLabelAsterisk = false, not formsy', () => {
         render(<LabelOverlay addLabelAsterisk={false} isFormsy={false} label="Test Label" required={true} />);
-        expect(document.querySelector('label')?.textContent).toBe('Test Label * ');
+        expect(document.querySelector('.control-label')?.textContent).toBe('Test Label * ');
         expect(document.querySelectorAll('.fa-question-circle')).toHaveLength(1);
     });
 
     it('renders label with overlay, required = false, and addLabelAsterisk = true, not formsy', () => {
         render(<LabelOverlay addLabelAsterisk={true} isFormsy={false} label="Test Label" required={false} />);
-        expect(document.querySelector('label')?.textContent).toBe('Test Label * ');
+        expect(document.querySelector('.control-label')?.textContent).toBe('Test Label * ');
         expect(document.querySelectorAll('.fa-question-circle')).toHaveLength(1);
     });
 
     it('renders label with no overlay and required symbol when required, not formsy', () => {
         render(<LabelOverlay helpTipRenderer="NONE" isFormsy={false} label="Test Label" required={true} />);
-        expect(document.querySelector('label')?.textContent).toBe('Test Label * ');
+        expect(document.querySelector('.control-label')?.textContent).toBe('Test Label * ');
         expect(document.querySelectorAll('.fa-question-circle')).toHaveLength(0);
     });
 
     it('renders label with overlay, isFormsy = true (default)', () => {
         render(<LabelOverlay label="Test Label" />);
-        expect(document.querySelector('label')).toBeNull();
+        expect(document.querySelector('.control-label')).toBeNull();
         expect(document.querySelector('span')?.textContent).toBe('Test Label ');
         expect(document.querySelectorAll('.fa-question-circle')).toHaveLength(1);
     });
 
     it('renders label with overlay and required', () => {
         render(<LabelOverlay isFormsy={true} label="Test Label" required={true} />);
-        expect(document.querySelector('label')).toBeNull();
+        expect(document.querySelector('.control-label')).toBeNull();
         expect(document.querySelector('span')?.textContent).toBe('Test Label * ');
         expect(document.querySelectorAll('.fa-question-circle')).toHaveLength(1);
     });
 
     it('renders label with overlay and addLabelAsterisk', () => {
         render(<LabelOverlay addLabelAsterisk={true} isFormsy={true} label="Test Label" />);
-        expect(document.querySelector('label')).toBeNull();
+        expect(document.querySelector('.control-label')).toBeNull();
         expect(document.querySelector('span')?.textContent).toBe('Test Label * ');
         expect(document.querySelectorAll('.fa-question-circle')).toHaveLength(1);
     });
diff --git a/packages/components/src/internal/components/forms/LabelOverlay.tsx b/packages/components/src/internal/components/forms/LabelOverlay.tsx
index 0d9184dfc6..27c30d2013 100644
--- a/packages/components/src/internal/components/forms/LabelOverlay.tsx
+++ b/packages/components/src/internal/components/forms/LabelOverlay.tsx
@@ -29,6 +29,7 @@ import { DOMAIN_FIELD, DomainFieldHelpTipContents } from './DomainFieldHelpTipCo
 export interface LabelOverlayProps extends PropsWithChildren {
     addLabelAsterisk?: boolean;
     column?: QueryColumn;
+    dataKey?: string;
     description?: string;
     helpTipRenderer?: string;
     inputId?: string;
@@ -103,7 +104,7 @@ export class LabelOverlay extends React.Component<LabelOverlayProps> {
     }
 
     render(): ReactNode {
-        const { column, inputId, isFormsy, labelClass, required, addLabelAsterisk } = this.props;
+        const { column, dataKey, inputId, isFormsy, labelClass, required, addLabelAsterisk } = this.props;
         const label = this.props.label ? this.props.label : column ? column.caption : null;
 
         const overlay = this.getOverlay();
@@ -111,9 +112,8 @@ export class LabelOverlay extends React.Component<LabelOverlayProps> {
         if (isFormsy) {
             // when being used as a label for a formsy component directly this will use just a span without the
             // classes applied as well as not needing to handle 'required' display
-            // TODO: remove space for required-symbol after *
             return (
-                <span>
+                <span data-fieldkey={dataKey ?? column?.fieldKey} id={column?.labelId}>
                     {label}&nbsp;
                     {overlay}
                     {required || addLabelAsterisk ? <span className="required-symbol">* </span> : null}
@@ -121,10 +121,22 @@ export class LabelOverlay extends React.Component<LabelOverlayProps> {
             );
         }
 
-        // TODO: remove space for required-symbol after *
+        if (!inputId) {
+            return (
+                <span className={(labelClass ? labelClass + ' ' : '') + 'text__truncate-and-wrap'} id={column?.labelId}>
+                    <span data-fieldkey={dataKey ?? column?.fieldKey}>{label}</span>&nbsp;
+                    {overlay}
+                    {required || addLabelAsterisk ? <span className="required-symbol">* </span> : null}
+                </span>
+            );
+        }
         return (
-            <label className={(labelClass ? labelClass + ' ' : '') + 'text__truncate-and-wrap'} htmlFor={inputId}>
-                <span>{label}</span>&nbsp;
+            <label
+                className={(labelClass ? labelClass + ' ' : '') + 'text__truncate-and-wrap'}
+                htmlFor={inputId}
+                id={column?.labelId}
+            >
+                <span data-fieldkey={inputId}>{label}</span>&nbsp;
                 {overlay}
                 {required || addLabelAsterisk ? <span className="required-symbol">* </span> : null}
             </label>
diff --git a/packages/components/src/internal/components/forms/detail/DetailPanelHeader.tsx b/packages/components/src/internal/components/forms/detail/DetailPanelHeader.tsx
index 9c8b613edd..e102f5ab43 100644
--- a/packages/components/src/internal/components/forms/detail/DetailPanelHeader.tsx
+++ b/packages/components/src/internal/components/forms/detail/DetailPanelHeader.tsx
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import React, { FC, memo } from 'react';
+import { Icon } from '../../../Icon';
 
 interface DetailPanelHeaderProps {
     editing?: boolean;
@@ -30,7 +31,9 @@ export const DetailPanelHeader: FC<DetailPanelHeaderProps> = memo(props => {
     if (editing) {
         return (
             <h2 className="panel-heading">
-                {verb} {title}
+                <span>
+                    {verb} {title}
+                </span>
                 <span className="detail__edit--heading">
                     {warning !== undefined && (
                         <span>
@@ -45,12 +48,12 @@ export const DetailPanelHeader: FC<DetailPanelHeaderProps> = memo(props => {
 
     return (
         <h2 className="panel-heading">
-            {title}
+            <span>{title}</span>
             <span className="detail__edit--heading">
                 {isEditable && (
                     <>
                         <button className="clickable-text detail__edit-button" onClick={onClick} type="button">
-                            <i className="fa fa-pencil-square-o" />
+                            <Icon iconClass="fa fa-pencil-square-o" srText={'Edit ' + title} />
                         </button>
                         <div className="clearfix" />
                     </>
diff --git a/packages/components/src/internal/components/forms/input/AmountUnitInput.test.tsx b/packages/components/src/internal/components/forms/input/AmountUnitInput.test.tsx
index 16f64c6af2..c16ada4106 100644
--- a/packages/components/src/internal/components/forms/input/AmountUnitInput.test.tsx
+++ b/packages/components/src/internal/components/forms/input/AmountUnitInput.test.tsx
@@ -77,8 +77,7 @@ describe('AmountUnitInput', () => {
         expect(document.querySelectorAll('.form-group.row')).toHaveLength(1);
         expect(document.querySelectorAll('.control-label')).toHaveLength(1);
         expect(document.querySelectorAll('.control-label')[0].textContent).toBe('Amount and Units');
-        expect(document.querySelectorAll('label')).toHaveLength(1);
-        expect(document.querySelectorAll('label')[0].textContent).toBe('');
+        expect(document.querySelectorAll('label')).toHaveLength(0);
         expect(document.querySelectorAll('.fa-toggle-on')).toHaveLength(1);
         expect(document.querySelectorAll('.fa-toggle-off')).toHaveLength(0);
         const inputs = document.querySelectorAll('input');
@@ -105,8 +104,7 @@ describe('AmountUnitInput', () => {
         expect(document.querySelectorAll('.form-group.row')).toHaveLength(1);
         expect(document.querySelectorAll('.control-label')).toHaveLength(1);
         expect(document.querySelectorAll('.control-label')[0].textContent).toBe('Amount and Units');
-        expect(document.querySelectorAll('label')).toHaveLength(1);
-        expect(document.querySelectorAll('label')[0].textContent).toBe('');
+        expect(document.querySelectorAll('label')).toHaveLength(0);
         expect(document.querySelectorAll('.fa-toggle-on')).toHaveLength(0);
         expect(document.querySelectorAll('.fa-toggle-off')).toHaveLength(1);
         const inputs = document.querySelectorAll('input');
@@ -133,8 +131,7 @@ describe('AmountUnitInput', () => {
         expect(document.querySelectorAll('.form-group.row')).toHaveLength(1);
         expect(document.querySelectorAll('.control-label')).toHaveLength(1);
         expect(document.querySelectorAll('.control-label')[0].textContent).toBe('Amount and Units');
-        expect(document.querySelectorAll('label')).toHaveLength(1);
-        expect(document.querySelectorAll('label')[0].textContent).toBe('');
+        expect(document.querySelectorAll('label')).toHaveLength(0);
         expect(document.querySelectorAll('.fa-toggle-on')).toHaveLength(0);
         expect(document.querySelectorAll('.fa-toggle-off')).toHaveLength(1);
         const inputs = document.querySelectorAll('input');
@@ -161,8 +158,7 @@ describe('AmountUnitInput', () => {
         expect(document.querySelectorAll('.form-group.row')).toHaveLength(1);
         expect(document.querySelectorAll('.control-label')).toHaveLength(1);
         expect(document.querySelectorAll('.control-label')[0].textContent).toBe('Amount and Units');
-        expect(document.querySelectorAll('label')).toHaveLength(1);
-        expect(document.querySelectorAll('label')[0].textContent).toBe('');
+        expect(document.querySelectorAll('label')).toHaveLength(0);
         expect(document.querySelectorAll('.fa-toggle-on')).toHaveLength(0);
         expect(document.querySelectorAll('.fa-toggle-off')).toHaveLength(0);
         const inputs = document.querySelectorAll('input');
diff --git a/packages/components/src/internal/components/forms/input/AmountUnitInput.tsx b/packages/components/src/internal/components/forms/input/AmountUnitInput.tsx
index d7330080ae..3b5c2e23b6 100644
--- a/packages/components/src/internal/components/forms/input/AmountUnitInput.tsx
+++ b/packages/components/src/internal/components/forms/input/AmountUnitInput.tsx
@@ -69,9 +69,12 @@ export const AmountUnitInput: FC<InputRendererProps> = memo(props => {
                     id={id}
                     isDisabled={disabled}
                     label={
-                        <div className={inputLabelClass + ' bold-text text__truncate-and-wrap'}>
+                        <span
+                            className={inputLabelClass + ' bold-text text__truncate-and-wrap'}
+                            data-fieldkey={amountCol.name}
+                        >
                             Amount and Units
-                        </div>
+                        </span>
                     }
                     labelOverlayProps={{
                         description: 'The amount and units of this sample currently on hand.',
diff --git a/packages/components/src/internal/components/forms/input/CheckboxInput.tsx b/packages/components/src/internal/components/forms/input/CheckboxInput.tsx
index 65dea1ccdd..9e649e430c 100644
--- a/packages/components/src/internal/components/forms/input/CheckboxInput.tsx
+++ b/packages/components/src/internal/components/forms/input/CheckboxInput.tsx
@@ -146,7 +146,8 @@ class CheckboxInputImpl extends DisableableInput<CheckboxInputImplProps, Checkbo
                         />
                     ) : (
                         <input
-                            aria-label={label}
+                            aria-label={label || undefined}
+                            aria-labelledby={label ? undefined : queryColumn.labelId}
                             checked={checked}
                             disabled={isDisabled}
                             id={queryColumn.fieldKey}
diff --git a/packages/components/src/internal/components/forms/input/DatePickerInput.tsx b/packages/components/src/internal/components/forms/input/DatePickerInput.tsx
index c417e25cfd..75672d832e 100644
--- a/packages/components/src/internal/components/forms/input/DatePickerInput.tsx
+++ b/packages/components/src/internal/components/forms/input/DatePickerInput.tsx
@@ -288,6 +288,9 @@ export class DatePickerInputImpl extends DisableableInput<DatePickerInputImplPro
                 : (placeholderText ?? `Select ${queryColumn.caption.toLowerCase()}`);
         const picker = (
             <DatePicker
+                ariaLabelledBy={
+                    !showLabel && !renderFieldLabel ? queryColumn.labelId : undefined
+                }
                 autoComplete="off"
                 autoFocus={autoFocus}
                 className={inputClassName}
diff --git a/packages/components/src/internal/components/forms/input/FileInput.tsx b/packages/components/src/internal/components/forms/input/FileInput.tsx
index 1dfe943221..909bda163e 100644
--- a/packages/components/src/internal/components/forms/input/FileInput.tsx
+++ b/packages/components/src/internal/components/forms/input/FileInput.tsx
@@ -280,7 +280,7 @@ class FileInputImpl extends DisableableInput<FileInputImplProps, State> {
 
         const labelOverlayProps = {
             addLabelAsterisk,
-            inputId,
+            dataKey: inputId,
             // While this component supports binding Formsy it does not use a Formsy component
             // to render the associated label. As such, the label overlay is always configured as isFormsy={false}.
             isFormsy: false,
diff --git a/packages/components/src/internal/components/forms/input/SelectInput.test.tsx b/packages/components/src/internal/components/forms/input/SelectInput.test.tsx
index 92285587f5..1b32f1787b 100644
--- a/packages/components/src/internal/components/forms/input/SelectInput.test.tsx
+++ b/packages/components/src/internal/components/forms/input/SelectInput.test.tsx
@@ -81,9 +81,9 @@ describe('SelectInput', () => {
 
     function validateFieldLabel(component: any, labelText?: string): void {
         if (labelText !== undefined) {
-            expect(document.querySelector('label').textContent).toBe(labelText);
+            expect(document.querySelector('.control-label').textContent).toBe(labelText);
         } else {
-            expect(document.querySelectorAll('label')).toHaveLength(0);
+            expect(document.querySelectorAll('.control-label')).toHaveLength(0);
         }
     }
 
diff --git a/packages/components/src/internal/components/forms/input/SelectInput.tsx b/packages/components/src/internal/components/forms/input/SelectInput.tsx
index 9e20e140b9..97048cc43e 100644
--- a/packages/components/src/internal/components/forms/input/SelectInput.tsx
+++ b/packages/components/src/internal/components/forms/input/SelectInput.tsx
@@ -538,10 +538,10 @@ export class SelectInputImpl extends Component<SelectInputImplProps, State> {
 
                 if (renderFieldLabel) {
                     return (
-                        <label className={labelClass} htmlFor={name}>
+                        <span className={labelClass} data-fieldkey={name}>
                             {renderFieldLabel(undefined, label, description_)}
                             {required && <span className="required-symbol"> *</span>}
-                        </label>
+                        </span>
                     );
                 }
 
@@ -551,7 +551,7 @@ export class SelectInputImpl extends Component<SelectInputImplProps, State> {
                         id={this.getId()}
                         isDisabled={isDisabled}
                         labelOverlayProps={{
-                            inputId: name,
+                            dataKey: name,
                             description: description_,
                             label,
                             addLabelAsterisk,
diff --git a/packages/components/src/internal/components/forms/input/TextAreaInput.tsx b/packages/components/src/internal/components/forms/input/TextAreaInput.tsx
index 9d03db256c..9e4219436f 100644
--- a/packages/components/src/internal/components/forms/input/TextAreaInput.tsx
+++ b/packages/components/src/internal/components/forms/input/TextAreaInput.tsx
@@ -23,6 +23,7 @@ import { INPUT_LABEL_CLASS_NAME, INPUT_WRAPPER_CLASS_NAME, MIXED_VALUE_DISPLAY }
 
 import { DisableableInput, DisableableInputProps, DisableableInputState } from './DisableableInput';
 import { FormsyTextArea, FormsyTextAreaProps } from './FormsyReactComponents';
+import { stringToHtmlId } from '../../../util/utils';
 
 interface TextAreaInputProps extends DisableableInputProps, Omit<FormsyTextAreaProps, 'onChange'> {
     addLabelAsterisk?: boolean;
@@ -62,6 +63,11 @@ export class TextAreaInput extends DisableableInput<TextAreaInputProps, Disablea
             return renderFieldLabel(queryColumn);
         }
 
+        // FIXME: This is here (at least for now) because of the use of the hide-label class below
+        // in place of sending showLabel=false???
+        if (showLabel === false) {
+            return null;
+        }
         return (
             <FieldLabel
                 column={queryColumn}
@@ -96,7 +102,8 @@ export class TextAreaInput extends DisableableInput<TextAreaInputProps, Disablea
 
         return (
             <FormsyTextArea
-                id={queryColumn.fieldKey}
+                aria-label={showLabel ? undefined : queryColumn.caption}
+                id={stringToHtmlId(queryColumn.fieldKey)}
                 name={queryColumn.fieldKey}
                 placeholder={
                     hasMixedValue && this.state.isDisabled
diff --git a/packages/components/src/internal/components/forms/input/TextInput.tsx b/packages/components/src/internal/components/forms/input/TextInput.tsx
index a47281b0c1..5202708428 100644
--- a/packages/components/src/internal/components/forms/input/TextInput.tsx
+++ b/packages/components/src/internal/components/forms/input/TextInput.tsx
@@ -90,6 +90,12 @@ export class TextInput extends DisableableInput<TextInputProps, TextInputState>
             return renderFieldLabel(queryColumn);
         }
 
+        // FIXME: This is here (at least for now) because of the use of the hide-label class below
+        // in place of sending showLabel=false???
+        if (showLabel === false) {
+            return null;
+        }
+
         return (
             <FieldLabel
                 column={queryColumn}
@@ -139,6 +145,7 @@ export class TextInput extends DisableableInput<TextInputProps, TextInputState>
         return (
             <>
                 <FormsyInput
+                    aria-label={showLabel ? undefined : queryColumn.caption}
                     id={queryColumn.fieldKey}
                     name={queryColumn.fieldKey}
                     placeholder={
diff --git a/packages/components/src/internal/components/labelPrinting/LabelsConfigurationPanel.tsx b/packages/components/src/internal/components/labelPrinting/LabelsConfigurationPanel.tsx
index 4a81cb20e9..e9faaf0b4b 100644
--- a/packages/components/src/internal/components/labelPrinting/LabelsConfigurationPanel.tsx
+++ b/packages/components/src/internal/components/labelPrinting/LabelsConfigurationPanel.tsx
@@ -259,14 +259,18 @@ export const LabelTemplateDetails: FC<LabelTemplateDetailsProps> = memo(props =>
                     </div>
                     <div className="form-group">
                         <div className="col-sm-4">
-                            <DomainFieldLabel label="Description" />
+                            <DomainFieldLabel
+                                id={'label-description-label-' + updatedTemplate.rowId}
+                                label="Description"
+                            />
                         </div>
                         <div className="col-sm-8">
                             <textarea
+                                aria-labelledby={'label-description-label-' + updatedTemplate.rowId}
                                 className="form-control"
+                                disabled={saving}
                                 name="description"
                                 onChange={onFormChange}
-                                disabled={saving}
                                 value={updatedTemplate.description ?? ''}
                             />
                         </div>
diff --git a/packages/components/src/internal/components/samples/ManageSampleStatusesPanel.tsx b/packages/components/src/internal/components/samples/ManageSampleStatusesPanel.tsx
index c842b13cea..50adfe47b0 100644
--- a/packages/components/src/internal/components/samples/ManageSampleStatusesPanel.tsx
+++ b/packages/components/src/internal/components/samples/ManageSampleStatusesPanel.tsx
@@ -252,10 +252,14 @@ export const SampleStatusDetail: FC<SampleStatusDetailProps> = memo(props => {
                     </div>
                     <div className="form-group">
                         <div className="col-sm-4">
-                            <DomainFieldLabel label="Description" />
+                            <DomainFieldLabel
+                                id={'status-description-label-' + updatedState.rowId}
+                                label="Description"
+                            />
                         </div>
                         <div className="col-sm-8">
                             <textarea
+                                aria-labelledby={'status-description-label-' + updatedState.rowId}
                                 className="form-control"
                                 disabled={saving || !updatedState.isLocal}
                                 name="description"
diff --git a/packages/components/src/internal/components/search/FindByIdsModal.tsx b/packages/components/src/internal/components/search/FindByIdsModal.tsx
index a3b96b305d..af6077f85b 100644
--- a/packages/components/src/internal/components/search/FindByIdsModal.tsx
+++ b/packages/components/src/internal/components/search/FindByIdsModal.tsx
@@ -127,6 +127,7 @@ export const FindByIdsModal: FC<Props> = memo(props => {
                 onFieldChange={onFieldTypeChange}
             />
             <textarea
+                aria-label="Ids"
                 className="form-control textarea-fullwidth"
                 cols={50}
                 onChange={onIdTextChange}
diff --git a/packages/components/src/public/QueryColumn.ts b/packages/components/src/public/QueryColumn.ts
index fa0e7eb99a..da76b37386 100644
--- a/packages/components/src/public/QueryColumn.ts
+++ b/packages/components/src/public/QueryColumn.ts
@@ -20,6 +20,7 @@ import { SchemaQuery } from './SchemaQuery';
 import { IQueryColumn } from './IQueryColumn';
 import { PropDescType } from '../internal/components/domainproperties/PropDescType';
 import { SortDirection } from './QuerySort';
+import { stringToHtmlId } from '../internal/util/utils';
 
 export enum Operation {
     insert = 'insert',
@@ -416,6 +417,10 @@ export class QueryColumn implements IQueryColumn {
         return fieldKey;
     }
 
+    get labelId(): string {
+        return stringToHtmlId(this.fieldKey) + '-label';
+    }
+
     get lookupKey(): string {
         if (!this.lookup) return undefined;
 
diff --git a/packages/components/src/theme/form.scss b/packages/components/src/theme/form.scss
index eff33566ac..c03d42c581 100644
--- a/packages/components/src/theme/form.scss
+++ b/packages/components/src/theme/form.scss
@@ -313,6 +313,9 @@ textarea.form-control {
     label {
         font-weight: normal;
     }
+    span.control-label {
+        font-weight: normal;
+    }
 }
 
 .required-symbol {
@@ -394,6 +397,10 @@ textarea.form-control {
     }
 }
 
+.control-label {
+    font-weight: 700;
+}
+
 .framed-input__container {
     display: flex;
 }