diff --git a/src/elements/earn/portfolio/liquidityProtection/protectedPositions/ProtectedPositionTableCellActions.tsx b/src/elements/earn/portfolio/liquidityProtection/protectedPositions/ProtectedPositionTableCellActions.tsx
index 2fa9b3a2..b52698df 100644
--- a/src/elements/earn/portfolio/liquidityProtection/protectedPositions/ProtectedPositionTableCellActions.tsx
+++ b/src/elements/earn/portfolio/liquidityProtection/protectedPositions/ProtectedPositionTableCellActions.tsx
@@ -1,5 +1,4 @@
 import {
-  fetchProtectedPositions,
   ProtectedPosition,
   ProtectedPositionGrouped,
 } from 'services/web3/protection/positions';
@@ -10,22 +9,11 @@ import { Button } from 'components/button/Button';
 import { WithdrawLiquidityWidget } from '../../withdrawLiquidity/WithdrawLiquidityWidget';
 import { UpgradeBntModal } from '../../v3/UpgradeBntModal';
 import { bntToken } from 'services/web3/config';
-import {
-  getAllBntPositionsAndAmount,
-  setProtectedPositions,
-} from 'store/liquidity/liquidity';
+import { getAllBntPositionsAndAmount } from 'store/liquidity/liquidity';
 import { useAppSelector } from 'store';
 import { getIsV3Exist } from 'store/bancor/pool';
 import { PopoverV3 } from 'components/popover/PopoverV3';
 import { UpgradeTknModal } from '../../v3/UpgradeTknModal';
