From ef8b0a2d7d375e6dcc4d84af96d635959a598f56 Mon Sep 17 00:00:00 2001
From: Rob Snow <rsnow@adobe.com>
Date: Mon, 3 Aug 2026 16:07:39 +1000
Subject: [PATCH 1/3] chore: update icons to new size

---
 packages/@react-spectrum/s2/src/ActionButton.tsx | 4 ++--
 packages/@react-spectrum/s2/src/Badge.tsx        | 2 +-
 packages/@react-spectrum/s2/src/Button.tsx       | 4 ++--
 packages/@react-spectrum/s2/src/DragPreview.tsx  | 2 +-
 packages/@react-spectrum/s2/src/Field.tsx        | 4 ++--
 packages/@react-spectrum/s2/src/ListView.tsx     | 2 +-
 packages/@react-spectrum/s2/src/Menu.tsx         | 2 +-
 packages/@react-spectrum/s2/src/SearchField.tsx  | 2 +-
 packages/@react-spectrum/s2/src/SideNav.tsx      | 4 ++--
 packages/@react-spectrum/s2/src/TagGroup.tsx     | 4 ++--
 packages/@react-spectrum/s2/src/ToggleButton.tsx | 2 +-
 packages/@react-spectrum/s2/src/TreeView.tsx     | 2 +-
 12 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/@react-spectrum/s2/src/ActionButton.tsx b/packages/@react-spectrum/s2/src/ActionButton.tsx
