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/5] 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/5] 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/5] 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> {

From 288a74437599d5d8f021451877c3a111773489a3 Mon Sep 17 00:00:00 2001
From: Rob Snow <rsnow@adobe.com>
Date: Tue, 11 Aug 2026 12:16:34 +1000
Subject: [PATCH 4/5] use lh unit instead

---
 .../@react-spectrum/s2/src/ActionButton.tsx   | 15 ++------
 packages/@react-spectrum/s2/src/Avatar.tsx    | 36 ++++++++++++++++---
 packages/@react-spectrum/s2/src/Badge.tsx     |  2 +-
 packages/@react-spectrum/s2/src/Button.tsx    |  4 +--
 .../@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 +-
 .../s2/src/NotificationBadge.tsx              |  2 +-
 .../@react-spectrum/s2/src/SearchField.tsx    |  2 +-
 packages/@react-spectrum/s2/src/SideNav.tsx   |  4 +--
 packages/@react-spectrum/s2/src/TagGroup.tsx  |  4 +--
 .../@react-spectrum/s2/src/ToggleButton.tsx   |  2 +-
 packages/@react-spectrum/s2/src/TreeView.tsx  |  2 +-
 .../s2/stories/Avatar.stories.tsx             | 29 +++++++++++++++
 .../@react-spectrum/s2/style/style-macro.ts   |  6 ++--
 16 files changed, 83 insertions(+), 35 deletions(-)

diff --git a/packages/@react-spectrum/s2/src/ActionButton.tsx b/packages/@react-spectrum/s2/src/ActionButton.tsx
index db540c117f0..b480f818f81 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(18)
+      value: '1lh'
     },
     '--badgePosition': {
       type: 'width',
@@ -306,15 +306,6 @@ export const btnStyles = style<
   getAllowedOverrides()
 );
 
-// Matching icon sizes. TBD.
-const avatarSize: Record<NonNullable<ActionButtonStyleProps['size']>, number> = {
-  XS: 14,
-  S: 16,
-  M: 18,
-  L: 20,
-  XL: 22
-} as const;
-
 interface ActionButtonContextProps extends Partial<ActionButtonProps> {
   holdAffordance?: boolean;
 }
