diff --git a/packages/@react-spectrum/ai/exports/index.ts b/packages/@react-spectrum/ai/exports/index.ts
index 7fd5afd63de..fc47ff18a0c 100644
--- a/packages/@react-spectrum/ai/exports/index.ts
+++ b/packages/@react-spectrum/ai/exports/index.ts
@@ -1,4 +1,4 @@
-export {Attachment, AttachmentList} from '../src/AttachmentList';
+export {Attachment, AttachmentList, AttachmentPreview} from '../src/AttachmentList';
 export {MessageFeedback} from '../src/MessageFeedback';
 export {MessageSource, SourceList, SourceListItem} from '../src/MessageSource';
 export {MessageSuggestion, MessageSuggestionList} from '../src/MessageSuggestion';
@@ -37,7 +37,11 @@ export {UserMessage} from '../src/UserMessage';
 export {PixelLoader} from '../src/loader/react';
 export {AIButton} from '../src/AIButton';
 
-export type {AttachmentProps, AttachmentListProps} from '../src/AttachmentList';
+export type {
+  AttachmentProps,
+  AttachmentListProps,
+  AttachmentPreviewProps
+} from '../src/AttachmentList';
 export type {
   PromptFieldProps,
   PromptFieldSubmitButtonProps,
diff --git a/packages/@react-spectrum/ai/src/AttachmentList.tsx b/packages/@react-spectrum/ai/src/AttachmentList.tsx
index a2b79077ad9..3da985bf1be 100644
--- a/packages/@react-spectrum/ai/src/AttachmentList.tsx
+++ b/packages/@react-spectrum/ai/src/AttachmentList.tsx
@@ -18,27 +18,31 @@ import {
   forwardRefType,
   GlobalDOMAttributes
 } from '@react-types/shared';
+import AudioWave from '@react-spectrum/s2/icons/AudioWave';
 import {
   baseColor,
   color,
   focusRing,
   iconStyle,
   lightDark,
-  space,
   style
 } from '@react-spectrum/s2/style' with {type: 'macro'};
 import {Button} from 'react-aria-components/Button';
 import {CardProps} from '@react-spectrum/s2/Card';
 import {ContentContext} from '@react-spectrum/s2/Content';
+import {createContext, forwardRef, ReactNode, useContext, useRef} from 'react';
 import Cross from '../ui-icons/Cross';
 import {DEFAULT_SLOT, Provider} from 'react-aria-components/slots';
-import {forwardRef, ReactNode, useContext, useRef} from 'react';
+import File from '@react-spectrum/s2/icons/File';
+import FileText from '@react-spectrum/s2/icons/FileText';
+// @ts-ignore
 import {IllustrationContext} from '@react-spectrum/s2/Icon';
-import {ImageContext} from '@react-spectrum/s2/Image';
+import {Image, ImageContext, ImageProps} from '@react-spectrum/s2/Image';
 import {ImageCoordinator} from '@react-spectrum/s2/ImageCoordinator';
-// @ts-ignore
+import ImageIcon from '@react-spectrum/s2/icons/Image';
 import intlMessages from '../intl/*.json';
 import {mergeStyles} from '@react-spectrum/s2/mergeStyles';
+import Play from '@react-spectrum/s2/icons/Play';
 import {pressScale} from '@react-spectrum/s2/pressScale';
 import {ProgressCircle} from '@react-spectrum/s2/ProgressCircle';
 import {StyleString} from '@react-spectrum/s2/style' with {type: 'macro'};
@@ -69,12 +73,7 @@ const controlSizeM = {
   }
 } as const;
 
