diff --git a/components/settings/__tests__/keyword-settings.test.tsx b/components/settings/__tests__/keyword-settings.test.tsx
index 333a37ecf..6e994ce58 100644
--- a/components/settings/__tests__/keyword-settings.test.tsx
+++ b/components/settings/__tests__/keyword-settings.test.tsx
@@ -89,6 +89,17 @@ describe('KeywordSettings', () => {
expect(useSettingsStore.getState().emailKeywords.find((k) => k.id === 'red')).toBeUndefined();
});
+ // A list of "Edit" / "Delete" with nothing else said which tag a screen
+ // reader user was on; each button is named after its tag now, as a full
+ // size icon button (32px, 44px hit area on touch).
+ it('names each tag row button after its tag', () => {
+ render();
+ expect(screen.getAllByRole('button', { name: 'edit_tag' })).toHaveLength(DEFAULT_KEYWORDS.length);
+ const deletes = screen.getAllByRole('button', { name: 'delete_tag' });
+ expect(deletes).toHaveLength(DEFAULT_KEYWORDS.length);
+ expect(deletes[0].className).toContain('h-8 w-8');
+ });
+
it('shows edit form when edit button clicked', () => {
render();
const editButtons = screen.getAllByTitle('edit');
diff --git a/components/settings/__tests__/settings-delete-undo.test.tsx b/components/settings/__tests__/settings-delete-undo.test.tsx
index 63b633221..5433e965a 100644
--- a/components/settings/__tests__/settings-delete-undo.test.tsx
+++ b/components/settings/__tests__/settings-delete-undo.test.tsx
@@ -45,7 +45,8 @@ describe('deleting a tag', () => {
render();
const second = DEFAULT_KEYWORDS[1];
- fireEvent.click(screen.getAllByRole('button', { name: 'delete' })[1]);
+ // Each Delete is named after its tag (the mocked t returns the key).
+ fireEvent.click(screen.getAllByRole('button', { name: 'delete_tag' })[1]);
expect(useSettingsStore.getState().emailKeywords.map((k) => k.id)).not.toContain(second.id);
expect(screen.queryByRole('alertdialog')).toBeNull();
diff --git a/components/settings/address-book-management-settings.tsx b/components/settings/address-book-management-settings.tsx
index 6145958ba..a9f78de91 100644
--- a/components/settings/address-book-management-settings.tsx
+++ b/components/settings/address-book-management-settings.tsx
@@ -9,6 +9,7 @@ import { useManagedAccountStore } from "@/stores/managed-account-store";
import { toast } from "@/stores/toast-store";
import { SettingsSection } from "./settings-section";
import { cn } from "@/lib/utils";
+import { IconButton } from "@/components/ui/icon-button";
import type { AddressBook, AddressBookRights } from "@/lib/jmap/types";
import { ShareCollectionDialog } from "./share-collection-dialog";
import { PromptDialog } from "@/components/ui/prompt-dialog";
@@ -207,10 +208,10 @@ export function AddressBookManagementSettings() {
>