@@ -402,7 +393,7 @@ export const ActionButton = forwardRef(function ActionButton(
                 {
                   render: centerBaseline({slot: 'icon', styles: style({gridArea: 'icon'})}),
                   styles: style({
-                    size: fontRelative(18),
+                    size: '1lh',
                     marginStart: '--iconMargin',
                     visibility: {
                       isProgressVisible: 'hidden'
@@ -413,7 +404,7 @@ export const ActionButton = forwardRef(function ActionButton(
               [
                 AvatarContext,
                 {
-                  size: avatarSize[size],
+                  size: '1lh',
                   styles: style({
                     marginStart: '--iconMargin',
                     gridArea: 'icon'
diff --git a/packages/@react-spectrum/s2/src/Avatar.tsx b/packages/@react-spectrum/s2/src/Avatar.tsx
index 20c8347a5ba..9cbb8f625bb 100644
--- a/packages/@react-spectrum/s2/src/Avatar.tsx
+++ b/packages/@react-spectrum/s2/src/Avatar.tsx
@@ -38,7 +38,23 @@ export interface AvatarProps extends UnsafeStyles, DOMProps, SlotProps {
    *
    * @default 24
    */
-  size?: 16 | 20 | 24 | 28 | 32 | 36 | 40 | 44 | 48 | 56 | 64 | 80 | 96 | 112 | (number & {});
+  size?:
+    | 16
+    | 20
+    | 24
+    | 28
+    | 32
+    | 36
+    | 40
+    | 44
+    | 48
+    | 56
+    | 64
+    | 80
+    | 96
+    | 112
+    | (number & {})
+    | `${number}lh`;
   /** Whether the avatar is over a color background. */
   isOverBackground?: boolean;
 }
@@ -59,7 +75,9 @@ const imageStyles = style(
     outlineColor: '--s2-container-bg',
     outlineWidth: {
       default: 1,
-      isLarge: 2
+      isLarge: 2,
+      // if bigger than 64px, use 2px outline, otherwise use 1px outline
+      isLH: 'min(2px, max(1px, calc((((1lh / 64) - 1px) * 9999) + 1px)))'
     }
   },
   getAllowedOverrides({width: false})
@@ -90,8 +108,16 @@ export const Avatar = forwardRef(function Avatar(
   const domProps = filterDOMProps(otherProps);
 
   // In the docs build, we need to be able to simulate font scaling.
-  let remSize = isDocsEnv() ? `calc(${size / 16} * var(--rem, 1rem))` : `${size / 16}rem`;
-  let isLarge = size >= 64;
+  let remSize;
+  let isLarge = false;
+  let isLH = false;
+  if (typeof size === 'string') {
+    remSize = size;
+    isLH = size.endsWith('lh');
+  } else {
+    remSize = isDocsEnv() ? `calc(${size / 16} * var(--rem, 1rem))` : `${size / 16}rem`;
+    isLarge = size >= 64;
+  }
   return (
     <Image
       {...domProps}
@@ -104,7 +130,7 @@ export const Avatar = forwardRef(function Avatar(
         height: remSize
       }}
       UNSAFE_className={UNSAFE_className + ' ' + centerBaselineBefore}
-      styles={imageStyles({isOverBackground, isLarge}, props.styles)}
+      styles={imageStyles({isOverBackground, isLarge, isLH}, props.styles)}
       src={src}
     />
   );
diff --git a/packages/@react-spectrum/s2/src/Badge.tsx b/packages/@react-spectrum/s2/src/Badge.tsx
index 1bcd382b716..fdd58676608 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(18), marginStart: '--iconMargin', flexShrink: 0})
+            styles: style({size: '1lh', marginStart: '--iconMargin', flexShrink: 0})
           }
         ]
       ]}>
diff --git a/packages/@react-spectrum/s2/src/Button.tsx b/packages/@react-spectrum/s2/src/Button.tsx
index c7b444a18de..580666c5048 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(18),
+                    size: '1lh',
                     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(18),
+                    size: '1lh',
                     marginStart: '--iconMargin',
                     flexShrink: 0
                   })
diff --git a/packages/@react-spectrum/s2/src/DragPreview.tsx b/packages/@react-spectrum/s2/src/DragPreview.tsx
index 78e2a0b0b60..62db6da80cb 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(18),
+  size: '1lh',
   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 69296e3602d..221be8f67b1 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(18),
+                  size: '1lh',
                   '--iconPrimary': {type: 'fill', value: 'currentColor'}
                 })
               }
@@ -490,7 +490,7 @@ export function FieldErrorIcon(props: {isDisabled?: boolean}): ReactNode {
               })
             }),
             styles: style({
-              size: fontRelative(18),
+              size: '1lh',
               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 dae3ea84a84..cf1d87c99b6 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(18)
+      [hasTrailingIconRows]: '1lh'
     }
   }
 });
diff --git a/packages/@react-spectrum/s2/src/Menu.tsx b/packages/@react-spectrum/s2/src/Menu.tsx
index 3422b29be88..114fe5279f5 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(18),
+  size: '1lh',
   // 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/NotificationBadge.tsx b/packages/@react-spectrum/s2/src/NotificationBadge.tsx
index a1da1719aaa..51148d82ed9 100644
--- a/packages/@react-spectrum/s2/src/NotificationBadge.tsx
+++ b/packages/@react-spectrum/s2/src/NotificationBadge.tsx
@@ -93,7 +93,7 @@ const badge = style(
           isIndicatorOnly: 8
         },
         M: {
-          default: fontRelative(18), // sort of arbitrary? tried to get as close to the figma designs as possible
+          default: '1lh', // sort of arbitrary? tried to get as close to the figma designs as possible
           isIndicatorOnly: 8
         },
         L: {
diff --git a/packages/@react-spectrum/s2/src/SearchField.tsx b/packages/@react-spectrum/s2/src/SearchField.tsx
index 484bbc66a68..5d084d08f21 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(18),
+                      size: '1lh',
                       marginStart: '--iconMargin'
                     })
                   }
