diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 1eb8ae65e6c88..77b7544169b02 100755
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -2002,18 +2002,23 @@ const CONST = {
         VIDEO: /\.(mov|mp4)$/,
     },
 
-    FILE_VALIDATION_ERRORS: {
+    SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS: {
+        NO_FILE_PROVIDED: 'noFileProvided',
+        FILE_INVALID: 'fileInvalid',
         WRONG_FILE_TYPE: 'wrongFileType',
-        WRONG_FILE_TYPE_MULTIPLE: 'wrongFileTypeMultiple',
         FILE_TOO_LARGE: 'fileTooLarge',
-        FILE_TOO_LARGE_MULTIPLE: 'fileTooLargeMultiple',
         FILE_TOO_SMALL: 'fileTooSmall',
         FILE_CORRUPTED: 'fileCorrupted',
-        FOLDER_NOT_ALLOWED: 'folderNotAllowed',
-        MAX_FILE_LIMIT_EXCEEDED: 'fileLimitExceeded',
         PROTECTED_FILE: 'protectedFile',
     },
 
+    MULTIPLE_ATTACHMENT_FILES_VALIDATION_ERRORS: {
+        WRONG_FILE_TYPE: 'multipleAttachmentsWrongFileType',
+        FILE_TOO_LARGE: 'multipleAttachmentsFileTooLarge',
+        FOLDER_NOT_ALLOWED: 'multipleAttachmentsFolderNotAllowed',
+        MAX_FILE_LIMIT_EXCEEDED: 'multipleAttachmentsMaxFileLimitExceeded',
+    },
+
     IOS_CAMERA_ROLL_ACCESS_ERROR: 'Access to photo library was denied',
     ADD_PAYMENT_MENU_POSITION_Y: 226,
     ADD_PAYMENT_MENU_POSITION_X: 356,
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index f599663ad3e20..242f78fbb238e 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -476,16 +476,7 @@ const ROUTES = {
             return getUrlWithBackToParam(`${baseRoute}${queryString}` as const, backTo);
         },
     },
-    REPORT_AVATAR: {
-        route: 'r/:reportID/avatar',
-        getRoute: (reportID: string, policyID?: string) => {
-            if (policyID) {
-                return `r/${reportID}/avatar?policyID=${policyID}` as const;
-            }
-            return `r/${reportID}/avatar` as const;
-        },
-    },
-    ATTACHMENTS: {
+    REPORT_ATTACHMENTS: {
         route: 'attachment',
         getRoute: (params?: ReportAttachmentsRouteParams) => getAttachmentModalScreenRoute('attachment', params),
     },
@@ -495,6 +486,15 @@ const ROUTES = {
             return getAttachmentModalScreenRoute(`r/${reportID}/attachment/add`, params);
         },
     },