-import {
-  migrateNotification,
-  rejectNotification,
-  migrateFailedNotification,
-} from 'services/notifications/notifications';
-import { migrateV2Positions } from 'services/web3/protection/migration';
-import { useDispatch } from 'react-redux';
-import { Pool } from 'services/observables/pools';
 
 export const ProtectedPositionTableCellActions = (
   cellData: PropsWithChildren<
@@ -35,27 +23,19 @@ export const ProtectedPositionTableCellActions = (
   const [isOpenWithdraw, setIsOpenWithdraw] = useState(false);
   const [isOpenBnt, setIsOpenBnt] = useState(false);
   const [isOpenTkn, setIsOpenTkn] = useState(false);
-  const dispatch = useDispatch();
   const { row } = cellData;
   const position = row.original;
   const [SelectedPositions, setSelectedPositions] = useState<
     ProtectedPosition[]
   >([]);
-  const isPoolExistV3 = useAppSelector<boolean>((state) =>
+  const isPoolExistV3 = useAppSelector((state) =>
     getIsV3Exist(state, position.reserveToken.address)
   );
-  const totalBNT = useAppSelector<{
-    usdAmount: number;
-    tknAmount: number;
-    bntPositions: ProtectedPosition[];
-  }>(getAllBntPositionsAndAmount);
-  const protocolBnBNTAmount = useAppSelector<number>(
+  const totalBNT = useAppSelector(getAllBntPositionsAndAmount);
+  const protocolBnBNTAmount = useAppSelector(
     (state) => state.liquidity.protocolBnBNTAmount
   );
 
-  const pools = useAppSelector<Pool[]>((state) => state.pool.v2Pools);
-  const account = useAppSelector((state) => state.user.account);
-
   const isMigrateDisabled = useCallback(
     (positions: ProtectedPosition[]) => {
       if (!positions || positions.length === 0) return true;
@@ -76,35 +56,13 @@ export const ProtectedPositionTableCellActions = (
     (positions: ProtectedPosition[]) => {
       const isBnt = positions[0].reserveToken.address === bntToken;
       if (isBnt && protocolBnBNTAmount > totalBNT.tknAmount) {
-        const poolID =
-          totalBNT.bntPositions.length > 0
-            ? totalBNT.bntPositions[0].pool.pool_dlt_id
-            : '';
-        if (totalBNT.bntPositions.every((x) => x.pool.pool_dlt_id === poolID))
-          migrateV2Positions(
-            totalBNT.bntPositions,
-            (txHash: string) => migrateNotification(dispatch, txHash),
-            async () => {
-              const positions = await fetchProtectedPositions(pools, account!);
-              dispatch(setProtectedPositions(positions));
-            },
-            () => rejectNotification(dispatch),
-            () => migrateFailedNotification(dispatch)
-          );
-        else setIsOpenBnt(true);
+        setIsOpenBnt(true);
       } else {
         setSelectedPositions(positions);
         setIsOpenTkn(true);
       }
     },
-    [
-      totalBNT.tknAmount,
-      totalBNT.bntPositions,
-      protocolBnBNTAmount,
-      account,
-      dispatch,
-      pools,
-    ]
+    [totalBNT.tknAmount, protocolBnBNTAmount]
   );
 
   const singleContent = useMemo(() => {
@@ -112,10 +70,10 @@ export const ProtectedPositionTableCellActions = (
     const button = (
       <Button
         onClick={() => migrate([position])}
-        className="text-12 w-[165px] h-[32px] mr-10"
+        className="text-12 w-[145px] h-[32px] mr-10"
         disabled={disabled}
       >
-        Upgrade To V3
+        Upgrade All To V3
       </Button>
     );
     return isPoolExistV3 ? (
@@ -129,7 +87,7 @@ export const ProtectedPositionTableCellActions = (
     ) : (
       <></>
     );
-  }, [position, migrate, isPoolExistV3, isMigrateDisabled]);
+  }, [isMigrateDisabled, position, migrate, isPoolExistV3]);
 
   const groupContent = useMemo(() => {
     const disabled = isMigrateDisabled(position.subRows);
@@ -153,7 +111,7 @@ export const ProtectedPositionTableCellActions = (
     ) : (
       <></>
     );
-  }, [position, migrate, isPoolExistV3, isMigrateDisabled]);
+  }, [isMigrateDisabled, position, isPoolExistV3, migrate]);
   return (
     <div>
       {TableCellExpander({
diff --git a/src/elements/earn/portfolio/v3/UpgradeBntModal.tsx b/src/elements/earn/portfolio/v3/UpgradeBntModal.tsx
index 89c8c551..7c644cf7 100644
--- a/src/elements/earn/portfolio/v3/UpgradeBntModal.tsx
+++ b/src/elements/earn/portfolio/v3/UpgradeBntModal.tsx
@@ -4,10 +4,8 @@ import {
   ProtectedPosition,
   ProtectedPositionGrouped,
 } from 'services/web3/protection/positions';
-import { Button, ButtonSize } from 'components/button/Button';
-import { ReactComponent as IconCheck } from 'assets/icons/circlecheck.svg';
+import { Button, ButtonSize, ButtonVariant } from 'components/button/Button';
 import { useAppSelector } from 'store';
-import { useMemo } from 'react';
 import {
   getAllBntPositionsAndAmount,
   setProtectedPositions,
@@ -20,10 +18,12 @@ import {
 import { migrateV2Positions } from 'services/web3/protection/migration';
 import { useDispatch } from 'react-redux';
 import { Pool } from 'services/observables/pools';
-import { Image } from 'components/image/Image';
-import { PopoverV3 } from 'components/popover/PopoverV3';
-import { EmergencyInfo } from 'components/EmergencyInfo';
 import { useNavigation } from 'hooks/useNavigation';
+import { Image } from 'components/image/Image';
+import { getV3byID } from 'store/bancor/pool';
+import { bntToken } from 'services/web3/config';
+import { useState } from 'react';
+import { updatePortfolioData } from 'services/web3/v3/portfolio/helpers';
 
 export const UpgradeBntModal = ({
   position,
@@ -36,7 +36,9 @@ export const UpgradeBntModal = ({
 }) => {
   const dispatch = useDispatch();
   const { goToPage } = useNavigation();
+  const [txBusy, setTxBusy] = useState(false);
 
+  const poolV3 = useAppSelector((state) => getV3byID(state, bntToken));
   const pools = useAppSelector<Pool[]>((state) => state.pool.v2Pools);
   const account = useAppSelector((state) => state.user.account);
 
@@ -46,21 +48,8 @@ export const UpgradeBntModal = ({
     bntPositions: ProtectedPosition[];
   }>(getAllBntPositionsAndAmount);
 
-  const { withdrawalFee, lockDuration } = useAppSelector(
-    (state) => state.v3Portfolio.withdrawalSettings
-  );
-
-  const lockDurationInDays = useMemo(
-    () => lockDuration / 60 / 60 / 24,
-    [lockDuration]
-  );
-
-  const withdrawalFeeInPercent = useMemo(
-    () => (withdrawalFee * 100).toFixed(2),
-    [withdrawalFee]
-  );
-
   const migrate = (positions: ProtectedPosition[]) => {
+    setTxBusy(true);
     migrateV2Positions(
       positions,
       (txHash: string) => migrateNotification(dispatch, txHash),
@@ -68,71 +57,59 @@ export const UpgradeBntModal = ({
         const positions = await fetchProtectedPositions(pools, account!);
         if (positions.length === 0) goToPage.portfolio();
         dispatch(setProtectedPositions(positions));
+        await updatePortfolioData(dispatch);
       },
       () => rejectNotification(dispatch),
       () => migrateFailedNotification(dispatch)
     );
+    setTxBusy(false);
     setIsOpen(false);
   };
 
   return (
-    <Modal large isOpen={isOpen} setIsOpen={setIsOpen} titleElement={<div />}>
-      <div className="flex flex-col items-center gap-20 p-20 text-center">
-        <Image
-          alt="Token"
-          src={position.reserveToken.logoURI}
-          className="!rounded-full h-50 w-50"
-        />
-        <div>Upgrade BNT</div>
-        <div>
-          Move all BNT to a single pool and earn from all trades in the network
-        </div>
-        <div className="flex flex-col items-center justify-center font-bold text-center text-error">
-          <div>You are migrating from Bancor V2.1 to Bancor V3.</div>
-          <div>Please note that BNT distribution is temporarily paused.</div>
-          <PopoverV3
-            children={<EmergencyInfo />}
-            hover
-            buttonElement={() => (
-              <span className="underline cursor-pointer">More info</span>
-            )}
+    <Modal large isOpen={isOpen} setIsOpen={setIsOpen} title={'Migrate to v3'}>
+      <div className="px-30 pb-30">
+        <p className={'text-secondary text-16 mb-30'}>
+          Move all your BNT to a single pool that earns fees from all trades in
+          the network
+        </p>
+
+        <div
+          className={
+            'bg-secondary rounded-10 p-16 space-x-16 text-20 flex items-center'
+          }
+        >
+          <Image
+            alt={'Token Logo'}
+            src={poolV3?.reserveToken.logoURI}
+            className={'w-40 h-40'}
           />
+          <span>All {poolV3?.name}</span>
         </div>
-        <div className="w-full p-20 bg-fog dark:bg-black rounded-20">
-          <div className="flex items-center justify-between text-18 mb-15">
-            <div>Upgrade all BNT</div>
-          </div>
-          <div className="flex items-center gap-5">
-            <IconCheck className="w-10 text-primary" />
-            Single BNT pool
-          </div>
-          <div className="flex items-center gap-5">
-            <IconCheck className="w-10 text-primary" />
-            Auto-compounding
-          </div>
-          <div className="flex items-center gap-5">
-            <IconCheck className="w-10 text-primary" />
-            Fully upgrade partially protected holdings
-          </div>
-        </div>
+
         <Button
           onClick={() => migrate(totalBNT.bntPositions)}
           size={ButtonSize.Full}
+          className="mt-30 mb-30"
+          variant={ButtonVariant.Secondary}
+          disabled={txBusy}
         >
-          Upgrade All
+          {txBusy
+            ? '... waiting for confirmation'
+            : `Migrate all ${poolV3?.name} to v3`}
         </Button>
-        <button
-          onClick={() =>
-            migrate(
-              position.subRows.length === 0 ? [position] : position.subRows
-            )
-          }
-          className="text-primary"
-        >
-          No Thanks, just BNT from the {position.pool.name}
-        </button>
-        <div className="text-secondary text-[13px]">
-          {`${lockDurationInDays} day cooldown • ${withdrawalFeeInPercent}% withdrawal fee`}
+
+        <div className={'flex justify-center'}>
+          <button
+            onClick={() =>
+              migrate(
+                position.subRows.length === 0 ? [position] : position.subRows
+              )
+            }
+            className="hover:text-primary text-16"
+          >
+            Migrate only BNT from {position.pool.name}
+          </button>
         </div>
       </div>
     </Modal>
diff --git a/src/elements/earn/portfolio/v3/UpgradeTknModal.tsx b/src/elements/earn/portfolio/v3/UpgradeTknModal.tsx
index a77a9bd0..55ee0f8d 100644
--- a/src/elements/earn/portfolio/v3/UpgradeTknModal.tsx
+++ b/src/elements/earn/portfolio/v3/UpgradeTknModal.tsx
@@ -3,10 +3,8 @@ import {
   fetchProtectedPositions,
   ProtectedPosition,
 } from 'services/web3/protection/positions';
-import { Button, ButtonSize } from 'components/button/Button';
-import { ReactComponent as IconCheck } from 'assets/icons/circlecheck.svg';
+import { Button, ButtonSize, ButtonVariant } from 'components/button/Button';
 import { useAppSelector } from 'store';
-import { useMemo } from 'react';
 import { setProtectedPositions } from 'store/liquidity/liquidity';
 import {
   migrateNotification,
@@ -15,11 +13,14 @@ import {
 } from 'services/notifications/notifications';
 import { migrateV2Positions } from 'services/web3/protection/migration';
 import { useDispatch } from 'react-redux';
-import { Pool } from 'services/observables/pools';
 import { Image } from 'components/image/Image';
-import { PopoverV3 } from 'components/popover/PopoverV3';
-import { EmergencyInfo } from 'components/EmergencyInfo';
 import { useNavigation } from 'hooks/useNavigation';
+import { prettifyNumber, toBigNumber } from 'utils/helperFunctions';
+import { Switch, SwitchVariant } from 'components/switch/Switch';
+import { DepositFAQ } from 'elements/earn/pools/poolsTable/v3/DepositFAQ';
+import { getV3byID } from 'store/bancor/pool';
+import { useState } from 'react';
+import { updatePortfolioData } from 'services/web3/v3/portfolio/helpers';
 
 export const UpgradeTknModal = ({
   positions,
@@ -32,26 +33,23 @@ export const UpgradeTknModal = ({
 }) => {
   const dispatch = useDispatch();
   const { goToPage } = useNavigation();
-  const pools = useAppSelector<Pool[]>((state) => state.pool.v2Pools);
+
+  const [txBusy, setTxBusy] = useState(false);
+  const [tosAgreed, setTosAgreed] = useState(false);
+
+  const pools = useAppSelector((state) => state.pool.v2Pools);
   const account = useAppSelector((state) => state.user.account);
   const position = positions.length !== 0 ? positions[0] : undefined;
   const token = position?.reserveToken;
-
-  const { withdrawalFee, lockDuration } = useAppSelector(
-    (state) => state.v3Portfolio.withdrawalSettings
-  );
-
-  const lockDurationInDays = useMemo(
-    () => lockDuration / 60 / 60 / 24,
-    [lockDuration]
+  const poolV3 = useAppSelector((state) =>
+    getV3byID(state, position?.reserveToken.address ?? '')
   );
 
-  const withdrawalFeeInPercent = useMemo(
-    () => (withdrawalFee * 100).toFixed(2),
-    [withdrawalFee]
-  );
+  const extVaultBalanceUsd = poolV3?.extVaultBalance.tkn ?? '0';
+  const hasExtVaultBalance = !toBigNumber(extVaultBalanceUsd).isZero();
 
   const migrate = () => {
+    setTxBusy(true);
     migrateV2Positions(
       positions,
       (txHash: string) => migrateNotification(dispatch, txHash),
@@ -59,62 +57,95 @@ export const UpgradeTknModal = ({
         const positions = await fetchProtectedPositions(pools, account!);
         if (positions.length === 0) goToPage.portfolio();
         dispatch(setProtectedPositions(positions));
+        await updatePortfolioData(dispatch);
       },
       () => rejectNotification(dispatch),
       () => migrateFailedNotification(dispatch)
     );
+    setTxBusy(false);
     setIsOpen(false);
   };
 
   if (!position || !token) return null;
 
   return (
-    <Modal large isOpen={isOpen} setIsOpen={setIsOpen} titleElement={<div />}>
-      <div className="flex flex-col items-center gap-20 p-20 text-center">
-        <Image
-          alt="Token"
-          src={token?.logoURI}
-          className="!rounded-full h-50 w-50"
-        />
-        <div className="text-20">Upgrade {token.symbol}</div>
-        <div className="text-black-low dark:text-white-low">
-          Move all {token.symbol} to Bancor V3
-        </div>
-        <div className="flex flex-col items-center justify-center font-bold text-center text-error">
-          <div>You are migrating from Bancor V2.1 to Bancor V3.</div>
-          <div>Please note that BNT distribution is temporarily paused.</div>
-          <PopoverV3
-            children={<EmergencyInfo />}
-            hover
-            buttonElement={() => (
-              <span className="underline cursor-pointer">More info</span>
-            )}
-          />
-        </div>
-        <div className="w-full p-20 bg-fog dark:bg-black rounded-20">
-          <div className="flex items-center justify-between text-18 mb-15">
-            <div>Upgrade all {token.symbol}</div>
+    <Modal large isOpen={isOpen} setIsOpen={setIsOpen} title={'Migrate to v3'}>
+      <>
+        <div className="p-30 pb-14">
+          <div
+            className={
+              'bg-secondary rounded-10 p-16 space-x-16 text-20 flex items-center mb-20'
+            }
+          >
+            <Image
+              alt={'Token Logo'}
+              src={poolV3?.reserveToken.logoURI}
+              className={'w-40 h-40'}
+            />
+            <span>All {poolV3?.name}</span>
           </div>
-          <div className="flex items-center gap-5">
-            <IconCheck className="w-10 text-primary" />
-            Single Side
-          </div>
-          <div className="flex items-center gap-5">
-            <IconCheck className="w-10 text-primary" />
-            Auto-compounding
-          </div>
-          <div className="flex items-center gap-5">
-            <IconCheck className="w-10 text-primary" />
-            Fully upgrade partially protected holdings
+
+          {hasExtVaultBalance ? (
+            <>
+              <div className={'flex justify-between items-center'}>
+                <div>External Liquidity Protection:</div>
+                <div>{prettifyNumber(extVaultBalanceUsd, true)}</div>
+              </div>
+
+              <hr className={'my-20'} />
+
+              <div className={'text-secondary space-y-20'}>
+                <p>
+                  BNT distribution was disabled. Should this pool be in deficit
+                  when you’re ready to withdraw from v3, you will be compensated
+                  from the external liquidity protection vault.
+                </p>
+                <p>
+                  If the protection vault is empty, your deposit will accrue the
+                  pool deficit during withdrawal from v3.
+                </p>
+              </div>
+            </>
+          ) : (
+            <p className={'text-secondary'}>
+              After migrating to v3, if you withdraw from the v3 pool while it
+              is in deficit, you'll accrue the deficit in the pool. The value
+              changes over time.
+            </p>
+          )}
+          <div
+            className={
+              'flex justify-between mt-20 space-x-20 items-center text-error'
+            }
+          >
+            <Switch
+              variant={SwitchVariant.ERROR}
+              selected={tosAgreed}
+              onChange={setTosAgreed}
+            />
+            <button
+              className={'text-left'}
+              onClick={() => setTosAgreed((prev) => !prev)}
+            >
+              I understand and accept the risks from migrating while BNT
+              distribution is disabled.
+            </button>
           </div>
+
+          <Button
+            onClick={() => migrate()}
+            size={ButtonSize.Full}
+            className="mt-30 mb-14"
+            variant={ButtonVariant.Secondary}
+            disabled={!tosAgreed || txBusy}
+          >
+            {txBusy
+              ? '... waiting for confirmation'
+              : `Migrate all ${poolV3?.name} to v3`}
+          </Button>
         </div>
-        <Button onClick={() => migrate()} size={ButtonSize.Full}>
-          Upgrade All
-        </Button>
-        <div className="text-secondary text-[13px]">
-          {`${lockDurationInDays} day cooldown • ${withdrawalFeeInPercent}% withdrawal fee`}
-        </div>
-      </div>
+        <DepositFAQ />
+      </>
     </Modal>
   );
 };