diff --git a/packages/@react-spectrum/s2/src/SideNav.tsx b/packages/@react-spectrum/s2/src/SideNav.tsx
index c41b3be35c5..3af8a829a37 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(18), flexShrink: 0})
+                styles: style({size: '1lh', 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(18), flexShrink: 0})
+              styles: style({size: '1lh', flexShrink: 0})
             }
           ]
         ]}>
diff --git a/packages/@react-spectrum/s2/src/TagGroup.tsx b/packages/@react-spectrum/s2/src/TagGroup.tsx
index 7bb2c2d295d..702bf280d9c 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(18),
+                    size: '1lh',
                     marginStart: '--iconMargin',
                     flexShrink: 0
                   })
@@ -647,7 +647,7 @@ function TagWrapper({children, isDisabled, allowsRemoving, isInRealDOM, isEmphas
                 ImageContext,
                 {
                   styles: style({
-                    size: fontRelative(18),
+                    size: '1lh',
                     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 1dcafc106c2..3f2d1e49b45 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(18), marginStart: '--iconMargin', flexShrink: 0})
+              styles: style({size: '1lh', marginStart: '--iconMargin', flexShrink: 0})
             }
           ]
         ]}>
diff --git a/packages/@react-spectrum/s2/src/TreeView.tsx b/packages/@react-spectrum/s2/src/TreeView.tsx
index da901cff669..7e093a85521 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(18), flexShrink: 0})
+                    styles: style({size: '1lh', flexShrink: 0})
                   }
                 ],
                 [ActionButtonGroupContext, {styles: treeActions, isDisabled}],
diff --git a/packages/@react-spectrum/s2/stories/Avatar.stories.tsx b/packages/@react-spectrum/s2/stories/Avatar.stories.tsx
index 550531d7867..444df15b025 100644
--- a/packages/@react-spectrum/s2/stories/Avatar.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/Avatar.stories.tsx
@@ -40,3 +40,32 @@ type Story = StoryObj<typeof Avatar>;
 export const Example: Story = {
   render: args => <Avatar alt="design provided" src="https://i.imgur.com/xIe7Wlb.png" {...args} />
 };
+
+export const ExtremelyLargeHeader: Story = {
+  render: args => (
+    <div
+      className={style({display: 'flex', flexDirection: 'column', alignItems: 'center', gap: 8})}>
+      <div className={style({font: 'heading-3xl', display: 'flex', alignItems: 'center', gap: 8})}>
+        <Avatar
+          alt="design provided"
+          src="https://i.imgur.com/xIe7Wlb.png"
+          size={'1lh'}
+          {...args}
+        />
+        <span>Person</span>
+      </div>
+      <div className={style({font: 'heading-2xl', display: 'flex', alignItems: 'center', gap: 8})}>
+        <Avatar
+          alt="design provided"
+          src="https://i.imgur.com/xIe7Wlb.png"
+          size={'1lh'}
+          {...args}
+        />
+        <span>Person</span>
+      </div>
+    </div>
+  ),
+  argTypes: {
+    size: {control: false}
+  }
+};
diff --git a/packages/@react-spectrum/s2/style/style-macro.ts b/packages/@react-spectrum/s2/style/style-macro.ts
index f2373f1bae2..e7f3900c0ad 100644
--- a/packages/@react-spectrum/s2/style/style-macro.ts
+++ b/packages/@react-spectrum/s2/style/style-macro.ts
@@ -119,7 +119,9 @@ export type LengthPercentageUnit =
   | 'cqw'
   | 'cqh'
   | 'cqmin'
-  | 'cqmax';
+  | 'cqmax'
+  | 'lh'
+  | 'rlh';
 export type LengthPercentage = `${number}${LengthPercentageUnit}`;
 
 export class PercentageProperty<T extends CSSValue>
