diff --git a/packages/@react-spectrum/s2/src/Dialog.tsx b/packages/@react-spectrum/s2/src/Dialog.tsx
index 1f221105f84..0a2cd84ddf9 100644
--- a/packages/@react-spectrum/s2/src/Dialog.tsx
+++ b/packages/@react-spectrum/s2/src/Dialog.tsx
@@ -48,11 +48,11 @@ const image = style({
 const heading = style({
   flexGrow: 1,
   marginY: 0,
-  font: 'heading'
+  font: 'title-2xl'
 });
 
 const header = style({
-  font: 'body-lg'
+  font: 'body'
 });
 
 const content =  style({
@@ -181,7 +181,7 @@ export const Dialog = forwardRef(function Dialog(props: DialogProps, ref: DOMRef
                   {children}
                 </Provider>
               </div>
-              {props.isDismissible && 
+              {props.isDismissible &&
                 <CloseButton styles={style({marginBottom: 12})} />
               }
             </div>
diff --git a/packages/@react-spectrum/s2/src/Field.tsx b/packages/@react-spectrum/s2/src/Field.tsx
index ad806490465..b05178ab5ee 100644
--- a/packages/@react-spectrum/s2/src/Field.tsx
+++ b/packages/@react-spectrum/s2/src/Field.tsx
@@ -196,13 +196,13 @@ export const FieldGroup = forwardRef(function FieldGroup(props: FieldGroupProps,
       {...otherProps}
       onPointerDown={(e) => {
         // Forward focus to input element when clicking on a non-interactive child (e.g. icon or padding)
-        if (e.pointerType === 'mouse' && !(e.target as Element).closest('button,input,textarea')) {
+        if (e.pointerType === 'mouse' && !(e.target as Element).closest('button,input,textarea,[role="button"]')) {
           e.preventDefault();
           (e.currentTarget.querySelector('input, textarea') as HTMLElement)?.focus();
         }
       }}
       onTouchEnd={e => {
-        if (!(e.target as Element).closest('button,input,textarea')) {
+        if (!(e.target as Element).closest('button,input,textarea,[role="button"]')) {
           e.preventDefault();
           (e.currentTarget.querySelector('input, textarea') as HTMLElement)?.focus();
         }
diff --git a/packages/@react-spectrum/s2/src/FullscreenDialog.tsx b/packages/@react-spectrum/s2/src/FullscreenDialog.tsx
index fc2a3c8c02f..cf293ee72a5 100644
--- a/packages/@react-spectrum/s2/src/FullscreenDialog.tsx
+++ b/packages/@react-spectrum/s2/src/FullscreenDialog.tsx
@@ -35,7 +35,8 @@ const heading = style({
   gridArea: 'heading',
   flexGrow: 1,
   marginY: 0,
-  font: 'heading'
+  font: 'title-2xl',
+  color: 'heading'
 });
 
 const header = style({
@@ -43,7 +44,7 @@ const header = style({
   marginX: {
     sm: 'auto'
   },
-  font: 'body-lg'
+  font: 'body'
 });
 
 const content =  style({