diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 3dc475b1a7..e98bf6e22a 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.34.0",
+  "version": "7.34.1-emptyLinksAndButtons.12",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.34.0",
+      "version": "7.34.1-emptyLinksAndButtons.12",
       "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 b5f18ea532..373639f4d0 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.34.0",
+  "version": "7.34.1-emptyLinksAndButtons.12",
   "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 93374ac1b1..28a10d6e95 100644
--- a/packages/components/releaseNotes/components.md
+++ b/packages/components/releaseNotes/components.md
@@ -1,6 +1,12 @@
 # @labkey/components
 Components, models, actions, and utility functions for LabKey applications and pages
 
+### version TBD
+*Released*: TBD
+- Fix accessibility issues for empty links and buttons
+- Add `Icon` component for use on buttons and links that are only icons
+- Add some alt text to a few images
+
 ### version 7.34.0
 *Released*: 5 May 2026
 - Accessibility improvements for app pages: Colors
diff --git a/packages/components/src/index.ts b/packages/components/src/index.ts
index 48919be9ef..ba0b3643db 100644
--- a/packages/components/src/index.ts
+++ b/packages/components/src/index.ts
@@ -891,6 +891,7 @@ import { OverlayTrigger, useOverlayTriggerState } from './internal/OverlayTrigge
 import { Tooltip } from './internal/Tooltip';
 import { Popover } from './internal/Popover';
 import { DropdownButton, DropdownMenu, MenuDivider, MenuHeader, MenuItem, SplitButton } from './internal/dropdowns';
+import { Icon } from './internal/Icon';
 import { DropdownSection } from './internal/DropdownSection';
 import { isLoginAutoRedirectEnabled, showPremiumFeatures } from './internal/components/administration/utils';
 import { LineageGridModel, LineageResult } from './internal/components/lineage/models';