-const hoverBackground = {
-  default: 'gray-200',
-  isStaticColor: 'transparent-overlay-200'
-} as const;
-
-const styles = style<{
+const closeButton = style<{
   isDisabled: boolean;
   isHovered: boolean;
   isFocusVisible: boolean;
@@ -92,16 +91,14 @@ const styles = style<{
   borderStyle: 'none',
   transition: 'default',
   backgroundColor: {
-    default: 'gray-200',
-    isHovered: hoverBackground,
-    isFocusVisible: hoverBackground,
-    isPressed: hoverBackground
+    default: baseColor('gray-900'),
+    forcedColors: 'ButtonText'
   },
   color: {
-    default: baseColor('neutral'),
+    default: baseColor('gray-25'),
     isDisabled: 'disabled',
     forcedColors: {
-      default: 'ButtonText',
+      default: 'ButtonFace',
       isDisabled: 'GrayText'
     }
   },
@@ -117,22 +114,40 @@ const styles = style<{
 });
 
 const onlyPreview = ':not(:has([data-slot=content])):not(:has([data-slot=preview]))';
-const noDescription = ':not(:has([slot=description]))';
+
+const container = {
+  backgroundColor: {
+    default: lightDark('white/5', 'black/5'),
+    forcedColors: 'ButtonFace'
+  },
+  boxShadow: `[inset 0 0 0 1px light-dark(${color('black/5')}, ${color('white/5')}), 0 8px 32px 0 light-dark(${color('transparent-white-50')}, ${color('transparent-black-50')}), inset 0 -5px 21.6px 0 ${color('transparent-white-50')}, inset 0 24px 32px 0 ${color('transparent-white-50')}]`
+} as const;
 
 const attachmentCard = style({
+  ...container,
   display: 'flex',
   flexDirection: 'row',
   position: 'relative',
-  borderRadius: 'default',
-  backgroundColor: {
-    default: lightDark('transparent-white-300', 'transparent-black-300'),
-    forcedColors: 'ButtonFace'
+  borderRadius: 'lg',
+  outlineStyle: 'solid',
+  outlineWidth: {
+    default: 1, // WHCM
+    isInvalid: 2
   },
-  boxShadow: {
-    default: `[inset 0 0 0 1px light-dark(${color('transparent-black-300')}, ${color('transparent-white-300')})]`,
-    isInvalid: `[inset 0 0 0 1px ${color('negative-900')}]`
+  outlineOffset: {
+    default: -1,
+    isInvalid: -2
+  },
+  outlineColor: {
+    default: 'transparent',
+    forcedColors: 'ButtonBorder',
+    isInvalid: {
+      default: 'negative-900',
+      forcedColors: 'Mark'
+    }
   },
   forcedColorAdjust: 'none',
+  cursor: 'default',
   transition: 'default',
   fontFamily: 'sans',
   overflow: 'clip',
@@ -264,7 +279,7 @@ const attachmentDescription = style<{size: 'XS' | 'S' | 'M' | 'L' | 'XL'}>({
   gridArea: 'description'
 });
 
-const attachmentContent = style<{size: 'XS' | 'S' | 'M' | 'L' | 'XL'}>({
+const attachmentContent = style({
   display: 'grid',
   gridTemplateColumns: ['minmax(0, 1fr)'],
   gridTemplateAreas: ['title', 'description'],
@@ -273,16 +288,6 @@ const attachmentContent = style<{size: 'XS' | 'S' | 'M' | 'L' | 'XL'}>({
   minWidth: 0,
   alignItems: 'baseline',
   alignContent: 'start',
-  rowGap: {
-    size: {
-      XS: 4,
-      S: 4,
-      M: space(6),
-      L: space(6),
-      XL: 8
-    },
-    [noDescription]: 0
-  },
   paddingStart: {
     default: '--card-spacing',
     ':first-child': 0
@@ -303,7 +308,7 @@ const CloseButton = function CloseButton(props) {
       slot="remove"
       style={pressScale(ref, {})}
       className={renderProps =>
-        mergeStyles(styles({...renderProps, size: props.size || 'M'}), props.styles)
+        mergeStyles(closeButton({...renderProps, size: props.size || 'M'}), props.styles)
       }>
       <Cross size="M" />
     </Button>
@@ -387,101 +392,8 @@ const tagStyles = style({
   flexGrow: 0,
   position: 'relative',
   ...focusRing(),
-  borderRadius: 'default'
+  borderRadius: 'lg'
 });
-
-// this is checking that there isn't content in the attachment
-// similar to onlyPreview, but specifically checking siblings before the alert icon (aka looking for Content)
-const onlyPreviewFromError = ':not([data-slot=content] ~ *)';
-const attachmentErrorStyles = style({
-  display: 'flex',
-  flexShrink: 0,
-  alignItems: 'center',
-  paddingStart: {
-    default: 8,
-    [onlyPreviewFromError]: 0
-  },
-  position: {
-    [onlyPreviewFromError]: 'absolute'
-  },
-  top: {
-    [onlyPreviewFromError]: '50%'
-  },
-  insetStart: {
-    [onlyPreviewFromError]: '50%'
-  },
-  transform: {
-    [onlyPreviewFromError]: 'translate(-50%, -50%)'
-  },
-  '--iconPrimary': {
-    type: 'color',
-    value: 'negative'
-  }
-});
-
-// this is also checking that there isn't content in the attachment
-// similar to onlyPreview, but specifically checking siblings after the thumbnail (aka looking for Content)
-const onlyPreviewFromThumbnail = ':not(:has(~ [data-slot=content]))';
-function AttachmentContextProvider({
-  children,
-  isUploading,
-  isInvalid
-}: {
-  children: ReactNode;
-  isUploading: boolean;
-  isInvalid?: boolean;
-}) {
-  let imageCtx = useContext(ImageContext);
-  let illustrationCtx = useContext(IllustrationContext);
-  const opacityStyles = style({
-    opacity: {
-      default: 1,
-      isUploading: 0.15,
-      isInvalid: {
-        default: 1,
-        [onlyPreviewFromThumbnail]: 0.15
-      }
-    },
-    transition: 'default'
-  })({isUploading, isInvalid});
-  const imageSlots = imageCtx && 'slots' in imageCtx ? imageCtx.slots : undefined;
-  const illustrationSlots =
-    illustrationCtx && 'slots' in illustrationCtx ? illustrationCtx.slots : undefined;
-
-  return (
-    <Provider
-      values={[
-        [
-          ImageContext,
-          {
-            ...imageCtx,
-            slots: {
-              ...imageSlots,
-              thumbnail: {
-                ...imageSlots?.thumbnail,
-                styles: mergeStyles(imageSlots?.thumbnail?.styles, opacityStyles)
-              }
-            }
-          }
-        ],
-        [
-          IllustrationContext,
-          {
-            slots: {
-              ...illustrationSlots,
-              thumbnail: {
-                ...illustrationSlots?.thumbnail,
-                styles: mergeStyles(illustrationSlots?.thumbnail?.styles, opacityStyles)
-              }
-            }
-          }
-        ]
-      ]}>
-      {children}
-    </Provider>
-  );
-}
-
 interface AttachmentCardProps {
   size?: 'XS' | 'S' | 'M' | 'L' | 'XL';
   isInvalid?: boolean;
@@ -509,14 +421,10 @@ function AttachmentCard({size = 'M', isInvalid = false, children}: AttachmentCar
                     borderRadius: '[3px]',
                     objectFit: 'cover',
                     outlineStyle: 'solid',
-                    outlineWidth: {
-                      default: 2,
-                      size: {
-                        XS: 1
-                      }
-                    },
-                    outlineColor: '--s2-container-bg'
-                  })({size})
+                    outlineWidth: 1,
+                    outlineColor: 'gray-800/10',
+                    outlineOffset: -1
+                  })
                 }
               }
             }
@@ -546,7 +454,7 @@ function AttachmentCard({size = 'M', isInvalid = false, children}: AttachmentCar
           [
             ContentContext,
             {
-              styles: attachmentContent({size}),
+              styles: attachmentContent,
               // @ts-ignore
               'data-slot': 'content'
             }
@@ -574,7 +482,6 @@ export const Attachment = forwardRef(function Attachment(
     size = 'M'
   } = props;
   let domRef = useDOMRef(ref);
-  let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-spectrum/ai');
   return (
     <Tag
       id={id}
@@ -585,41 +492,10 @@ export const Attachment = forwardRef(function Attachment(
       ref={domRef}
       className={renderProps => mergeStyles(tagStyles({...renderProps}), styles)}>
       <AttachmentCard size={size} isInvalid={isInvalid}>
-        {props.uploadProgress != null && props.uploadProgress < 100 && (
-          <div
-            className={style({
-              position: 'absolute',
-              top: '50%',
-              insetStart: {
-                default: '50%',
-                // this checks that there is text content in the attachment + a Image as a thumbnail
-                ':has(~ [data-slot=content]):not(:has(~ [data-rsp-slot=illustration]))':
-                  '[calc(var(--card-padding-x) + var(--basic-thumb-size) / 2)]',
-                // this checks that there is text content in the attachment + a Illustration as a thumbnail
-                ':has(~ [data-slot=content]):has(~ [data-rsp-slot=illustration])':
-                  '[calc(var(--card-padding-x) + var(--illust-margin-x) + var(--illust-thumb-size) / 2)]'
-              },
-              transform: 'translate(-50%, -50%)'
-            })}>
-            <ProgressCircle
-              aria-label={stringFormatter.format('promptfield.uploading')}
-              value={props.uploadProgress}
-              // TODO: should probably be M for most thumbnail only attachments at varying sizes, but needs to be S if there is text content
-              // aka like a actualy horizontal card, but to do this I need to know if text sibling is there...
-              size="S"
-            />
-          </div>
-        )}
-        <AttachmentContextProvider
-          isInvalid={isInvalid}
-          isUploading={props.uploadProgress != null && props.uploadProgress < 100}>
+        <AttachmentPreviewContext.Provider
+          value={{isInvalid: !!isInvalid, uploadProgress: props.uploadProgress ?? 100, size}}>
           {typeof children === 'function' ? children({size}) : children}
-        </AttachmentContextProvider>
-        {isInvalid && (
-          <div aria-hidden="true" className={attachmentErrorStyles}>
-            <AlertTriangleIcon size={size} />
-          </div>
-        )}
+        </AttachmentPreviewContext.Provider>
       </AttachmentCard>
       {/** Definitely not a close button, though looks like one. */}
       <div
@@ -635,17 +511,103 @@ export const Attachment = forwardRef(function Attachment(
   );
 });
 
+const attachmentPreviewWrapper = style({
+  width: 32,
+  height: 32,
+  display: 'flex',
+  alignItems: 'center',
+  justifyContent: 'center'
+});
+
+const AttachmentPreviewContext = createContext({
+  isInvalid: false,
+  uploadProgress: 100,
+  size: 'S' as 'XS' | 'S' | 'M' | 'L' | 'XL'
+});
+
+export interface AttachmentPreviewProps extends ImageProps {
+  mimeType: string;
+}
+
+export function AttachmentPreview(props: AttachmentPreviewProps) {
+  let {mimeType, ...otherProps} = props;
+  let {isInvalid, uploadProgress, size} = useContext(AttachmentPreviewContext)!;
+  let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-spectrum/ai');
+
+  if (isInvalid) {
+    return (
+      <div className={attachmentPreviewWrapper}>
+        <AlertTriangleIcon size={size} />
+      </div>
+    );
+  }
+
+  if (uploadProgress < 100) {
+    return (
+      <div className={attachmentPreviewWrapper}>
+        <ProgressCircle
+          aria-label={stringFormatter.format('promptfield.uploading')}
+          value={uploadProgress}
+          size="S"
+        />
+      </div>
+    );
+  }
+
+  if (otherProps.src) {
+    return <Image {...otherProps} slot="thumbnail" />;
+  }
+
+  if (mimeType.startsWith('audio/')) {
+    return (
+      <div className={attachmentPreviewWrapper}>
+        <AudioWave />
+      </div>
+    );
+  }
+
+  if (mimeType.startsWith('video/')) {
+    return (
+      <div className={attachmentPreviewWrapper}>
+        <Play />
+      </div>
+    );
+  }
+
+  if (mimeType.startsWith('image/')) {
+    return (
+      <div className={attachmentPreviewWrapper}>
+        <ImageIcon />
+      </div>
+    );
+  }
+
+  if (mimeType.startsWith('text/')) {
+    return (
+      <div className={attachmentPreviewWrapper}>
+        <FileText />
+      </div>
+    );
+  }
+
+  return (
+    <div className={attachmentPreviewWrapper}>
+      <File />
+    </div>
+  );
+}
+
 function AlertTriangleIcon({size}) {
   switch (size) {
     case 'XS':
-      return <AlertTriangle styles={iconStyle({size: 'XS'})} />;
+      return <AlertTriangle styles={iconStyle({size: 'XS', color: 'negative'})} />;
     case 'S':
-      return <AlertTriangle styles={iconStyle({size: 'S'})} />;
+      return <AlertTriangle styles={iconStyle({size: 'S', color: 'negative'})} />;
     case 'M':
-      return <AlertTriangle styles={iconStyle({size: 'M'})} />;
+      return <AlertTriangle styles={iconStyle({size: 'M', color: 'negative'})} />;
     case 'L':
-      return <AlertTriangle styles={iconStyle({size: 'L'})} />;
+      return <AlertTriangle styles={iconStyle({size: 'L', color: 'negative'})} />;
     case 'XL':
-      return <AlertTriangle styles={iconStyle({size: 'XL'})} />;
+      return <AlertTriangle styles={iconStyle({size: 'XL', color: 'negative'})} />;
   }
 }
diff --git a/packages/@react-spectrum/ai/src/PromptField.tsx b/packages/@react-spectrum/ai/src/PromptField.tsx
index 3aed8e1fa58..acd906ec6d5 100644
--- a/packages/@react-spectrum/ai/src/PromptField.tsx
+++ b/packages/@react-spectrum/ai/src/PromptField.tsx
@@ -543,7 +543,7 @@ export function PromptTokenField(props: PromptTokenFieldProps) {
         '--loader-opacity': {
           type: 'opacity',
           value: {
-            default: 0.51,
+            default: 0.64,
             isFocused: 1,
             forcedColors: 1
           }
diff --git a/packages/@react-spectrum/ai/stories/AttachmentList.stories.tsx b/packages/@react-spectrum/ai/stories/AttachmentList.stories.tsx
index e4c9f865ec5..a3101ea7bf6 100644
--- a/packages/@react-spectrum/ai/stories/AttachmentList.stories.tsx
+++ b/packages/@react-spectrum/ai/stories/AttachmentList.stories.tsx
@@ -10,13 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {Attachment as AttachmentComponent, AttachmentList} from '../src/AttachmentList';
+import {
+  Attachment as AttachmentComponent,
+  AttachmentList,
+  AttachmentPreview
+} from '../src/AttachmentList';
 import {categorizeArgTypes, getActionArgs} from '../../s2/stories/utils';
 import {Content} from '@react-spectrum/s2/Content';
-import FileTextIllustration from '../../s2/spectrum-illustrations/gradient/generic1/FileText';
-import FileVideo from '@react-spectrum/s2/illustrations/gradient/generic1/FileVideo';
-import FileZip from '@react-spectrum/s2/illustrations/gradient/generic1/FileZip';
-import {Image} from '@react-spectrum/s2/Image';
 import type {Meta, StoryObj} from '@storybook/react';
 import {style} from '@react-spectrum/s2/style' with {type: 'macro'};
 import {Text} from '@react-spectrum/s2/Text';
@@ -56,7 +56,8 @@ function AttachmentListRender(args) {
         isInvalid={isInvalid}
         size={size}
         aria-label="Demo file.pdf">
-        <Image
+        <AttachmentPreview
+          mimeType="application/pdf"
           slot="thumbnail"
           src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
         />
@@ -66,7 +67,8 @@ function AttachmentListRender(args) {
         isInvalid={isInvalid}
         size={size}
         aria-label="Alligator.pdf">
-        <Image
+        <AttachmentPreview
+          mimeType="application/pdf"
           slot="thumbnail"
           src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
         />
@@ -76,7 +78,8 @@ function AttachmentListRender(args) {
         isInvalid={isInvalid}
         size={size}
         aria-label="Rules.pdf">
-        <Image
+        <AttachmentPreview
+          mimeType="application/pdf"
           slot="thumbnail"
           src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
         />
@@ -86,7 +89,8 @@ function AttachmentListRender(args) {
         isInvalid={isInvalid}
         size={size}
         aria-label="Echidna.pdf">
-        <Image
+        <AttachmentPreview
+          mimeType="application/pdf"
           slot="thumbnail"
           src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
         />
@@ -112,14 +116,14 @@ function NonImageAttachmentListRender(args) {
         isInvalid={isInvalid}
         size={size}
         aria-label="report.pdf">
-        <FileTextIllustration slot="thumbnail" />
+        <AttachmentPreview mimeType="application/pdf" />
       </AttachmentComponent>
       <AttachmentComponent
         uploadProgress={uploadProgress}
         isInvalid={isInvalid}
         size={size}
         aria-label="notes.txt">
-        <FileTextIllustration slot="thumbnail" />
+        <AttachmentPreview mimeType="text/plain" />
         <Content>
           <Text slot="title">notes.txt</Text>
           <Text slot="description">Plain text document</Text>
@@ -130,7 +134,7 @@ function NonImageAttachmentListRender(args) {
         isInvalid={isInvalid}
         size={size}
         aria-label="data.csv">
-        <FileTextIllustration slot="thumbnail" />
+        <AttachmentPreview mimeType="text/csv" />
         <Content>
           <Text slot="title">data.csv</Text>
         </Content>
@@ -151,7 +155,8 @@ export const LongContents: Story = {
         size={args.size}
         styles={style({maxWidth: 300})}
         aria-label="Very long file name that exceeds the container width.pdf">
-        <Image
+        <AttachmentPreview
+          mimeType="application/pdf"
           slot="thumbnail"
           src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
         />
@@ -177,8 +182,9 @@ function MixedAttachments(args) {
           isInvalid={isInvalid}
           size={size}
           aria-label="banner.png">
-          <Image
+          <AttachmentPreview
             slot="thumbnail"
+            mimeType="image/png"
             src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
           />
         </AttachmentComponent>
@@ -187,21 +193,21 @@ function MixedAttachments(args) {
           isInvalid={isInvalid}
           size={size}
           aria-label="notes.tsx">
-          <FileTextIllustration slot="thumbnail" />
+          <AttachmentPreview mimeType="text/typescript" />
         </AttachmentComponent>
         <AttachmentComponent
           uploadProgress={uploadProgress}
           isInvalid={isInvalid}
           size={size}
           aria-label="video.mp4">
-          <FileVideo slot="thumbnail" />
+          <AttachmentPreview mimeType="video/mp4" />
         </AttachmentComponent>
         <AttachmentComponent
           uploadProgress={uploadProgress}
           isInvalid={isInvalid}
           size={size}
           aria-label="debug.zip">
-          <FileZip slot="thumbnail" />
+          <AttachmentPreview mimeType="application/zip" />
         </AttachmentComponent>
       </AttachmentList>
       <AttachmentList {...listArgs}>
@@ -210,8 +216,9 @@ function MixedAttachments(args) {
           isInvalid={isInvalid}
           size={size}
           aria-label="banner.png">
-          <Image
+          <AttachmentPreview
             slot="thumbnail"
+            mimeType="image/png"
             src={new URL('../../s2/stories/assets/placeholder.png', import.meta.url).toString()}
           />
           <Content>
@@ -224,7 +231,7 @@ function MixedAttachments(args) {
           isInvalid={isInvalid}
           size={size}
           aria-label="notes.txt">
-          <FileTextIllustration slot="thumbnail" />
+          <AttachmentPreview slot="thumbnail" mimeType="text/plain" />
           <Content>
             <Text slot="title">notes.txt</Text>
             <Text slot="description">Plain text</Text>
@@ -235,7 +242,7 @@ function MixedAttachments(args) {
           isInvalid={isInvalid}
           size={size}
           aria-label="video.mp4">
-          <FileVideo slot="thumbnail" />
+          <AttachmentPreview slot="thumbnail" mimeType="video/mp4" />
           <Content>
             <Text slot="title">video.mp4</Text>
             <Text slot="description">MP4</Text>
@@ -246,7 +253,7 @@ function MixedAttachments(args) {
           isInvalid={isInvalid}
           size={size}
           aria-label="debug.zip">
-          <FileZip slot="thumbnail" />
+          <AttachmentPreview slot="thumbnail" mimeType="application/zip" />
           <Content>
             <Text slot="title">debug.zip</Text>
             <Text slot="description">ZIP</Text>
diff --git a/packages/@react-spectrum/ai/stories/PromptField.stories.tsx b/packages/@react-spectrum/ai/stories/PromptField.stories.tsx
index e25515ab25a..edf4cc93d1c 100644
--- a/packages/@react-spectrum/ai/stories/PromptField.stories.tsx
+++ b/packages/@react-spectrum/ai/stories/PromptField.stories.tsx
@@ -11,7 +11,6 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionButton} from '@react-spectrum/s2/ActionButton';
 import {
   AttachFileMenuItem,
   CommandMenuItem,
@@ -29,9 +28,8 @@ import {
   PromptToken,
   PromptTokenField
 } from '../src/PromptField';
-import {Attachment} from '../src/AttachmentList';
+import {Attachment, AttachmentPreview} from '../src/AttachmentList';
 import Brand from '@react-spectrum/s2/icons/Brand';
-import {Button} from '@react-spectrum/s2/Button';
 import {categorizeArgTypes, getActionArgs} from '../../s2/stories/utils';
 import {CenterBaseline} from '@react-spectrum/s2/CenterBaseline';
 import {
@@ -41,7 +39,6 @@ import {
   Menu,
   MenuItem,
   MenuSection,
-  MenuTrigger,
   SubmenuTrigger,
   Text
 } from '@react-spectrum/s2/Menu';
@@ -50,17 +47,12 @@ import Data from '@react-spectrum/s2/icons/Data';
 import * as data from '../src/loader/data';
 import type {FocusableRefValue} from '@react-types/shared';
 import {iconStyle, style} from '@react-spectrum/s2/style' with {type: 'macro'};
-import {Image} from '@react-spectrum/s2/Image';
-import Keyboard from '@react-spectrum/s2/icons/Keyboard';
-import {LinkButton} from '@react-spectrum/s2/LinkButton';
 import LinkIcon from '@react-spectrum/s2/icons/Link';
-import ListMultiSelect from '@react-spectrum/s2/icons/ListMultiSelect';
 import {MessageSuggestion, MessageSuggestionList} from '../src/MessageSuggestion';
 import type {Meta, StoryObj} from '@storybook/react';
 import Plugin from '@react-spectrum/s2/icons/Plugin';
 import Prompt from '@react-spectrum/s2/icons/Prompt';
 import SocialNetwork from '@react-spectrum/s2/icons/SocialNetwork';
-import {ToggleButton} from '@react-spectrum/s2/ToggleButton';
 import {TokenFieldValue} from 'react-aria-components';
 import {TokenSegment} from 'react-stately';
 import {useRef, useState} from 'react';
@@ -292,37 +284,6 @@ function renderCompletions(filterValue: string, callbacks?: CompletionCallbacks)
   return null;
 }
 
-function ToolbarButtons() {
-  return (
-    <div className={style({display: 'flex', gap: 8})}>
-      <ToggleButton isQuiet size="S">
-        <ListMultiSelect />
-        <Text>Plan mode</Text>
-      </ToggleButton>
-      <MenuTrigger>
-        <ActionButton isQuiet size="S">
-          <Keyboard />
-          <Text>Normal</Text>
-        </ActionButton>
-        <Menu>
-          <MenuSection>
-            <Header>
-              <Heading>Transcript view</Heading>
-            </Header>
-            <MenuItem>Normal</MenuItem>
-          </MenuSection>
-        </Menu>
-      </MenuTrigger>
-      <Button size="S" fillStyle="outline">
-        Model
-      </Button>
-      <LinkButton size="S" fillStyle="outline" href="#">
-        Terms and conditions
-      </LinkButton>
-    </div>
-  );
-}
-
 interface UploadState {
   status: 'uploading' | 'completed';
   progress?: number;
@@ -483,7 +444,7 @@ function EverythingRender(args) {
           setAttachments([]);
           setAttachmentState(new Map());
         }}
-        acceptedAttachmentTypes={['image/*']}
+        acceptedAttachmentTypes={['*/*']}
         onAddAttachments={newAttachments => {
           setAttachmentState(prev => {
             let newState = new Map(prev);
@@ -511,12 +472,13 @@ function EverythingRender(args) {
               <Attachment
                 isInvalid={args.attachmentInvalid}
                 uploadProgress={state?.status === 'uploading' ? state?.progress : undefined}>
-                {/* TODO: what about non-image attachments? */}
-                {attachment.image && <Image src={attachment.image} slot="thumbnail" />}
+                <AttachmentPreview mimeType={attachment.file.type} src={attachment.image} />
                 {args.attachmentVariant === 'card' && (
                   <Content>
                     <Text slot="title">{attachment.file.name}</Text>
-                    <Text slot="description">{attachment.file.type}</Text>
+                    <Text slot="description">
+                      {attachment.file.type.split('/').pop()?.toUpperCase()}
+                    </Text>
                   </Content>
                 )}
               </Attachment>
@@ -640,7 +602,6 @@ function EverythingRender(args) {
                 </Menu>
               </SubmenuTrigger>
             </InsertMenuButton>
-            <ToolbarButtons />
           </div>
           {/* TODO is this kind of styling expected from the user? Or should we have a slot that places the mic button next to the submit button? */}
           <div style={{display: 'flex', gap: 8, alignItems: 'center'}}>
diff --git a/packages/@react-spectrum/ai/test/PromptField.test.tsx b/packages/@react-spectrum/ai/test/PromptField.test.tsx
index 6729af91ab9..4cbbb858ad2 100644
--- a/packages/@react-spectrum/ai/test/PromptField.test.tsx
+++ b/packages/@react-spectrum/ai/test/PromptField.test.tsx
@@ -440,7 +440,7 @@ describeOrSkip('PromptField', () => {
       let {container} = renderPromptField({attachments: [imageAttachment('a1')], invalid: true});
       expect(screen.getByLabelText('Attachments')).toBeInTheDocument();
       // The invalid state renders a decorative alert icon.
-      expect(container.querySelector('[aria-hidden="true"] svg')).toBeTruthy();
+      expect(container.querySelector('svg')).toBeTruthy();
     });
   });
 
diff --git a/packages/@react-spectrum/ai/test/utils/promptFieldTestUtils.tsx b/packages/@react-spectrum/ai/test/utils/promptFieldTestUtils.tsx
index fd0b7852fcb..b3414ef80b4 100644
--- a/packages/@react-spectrum/ai/test/utils/promptFieldTestUtils.tsx
+++ b/packages/@react-spectrum/ai/test/utils/promptFieldTestUtils.tsx
@@ -25,7 +25,7 @@ import {
   PromptToken,
   PromptTokenField
 } from '../../src/PromptField';
-import {Attachment} from '../../src/AttachmentList';
+import {Attachment, AttachmentPreview} from '../../src/AttachmentList';
 import {
   Collection,
   Header,
@@ -36,7 +36,6 @@ import {
   SubmenuTrigger,
   Text
 } from '@react-spectrum/s2/Menu';
-import {Image} from '@react-spectrum/s2/Image';
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React, {useEffect, useState} from 'react';
 import {TokenFieldValue} from 'react-aria-components';
@@ -257,7 +256,7 @@ function ControlledPromptField(props: ControlledPromptFieldProps) {
             textValue={attachment.file.name}
             isInvalid={invalid}
             uploadProgress={uploadProgress}>
-            {attachment.image && <Image src={attachment.image} slot="thumbnail" />}
+            {attachment.image && <AttachmentPreview mimeType="image/png" src={attachment.image} />}
           </Attachment>
         )}
       </PromptFieldAttachmentList>