diff --git a/packages/account/src/Components/icon-message-list/__tests__/icon-message-list.spec.tsx b/packages/account/src/Components/icon-message-list/__tests__/icon-message-list.spec.tsx
index 2591e61a77ff..ef1733cf3e76 100644
--- a/packages/account/src/Components/icon-message-list/__tests__/icon-message-list.spec.tsx
+++ b/packages/account/src/Components/icon-message-list/__tests__/icon-message-list.spec.tsx
@@ -1,6 +1,8 @@
 import React from 'react';
-import { fireEvent, render, screen } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import { Icon } from '@deriv/components';
+import { StoreProvider, mockStore } from '@deriv/stores';
 import IconMessageList from '../icon-message-list';
 
 jest.mock('@deriv/components', () => {
@@ -11,67 +13,61 @@ jest.mock('@deriv/components', () => {
     };
 });
 describe('<IconMessageList/>', () => {
-    const messages_list = ['Sample Text1', 'Sample Text2', 'Sample Text3', 'Sample Text4'];
+    const messages_list = ['DataComparisonDocumentNumbers', 'CompromisedDocument', 'VisualAuthenticityFonts'];
+
+    const mock_props: React.ComponentProps<typeof IconMessageList> = {
+        icon: <Icon icon='sampleIcon' />,
+        message: 'Lorem Ipsom',
+        message_list: messages_list,
+        onContinue: jest.fn(),
+    };
+
+    const store_config = mockStore({ ui: { is_desktop: true } });
+
+    const renderComponent = ({ props = mock_props, store = store_config }) =>
+        render(
+            <StoreProvider store={store}>
+                <IconMessageList {...props} />
+            </StoreProvider>
+        );
+
     it('should render IconMessageList component', () => {
-        render(<IconMessageList />);
+        renderComponent({});
         expect(screen.getByTestId('dt_icon_message_list')).toBeInTheDocument();
     });
 
     it('should render icon passed to the component', () => {
-        render(<IconMessageList icon={<Icon icon='sampleIcon' />} />);
-        expect(screen.getByTestId('mocked_icon')).toBeInTheDocument();
+        renderComponent({});
+        expect(screen.getByText('sampleIcon')).toBeInTheDocument();
+        expect(screen.getByText('IcAlertDanger')).toBeInTheDocument();
     });
+
     it('should show message passed to the component', () => {
-        render(<IconMessageList message={'Lorem Ipsom'} />);
+        renderComponent({});
         expect(screen.getByText(/lorem ipsom/i)).toBeInTheDocument();
     });
-    it('when the length of message_list is less than 3, it should show messages with icons ', () => {
-        render(<IconMessageList message_list={['Sample Text1', 'Sample Text2']} />);
-        expect(screen.getByText(/Sample Text1/i)).toBeInTheDocument();
-        expect(screen.getByText(/Sample Text2/i)).toBeInTheDocument();
-        expect(screen.getAllByText(/icclosecircle/i).length).toBe(2);
-    });
-
-    it('should show first 3 msgs and show_more_btn when the message_list is more than 3', () => {
-        render(<IconMessageList message_list={messages_list} />);
-        expect(screen.getByText(/sample text1/i)).toBeInTheDocument();
-        expect(screen.getByText(/sample text2/i)).toBeInTheDocument();
-        expect(screen.getByText(/sample text3/i)).toBeInTheDocument();
-        expect(screen.queryByText(/sample text4/i)).not.toBeInTheDocument();
-        expect(
-            screen.getByRole('button', {
-                name: /show more/i,
-            })
-        ).toBeInTheDocument();
-        expect(
-            screen.queryByRole('button', {
-                name: /show less/i,
-            })
-        ).not.toBeInTheDocument();
-    });
-
-    it('should show all messages and show_less_btn when show_more btn is clicked', () => {
-        render(<IconMessageList message_list={messages_list} />);
-
-        const show_more_btn = screen.getByRole('button', {
-            name: /show more/i,
-        });
 
-        fireEvent.click(show_more_btn);
-        expect(screen.getByText(/sample text1/i)).toBeInTheDocument();
-        expect(screen.getByText(/sample text2/i)).toBeInTheDocument();
-        expect(screen.getByText(/sample text3/i)).toBeInTheDocument();
-        expect(screen.getByText(/sample text4/i)).toBeInTheDocument();
-        expect(screen.queryByRole('button', { name: /show less/i })).toBeInTheDocument();
-        expect(screen.queryByRole('button', { name: /show more/i })).not.toBeInTheDocument();
+    it('should render the messages based on Onfido Error codes', () => {
+        const new_props = {
+            ...mock_props,
+            message_list: ['DataComparisonDocumentNumbers', 'CompromisedDocument'],
+        };
+        renderComponent({ props: new_props });
+        expect(screen.getByText('Your document appears to be invalid.')).toBeInTheDocument();
+        expect(screen.getByText('Your document failed our verification checks.')).toBeInTheDocument();
     });
 
     it('should show continue_btn if OnContinue is passed', () => {
         const onContinuefn = jest.fn();
-        render(<IconMessageList message_list={['Sample Text1']} onContinue={onContinuefn} />);
-        const upload_btn = screen.queryByRole('button', { name: /upload document/i });
+        const new_props = {
+            ...mock_props,
+            messages_list: ['DataComparisonDocumentNumbers'],
+            onContinue: onContinuefn,
+        };
+        renderComponent({ props: new_props });
+        const upload_btn = screen.queryByRole('button', { name: /verify again/i });
         expect(upload_btn).toBeInTheDocument();
-        fireEvent.click(upload_btn);
+        userEvent.click(upload_btn);
         expect(onContinuefn).toHaveBeenCalled();
     });
 });
diff --git a/packages/account/src/Components/icon-message-list/__tests__/list-item.spec.tsx b/packages/account/src/Components/icon-message-list/__tests__/list-item.spec.tsx
new file mode 100644
index 000000000000..5eae8fece439
--- /dev/null
+++ b/packages/account/src/Components/icon-message-list/__tests__/list-item.spec.tsx
@@ -0,0 +1,26 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import ListItem from '../list-item';
+import { StoreProvider, mockStore } from '@deriv/stores';
+
+describe('<ListItem/>', () => {
+    const store_config = mockStore({});
+
+    const renderComponent = (props: React.ComponentProps<typeof ListItem>) =>
+        render(
+            <StoreProvider store={store_config}>
+                <ListItem {...props} />
+            </StoreProvider>
+        );
+
+    it('should render ListItem component', () => {
+        renderComponent({ text: 'test' });
+        expect(screen.getByText('test')).toBeInTheDocument();
+    });
+
+    it('should render ListItem component with index', () => {
+        renderComponent({ text: 'test', index: 1 });
+        expect(screen.getByText('1.')).toBeInTheDocument();
+        expect(screen.getByText('test')).toBeInTheDocument();
+    });
+});
diff --git a/packages/account/src/Components/icon-message-list/icon-message-list.tsx b/packages/account/src/Components/icon-message-list/icon-message-list.tsx
index 495c9e6a34e8..ea2a6ba997fd 100644
--- a/packages/account/src/Components/icon-message-list/icon-message-list.tsx
+++ b/packages/account/src/Components/icon-message-list/icon-message-list.tsx
@@ -1,44 +1,27 @@
 import React from 'react';
 import classNames from 'classnames';
-import { localize } from '@deriv/translations';
-import { Div100vhContainer, Text, Button, Icon, ThemedScrollbars } from '@deriv/components';
-import { isDesktop, isMobile } from '@deriv/shared';
+import { Div100vhContainer, Text, Button, ThemedScrollbars, Icon } from '@deriv/components';
+import { getOnfidoError } from '@deriv/shared';
+import { observer, useStore } from '@deriv/stores';
+import { Localize } from '@deriv/translations';
+import ListItem from './list-item';
 
-type TListItem = {
-    text?: string;
-};
-
-type TMessage_list = {
-    message_list?: string[];
-};
-
-type TIconMessageList = TMessage_list & {
-    className: string;
+type TIconMessageList = {
+    className?: string;
     icon: React.ReactElement;
     message: string;
+    message_list: Array<string>;
     onContinue: () => void;
 };
 
-const ListItem = ({ text }: TListItem) => (
-    <div className='account-management__list-message'>
-        <div className='account-management__list-icon'>
-            <Icon icon='IcCloseCircle' color='red' />
-        </div>
-        <div className='account-management__list-text-container'>
-            <Text size='xs' className='account-management__list-text'>
-                {text}
-            </Text>
-        </div>
-    </div>
-);
-
-const IconMessageList = ({ className, icon, message, message_list = [], onContinue }: Partial<TIconMessageList>) => {
-    const has_maximum_list = message_list.length > 3;
+const IconMessageList = observer(({ className, icon, message, message_list = [], onContinue }: TIconMessageList) => {
+    const { ui } = useStore();
+    const { is_mobile, is_desktop } = ui;
     return (
-        <ThemedScrollbars is_bypassed={isMobile()}>
+        <ThemedScrollbars is_bypassed={is_mobile}>
             <Div100vhContainer
                 className='account-management__message-wrapper'
-                is_disabled={isDesktop()}
+                is_disabled={is_desktop}
                 height_offset='110px'
             >
                 <div
@@ -62,17 +45,31 @@ const IconMessageList = ({ className, icon, message, message_list = [], onContin
                         className={classNames('account-management__message', {
                             [`${className}__message`]: className,
                         })}
+                        size={is_desktop ? 's' : 'xs'}
                     >
                         {message}
                     </Text>
 
                     {message_list && (
                         <div className='account-management__list-container'>
-                            {has_maximum_list ? (
-                                <MaximumList message_list={message_list} />
-                            ) : (
-                                message_list.map((text, idx) => <ListItem key={idx} text={text} />)
-                            )}
+                            <div className='account-management__list-message'>
+                                <div className='account-management__list-icon'>
+                                    <Icon icon='IcAlertDanger' color='red' />
+                                </div>
+                                <section>
+                                    {message_list.length < 2 ? (
+                                        <ListItem text={getOnfidoError(message_list[0])} />
+                                    ) : (
+                                        message_list.map((text, idx) => (
+                                            <ListItem
+                                                key={text}
+                                                text={getOnfidoError(message_list[idx])}
+                                                index={idx + 1}
+                                            />
+                                        ))
+                                    )}
+                                </section>
+                            </div>
                         </div>
                     )}
                     {onContinue && (
@@ -81,49 +78,15 @@ const IconMessageList = ({ className, icon, message, message_list = [], onContin
                             className='account-management__continue'
                             onClick={onContinue}
                             large
-                            text={localize('Upload Document')}
                             primary
-                        />
+                        >
+                            <Localize i18n_default_text='Verify again' />
+                        </Button>
                     )}
                 </div>
             </Div100vhContainer>
         </ThemedScrollbars>
     );
-};
-
-const MaximumList = ({ message_list }: TMessage_list) => {
-    const [show_more, setShowMore] = React.useState(false);
-    const maximum_list = message_list.slice(0, 3);
-
-    return show_more ? (
-        <React.Fragment>
-            {message_list.map(text => (
-                <ListItem key={text} text={text} />
-            ))}
-            <Button
-                type='button'
-                className='account-management__list-button'
-                onClick={() => setShowMore(false)}
-                large
-                text={localize('Show less')}
-                tertiary
-            />
-        </React.Fragment>
-    ) : (
-        <React.Fragment>
-            {maximum_list.map(text => (
-                <ListItem key={text} text={text} />
-            ))}
-            <Button
-                type='button'
-                className='account-management__list-button'
-                onClick={() => setShowMore(true)}
-                large
-                text={localize('Show more')}
-                tertiary
-            />
-        </React.Fragment>
-    );
-};
+});
 
 export default IconMessageList;
diff --git a/packages/account/src/Components/icon-message-list/list-item.tsx b/packages/account/src/Components/icon-message-list/list-item.tsx
new file mode 100644
index 000000000000..24bef3127ef9
--- /dev/null
+++ b/packages/account/src/Components/icon-message-list/list-item.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import { Text } from '@deriv/components';
+import { observer, useStore } from '@deriv/stores';
+import { Localize } from '@deriv/translations';
+
+type TListItem = {
+    text: React.ReactNode;
+    index?: number;
+};
+
+const ListItem = observer(({ text, index }: TListItem) => {
+    const {
+        ui: { is_desktop },
+    } = useStore();
+    const text_size = is_desktop ? 'xs' : 'xxs';
+    return (
+        <div className='account-management__list-text-container'>
+            {index && (
+                <Text size={text_size} className='account-management__list-text'>
+                    <Localize i18n_default_text='{{index}}.' values={{ index }} />{' '}
+                </Text>
+            )}
+            <Text size={text_size} className='account-management__list-text'>
+                {text}
+            </Text>
+        </div>
+    );
+});
+
+export default ListItem;
diff --git a/packages/account/src/Components/poi/idv-status/idv-failed/__tests__/idv-failed.spec.tsx b/packages/account/src/Components/poi/idv-status/idv-failed/__tests__/idv-failed.spec.tsx
index a6dea68dd7af..aa1b198e5d2c 100644
--- a/packages/account/src/Components/poi/idv-status/idv-failed/__tests__/idv-failed.spec.tsx
+++ b/packages/account/src/Components/poi/idv-status/idv-failed/__tests__/idv-failed.spec.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
 import IdvFailed from '../idv-failed';
-import { idv_error_statuses } from '@deriv/shared';
+import { IDV_ERROR_STATUS } from '@deriv/shared';
 import { StoreProvider, mockStore } from '@deriv/stores';
 
 jest.mock('@deriv/shared', () => ({
@@ -39,7 +39,7 @@ describe('<IdvFailed/>', () => {
         account_settings: {
             citizen: 'gh',
         },
-        mismatch_status: idv_error_statuses.poi_name_mismatch,
+        mismatch_status: IDV_ERROR_STATUS.NameMismatch.code,
         latest_status: {},
     };
 
@@ -56,48 +56,48 @@ describe('<IdvFailed/>', () => {
         renderComponent({});
 
         await waitFor(() => {
-            expect(screen.getByTestId(idv_error_statuses.poi_name_mismatch)).toBeInTheDocument();
+            expect(screen.getByTestId(IDV_ERROR_STATUS.NameMismatch.code)).toBeInTheDocument();
             expect(screen.getByText('PersonalDetailsForm')).toBeInTheDocument();
         });
     });
 
     it('should render IDVfailed component with dob mismatch message', async () => {
-        const new_props = { ...mock_props, mismatch_status: idv_error_statuses.poi_dob_mismatch };
+        const new_props = { ...mock_props, mismatch_status: IDV_ERROR_STATUS.DobMismatch.code };
         renderComponent({ props: new_props });
 
         await waitFor(() => {
-            expect(screen.getByTestId(idv_error_statuses.poi_dob_mismatch)).toBeInTheDocument();
+            expect(screen.getByTestId(IDV_ERROR_STATUS.DobMismatch.code)).toBeInTheDocument();
             expect(screen.queryByText('IDVForm')).not.toBeInTheDocument();
         });
     });
 
     it('should render IDVfailed component with name & DOB mismatch message', async () => {
-        const new_props = { ...mock_props, mismatch_status: idv_error_statuses.poi_name_dob_mismatch };
+        const new_props = { ...mock_props, mismatch_status: IDV_ERROR_STATUS.NameDobMismatch.code };
         renderComponent({ props: new_props });
 
         await waitFor(() => {
-            expect(screen.getByTestId(idv_error_statuses.poi_name_dob_mismatch)).toBeInTheDocument();
+            expect(screen.getByTestId(IDV_ERROR_STATUS.NameDobMismatch.code)).toBeInTheDocument();
             expect(screen.getByRole('button', { name: /Update profile/i })).toBeInTheDocument();
         });
     });
 
     it('should render IDVfailed component with expired message', async () => {
-        const new_props = { ...mock_props, mismatch_status: idv_error_statuses.poi_expired };
+        const new_props = { ...mock_props, mismatch_status: IDV_ERROR_STATUS.Expired.code };
         renderComponent({ props: new_props });
 
         await waitFor(() => {
-            expect(screen.getByTestId(idv_error_statuses.poi_expired)).toBeInTheDocument();
+            expect(screen.getByTestId(IDV_ERROR_STATUS.Expired.code)).toBeInTheDocument();
             expect(screen.getByText('IDVForm')).toBeInTheDocument();
             expect(screen.getByText('PersonalDetailsForm')).toBeInTheDocument();
         });
     });
 
     it('should render IDVfailed component with verification failed message', async () => {
-        const new_props = { ...mock_props, mismatch_status: idv_error_statuses.poi_failed };
+        const new_props = { ...mock_props, mismatch_status: IDV_ERROR_STATUS.Failed.code };
         renderComponent({ props: new_props });
 
         await waitFor(() => {
-            expect(screen.getByTestId(idv_error_statuses.poi_failed)).toBeInTheDocument();
+            expect(screen.getByTestId(IDV_ERROR_STATUS.Failed.code)).toBeInTheDocument();
             expect(screen.getByRole('button', { name: /Verify/i })).toBeInTheDocument();
         });
     });
diff --git a/packages/account/src/Components/poi/idv-status/idv-failed/idv-failed.tsx b/packages/account/src/Components/poi/idv-status/idv-failed/idv-failed.tsx
index f7a4379216d3..abcc5e10c9a5 100644
--- a/packages/account/src/Components/poi/idv-status/idv-failed/idv-failed.tsx
+++ b/packages/account/src/Components/poi/idv-status/idv-failed/idv-failed.tsx
@@ -6,7 +6,7 @@ import { Button, DesktopWrapper, HintBox, Loading, Text } from '@deriv/component
 import {
     filterObjProperties,
     getIDVNotApplicableOption,
-    idv_error_statuses,
+    IDV_ERROR_STATUS,
     isEmptyObject,
     isMobile,
     removeEmptyPropertiesFromObject,
@@ -14,9 +14,8 @@ import {
     toMoment,
     WS,
 } from '@deriv/shared';
+import { useStore } from '@deriv/stores';
 import { Localize, localize } from '@deriv/translations';
-import PoiNameExample from '../../../../Assets/ic-poi-name-example.svg';
-import PoiDobExample from '../../../../Assets/ic-poi-dob-example.svg';
 import PoiNameDobExample from '../../../../Assets/ic-poi-name-dob-example.svg';
 import FormBody from '../../../form-body';
 import IDVForm from '../../../forms/idv-form';
@@ -24,7 +23,6 @@ import FormFooter from '../../../form-footer';
 import FormSubHeader from '../../../form-sub-header';
 import PersonalDetailsForm from '../../../forms/personal-details-form.jsx';
 import {
-    getIDVDocumentType,
     isAdditionalDocumentValid,
     isDocumentNumberValid,
     isDocumentTypeValid,
@@ -37,11 +35,11 @@ import {
     GENERIC_ERROR_MESSAGE,
     DUPLICATE_ACCOUNT_ERROR_MESSAGE,
     CLAIMED_DOCUMENT_ERROR_MESSAGE,
+    generateIDVError,
 } from '../../../../Configs/poi-error-config';
 import { API_ERROR_CODES } from '../../../../Constants/api-error-codes';
 import { TIDVFormValues, TPersonalDetailsForm } from '../../../../Types';
 import LoadErrorMessage from '../../../load-error-message';
-import { useStore } from '@deriv/stores';
 
 type TRestState = {
     api_error: string;
@@ -76,7 +74,7 @@ const IdvFailed = ({
     residence_list,
     account_settings,
     handleSubmit,
-    mismatch_status = idv_error_statuses.poi_failed,
+    mismatch_status = IDV_ERROR_STATUS.Failed.code,
     latest_status,
     selected_country,
 }: TIdvFailed) => {
@@ -98,8 +96,14 @@ const IdvFailed = ({
         changeable_fields: [],
     });
 
+    // Document upload not required for the below error codes
     const is_document_upload_required = React.useMemo(
-        () => [idv_error_statuses.poi_expired, idv_error_statuses.poi_failed].includes(mismatch_status),
+        () =>
+            ![
+                IDV_ERROR_STATUS.DobMismatch.code,
+                IDV_ERROR_STATUS.NameMismatch.code,
+                IDV_ERROR_STATUS.NameDobMismatch.code,
+            ].includes(mismatch_status),
         [mismatch_status]
     );
 
@@ -117,91 +121,6 @@ const IdvFailed = ({
 
     const IDV_NOT_APPLICABLE_OPTION = React.useMemo(() => getIDVNotApplicableOption(), []);
 
-    const generateIDVError = React.useCallback(() => {
-        const document_name = is_document_upload_required
-            ? 'identity document'
-            : getIDVDocumentType(latest_status, chosen_country);
-        switch (mismatch_status) {
-            case idv_error_statuses.poi_name_dob_mismatch:
-                return {
-                    required_fields: ['first_name', 'last_name', 'date_of_birth'],
-                    side_note_image: <PoiNameDobExample />,
-                    inline_note_text: (
-                        <Localize
-                            i18n_default_text='To avoid delays, enter your <0>name</0> and <0>date of birth</0> exactly as they appear on your {{document_name}}.'
-                            components={[<strong key={0} />]}
-                            values={{ document_name }}
-                        />
-                    ),
-                    failure_message: (
-                        <Localize
-                            i18n_default_text="The <0>name</0> and <0>date of birth</0> on your identity document don't match your profile."
-                            components={[<strong key={0} />]}
-                        />
-                    ),
-                };
-            case idv_error_statuses.poi_name_mismatch:
-                return {
-                    required_fields: ['first_name', 'last_name'],
-                    side_note_image: <PoiNameExample />,
-                    inline_note_text: (
-                        <Localize
-                            i18n_default_text='To avoid delays, enter your <0>name</0> exactly as it appears on your {{document_name}}.'
-                            components={[<strong key={0} />]}
-                            values={{ document_name }}
-                        />
-                    ),
-                    failure_message: (
-                        <Localize
-                            i18n_default_text="The <0>name</0> on your identity document doesn't match your profile."
-                            components={[<strong key={0} />]}
-                        />
-                    ),
-                };
-            case idv_error_statuses.poi_dob_mismatch:
-                return {
-                    required_fields: ['date_of_birth'],
-                    side_note_image: <PoiDobExample />,
-                    inline_note_text: (
-                        <Localize
-                            i18n_default_text='To avoid delays, enter your <0>date of birth</0> exactly as it appears on your {{document_name}}.'
-                            components={[<strong key={0} />]}
-                            values={{ document_name }}
-                        />
-                    ),
-                    failure_message: (
-                        <Localize
-                            i18n_default_text="The <0>date of birth</0> on your identity document doesn't match your profile."
-                            components={[<strong key={0} />]}
-                        />
-                    ),
-                };
-            default:
-                return {
-                    required_fields: ['first_name', 'last_name', 'date_of_birth'],
-                    side_note_image: <PoiNameDobExample />,
-                    inline_note_text: (
-                        <Localize
-                            i18n_default_text='To avoid delays, enter your <0>name</0> and <0>date of birth</0> exactly as they appear on your {{document_name}}.'
-                            components={[<strong key={0} />]}
-                            values={{ document_name }}
-                        />
-                    ),
-                    failure_message: (
-                        <Localize
-                            i18n_default_text='{{ banner_message }}'
-                            values={{
-                                banner_message:
-                                    mismatch_status === 'POI_EXPIRED'
-                                        ? 'Your identity document has expired.'
-                                        : 'We were unable to verify the identity document with the details provided.',
-                            }}
-                        />
-                    ),
-                };
-        }
-    }, [latest_status, mismatch_status, chosen_country]);
-
     React.useEffect(() => {
         const initializeFormValues = async (required_fields: string[]) => {
             await WS.wait('get_settings');
@@ -235,7 +154,12 @@ const IdvFailed = ({
 
         setIsAlreadyAttempted(true);
 
-        const error_config = generateIDVError();
+        const error_config = generateIDVError(
+            is_document_upload_required,
+            latest_status,
+            chosen_country,
+            mismatch_status
+        );
         setIdvFailure(error_config);
         initializeFormValues(error_config?.required_fields ?? []).catch(e => {
             setRestState({
diff --git a/packages/account/src/Components/poi/idv-status/idv-submit-complete/__tests__/idv-submit-complete.spec.tsx b/packages/account/src/Components/poi/idv-status/idv-submit-complete/__tests__/idv-submit-complete.spec.tsx
index 5e5dcf0b70dc..a47569a48320 100644
--- a/packages/account/src/Components/poi/idv-status/idv-submit-complete/__tests__/idv-submit-complete.spec.tsx
+++ b/packages/account/src/Components/poi/idv-status/idv-submit-complete/__tests__/idv-submit-complete.spec.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { BrowserRouter } from 'react-router-dom';
 import { render, screen } from '@testing-library/react';
-import { idv_error_statuses } from '@deriv/shared';
+import { IDV_ERROR_STATUS } from '@deriv/shared';
 import IdvSubmitComplete from '../idv-submit-complete';
 import { StoreProvider, mockStore } from '@deriv/stores';
 
@@ -91,7 +91,7 @@ describe('<IdvSubmitComplete/>', () => {
 
         const new_props: TIdvSubmitCompleteProps = {
             ...mock_props,
-            mismatch_status: idv_error_statuses.poi_name_dob_mismatch,
+            mismatch_status: IDV_ERROR_STATUS.NameDobMismatch.code,
         };
         renderComponent({ props: new_props, store_config: new_store });
 
@@ -119,7 +119,7 @@ describe('<IdvSubmitComplete/>', () => {
 
         const new_props: TIdvSubmitCompleteProps = {
             ...mock_props,
-            mismatch_status: idv_error_statuses.poi_expired,
+            mismatch_status: IDV_ERROR_STATUS.Expired.code,
         };
         renderComponent({ props: new_props, store_config: new_store });
 
diff --git a/packages/account/src/Components/poi/idv-status/idv-submit-complete/idv-submit-complete.tsx b/packages/account/src/Components/poi/idv-status/idv-submit-complete/idv-submit-complete.tsx
index decb21d890aa..216fa1d7be5e 100644
--- a/packages/account/src/Components/poi/idv-status/idv-submit-complete/idv-submit-complete.tsx
+++ b/packages/account/src/Components/poi/idv-status/idv-submit-complete/idv-submit-complete.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import classNames from 'classnames';
 import { Text } from '@deriv/components';
-import { idv_error_statuses, TIDVErrorStatus } from '@deriv/shared';
+import { TIDVErrorStatus, IDV_ERROR_STATUS } from '@deriv/shared';
 import { observer, useStore } from '@deriv/stores';
 import { Localize } from '@deriv/translations';
 import IdvDocumentPending from 'Assets/ic-idv-document-pending.svg';
@@ -20,12 +20,12 @@ const IdvSubmitComplete = observer(
         const { is_already_attempted } = client;
 
         const is_mismatch_error =
-            mismatch_status === idv_error_statuses.poi_name_dob_mismatch ||
-            mismatch_status === idv_error_statuses.poi_dob_mismatch ||
-            mismatch_status === idv_error_statuses.poi_name_mismatch;
+            mismatch_status === IDV_ERROR_STATUS.NameDobMismatch.code ||
+            mismatch_status === IDV_ERROR_STATUS.DobMismatch.code ||
+            mismatch_status === IDV_ERROR_STATUS.NameMismatch.code;
 
         const is_expired_or_failed_error =
-            mismatch_status === idv_error_statuses.poi_expired || mismatch_status === idv_error_statuses.poi_failed;
+            mismatch_status === IDV_ERROR_STATUS.Expired.code || mismatch_status === IDV_ERROR_STATUS.Failed.code;
 
         const getHeaderText = () => {
             if (is_already_attempted) {
diff --git a/packages/account/src/Components/poi/poi-country-selector/__tests__/poi-country-selector.spec.tsx b/packages/account/src/Components/poi/poi-country-selector/__tests__/poi-country-selector.spec.tsx
index be59e5489ce0..7c06a03a1a38 100644
--- a/packages/account/src/Components/poi/poi-country-selector/__tests__/poi-country-selector.spec.tsx
+++ b/packages/account/src/Components/poi/poi-country-selector/__tests__/poi-country-selector.spec.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
-import { isDesktop, isMobile } from '@deriv/shared';
+import { IDV_ERROR_STATUS, isDesktop, isMobile } from '@deriv/shared';
 import CountrySelector from '../poi-country-selector';
 import { APIProvider } from '@deriv/api';
 import { StoreProvider, mockStore } from '@deriv/stores';
@@ -90,7 +90,7 @@ describe('<CountrySelector/>', () => {
     });
 
     it('should render error status and country selector when error is verification failed or expired', () => {
-        mock_props.mismatch_status = 'POI_FAILED';
+        mock_props.mismatch_status = IDV_ERROR_STATUS.Failed.code;
 
         renderComponent({ props: mock_props });
 
@@ -128,7 +128,7 @@ describe('<CountrySelector/>', () => {
     });
 
     it('should render high risk error message', () => {
-        mock_props.mismatch_status = 'POI_HIGH_RISK';
+        mock_props.mismatch_status = IDV_ERROR_STATUS.HighRisk.code;
 
         renderComponent({ props: mock_props });
 
diff --git a/packages/account/src/Components/poi/poi-country-selector/poi-country-selector.tsx b/packages/account/src/Components/poi/poi-country-selector/poi-country-selector.tsx
index 75066326c3a3..69f0dd5b3b34 100644
--- a/packages/account/src/Components/poi/poi-country-selector/poi-country-selector.tsx
+++ b/packages/account/src/Components/poi/poi-country-selector/poi-country-selector.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import classNames from 'classnames';
 import { Formik, Field, FormikErrors, FormikValues, FormikHelpers } from 'formik';
 import { Autocomplete, Button, DesktopWrapper, HintBox, MobileWrapper, Text, SelectNative } from '@deriv/components';
-import { idv_error_statuses, isMobile, TIDVErrorStatus } from '@deriv/shared';
+import { IDV_ERROR_STATUS, isMobile, TIDVErrorStatus } from '@deriv/shared';
 import { Localize, localize } from '@deriv/translations';
 import FormFooter from 'Components/form-footer';
 import { POIContext } from '../../../Helpers/poi-context';
@@ -48,20 +48,7 @@ const CountrySelector = ({ handleSelectionNext, is_from_external, mismatch_statu
         handleSelectionNext?.();
     };
 
-    let failed_message: JSX.Element | null = null;
-    if (mismatch_status === idv_error_statuses.poi_expired) {
-        failed_message = <Localize i18n_default_text='Your identity document has expired.' />;
-    }
-    if (mismatch_status === idv_error_statuses.poi_failed) {
-        failed_message = (
-            <Localize i18n_default_text='We were unable to verify the identity document with the details provided.' />
-        );
-    }
-    if (mismatch_status === idv_error_statuses.poi_high_risk) {
-        failed_message = (
-            <Localize i18n_default_text='For enhanced security, we need to reverify your identity. Kindly resubmit your proof of identity to unlock your account.' />
-        );
-    }
+    const failed_message: React.ReactNode = mismatch_status ? IDV_ERROR_STATUS[mismatch_status]?.message ?? null : null;
 
     return (
         <Formik initialValues={initial_form_values} validate={validateFields} onSubmit={submitHandler}>
@@ -85,7 +72,7 @@ const CountrySelector = ({ handleSelectionNext, is_from_external, mismatch_statu
                     >
                         {failed_message ? (
                             <React.Fragment>
-                                <Text className='' align='center' weight='bold' size={isMobile() ? 'xs' : 's'}>
+                                <Text align='center' weight='bold' size={isMobile() ? 'xs' : 's'}>
                                     <Localize i18n_default_text='Your identity verification failed because:' />
                                 </Text>
                                 <HintBox
diff --git a/packages/account/src/Components/poi/status/rejected-reasons/__tests__/rejected-reasons.spec.tsx b/packages/account/src/Components/poi/status/rejected-reasons/__tests__/rejected-reasons.spec.tsx
index 00eba299dfe8..fc1b49bb12c1 100644
--- a/packages/account/src/Components/poi/status/rejected-reasons/__tests__/rejected-reasons.spec.tsx
+++ b/packages/account/src/Components/poi/status/rejected-reasons/__tests__/rejected-reasons.spec.tsx
@@ -1,22 +1,29 @@
 import React from 'react';
 import { render, screen, fireEvent } from '@testing-library/react';
+import { StoreProvider, mockStore } from '@deriv/stores';
 import { RejectedReasons } from '../rejected-reasons';
 
 describe('<RejectedReasons />', () => {
     it('should render RejectedReasons with rejected reasons and trigger continue ', () => {
         const mockHandleRequireSubmission = jest.fn();
-        const rejected_reasons = ['Reason 1', 'Reason 2'];
+        const rejected_reasons = ['DataValidationExpiryDate', 'DataValidationDocumentExpiration'];
+
+        const store_config = mockStore({});
 
         render(
-            <RejectedReasons
-                handleRequireSubmission={mockHandleRequireSubmission}
-                rejected_reasons={rejected_reasons}
-            />
+            <StoreProvider store={store_config}>
+                <RejectedReasons
+                    handleRequireSubmission={mockHandleRequireSubmission}
+                    rejected_reasons={rejected_reasons}
+                />
+            </StoreProvider>
         );
 
         expect(screen.getByTestId('dt_icon_message_list')).toBeInTheDocument();
-        expect(screen.getByText('Reason 1')).toBeInTheDocument();
-        expect(screen.getByText('Reason 2')).toBeInTheDocument();
+        expect(
+            screen.getByText('Some details on your document appear to be invalid, missing, or unclear.')
+        ).toBeInTheDocument();
+        expect(screen.getByText('Your document has expired.')).toBeInTheDocument();
 
         const btn = screen.getByRole('button');
         fireEvent.click(btn);
diff --git a/packages/account/src/Components/poi/status/rejected-reasons/index.js b/packages/account/src/Components/poi/status/rejected-reasons/index.ts
similarity index 100%
rename from packages/account/src/Components/poi/status/rejected-reasons/index.js
rename to packages/account/src/Components/poi/status/rejected-reasons/index.ts
diff --git a/packages/account/src/Configs/__test__/poi-error-config.spec.ts b/packages/account/src/Configs/__test__/poi-error-config.spec.ts
new file mode 100644
index 000000000000..e3a0e36c1acb
--- /dev/null
+++ b/packages/account/src/Configs/__test__/poi-error-config.spec.ts
@@ -0,0 +1,18 @@
+import { generateIDVError } from '../poi-error-config';
+
+describe('generateIDVError', () => {
+    it('should return Name & DOB mismatch error config', () => {
+        const error = generateIDVError(false, {}, { value: 'Country 1', text: 'Country 1' }, 'NameDobMismatch');
+        expect(error.required_fields).toEqual(['first_name', 'last_name', 'date_of_birth']);
+    });
+
+    it('should return Name mismatch error config', () => {
+        const error = generateIDVError(false, {}, { value: 'Country 1', text: 'Country 1' }, 'NameMismatch');
+        expect(error.required_fields).toEqual(['first_name', 'last_name']);
+    });
+
+    it('should return DOB mismatch error config', () => {
+        const error = generateIDVError(false, {}, { value: 'Country 1', text: 'Country 1' }, 'DobMismatch');
+        expect(error.required_fields).toEqual(['date_of_birth']);
+    });
+});
diff --git a/packages/account/src/Configs/poi-error-config.tsx b/packages/account/src/Configs/poi-error-config.tsx
index 301abe6ed681..1141f684616c 100644
--- a/packages/account/src/Configs/poi-error-config.tsx
+++ b/packages/account/src/Configs/poi-error-config.tsx
@@ -1,5 +1,11 @@
-import { Localize } from '@deriv/translations';
 import React from 'react';
+import { GetAccountStatus, ResidenceList } from '@deriv/api-types';
+import { IDV_ERROR_STATUS, getIDVError } from '@deriv/shared';
+import { Localize } from '@deriv/translations';
+import PoiNameDobExample from '../Assets/ic-poi-name-dob-example.svg';
+import PoiNameExample from '../Assets/ic-poi-name-example.svg';
+import PoiDobExample from '../Assets/ic-poi-dob-example.svg';
+import { getIDVDocumentType } from '../Helpers/utils';
 
 const handleOnClick = () => window.LC_API.open_chat_window();
 
@@ -20,3 +26,56 @@ export const CLAIMED_DOCUMENT_ERROR_MESSAGE = (
         components={[<span key={0} className='link link--orange' onClick={handleOnClick} onKeyDown={handleOnClick} />]}
     />
 );
+
+export const generateIDVError = (
+    is_document_upload_required: boolean,
+    latest_status: DeepRequired<GetAccountStatus>['authentication']['attempts']['latest'],
+    chosen_country: DeepRequired<ResidenceList[0]>,
+    mismatch_status: keyof typeof IDV_ERROR_STATUS
+) => {
+    const document_name = is_document_upload_required
+        ? 'identity document'
+        : getIDVDocumentType(latest_status, chosen_country);
+
+    switch (mismatch_status) {
+        case IDV_ERROR_STATUS.NameMismatch.code:
+            return {
+                required_fields: ['first_name', 'last_name'],
+                side_note_image: <PoiNameExample />,
+                inline_note_text: (
+                    <Localize
+                        i18n_default_text='To avoid delays, enter your <0>name</0> exactly as it appears on your {{document_name}}.'
+                        components={[<strong key={0} />]}
+                        values={{ document_name }}
+                    />
+                ),
+                failure_message: IDV_ERROR_STATUS.NameMismatch.message,
+            };
+        case IDV_ERROR_STATUS.DobMismatch.code:
+            return {
+                required_fields: ['date_of_birth'],
+                side_note_image: <PoiDobExample />,
+                inline_note_text: (
+                    <Localize
+                        i18n_default_text='To avoid delays, enter your <0>date of birth</0> exactly as it appears on your {{document_name}}.'
+                        components={[<strong key={0} />]}
+                        values={{ document_name }}
+                    />
+                ),
+                failure_message: IDV_ERROR_STATUS.DobMismatch.message,
+            };
+        default:
+            return {
+                required_fields: ['first_name', 'last_name', 'date_of_birth'],
+                side_note_image: <PoiNameDobExample />,
+                inline_note_text: (
+                    <Localize
+                        i18n_default_text='To avoid delays, enter your <0>name</0> and <0>date of birth</0> exactly as they appear on your {{document_name}}.'
+                        components={[<strong key={0} />]}
+                        values={{ document_name }}
+                    />
+                ),
+                failure_message: getIDVError(mismatch_status),
+            };
+    }
+};
diff --git a/packages/account/src/Helpers/__tests__/utils.spec.tsx b/packages/account/src/Helpers/__tests__/utils.spec.tsx
index d391084d7d9e..afb61cdd87cc 100644
--- a/packages/account/src/Helpers/__tests__/utils.spec.tsx
+++ b/packages/account/src/Helpers/__tests__/utils.spec.tsx
@@ -261,14 +261,14 @@ describe('getOnfidoSupportedLocaleCode', () => {
 
 describe('verifyFields', () => {
     it('should return date field in the list when the error is date of birth', () => {
-        expect(verifyFields('POI_DOB_MISMATCH')).toEqual(['date_of_birth']);
+        expect(verifyFields('DobMismatch')).toEqual(['date_of_birth']);
     });
 
     it('should return first and last name in the list when the error is name', () => {
-        expect(verifyFields('POI_NAME_MISMATCH')).toEqual(['first_name', 'last_name']);
+        expect(verifyFields('NameMismatch')).toEqual(['first_name', 'last_name']);
     });
 
     it('should return first name, last name and dob in the list when the the error is regarding rejection', () => {
-        expect(verifyFields('POI_FAILED')).toEqual(['first_name', 'last_name', 'date_of_birth']);
+        expect(verifyFields('Expired')).toEqual(['first_name', 'last_name', 'date_of_birth']);
     });
 });
diff --git a/packages/account/src/Helpers/utils.tsx b/packages/account/src/Helpers/utils.tsx
index ee68e4af9a72..184e5fd16d32 100644
--- a/packages/account/src/Helpers/utils.tsx
+++ b/packages/account/src/Helpers/utils.tsx
@@ -1,17 +1,17 @@
 import React from 'react';
+import { FormikValues } from 'formik';
 import countries from 'i18n-iso-countries';
-import { Localize, localize } from '@deriv/translations';
+import { ResidenceList, GetAccountStatus } from '@deriv/api-types';
 import {
     filterObjProperties,
     toMoment,
     validLength,
     validName,
     getIDVNotApplicableOption,
-    idv_error_statuses,
+    IDV_ERROR_STATUS,
     AUTH_STATUS_CODES,
 } from '@deriv/shared';
-import { ResidenceList, GetAccountStatus } from '@deriv/api-types';
-import { FormikValues } from 'formik';
+import { Localize, localize } from '@deriv/translations';
 import { getIDVDocuments } from '../Constants/idv-document-config';
 import { TServerError } from '../Types';
 import { LANGUAGE_CODES } from '../Constants/onfido';
@@ -265,12 +265,12 @@ export const validate = <T,>(errors: Record<string, string>, values: T) => {
     };
 };
 
-type TIDVErrorStatus = typeof idv_error_statuses[keyof typeof idv_error_statuses];
+type TIDVErrorStatus = keyof typeof IDV_ERROR_STATUS;
 export const verifyFields = (status: TIDVErrorStatus) => {
     switch (status) {
-        case idv_error_statuses.poi_dob_mismatch:
+        case IDV_ERROR_STATUS.DobMismatch.code:
             return ['date_of_birth'];
-        case idv_error_statuses.poi_name_mismatch:
+        case IDV_ERROR_STATUS.NameMismatch.code:
             return ['first_name', 'last_name'];
         default:
             return ['first_name', 'last_name', 'date_of_birth'];
diff --git a/packages/account/src/Sections/Verification/ProofOfIdentity/onfido.jsx b/packages/account/src/Sections/Verification/ProofOfIdentity/onfido.jsx
index 95a1477d72c7..2eab60ce4491 100644
--- a/packages/account/src/Sections/Verification/ProofOfIdentity/onfido.jsx
+++ b/packages/account/src/Sections/Verification/ProofOfIdentity/onfido.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
+import { formatOnfidoError } from '@deriv/shared';
 import UploadComplete from 'Components/poi/status/upload-complete';
-import Expired from 'Components/poi/status/expired';
 import Verified from 'Components/poi/status/verified';
 import RejectedReasons from 'Components/poi/status/rejected-reasons';
 import Unsupported from 'Components/poi/status/unsupported';
@@ -30,6 +30,8 @@ const Onfido = ({
             );
         case identity_status_codes.rejected:
         case identity_status_codes.suspected:
+        case identity_status_codes.expired: {
+            const submission_errors = formatOnfidoError(status, rejected_reasons);
             if (Number(submissions_left) < 1) {
                 return (
                     <Unsupported
@@ -44,22 +46,15 @@ const Onfido = ({
             }
             return (
                 <RejectedReasons
-                    rejected_reasons={rejected_reasons}
+                    rejected_reasons={submission_errors}
                     handleRequireSubmission={handleRequireSubmission}
                 />
             );
+        }
         case identity_status_codes.verified:
             return (
                 <Verified is_from_external={is_from_external} needs_poa={needs_poa} redirect_button={redirect_button} />
             );
-        case identity_status_codes.expired:
-            return (
-                <Expired
-                    is_from_external={is_from_external}
-                    redirect_button={redirect_button}
-                    handleRequireSubmission={handleRequireSubmission}
-                />
-            );
         default:
             return null;
     }
diff --git a/packages/account/src/Sections/Verification/ProofOfIdentity/proof-of-identity-submission.jsx b/packages/account/src/Sections/Verification/ProofOfIdentity/proof-of-identity-submission.jsx
index 10dab8e86153..13f959a12765 100644
--- a/packages/account/src/Sections/Verification/ProofOfIdentity/proof-of-identity-submission.jsx
+++ b/packages/account/src/Sections/Verification/ProofOfIdentity/proof-of-identity-submission.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { formatIDVError, WS, idv_error_statuses } from '@deriv/shared';
+import { formatIDVError, WS, IDV_ERROR_STATUS } from '@deriv/shared';
 import { observer, useStore } from '@deriv/stores';
 import CountrySelector from 'Components/poi/poi-country-selector';
 import IdvDocumentSubmit from 'Components/poi/idv-document-submit';
@@ -127,10 +127,11 @@ const POISubmission = observer(
                 setIdentityService(identity_last_attempt);
             } else if (
                 mismatch_status &&
-                ![
-                    idv_error_statuses.poi_expired,
-                    idv_error_statuses.poi_failed,
-                    idv_error_statuses.poi_high_risk,
+                [
+                    IDV_ERROR_STATUS.DobMismatch.code,
+                    IDV_ERROR_STATUS.NameMismatch.code,
+                    IDV_ERROR_STATUS.NameDobMismatch.code,
+                    IDV_ERROR_STATUS.HighRisk.code,
                 ].includes(mismatch_status) &&
                 idv.submissions_left > 0
             ) {
@@ -186,7 +187,6 @@ const POISubmission = observer(
                         const country_code = selected_country.value;
                         const doc_obj = selected_country.identity.services.onfido.documents_supported;
                         const documents_supported = Object.keys(doc_obj).map(d => doc_obj[d].display_name);
-
                         return (
                             <OnfidoSdkViewContainer
                                 country_code={country_code}
diff --git a/packages/account/src/Styles/account.scss b/packages/account/src/Styles/account.scss
index d7d4c0eef6f7..8ef4c9ff4f2c 100644
--- a/packages/account/src/Styles/account.scss
+++ b/packages/account/src/Styles/account.scss
@@ -627,9 +627,14 @@ $MIN_HEIGHT_FLOATING: calc(
         &__list {
             &-container {
                 margin-top: 1.6rem;
-                max-width: 50.6rem;
+                width: 100%;
                 display: flex;
                 flex-direction: column;
+                border-radius: 0.8rem;
+                background: $color-status-error;
+                padding: 0.8rem;
+                align-items: flex-start;
+                gap: 0.8rem;
             }
 
             &-icon {
@@ -668,6 +673,10 @@ $MIN_HEIGHT_FLOATING: calc(
                 align-items: center;
                 flex-direction: column;
 
+                @include mobile {
+                    justify-content: center;
+                }
+
                 .dc-btn {
                     height: 4rem;
                     margin-top: 3.2rem;
@@ -675,7 +684,6 @@ $MIN_HEIGHT_FLOATING: calc(
                     @include mobile {
                         margin: 1.6rem 0;
                         padding: 1.6rem;
-                        width: 100%;
                     }
                 }
             }
@@ -683,15 +691,9 @@ $MIN_HEIGHT_FLOATING: calc(
             &-icon {
                 width: 12.8rem;
                 height: 12.8rem;
-                margin-top: 8rem;
-
-                @include mobile {
-                    margin-top: 4rem;
 
-                    /* iPhone SE screen height fixes due to UI space restrictions */
-                    @media only screen and (max-height: 480px) {
-                        margin-top: 3.2rem;
-                    }
+                @include desktop {
+                    margin-top: 8rem;
                 }
             }
 
diff --git a/packages/shared/src/utils/constants/idv-failure-codes.ts b/packages/shared/src/utils/constants/idv-failure-codes.ts
deleted file mode 100644
index 2b19a044278d..000000000000
--- a/packages/shared/src/utils/constants/idv-failure-codes.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export const idv_error_statuses = Object.freeze({
-    poi_name_dob_mismatch: 'POI_NAME_DOB_MISMATCH',
-    poi_dob_mismatch: 'POI_DOB_MISMATCH',
-    poi_name_mismatch: 'POI_NAME_MISMATCH',
-    poi_expired: 'POI_EXPIRED',
-    poi_failed: 'POI_FAILED',
-    poi_high_risk: 'POI_HIGH_RISK',
-});
diff --git a/packages/shared/src/utils/constants/index.ts b/packages/shared/src/utils/constants/index.ts
index 09c0e6b6dc70..d1ec0ed49692 100644
--- a/packages/shared/src/utils/constants/index.ts
+++ b/packages/shared/src/utils/constants/index.ts
@@ -5,6 +5,6 @@ export * from './default-options';
 export * from './jurisdictions-config';
 export * from './signup_fields';
 export * from './error';
+export * from './poi-failure-codes';
 export * from './mt5-login-list-status';
-export * from './idv-failure-codes';
 export * from './auth-status-codes';
diff --git a/packages/shared/src/utils/constants/poi-failure-codes.tsx b/packages/shared/src/utils/constants/poi-failure-codes.tsx
new file mode 100644
index 000000000000..ea97d2d0f8c3
--- /dev/null
+++ b/packages/shared/src/utils/constants/poi-failure-codes.tsx
@@ -0,0 +1,345 @@
+import React from 'react';
+import { Localize } from '@deriv/translations';
+
+type TIDVErrorStatus = Readonly<{
+    [key: string]: {
+        code: keyof typeof IDV_ERROR_STATUS;
+        message: React.ReactNode;
+    };
+}>;
+
+type TOnfidoErrorStatus = Readonly<{
+    [key: string]: {
+        code: keyof typeof ONFIDO_ERROR_STATUS;
+        message: React.ReactNode;
+    };
+}>;
+
+export const IDV_ERROR_STATUS: TIDVErrorStatus = Object.freeze({
+    DobMismatch: {
+        code: 'DobMismatch',
+        message: (
+            <Localize
+                i18n_default_text="The <0>date of birth</0> on your identity document doesn't match your profile."
+                components={[<strong key={0} />]}
+            />
+        ),
+    },
+    DocumentRejected: {
+        code: 'DocumentRejected',
+        message: (
+            <Localize i18n_default_text='We were unable to verify the identity document with the details provided.' />
+        ),
+    },
+    EmptyStatus: {
+        code: 'EmptyStatus',
+        message: <Localize i18n_default_text='The verification status was empty, rejected for lack of information.' />,
+    },
+    Expired: { code: 'Expired', message: <Localize i18n_default_text='Your identity document has expired.' /> },
+    InformationLack: {
+        code: 'InformationLack',
+        message: (
+            <Localize i18n_default_text='The verification is passed but the personal info is not available to compare.' />
+        ),
+    },
+    MalformedJson: {
+        code: 'MalformedJson',
+        message: (
+            <Localize i18n_default_text='The verification status is not available, provider says: Malformed JSON.' />
+        ),
+    },
+    NameMismatch: {
+        code: 'NameMismatch',
+        message: (
+            <Localize
+                i18n_default_text="The <0>name</0> on your identity document doesn't match your profile."
+                components={[<strong key={0} />]}
+            />
+        ),
+    },
+    RejectedByProvider: {
+        code: 'RejectedByProvider',
+        message: <Localize i18n_default_text='The document was rejected by the Provider.' />,
+    },
+    Underage: {
+        code: 'Underage',
+        message: <Localize i18n_default_text='You’re under legal age.' />,
+    },
+    Deceased: {
+        code: 'Deceased',
+        message: <Localize i18n_default_text='The document’s owner is deceased.' />,
+    },
+    Failed: {
+        code: 'Failed',
+        message: (
+            <Localize i18n_default_text='We were unable to verify the identity document with the details provided.' />
+        ),
+    },
+    NameDobMismatch: {
+        code: 'NameDobMismatch',
+        message: (
+            <Localize
+                i18n_default_text="The <0>name</0> and <0>date of birth</0> on your identity document don't match your profile."
+                components={[<strong key={0} />]}
+            />
+        ),
+    },
+    NeedsTechnicalInvestigation: {
+        code: 'NeedsTechnicalInvestigation',
+        message: (
+            <Localize i18n_default_text='The verification status is not available, provider says: Needs Technical Investigation.' />
+        ),
+    },
+    HighRisk: {
+        code: 'HighRisk',
+        message: (
+            <Localize i18n_default_text='For enhanced security, we need to reverify your identity. Kindly resubmit your proof of identity to unlock your account.' />
+        ),
+    },
+});
+
+export const ONFIDO_ERROR_STATUS: TOnfidoErrorStatus = Object.freeze({
+    AgeValidationMinimumAcceptedAge: {
+        code: 'AgeValidationMinimumAcceptedAge',
+        message: (
+            <Localize i18n_default_text='Your age in the document you provided appears to be below 18 years. We’re only allowed to offer our services to clients above 18 years old, so we’ll need to close your account. If you have a balance in your account, contact us via live chat and we’ll help to withdraw your funds before your account is closed.' />
+        ),
+    },
+    CompromisedDocument: {
+        code: 'CompromisedDocument',
+        message: <Localize i18n_default_text='Your document failed our verification checks.' />,
+    },
+    DataComparisonDateOfBirth: {
+        code: 'DataComparisonDateOfBirth',
+        message: <Localize i18n_default_text='The date of birth on your document doesn’t match your profile.' />,
+    },
+    DataComparisonDateOfExpiry: {
+        code: 'DataComparisonDateOfExpiry',
+        message: <Localize i18n_default_text='Your document has expired.' />,
+    },
+    DataComparisonDocumentNumbers: {
+        code: 'DataComparisonDocumentNumbers',
+        message: <Localize i18n_default_text='Your document appears to be invalid.' />,
+    },
+    DataComparisonDocumentType: {
+        code: 'DataComparisonDocumentType',
+        message: <Localize i18n_default_text='Your document appears to be invalid.' />,
+    },
+    DataComparisonIssuingCountry: {
+        code: 'DataComparisonIssuingCountry',
+        message: <Localize i18n_default_text='Your document appears to be invalid.' />,
+    },
+    DataComparisonName: {
+        code: 'DataComparisonName',
+        message: <Localize i18n_default_text='The name on your document doesn’t match your profile.' />,
+    },
+    DataValidationDateOfBirth: {
+        code: 'DataValidationDateOfBirth',
+        message: (
+            <Localize i18n_default_text='Some details on your document appear to be invalid, missing, or unclear.' />
+        ),
+    },
+    DataValidationDocumentExpiration: {
+        code: 'DataValidationDocumentExpiration',
+        message: <Localize i18n_default_text='Your document has expired.' />,
+    },
+    DataValidationDocumentNumbers: {
+        code: 'DataValidationDocumentNumbers',
+        message: (
+            <Localize i18n_default_text='Some details in your document appear to be invalid, missing, or unclear.' />
+        ),
+    },
+    DataValidationExpiryDate: {
+        code: 'DataValidationExpiryDate',
+        message: (
+            <Localize i18n_default_text='Some details on your document appear to be invalid, missing, or unclear.' />
+        ),
+    },
+    DataValidationMrz: {
+        code: 'DataValidationMrz',
+        message: (
+            <Localize i18n_default_text='Some details on your document appear to be invalid, missing, or unclear.' />
+        ),
+    },
+    DataValidationNoDocumentNumbers: {
+        code: 'DataValidationNoDocumentNumbers',
+        message: <Localize i18n_default_text='The serial number of your document couldn’t be verified.' />,
+    },
+    Expired: { code: 'Expired', message: <Localize i18n_default_text='Your document has expired.' /> },
+    ImageIntegrityColourPicture: {
+        code: 'ImageIntegrityColourPicture',
+        message: (
+            <Localize i18n_default_text='Your document appears to be in black and white. Please upload a colour photo of your document.' />
+        ),
+    },
+    ImageIntegrityConclusiveDocumentQuality: {
+        code: 'ImageIntegrityConclusiveDocumentQuality',
+        message: <Localize i18n_default_text='Your document appears to be invalid.' />,
+    },
+    ImageIntegrityConclusiveDocumentQualityAbnormalDocumentFeatures: {
+        code: 'ImageIntegrityConclusiveDocumentQualityAbnormalDocumentFeatures',
+        message: (
+            <Localize i18n_default_text='Some details on your document appear to be invalid, missing, or unclear.' />
+        ),
+    },
+    ImageIntegrityConclusiveDocumentQualityCornerRemoved: {
+        code: 'ImageIntegrityConclusiveDocumentQualityCornerRemoved',
+        message: <Localize i18n_default_text='Your document appears to be damaged or cropped.' />,
+    },
+    ImageIntegrityConclusiveDocumentQualityDigitalDocument: {
+        code: 'ImageIntegrityConclusiveDocumentQualityDigitalDocument',
+        message: <Localize i18n_default_text='Your document appears to be a digital document.' />,
+    },
+    ImageIntegrityConclusiveDocumentQualityMissingBack: {
+        code: 'ImageIntegrityConclusiveDocumentQualityMissingBack',
+        message: (
+            <Localize i18n_default_text='The back of your document appears to be missing. Please include both sides of your identity document.' />
+        ),
+    },
+    ImageIntegrityConclusiveDocumentQualityObscuredDataPoints: {
+        code: 'ImageIntegrityConclusiveDocumentQualityObscuredDataPoints',
+        message: (
+            <Localize i18n_default_text='Some details on your document appear to be invalid, missing, or unclear.' />
+        ),
+    },
+    ImageIntegrityConclusiveDocumentQualityObscuredSecurityFeatures: {
+        code: 'ImageIntegrityConclusiveDocumentQualityObscuredSecurityFeatures',
+        message: (
+            <Localize i18n_default_text='Some details on your document appear to be invalid, missing, or unclear.' />
+        ),
+    },
+    ImageIntegrityConclusiveDocumentQualityPuncturedDocument: {
+        code: 'ImageIntegrityConclusiveDocumentQualityPuncturedDocument',
+        message: <Localize i18n_default_text='Your document appears to be damaged or cropped.' />,
+    },
+    ImageIntegrityConclusiveDocumentQualityWatermarksDigitalTextOverlay: {
+        code: 'ImageIntegrityConclusiveDocumentQualityWatermarksDigitalTextOverlay',
+        message: (
+            <Localize i18n_default_text='Your document contains markings or text that should not be on your document.' />
+        ),
+    },
+    ImageIntegrityImageQuality: {
+        code: 'ImageIntegrityImageQuality',
+        message: (
+            <Localize i18n_default_text='The image quality of your document is too low. Please provide a hi-res photo of your identity document.' />
+        ),
+    },
+    ImageIntegrityImageQualityBlurredPhoto: {
+        code: 'ImageIntegrityImageQualityBlurredPhoto',
+        message: (
+            <Localize i18n_default_text="We were unable to verify your selfie because it’s not clear. Please take a clearer photo and try again. Ensure that there's enough light where you are and that your entire face is in the frame." />
+        ),
+    },
+    ImageIntegrityImageQualityCoveredPhoto: {
+        code: 'ImageIntegrityImageQualityCoveredPhoto',
+        message: (
+            <Localize i18n_default_text='We’re unable to verify the document you provided because some details appear to be missing. Please try again or provide another document.' />
+        ),
+    },
+    ImageIntegrityImageQualityCutOffDocument: {
+        code: 'ImageIntegrityImageQualityCutOffDocument',
+        message: (
+            <Localize i18n_default_text='We’re unable to verify the document you provided because it appears to be damaged. Please try again or upload another document.' />
+        ),
+    },
+    ImageIntegrityImageQualityDamagedDocument: {
+        code: 'ImageIntegrityImageQualityDamagedDocument',
+        message: (
+            <Localize i18n_default_text='We’re unable to verify the document you provided because it appears to be damaged. Please try again or upload another document.' />
+        ),
+    },
+    ImageIntegrityImageQualityDarkPhoto: {
+        code: 'ImageIntegrityImageQualityDarkPhoto',
+        message: (
+            <Localize i18n_default_text='We were unable to verify your selfie because it’s not clear. Please take a clearer photo and try again. Ensure that there’s enough light where you are and that your entire face is in the frame.' />
+        ),
+    },
+    ImageIntegrityImageQualityGlareOnPhoto: {
+        code: 'ImageIntegrityImageQualityGlareOnPhoto',
+        message: (
+            <Localize i18n_default_text='We were unable to verify your selfie because it’s not clear. Please take a clearer photo and try again. Ensure that there’s enough light where you are and that your entire face is in the frame.' />
+        ),
+    },
+    ImageIntegrityImageQualityIncorrectSide: {
+        code: 'ImageIntegrityImageQualityIncorrectSide',
+        message: (
+            <Localize i18n_default_text='The front of your document appears to be missing. Please provide both sides of your identity document.' />
+        ),
+    },
+    ImageIntegrityImageQualityNoDocumentInImage: {
+        code: 'ImageIntegrityImageQualityNoDocumentInImage',
+        message: (
+            <Localize i18n_default_text='We’re unable to verify the document you provided because it appears to be a blank image. Please try again or upload another document.' />
+        ),
+    },
+    ImageIntegrityImageQualityOtherPhotoIssue: {
+        code: 'ImageIntegrityImageQualityOtherPhotoIssue',
+        message: (
+            <Localize i18n_default_text='We’re unable to verify the document you provided because some details appear to be missing. Please try again or provide another document.' />
+        ),
+    },
+    ImageIntegrityImageQualityTwoDocumentsUploaded: {
+        code: 'ImageIntegrityImageQualityTwoDocumentsUploaded',
+        message: (
+            <Localize i18n_default_text='The document you provided appears to be two different types. Please try again or provide another document.' />
+        ),
+    },
+    ImageIntegritySupportedDocument: {
+        code: 'ImageIntegritySupportedDocument',
+        message: (
+            <Localize i18n_default_text='The document you provided is not supported for your country. Please provide a supported document for your country.' />
+        ),
+    },
+    SelfieRejected: {
+        code: 'SelfieRejected',
+        message: <Localize i18n_default_text='Your selfie does not match your document.' />,
+    },
+    VisualAuthenticityDigitalTampering: {
+        code: 'VisualAuthenticityDigitalTampering',
+        message: <Localize i18n_default_text='Your document appears to be invalid.' />,
+    },
+    VisualAuthenticityFaceDetection: {
+        code: 'VisualAuthenticityFaceDetection',
+        message: <Localize i18n_default_text='Your document appears to be invalid.' />,
+    },
+    VisualAuthenticityFonts: {
+        code: 'VisualAuthenticityFonts',
+        message: <Localize i18n_default_text='Your document appears to be invalid.' />,
+    },
+    VisualAuthenticityOriginalDocumentPresent: {
+        code: 'VisualAuthenticityOriginalDocumentPresent',
+        message: (
+            <Localize i18n_default_text='Your document appears to be a scanned copy that contains markings or text that shouldn’t be on your document.' />
+        ),
+    },
+    VisualAuthenticityOriginalDocumentPresentDocumentOnPrintedPaper: {
+        code: 'VisualAuthenticityOriginalDocumentPresentDocumentOnPrintedPaper',
+        message: <Localize i18n_default_text='Your document appears to be a printed copy.' />,
+    },
+    VisualAuthenticityOriginalDocumentPresentPhotoOfScreen: {
+        code: 'VisualAuthenticityOriginalDocumentPresentPhotoOfScreen',
+        message: <Localize i18n_default_text='Your document appears to be a photo of a device screen.' />,
+    },
+    VisualAuthenticityOriginalDocumentPresentScan: {
+        code: 'VisualAuthenticityOriginalDocumentPresentScan',
+        message: (
+            <Localize i18n_default_text='We’re unable to verify the document you provided because it contains markings or text that should not be on your document. Please provide a clear photo or a scan of your original identity document.' />
+        ),
+    },
+    VisualAuthenticityOriginalDocumentPresentScreenshot: {
+        code: 'VisualAuthenticityOriginalDocumentPresentScreenshot',
+        message: <Localize i18n_default_text='Your document appears to be a screenshot.' />,
+    },
+    VisualAuthenticityPictureFaceIntegrity: {
+        code: 'VisualAuthenticityPictureFaceIntegrity',
+        message: <Localize i18n_default_text='Your document appears to be invalid.' />,
+    },
+    VisualAuthenticitySecurityFeatures: {
+        code: 'VisualAuthenticitySecurityFeatures',
+        message: <Localize i18n_default_text='Your document appears to be invalid.' />,
+    },
+    VisualAuthenticityTemplate: {
+        code: 'VisualAuthenticityTemplate',
+        message: <Localize i18n_default_text='Your document appears to be invalid.' />,
+    },
+});
diff --git a/packages/shared/src/utils/helpers/format-response.ts b/packages/shared/src/utils/helpers/format-response.ts
index 0521403b7815..400f73913a25 100644
--- a/packages/shared/src/utils/helpers/format-response.ts
+++ b/packages/shared/src/utils/helpers/format-response.ts
@@ -1,6 +1,11 @@
 import { GetSettings, ProfitTable, ResidenceList, Statement } from '@deriv/api-types';
-import { idv_error_statuses } from '../constants/idv-failure-codes';
-import { getContractTypeFeatureFlag, getUnsupportedContracts, STATUS_CODES } from '../constants';
+import {
+    getContractTypeFeatureFlag,
+    getUnsupportedContracts,
+    STATUS_CODES,
+    IDV_ERROR_STATUS,
+    ONFIDO_ERROR_STATUS,
+} from '../constants';
 import { getSymbolDisplayName, TActiveSymbols } from './active-symbols';
 import { getMarketInformation } from './market-underlying';
 import { TContractInfo } from '../contract';
@@ -58,10 +63,11 @@ export const formatPortfolioPosition = (
     };
 };
 
-export type TIDVErrorStatus = typeof idv_error_statuses[keyof typeof idv_error_statuses];
+export type TIDVErrorStatus = keyof typeof IDV_ERROR_STATUS;
+export type TOnfidoErrorStatus = keyof typeof ONFIDO_ERROR_STATUS;
 
 //formatIDVError is parsing errors messages from BE (strings) and returns error codes for using it on FE
-export const formatIDVError = (errors: string[], status_code: string, is_high_risk?: boolean) => {
+export const formatIDVError = (errors: Array<TIDVErrorStatus>, status_code: string, is_high_risk?: boolean) => {
     /**
      * Check required incase of DIEL client
      */
@@ -72,29 +78,43 @@ export const formatIDVError = (errors: string[], status_code: string, is_high_ri
     ) {
         return null;
     }
+
     if (is_high_risk && status_code === STATUS_CODES.VERIFIED) {
-        return idv_error_statuses.poi_high_risk;
+        return IDV_ERROR_STATUS.HighRisk.code;
     }
-    const error_keys: Record<string, TIDVErrorStatus> = {
-        name: 'POI_NAME_MISMATCH',
-        birth: 'POI_DOB_MISMATCH',
-        rejected: 'POI_FAILED',
-    };
+
     if (status_code === STATUS_CODES.EXPIRED) {
-        return idv_error_statuses.poi_expired;
+        return IDV_ERROR_STATUS.Expired.code;
     }
-    const status: TIDVErrorStatus[] = [];
+
+    const status: Array<TIDVErrorStatus> = [];
     errors.forEach(error => {
-        const error_regex = RegExp(/(name|birth|rejected)/i).exec(error);
-        if (error_regex) {
-            status.push(error_keys[error_regex[0].toLowerCase()]);
+        const error_key: TIDVErrorStatus = IDV_ERROR_STATUS[error].code;
+        if (error_key) {
+            status.push(error_key);
         }
     });
-    return status.includes(error_keys.name) &&
-        status.includes(error_keys.birth) &&
-        !status.includes(error_keys.rejected)
-        ? idv_error_statuses.poi_name_dob_mismatch
-        : status[0] ?? idv_error_statuses.poi_failed;
+
+    return status.includes(IDV_ERROR_STATUS.NameMismatch.code) &&
+        status.includes(IDV_ERROR_STATUS.DobMismatch.code) &&
+        !status.includes(IDV_ERROR_STATUS.Failed.code)
+        ? IDV_ERROR_STATUS.NameDobMismatch.code
+        : status[0] ?? IDV_ERROR_STATUS.Failed.code;
+};
+
+export const formatOnfidoError = (status_code: string, errors: Array<TOnfidoErrorStatus> = []) => {
+    if (status_code === STATUS_CODES.EXPIRED) {
+        return [ONFIDO_ERROR_STATUS.Expired.code, ...errors];
+    }
+    return errors;
+};
+
+export const getOnfidoError = (error: TOnfidoErrorStatus) => {
+    return ONFIDO_ERROR_STATUS[error]?.message ?? '';
+};
+
+export const getIDVError = (error: TIDVErrorStatus) => {
+    return IDV_ERROR_STATUS[error]?.message ?? '';
 };
 
 export const isVerificationServiceSupported = (