+    REPORT_AVATAR: {
+        route: 'r/:reportID/avatar',
+        getRoute: (reportID: string, policyID?: string) => {
+            if (policyID) {
+                return `r/${reportID}/avatar?policyID=${policyID}` as const;
+            }
+            return `r/${reportID}/avatar` as const;
+        },
+    },
     EDIT_CURRENCY_REQUEST: {
         route: 'r/:threadReportID/edit/currency',
         getRoute: (threadReportID: string, currency: string, backTo: string) => `r/${threadReportID}/edit/currency?currency=${currency}&backTo=${backTo}` as const,
@@ -3317,11 +3317,11 @@ const SHARED_ROUTE_PARAMS: Partial<Record<Screen, string[]>> = {
 export {PUBLIC_SCREENS_ROUTES, SHARED_ROUTE_PARAMS, VERIFY_ACCOUNT};
 export default ROUTES;
 
-type ReportAttachmentsRoute = typeof ROUTES.ATTACHMENTS.route;
+type ReportAttachmentsRoute = typeof ROUTES.REPORT_ATTACHMENTS.route;
 type ReportAddAttachmentRoute = `r/${string}/attachment/add`;
 type AttachmentRoutes = ReportAttachmentsRoute | ReportAddAttachmentRoute;
 
-type ReportAttachmentsRouteParams = RootNavigatorParamList[typeof SCREENS.ATTACHMENTS];
+type ReportAttachmentsRouteParams = RootNavigatorParamList[typeof SCREENS.REPORT_ATTACHMENTS];
 type ReportAddAttachmentRouteParams = RootNavigatorParamList[typeof SCREENS.REPORT_ADD_ATTACHMENT];
 
 function getAttachmentModalScreenRoute(url: AttachmentRoutes, params?: ReportAttachmentsRouteParams | ReportAddAttachmentRouteParams) {
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index 60e8139be4ebb..53ca71a02410f 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -7,7 +7,7 @@ import type DeepValueOf from './types/utils/DeepValueOf';
 const PROTECTED_SCREENS = {
     HOME: 'Home',
     CONCIERGE: 'Concierge',
-    ATTACHMENTS: 'Attachments',
+    REPORT_ATTACHMENTS: 'ReportAttachments',
     REPORT_ADD_ATTACHMENT: 'ReportAddAttachment',
     TRACK_EXPENSE: 'TrackExpense',
     SUBMIT_EXPENSE: 'SubmitExpense',
diff --git a/src/components/AttachmentModal.tsx b/src/components/AttachmentModal.tsx
deleted file mode 100644
index d7b50ee8e06b1..0000000000000
--- a/src/components/AttachmentModal.tsx
+++ /dev/null
@@ -1,607 +0,0 @@
-import React, {memo, useCallback, useEffect, useMemo, useRef, useState} from 'react';
-import {InteractionManager, Keyboard, View} from 'react-native';
-import {GestureHandlerRootView} from 'react-native-gesture-handler';
-import type {OnyxEntry} from 'react-native-onyx';
-import Animated, {FadeIn, LayoutAnimationConfig, useSharedValue} from 'react-native-reanimated';
-import type {ValueOf} from 'type-fest';
-import useLocalize from '@hooks/useLocalize';
-import useNetwork from '@hooks/useNetwork';
-import useOnyx from '@hooks/useOnyx';
-import useResponsiveLayout from '@hooks/useResponsiveLayout';
-import useThemeStyles from '@hooks/useThemeStyles';
-import addEncryptedAuthTokenToURL from '@libs/addEncryptedAuthTokenToURL';
-import attachmentModalHandler from '@libs/AttachmentModalHandler';
-import fileDownload from '@libs/fileDownload';
-import {getFileName} from '@libs/fileDownload/FileUtils';
-import Navigation from '@libs/Navigation/Navigation';
-import {getOriginalMessage, getReportAction, isMoneyRequestAction} from '@libs/ReportActionsUtils';
-import {hasEReceipt, hasMissingSmartscanFields, hasReceipt, hasReceiptSource, isReceiptBeingScanned} from '@libs/TransactionUtils';
-import type {AvatarSource} from '@libs/UserUtils';
-import variables from '@styles/variables';
-import {detachReceipt} from '@userActions/IOU';
-import type {IOUAction, IOUType} from '@src/CONST';
-import CONST from '@src/CONST';
-import type {TranslationPaths} from '@src/languages/types';
-import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
-import type * as OnyxTypes from '@src/types/onyx';
-import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import viewRef from '@src/types/utils/viewRef';
-import AttachmentCarousel from './Attachments/AttachmentCarousel';
-import AttachmentCarouselPagerContext from './Attachments/AttachmentCarousel/Pager/AttachmentCarouselPagerContext';
-import AttachmentView from './Attachments/AttachmentView';
-import useAttachmentErrors from './Attachments/AttachmentView/useAttachmentErrors';
-import type {Attachment} from './Attachments/types';
-import BlockingView from './BlockingViews/BlockingView';
-import Button from './Button';
-import ConfirmModal from './ConfirmModal';
-import FullScreenLoadingIndicator from './FullscreenLoadingIndicator';
-import HeaderGap from './HeaderGap';
-import HeaderWithBackButton from './HeaderWithBackButton';
-import * as Expensicons from './Icon/Expensicons';
-import * as Illustrations from './Icon/Illustrations';
-import Modal from './Modal';
-import SafeAreaConsumer from './SafeAreaConsumer';
-
-/**
- * Modal render prop component that exposes modal launching triggers that can be used
- * to display a full size image or PDF modally with optional confirmation button.
- */
-
-type ImagePickerResponse = {
-    height?: number;
-    name: string;
-    size?: number | null;
-    type: string;
-    uri: string;
-    width?: number;
-};
-
-type FileObject = Partial<File | ImagePickerResponse>;
-
-type ChildrenProps = {
-    show: () => void;
-};
-
-type AttachmentModalProps = {
-    /** Optional source (URL, SVG function) for the image shown. If not passed in via props must be specified when modal is opened. */
-    source?: AvatarSource;
-
-    /** The id of the attachment. */
-    attachmentID?: string;
-
-    /** Optional callback to fire when we want to preview an image and approve it for use. */
-    onConfirm?: ((file: FileObject) => void) | null;
-
-    /** Whether the modal should be open by default */
-    defaultOpen?: boolean;
-
-    /** Trigger when we explicity click close button in ProfileAttachment modal */
-    onModalClose?: () => void;
-
-    /** Optional original filename when uploading */
-    originalFileName?: string;
-
-    /** Whether source url requires authentication */
-    isAuthTokenRequired?: boolean;
-
-    /** Determines if download Button should be shown or not */
-    allowDownload?: boolean;
-
-    /** Determines if the receipt comes from track expense action */
-    isTrackExpenseAction?: boolean;
-
-    /** Title shown in the header of the modal */
-    headerTitle?: string;
-
-    /** The report that has this attachment */
-    report?: OnyxEntry<OnyxTypes.Report>;
-
-    /** The ID of the current report */
-    reportID?: string;
-
-    /** The type of the attachment */
-    type?: ValueOf<typeof CONST.ATTACHMENT_TYPE>;
-
-    /** If the attachment originates from a note, the accountID will represent the author of that note. */
-    accountID?: number;
-
-    /** Optional callback to fire when we want to do something after modal show. */
-    onModalShow?: () => void;
-
-    /** Optional callback to fire when we want to do something after modal hide. */
-    onModalHide?: () => void;
-
-    /** The data is loading or not */
-    isLoading?: boolean;
-
-    /** Should display not found page or not */
-    shouldShowNotFoundPage?: boolean;
-
-    /** Optional callback to fire when we want to do something after attachment carousel changes. */
-    onCarouselAttachmentChange?: (attachment: Attachment) => void;
-
-    /** Denotes whether it is a workspace avatar or not */
-    isWorkspaceAvatar?: boolean;
-
-    /** Denotes whether it can be an icon (ex: SVG) */
-    maybeIcon?: boolean;
-
-    /** Whether it is a receipt attachment or not */
-    isReceiptAttachment?: boolean;
-
-    /** A function as a child to pass modal launching methods to */
-    children?: React.FC<ChildrenProps>;
-
-    /** The iou action of the expense creation flow of which we are displaying the receipt for. */
-    iouAction?: IOUAction;
-
-    /** The iou type of the expense creation flow of which we are displaying the receipt for. */
-    iouType?: IOUType;
-
-    /** The id of the draft transaction linked to the receipt. */
-    draftTransactionID?: string;
-
-    fallbackSource?: AvatarSource;
-
-    canEditReceipt?: boolean;
-
-    canDeleteReceipt?: boolean;
-
-    shouldDisableSendButton?: boolean;
-
-    attachmentLink?: string;
-
-    shouldHandleNavigationBack?: boolean;
-};
-
-function AttachmentModal({
-    source = '',
-    onConfirm,
-    defaultOpen = false,
-    originalFileName = '',
-    isAuthTokenRequired = false,
-    allowDownload = false,
-    isTrackExpenseAction = false,
-    report,
-    reportID,
-    onModalShow = () => {},
-    onModalHide = () => {},
-    onCarouselAttachmentChange = () => {},
-    isReceiptAttachment = false,
-    isWorkspaceAvatar = false,
-    maybeIcon = false,
-    headerTitle,
-    children,
-    fallbackSource,
-    canEditReceipt = false,
-    canDeleteReceipt = false,
-    onModalClose = () => {},
-    isLoading = false,
-    shouldShowNotFoundPage = false,
-    type = undefined,
-    attachmentID,
-    accountID = undefined,
-    shouldDisableSendButton = false,
-    draftTransactionID,
-    iouAction,
-    iouType: iouTypeProp,
-    attachmentLink = '',
-    shouldHandleNavigationBack,
-}: AttachmentModalProps) {
-    const styles = useThemeStyles();
-    const [isModalOpen, setIsModalOpen] = useState(defaultOpen);
-    const [shouldLoadAttachment, setShouldLoadAttachment] = useState(false);
-    const [isAttachmentInvalid, setIsAttachmentInvalid] = useState(false);
-    const [isDeleteReceiptConfirmModalVisible, setIsDeleteReceiptConfirmModalVisible] = useState(false);
-    const [isAuthTokenRequiredState, setIsAuthTokenRequiredState] = useState(isAuthTokenRequired);
-    const [attachmentInvalidReasonTitle, setAttachmentInvalidReasonTitle] = useState<TranslationPaths | null>(null);
-    const [attachmentInvalidReason, setAttachmentInvalidReason] = useState<TranslationPaths | null>(null);
-    const [sourceState, setSourceState] = useState<AvatarSource>(() => source);
-    const [isConfirmButtonDisabled, setIsConfirmButtonDisabled] = useState(false);
-    const [isDownloadButtonReadyToBeShown, setIsDownloadButtonReadyToBeShown] = React.useState(true);
-    const isPDFLoadError = useRef(false);
-    const isReplaceReceipt = useRef(false);
-    const {shouldUseNarrowLayout} = useResponsiveLayout();
-    const nope = useSharedValue(false);
-    const isOverlayModalVisible = (isReceiptAttachment && isDeleteReceiptConfirmModalVisible) || (!isReceiptAttachment && isAttachmentInvalid);
-    const iouType = useMemo(() => iouTypeProp ?? (isTrackExpenseAction ? CONST.IOU.TYPE.TRACK : CONST.IOU.TYPE.SUBMIT), [isTrackExpenseAction, iouTypeProp]);
-    const parentReportAction = getReportAction(report?.parentReportID, report?.parentReportActionID);
-    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-    const transactionID = (isMoneyRequestAction(parentReportAction) && getOriginalMessage(parentReportAction)?.IOUTransactionID) || CONST.DEFAULT_NUMBER_ID;
-    const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {canBeMissing: true});
-    const [currentAttachmentLink, setCurrentAttachmentLink] = useState(attachmentLink);
-    const {setAttachmentError, isErrorInAttachment, clearAttachmentErrors} = useAttachmentErrors();
-
-    const [file, setFile] = useState<FileObject | undefined>(
-        originalFileName
-            ? {
-                  name: originalFileName,
-              }
-            : undefined,
-    );
-    const {translate} = useLocalize();
-    const {isOffline} = useNetwork();
-
-    const isLocalSource = typeof sourceState === 'string' && /^file:|^blob:/.test(sourceState);
-
-    useEffect(() => {
-        setFile(originalFileName ? {name: originalFileName} : undefined);
-    }, [originalFileName]);
-
-    /**
-     * Keeps the attachment source in sync with the attachment displayed currently in the carousel.
-     */
-    const onNavigate = useCallback(
-        (attachment: Attachment) => {
-            setSourceState(attachment.source);
-            setFile(attachment.file);
-            setIsAuthTokenRequiredState(attachment.isAuthTokenRequired ?? false);
-            onCarouselAttachmentChange(attachment);
-            setCurrentAttachmentLink(attachment?.attachmentLink ?? '');
-        },
-        [onCarouselAttachmentChange],
-    );
-
-    const setDownloadButtonVisibility = useCallback(
-        (isButtonVisible: boolean) => {
-            if (isDownloadButtonReadyToBeShown === isButtonVisible) {
-                return;
-            }
-            setIsDownloadButtonReadyToBeShown(isButtonVisible);
-        },
-        [isDownloadButtonReadyToBeShown],
-    );
-
-    /**
-     * Download the currently viewed attachment.
-     */
-    const downloadAttachment = useCallback(() => {
-        let sourceURL = sourceState;
-        if (isAuthTokenRequiredState && typeof sourceURL === 'string') {
-            sourceURL = addEncryptedAuthTokenToURL(sourceURL);
-        }
-
-        if (typeof sourceURL === 'string') {
-            const fileName = type === CONST.ATTACHMENT_TYPE.SEARCH ? getFileName(`${sourceURL}`) : file?.name;
-            fileDownload(sourceURL, fileName ?? '', undefined, undefined, undefined, undefined, undefined, !draftTransactionID);
-        }
-
-        // At ios, if the keyboard is open while opening the attachment, then after downloading
-        // the attachment keyboard will show up. So, to fix it we need to dismiss the keyboard.
-        Keyboard.dismiss();
-    }, [isAuthTokenRequiredState, sourceState, file, type, draftTransactionID]);
-
-    /**
-     * Execute the onConfirm callback and close the modal.
-     */
-    const submitAndClose = useCallback(() => {
-        // If the modal has already been closed or the confirm button is disabled
-        // do not submit.
-        if (!isModalOpen || isConfirmButtonDisabled) {
-            return;
-        }
-
-        if (onConfirm) {
-            onConfirm(Object.assign(file ?? {}, {source: sourceState} as FileObject));
-        }
-
-        setIsModalOpen(false);
-        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
-    }, [isModalOpen, isConfirmButtonDisabled, onConfirm, file, sourceState]);
-
-    /**
-     * Close the confirm modals.
-     */
-    const closeConfirmModal = useCallback(() => {
-        setIsAttachmentInvalid(false);
-        setIsDeleteReceiptConfirmModalVisible(false);
-    }, []);
-
-    /**
-     * Detach the receipt and close the modal.
-     */
-    const deleteAndCloseModal = useCallback(() => {
-        detachReceipt(transaction?.transactionID);
-        setIsDeleteReceiptConfirmModalVisible(false);
-        Navigation.goBack();
-    }, [transaction]);
-
-    /**
-     * Closes the modal.
-     * @param {boolean} [shouldCallDirectly] If true, directly calls `onModalClose`.
-     * This is useful when you plan to continue navigating to another page after closing the modal, to avoid freezing the app due to navigating to another page first and dismissing the modal later.
-     * If `shouldCallDirectly` is false or undefined, it calls `attachmentModalHandler.handleModalClose` to close the modal.
-     * This ensures smooth modal closing behavior without causing delays in closing.
-     */
-    const closeModal = useCallback(
-        (shouldCallDirectly?: boolean) => {
-            setIsModalOpen(false);
-
-            if (typeof onModalClose === 'function') {
-                if (shouldCallDirectly) {
-                    onModalClose();
-                    return;
-                }
-                attachmentModalHandler.handleModalClose(onModalClose);
-            }
-
-            // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
-        },
-        [onModalClose],
-    );
-
-    /**
-     *  open the modal
-     */
-    const openModal = useCallback(() => {
-        setIsModalOpen(true);
-    }, []);
-
-    useEffect(() => {
-        setSourceState(() => source);
-    }, [source]);
-
-    useEffect(() => {
-        setIsAuthTokenRequiredState(isAuthTokenRequired);
-    }, [isAuthTokenRequired]);
-
-    const sourceForAttachmentView = sourceState || source;
-
-    const threeDotsMenuItems = useMemo(() => {
-        if (!isReceiptAttachment) {
-            return [];
-        }
-
-        const menuItems = [];
-        if (canEditReceipt) {
-            // linter keep complain about accessing ref during render
-            // eslint-disable-next-line react-compiler/react-compiler
-            menuItems.push({
-                icon: Expensicons.Camera,
-                text: translate('common.replace'),
-                onSelected: () => {
-                    closeModal(true);
-                    // Set the ref to true, so when the modal is hidden, we will navigate to the scan receipt screen
-                    isReplaceReceipt.current = true;
-                },
-            });
-        }
-        if ((!isOffline && allowDownload && !isLocalSource) || !!draftTransactionID) {
-            menuItems.push({
-                icon: Expensicons.Download,
-                text: translate('common.download'),
-                onSelected: () => downloadAttachment(),
-            });
-        }
-
-        const hasOnlyEReceipt = hasEReceipt(transaction) && !hasReceiptSource(transaction);
-        if (!hasOnlyEReceipt && hasReceipt(transaction) && !isReceiptBeingScanned(transaction) && canDeleteReceipt && !hasMissingSmartscanFields(transaction)) {
-            menuItems.push({
-                icon: Expensicons.Trashcan,
-                text: translate('receipt.deleteReceipt'),
-                onSelected: () => {
-                    setIsDeleteReceiptConfirmModalVisible(true);
-                },
-                shouldCallAfterModalHide: true,
-            });
-        }
-        return menuItems;
-        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
-    }, [isReceiptAttachment, transaction, file, sourceState, iouType]);
-
-    const headerTitleNew = headerTitle ?? translate(isReceiptAttachment ? 'common.receipt' : 'common.attachment');
-    const shouldShowThreeDotsButton = isReceiptAttachment && isModalOpen && threeDotsMenuItems.length !== 0;
-    let shouldShowDownloadButton = false;
-    if ((!isEmptyObject(report) || type === CONST.ATTACHMENT_TYPE.SEARCH) && !isErrorInAttachment(sourceState)) {
-        shouldShowDownloadButton = allowDownload && isDownloadButtonReadyToBeShown && !shouldShowNotFoundPage && !isReceiptAttachment && !isOffline && !isLocalSource;
-    }
-    const context = useMemo(
-        () => ({
-            pagerItems: [{source: sourceForAttachmentView, index: 0, isActive: true}],
-            activePage: 0,
-            pagerRef: undefined,
-            isPagerScrolling: nope,
-            isScrollEnabled: nope,
-            onTap: () => {},
-            onScaleChanged: () => {},
-            onSwipeDown: closeModal,
-            onAttachmentError: setAttachmentError,
-        }),
-        [closeModal, setAttachmentError, nope, sourceForAttachmentView],
-    );
-
-    const submitRef = useRef<View | HTMLElement>(null);
-
-    return (
-        <>
-            <Modal
-                type={CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE}
-                onClose={isOverlayModalVisible ? closeConfirmModal : closeModal}
-                isVisible={isModalOpen}
-                onModalShow={() => {
-                    onModalShow();
-                    setShouldLoadAttachment(true);
-                }}
-                onModalHide={() => {
-                    if (!isPDFLoadError.current) {
-                        onModalHide();
-                    }
-                    setShouldLoadAttachment(false);
-                    clearAttachmentErrors();
-                    if (isPDFLoadError.current) {
-                        setIsAttachmentInvalid(true);
-                        setAttachmentInvalidReasonTitle('attachmentPicker.attachmentError');
-                        setAttachmentInvalidReason('attachmentPicker.errorWhileSelectingCorruptedAttachment');
-                        return;
-                    }
-
-                    if (isReplaceReceipt.current) {
-                        // eslint-disable-next-line deprecation/deprecation
-                        InteractionManager.runAfterInteractions(() => {
-                            Navigation.navigate(
-                                ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(
-                                    iouAction ?? CONST.IOU.ACTION.EDIT,
-                                    iouType,
-                                    draftTransactionID ?? transaction?.transactionID,
-                                    report?.reportID,
-                                    Navigation.getActiveRoute(),
-                                ),
-                            );
-                        });
-                    }
-                }}
-                initialFocus={() => {
-                    if (!submitRef.current) {
-                        return false;
-                    }
-                    return submitRef.current;
-                }}
-                shouldHandleNavigationBack={shouldHandleNavigationBack}
-            >
-                <GestureHandlerRootView style={styles.flex1}>
-                    {shouldUseNarrowLayout && <HeaderGap />}
-                    <HeaderWithBackButton
-                        shouldMinimizeMenuButton
-                        title={headerTitleNew}
-                        shouldShowBorderBottom
-                        shouldShowDownloadButton={shouldShowDownloadButton}
-                        onDownloadButtonPress={() => downloadAttachment()}
-                        shouldShowCloseButton={!shouldUseNarrowLayout}
-                        shouldShowBackButton={shouldUseNarrowLayout}
-                        onBackButtonPress={closeModal}
-                        onCloseButtonPress={closeModal}
-                        shouldShowThreeDotsButton={shouldShowThreeDotsButton}
-                        threeDotsAnchorAlignment={{
-                            horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
-                            vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
-                        }}
-                        shouldSetModalVisibility={false}
-                        threeDotsMenuItems={threeDotsMenuItems}
-                        shouldOverlayDots
-                        subTitleLink={currentAttachmentLink ?? ''}
-                        shouldDisplayHelpButton={false}
-                    />
-                    <View style={styles.imageModalImageCenterContainer}>
-                        {isLoading && <FullScreenLoadingIndicator testID="attachment-loading-spinner" />}
-                        {shouldShowNotFoundPage && !isLoading && (
-                            <BlockingView
-                                icon={Illustrations.ToddBehindCloud}
-                                iconWidth={variables.modalTopIconWidth}
-                                iconHeight={variables.modalTopIconHeight}
-                                title={translate('notFound.notHere')}
-                                subtitle={translate('notFound.pageNotFound')}
-                                linkTranslationKey="notFound.goBackHome"
-                                onLinkPress={() => Navigation.dismissModal()}
-                            />
-                        )}
-                        {!shouldShowNotFoundPage &&
-                            !isLoading &&
-                            // We shouldn't show carousel arrow in search result attachment
-                            (!isEmptyObject(report) && !isReceiptAttachment && type !== CONST.ATTACHMENT_TYPE.SEARCH ? (
-                                <AttachmentCarousel
-                                    accountID={accountID}
-                                    type={type}
-                                    attachmentID={attachmentID}
-                                    report={report}
-                                    onNavigate={onNavigate}
-                                    onSwipeDown={closeModal}
-                                    source={source}
-                                    setDownloadButtonVisibility={setDownloadButtonVisibility}
-                                    attachmentLink={currentAttachmentLink}
-                                    onAttachmentError={setAttachmentError}
-                                />
-                            ) : (
-                                !!sourceForAttachmentView &&
-                                shouldLoadAttachment && (
-                                    <AttachmentCarouselPagerContext.Provider value={context}>
-                                        <AttachmentView
-                                            containerStyles={[styles.mh5]}
-                                            source={sourceForAttachmentView}
-                                            isAuthTokenRequired={isAuthTokenRequiredState}
-                                            file={file}
-                                            onToggleKeyboard={setIsConfirmButtonDisabled}
-                                            onPDFLoadError={() => {
-                                                isPDFLoadError.current = true;
-                                                closeModal();
-                                            }}
-                                            isWorkspaceAvatar={isWorkspaceAvatar}
-                                            maybeIcon={maybeIcon}
-                                            fallbackSource={fallbackSource}
-                                            isUsedInAttachmentModal
-                                            transactionID={transaction?.transactionID}
-                                            isUploaded={!isEmptyObject(report)}
-                                            reportID={reportID ?? (!isEmptyObject(report) ? report.reportID : undefined)}
-                                        />
-                                    </AttachmentCarouselPagerContext.Provider>
-                                )
-                            ))}
-                    </View>
-                    {/* If we have an onConfirm method show a confirmation button */}
-                    <LayoutAnimationConfig skipEntering>
-                        {!!onConfirm && !isConfirmButtonDisabled && (
-                            <SafeAreaConsumer>
-                                {({safeAreaPaddingBottomStyle}) => (
-                                    <Animated.View
-                                        style={safeAreaPaddingBottomStyle}
-                                        entering={FadeIn}
-                                    >
-                                        <Button
-                                            ref={viewRef(submitRef)}
-                                            success
-                                            large
-                                            style={[styles.buttonConfirm, shouldUseNarrowLayout ? {} : styles.attachmentButtonBigScreen]}
-                                            textStyles={[styles.buttonConfirmText]}
-                                            text={translate('common.send')}
-                                            onPress={submitAndClose}
-                                            isDisabled={isConfirmButtonDisabled || shouldDisableSendButton}
-                                            pressOnEnter
-                                        />
-                                    </Animated.View>
-                                )}
-                            </SafeAreaConsumer>
-                        )}
-                    </LayoutAnimationConfig>
-                    {isReceiptAttachment && (
-                        <ConfirmModal
-                            title={translate('receipt.deleteReceipt')}
-                            isVisible={isDeleteReceiptConfirmModalVisible}
-                            onConfirm={deleteAndCloseModal}
-                            onCancel={closeConfirmModal}
-                            prompt={translate('receipt.deleteConfirmation')}
-                            confirmText={translate('common.delete')}
-                            cancelText={translate('common.cancel')}
-                            danger
-                        />
-                    )}
-                </GestureHandlerRootView>
-            </Modal>
-            {!isReceiptAttachment && (
-                <ConfirmModal
-                    title={attachmentInvalidReasonTitle ? translate(attachmentInvalidReasonTitle) : ''}
-                    onConfirm={closeConfirmModal}
-                    onCancel={closeConfirmModal}
-                    isVisible={isAttachmentInvalid}
-                    prompt={attachmentInvalidReason ? translate(attachmentInvalidReason) : ''}
-                    confirmText={translate('common.close')}
-                    shouldShowCancelButton={false}
-                    onModalHide={() => {
-                        if (!isPDFLoadError.current) {
-                            return;
-                        }
-                        isPDFLoadError.current = false;
-                        onModalHide?.();
-                    }}
-                />
-            )}
-
-            {children?.({show: openModal})}
-        </>
-    );
-}
-
-AttachmentModal.displayName = 'AttachmentModal';
-
-export default memo(AttachmentModal);
-
-export type {FileObject, ImagePickerResponse};
diff --git a/src/components/AvatarWithImagePicker.tsx b/src/components/AvatarWithImagePicker.tsx
index 4212aa602571d..4ee05759ae6d7 100644
--- a/src/components/AvatarWithImagePicker.tsx
+++ b/src/components/AvatarWithImagePicker.tsx
@@ -1,5 +1,5 @@
 import {useIsFocused} from '@react-navigation/native';
-import React, {useCallback, useEffect, useLayoutEffect, useRef, useState} from 'react';
+import React, {useCallback, useContext, useEffect, useLayoutEffect, useRef, useState} from 'react';
 import {View} from 'react-native';
 import type {StyleProp, ViewStyle} from 'react-native';
 import useLocalize from '@hooks/useLocalize';
@@ -8,13 +8,16 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {validateAvatarImage} from '@libs/AvatarUtils';
 import {isSafari} from '@libs/Browser';
 import type {CustomRNImageManipulatorResult} from '@libs/cropOrRotateImage/types';
+import Navigation from '@libs/Navigation/Navigation';
 import type {AvatarSource} from '@libs/UserUtils';
+import AttachmentModalContext from '@pages/media/AttachmentModalScreen/AttachmentModalContext';
 import type {FileObject} from '@pages/media/AttachmentModalScreen/types';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
 import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
 import type IconAsset from '@src/types/utils/IconAsset';
-import AttachmentModal from './AttachmentModal';
 import AttachmentPicker from './AttachmentPicker';
 import AvatarButtonWithIcon from './AvatarButtonWithIcon';
 import type {AvatarButtonWithIconProps} from './AvatarButtonWithIcon';
@@ -230,6 +233,17 @@ function AvatarWithImagePicker({
         [disabled, enablePreview, isUsingDefaultAvatar, onViewPhotoPress, showAvatarCropModal],
     );
 
+    const reportAttachmentsContext = useContext(AttachmentModalContext);
+    const showAttachmentModalScreen = useCallback(() => {
+        reportAttachmentsContext.setCurrentAttachment<typeof SCREENS.REPORT_ATTACHMENTS>({
+            source: previewSource,
+            fallbackSource: fallbackIcon,
+            headerTitle,
+            originalFileName,
+            maybeIcon: isUsingDefaultAvatar,
+        });
+        Navigation.navigate(ROUTES.REPORT_ATTACHMENTS.getRoute());
+    }, [fallbackIcon, headerTitle, isUsingDefaultAvatar, originalFileName, previewSource, reportAttachmentsContext]);
     useLayoutEffect(() => {
         if (!anchorRef.current || !isMenuVisible) {
             return;
@@ -241,87 +255,77 @@ function AvatarWithImagePicker({
     return (
         <View style={[styles.w100, style]}>
             <View style={styles.w100}>
-                <AttachmentModal
-                    headerTitle={headerTitle}
-                    source={previewSource}
-                    originalFileName={originalFileName}
-                    fallbackSource={fallbackIcon}
-                    maybeIcon={isUsingDefaultAvatar}
+                <AttachmentPicker
+                    type={CONST.ATTACHMENT_PICKER_TYPE.IMAGE}
+                    // We need to skip the validation in AttachmentPicker because it is handled in this component itself
+                    shouldValidateImage={false}
                 >
-                    {({show}) => (
-                        <AttachmentPicker
-                            type={CONST.ATTACHMENT_PICKER_TYPE.IMAGE}
-                            // We need to skip the validation in AttachmentPicker because it is handled in this component itself
-                            shouldValidateImage={false}
-                        >
-                            {({openPicker}) => {
-                                const menuItems = createMenuItems(openPicker);
-
-                                // If the current avatar isn't a default avatar and we are not overriding this behavior allow the "View Photo" option
-                                if (!shouldDisableViewPhoto && !isUsingDefaultAvatar) {
-                                    menuItems.push({
-                                        icon: Expensicons.Eye,
-                                        text: translate('avatarWithImagePicker.viewPhoto'),
-                                        onSelected: () => {
-                                            if (typeof onViewPhotoPress !== 'function') {
-                                                show();
-                                                return;
-                                            }
-                                            onViewPhotoPress();
-                                        },
-                                        shouldCallAfterModalHide: true,
-                                    });
-                                }
-
-                                return (
-                                    <>
-                                        <OfflineWithFeedback
-                                            errors={errors}
-                                            errorRowStyles={errorRowStyles}
-                                            onClose={onErrorClose}
-                                        >
-                                            <AvatarButtonWithIcon
-                                                text={translate('avatarWithImagePicker.editImage')}
-                                                source={source}
-                                                avatarID={avatarID}
-                                                onPress={() => onPressAvatar(openPicker)}
-                                                avatarStyle={avatarStyle}
-                                                pendingAction={pendingAction}
-                                                fallbackIcon={fallbackIcon}
-                                                anchorRef={anchorRef}
-                                                DefaultAvatar={DefaultAvatar}
-                                                editIcon={editIcon}
-                                                size={size}
-                                                type={type}
-                                                disabledStyle={disabledStyle}
-                                                editIconStyle={editIconStyle}
-                                            />
-                                        </OfflineWithFeedback>
-                                        <PopoverMenu
-                                            anchorPosition={popoverPosition}
-                                            isVisible={isMenuVisible}
-                                            onClose={() => setIsMenuVisible(false)}
-                                            onItemSelected={(item, index) => {
-                                                setIsMenuVisible(false);
-                                                // In order for the file picker to open dynamically, the click
-                                                // function must be called from within an event handler that was initiated
-                                                // by the user on Safari.
-                                                if (index === 0 && isSafari()) {
-                                                    openPicker({
-                                                        onPicked: (data) => showAvatarCropModal(data.at(0) ?? {}),
-                                                    });
-                                                }
-                                            }}
-                                            menuItems={menuItems}
-                                            anchorAlignment={anchorAlignment}
-                                            anchorRef={anchorRef}
-                                        />
-                                    </>
-                                );
-                            }}
-                        </AttachmentPicker>
-                    )}
-                </AttachmentModal>
+                    {({openPicker}) => {
+                        const menuItems = createMenuItems(openPicker);
+
+                        // If the current avatar isn't a default avatar and we are not overriding this behavior allow the "View Photo" option
+                        if (!shouldDisableViewPhoto && !isUsingDefaultAvatar) {
+                            menuItems.push({
+                                icon: Expensicons.Eye,
+                                text: translate('avatarWithImagePicker.viewPhoto'),
+                                onSelected: () => {
+                                    if (typeof onViewPhotoPress !== 'function') {
+                                        showAttachmentModalScreen();
+                                        return;
+                                    }
+                                    onViewPhotoPress();
+                                },
+                                shouldCallAfterModalHide: true,
+                            });
+                        }
+
+                        return (
+                            <>
+                                <OfflineWithFeedback
+                                    errors={errors}
+                                    errorRowStyles={errorRowStyles}
+                                    onClose={onErrorClose}
+                                >
+                                    <AvatarButtonWithIcon
+                                        text={translate('avatarWithImagePicker.editImage')}
+                                        source={source}
+                                        avatarID={avatarID}
+                                        onPress={() => onPressAvatar(openPicker)}
+                                        avatarStyle={avatarStyle}
+                                        pendingAction={pendingAction}
+                                        fallbackIcon={fallbackIcon}
+                                        anchorRef={anchorRef}
+                                        DefaultAvatar={DefaultAvatar}
+                                        editIcon={editIcon}
+                                        size={size}
+                                        type={type}
+                                        disabledStyle={disabledStyle}
+                                        editIconStyle={editIconStyle}
+                                    />
+                                </OfflineWithFeedback>
+                                <PopoverMenu
+                                    anchorPosition={popoverPosition}
+                                    isVisible={isMenuVisible}
+                                    onClose={() => setIsMenuVisible(false)}
+                                    onItemSelected={(item, index) => {
+                                        setIsMenuVisible(false);
+                                        // In order for the file picker to open dynamically, the click
+                                        // function must be called from within an event handler that was initiated
+                                        // by the user on Safari.
+                                        if (index === 0 && isSafari()) {
+                                            openPicker({
+                                                onPicked: (data) => showAvatarCropModal(data.at(0) ?? {}),
+                                            });
+                                        }
+                                    }}
+                                    menuItems={menuItems}
+                                    anchorAlignment={anchorAlignment}
+                                    anchorRef={anchorRef}
+                                />
+                            </>
+                        );
+                    }}
+                </AttachmentPicker>
             </View>
             {!!errorData.validationError && (
                 <DotIndicatorMessage
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.tsx
index 005465adbbbf9..45f9ed3dac3d4 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.tsx
@@ -104,7 +104,7 @@ function ImageRenderer({tnode}: CustomRendererProps<TBlock>) {
                                 }
 
                                 const attachmentLink = tnode.parent?.attributes?.href;
-                                const route = ROUTES.ATTACHMENTS?.getRoute({
+                                const route = ROUTES.REPORT_ATTACHMENTS?.getRoute({
                                     attachmentID,
                                     reportID,
                                     type,
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VideoRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VideoRenderer.tsx
index 4efb88bc4f918..eda39a37df217 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/VideoRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/VideoRenderer.tsx
@@ -46,7 +46,15 @@ function VideoRenderer({tnode, key}: VideoRendererProps) {
                                     return;
                                 }
                                 const isAuthTokenRequired = !!htmlAttribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE];
-                                const route = ROUTES.ATTACHMENTS.getRoute({attachmentID, reportID: report?.reportID, type, source: sourceURL, accountID, isAuthTokenRequired, hashKey});
+                                const route = ROUTES.REPORT_ATTACHMENTS.getRoute({
+                                    attachmentID,
+                                    reportID: report?.reportID,
+                                    type,
+                                    source: sourceURL,
+                                    accountID,
+                                    isAuthTokenRequired,
+                                    hashKey,
+                                });
                                 Navigation.navigate(route);
                             }}
                         />
diff --git a/src/components/VideoPlayerContexts/PlaybackContext/playbackContextReportIDUtils.ts b/src/components/VideoPlayerContexts/PlaybackContext/playbackContextReportIDUtils.ts
index 25cfd4b8f6a0f..b8fce5c618ab5 100644
--- a/src/components/VideoPlayerContexts/PlaybackContext/playbackContextReportIDUtils.ts
+++ b/src/components/VideoPlayerContexts/PlaybackContext/playbackContextReportIDUtils.ts
@@ -47,7 +47,7 @@ const getCurrentRouteReportID: (url: string) => string | ProtectedCurrentRouteRe
     return isFocusedRouteAChatThread ? firstReportThatHasURLInAttachments : focusedRouteReportID;
 };
 
-const screensWithReportID = [SCREENS.SEARCH.REPORT_RHP, SCREENS.REPORT, SCREENS.SEARCH.MONEY_REQUEST_REPORT, SCREENS.ATTACHMENTS];
+const screensWithReportID = [SCREENS.SEARCH.REPORT_RHP, SCREENS.REPORT, SCREENS.SEARCH.MONEY_REQUEST_REPORT, SCREENS.REPORT_ATTACHMENTS];
 
 function hasReportIdInRouteParams(route: SearchRoute): route is RouteWithReportIDInParams<SearchRoute> {
     return !!route && !!route.params && !!screensWithReportID.find((screen) => screen === route.name) && 'reportID' in route.params;
diff --git a/src/components/VideoPlayerPreview/index.tsx b/src/components/VideoPlayerPreview/index.tsx
index 6c6bd194d3e27..b4dd3fc4461ca 100644
--- a/src/components/VideoPlayerPreview/index.tsx
+++ b/src/components/VideoPlayerPreview/index.tsx
@@ -50,7 +50,7 @@ type VideoPlayerPreviewProps = {
     isDeleted?: boolean;
 };
 
-const isOnAttachmentRoute = () => Navigation.getActiveRouteWithoutParams() === `/${ROUTES.ATTACHMENTS.route}`;
+const isOnAttachmentRoute = () => Navigation.getActiveRouteWithoutParams() === `/${ROUTES.REPORT_ATTACHMENTS.route}`;
 
 function VideoPlayerPreview({videoUrl, thumbnailUrl, reportID, fileName, videoDimensions, videoDuration, onShowModalPress, isDeleted}: VideoPlayerPreviewProps) {
     const styles = useThemeStyles();
diff --git a/src/hooks/useCheckIfRouteHasRemainedUnchanged.ts b/src/hooks/useCheckIfRouteHasRemainedUnchanged.ts
index 22c1153c624d7..0c6c2bd5794ef 100644
--- a/src/hooks/useCheckIfRouteHasRemainedUnchanged.ts
+++ b/src/hooks/useCheckIfRouteHasRemainedUnchanged.ts
@@ -33,7 +33,7 @@ function useCheckIfRouteHasRemainedUnchanged(videoUrl: string) {
         // If on AttachmentModal, only play when the source parameters match videoUrl ensures correct play VideoPlayer share for this one
         const currentRoute = navigationRef.getCurrentRoute();
         if (
-            currentRoute?.name === SCREENS.ATTACHMENTS &&
+            currentRoute?.name === SCREENS.REPORT_ATTACHMENTS &&
             currentRoute?.params &&
             'source' in currentRoute.params &&
             currentRoute.params.source === videoUrl &&
@@ -57,7 +57,7 @@ function useCheckIfRouteHasRemainedUnchanged(videoUrl: string) {
             const route = navigationRef.getCurrentRoute();
             // If the app is launched with the attachment route, it will always remain on the report screen.
             // Thus, it can be considered as still being on the rendered route.
-            isOnInitialRenderedRouteRef.current = navigation.isFocused() || route?.name === SCREENS.ATTACHMENTS;
+            isOnInitialRenderedRouteRef.current = navigation.isFocused() || route?.name === SCREENS.REPORT_ATTACHMENTS;
         });
         // eslint-disable-next-line react-compiler/react-compiler
         // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -71,7 +71,7 @@ function useCheckIfRouteHasRemainedUnchanged(videoUrl: string) {
         const unsubscribeBlur = navigation.addListener('blur', () => {
             const route = navigationRef.getCurrentRoute();
 
-            if (route?.name === SCREENS.ATTACHMENTS) {
+            if (route?.name === SCREENS.REPORT_ATTACHMENTS) {
                 // Skip route update when attachment modal is opened
                 return;
             }
diff --git a/src/hooks/useFilesValidation.tsx b/src/hooks/useFilesValidation.tsx
index 9e08cec12e4d6..96d3142bb3b19 100644
--- a/src/hooks/useFilesValidation.tsx
+++ b/src/hooks/useFilesValidation.tsx
@@ -1,13 +1,12 @@
 import {Str} from 'expensify-common';
 import React, {useCallback, useRef, useState} from 'react';
 import {InteractionManager} from 'react-native';
-import type {ValueOf} from 'type-fest';
-import type {FileObject} from '@components/AttachmentModal';
 import ConfirmModal from '@components/ConfirmModal';
 import {useFullScreenLoader} from '@components/FullScreenLoaderContext';
 import PDFThumbnail from '@components/PDFThumbnail';
 import Text from '@components/Text';
 import TextLink from '@components/TextLink';
+import type {MultipleAttachmentsValidationError, SingleAttachmentValidationError} from '@libs/AttachmentValidation';
 import {
     getFileValidationErrorText,
     hasHeicOrHeifExtension,
@@ -18,12 +17,13 @@ import {
     validateImageForCorruption,
 } from '@libs/fileDownload/FileUtils';
 import convertHeicImage from '@libs/fileDownload/heicConverter';
+import type {FileObject} from '@pages/media/AttachmentModalScreen/types';
 import CONST from '@src/CONST';
 import useLocalize from './useLocalize';
 import useThemeStyles from './useThemeStyles';
 
 type ErrorObject = {
-    error: ValueOf<typeof CONST.FILE_VALIDATION_ERRORS>;
+    error: SingleAttachmentValidationError | MultipleAttachmentsValidationError;
     fileExtension?: string;
 };
 
@@ -35,7 +35,7 @@ function useFilesValidation(proceedWithFilesAction: (files: FileObject[], dataTr
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const [isErrorModalVisible, setIsErrorModalVisible] = useState(false);
-    const [fileError, setFileError] = useState<ValueOf<typeof CONST.FILE_VALIDATION_ERRORS> | null>(null);
+    const [fileError, setFileError] = useState<SingleAttachmentValidationError | MultipleAttachmentsValidationError>();
     const [pdfFilesToRender, setPdfFilesToRender] = useState<FileObject[]>([]);
     const [validFilesToUpload, setValidFilesToUpload] = useState([] as FileObject[]);
     const [isValidatingMultipleFiles, setIsValidatingMultipleFiles] = useState(false);
@@ -76,7 +76,7 @@ function useFilesValidation(proceedWithFilesAction: (files: FileObject[], dataTr
         setIsLoaderVisible(false);
         setValidFilesToUpload([]);
         setIsValidatingMultipleFiles(false);
-        setFileError(null);
+        setFileError(undefined);
         setInvalidFileExtension('');
         setErrorQueue([]);
         setCurrentErrorIndex(0);
@@ -96,7 +96,7 @@ function useFilesValidation(proceedWithFilesAction: (files: FileObject[], dataTr
         });
     }, [resetValidationState]);
 
-    const setErrorAndOpenModal = (error: ValueOf<typeof CONST.FILE_VALIDATION_ERRORS>) => {
+    const setErrorAndOpenModal = (error: SingleAttachmentValidationError | MultipleAttachmentsValidationError) => {
         setFileError(error);
         setIsErrorModalVisible(true);
     };
@@ -106,7 +106,7 @@ function useFilesValidation(proceedWithFilesAction: (files: FileObject[], dataTr
             const entry = item.webkitGetAsEntry();
 
             if (entry?.isDirectory) {
-                collectedErrors.current.push({error: CONST.FILE_VALIDATION_ERRORS.FOLDER_NOT_ALLOWED});
+                collectedErrors.current.push({error: CONST.MULTIPLE_ATTACHMENT_FILES_VALIDATION_ERRORS.FOLDER_NOT_ALLOWED});
                 return Promise.resolve(false);
             }
         }
@@ -118,7 +118,8 @@ function useFilesValidation(proceedWithFilesAction: (files: FileObject[], dataTr
                     if (error) {
                         const errorData = {
                             error,
-                            fileExtension: error === CONST.FILE_VALIDATION_ERRORS.WRONG_FILE_TYPE_MULTIPLE ? splitExtensionFromFileName(normalizedFile.name ?? '').fileExtension : undefined,
+                            fileExtension:
+                                error === CONST.MULTIPLE_ATTACHMENT_FILES_VALIDATION_ERRORS.WRONG_FILE_TYPE ? splitExtensionFromFileName(normalizedFile.name ?? '').fileExtension : undefined,
                         };
                         collectedErrors.current.push(errorData);
                         return false;
@@ -127,7 +128,7 @@ function useFilesValidation(proceedWithFilesAction: (files: FileObject[], dataTr
                 }),
             )
             .catch(() => {
-                collectedErrors.current.push({error: CONST.FILE_VALIDATION_ERRORS.FILE_CORRUPTED});
+                collectedErrors.current.push({error: CONST.SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS.FILE_CORRUPTED});
                 return false;
             });
     };
@@ -274,14 +275,14 @@ function useFilesValidation(proceedWithFilesAction: (files: FileObject[], dataTr
             if (items) {
                 dataTransferItemList.current = items.slice(0, CONST.API_ATTACHMENT_VALIDATIONS.MAX_FILE_LIMIT);
             }
-            setErrorAndOpenModal(CONST.FILE_VALIDATION_ERRORS.MAX_FILE_LIMIT_EXCEEDED);
+            setErrorAndOpenModal(CONST.MULTIPLE_ATTACHMENT_FILES_VALIDATION_ERRORS.MAX_FILE_LIMIT_EXCEEDED);
         } else {
             validateAndResizeFiles(files, items ?? []);
         }
     };
 
     const onConfirm = () => {
-        if (fileError === CONST.FILE_VALIDATION_ERRORS.MAX_FILE_LIMIT_EXCEEDED) {
+        if (fileError === CONST.MULTIPLE_ATTACHMENT_FILES_VALIDATION_ERRORS.MAX_FILE_LIMIT_EXCEEDED) {
             setIsErrorModalVisible(false);
             validateAndResizeFiles(filesToValidate.current, dataTransferItemList.current);
             return;
@@ -335,7 +336,7 @@ function useFilesValidation(proceedWithFilesAction: (files: FileObject[], dataTr
                   onPassword={() => {
                       validatedPDFs.current.push(file);
                       if (isValidatingReceipts) {
-                          collectedErrors.current.push({error: CONST.FILE_VALIDATION_ERRORS.PROTECTED_FILE});
+                          collectedErrors.current.push({error: CONST.SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS.PROTECTED_FILE});
                       } else {
                           validFiles.current.push(file);
                       }
@@ -343,7 +344,7 @@ function useFilesValidation(proceedWithFilesAction: (files: FileObject[], dataTr
                   }}
                   onLoadError={() => {
                       validatedPDFs.current.push(file);
-                      collectedErrors.current.push({error: CONST.FILE_VALIDATION_ERRORS.FILE_CORRUPTED});
+                      collectedErrors.current.push({error: CONST.SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS.FILE_CORRUPTED});
                       checkIfAllValidatedAndProceed();
                   }}
               />
@@ -355,7 +356,7 @@ function useFilesValidation(proceedWithFilesAction: (files: FileObject[], dataTr
             return '';
         }
         const prompt = getFileValidationErrorText(fileError, {fileType: invalidFileExtension}, isValidatingReceipts).reason;
-        if (fileError === CONST.FILE_VALIDATION_ERRORS.WRONG_FILE_TYPE_MULTIPLE || fileError === CONST.FILE_VALIDATION_ERRORS.WRONG_FILE_TYPE) {
+        if (fileError === CONST.MULTIPLE_ATTACHMENT_FILES_VALIDATION_ERRORS.WRONG_FILE_TYPE || fileError === CONST.SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS.WRONG_FILE_TYPE) {
             return (
                 <Text>
                     {prompt}
diff --git a/src/hooks/useSearchState.ts b/src/hooks/useSearchState.ts
index c9f0f55cadb6d..b5825e1c9880c 100644
--- a/src/hooks/useSearchState.ts
+++ b/src/hooks/useSearchState.ts
@@ -30,7 +30,7 @@ const useSearchState = (): SearchStateResult => {
             return {isOnSearch: false, hashKey: undefined};
         }
 
-        const isSearchAttachmentModal = route?.name === SCREENS.ATTACHMENTS && type === CONST.ATTACHMENT_TYPE.SEARCH;
+        const isSearchAttachmentModal = route?.name === SCREENS.REPORT_ATTACHMENTS && type === CONST.ATTACHMENT_TYPE.SEARCH;
         const queryJSON = q ? buildSearchQueryJSON(q) : ({} as Partial<SearchQueryJSON>);
         // for attachment modal the hashKey is passed through route params, fallback to it if not found in queryJSON
         const hashKey = queryJSON?.hash ? queryJSON.hash : (hashKeyFromRoute ?? undefined);
diff --git a/src/libs/AttachmentUtils.ts b/src/libs/AttachmentUtils.ts
deleted file mode 100644
index eea91499fa661..0000000000000
--- a/src/libs/AttachmentUtils.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import type {FileObject} from '@pages/media/AttachmentModalScreen/types';
-import CONST from '@src/CONST';
-import {cleanFileName, validateImageForCorruption} from './fileDownload/FileUtils';
-
-type AttachmentValidationError = CorruptionError | 'fileDoesNotExist' | 'fileInvalid';
-type ValidResult = {
-    isValid: true;
-    fileType: 'file' | 'uri';
-    source: string;
-    file: FileObject;
-};
-type InvalidResult = {
-    isValid: false;
-    error: AttachmentValidationError;
-};
-
-type AttachmentValidationResult = ValidResult | InvalidResult;
-
-function validateAttachmentFile(file: FileObject): Promise<AttachmentValidationResult> {
-    if (!file || !isDirectoryCheck(file)) {
-        return Promise.resolve({isValid: false, error: 'fileDoesNotExist'});
-    }
-
-    let fileObject = file;
-    if ('getAsFile' in file && typeof file.getAsFile === 'function') {
-        fileObject = file.getAsFile() as FileObject;
-    }
-    if (!fileObject) {
-        return Promise.resolve({isValid: false, error: 'fileInvalid'});
-    }
-
-    return isFileCorrupted(fileObject).then((corruptionResult) => {
-        if (!corruptionResult.isValid) {
-            return corruptionResult as InvalidResult;
-        }
-
-        if (fileObject instanceof File) {
-            /**
-             * Cleaning file name, done here so that it covers all cases:
-             * upload, drag and drop, copy-paste
-             */
-            let updatedFile = fileObject;
-            const cleanName = cleanFileName(updatedFile.name);
-            if (updatedFile.name !== cleanName) {
-                updatedFile = new File([updatedFile], cleanName, {type: updatedFile.type});
-            }
-            const inputSource = URL.createObjectURL(updatedFile);
-            updatedFile.uri = inputSource;
-
-            return {isValid: true, fileType: 'file', source: inputSource, file: updatedFile} as ValidResult;
-        }
-
-        return {isValid: true, fileType: 'uri', source: fileObject.uri, file: fileObject} as ValidResult;
-    });
-}
-
-type CorruptionError = 'tooLarge' | 'tooSmall' | 'error';
-type NoCorruptionResult = {
-    isValid: true;
-};
-type CorruptionResult = {
-    isValid: false;
-    error: CorruptionError;
-};
-type AttachmentCorruptionValidationResult = NoCorruptionResult | CorruptionResult;
-
-function isFileCorrupted(fileObject: FileObject): Promise<AttachmentCorruptionValidationResult> {
-    return validateImageForCorruption(fileObject)
-        .then(() => {
-            if (fileObject.size && fileObject.size > CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE) {
-                return {
-                    isValid: false,
-                    error: 'tooLarge',
-                } satisfies AttachmentCorruptionValidationResult;
-            }
-
-            if (fileObject.size && fileObject.size < CONST.API_ATTACHMENT_VALIDATIONS.MIN_SIZE) {
-                return {
-                    isValid: false,
-                    error: 'tooSmall',
-                } satisfies AttachmentCorruptionValidationResult;
-            }
-
-            return {
-                isValid: true,
-            } satisfies AttachmentCorruptionValidationResult;
-        })
-        .catch(() => {
-            return {
-                isValid: false,
-                error: 'error',
-            };
-        });
-}
-
-function isDirectoryCheck(data: FileObject) {
-    if ('webkitGetAsEntry' in data && (data as DataTransferItem).webkitGetAsEntry()?.isDirectory) {
-        return false;
-    }
-
-    return true;
-}
-
-export default validateAttachmentFile;
-export type {AttachmentValidationResult};
diff --git a/src/libs/AttachmentValidation.ts b/src/libs/AttachmentValidation.ts
new file mode 100644
index 0000000000000..d1aa53a384bde
--- /dev/null
+++ b/src/libs/AttachmentValidation.ts
@@ -0,0 +1,172 @@
+import type {ValueOf} from 'type-fest';
+import type {FileObject} from '@pages/media/AttachmentModalScreen/types';
+import CONST from '@src/CONST';
+import {cleanFileName, normalizeFileObject, validateImageForCorruption} from './fileDownload/FileUtils';
+
+type ValidatedFile = {
+    fileType: 'file' | 'uri';
+    source: string;
+    file: FileObject;
+};
+
+type SingleAttachmentValidResult = {
+    isValid: true;
+    validatedFile: ValidatedFile;
+};
+
+type SingleAttachmentValidationError = ValueOf<typeof CONST.SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS>;
+type SingleAttachmentInvalidResult = {
+    isValid: false;
+    error: SingleAttachmentValidationError;
+};
+
+type SingleAttachmentValidationResult = SingleAttachmentValidResult | SingleAttachmentInvalidResult;
+
+function isSingleAttachmentValidationResult(result: unknown): result is SingleAttachmentValidationResult {
+    return typeof result === 'object' && result !== null && 'isValid' in result && typeof result.isValid === 'boolean' && ('validatedFile' in result || 'error' in result);
+}
+
+function validateAttachmentFile(file: FileObject): Promise<SingleAttachmentValidationResult> {
+    if (!file) {
+        return Promise.resolve({isValid: false, error: CONST.SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS.NO_FILE_PROVIDED});
+    }
+
+    let fileObject = file;
+    if ('getAsFile' in file && typeof file.getAsFile === 'function') {
+        fileObject = file.getAsFile() as FileObject;
+    }
+    if (!fileObject) {
+        return Promise.resolve({isValid: false, error: CONST.SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS.FILE_INVALID});
+    }
+
+    return isFileCorrupted(fileObject).then((corruptionResult) => {
+        if (!corruptionResult.isValid) {
+            return corruptionResult;
+        }
+
+        let validatedFile: ValidatedFile;
+
+        if (fileObject instanceof File) {
+            /**
+             * Cleaning file name, done here so that it covers all cases:
+             * upload, drag and drop, copy-paste
+             */
+            let updatedFile = fileObject;
+            const cleanName = cleanFileName(updatedFile.name);
+            if (updatedFile.name !== cleanName) {
+                updatedFile = new File([updatedFile], cleanName, {type: updatedFile.type});
+            }
+            const inputSource = URL.createObjectURL(updatedFile);
+            updatedFile.uri = inputSource;
+
+            validatedFile = {
+                fileType: 'file',
+                source: inputSource,
+                file: updatedFile,
+            };
+
+            return {isValid: true, validatedFile};
+        }
+
+        validatedFile = {
+            fileType: 'uri',
+            source: fileObject.uri ?? '',
+            file: fileObject,
+        };
+
+        return {isValid: true, validatedFile};
+    });
+}
+
+type MultipleAttachmentsValidResult = {
+    isValid: true;
+    validatedFiles: ValidatedFile[];
+};
+
+type MultipleAttachmentsValidationError = ValueOf<typeof CONST.MULTIPLE_ATTACHMENT_FILES_VALIDATION_ERRORS>;
+type MultipleAttachmentsInvalidResult = {
+    isValid: false;
+    error: MultipleAttachmentsValidationError;
+    fileResults: SingleAttachmentValidationResult[];
+};
+type MultipleAttachmentsValidationResult = MultipleAttachmentsValidResult | MultipleAttachmentsInvalidResult;
+
+function isMultipleAttachmentsValidationResult(result: unknown): result is MultipleAttachmentsValidationResult {
+    return typeof result === 'object' && result !== null && 'isValid' in result && typeof result.isValid === 'boolean' && ('validatedFiles' in result || 'fileResults' in result);
+}
+
+function validateMultipleAttachmentFiles(files: FileObject[]): Promise<MultipleAttachmentsValidationResult> {
+    if (!files?.length || files.some((f) => isDirectory(f))) {
+        return Promise.resolve({isValid: false, error: CONST.MULTIPLE_ATTACHMENT_FILES_VALIDATION_ERRORS.FOLDER_NOT_ALLOWED, fileResults: []});
+    }
+
+    if (files.length > CONST.API_ATTACHMENT_VALIDATIONS.MAX_FILE_LIMIT) {
+        return Promise.resolve({isValid: false, error: CONST.MULTIPLE_ATTACHMENT_FILES_VALIDATION_ERRORS.MAX_FILE_LIMIT_EXCEEDED, fileResults: []});
+    }
+
+    return Promise.all(files.map((f) => validateAttachmentFile(f))).then((results) => {
+        if (results.every((result) => result.isValid)) {
+            return {
+                isValid: true,
+                validatedFiles: results.map((result) => result.validatedFile),
+            };
+        }
+
+        return {
+            isValid: false,
+            error: CONST.MULTIPLE_ATTACHMENT_FILES_VALIDATION_ERRORS.WRONG_FILE_TYPE,
+            fileResults: results,
+        };
+    });
+}
+
+function isFileCorrupted(fileObject: FileObject): Promise<SingleAttachmentValidationResult> {
+    return normalizeFileObject(fileObject).then((normalizedFile) => {
+        return validateImageForCorruption(normalizedFile)
+            .then(() => {
+                if (normalizedFile.size && normalizedFile.size > CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE) {
+                    return {
+                        isValid: false,
+                        error: CONST.SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS.FILE_TOO_LARGE,
+                    } as SingleAttachmentInvalidResult;
+                }
+
+                if (normalizedFile.size && normalizedFile.size < CONST.API_ATTACHMENT_VALIDATIONS.MIN_SIZE) {
+                    return {
+                        isValid: false,
+                        error: CONST.SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS.FILE_TOO_SMALL,
+                    } as SingleAttachmentInvalidResult;
+                }
+
+                return {
+                    isValid: true,
+                } as SingleAttachmentValidResult;
+            })
+            .catch(() => {
+                return {
+                    isValid: false,
+                    error: CONST.SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS.FILE_INVALID,
+                } as SingleAttachmentInvalidResult;
+            });
+    });
+}
+
+function isDirectory(data: FileObject) {
+    if ('webkitGetAsEntry' in data && (data as DataTransferItem).webkitGetAsEntry()?.isDirectory) {
+        return true;
+    }
+
+    return false;
+}
+
+export {validateAttachmentFile, validateMultipleAttachmentFiles, isSingleAttachmentValidationResult, isMultipleAttachmentsValidationResult};
+export type {
+    SingleAttachmentValidationResult,
+    SingleAttachmentValidResult,
+    SingleAttachmentInvalidResult,
+    SingleAttachmentValidationError,
+    MultipleAttachmentsValidationResult,
+    MultipleAttachmentsValidResult,
+    MultipleAttachmentsInvalidResult,
+    MultipleAttachmentsValidationError,
+};
diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.tsx b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
index 64b60bbe948ab..e727761688a51 100644
--- a/src/libs/Navigation/AppNavigator/AuthScreens.tsx
+++ b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
@@ -34,7 +34,6 @@ import NavBarManager from '@libs/NavBarManager';
 import getCurrentUrl from '@libs/Navigation/currentUrl';
 import Navigation from '@libs/Navigation/Navigation';
 import Animations, {InternalPlatformAnimations} from '@libs/Navigation/PlatformStackNavigation/navigationOptions/animation';
-import Presentation from '@libs/Navigation/PlatformStackNavigation/navigationOptions/presentation';
 import type {AuthScreensParamList} from '@libs/Navigation/types';
 import NetworkConnection from '@libs/NetworkConnection';
 import {shouldOnboardingRedirectToOldDot} from '@libs/OnboardingUtils';
@@ -84,10 +83,6 @@ const loadLogOutPreviousUserPage = () => require<ReactComponentModule>('../../..
 const loadConciergePage = () => require<ReactComponentModule>('../../../pages/ConciergePage').default;
 const loadTrackExpensePage = () => require<ReactComponentModule>('../../../pages/TrackExpensePage').default;
 const loadSubmitExpensePage = () => require<ReactComponentModule>('../../../pages/SubmitExpensePage').default;
-const loadProfileAvatar = () => require<ReactComponentModule>('../../../pages/settings/Profile/Avatar/ProfileAvatar').default;
-const loadWorkspaceAvatar = () => require<ReactComponentModule>('../../../pages/workspace/WorkspaceAvatar').default;
-const loadReportAvatar = () => require<ReactComponentModule>('../../../pages/ReportAvatar').default;
-const loadReceiptView = () => require<ReactComponentModule>('../../../pages/TransactionReceiptPage').default;
 const loadWorkspaceJoinUser = () => require<ReactComponentModule>('@pages/workspace/WorkspaceJoinUserPage').default;
 
 const loadReportSplitNavigator = () => require<ReactComponentModule>('./Navigators/ReportsSplitNavigator').default;
@@ -570,7 +565,13 @@ function AuthScreens() {
                     getComponent={loadSubmitExpensePage}
                 />
                 <RootStack.Screen
-                    name={SCREENS.ATTACHMENTS}
+                    name={SCREENS.REPORT_ATTACHMENTS}
+                    options={attachmentModalScreenOptions}
+                    getComponent={loadAttachmentModalScreen}
+                    listeners={modalScreenListeners}
+                />
+                <RootStack.Screen
+                    name={SCREENS.REPORT_ADD_ATTACHMENT}
                     options={attachmentModalScreenOptions}
                     getComponent={loadAttachmentModalScreen}
                     listeners={modalScreenListeners}
@@ -583,30 +584,20 @@ function AuthScreens() {
                 />
                 <RootStack.Screen
                     name={SCREENS.PROFILE_AVATAR}
-                    options={{
-                        headerShown: false,
-                        presentation: Presentation.TRANSPARENT_MODAL,
-                        animation: Animations.NONE,
-                    }}
-                    getComponent={loadProfileAvatar}
+                    options={attachmentModalScreenOptions}
+                    getComponent={loadAttachmentModalScreen}
                     listeners={modalScreenListeners}
                 />
                 <RootStack.Screen
                     name={SCREENS.WORKSPACE_AVATAR}
-                    options={{
-                        headerShown: false,
-                        presentation: Presentation.TRANSPARENT_MODAL,
-                    }}
-                    getComponent={loadWorkspaceAvatar}
+                    options={attachmentModalScreenOptions}
+                    getComponent={loadAttachmentModalScreen}
                     listeners={modalScreenListeners}
                 />
                 <RootStack.Screen
                     name={SCREENS.REPORT_AVATAR}
-                    options={{
-                        headerShown: false,
-                        presentation: Presentation.TRANSPARENT_MODAL,
-                    }}
-                    getComponent={loadReportAvatar}
+                    options={attachmentModalScreenOptions}
+                    getComponent={loadAttachmentModalScreen}
                     listeners={modalScreenListeners}
                 />
                 <RootStack.Screen
@@ -699,20 +690,14 @@ function AuthScreens() {
                 />
                 <RootStack.Screen
                     name={SCREENS.TRANSACTION_RECEIPT}
-                    options={{
-                        headerShown: false,
-                        presentation: Presentation.TRANSPARENT_MODAL,
-                    }}
-                    getComponent={loadReceiptView}
+                    options={attachmentModalScreenOptions}
+                    getComponent={loadAttachmentModalScreen}
                     listeners={modalScreenListeners}
                 />
                 <RootStack.Screen
                     name={SCREENS.MONEY_REQUEST.RECEIPT_PREVIEW}
-                    options={{
-                        headerShown: false,
-                        presentation: Presentation.TRANSPARENT_MODAL,
-                    }}
-                    getComponent={loadReceiptView}
+                    options={attachmentModalScreenOptions}
+                    getComponent={loadAttachmentModalScreen}
                     listeners={modalScreenListeners}
                 />
                 <RootStack.Screen
diff --git a/src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts b/src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts
index e20e00eadd8c4..3cdcf9fe2cf7f 100644
--- a/src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts
+++ b/src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts
@@ -19,7 +19,7 @@ const MODAL_ROUTES_TO_DISMISS: string[] = [
     NAVIGATORS.SHARE_MODAL_NAVIGATOR,
     NAVIGATORS.TEST_DRIVE_MODAL_NAVIGATOR,
     SCREENS.NOT_FOUND,
-    SCREENS.ATTACHMENTS,
+    SCREENS.REPORT_ATTACHMENTS,
     SCREENS.REPORT_ADD_ATTACHMENT,
     SCREENS.TRANSACTION_RECEIPT,
     SCREENS.MONEY_REQUEST.RECEIPT_PREVIEW,
diff --git a/src/libs/Navigation/helpers/linkTo/index.ts b/src/libs/Navigation/helpers/linkTo/index.ts
index c4b1e99d3d5f0..1649e9c7ab295 100644
--- a/src/libs/Navigation/helpers/linkTo/index.ts
+++ b/src/libs/Navigation/helpers/linkTo/index.ts
@@ -50,7 +50,7 @@ function shouldCheckFullScreenRouteMatching(action: StackNavigationAction): acti
 }
 
 function isNavigatingToAttachmentScreen(focusedRouteName?: string) {
-    return focusedRouteName === SCREENS.ATTACHMENTS;
+    return focusedRouteName === SCREENS.REPORT_ATTACHMENTS;
 }
 
 function isNavigatingToReportWithSameReportID(currentRoute: NavigationPartialRoute, newRoute: NavigationPartialRoute) {
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index 9b8379f54d969..190a5630309d1 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -24,7 +24,7 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
         [SCREENS.SIGN_IN_WITH_GOOGLE_DESKTOP]: ROUTES.GOOGLE_SIGN_IN,
         [SCREENS.SAML_SIGN_IN]: ROUTES.SAML_SIGN_IN,
         [SCREENS.DESKTOP_SIGN_IN_REDIRECT]: ROUTES.DESKTOP_SIGN_IN_REDIRECT,
-        [SCREENS.ATTACHMENTS]: ROUTES.ATTACHMENTS.route,
+        [SCREENS.REPORT_ATTACHMENTS]: ROUTES.REPORT_ATTACHMENTS.route,
         [SCREENS.REPORT_ADD_ATTACHMENT]: ROUTES.REPORT_ADD_ATTACHMENT.route,
         [SCREENS.PROFILE_AVATAR]: ROUTES.PROFILE_AVATAR.route,
         [SCREENS.WORKSPACE_AVATAR]: ROUTES.WORKSPACE_AVATAR.route,
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index 856d0e8957aac..3eb27e505d8d6 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -1917,7 +1917,7 @@ type ReportsSplitNavigatorParamList = {
         referrer?: string;
         backTo?: Routes;
     };
-    [SCREENS.ATTACHMENTS]: AttachmentModalScreensParamList[typeof SCREENS.ATTACHMENTS];
+    [SCREENS.REPORT_ATTACHMENTS]: AttachmentModalScreensParamList[typeof SCREENS.REPORT_ATTACHMENTS];
 };
 
 type SettingsSplitNavigatorParamList = {
@@ -2176,7 +2176,7 @@ type PublicScreensParamList = SharedScreensParamList & {
 };
 
 type AttachmentModalScreensParamList = {
-    [SCREENS.ATTACHMENTS]: AttachmentModalContainerModalProps & {
+    [SCREENS.REPORT_ATTACHMENTS]: AttachmentModalContainerModalProps & {
         source?: AvatarSource;
         reportID?: string;
         accountID?: number;
@@ -2219,6 +2219,8 @@ type AttachmentModalScreensParamList = {
     [SCREENS.REPORT_AVATAR]: AttachmentModalContainerModalProps & {
         reportID: string;
         policyID?: string;
+        onShow?: () => void;
+        onClose?: () => void;
     };
     [SCREENS.TRANSACTION_RECEIPT]: AttachmentModalContainerModalProps & {
         reportID: string;
@@ -2228,6 +2230,8 @@ type AttachmentModalScreensParamList = {
         action?: IOUAction;
         iouType?: IOUType;
         mergeTransactionID?: string;
+        onShow?: () => void;
+        onClose?: () => void;
     };
     [SCREENS.MONEY_REQUEST.RECEIPT_PREVIEW]: AttachmentModalContainerModalProps & {
         reportID: string;
diff --git a/src/libs/fileDownload/FileUtils.ts b/src/libs/fileDownload/FileUtils.ts
index 385df6d83297e..b695d547b88c9 100644
--- a/src/libs/fileDownload/FileUtils.ts
+++ b/src/libs/fileDownload/FileUtils.ts
@@ -3,7 +3,8 @@ import {Alert, Linking, Platform} from 'react-native';
 import type {ReactNativeBlobUtilReadStream} from 'react-native-blob-util';
 import ReactNativeBlobUtil from 'react-native-blob-util';
 import ImageSize from 'react-native-image-size';
-import type {TupleToUnion, ValueOf} from 'type-fest';
+import type {TupleToUnion} from 'type-fest';
+import type {MultipleAttachmentsValidationError, SingleAttachmentValidationError} from '@libs/AttachmentValidation';
 import DateUtils from '@libs/DateUtils';
 import getPlatform from '@libs/getPlatform';
 import {translateLocal} from '@libs/Localize';
@@ -551,15 +552,15 @@ const validateAttachment = (file: FileObject, isCheckingMultipleFiles?: boolean,
     const maxFileSize = isValidatingReceipt ? CONST.API_ATTACHMENT_VALIDATIONS.RECEIPT_MAX_SIZE : CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE;
 
     if (isValidatingReceipt && !isValidReceiptExtension(file)) {
-        return isCheckingMultipleFiles ? CONST.FILE_VALIDATION_ERRORS.WRONG_FILE_TYPE_MULTIPLE : CONST.FILE_VALIDATION_ERRORS.WRONG_FILE_TYPE;
+        return isCheckingMultipleFiles ? CONST.MULTIPLE_ATTACHMENT_FILES_VALIDATION_ERRORS.WRONG_FILE_TYPE : CONST.SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS.WRONG_FILE_TYPE;
     }
 
     if (!Str.isImage(file.name ?? '') && !hasHeicOrHeifExtension(file) && (file?.size ?? 0) > maxFileSize) {
-        return isCheckingMultipleFiles ? CONST.FILE_VALIDATION_ERRORS.FILE_TOO_LARGE_MULTIPLE : CONST.FILE_VALIDATION_ERRORS.FILE_TOO_LARGE;
+        return isCheckingMultipleFiles ? CONST.MULTIPLE_ATTACHMENT_FILES_VALIDATION_ERRORS.FILE_TOO_LARGE : CONST.SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS.FILE_TOO_LARGE;
     }
 
     if (isValidatingReceipt && (file?.size ?? 0) < CONST.API_ATTACHMENT_VALIDATIONS.MIN_SIZE) {
-        return CONST.FILE_VALIDATION_ERRORS.FILE_TOO_SMALL;
+        return CONST.SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS.FILE_TOO_SMALL;
     }
 
     return '';
@@ -572,7 +573,7 @@ type TranslationAdditionalData = {
 };
 
 const getFileValidationErrorText = (
-    validationError: ValueOf<typeof CONST.FILE_VALIDATION_ERRORS> | null,
+    validationError: SingleAttachmentValidationError | MultipleAttachmentsValidationError | undefined,
     additionalData: TranslationAdditionalData = {},
     isValidatingReceipt = false,
 ): {
@@ -587,17 +588,17 @@ const getFileValidationErrorText = (
     }
     const maxSize = isValidatingReceipt ? CONST.API_ATTACHMENT_VALIDATIONS.RECEIPT_MAX_SIZE : CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE;
     switch (validationError) {
-        case CONST.FILE_VALIDATION_ERRORS.WRONG_FILE_TYPE:
+        case CONST.SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS.WRONG_FILE_TYPE:
             return {
                 title: translateLocal('attachmentPicker.wrongFileType'),
                 reason: translateLocal('attachmentPicker.notAllowedExtension'),
             };
-        case CONST.FILE_VALIDATION_ERRORS.WRONG_FILE_TYPE_MULTIPLE:
+        case CONST.MULTIPLE_ATTACHMENT_FILES_VALIDATION_ERRORS.WRONG_FILE_TYPE:
             return {
                 title: translateLocal('attachmentPicker.someFilesCantBeUploaded'),
                 reason: translateLocal('attachmentPicker.unsupportedFileType', {fileType: additionalData.fileType ?? ''}),
             };
-        case CONST.FILE_VALIDATION_ERRORS.FILE_TOO_LARGE:
+        case CONST.SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS.FILE_TOO_LARGE:
             return {
                 title: translateLocal('attachmentPicker.attachmentTooLarge'),
                 reason: isValidatingReceipt
@@ -606,34 +607,34 @@ const getFileValidationErrorText = (
                       })
                     : translateLocal('attachmentPicker.sizeExceeded'),
             };
-        case CONST.FILE_VALIDATION_ERRORS.FILE_TOO_LARGE_MULTIPLE:
+        case CONST.MULTIPLE_ATTACHMENT_FILES_VALIDATION_ERRORS.FILE_TOO_LARGE:
             return {
                 title: translateLocal('attachmentPicker.someFilesCantBeUploaded'),
                 reason: translateLocal('attachmentPicker.sizeLimitExceeded', {
                     maxUploadSizeInMB: additionalData.maxUploadSizeInMB ?? maxSize / 1024 / 1024,
                 }),
             };
-        case CONST.FILE_VALIDATION_ERRORS.FILE_TOO_SMALL:
+        case CONST.SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS.FILE_TOO_SMALL:
             return {
                 title: translateLocal('attachmentPicker.attachmentTooSmall'),
                 reason: translateLocal('attachmentPicker.sizeNotMet'),
             };
-        case CONST.FILE_VALIDATION_ERRORS.FOLDER_NOT_ALLOWED:
+        case CONST.MULTIPLE_ATTACHMENT_FILES_VALIDATION_ERRORS.FOLDER_NOT_ALLOWED:
             return {
                 title: translateLocal('attachmentPicker.attachmentError'),
                 reason: translateLocal('attachmentPicker.folderNotAllowedMessage'),
             };
-        case CONST.FILE_VALIDATION_ERRORS.MAX_FILE_LIMIT_EXCEEDED:
+        case CONST.MULTIPLE_ATTACHMENT_FILES_VALIDATION_ERRORS.MAX_FILE_LIMIT_EXCEEDED:
             return {
                 title: translateLocal('attachmentPicker.someFilesCantBeUploaded'),
                 reason: translateLocal('attachmentPicker.maxFileLimitExceeded'),
             };
-        case CONST.FILE_VALIDATION_ERRORS.FILE_CORRUPTED:
+        case CONST.SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS.FILE_CORRUPTED:
             return {
                 title: translateLocal('attachmentPicker.attachmentError'),
                 reason: translateLocal('attachmentPicker.errorWhileSelectingCorruptedAttachment'),
             };
-        case CONST.FILE_VALIDATION_ERRORS.PROTECTED_FILE:
+        case CONST.SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS.PROTECTED_FILE:
             return {
                 title: translateLocal('attachmentPicker.attachmentError'),
                 reason: translateLocal('attachmentPicker.protectedPDFNotSupported'),
diff --git a/src/pages/ReportAvatar.tsx b/src/pages/ReportAvatar.tsx
deleted file mode 100644
index a2637549a1c49..0000000000000
--- a/src/pages/ReportAvatar.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import React, {useMemo} from 'react';
-import AttachmentModal from '@components/AttachmentModal';
-import useOnyx from '@hooks/useOnyx';
-import Navigation from '@libs/Navigation/Navigation';
-import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
-import type {AuthScreensParamList} from '@libs/Navigation/types';
-import {getDefaultGroupAvatar, getPolicyName, getReportName, getWorkspaceIcon, isGroupChat, isThread, isUserCreatedPolicyRoom} from '@libs/ReportUtils';
-import {getFullSizeAvatar} from '@libs/UserUtils';
-import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
-import type SCREENS from '@src/SCREENS';
-
-type ReportAvatarProps = PlatformStackScreenProps<AuthScreensParamList, typeof SCREENS.REPORT_AVATAR>;
-
-function ReportAvatar({route}: ReportAvatarProps) {
-    const {reportID, policyID} = route.params;
-    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {canBeMissing: false});
-    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {canBeMissing: true});
-    const [isLoadingApp = true] = useOnyx(ONYXKEYS.IS_LOADING_APP, {canBeMissing: true});
-
-    const attachment = useMemo(() => {
-        if (isGroupChat(report) && !isThread(report)) {
-            return {
-                source: report?.avatarUrl ? getFullSizeAvatar(report.avatarUrl, 0) : getDefaultGroupAvatar(report?.reportID),
-                headerTitle: getReportName(report),
-                isWorkspaceAvatar: false,
-            };
-        }
-        if (isUserCreatedPolicyRoom(report)) {
-            return {
-                source: report?.avatarUrl ? getFullSizeAvatar(report.avatarUrl, 0) : undefined,
-                headerTitle: getReportName(report),
-                isWorkspaceAvatar: false,
-            };
-        }
-
-        return {
-            source: getFullSizeAvatar(getWorkspaceIcon(report, policy).source, 0),
-            headerTitle: getPolicyName({report, policy}),
-            // In the case of default workspace avatar, originalFileName prop takes policyID as value to get the color of the avatar
-            originalFileName: policy?.originalFileName ?? policy?.id ?? report?.policyID,
-            isWorkspaceAvatar: true,
-        };
-    }, [report, policy]);
-
-    return (
-        <AttachmentModal
-            headerTitle={attachment.headerTitle}
-            defaultOpen
-            source={attachment.source}
-            onModalClose={() => {
-                Navigation.goBack(report?.reportID ? ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report?.reportID) : undefined);
-            }}
-            isWorkspaceAvatar={attachment.isWorkspaceAvatar}
-            maybeIcon
-            originalFileName={attachment.originalFileName}
-            shouldShowNotFoundPage={!report?.reportID && !isLoadingApp}
-            isLoading={(!report?.reportID || !policy?.id) && !!isLoadingApp}
-        />
-    );
-}
-
-ReportAvatar.displayName = 'ReportAvatar';
-export default ReportAvatar;
diff --git a/src/pages/Share/ShareDetailsPage.tsx b/src/pages/Share/ShareDetailsPage.tsx
index faa42e5705d55..1048cde005823 100644
--- a/src/pages/Share/ShareDetailsPage.tsx
+++ b/src/pages/Share/ShareDetailsPage.tsx
@@ -1,9 +1,8 @@
 import type {StackScreenProps} from '@react-navigation/stack';
 import reportsSelector from '@selectors/Attributes';
-import React, {useEffect, useMemo, useState} from 'react';
+import React, {useCallback, useContext, useEffect, useMemo, useState} from 'react';
 import {SafeAreaView, View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
-import AttachmentModal from '@components/AttachmentModal';
 import AttachmentPreview from '@components/AttachmentPreview';
 import Button from '@components/Button';
 import FixedFooter from '@components/FixedFooter';
@@ -28,6 +27,7 @@ import {getReportDisplayOption} from '@libs/OptionsListUtils';
 import {shouldValidateFile} from '@libs/ReceiptUtils';
 import {getReportOrDraftReport, isDraftReport} from '@libs/ReportUtils';
 import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
+import AttachmentModalContext from '@pages/media/AttachmentModalScreen/AttachmentModalContext';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -63,10 +63,21 @@ function ShareDetailsPage({
     const report: OnyxEntry<ReportType> = getReportOrDraftReport(reportOrAccountID);
     const displayReport = useMemo(() => getReportDisplayOption(report, unknownUserDetails, reportAttributesDerived), [report, unknownUserDetails, reportAttributesDerived]);
 
+    const originalFileName = currentAttachment?.content.split('/').pop();
     const fileSource = shouldUsePreValidatedFile ? (validatedFile?.uri ?? '') : (currentAttachment?.content ?? '');
     const validateFileName = shouldUsePreValidatedFile ? getFileName(validatedFile?.uri ?? CONST.ATTACHMENT_IMAGE_DEFAULT_NAME) : getFileName(currentAttachment?.content ?? '');
     const fileType = shouldUsePreValidatedFile ? (validatedFile?.type ?? CONST.SHARE_FILE_MIMETYPE.JPEG) : (currentAttachment?.mimeType ?? '');
 
+    const reportAttachmentsContext = useContext(AttachmentModalContext);
+    const showAttachmentModalScreen = useCallback(() => {
+        reportAttachmentsContext.setCurrentAttachment({headerTitle: originalFileName, originalFileName, fallbackSource: FallbackAvatar});
+        Navigation.navigate(
+            ROUTES.REPORT_ATTACHMENTS.getRoute({
+                source: currentAttachment?.content,
+            }),
+        );
+    }, [reportAttachmentsContext, originalFileName, currentAttachment]);
+
     useEffect(() => {
         if (!currentAttachment?.content || errorTitle) {
             return;
@@ -204,23 +215,14 @@ function ShareDetailsPage({
                                     <Text style={styles.textLabelSupporting}>{translate('common.attachment')}</Text>
                                 </View>
                                 <SafeAreaView>
-                                    <AttachmentModal
-                                        headerTitle={validateFileName}
-                                        source={fileSource}
-                                        originalFileName={validateFileName}
-                                        fallbackSource={FallbackAvatar}
-                                    >
-                                        {({show}) => (
-                                            <AttachmentPreview
-                                                source={fileSource ?? ''}
-                                                aspectRatio={currentAttachment?.aspectRatio}
-                                                onPress={show}
-                                                onLoadError={() => {
-                                                    showErrorAlert(translate('attachmentPicker.attachmentError'), translate('attachmentPicker.errorWhileSelectingCorruptedAttachment'));
-                                                }}
-                                            />
-                                        )}
-                                    </AttachmentModal>
+                                    <AttachmentPreview
+                                        source={fileSource ?? ''}
+                                        aspectRatio={currentAttachment?.aspectRatio}
+                                        onPress={showAttachmentModalScreen}
+                                        onLoadError={() => {
+                                            showErrorAlert(translate('attachmentPicker.attachmentError'), translate('attachmentPicker.errorWhileSelectingCorruptedAttachment'));
+                                        }}
+                                    />
                                 </SafeAreaView>
                             </>
                         )}
diff --git a/src/pages/TransactionReceiptPage.tsx b/src/pages/TransactionReceiptPage.tsx
deleted file mode 100644
index 9b757958ac382..0000000000000
--- a/src/pages/TransactionReceiptPage.tsx
+++ /dev/null
@@ -1,141 +0,0 @@
-import React, {useEffect} from 'react';
-import AttachmentModal from '@components/AttachmentModal';
-import useOnyx from '@hooks/useOnyx';
-import {navigateToStartStepIfScanFileCannotBeRead} from '@libs/actions/IOU';
-import {openReport} from '@libs/actions/Report';
-import getReceiptFilenameFromTransaction from '@libs/getReceiptFilenameFromTransaction';
-import {getReceiptFileName} from '@libs/MergeTransactionUtils';
-import Navigation from '@libs/Navigation/Navigation';
-import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
-import type {AuthScreensParamList} from '@libs/Navigation/types';
-import {getThumbnailAndImageURIs} from '@libs/ReceiptUtils';
-import {getReportAction, isTrackExpenseAction as isTrackExpenseReportReportActionsUtils} from '@libs/ReportActionsUtils';
-import {canEditFieldOfMoneyRequest, isMoneyRequestReport, isTrackExpenseReport as isTrackExpenseReportReportUtils} from '@libs/ReportUtils';
-import {getRequestType, hasEReceipt, hasReceiptSource} from '@libs/TransactionUtils';
-import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
-import type SCREENS from '@src/SCREENS';
-
-type TransactionReceiptProps = PlatformStackScreenProps<AuthScreensParamList, typeof SCREENS.TRANSACTION_RECEIPT | typeof SCREENS.MONEY_REQUEST.RECEIPT_PREVIEW>;
-
-function TransactionReceipt({route}: TransactionReceiptProps) {
-    const reportID = route.params.reportID;
-    const transactionID = route.params.transactionID;
-    const action = 'action' in route.params ? route.params.action : undefined;
-    const iouType = 'iouType' in route.params ? route.params.iouType : undefined;
-    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {canBeMissing: true});
-    const [transactionMain] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {canBeMissing: true});
-    const [transactionDraft] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {canBeMissing: true});
-    const [reportMetadata = CONST.DEFAULT_REPORT_METADATA] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, {canBeMissing: true});
-
-    const mergeTransactionID = 'mergeTransactionID' in route.params ? route.params.mergeTransactionID : undefined;
-    const isFromReviewDuplicates = 'isFromReviewDuplicates' in route.params ? route.params.isFromReviewDuplicates === 'true' : undefined;
-    const [mergeTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.MERGE_TRANSACTION}${mergeTransactionID}`, {canBeMissing: true});
-
-    const isDraftTransaction = !!action;
-
-    // Determine which transaction to use based on the scenario
-    let transaction;
-    if (isDraftTransaction) {
-        transaction = transactionDraft;
-    } else if (mergeTransactionID && mergeTransaction && transactionMain) {
-        // If we have a merge transaction, we need to use the receipt from the merge transaction
-        transaction = {
-            ...transactionMain,
-            receipt: mergeTransaction.receipt,
-            filename: getReceiptFileName(mergeTransaction.receipt),
-        };
-    } else {
-        transaction = transactionMain;
-    }
-    const receiptURIs = getThumbnailAndImageURIs(transaction);
-    const isLocalFile = receiptURIs.isLocalFile;
-    const readonly = route.params.readonly === 'true';
-    const imageSource = isDraftTransaction ? transactionDraft?.receipt?.source : tryResolveUrlFromApiRoot(receiptURIs.image ?? '');
-
-    const parentReportAction = getReportAction(report?.parentReportID, report?.parentReportActionID);
-    const canEditReceipt = canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.RECEIPT);
-    const canDeleteReceipt = canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.RECEIPT, true);
-    const isEReceipt = transaction && !hasReceiptSource(transaction) && hasEReceipt(transaction);
-    const isTrackExpenseAction = isTrackExpenseReportReportActionsUtils(parentReportAction);
-
-    useEffect(() => {
-        if ((!!report && !!transaction) || isDraftTransaction) {
-            return;
-        }
-        openReport(reportID);
-        // I'm disabling the warning, as it expects to use exhaustive deps, even though we want this useEffect to run only on the first render.
-        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
-    }, []);
-
-    const receiptPath = transaction?.receipt?.source;
-
-    useEffect(() => {
-        if (!isDraftTransaction || !iouType || !transaction) {
-            return;
-        }
-
-        const requestType = getRequestType(transaction);
-        const receiptFilename = getReceiptFilenameFromTransaction(transaction);
-        const receiptType = transaction?.receipt?.type;
-        navigateToStartStepIfScanFileCannotBeRead(
-            receiptFilename,
-            receiptPath,
-            () => {},
-            requestType,
-            iouType,
-            transactionID,
-            reportID,
-            receiptType,
-            () =>
-                Navigation.goBack(
-                    ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(
-                        CONST.IOU.ACTION.CREATE,
-                        iouType,
-                        transactionID,
-                        reportID,
-                        ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(action, iouType, transactionID, reportID),
-                    ),
-                ),
-        );
-
-        // eslint-disable-next-line react-compiler/react-compiler
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [receiptPath]);
-
-    const moneyRequestReportID = isMoneyRequestReport(report) ? report?.reportID : report?.parentReportID;
-    const isTrackExpenseReport = isTrackExpenseReportReportUtils(report);
-
-    // eslint-disable-next-line rulesdir/no-negated-variables
-    const shouldShowNotFoundPage =
-        isTrackExpenseReport || isDraftTransaction || transaction?.reportID === CONST.REPORT.SPLIT_REPORT_ID || isFromReviewDuplicates
-            ? !transaction
-            : moneyRequestReportID !== transaction?.reportID;
-
-    return (
-        <AttachmentModal
-            source={imageSource}
-            isAuthTokenRequired={!isLocalFile && !isDraftTransaction}
-            report={report}
-            isReceiptAttachment
-            canEditReceipt={((canEditReceipt && !readonly) || isDraftTransaction) && !transaction?.receipt?.isTestDriveReceipt}
-            canDeleteReceipt={canDeleteReceipt && !readonly && !isDraftTransaction && !transaction?.receipt?.isTestDriveReceipt}
-            allowDownload={!isEReceipt}
-            isTrackExpenseAction={isTrackExpenseAction}
-            originalFileName={isDraftTransaction ? getReceiptFilenameFromTransaction(transaction) : receiptURIs?.filename}
-            defaultOpen
-            iouAction={action}
-            iouType={iouType}
-            draftTransactionID={isDraftTransaction ? transactionID : undefined}
-            onModalClose={Navigation.dismissModal}
-            isLoading={!transaction && reportMetadata?.isLoadingInitialReportActions}
-            shouldShowNotFoundPage={shouldShowNotFoundPage}
-        />
-    );
-}
-
-TransactionReceipt.displayName = 'TransactionReceipt';
-
-export default TransactionReceipt;
diff --git a/src/pages/media/AttachmentModalScreen/AttachmentModalBaseContent/index.tsx b/src/pages/media/AttachmentModalScreen/AttachmentModalBaseContent/index.tsx
index 7dc066948e6da..711a3d7630cc0 100644
--- a/src/pages/media/AttachmentModalScreen/AttachmentModalBaseContent/index.tsx
+++ b/src/pages/media/AttachmentModalScreen/AttachmentModalBaseContent/index.tsx
@@ -86,7 +86,7 @@ function AttachmentModalBaseContent({
     const [currentAttachmentLink, setCurrentAttachmentLink] = useState(attachmentLink);
 
     const fallbackFile = useMemo(() => (originalFileName ? {name: originalFileName} : undefined), [originalFileName]);
-    const [files, setFilesInternal] = useState<FileObject | FileObject[] | undefined>();
+    const [files, setFilesInternal] = useState<FileObject | FileObject[] | undefined>(() => filesProp ?? fallbackFile);
     const [isMultipleFiles, setIsMultipleFiles] = useState<boolean>(() => Array.isArray(files));
     const fileToDisplay = useMemo(() => {
         if (isMultipleFiles) {
@@ -106,10 +106,6 @@ function AttachmentModalBaseContent({
     }, []);
 
     useEffect(() => {
-        if (!filesProp) {
-            return;
-        }
-
         setFile(filesProp ?? fallbackFile);
     }, [filesProp, fallbackFile, setFile]);
 
diff --git a/src/pages/media/AttachmentModalScreen/AttachmentModalBaseContent/types.ts b/src/pages/media/AttachmentModalScreen/AttachmentModalBaseContent/types.ts
index a2d39adbd3737..3697940eb96c1 100644
--- a/src/pages/media/AttachmentModalScreen/AttachmentModalBaseContent/types.ts
+++ b/src/pages/media/AttachmentModalScreen/AttachmentModalBaseContent/types.ts
@@ -18,11 +18,10 @@ type AttachmentModalContentData = {
     file: FileObject | undefined;
 };
 
-type ThreeDotsMenuItemGeneratorProps = AttachmentModalContentData & {
+type ThreeDotsMenuItemFactoryProps = AttachmentModalContentData & {
     isLocalSource: boolean;
 };
-
-type ThreeDotsMenuItemGenerator = (props: ThreeDotsMenuItemGeneratorProps) => PopoverMenuItem[];
+type ThreeDotsMenuItemFactory = (props: ThreeDotsMenuItemFactoryProps) => PopoverMenuItem[];
 
 type DownloadAttachmentCallback = (props: AttachmentModalContentData) => void;
 
@@ -58,7 +57,7 @@ type AttachmentModalBaseContentProps = {
     headerTitle?: string;
 
     /** The menu items for the three dots button */
-    threeDotsMenuItems?: PopoverMenuItem[] | ThreeDotsMenuItemGenerator;
+    threeDotsMenuItems?: PopoverMenuItem[] | ThreeDotsMenuItemFactory;
 
     /** The report that has this attachment */
     report?: OnyxEntry<OnyxTypes.Report>;
@@ -123,6 +122,6 @@ export type {
     DownloadAttachmentCallback,
     AttachmentContent,
     AttachmentContentProps,
-    ThreeDotsMenuItemGenerator,
-    ThreeDotsMenuItemGeneratorProps,
+    ThreeDotsMenuItemFactoryProps,
+    ThreeDotsMenuItemFactory,
 };
diff --git a/src/pages/media/AttachmentModalScreen/AttachmentModalContainer/index.tsx b/src/pages/media/AttachmentModalScreen/AttachmentModalContainer/index.tsx
index 30a0991123f6c..e666f4c8d4084 100644
--- a/src/pages/media/AttachmentModalScreen/AttachmentModalContainer/index.tsx
+++ b/src/pages/media/AttachmentModalScreen/AttachmentModalContainer/index.tsx
@@ -4,8 +4,8 @@ import Navigation from '@libs/Navigation/Navigation';
 import AttachmentModalBaseContent from '@pages/media/AttachmentModalScreen/AttachmentModalBaseContent';
 import AttachmentStateContextProvider from '@pages/media/AttachmentModalScreen/AttachmentModalBaseContent/AttachmentStateContextProvider';
 import AttachmentModalContext from '@pages/media/AttachmentModalScreen/AttachmentModalContext';
-import type {AttachmentModalScreenType} from '@pages/media/AttachmentModalScreen/types';
 import CONST from '@src/CONST';
+import type {AttachmentModalScreenType} from '..';
 import type AttachmentModalContainerProps from './types';
 
 function AttachmentModalContainer<Screen extends AttachmentModalScreenType>({
diff --git a/src/pages/media/AttachmentModalScreen/AttachmentModalContainer/types.ts b/src/pages/media/AttachmentModalScreen/AttachmentModalContainer/types.ts
index d56988be8895f..806004d730424 100644
--- a/src/pages/media/AttachmentModalScreen/AttachmentModalContainer/types.ts
+++ b/src/pages/media/AttachmentModalScreen/AttachmentModalContainer/types.ts
@@ -1,5 +1,6 @@
 import type {AttachmentModalBaseContentProps} from '@pages/media/AttachmentModalScreen/AttachmentModalBaseContent/types';
-import type {AttachmentModalContainerModalProps, AttachmentModalScreenProps, AttachmentModalScreenType} from '@pages/media/AttachmentModalScreen/types';
+import type {AttachmentModalContainerModalProps, AttachmentModalScreenProps} from '@pages/media/AttachmentModalScreen/types';
+import type {AttachmentModalScreenType} from '..';
 
 type AttachmentModalContainerProps<Screen extends AttachmentModalScreenType> = AttachmentModalContainerModalProps & {
     navigation: AttachmentModalScreenProps<Screen>['navigation'];
diff --git a/src/pages/media/AttachmentModalScreen/index.tsx b/src/pages/media/AttachmentModalScreen/index.tsx
index 749260326f9ab..db9de2e6996e7 100644
--- a/src/pages/media/AttachmentModalScreen/index.tsx
+++ b/src/pages/media/AttachmentModalScreen/index.tsx
@@ -27,11 +27,11 @@ function AttachmentModalScreen<Screen extends AttachmentModalScreenType>({route,
         return route;
     }, [attachmentsContext, route]);
 
-    if (route.name === SCREENS.ATTACHMENTS) {
+    if (route.name === SCREENS.REPORT_ATTACHMENTS) {
         return (
             <ReportAttachmentModalContent
-                route={routeWithContext as RouteType<typeof SCREENS.ATTACHMENTS>}
-                navigation={navigation as NavigationType<typeof SCREENS.ATTACHMENTS>}
+                route={routeWithContext as RouteType<typeof SCREENS.REPORT_ATTACHMENTS>}
+                navigation={navigation as NavigationType<typeof SCREENS.REPORT_ATTACHMENTS>}
             />
         );
     }
@@ -87,3 +87,4 @@ function AttachmentModalScreen<Screen extends AttachmentModalScreenType>({route,
 AttachmentModalScreen.displayName = 'AttachmentModalScreen';
 
 export default AttachmentModalScreen;
+export type {AttachmentModalScreenType};
diff --git a/src/pages/media/AttachmentModalScreen/routes/ProfileAvatarModalContent.tsx b/src/pages/media/AttachmentModalScreen/routes/ProfileAvatarModalContent.tsx
index a9ae08607976d..7c1945915ede5 100644
--- a/src/pages/media/AttachmentModalScreen/routes/ProfileAvatarModalContent.tsx
+++ b/src/pages/media/AttachmentModalScreen/routes/ProfileAvatarModalContent.tsx
@@ -11,6 +11,7 @@ import type {AttachmentModalScreenProps} from '@pages/media/AttachmentModalScree
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
+import useDownloadAttachment from './hooks/useDownloadAttachment';
 
 function ProfileAvatarModalContent({navigation, route}: AttachmentModalScreenProps<typeof SCREENS.PROFILE_AVATAR>) {
     const {accountID = CONST.DEFAULT_NUMBER_ID} = route.params;
@@ -21,23 +22,27 @@ function ProfileAvatarModalContent({navigation, route}: AttachmentModalScreenPro
     const avatarURL = personalDetail?.avatar ?? '';
     const displayName = getDisplayNameOrDefault(personalDetail);
     const [isLoadingApp = true] = useOnyx(ONYXKEYS.IS_LOADING_APP, {canBeMissing: true});
+
     useEffect(() => {
-        if (!isValidAccountRoute(accountID)) {
+        if (!isValidAccountRoute(Number(accountID))) {
             return;
         }
         openPublicProfilePage(accountID);
     }, [accountID]);
 
+    const onDownloadAttachment = useDownloadAttachment();
+
     const contentProps = useMemo<AttachmentModalBaseContentProps>(
         () => ({
             source: getFullSizeAvatar(avatarURL, accountID),
-            isLoading: !!(personalDetailsMetadata?.[accountID]?.isLoading ?? (isLoadingApp && !Object.keys(personalDetail ?? {}).length)),
-            headerTitle: formatPhoneNumber(displayName),
             originalFileName: personalDetail?.originalFileName ?? '',
+            headerTitle: formatPhoneNumber(displayName),
+            isLoading: !!(personalDetailsMetadata?.[accountID]?.isLoading ?? (isLoadingApp && !Object.keys(personalDetail ?? {}).length)),
             shouldShowNotFoundPage: !avatarURL,
             maybeIcon: true,
+            onDownloadAttachment,
         }),
-        [accountID, avatarURL, displayName, isLoadingApp, personalDetail, personalDetailsMetadata, formatPhoneNumber],
+        [accountID, avatarURL, displayName, formatPhoneNumber, isLoadingApp, onDownloadAttachment, personalDetail, personalDetailsMetadata],
     );
 
     return (
diff --git a/src/pages/media/AttachmentModalScreen/routes/ReportAttachmentModalContent.tsx b/src/pages/media/AttachmentModalScreen/routes/ReportAttachmentModalContent.tsx
index a59fa877059bd..0a59ce93e7241 100644
--- a/src/pages/media/AttachmentModalScreen/routes/ReportAttachmentModalContent.tsx
+++ b/src/pages/media/AttachmentModalScreen/routes/ReportAttachmentModalContent.tsx
@@ -20,7 +20,7 @@ import useDownloadAttachment from './hooks/useDownloadAttachment';
 import useNavigateToReportOnRefresh from './hooks/useNavigateToReportOnRefresh';
 import useReportAttachmentModalType from './hooks/useReportAttachmentModalType';
 
-function ReportAttachmentModalContent({route, navigation}: AttachmentModalScreenProps<typeof SCREENS.ATTACHMENTS>) {
+function ReportAttachmentModalContent({route, navigation}: AttachmentModalScreenProps<typeof SCREENS.REPORT_ATTACHMENTS>) {
     const {attachmentID, type, source: sourceParam, isAuthTokenRequired, attachmentLink, originalFileName, accountID, reportID, hashKey, headerTitle, onShow, onClose} = route.params;
 
     const [reportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {
@@ -70,7 +70,7 @@ function ReportAttachmentModalContent({route, navigation}: AttachmentModalScreen
 
     const onCarouselAttachmentChange = useCallback(
         (attachment: Attachment) => {
-            const routeToNavigate = ROUTES.ATTACHMENTS.getRoute({
+            const routeToNavigate = ROUTES.REPORT_ATTACHMENTS.getRoute({
                 reportID,
                 attachmentID: attachment.attachmentID,
                 type,
@@ -115,7 +115,7 @@ function ReportAttachmentModalContent({route, navigation}: AttachmentModalScreen
     );
 
     return (
-        <AttachmentModalContainer<typeof SCREENS.ATTACHMENTS>
+        <AttachmentModalContainer<typeof SCREENS.REPORT_ATTACHMENTS>
             navigation={navigation}
             contentProps={contentProps}
             modalType={modalType}
diff --git a/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx b/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx
index d60c6c3bcbcd9..591023c0f5931 100644
--- a/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx
+++ b/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx
@@ -1,44 +1,80 @@
-import React, {useEffect, useMemo, useState} from 'react';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import {InteractionManager} from 'react-native';
+import ConfirmModal from '@components/ConfirmModal';
+import * as Expensicons from '@components/Icon/Expensicons';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
-import {navigateToStartStepIfScanFileCannotBeRead} from '@libs/actions/IOU';
+import {detachReceipt, navigateToStartStepIfScanFileCannotBeRead} from '@libs/actions/IOU';
 import {openReport} from '@libs/actions/Report';
 import getReceiptFilenameFromTransaction from '@libs/getReceiptFilenameFromTransaction';
+import {getReceiptFileName} from '@libs/MergeTransactionUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import {getThumbnailAndImageURIs} from '@libs/ReceiptUtils';
 import {getReportAction, isTrackExpenseAction} from '@libs/ReportActionsUtils';
 import {canEditFieldOfMoneyRequest, isMoneyRequestReport, isTrackExpenseReport} from '@libs/ReportUtils';
-import {getRequestType, hasEReceipt, hasReceiptSource} from '@libs/TransactionUtils';
+import {getRequestType, hasEReceipt, hasMissingSmartscanFields, hasReceipt, hasReceiptSource, isReceiptBeingScanned} from '@libs/TransactionUtils';
 import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
-import type {AttachmentModalBaseContentProps} from '@pages/media/AttachmentModalScreen/AttachmentModalBaseContent/types';
+import type {AttachmentModalBaseContentProps, ThreeDotsMenuItemFactory} from '@pages/media/AttachmentModalScreen/AttachmentModalBaseContent/types';
 import AttachmentModalContainer from '@pages/media/AttachmentModalScreen/AttachmentModalContainer';
 import type {AttachmentModalScreenProps} from '@pages/media/AttachmentModalScreen/types';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
+import useDownloadAttachment from './hooks/useDownloadAttachment';
 
 function TransactionReceiptModalContent({navigation, route}: AttachmentModalScreenProps<typeof SCREENS.TRANSACTION_RECEIPT>) {
-    const {reportID = '', transactionID = '', action, iouType, readonly: readonlyProp, isFromReviewDuplicates: isFromReviewDuplicatesProp} = route.params;
+    const {reportID = '', transactionID = '', action, iouType: iouTypeParam, readonly: readonlyParam, isFromReviewDuplicates: isFromReviewDuplicatesProp} = route.params;
+
+    const {translate} = useLocalize();
+    const {isOffline} = useNetwork();
 
     const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {canBeMissing: true});
     const [transactionMain] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {canBeMissing: true});
     const [transactionDraft] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {canBeMissing: true});
     const [reportMetadata = CONST.DEFAULT_REPORT_METADATA] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, {canBeMissing: true});
 
+    // If we have a merge transaction, we need to use the receipt from the merge transaction
+    const mergeTransactionID = route.params.mergeTransactionID;
+    const [mergeTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.MERGE_TRANSACTION}${mergeTransactionID}`, {canBeMissing: true});
+
     const isDraftTransaction = !!action;
-    const transaction = isDraftTransaction ? transactionDraft : transactionMain;
+    const transaction = useMemo(() => {
+        if (isDraftTransaction) {
+            return transactionDraft;
+        }
+
+        if (mergeTransactionID && mergeTransaction && transactionMain) {
+            // If we have a merge transaction, we need to use the receipt from the merge transaction
+            return {
+                ...transactionMain,
+                receipt: mergeTransaction.receipt,
+                filename: getReceiptFileName(mergeTransaction.receipt),
+            };
+        }
+
+        return transactionMain;
+    }, [isDraftTransaction, mergeTransaction, mergeTransactionID, transactionDraft, transactionMain]);
+    const draftTransactionID = isDraftTransaction ? transactionID : undefined;
     const receiptURIs = getThumbnailAndImageURIs(transaction);
 
     const isLocalFile = receiptURIs.isLocalFile;
-    const readonly = readonlyProp === 'true';
+    const isAuthTokenRequired = !isLocalFile && !isDraftTransaction;
+    const readonly = readonlyParam === 'true';
     const isFromReviewDuplicates = isFromReviewDuplicatesProp === 'true';
-    const imageSource = isDraftTransaction ? transactionDraft?.receipt?.source : tryResolveUrlFromApiRoot(receiptURIs.image ?? '');
+    const source = isDraftTransaction ? transactionDraft?.receipt?.source : tryResolveUrlFromApiRoot(receiptURIs.image ?? '');
 
     const parentReportAction = getReportAction(report?.parentReportID, report?.parentReportActionID);
     const canEditReceipt = canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.RECEIPT);
     const canDeleteReceipt = canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.RECEIPT, true);
+
+    const shouldShowReplaceReceiptButton = ((canEditReceipt && !readonly) || isDraftTransaction) && !transaction?.receipt?.isTestDriveReceipt;
+    const shouldShowDeleteReceiptButton = canDeleteReceipt && !readonly && !isDraftTransaction && !transaction?.receipt?.isTestDriveReceipt;
+
     const isEReceipt = transaction && !hasReceiptSource(transaction) && hasEReceipt(transaction);
     const isTrackExpenseActionValue = isTrackExpenseAction(parentReportAction);
+    const iouType = useMemo(() => iouTypeParam ?? (isTrackExpenseActionValue ? CONST.IOU.TYPE.TRACK : CONST.IOU.TYPE.SUBMIT), [isTrackExpenseActionValue, iouTypeParam]);
 
     const [isDeleteReceiptConfirmModalVisible, setIsDeleteReceiptConfirmModalVisible] = useState(false);
 
@@ -95,44 +131,123 @@ function TransactionReceiptModalContent({navigation, route}: AttachmentModalScre
             ? !transaction
             : moneyRequestReportID !== transaction?.reportID;
 
+    /**
+     * Detach the receipt and close the modal.
+     */
+    const deleteReceiptAndClose = useCallback(() => {
+        detachReceipt(transaction?.transactionID);
+        navigation.goBack();
+    }, [navigation, transaction?.transactionID]);
+
+    const onDownloadAttachment = useDownloadAttachment({
+        isAuthTokenRequired,
+        draftTransactionID,
+    });
+
+    const allowDownload = !isEReceipt;
+
+    const threeDotsMenuItems: ThreeDotsMenuItemFactory = useCallback(
+        ({file, source: innerSource, isLocalSource}) => {
+            const menuItems = [];
+            if (shouldShowReplaceReceiptButton) {
+                menuItems.push({
+                    icon: Expensicons.Camera,
+                    text: translate('common.replace'),
+                    onSelected: () => {
+                        Navigation.dismissModal();
+                        InteractionManager.runAfterInteractions(() => {
+                            Navigation.navigate(
+                                ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(
+                                    action ?? CONST.IOU.ACTION.EDIT,
+                                    iouType,
+                                    draftTransactionID ?? transaction?.transactionID,
+                                    report?.reportID,
+                                    Navigation.getActiveRoute(),
+                                ),
+                            );
+                        });
+                    },
+                });
+            }
+            if ((!isOffline && allowDownload && !isLocalSource) || !!draftTransactionID) {
+                menuItems.push({
+                    icon: Expensicons.Download,
+                    text: translate('common.download'),
+                    onSelected: () => onDownloadAttachment({source: innerSource, file}),
+                });
+            }
+
+            const hasOnlyEReceipt = hasEReceipt(transaction) && !hasReceiptSource(transaction);
+            if (shouldShowDeleteReceiptButton && !hasOnlyEReceipt && hasReceipt(transaction) && !isReceiptBeingScanned(transaction) && !hasMissingSmartscanFields(transaction)) {
+                menuItems.push({
+                    icon: Expensicons.Trashcan,
+                    text: translate('receipt.deleteReceipt'),
+                    onSelected: () => setIsDeleteReceiptConfirmModalVisible?.(true),
+                    shouldCallAfterModalHide: true,
+                });
+            }
+            return menuItems;
+            // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+        },
+        [
+            shouldShowReplaceReceiptButton,
+            isOffline,
+            allowDownload,
+            draftTransactionID,
+            transaction,
+            shouldShowDeleteReceiptButton,
+            translate,
+            action,
+            iouType,
+            report?.reportID,
+            onDownloadAttachment,
+        ],
+    );
+
+    const ExtraContent = useMemo(
+        () => (
+            <ConfirmModal
+                title={translate('receipt.deleteReceipt')}
+                isVisible={isDeleteReceiptConfirmModalVisible}
+                onConfirm={() => deleteReceiptAndClose()}
+                onCancel={() => setIsDeleteReceiptConfirmModalVisible?.(false)}
+                prompt={translate('receipt.deleteConfirmation')}
+                confirmText={translate('common.delete')}
+                cancelText={translate('common.cancel')}
+                danger
+            />
+        ),
+        [deleteReceiptAndClose, isDeleteReceiptConfirmModalVisible, translate],
+    );
+
     const contentProps = useMemo<AttachmentModalBaseContentProps>(
         () => ({
-            source: imageSource,
-            isAuthTokenRequired: !isLocalFile && !isDraftTransaction,
+            source,
+            originalFileName: isDraftTransaction ? getReceiptFilenameFromTransaction(transaction) : receiptURIs?.filename,
             report,
-            isReceiptAttachment: true,
-            isDeleteReceiptConfirmModalVisible,
-            canEditReceipt: ((canEditReceipt && !readonly) || isDraftTransaction) && !transaction?.receipt?.isTestDriveReceipt,
-            canDeleteReceipt: canDeleteReceipt && !readonly && !isDraftTransaction && !transaction?.receipt?.isTestDriveReceipt,
-            allowDownload: !isEReceipt,
+            headerTitle: translate('common.receipt'),
+            threeDotsMenuItems,
+            isAuthTokenRequired,
             isTrackExpenseAction: isTrackExpenseActionValue,
-            originalFileName: isDraftTransaction ? getReceiptFilenameFromTransaction(transaction) : receiptURIs?.filename,
             isLoading: !transaction && reportMetadata?.isLoadingInitialReportActions,
-            action,
-            iouType,
-            draftTransactionID: isDraftTransaction ? transactionID : undefined,
             shouldShowNotFoundPage,
-            onRequestDeleteReceipt: () => setIsDeleteReceiptConfirmModalVisible?.(true),
-            onDeleteReceipt: () => setIsDeleteReceiptConfirmModalVisible?.(false),
+            shouldShowCarousel: false,
+            onDownloadAttachment: allowDownload ? undefined : onDownloadAttachment,
         }),
         [
-            canDeleteReceipt,
-            canEditReceipt,
-            imageSource,
-            action,
-            iouType,
-            isDeleteReceiptConfirmModalVisible,
+            allowDownload,
+            isAuthTokenRequired,
             isDraftTransaction,
-            isEReceipt,
-            isLocalFile,
             isTrackExpenseActionValue,
-            readonly,
+            onDownloadAttachment,
             receiptURIs?.filename,
             report,
             reportMetadata?.isLoadingInitialReportActions,
             shouldShowNotFoundPage,
+            source,
+            threeDotsMenuItems,
             transaction,
-            transactionID,
+            translate,
         ],
     );
 
@@ -140,6 +255,7 @@ function TransactionReceiptModalContent({navigation, route}: AttachmentModalScre
         <AttachmentModalContainer
             navigation={navigation}
             contentProps={contentProps}
+            ExtraContent={ExtraContent}
         />
     );
 }
diff --git a/src/pages/media/AttachmentModalScreen/routes/WorkspaceAvatarModalContent.tsx b/src/pages/media/AttachmentModalScreen/routes/WorkspaceAvatarModalContent.tsx
index 0faa06da22f55..2c971ec8a59de 100644
--- a/src/pages/media/AttachmentModalScreen/routes/WorkspaceAvatarModalContent.tsx
+++ b/src/pages/media/AttachmentModalScreen/routes/WorkspaceAvatarModalContent.tsx
@@ -1,5 +1,6 @@
 import React, {useMemo} from 'react';
 import useOnyx from '@hooks/useOnyx';
+import usePolicy from '@hooks/usePolicy';
 import {getDefaultWorkspaceAvatar} from '@libs/ReportUtils';
 import {getFullSizeAvatar} from '@libs/UserUtils';
 import type {AttachmentModalBaseContentProps} from '@pages/media/AttachmentModalScreen/AttachmentModalBaseContent/types';
@@ -7,26 +8,33 @@ import AttachmentModalContainer from '@pages/media/AttachmentModalScreen/Attachm
 import type {AttachmentModalScreenProps} from '@pages/media/AttachmentModalScreen/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
+import useDownloadAttachment from './hooks/useDownloadAttachment';
 
 function WorkspaceAvatarModalContent({navigation, route}: AttachmentModalScreenProps<typeof SCREENS.WORKSPACE_AVATAR>) {
-    const {policyID} = route.params;
+    const {policyID, letter: fallbackLetter} = route.params;
 
-    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {canBeMissing: false});
-    const [isLoadingApp = true] = useOnyx(ONYXKEYS.IS_LOADING_APP, {canBeMissing: true});
+    const policy = usePolicy(policyID);
+    const [isLoadingApp = false] = useOnyx(ONYXKEYS.IS_LOADING_APP, {canBeMissing: true, initWithStoredValues: false});
 
-    const avatarURL = policy?.avatarURL ?? getDefaultWorkspaceAvatar(policy?.name ?? '');
+    const avatarURL = policy?.avatarURL ?? getDefaultWorkspaceAvatar(policy?.name ?? fallbackLetter);
+
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const shouldShowNotFoundPage = !Object.keys(policy ?? {}).length && !isLoadingApp && (!policyID || !fallbackLetter);
+
+    const onDownloadAttachment = useDownloadAttachment();
 
     const contentProps = useMemo<AttachmentModalBaseContentProps>(
         () => ({
             source: getFullSizeAvatar(avatarURL, 0),
             headerTitle: policy?.name,
-            isWorkspaceAvatar: true,
             originalFileName: policy?.originalFileName ?? policy?.id,
-            shouldShowNotFoundPage: !Object.keys(policy ?? {}).length && !isLoadingApp,
+            shouldShowNotFoundPage,
+            isWorkspaceAvatar: true,
             isLoading: !Object.keys(policy ?? {}).length && !!isLoadingApp,
             maybeIcon: true,
+            onDownloadAttachment,
         }),
-        [avatarURL, isLoadingApp, policy],
+        [avatarURL, isLoadingApp, onDownloadAttachment, policy, shouldShowNotFoundPage],
     );
 
     return (
diff --git a/src/pages/media/AttachmentModalScreen/routes/report/ReportAddAttachmentModalContent.tsx b/src/pages/media/AttachmentModalScreen/routes/report/ReportAddAttachmentModalContent.tsx
new file mode 100644
index 0000000000000..1e484ac4c22bd
--- /dev/null
+++ b/src/pages/media/AttachmentModalScreen/routes/report/ReportAddAttachmentModalContent.tsx
@@ -0,0 +1,254 @@
+import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
+import type {View} from 'react-native';
+import AttachmentCarouselView from '@components/Attachments/AttachmentCarousel/AttachmentCarouselView';
+import useCarouselArrows from '@components/Attachments/AttachmentCarousel/useCarouselArrows';
+import useAttachmentErrors from '@components/Attachments/AttachmentView/useAttachmentErrors';
+import type {Attachment} from '@components/Attachments/types';
+import ConfirmModal from '@components/ConfirmModal';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import useOnyx from '@hooks/useOnyx';
+import {openReport} from '@libs/actions/Report';
+import {isMultipleAttachmentsValidationResult, isSingleAttachmentValidationResult} from '@libs/AttachmentValidation';
+import {getFileValidationErrorText} from '@libs/fileDownload/FileUtils';
+import {isReportNotFound} from '@libs/ReportUtils';
+import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
+import type {AttachmentContentProps, AttachmentModalBaseContentProps} from '@pages/media/AttachmentModalScreen/AttachmentModalBaseContent/types';
+import AttachmentModalContainer from '@pages/media/AttachmentModalScreen/AttachmentModalContainer';
+import useDownloadAttachment from '@pages/media/AttachmentModalScreen/routes/hooks/useDownloadAttachment';
+import type {AttachmentModalScreenProps, FileObject} from '@pages/media/AttachmentModalScreen/types';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import useFileUploadValidation from './hooks/useFileUploadValidation';
+import useNavigateToReportOnRefresh from './hooks/useNavigateToReportOnRefresh';
+import useReportAttachmentModalType from './hooks/useReportAttachmentModalType';
+
+const convertFileToAttachment = (file: FileObject | undefined): Attachment => {
+    if (!file) {
+        return {source: ''};
+    }
+
+    return {
+        file,
+        source: file.uri ?? '',
+    };
+};
+
+function ReportAddAttachmentModalContent({route, navigation}: AttachmentModalScreenProps<typeof SCREENS.REPORT_ADD_ATTACHMENT>) {
+    const {
+        attachmentID,
+        file,
+        source: sourceParam,
+        isAuthTokenRequired,
+        attachmentLink,
+        originalFileName,
+        accountID = CONST.DEFAULT_NUMBER_ID,
+        reportID,
+        shouldDisableSendButton,
+        headerTitle,
+        onConfirm: onConfirmParam,
+        onShow,
+        onClose,
+    } = route.params;
+
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {canBeMissing: false});
+    const [reportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {
+        canEvict: false,
+        canBeMissing: true,
+    });
+    const [reportMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, {
+        canBeMissing: false,
+    });
+
+    useNavigateToReportOnRefresh({source: sourceParam, file, reportID});
+
+    const [isLoadingApp] = useOnyx(ONYXKEYS.IS_LOADING_APP, {canBeMissing: true});
+    const {isOffline} = useNetwork();
+    const {translate} = useLocalize();
+
+    const submitRef = useRef<View | HTMLElement>(null);
+
+    // Extract the reportActionID from the attachmentID (format: reportActionID_index)
+    const reportActionID = useMemo(() => attachmentID?.split('_')?.[0], [attachmentID]);
+
+    const shouldFetchReport = useMemo(() => {
+        return isEmptyObject(reportActions?.[reportActionID ?? CONST.DEFAULT_NUMBER_ID]);
+    }, [reportActions, reportActionID]);
+
+    const fetchReport = useCallback(() => {
+        openReport(reportID, reportActionID);
+    }, [reportID, reportActionID]);
+
+    useEffect(() => {
+        if (!reportID || !shouldFetchReport) {
+            return;
+        }
+
+        fetchReport();
+    }, [reportID, fetchReport, shouldFetchReport]);
+
+    const [source, setSource] = useState(() => Number(sourceParam) || (typeof sourceParam === 'string' ? tryResolveUrlFromApiRoot(decodeURIComponent(sourceParam)) : undefined));
+    const [filesToValidate, setFilesToValidate] = useState(() => file);
+    const {validFilesToUpload, fileError, isFileErrorModalVisible} = useFileUploadValidation({
+        files: filesToValidate,
+        onValid: (result) => {
+            if (isSingleAttachmentValidationResult(result)) {
+                setSource(result.validatedFile.source);
+            } else if (isMultipleAttachmentsValidationResult(result)) {
+                setSource(result.validatedFiles.at(0)?.source);
+            }
+        },
+    });
+    const isMultipleFiles = useMemo(() => Array.isArray(validFilesToUpload) && validFilesToUpload.length > 0, [validFilesToUpload]);
+
+    const modalType = useReportAttachmentModalType(validFilesToUpload ?? file);
+
+    const onConfirm = useCallback(
+        (f: FileObject | FileObject[]) => {
+            if (Array.isArray(validFilesToUpload) && validFilesToUpload.length > 0) {
+                onConfirmParam?.(validFilesToUpload);
+            } else {
+                onConfirmParam?.(f);
+            }
+        },
+        [onConfirmParam, validFilesToUpload],
+    );
+
+    const onDownloadAttachment = useDownloadAttachment({
+        isAuthTokenRequired,
+    });
+
+    const isLoading = useMemo(() => {
+        if (isOffline || isReportNotFound(report) || !reportID) {
+            return false;
+        }
+        const isEmptyReport = isEmptyObject(report);
+        return (
+            !!isLoadingApp ||
+            isEmptyReport ||
+            (reportMetadata?.isLoadingInitialReportActions !== false && shouldFetchReport) ||
+            (Array.isArray(validFilesToUpload) && validFilesToUpload.length === 0)
+        );
+    }, [isOffline, report, reportID, isLoadingApp, reportMetadata?.isLoadingInitialReportActions, shouldFetchReport, validFilesToUpload]);
+
+    const confirmAndContinue = useCallback(() => {
+        if (fileError !== CONST.MULTIPLE_ATTACHMENT_FILES_VALIDATION_ERRORS.MAX_FILE_LIMIT_EXCEEDED) {
+            return;
+        }
+
+        setFilesToValidate(file);
+    }, [fileError, file]);
+
+    const ExtraModals = useMemo(
+        () => (
+            <ConfirmModal
+                title={getFileValidationErrorText(fileError).title}
+                onConfirm={() => confirmAndContinue()}
+                onCancel={navigation.goBack}
+                isVisible={isFileErrorModalVisible}
+                prompt={getFileValidationErrorText(fileError).reason}
+                confirmText={translate(isMultipleFiles ? 'common.continue' : 'common.close')}
+                shouldShowCancelButton={isMultipleFiles}
+                cancelText={translate('common.cancel')}
+            />
+        ),
+        [confirmAndContinue, fileError, isFileErrorModalVisible, isMultipleFiles, navigation.goBack, translate],
+    );
+
+    const contentProps = useMemo<AttachmentModalBaseContentProps>(() => {
+        if (validFilesToUpload === undefined) {
+            return {
+                isLoading: true,
+            };
+        }
+
+        return {
+            file: validFilesToUpload,
+            fileToDisplayIndex: 0,
+            source,
+            isLoading,
+            isAuthTokenRequired,
+            attachmentLink,
+            originalFileName,
+            attachmentID,
+            accountID,
+            headerTitle,
+            shouldDisableSendButton,
+            submitRef,
+            onConfirm,
+            onDownloadAttachment,
+            AttachmentContent: AddAttachmentModalCarouselView,
+            ExtraModals,
+        };
+    }, [
+        ExtraModals,
+        accountID,
+        attachmentID,
+        attachmentLink,
+        headerTitle,
+        isAuthTokenRequired,
+        isLoading,
+        onConfirm,
+        onDownloadAttachment,
+        originalFileName,
+        shouldDisableSendButton,
+        source,
+        validFilesToUpload,
+    ]);
+
+    return (
+        <AttachmentModalContainer
+            navigation={navigation}
+            contentProps={contentProps}
+            modalType={modalType}
+            onShow={onShow}
+            onClose={onClose}
+        />
+    );
+}
+ReportAddAttachmentModalContent.displayName = 'ReportAddAttachmentModalContent';
+
+function AddAttachmentModalCarouselView({fileToDisplay, files}: AttachmentContentProps) {
+    const {setAttachmentError, clearAttachmentErrors} = useAttachmentErrors();
+    const {shouldShowArrows, setShouldShowArrows, autoHideArrows, cancelAutoHideArrows} = useCarouselArrows();
+
+    const [page, setPage] = useState<number>(0);
+    const attachments = useMemo(() => {
+        if (Array.isArray(files)) {
+            return files?.map((file) => convertFileToAttachment(file)) ?? [];
+        }
+
+        if (!files) {
+            return [];
+        }
+
+        return [convertFileToAttachment(files)];
+    }, [files]);
+    const currentAttachment = useMemo(() => convertFileToAttachment(fileToDisplay), [fileToDisplay]);
+
+    useEffect(() => {
+        clearAttachmentErrors();
+    }, [clearAttachmentErrors]);
+
+    if (attachments.length === 0 || !currentAttachment) {
+        return null;
+    }
+
+    return (
+        <AttachmentCarouselView
+            attachments={attachments}
+            source={currentAttachment.source}
+            page={page}
+            setPage={setPage}
+            autoHideArrows={autoHideArrows}
+            cancelAutoHideArrow={cancelAutoHideArrows}
+            setShouldShowArrows={setShouldShowArrows}
+            onAttachmentError={setAttachmentError}
+            shouldShowArrows={shouldShowArrows}
+        />
+    );
+}
+
+export default ReportAddAttachmentModalContent;
diff --git a/src/pages/media/AttachmentModalScreen/routes/report/ReportAttachmentModalContent.tsx b/src/pages/media/AttachmentModalScreen/routes/report/ReportAttachmentModalContent.tsx
new file mode 100644
index 0000000000000..067bbdf110e1d
--- /dev/null
+++ b/src/pages/media/AttachmentModalScreen/routes/report/ReportAttachmentModalContent.tsx
@@ -0,0 +1,126 @@
+import React, {useCallback, useEffect, useMemo, useRef} from 'react';
+import type {View} from 'react-native';
+import type {Attachment} from '@components/Attachments/types';
+import useNetwork from '@hooks/useNetwork';
+import useOnyx from '@hooks/useOnyx';
+import {openReport} from '@libs/actions/Report';
+import Navigation from '@libs/Navigation/Navigation';
+import {isReportNotFound} from '@libs/ReportUtils';
+import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
+import type {AttachmentModalBaseContentProps} from '@pages/media/AttachmentModalScreen/AttachmentModalBaseContent/types';
+import AttachmentModalContainer from '@pages/media/AttachmentModalScreen/AttachmentModalContainer';
+import useDownloadAttachment from '@pages/media/AttachmentModalScreen/routes/hooks/useDownloadAttachment';
+import type {AttachmentModalScreenProps} from '@pages/media/AttachmentModalScreen/types';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import useNavigateToReportOnRefresh from './hooks/useNavigateToReportOnRefresh';
+import useReportAttachmentModalType from './hooks/useReportAttachmentModalType';
+
+function ReportAttachmentModalContent({route, navigation}: AttachmentModalScreenProps<typeof SCREENS.REPORT_ATTACHMENTS>) {
+    const {attachmentID, type, source: sourceParam, isAuthTokenRequired, attachmentLink, originalFileName, accountID, reportID, hashKey, headerTitle, onShow, onClose} = route.params;
+
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {canBeMissing: false});
+    const [reportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {
+        canEvict: false,
+        canBeMissing: true,
+    });
+    const [reportMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, {
+        canBeMissing: false,
+    });
+
+    useNavigateToReportOnRefresh({source: sourceParam, reportID});
+
+    const [isLoadingApp] = useOnyx(ONYXKEYS.IS_LOADING_APP, {canBeMissing: true});
+    const {isOffline} = useNetwork();
+
+    const submitRef = useRef<View | HTMLElement>(null);
+
+    // Extract the reportActionID from the attachmentID (format: reportActionID_index)
+    const reportActionID = useMemo(() => attachmentID?.split('_')?.[0], [attachmentID]);
+
+    const shouldFetchReport = useMemo(() => {
+        return isEmptyObject(reportActions?.[reportActionID ?? CONST.DEFAULT_NUMBER_ID]);
+    }, [reportActions, reportActionID]);
+
+    const isLoading = useMemo(() => {
+        if (isOffline || isReportNotFound(report) || !reportID) {
+            return false;
+        }
+        const isEmptyReport = isEmptyObject(report);
+        return !!isLoadingApp || isEmptyReport || (reportMetadata?.isLoadingInitialReportActions !== false && shouldFetchReport);
+    }, [isOffline, reportID, isLoadingApp, report, reportMetadata, shouldFetchReport]);
+
+    const fetchReport = useCallback(() => {
+        openReport(reportID, reportActionID);
+    }, [reportID, reportActionID]);
+
+    useEffect(() => {
+        if (!reportID || !shouldFetchReport) {
+            return;
+        }
+
+        fetchReport();
+    }, [reportID, fetchReport, shouldFetchReport]);
+
+    const onCarouselAttachmentChange = useCallback(
+        (attachment: Attachment) => {
+            const routeToNavigate = ROUTES.REPORT_ATTACHMENTS.getRoute({
+                reportID,
+                attachmentID: attachment.attachmentID,
+                type,
+                source: String(attachment.source),
+                accountID,
+                isAuthTokenRequired: attachment?.isAuthTokenRequired,
+                originalFileName: attachment?.file?.name,
+                attachmentLink: attachment?.attachmentLink,
+                hashKey,
+            });
+            Navigation.navigate(routeToNavigate);
+        },
+        [reportID, type, accountID, hashKey],
+    );
+
+    const onDownloadAttachment = useDownloadAttachment({
+        isAuthTokenRequired,
+    });
+
+    const source = useMemo(() => Number(sourceParam) || (typeof sourceParam === 'string' ? tryResolveUrlFromApiRoot(decodeURIComponent(sourceParam)) : undefined), [sourceParam]);
+    const modalType = useReportAttachmentModalType();
+
+    const contentProps = useMemo<AttachmentModalBaseContentProps>(
+        () => ({
+            // In native the imported images sources are of type number. Ref: https://reactnative.dev/docs/image#imagesource
+            type,
+            report,
+            shouldShowNotFoundPage: !isLoading && type !== CONST.ATTACHMENT_TYPE.SEARCH && !report?.reportID,
+            isAuthTokenRequired: !!isAuthTokenRequired,
+            attachmentLink: attachmentLink ?? '',
+            originalFileName: originalFileName ?? '',
+            isLoading,
+            source,
+            attachmentID,
+            accountID,
+            headerTitle,
+            submitRef,
+            onDownloadAttachment,
+            onCarouselAttachmentChange,
+        }),
+        [accountID, attachmentID, attachmentLink, headerTitle, isAuthTokenRequired, isLoading, onCarouselAttachmentChange, onDownloadAttachment, originalFileName, report, source, type],
+    );
+
+    return (
+        <AttachmentModalContainer<typeof SCREENS.REPORT_ATTACHMENTS>
+            navigation={navigation}
+            contentProps={contentProps}
+            modalType={modalType}
+            onShow={onShow}
+            onClose={onClose}
+        />
+    );
+}
+ReportAttachmentModalContent.displayName = 'ReportAttachmentModalContent';
+
+export default ReportAttachmentModalContent;
diff --git a/src/pages/media/AttachmentModalScreen/routes/ReportAvatarModalContent.tsx b/src/pages/media/AttachmentModalScreen/routes/report/ReportAvatarModalContent.tsx
similarity index 78%
rename from src/pages/media/AttachmentModalScreen/routes/ReportAvatarModalContent.tsx
rename to src/pages/media/AttachmentModalScreen/routes/report/ReportAvatarModalContent.tsx
index e2c83a2730b7b..fae148b9c705f 100644
--- a/src/pages/media/AttachmentModalScreen/routes/ReportAvatarModalContent.tsx
+++ b/src/pages/media/AttachmentModalScreen/routes/report/ReportAvatarModalContent.tsx
@@ -1,9 +1,10 @@
 import React, {useMemo} from 'react';
 import useOnyx from '@hooks/useOnyx';
-import {getDefaultGroupAvatar, getPolicyName, getReportName, getWorkspaceIcon, isGroupChat, isThread} from '@libs/ReportUtils';
+import {getDefaultGroupAvatar, getPolicyName, getReportName, getWorkspaceIcon, isGroupChat, isThread, isUserCreatedPolicyRoom} from '@libs/ReportUtils';
 import {getFullSizeAvatar} from '@libs/UserUtils';
 import type {AttachmentModalBaseContentProps} from '@pages/media/AttachmentModalScreen/AttachmentModalBaseContent/types';
 import AttachmentModalContainer from '@pages/media/AttachmentModalScreen/AttachmentModalContainer';
+import useDownloadAttachment from '@pages/media/AttachmentModalScreen/routes/hooks/useDownloadAttachment';
 import type {AttachmentModalScreenProps} from '@pages/media/AttachmentModalScreen/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
@@ -24,6 +25,14 @@ function ReportAvatarModalContent({navigation, route}: AttachmentModalScreenProp
             };
         }
 
+        if (isUserCreatedPolicyRoom(report)) {
+            return {
+                source: report?.avatarUrl ? getFullSizeAvatar(report.avatarUrl, 0) : undefined,
+                headerTitle: getReportName(report),
+                isWorkspaceAvatar: false,
+            };
+        }
+
         return {
             source: getFullSizeAvatar(getWorkspaceIcon(report).source, 0),
             headerTitle: getPolicyName({report, policy}),
@@ -33,13 +42,16 @@ function ReportAvatarModalContent({navigation, route}: AttachmentModalScreenProp
         };
     }, [policy, report]);
 
+    const onDownloadAttachment = useDownloadAttachment();
+
     const contentProps = useMemo<AttachmentModalBaseContentProps>(
         () => ({
             ...attachment,
             shouldShowNotFoundPage: !report?.reportID && !isLoadingApp,
             isLoading: (!report?.reportID || !policy?.id) && !!isLoadingApp,
+            onDownloadAttachment,
         }),
-        [attachment, isLoadingApp, policy?.id, report?.reportID],
+        [attachment, isLoadingApp, policy?.id, report?.reportID, onDownloadAttachment],
     );
 
     return (
diff --git a/src/pages/media/AttachmentModalScreen/routes/report/hooks/useFileUploadValidation.ts b/src/pages/media/AttachmentModalScreen/routes/report/hooks/useFileUploadValidation.ts
new file mode 100644
index 0000000000000..f638f12691da1
--- /dev/null
+++ b/src/pages/media/AttachmentModalScreen/routes/report/hooks/useFileUploadValidation.ts
@@ -0,0 +1,89 @@
+import {useCallback, useEffect, useState} from 'react';
+import {InteractionManager} from 'react-native';
+import type {
+    MultipleAttachmentsInvalidResult,
+    MultipleAttachmentsValidationError,
+    MultipleAttachmentsValidResult,
+    SingleAttachmentInvalidResult,
+    SingleAttachmentValidationError,
+    SingleAttachmentValidResult,
+} from '@libs/AttachmentValidation';
+import {validateAttachmentFile, validateMultipleAttachmentFiles} from '@libs/AttachmentValidation';
+import type {FileObject} from '@pages/media/AttachmentModalScreen/types';
+import CONST from '@src/CONST';
+
+type UseFileUploadValidationProps = {
+    files: FileObject | FileObject[] | undefined;
+    onValid?: (result: SingleAttachmentValidResult | MultipleAttachmentsValidResult) => void;
+    onInvalid?: (result: SingleAttachmentInvalidResult | MultipleAttachmentsInvalidResult) => void;
+};
+
+function useFileUploadValidation({files, onValid, onInvalid}: UseFileUploadValidationProps) {
+    const [validFilesToUpload, setValidFilesToUpload] = useState<FileObject | FileObject[]>();
+    const [fileError, setFileError] = useState<SingleAttachmentValidationError | MultipleAttachmentsValidationError>();
+    const [isFileErrorModalVisible, setIsFileErrorModalVisible] = useState(false);
+
+    // Validates the attachment file and renders the appropriate modal type or errors
+    const validateFile = useCallback(
+        (file: FileObject | FileObject[]) => {
+            if (!file) {
+                return;
+            }
+
+            if (Array.isArray(file)) {
+                validateMultipleAttachmentFiles(file).then((result) => {
+                    if (result.isValid) {
+                        const validFiles = result.validatedFiles.map((f) => f.file);
+                        setValidFilesToUpload(validFiles);
+                        onValid?.(result);
+                        return;
+                    }
+
+                    setFileError(result.error);
+                    setIsFileErrorModalVisible(true);
+
+                    if (result.error === CONST.MULTIPLE_ATTACHMENT_FILES_VALIDATION_ERRORS.MAX_FILE_LIMIT_EXCEEDED) {
+                        const validFiles = file.slice(0, CONST.API_ATTACHMENT_VALIDATIONS.MAX_FILE_LIMIT);
+                        setValidFilesToUpload(validFiles);
+                    }
+
+                    onInvalid?.(result);
+                });
+                return;
+            }
+
+            validateAttachmentFile(file).then((result) => {
+                if (result.isValid) {
+                    const {validatedFile} = result;
+                    setValidFilesToUpload(validatedFile.file);
+
+                    onValid?.(result);
+                    return;
+                }
+
+                const {error} = result;
+                setFileError(error);
+
+                onInvalid?.(result);
+            });
+        },
+        [onInvalid, onValid],
+    );
+
+    useEffect(() => {
+        if (!files) {
+            return;
+        }
+
+        setIsFileErrorModalVisible(false);
+        InteractionManager.runAfterInteractions(() => {
+            setFileError(undefined);
+        });
+
+        validateFile(files);
+    }, [files, validateFile]);
+
+    return {validFilesToUpload, fileError, isFileErrorModalVisible};
+}
+
+export default useFileUploadValidation;
diff --git a/src/pages/media/AttachmentModalScreen/routes/report/hooks/useNavigateToReportOnRefresh.ts b/src/pages/media/AttachmentModalScreen/routes/report/hooks/useNavigateToReportOnRefresh.ts
new file mode 100644
index 0000000000000..ade1bdcf74897
--- /dev/null
+++ b/src/pages/media/AttachmentModalScreen/routes/report/hooks/useNavigateToReportOnRefresh.ts
@@ -0,0 +1,30 @@
+import {useEffect} from 'react';
+import Navigation from '@libs/Navigation/Navigation';
+import type {AvatarSource} from '@libs/UserUtils';
+import type {FileObject} from '@pages/media/AttachmentModalScreen/types';
+import ROUTES from '@src/ROUTES';
+
+type UseReportNavigationFallbackProps = {
+    source?: AvatarSource;
+    file?: FileObject | FileObject[];
+    reportID?: string;
+};
+
+// If the user refreshes during the send attachment flow, we need to navigate back to the report or home
+function useNavigateToReportOnRefresh({source, file, reportID}: UseReportNavigationFallbackProps) {
+    useEffect(() => {
+        if (!!source || !!file) {
+            return;
+        }
+
+        Navigation.isNavigationReady().then(() => {
+            if (reportID) {
+                Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(reportID));
+            } else {
+                Navigation.goBack(ROUTES.HOME);
+            }
+        });
+    }, [source, reportID, file]);
+}
+
+export default useNavigateToReportOnRefresh;
diff --git a/src/pages/media/AttachmentModalScreen/routes/report/hooks/useReportAttachmentModalType.ts b/src/pages/media/AttachmentModalScreen/routes/report/hooks/useReportAttachmentModalType.ts
new file mode 100644
index 0000000000000..d7aaa54c441a6
--- /dev/null
+++ b/src/pages/media/AttachmentModalScreen/routes/report/hooks/useReportAttachmentModalType.ts
@@ -0,0 +1,35 @@
+import {Str} from 'expensify-common';
+import {useEffect, useState} from 'react';
+import {translateLocal} from '@libs/Localize';
+import type {FileObject} from '@pages/media/AttachmentModalScreen/types';
+import CONST from '@src/CONST';
+import type ModalType from '@src/types/utils/ModalType';
+
+function isPdfFile(sourceURL: string, fileObject: FileObject) {
+    return !!sourceURL && (Str.isPDF(sourceURL) || (fileObject && Str.isPDF(fileObject.name ?? translateLocal('attachmentView.unknownFilename'))));
+}
+
+function useReportAttachmentModalType(file?: FileObject | FileObject[]) {
+    const [modalType, setModalType] = useState<ModalType>(CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE);
+    useEffect(() => {
+        if (!file) {
+            setModalType(CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE);
+            return;
+        }
+
+        let isPdf = false;
+
+        if (Array.isArray(file)) {
+            isPdf = file.some((f) => isPdfFile(f.uri ?? '', f));
+        } else {
+            isPdf = isPdfFile(file?.uri ?? '', file ?? {});
+        }
+
+        // If our attachment is a PDF, return the unswipeable Modal type.
+        setModalType(isPdf ? CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE : CONST.MODAL.MODAL_TYPE.CENTERED);
+    }, [file]);
+
+    return modalType;
+}
+
+export default useReportAttachmentModalType;
diff --git a/src/pages/media/AttachmentModalScreen/types.ts b/src/pages/media/AttachmentModalScreen/types.ts
index e383d298bc97c..112a347513de1 100644
--- a/src/pages/media/AttachmentModalScreen/types.ts
+++ b/src/pages/media/AttachmentModalScreen/types.ts
@@ -39,7 +39,7 @@ type AttachmentModalContainerModalProps = {
 };
 
 const ATTACHMENT_MODAL_SCREENS = [
-    SCREENS.ATTACHMENTS,
+    SCREENS.REPORT_ATTACHMENTS,
     SCREENS.REPORT_ADD_ATTACHMENT,
     SCREENS.REPORT_AVATAR,
     SCREENS.PROFILE_AVATAR,
diff --git a/src/pages/settings/Profile/Avatar/ProfileAvatar.tsx b/src/pages/settings/Profile/Avatar/ProfileAvatar.tsx
deleted file mode 100644
index c6e0991353572..0000000000000
--- a/src/pages/settings/Profile/Avatar/ProfileAvatar.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import React, {useEffect} from 'react';
-import AttachmentModal from '@components/AttachmentModal';
-import useLocalize from '@hooks/useLocalize';
-import useOnyx from '@hooks/useOnyx';
-import Navigation from '@libs/Navigation/Navigation';
-import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
-import type {AuthScreensParamList} from '@libs/Navigation/types';
-import {getDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
-import {getFullSizeAvatar} from '@libs/UserUtils';
-import {isValidAccountRoute} from '@libs/ValidationUtils';
-import {openPublicProfilePage} from '@userActions/PersonalDetails';
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import type SCREENS from '@src/SCREENS';
-
-type ProfileAvatarProps = PlatformStackScreenProps<AuthScreensParamList, typeof SCREENS.PROFILE_AVATAR>;
-
-function ProfileAvatar({route}: ProfileAvatarProps) {
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {canBeMissing: true});
-    const [personalDetailsMetadata] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_METADATA, {canBeMissing: true});
-    const [isLoadingApp = true] = useOnyx(ONYXKEYS.IS_LOADING_APP, {canBeMissing: true});
-    const personalDetail = personalDetails?.[route.params.accountID];
-    const avatarURL = personalDetail?.avatar ?? '';
-    const accountID = Number(route.params.accountID ?? CONST.DEFAULT_NUMBER_ID);
-    const isLoading = personalDetailsMetadata?.[accountID]?.isLoading ?? (isLoadingApp && !Object.keys(personalDetail ?? {}).length);
-    const displayName = getDisplayNameOrDefault(personalDetail);
-    const {formatPhoneNumber} = useLocalize();
-    useEffect(() => {
-        if (!isValidAccountRoute(Number(accountID))) {
-            return;
-        }
-        openPublicProfilePage(accountID);
-    }, [accountID, avatarURL]);
-
-    return (
-        <AttachmentModal
-            headerTitle={formatPhoneNumber(displayName)}
-            defaultOpen
-            source={getFullSizeAvatar(avatarURL, accountID)}
-            onModalClose={() => Navigation.goBack(route.params?.backTo)}
-            originalFileName={personalDetail?.originalFileName ?? ''}
-            isLoading={!!isLoading}
-            shouldShowNotFoundPage={!avatarURL}
-            maybeIcon
-        />
-    );
-}
-
-ProfileAvatar.displayName = 'ProfileAvatar';
-
-export default ProfileAvatar;
diff --git a/src/pages/workspace/WorkspaceAvatar.tsx b/src/pages/workspace/WorkspaceAvatar.tsx
deleted file mode 100644
index 0ee3a3a872bf3..0000000000000
--- a/src/pages/workspace/WorkspaceAvatar.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import React from 'react';
-import AttachmentModal from '@components/AttachmentModal';
-import useOnyx from '@hooks/useOnyx';
-import usePolicy from '@hooks/usePolicy';
-import Navigation from '@libs/Navigation/Navigation';
-import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
-import type {AuthScreensParamList} from '@libs/Navigation/types';
-import {getDefaultWorkspaceAvatar} from '@libs/ReportUtils';
-import {getFullSizeAvatar} from '@libs/UserUtils';
-import ONYXKEYS from '@src/ONYXKEYS';
-import type SCREENS from '@src/SCREENS';
-
-type WorkspaceAvatarProps = PlatformStackScreenProps<AuthScreensParamList, typeof SCREENS.WORKSPACE_AVATAR>;
-
-function WorkspaceAvatar({route}: WorkspaceAvatarProps) {
-    const {policyID, letter: fallbackLetter} = route?.params ?? {};
-    const policy = usePolicy(policyID);
-    const [isLoadingApp = false] = useOnyx(ONYXKEYS.IS_LOADING_APP, {canBeMissing: true, initWithStoredValues: false});
-    const policyAvatarURL = policy?.avatarURL;
-    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-    const avatarURL = policyAvatarURL || getDefaultWorkspaceAvatar(policy?.name ?? fallbackLetter);
-    // eslint-disable-next-line rulesdir/no-negated-variables
-    const shouldShowNotFoundPage = !Object.keys(policy ?? {}).length && !isLoadingApp && (!policyID || !fallbackLetter);
-
-    return (
-        <AttachmentModal
-            headerTitle={policy?.name ?? ''}
-            defaultOpen
-            source={getFullSizeAvatar(avatarURL, 0)}
-            onModalClose={Navigation.goBack}
-            isWorkspaceAvatar
-            originalFileName={policy?.originalFileName ?? policy?.id ?? policyID}
-            shouldShowNotFoundPage={shouldShowNotFoundPage}
-            isLoading={!Object.keys(policy ?? {}).length && !!isLoadingApp}
-            maybeIcon
-        />
-    );
-}
-
-WorkspaceAvatar.displayName = 'WorkspaceAvatar';
-
-export default WorkspaceAvatar;
diff --git a/tests/ui/ReportAttachments.tsx b/tests/ui/ReportAttachments.tsx
index 5180364f32a9c..895ac9ca9af12 100644
--- a/tests/ui/ReportAttachments.tsx
+++ b/tests/ui/ReportAttachments.tsx
@@ -39,13 +39,13 @@ jest.mock('@react-native-community/geolocation', () => ({
 }));
 jest.mock('@src/components/Attachments/AttachmentCarousel/Pager/usePageScrollHandler', () => jest.fn());
 
-const renderPage = (initialRouteName: typeof SCREENS.ATTACHMENTS, initialParams: AuthScreensParamList[typeof SCREENS.ATTACHMENTS]) => {
+const renderPage = (initialRouteName: typeof SCREENS.REPORT_ATTACHMENTS, initialParams: AuthScreensParamList[typeof SCREENS.REPORT_ATTACHMENTS]) => {
     return render(
         <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider, AttachmentModalContextProvider, CurrentReportIDContextProvider, PortalProvider, PlaybackContextProvider]}>
             <NavigationContainer>
                 <Stack.Navigator initialRouteName={initialRouteName}>
                     <Stack.Screen
-                        name={SCREENS.ATTACHMENTS}
+                        name={SCREENS.REPORT_ATTACHMENTS}
                         component={AttachmentModalScreen}
                         initialParams={initialParams}
                     />
@@ -181,7 +181,7 @@ describe('ReportAttachments', () => {
         await waitForBatchedUpdatesWithAct();
 
         // Given the report attachments params
-        const params: AuthScreensParamList[typeof SCREENS.ATTACHMENTS] = {
+        const params: AuthScreensParamList[typeof SCREENS.REPORT_ATTACHMENTS] = {
             source: 'https://staging.expensify.com/chat-attachments/7006877151048865417/w_d060af4fb7ac4a815e6ed99df9ef8dd216fdd8c7.png',
             type: 'r',
             reportID: '7487537791562875',
@@ -191,7 +191,7 @@ describe('ReportAttachments', () => {
         };
 
         // And ReportAttachments is opened
-        renderPage(SCREENS.ATTACHMENTS, params);
+        renderPage(SCREENS.REPORT_ATTACHMENTS, params);
 
         await waitForBatchedUpdatesWithAct();
 
@@ -201,7 +201,7 @@ describe('ReportAttachments', () => {
     });
     it('should fetch the report id, if the report has not yet been opened by the user', async () => {
         // Given the report attachments params
-        const params: AuthScreensParamList[typeof SCREENS.ATTACHMENTS] = {
+        const params: AuthScreensParamList[typeof SCREENS.REPORT_ATTACHMENTS] = {
             source: 'https://staging.expensify.com/chat-attachments/7006877151048865417/w_d060af4fb7ac4a815e6ed99df9ef8dd216fdd8c7.png',
             type: 'r',
             reportID: '7487537791562875',
@@ -211,7 +211,7 @@ describe('ReportAttachments', () => {
         };
 
         // And ReportAttachments is opened
-        renderPage(SCREENS.ATTACHMENTS, params);
+        renderPage(SCREENS.REPORT_ATTACHMENTS, params);
         await waitForBatchedUpdatesWithAct();
 
         const openReportRequest = getFetchMockCalls(WRITE_COMMANDS.OPEN_REPORT).find((request) => {
diff --git a/tests/unit/FileUtilsTest.ts b/tests/unit/FileUtilsTest.ts
index f1b3e05d47f65..d9582161de333 100644
--- a/tests/unit/FileUtilsTest.ts
+++ b/tests/unit/FileUtilsTest.ts
@@ -48,31 +48,31 @@ describe('FileUtils', () => {
         it('should not return FILE_TOO_SMALL when validating small attachment', () => {
             const file = createMockFile('file.csv', CONST.API_ATTACHMENT_VALIDATIONS.MIN_SIZE - 1);
             const error = FileUtils.validateAttachment(file, false, false);
-            expect(error).not.toBe(CONST.FILE_VALIDATION_ERRORS.FILE_TOO_SMALL);
+            expect(error).not.toBe(CONST.SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS.FILE_TOO_SMALL);
         });
 
         it('should return FILE_TOO_SMALL when validating small receipt', () => {
             const file = createMockFile('receipt.jpg', CONST.API_ATTACHMENT_VALIDATIONS.MIN_SIZE - 1);
             const error = FileUtils.validateAttachment(file, false, true);
-            expect(error).toBe(CONST.FILE_VALIDATION_ERRORS.FILE_TOO_SMALL);
+            expect(error).toBe(CONST.SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS.FILE_TOO_SMALL);
         });
 
         it('should return FILE_TOO_LARGE for large non-image file', () => {
             const file = createMockFile('file.pdf', CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE + 1);
             const error = FileUtils.validateAttachment(file);
-            expect(error).toBe(CONST.FILE_VALIDATION_ERRORS.FILE_TOO_LARGE);
+            expect(error).toBe(CONST.SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS.FILE_TOO_LARGE);
         });
 
         it('should return FILE_TOO_LARGE_MULTIPLE when checking multiple files', () => {
             const file = createMockFile('file.pdf', CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE + 1);
             const error = FileUtils.validateAttachment(file, true);
-            expect(error).toBe(CONST.FILE_VALIDATION_ERRORS.FILE_TOO_LARGE_MULTIPLE);
+            expect(error).toBe(CONST.MULTIPLE_ATTACHMENT_FILES_VALIDATION_ERRORS.FILE_TOO_LARGE);
         });
 
         it('should return WRONG_FILE_TYPE for invalid receipt extension', () => {
             const file = createMockFile('receipt.exe', CONST.API_ATTACHMENT_VALIDATIONS.RECEIPT_MAX_SIZE - 1);
             const error = FileUtils.validateAttachment(file, false, true);
-            expect(error).toBe(CONST.FILE_VALIDATION_ERRORS.WRONG_FILE_TYPE);
+            expect(error).toBe(CONST.SINGLE_ATTACHMENT_FILE_VALIDATION_ERRORS.WRONG_FILE_TYPE);
         });
 
         it('should prioritize WRONG_FILE_TYPE over FILE_TOO_LARGE for receipts', () => {