@@ -133,7 +135,7 @@ export class PercentageProperty<T extends CSSValue>
   toCSSValue(value: T | LengthPercentage): PropertyValueDefinition<Value> {
     if (
       typeof value === 'string' &&
-      /^-?\d+(?:\.\d+)?(%|vw|svw|dvw|vh|svh|dvh|vmin|svmin|dvmin|vmax|svmax|dvmax|cqw|cqh|cqmin|cqmax)$/.test(
+      /^-?\d+(?:\.\d+)?(%|vw|svw|dvw|vh|svh|dvh|vmin|svmin|dvmin|vmax|svmax|dvmax|cqw|cqh|cqmin|cqmax|lh|rlh)$/.test(
         value
       )
     ) {

From 0b79d221c9cae9e9d4565109ef19acfe32e788ef Mon Sep 17 00:00:00 2001
From: Rob Snow <rsnow@adobe.com>
Date: Tue, 11 Aug 2026 16:06:20 +1000
Subject: [PATCH 5/5] fix lint

---
 packages/@react-spectrum/s2/src/Badge.tsx        |  2 +-
 packages/@react-spectrum/s2/src/Button.tsx       |  2 +-
 packages/@react-spectrum/s2/src/DragPreview.tsx  |  2 +-
 packages/@react-spectrum/s2/src/ListView.tsx     | 10 +---------
 packages/@react-spectrum/s2/src/SideNav.tsx      |  2 +-
 packages/@react-spectrum/s2/src/TagGroup.tsx     |  2 +-
 packages/@react-spectrum/s2/src/ToggleButton.tsx |  2 +-
 packages/@react-spectrum/s2/src/TreeView.tsx     |  9 +--------
 8 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/packages/@react-spectrum/s2/src/Badge.tsx b/packages/@react-spectrum/s2/src/Badge.tsx
index fdd58676608..dd7038fa1d4 100644
--- a/packages/@react-spectrum/s2/src/Badge.tsx
+++ b/packages/@react-spectrum/s2/src/Badge.tsx
@@ -15,8 +15,8 @@ import {centerBaseline} from './CenterBaseline';
 import {ContextValue, Provider, SlotProps} from 'react-aria-components/slots';
 import {control, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {filterDOMProps} from 'react-aria/filterDOMProps';
-import {fontRelative, lightDark, style} from '../style' with {type: 'macro'};
 import {IconContext} from './Icon';
+import {lightDark, style} from '../style' with {type: 'macro'};
 import {TextContext as RACTextContext} from 'react-aria-components/Text';
 import React, {createContext, forwardRef, ReactNode} from 'react';
 import {SkeletonWrapper} from './Skeleton';
diff --git a/packages/@react-spectrum/s2/src/Button.tsx b/packages/@react-spectrum/s2/src/Button.tsx
index 580666c5048..ccf7d7eaf93 100644
--- a/packages/@react-spectrum/s2/src/Button.tsx
+++ b/packages/@react-spectrum/s2/src/Button.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {baseColor, focusRing, fontRelative, lightDark, style} from '../style' with {type: 'macro'};
+import {baseColor, focusRing, lightDark, style} from '../style' with {type: 'macro'};
 import {
   ButtonRenderProps,
   Button as RACButton,
diff --git a/packages/@react-spectrum/s2/src/DragPreview.tsx b/packages/@react-spectrum/s2/src/DragPreview.tsx
index 62db6da80cb..8544bf7488b 100644
--- a/packages/@react-spectrum/s2/src/DragPreview.tsx
+++ b/packages/@react-spectrum/s2/src/DragPreview.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {baseColor, fontRelative, style} from '../style' with {type: 'macro'};
+import {baseColor, style} from '../style' with {type: 'macro'};
 import {centerBaseline} from './CenterBaseline';
 import {controlFont} from './style-utils' with {type: 'macro'};
 import {DEFAULT_SLOT, Provider} from 'react-aria-components/slots';
diff --git a/packages/@react-spectrum/s2/src/ListView.tsx b/packages/@react-spectrum/s2/src/ListView.tsx
index cf1d87c99b6..bf0851803e9 100644
--- a/packages/@react-spectrum/s2/src/ListView.tsx
+++ b/packages/@react-spectrum/s2/src/ListView.tsx
@@ -12,15 +12,7 @@
 
 import {ActionButtonGroupContext} from './ActionButtonGroup';
 import {ActionMenuContext} from './ActionMenu';
-import {
-  baseColor,
-  color,
-  colorMix,
-  focusRing,
-  fontRelative,
-  space,
-  style
-} from '../style' with {type: 'macro'};
+import {baseColor, color, colorMix, focusRing, space, style} from '../style' with {type: 'macro'};
 import {centerBaseline} from './CenterBaseline';
 import {Checkbox} from './Checkbox';
 import {CheckboxContext} from 'react-aria-components/Checkbox';
diff --git a/packages/@react-spectrum/s2/src/SideNav.tsx b/packages/@react-spectrum/s2/src/SideNav.tsx
index 3af8a829a37..cc8ae9c2dc0 100644
--- a/packages/@react-spectrum/s2/src/SideNav.tsx
+++ b/packages/@react-spectrum/s2/src/SideNav.tsx
@@ -12,7 +12,7 @@
 
 import {ActionButtonGroupContext} from './ActionButtonGroup';
 import {ActionMenuContext} from './ActionMenu';
-import {baseColor, focusRing, fontRelative, space, style} from '../style' with {type: 'macro'};
+import {baseColor, focusRing, space, style} from '../style' with {type: 'macro'};
 import {Button, ButtonContext} from 'react-aria-components/Button';
 import {centerBaseline} from './CenterBaseline';
 import {
diff --git a/packages/@react-spectrum/s2/src/TagGroup.tsx b/packages/@react-spectrum/s2/src/TagGroup.tsx
index 702bf280d9c..0f208512198 100644
--- a/packages/@react-spectrum/s2/src/TagGroup.tsx
+++ b/packages/@react-spectrum/s2/src/TagGroup.tsx
@@ -23,7 +23,7 @@ import {
   TagRenderProps
 } from 'react-aria-components/TagGroup';
 import {AvatarContext} from './Avatar';
-import {baseColor, focusRing, fontRelative, lightDark, style} from '../style' with {type: 'macro'};
+import {baseColor, focusRing, lightDark, style} from '../style' with {type: 'macro'};
 import {CenterBaseline, centerBaseline} from './CenterBaseline';
 import {ClearButton} from './ClearButton';
 import {CollectionBuilder} from 'react-aria/CollectionBuilder';
diff --git a/packages/@react-spectrum/s2/src/ToggleButton.tsx b/packages/@react-spectrum/s2/src/ToggleButton.tsx
index 3f2d1e49b45..fa163d02b44 100644
--- a/packages/@react-spectrum/s2/src/ToggleButton.tsx
+++ b/packages/@react-spectrum/s2/src/ToggleButton.tsx
@@ -16,7 +16,6 @@ import {ContextValue, Provider, useSlottedContext} from 'react-aria-components/s
 import CornerTriangle from '../ui-icons/CornerTriangle';
 import {createContext, forwardRef, ReactNode} from 'react';
 import {FocusableRef, FocusableRefValue, GlobalDOMAttributes} from '@react-types/shared';
-import {fontRelative, space, style} from '../style' with {type: 'macro'};
 import {IconContext} from './Icon';
 import {pressScale} from './pressScale';
 import {
@@ -24,6 +23,7 @@ import {
   ToggleButtonProps as RACToggleButtonProps
 } from 'react-aria-components/ToggleButton';
 import {SkeletonContext} from './Skeleton';
+import {space, style} from '../style' with {type: 'macro'};
 import {StyleProps} from './style-utils';
 import {Text, TextContext} from './Content';
 import {ToggleButtonGroupContext} from './ToggleButtonGroup';
diff --git a/packages/@react-spectrum/s2/src/TreeView.tsx b/packages/@react-spectrum/s2/src/TreeView.tsx
index 7e093a85521..24f582dd7f2 100644
--- a/packages/@react-spectrum/s2/src/TreeView.tsx
+++ b/packages/@react-spectrum/s2/src/TreeView.tsx
@@ -12,14 +12,7 @@
 
 import {ActionButtonGroupContext} from './ActionButtonGroup';
 import {ActionMenuContext} from './ActionMenu';
-import {
-  baseColor,
-  color,
-  colorMix,
-  focusRing,
-  fontRelative,
-  style
-} from '../style' with {type: 'macro'};
+import {baseColor, color, colorMix, focusRing, style} from '../style' with {type: 'macro'};
 import {Button, ButtonContext} from 'react-aria-components/Button';
 import {centerBaseline} from './CenterBaseline';
 import {Checkbox} from './Checkbox';