index 970dd19c044..2bcf2e9d8b5 100644
--- a/packages/@react-spectrum/s2/src/ActionButton.tsx
+++ b/packages/@react-spectrum/s2/src/ActionButton.tsx
@@ -280,7 +280,7 @@ export const btnStyles = style<
     },
     '--iconWidth': {
       type: 'width',
-      value: fontRelative(20)
+      value: fontRelative(18)
     },
     '--badgePosition': {
       type: 'width',
@@ -402,7 +402,7 @@ export const ActionButton = forwardRef(function ActionButton(
                 {
                   render: centerBaseline({slot: 'icon', styles: style({gridArea: 'icon'})}),
                   styles: style({
-                    size: fontRelative(20),
+                    size: fontRelative(18),
                     marginStart: '--iconMargin',
                     visibility: {
                       isProgressVisible: 'hidden'
diff --git a/packages/@react-spectrum/s2/src/Badge.tsx b/packages/@react-spectrum/s2/src/Badge.tsx
index 9bdb65e0b14..1bcd382b716 100644
--- a/packages/@react-spectrum/s2/src/Badge.tsx
+++ b/packages/@react-spectrum/s2/src/Badge.tsx
@@ -234,7 +234,7 @@ export const Badge = forwardRef(function Badge(props: BadgeProps, ref: DOMRef<HT
           IconContext,
           {
             render: centerBaseline({slot: 'icon', styles: style({order: 0})}),
-            styles: style({size: fontRelative(20), marginStart: '--iconMargin', flexShrink: 0})
+            styles: style({size: fontRelative(18), marginStart: '--iconMargin', flexShrink: 0})
           }
         ]
       ]}>
diff --git a/packages/@react-spectrum/s2/src/Button.tsx b/packages/@react-spectrum/s2/src/Button.tsx
index 061a671d755..c7b444a18de 100644
--- a/packages/@react-spectrum/s2/src/Button.tsx
+++ b/packages/@react-spectrum/s2/src/Button.tsx
@@ -478,7 +478,7 @@ export const Button = forwardRef(function Button(
                 {
                   render: centerBaseline({slot: 'icon', styles: style({order: 0})}),
                   styles: style({
-                    size: fontRelative(20),
+                    size: fontRelative(18),
                     marginStart: '--iconMargin',
                     flexShrink: 0,
                     visibility: {
@@ -593,7 +593,7 @@ export const LinkButton = forwardRef(function LinkButton(
                 {
                   render: centerBaseline({slot: 'icon', styles: style({order: 0})}),
                   styles: style({
-                    size: fontRelative(20),
+                    size: fontRelative(18),
                     marginStart: '--iconMargin',
                     flexShrink: 0
                   })
diff --git a/packages/@react-spectrum/s2/src/DragPreview.tsx b/packages/@react-spectrum/s2/src/DragPreview.tsx
index 1836f505404..78e2a0b0b60 100644
--- a/packages/@react-spectrum/s2/src/DragPreview.tsx
+++ b/packages/@react-spectrum/s2/src/DragPreview.tsx
@@ -63,7 +63,7 @@ export let iconCenterWrapper = style({
 
 export let icon = style({
   display: 'block',
-  size: fontRelative(20),
+  size: fontRelative(18),
   marginEnd: 'text-to-visual',
   '--iconPrimary': {
     type: 'fill',
diff --git a/packages/@react-spectrum/s2/src/Field.tsx b/packages/@react-spectrum/s2/src/Field.tsx
index 5709090d61f..69296e3602d 100644
--- a/packages/@react-spectrum/s2/src/Field.tsx
+++ b/packages/@react-spectrum/s2/src/Field.tsx
@@ -294,7 +294,7 @@ export const FieldGroup = forwardRef(function FieldGroup(
               IconContext,
               {
                 styles: style({
-                  size: fontRelative(20),
+                  size: fontRelative(18),
                   '--iconPrimary': {type: 'fill', value: 'currentColor'}
                 })
               }
@@ -490,7 +490,7 @@ export function FieldErrorIcon(props: {isDisabled?: boolean}): ReactNode {
               })
             }),
             styles: style({
-              size: fontRelative(20),
+              size: fontRelative(18),
               marginStart: 'text-to-visual',
               marginEnd: fontRelative(-2),
               flexShrink: 0
diff --git a/packages/@react-spectrum/s2/src/ListView.tsx b/packages/@react-spectrum/s2/src/ListView.tsx
index 41d69a077b5..dae3ea84a84 100644
--- a/packages/@react-spectrum/s2/src/ListView.tsx
+++ b/packages/@react-spectrum/s2/src/ListView.tsx
@@ -235,7 +235,7 @@ const listView = style<GridListRenderProps & {isQuiet?: boolean; isDropTarget?:
     type: 'width',
     value: {
       default: 'auto',
-      [hasTrailingIconRows]: fontRelative(20)
+      [hasTrailingIconRows]: fontRelative(18)
     }
   }
 });
diff --git a/packages/@react-spectrum/s2/src/Menu.tsx b/packages/@react-spectrum/s2/src/Menu.tsx
index 3e0664e2593..3422b29be88 100644
--- a/packages/@react-spectrum/s2/src/Menu.tsx
+++ b/packages/@react-spectrum/s2/src/Menu.tsx
@@ -281,7 +281,7 @@ export let checkbox = style({
 
 export let icon = style({
   display: 'block',
-  size: fontRelative(20),
+  size: fontRelative(18),
   // too small default icon size is wrong, it's like the icons are 1 tshirt size bigger than the rest of the component? check again after typography changes
   // reminder, size of WF is applied via font size
   marginEnd: 'text-to-visual',
diff --git a/packages/@react-spectrum/s2/src/SearchField.tsx b/packages/@react-spectrum/s2/src/SearchField.tsx
index 9c3bd8b953c..484bbc66a68 100644
--- a/packages/@react-spectrum/s2/src/SearchField.tsx
+++ b/packages/@react-spectrum/s2/src/SearchField.tsx
@@ -163,7 +163,7 @@ export const SearchField = /*#__PURE__*/ forwardRef(function SearchField(
                       })
                     }),
                     styles: style({
-                      size: fontRelative(20),
+                      size: fontRelative(18),
                       marginStart: '--iconMargin'
                     })
                   }
diff --git a/packages/@react-spectrum/s2/src/SideNav.tsx b/packages/@react-spectrum/s2/src/SideNav.tsx
index 3c489729283..c41b3be35c5 100644
--- a/packages/@react-spectrum/s2/src/SideNav.tsx
+++ b/packages/@react-spectrum/s2/src/SideNav.tsx
@@ -543,7 +543,7 @@ const SideNavItemContentInner = props => {
               IconContext,
               {
                 render: centerBaseline({slot: 'icon', styles: treeIcon}),
-                styles: style({size: fontRelative(20), flexShrink: 0})
+                styles: style({size: fontRelative(18), flexShrink: 0})
               }
             ],
             [ActionButtonGroupContext, {styles: treeActions, isDisabled, size: 'S'}],
@@ -697,7 +697,7 @@ export const SideNavItemLink = (props: SideNavItemLinkProps): ReactNode => {
             IconContext,
             {
               render: centerBaseline({slot: 'icon', styles: treeIcon}),
-              styles: style({size: fontRelative(20), flexShrink: 0})
+              styles: style({size: fontRelative(18), flexShrink: 0})
             }
           ]
         ]}>
diff --git a/packages/@react-spectrum/s2/src/TagGroup.tsx b/packages/@react-spectrum/s2/src/TagGroup.tsx
index c7a1f3f1e39..7bb2c2d295d 100644
--- a/packages/@react-spectrum/s2/src/TagGroup.tsx
+++ b/packages/@react-spectrum/s2/src/TagGroup.tsx
@@ -630,7 +630,7 @@ function TagWrapper({children, isDisabled, allowsRemoving, isInRealDOM, isEmphas
                 {
                   render: centerBaseline({slot: 'icon', styles: style({order: 0})}),
                   styles: style({
-                    size: fontRelative(20),
+                    size: fontRelative(18),
                     marginStart: '--iconMargin',
                     flexShrink: 0
                   })
@@ -647,7 +647,7 @@ function TagWrapper({children, isDisabled, allowsRemoving, isInRealDOM, isEmphas
                 ImageContext,
                 {
                   styles: style({
-                    size: fontRelative(20),
+                    size: fontRelative(18),
                     flexShrink: 0,
                     order: 0,
                     aspectRatio: 'square',
diff --git a/packages/@react-spectrum/s2/src/ToggleButton.tsx b/packages/@react-spectrum/s2/src/ToggleButton.tsx
index cb8b897f33e..1dcafc106c2 100644
--- a/packages/@react-spectrum/s2/src/ToggleButton.tsx
+++ b/packages/@react-spectrum/s2/src/ToggleButton.tsx
@@ -126,7 +126,7 @@ export const ToggleButton = forwardRef(function ToggleButton(
             IconContext,
             {
               render: centerBaseline({slot: 'icon', styles: style({order: 0})}),
-              styles: style({size: fontRelative(20), marginStart: '--iconMargin', flexShrink: 0})
+              styles: style({size: fontRelative(18), marginStart: '--iconMargin', flexShrink: 0})
             }
           ]
         ]}>
diff --git a/packages/@react-spectrum/s2/src/TreeView.tsx b/packages/@react-spectrum/s2/src/TreeView.tsx
index 4573d2d5331..da901cff669 100644
--- a/packages/@react-spectrum/s2/src/TreeView.tsx
+++ b/packages/@react-spectrum/s2/src/TreeView.tsx
@@ -703,7 +703,7 @@ export const TreeViewItemContent = (props: TreeViewItemContentProps): ReactNode
                   IconContext,
                   {
                     render: centerBaseline({slot: 'icon', styles: treeIcon}),
-                    styles: style({size: fontRelative(20), flexShrink: 0})
+                    styles: style({size: fontRelative(18), flexShrink: 0})
                   }
                 ],
                 [ActionButtonGroupContext, {styles: treeActions, isDisabled}],

From 51a1696eaaf09c1da7cc5b98cd1143c25ccaae54 Mon Sep 17 00:00:00 2001
From: Rob Snow <rsnow@adobe.com>
Date: Mon, 3 Aug 2026 16:10:32 +1000
Subject: [PATCH 2/3] update `iconStyle`

---
 packages/@react-spectrum/s2/style/index.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/@react-spectrum/s2/style/index.ts b/packages/@react-spectrum/s2/style/index.ts
index 02d768a2a05..2685ce16742 100644
--- a/packages/@react-spectrum/s2/style/index.ts
+++ b/packages/@react-spectrum/s2/style/index.ts
@@ -149,9 +149,9 @@ export interface IconStyle {
 const iconSizes = {
   XS: 14,
   S: 16,
-  M: 20,
-  L: 22,
-  XL: 26
+  M: 18,
+  L: 20,
+  XL: 22
 } as const;
 
 /**

From a85a2449087849602046fd8a840f222e146db875 Mon Sep 17 00:00:00 2001
From: Rob Snow <rsnow@adobe.com>
Date: Mon, 3 Aug 2026 16:43:15 +1000
Subject: [PATCH 3/3] sync avatar size with icon size for ActionButton

---
 packages/@react-spectrum/s2/src/ActionButton.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/@react-spectrum/s2/src/ActionButton.tsx b/packages/@react-spectrum/s2/src/ActionButton.tsx
index 2bcf2e9d8b5..db540c117f0 100644
--- a/packages/@react-spectrum/s2/src/ActionButton.tsx
+++ b/packages/@react-spectrum/s2/src/ActionButton.tsx
@@ -310,9 +310,9 @@ export const btnStyles = style<
 const avatarSize: Record<NonNullable<ActionButtonStyleProps['size']>, number> = {
   XS: 14,
   S: 16,
-  M: 20,
-  L: 22,
-  XL: 26
+  M: 18,
+  L: 20,
+  XL: 22
 } as const;
 
 interface ActionButtonContextProps extends Partial<ActionButtonProps> {