@@ -1464,6 +1465,7 @@ export {
     HOME_TITLE,
     Hooks,
     HorizontalBarSection,
+    Icon,
     imageURL,
     IMPORT_DATA_FORM_TYPES,
     ImportAliasRenderer,
diff --git a/packages/components/src/internal/DropdownSection.tsx b/packages/components/src/internal/DropdownSection.tsx
index 9997ee6bc3..5ed5bad43f 100644
--- a/packages/components/src/internal/DropdownSection.tsx
+++ b/packages/components/src/internal/DropdownSection.tsx
@@ -61,7 +61,7 @@ export const DropdownSection: FC<MenuSectionProps> = ({ items, showDivider = fal
             )}
 
             {expanded && items.length > SHOW_FILTER_CUTOFF && (
-                <MenuItem>
+                <MenuItem aria-label="Filter selection options">
                     <input
                         aria-label="Filter selection options"
                         onChange={onFilterChange}
diff --git a/packages/components/src/internal/Icon.tsx b/packages/components/src/internal/Icon.tsx
new file mode 100644
index 0000000000..8812d288c7
--- /dev/null
+++ b/packages/components/src/internal/Icon.tsx
@@ -0,0 +1,15 @@
+import React, { FC } from 'react';
+
+interface IconProps {
+    iconClass: string;
+    srText: string; // text for screen readers
+}
+export const Icon: FC<IconProps> = ({ iconClass, srText }) => {
+    return (
+        <>
+            <span aria-hidden="true" className={iconClass} />
+            <span className="sr-only">{srText}</span>
+        </>
+    );
+};
+Icon.displayName = 'Icon';
diff --git a/packages/components/src/internal/announcements/ThreadBlock.tsx b/packages/components/src/internal/announcements/ThreadBlock.tsx
index c5cae8ed7a..69a8f881ff 100644
--- a/packages/components/src/internal/announcements/ThreadBlock.tsx
+++ b/packages/components/src/internal/announcements/ThreadBlock.tsx
@@ -93,6 +93,7 @@ const ThreadBlockHeader: FC<ThreadBlockHeaderProps> = props => {
                 {(onDelete || onEdit) && (
                     <DropdownMenu
                         className="thread-block-header__menu"
+                        label={"Manage thread block"}
                         title={<i className="fa fa-ellipsis-v" />}
                         pullRight
                     >
diff --git a/packages/components/src/internal/announcements/ThreadEditor.tsx b/packages/components/src/internal/announcements/ThreadEditor.tsx
index 799b332e86..94cfd857c3 100644
--- a/packages/components/src/internal/announcements/ThreadEditor.tsx
+++ b/packages/components/src/internal/announcements/ThreadEditor.tsx
@@ -189,7 +189,7 @@ const ThreadEditorToolbar: FC<ThreadEditorToolbarProps> = memo(({ inputRef, setB
     return (
         <div className="thread-editor-toolbar editor-toolbar">
             <div className="editor-toolbar__section insert-menu">
-                <DropdownMenu title={view}>
+                <DropdownMenu label="Editor View" title={view}>
                     <MenuItem onClick={setEditMode}>{EditorView.edit}</MenuItem>
                     <MenuItem onClick={setPreviewMode}>{EditorView.preview}</MenuItem>
                 </DropdownMenu>
diff --git a/packages/components/src/internal/components/base/Cards.test.tsx b/packages/components/src/internal/components/base/Cards.test.tsx
index ba679235b8..679e499955 100644
--- a/packages/components/src/internal/components/base/Cards.test.tsx
+++ b/packages/components/src/internal/components/base/Cards.test.tsx
@@ -33,7 +33,7 @@ describe('Cards', () => {
                     { title: 'card1' },
                     { title: 'card2', caption: 'caption2' },
                     { title: 'card3', iconSrc: 'iconSrc' },
-                    { title: 'card4', iconUrl: 'iconUrl' },
+                    { title: 'card4', iconUrl: 'iconUrl4' },
                     { title: 'card5', disabled: true },
                     { title: 'card6', href: 'href' },
                     { title: 'card7', onClick: jest.fn() },
@@ -41,7 +41,7 @@ describe('Cards', () => {
                         title: 'all',
                         caption: 'captionAll',
                         iconSrc: 'iconSrc',
-                        iconUrl: 'iconUrl',
+                        iconUrl: 'iconUrlAll',
                         href: 'href',
                         disabled: true,
                         onClick: jest.fn(),
diff --git a/packages/components/src/internal/components/base/Cards.tsx b/packages/components/src/internal/components/base/Cards.tsx
index 9645c43c0f..15ee025ee4 100644
--- a/packages/components/src/internal/components/base/Cards.tsx
+++ b/packages/components/src/internal/components/base/Cards.tsx
@@ -31,7 +31,7 @@ const Card: FC<CardProps> = props => {
         <a className="cards__card" href={href} onClick={onClickHandler}>
             <div className={'cards__block-center' + (disabled ? ' cards__block-disabled' : '')}>
                 <div className="cards__block-center-content">
-                    {iconUrl && <img src={iconUrl} />}
+                    {iconUrl && <img alt={caption ? caption + ' icon' : title + ' icon'} src={iconUrl} />}
                     {iconSrc && <SVGIcon iconSrc={iconSrc} />}
                 </div>
             </div>
diff --git a/packages/components/src/internal/components/chart/HorizontalBarSection.tsx b/packages/components/src/internal/components/chart/HorizontalBarSection.tsx
index ffc758f167..ae36ac4043 100644
--- a/packages/components/src/internal/components/chart/HorizontalBarSection.tsx
+++ b/packages/components/src/internal/components/chart/HorizontalBarSection.tsx
@@ -54,7 +54,7 @@ export const HorizontalBarSection: FC<Props> = memo(props => {
                         })}
                     >
                         {row.href && (
-                            <a href={row.href} className="horizontal-bar--link">
+                            <a aria-label={row.title} className="horizontal-bar--link" href={row.href}>
                                 &nbsp;
                             </a>
                         )}
diff --git a/packages/components/src/internal/components/domainproperties/samples/__snapshots__/SampleTypePropertiesPanel.test.tsx.snap b/packages/components/src/internal/components/domainproperties/samples/__snapshots__/SampleTypePropertiesPanel.test.tsx.snap
index 98aca0b420..bff0d5958c 100644
--- a/packages/components/src/internal/components/domainproperties/samples/__snapshots__/SampleTypePropertiesPanel.test.tsx.snap
+++ b/packages/components/src/internal/components/domainproperties/samples/__snapshots__/SampleTypePropertiesPanel.test.tsx.snap
@@ -238,6 +238,7 @@ exports[`SampleTypePropertiesPanel appPropertiesOnly 1`] = `
                 data-name="labelColor"
               >
                 <button
+                  aria-label="Label color picker"
                   class="color-picker__button btn btn-default"
                   type="button"
                 >
@@ -519,6 +520,7 @@ exports[`SampleTypePropertiesPanel appPropertiesOnly 1`] = `
               data-name="labelColor"
             >
               <button
+                aria-label="Label color picker"
                 class="color-picker__button btn btn-default"
                 type="button"
               >
diff --git a/packages/components/src/internal/components/forms/PageDetailHeader.tsx b/packages/components/src/internal/components/forms/PageDetailHeader.tsx
index 2d9289ba04..2b5c301536 100644
--- a/packages/components/src/internal/components/forms/PageDetailHeader.tsx
+++ b/packages/components/src/internal/components/forms/PageDetailHeader.tsx
@@ -47,7 +47,11 @@ export class PageDetailHeader extends PureComponent<PageDetailHeaderProps> {
                     {hasIcon && (
                         <div className="detail__header--image-container">
                             {iconUrl ? (
-                                <img className="detail__header-icon" src={iconUrl} />
+                                <img
+                                    alt={iconAltText ? iconAltText : ''}
+                                    className="detail__header-icon"
+                                    src={iconUrl}
+                                />
                             ) : (
                                 <SVGIcon
                                     alt={iconAltText ? iconAltText : ''}
diff --git a/packages/components/src/internal/components/forms/input/ColorPickerInput.tsx b/packages/components/src/internal/components/forms/input/ColorPickerInput.tsx
index 17f246ad78..2e101bacf6 100644
--- a/packages/components/src/internal/components/forms/input/ColorPickerInput.tsx
+++ b/packages/components/src/internal/components/forms/input/ColorPickerInput.tsx
@@ -112,6 +112,7 @@ export const ColorPickerInput: FC<Props> = memo(props => {
     return (
         <div className="color-picker" data-name={name}>
             <button
+                aria-label="Label color picker"
                 className="color-picker__button btn btn-default"
                 disabled={disabled}
                 onClick={togglePicker}
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 4defd4bba3..6c4974edc2 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
@@ -6,6 +6,7 @@ exports[`ColorPickerInput allowRemove 1`] = `
     class="color-picker"
   >
     <button
+      aria-label="Label color picker"
       class="color-picker__button btn btn-default"
       type="button"
     >
@@ -41,6 +42,7 @@ exports[`ColorPickerInput default props 1`] = `
     class="color-picker"
   >
     <button
+      aria-label="Label color picker"
       class="color-picker__button btn btn-default"
       type="button"
     >
@@ -65,6 +67,7 @@ exports[`ColorPickerInput disabled 1`] = `
     class="color-picker"
   >
     <button
+      aria-label="Label color picker"
       class="color-picker__button btn btn-default"
       disabled=""
       type="button"
@@ -90,6 +93,7 @@ exports[`ColorPickerInput showPicker 1`] = `
     class="color-picker"
   >
     <button
+      aria-label="Label color picker"
       class="color-picker__button btn btn-default"
       type="button"
     >
@@ -871,6 +875,7 @@ exports[`ColorPickerInput with button text 1`] = `
     class="color-picker"
   >
     <button
+      aria-label="Label color picker"
       class="color-picker__button btn btn-default"
       type="button"
     >
@@ -896,6 +901,7 @@ exports[`ColorPickerInput without value 1`] = `
     class="color-picker"
   >
     <button
+      aria-label="Label color picker"
       class="color-picker__button btn btn-default"
       type="button"
     >
diff --git a/packages/components/src/internal/components/lineage/vis/VisGraphControls.tsx b/packages/components/src/internal/components/lineage/vis/VisGraphControls.tsx
index 8f484d17f2..1242711e1f 100644
--- a/packages/components/src/internal/components/lineage/vis/VisGraphControls.tsx
+++ b/packages/components/src/internal/components/lineage/vis/VisGraphControls.tsx
@@ -2,6 +2,7 @@ import React, { PureComponent, ReactNode } from 'react';
 import { Network } from 'vis-network';
 
 import { DropdownButton, MenuItem } from '../../../dropdowns';
+import { Icon } from '../../../Icon';
 
 const PAN_INCREMENT = 20;
 const ZOOM_INCREMENT = 0.05;
@@ -71,10 +72,10 @@ export class VisGraphControls extends PureComponent<GraphControlsProps> {
                 <div className="lineage-visgraph-control-zoom">
                     <div className="btn-group">
                         <button className="btn btn-default" onClick={this.zoomOut} type="button">
-                            <i className="fa fa-search-minus" />
+                            <Icon iconClass="fa fa-search-minus" srText="Zoom out" />
                         </button>
                         <button className="btn btn-default" onClick={this.zoomIn} type="button">
-                            <i className="fa fa-search-plus" />
+                            <Icon iconClass="fa fa-search-plus" srText="Zoom in" />
                         </button>
                     </div>
                 </div>
@@ -84,17 +85,17 @@ export class VisGraphControls extends PureComponent<GraphControlsProps> {
                         onClick={this.panUp}
                         type="button"
                     >
-                        <i className="fa fa-arrow-up" />
+                        <Icon iconClass="fa fa-arrow-up" srText="Pan up" />
                     </button>
                     <div className="btn-group">
                         <button className="btn btn-default" onClick={this.panLeft} type="button">
-                            <i className="fa fa-arrow-left" />
+                            <Icon iconClass="fa fa-arrow-left" srText="Pan left" />
                         </button>
                         <button className="btn btn-default" onClick={this.panDown} type="button">
-                            <i className="fa fa-arrow-down" />
+                            <Icon iconClass="fa fa-arrow-down" srText="Pan down" />
                         </button>
                         <button className="btn btn-default" onClick={this.panRight} type="button">
-                            <i className="fa fa-arrow-right" />
+                            <Icon iconClass="fa fa-arrow-right" srText="Pan right" />
                         </button>
                     </div>
                 </div>
diff --git a/packages/components/src/internal/components/navigation/FolderMenu.tsx b/packages/components/src/internal/components/navigation/FolderMenu.tsx
index 167ce692f6..c81a5eeb68 100644
--- a/packages/components/src/internal/components/navigation/FolderMenu.tsx
+++ b/packages/components/src/internal/components/navigation/FolderMenu.tsx
@@ -7,6 +7,7 @@ import { Tip } from '../base/Tip';
 import { ExpandableContainer } from '../ExpandableContainer';
 import { AppLink } from '../../url/AppLink';
 import { ADMIN_KEY } from '../../app/constants';
+import { Icon } from '../../Icon';
 
 export interface FolderMenuItem {
     archived: boolean;
@@ -65,13 +66,13 @@ export const FolderMenuItems: FC<FolderMenuProps> = memo(props => {
                                 >
                                     <AppLink to={dashboardURL} className="dashboard-link">
                                         <Tip caption="Dashboard">
-                                            <i className="fa fa-home dashboard-icon" />
+                                            <Icon iconClass="fa fa-home dashboard-icon" srText="Dashboard" />
                                         </Tip>
                                     </AppLink>
                                     {user.isAdmin && (
                                         <AppLink to={adminURL}>
                                             <Tip caption="Administration">
-                                                <i className="fa fa-gear" />
+                                                <Icon iconClass="fa fa-gear" srText="Administration" />
                                             </Tip>
                                         </AppLink>
                                     )}
diff --git a/packages/components/src/internal/components/navigation/NavigationBar.tsx b/packages/components/src/internal/components/navigation/NavigationBar.tsx
index e03ba587c5..23346f0ec4 100644
--- a/packages/components/src/internal/components/navigation/NavigationBar.tsx
+++ b/packages/components/src/internal/components/navigation/NavigationBar.tsx
@@ -41,6 +41,7 @@ import { UserMenuGroup, UserMenuProps } from './UserMenuGroup';
 import { MenuSectionConfig } from './model';
 import { SEARCH_PLACEHOLDER } from './constants';
 import { useFolderMenuContext, useSubNavTabsContext } from './hooks';
+import { Icon } from '../../Icon';
 
 interface NavigationBarProps {
     brand?: ReactNode;
@@ -136,7 +137,12 @@ export const NavigationBar: FC<Props> = memo(props => {
                                         {onFindByIds ? (
                                             <FindAndSearchDropdown
                                                 className="navbar__xs-find-dropdown"
-                                                title={<i className="fa fa-search navbar__xs-search-icon" />}
+                                                title={
+                                                    <Icon
+                                                        iconClass="fa fa-search navbar__xs-search-icon"
+                                                        srText="Search and Find"
+                                                    />
+                                                }
                                                 findNounPlural="samples"
                                                 onSearch={onSearchIconClick}
                                                 onFindByIds={onFindByIds}
diff --git a/packages/components/src/internal/components/navigation/SubNav.tsx b/packages/components/src/internal/components/navigation/SubNav.tsx
index fcfce47a6a..8d0ad705f5 100644
--- a/packages/components/src/internal/components/navigation/SubNav.tsx
+++ b/packages/components/src/internal/components/navigation/SubNav.tsx
@@ -26,6 +26,7 @@ import { NavItem, ParentNavItem } from './NavItem';
 import { isAdminRoute } from './ProductMenu';
 import { ITab } from './types';
 import { useSubNavTabsContext } from './hooks';
+import { Icon } from '../../Icon';
 
 interface Props {
     noun?: ITab;
@@ -108,10 +109,10 @@ const SubNavImpl: FC<Props> = ({ noun, tabs }) => {
                 {isScrollable && (
                     <div className="btn-group scroll-btn-group">
                         <button className="btn btn-default" onClick={scrollLeft} type="button">
-                            <i className="fa fa-chevron-left" />
+                            <Icon iconClass="fa fa-chevron-left" srText="Scroll left" />
                         </button>
                         <button className="btn btn-default" onClick={scrollRight} type="button">
-                            <i className="fa fa-chevron-right" />
+                            <Icon iconClass="fa fa-chevron-right" srText="Scroll right" />
                         </button>
                     </div>
                 )}
diff --git a/packages/components/src/internal/components/navigation/UserMenuGroup.tsx b/packages/components/src/internal/components/navigation/UserMenuGroup.tsx
index b27506b31d..12bb43f2a3 100644
--- a/packages/components/src/internal/components/navigation/UserMenuGroup.tsx
+++ b/packages/components/src/internal/components/navigation/UserMenuGroup.tsx
@@ -31,11 +31,12 @@ import { getHelpLink } from '../../util/helpLinks';
 
 import { HELP_LINK_METRIC, RELEASE_NOTES_METRIC } from '../productnavigation/constants';
 
-import { DropdownMenu, DropdownButton, MenuDivider, MenuHeader, MenuItem } from '../../dropdowns';
+import { DropdownButton, DropdownMenu, MenuDivider, MenuHeader, MenuItem } from '../../dropdowns';
 
 import { signIn as defaultSignIn, signOut as defaultSignOut } from './actions';
 import { MenuSectionModel } from './model';
 import { biologicsIsPrimaryApp } from '../../app/products';
+import { Icon } from '../../Icon';
 
 export interface UserMenuProps {
     appProperties?: AppProperties;
@@ -130,7 +131,7 @@ export const UserMenuGroupImpl: FC<UserMenuProps & ImplProps> = props => {
     return (
         <>
             <div className="navbar-item pull-right">
-                <DropdownMenu className="user-dropdown" title={userToggle} pullRight>
+                <DropdownMenu className="user-dropdown" label="User menu" pullRight title={userToggle} >
                     <div className="navbar-connector" />
                     {userMenuItems}
                     {extraUserItems}
@@ -147,7 +148,7 @@ export const UserMenuGroupImpl: FC<UserMenuProps & ImplProps> = props => {
                     <DropdownButton
                         className="admin-dropdown"
                         buttonClassName="navbar-menu-button"
-                        title={<i className="fa fa-cog navbar-header-icon" />}
+                        title={<Icon iconClass="fa fa-cog navbar-header-icon" srText="Admin"/>}
                         noCaret
                         pullRight
                     >
@@ -169,11 +170,11 @@ export const UserMenuGroupImpl: FC<UserMenuProps & ImplProps> = props => {
             {(!!helpHref || !!releaseNoteHref) && (
                 <div className="navbar-item pull-right navbar-item__dropdown">
                     <DropdownButton
-                        className="help-dropdown"
                         buttonClassName="navbar-menu-button"
-                        title={<i className="fa fa-question-circle navbar-header-icon" />}
+                        className="help-dropdown"
                         noCaret
                         pullRight
+                        title={<Icon iconClass="fa fa-question-circle navbar-header-icon" srText="Help" />}
                     >
                         <div className="navbar-icon-connector" />
                         {helpHref && (
diff --git a/packages/components/src/internal/components/notifications/ServerNotifications.test.tsx b/packages/components/src/internal/components/notifications/ServerNotifications.test.tsx
index 8a4943c832..7c1b2e28ad 100644
--- a/packages/components/src/internal/components/notifications/ServerNotifications.test.tsx
+++ b/packages/components/src/internal/components/notifications/ServerNotifications.test.tsx
@@ -50,7 +50,7 @@ describe('ServerNotifications', () => {
         fireEvent.click(screen.getByRole('button'));
 
         expect(container.querySelector('.server-notifications-listing-container')).toBeInTheDocument();
-        expect(screen.getByText('Notifications')).toBeInTheDocument();
+        expect(screen.getAllByText('Notifications')).toHaveLength(2);
         expect(container.querySelector('.badge')).not.toBeInTheDocument();
     });
 
diff --git a/packages/components/src/internal/components/notifications/ServerNotifications.tsx b/packages/components/src/internal/components/notifications/ServerNotifications.tsx
index 983416c09e..0571cb1853 100644
--- a/packages/components/src/internal/components/notifications/ServerNotifications.tsx
+++ b/packages/components/src/internal/components/notifications/ServerNotifications.tsx
@@ -9,6 +9,7 @@ import { useNavMenuState } from '../../useNavMenuState';
 import { markAllNotificationsAsRead, markNotificationsAsRead } from './actions';
 import { ServerNotificationsConfig } from './model';
 import { ServerActivityList } from './ServerActivityList';
+import { Icon } from '../../Icon';
 
 export const ServerNotifications: FC<ServerNotificationsConfig> = props => {
     const { onRead, serverActivity } = props;
@@ -78,7 +79,7 @@ export const ServerNotifications: FC<ServerNotificationsConfig> = props => {
                 role="button"
                 type="button"
             >
-                <span className={iconClassName} />
+                <Icon iconClass={iconClassName} srText="Notifications" />
                 {unreadCount > 0 && <span className="badge">{unreadCount}</span>}
             </button>
 
diff --git a/packages/components/src/internal/components/pagination/PaginationButton.tsx b/packages/components/src/internal/components/pagination/PaginationButton.tsx
index 67e7fb1154..17ee832974 100644
--- a/packages/components/src/internal/components/pagination/PaginationButton.tsx
+++ b/packages/components/src/internal/components/pagination/PaginationButton.tsx
@@ -6,6 +6,7 @@ import { createPortal } from 'react-dom';
 import { blurActiveElement } from '../../util/utils';
 import { useOverlayTriggerState } from '../../OverlayTrigger';
 import { Tooltip } from '../../Tooltip';
+import { Icon } from '../../Icon';
 
 interface Props {
     className?: string;
@@ -40,15 +41,15 @@ export const PaginationButton: FC<Props> = ({ className, disabled, iconClass, on
 
     return (
         <button
-            disabled={disabled}
             className={clsName}
+            disabled={disabled}
             onClick={onClick_}
             onPointerEnter={onMouseEnter}
             onPointerLeave={onMouseLeave}
             ref={targetRef}
             type="button"
         >
-            <i className={`fa ${iconClass}`} />
+            <Icon iconClass={`fa ${iconClass}`} srText={tooltip} />
             {show && createPortal(tooltip_, portalEl)}
         </button>
     );
diff --git a/packages/components/src/internal/components/productnavigation/ProductNavigation.tsx b/packages/components/src/internal/components/productnavigation/ProductNavigation.tsx
index 4efcbaf600..20dfb340ef 100644
--- a/packages/components/src/internal/components/productnavigation/ProductNavigation.tsx
+++ b/packages/components/src/internal/components/productnavigation/ProductNavigation.tsx
@@ -3,6 +3,7 @@ import React, { FC, memo, useCallback } from 'react';
 import { useNavMenuState } from '../../useNavMenuState';
 
 import { ProductNavigationMenu } from './ProductNavigationMenu';
+import { Icon } from '../../Icon';
 
 export const ProductNavigation: FC = memo(() => {
     const { show, setShow, menuRef, toggleRef } = useNavMenuState();
@@ -19,7 +20,7 @@ export const ProductNavigation: FC = memo(() => {
                 role="button"
                 type="button"
             >
-                <span className="fa fa-th-large navbar-header-icon" />
+                <Icon iconClass="fa fa-th-large navbar-header-icon" srText="Product Navigation" />
             </button>
 
             {show && <ProductNavigationMenu onCloseMenu={onCloseMenu} menuRef={menuRef} />}
diff --git a/packages/components/src/internal/components/search/FindAndSearchDropdown.tsx b/packages/components/src/internal/components/search/FindAndSearchDropdown.tsx
index 33cade2e56..01cdf697cc 100644
--- a/packages/components/src/internal/components/search/FindAndSearchDropdown.tsx
+++ b/packages/components/src/internal/components/search/FindAndSearchDropdown.tsx
@@ -62,7 +62,11 @@ export const FindAndSearchDropdown: FC<Props> = memo(props => {
 
     return (
         <>
-            <DropdownButton title={title} buttonClassName={'navbar__find-and-search-button ' + className}>
+            <DropdownButton
+                aria-label="Find and Search Menu"
+                buttonClassName={'navbar__find-and-search-button ' + (className ?? '')}
+                title={title}
+            >
                 {!!onFindByIds && (
                     <>
                         <MenuItem onClick={findByBarcodeClicked}>
diff --git a/packages/components/src/internal/components/user/UserDetailHeader.tsx b/packages/components/src/internal/components/user/UserDetailHeader.tsx
index 708b49f0a7..59184ec89d 100644
--- a/packages/components/src/internal/components/user/UserDetailHeader.tsx
+++ b/packages/components/src/internal/components/user/UserDetailHeader.tsx
@@ -21,7 +21,12 @@ export const UserDetailHeader: FC<Props> = props => {
     const lastLogin = useMemo(() => getUserLastLogin(userProperties, dateFormat), [dateFormat, userProperties]);
 
     return (
-        <PageDetailHeader iconUrl={user.avatar} leftColumns={9} title={title}>
+        <PageDetailHeader
+            iconAltText={user.displayName + ' avatar'}
+            iconUrl={user.avatar}
+            leftColumns={9}
+            title={title}
+        >
             {showFolderTitle && !!container?.title && (
                 <div className="detail__header--desc">
                     <i className="fa fa-folder-open" />
diff --git a/packages/components/src/internal/components/user/UserProfile.tsx b/packages/components/src/internal/components/user/UserProfile.tsx
index 4cca8f6879..659be554a5 100644
--- a/packages/components/src/internal/components/user/UserProfile.tsx
+++ b/packages/components/src/internal/components/user/UserProfile.tsx
@@ -178,7 +178,11 @@ export class UserProfile extends PureComponent<Props, State> {
                                 <p className="user-section-header">Avatar</p>
                             </div>
                             <div className="col-sm-2 col-xs-12">
-                                <img src={avatarSrc} className="detail__header-icon" />
+                                <img
+                                    alt={user.displayName + ' avatar'}
+                                    className="detail__header-icon"
+                                    src={avatarSrc}
+                                />
                             </div>
                             <div className="col-sm-7 col-xs-12">
                                 <FileInput
diff --git a/packages/components/src/internal/components/user/__snapshots__/UserDetailHeader.test.tsx.snap b/packages/components/src/internal/components/user/__snapshots__/UserDetailHeader.test.tsx.snap
index cb47620f02..8a904609b8 100644
--- a/packages/components/src/internal/components/user/__snapshots__/UserDetailHeader.test.tsx.snap
+++ b/packages/components/src/internal/components/user/__snapshots__/UserDetailHeader.test.tsx.snap
@@ -12,6 +12,7 @@ exports[`UserDetailHeader default properties 1`] = `
         class="detail__header--image-container"
       >
         <img
+          alt="ReaderDisplayName avatar"
           class="detail__header-icon"
           src="/labkey/_images/defaultavatar.png"
         />
@@ -48,6 +49,7 @@ exports[`UserDetailHeader optional properties 1`] = `
         class="detail__header--image-container"
       >
         <img
+          alt="AssayDesignerDisplayName avatar"
           class="detail__header-icon"
           src="/labkey/_images/defaultavatar.png"
         />
diff --git a/packages/components/src/internal/dropdowns.tsx b/packages/components/src/internal/dropdowns.tsx
index 24e246d75d..172fe58113 100644
--- a/packages/components/src/internal/dropdowns.tsx
+++ b/packages/components/src/internal/dropdowns.tsx
@@ -20,6 +20,7 @@ import { generateId } from './util/utils';
 import { cancelEvent } from './events';
 import { AppLink } from './url/AppLink';
 import { AppURL } from './url/AppURL';
+import { Icon } from './Icon';
 
 export type BSStyle = 'success' | 'danger' | 'default' | 'primary' | 'info';
 const DROPDOWN_MENU_CLASS = 'dropdown-menu';
@@ -107,12 +108,16 @@ export const DropdownMenu: FC<DropdownMenuProps> = props => {
     return (
         <div className={className}>
             {asAnchor && (
-                <a {...elemProps} href="#">
+                <a aria-label={label} {...elemProps} href="#">
                     {title}
                     <span className="caret" />
                 </a>
             )}
-            {!asAnchor && <span {...elemProps}>{title}</span>}
+            {!asAnchor && (
+                <span aria-label={label} {...elemProps}>
+                    {title}
+                </span>
+            )}
 
             <ul className={menuClassName} onClick={handleMenuClick}>
                 {children}
@@ -172,10 +177,11 @@ export const DropdownButton = forwardRef<HTMLDivElement, DropdownButtonProps>((p
     );
 
     return (
-        <div className={className} ref={ref} onMouseEnter={onMouseEnter} onMouseLeave={onMouseLeave}>
+        <div className={className} onMouseEnter={onMouseEnter} onMouseLeave={onMouseLeave} ref={ref} >
             <button
-                aria-haspopup="true"
                 aria-expanded={open}
+                aria-haspopup="true"
+                aria-label={props['aria-label']}
                 className={buttonClassName}
                 disabled={disabled}
                 id={id}
@@ -186,10 +192,10 @@ export const DropdownButton = forwardRef<HTMLDivElement, DropdownButtonProps>((p
                 type="button"
             >
                 {title}
-                {!noCaret && <span className={caretClassName} />}
+                {!noCaret && <span aria-hidden="true" className={caretClassName} />}
             </button>
             {showMenu && (
-                <ul className={menuClassName} aria-labelledby={id} onClick={handleMenuClick} role="menu">
+                <ul aria-labelledby={id} className={menuClassName} onClick={handleMenuClick} role="menu">
                     {children}
                 </ul>
             )}
@@ -347,7 +353,15 @@ export const MenuItem = forwardRef<HTMLLIElement, MenuItemProps>((props, ref) =>
 
     return (
         <li className={className} role="presentation" ref={ref} onMouseEnter={onMouseEnter} onMouseLeave={onMouseLeave}>
-            <AppLink onClick={onClick_} rel={rel} role="menuitem" target={target} title={title} to={href}>
+            <AppLink
+                aria-label={props['aria-label']}
+                onClick={onClick_}
+                rel={rel}
+                role="menuitem"
+                target={target}
+                title={title}
+                to={href}
+            >
                 {children}
             </AppLink>
         </li>
diff --git a/packages/components/src/internal/renderers/AttachmentCard.tsx b/packages/components/src/internal/renderers/AttachmentCard.tsx
index a92699d25b..6b9aa71863 100644
--- a/packages/components/src/internal/renderers/AttachmentCard.tsx
+++ b/packages/components/src/internal/renderers/AttachmentCard.tsx
@@ -134,8 +134,9 @@ export const AttachmentCard: FC<AttachmentCardProps> = memo(props => {
                 {isLoaded && showMenu && (
                     <DropdownMenu
                         className="attachment-card__menu"
-                        title={<i className="fa fa-ellipsis-v" />}
+                        label="Manage Attachment"
                         pullRight
+                        title={<i className="fa fa-ellipsis-v" />}
                     >
                         {onCopyLink && !unavailable && <MenuItem onClick={_onCopyLink}>Copy {copyNoun}</MenuItem>}
                         {allowDownload && !unavailable && <MenuItem onClick={_onDownload}>Download</MenuItem>}
diff --git a/packages/components/src/public/QueryModel/ExportMenu.tsx b/packages/components/src/public/QueryModel/ExportMenu.tsx
index d3e00a97d1..77c40a91d4 100644
--- a/packages/components/src/public/QueryModel/ExportMenu.tsx
+++ b/packages/components/src/public/QueryModel/ExportMenu.tsx
@@ -12,6 +12,7 @@ import { QueryModel } from './QueryModel';
 import { getQueryModelExportParams } from './utils';
 import { Actions } from './withQueryModels';
 import { SelectionMenuItem } from '../../internal/components/menus/SelectionMenuItem';
+import { Icon } from '../../internal/Icon';
 
 interface ExportMenuProps {
     actions: Actions;
@@ -140,7 +141,7 @@ const ExportMenuImpl: FC<ExportMenuImplProps> = memo(props => {
         hasData && (
             <div className="export-menu">
                 <Tip caption="Export">
-                    <DropdownButton noCaret pullRight title={<span className="fa fa-download" />}>
+                    <DropdownButton noCaret pullRight title={<Icon iconClass="fa fa-download" srText={"Export"}/>}>
                         <MenuHeader text={exportHeader} />
 
                         {exportOptions.map(option => (
diff --git a/packages/components/src/public/QueryModel/FiltersButton.test.tsx b/packages/components/src/public/QueryModel/FiltersButton.test.tsx
index a6ddf4c9b5..8512f4f399 100644
--- a/packages/components/src/public/QueryModel/FiltersButton.test.tsx
+++ b/packages/components/src/public/QueryModel/FiltersButton.test.tsx
@@ -23,7 +23,7 @@ describe('FiltersButton', () => {
         render(<FiltersButton onFilter={ON_FILTER} iconOnly />);
         const button = document.querySelectorAll('.grid-panel__button');
         expect(button).toHaveLength(1);
-        expect(button[0].textContent).toBe('');
+        expect(button[0].textContent).toBe('Filters'); // SR text
         expect(document.querySelectorAll('.fa-filter')).toHaveLength(1);
         expect(ON_FILTER).toHaveBeenCalledTimes(0);
         await userEvent.click(button[0]);
diff --git a/packages/components/src/public/QueryModel/FiltersButton.tsx b/packages/components/src/public/QueryModel/FiltersButton.tsx
index d1e5d4a361..c15657cd38 100644
--- a/packages/components/src/public/QueryModel/FiltersButton.tsx
+++ b/packages/components/src/public/QueryModel/FiltersButton.tsx
@@ -1,10 +1,11 @@
 import React, { FC, memo } from 'react';
 
 import { Tip } from '../../internal/components/base/Tip';
+import { Icon } from '../../internal/Icon';
 
 interface Props {
-    onFilter: () => void;
     iconOnly?: boolean;
+    onFilter: () => void;
 }
 
 export const FiltersButton: FC<Props> = memo(props => {
@@ -14,7 +15,7 @@ export const FiltersButton: FC<Props> = memo(props => {
         return (
             <Tip caption="Filters">
                 <button className="grid-panel__button btn btn-default" onClick={onFilter} type="button">
-                    <i className="fa fa-filter" />
+                    <Icon iconClass="fa fa-filter" srText="Filters" />
                 </button>
             </Tip>
         );
@@ -22,7 +23,8 @@ export const FiltersButton: FC<Props> = memo(props => {
 
     return (
         <button className="grid-panel__button btn btn-default" onClick={onFilter} type="button">
-            <i className="fa fa-filter" /> Filters
+            <span aria-hidden="true" className="fa fa-filter" /> Filters
         </button>
     );
 });
+FiltersButton.displayName = 'FiltersButton';
diff --git a/packages/components/src/theme/form.scss b/packages/components/src/theme/form.scss
index 0c38a28321..eff33566ac 100644
--- a/packages/components/src/theme/form.scss
+++ b/packages/components/src/theme/form.scss
@@ -63,6 +63,9 @@
   button {
     pointer-events: none;
   }
+  a {
+      pointer-events: none;
+  }
 
 
    // fix styling of buttons in ButtonGroups and ButtonToolbars which got broken by inserting another div