diff --git a/package.json b/package.json
index 478f281355..01e89979b7 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
     "react-qrcode-logo": "^2.8.0",
     "react-redux": "^7.2.9",
     "react-rnd": "10.4.1",
-    "react-router-dom": "^6.4.3",
+    "react-router-dom": "6.5.0",
     "react-spring": "^9.6.1",
     "react-use": "^15.3.4",
     "react-use-gesture": "^6.0.14",
diff --git a/src/components/PoolList/ItemCard/index.tsx b/src/components/PoolList/ItemCard/index.tsx
index e5d12aabbd..a0d9f6a25c 100644
--- a/src/components/PoolList/ItemCard/index.tsx
+++ b/src/components/PoolList/ItemCard/index.tsx
@@ -4,7 +4,7 @@ import { parseUnits } from 'ethers/lib/utils'
 import JSBI from 'jsbi'
 import { useEffect, useState } from 'react'
 import { AlertTriangle, BarChart2, Minus, Plus, Share2 } from 'react-feather'
-import { Link, useNavigate } from 'react-router-dom'
+import { Link } from 'react-router-dom'
 import { Box, Flex, Text } from 'rebass'
 import styled from 'styled-components'
 
@@ -71,7 +71,6 @@ const formatPriceMax = (price?: Fraction) => {
 const ItemCard = ({ poolData, myLiquidity }: ListItemProps) => {
   const { chainId, networkInfo } = useActiveWeb3React()
   const amp = new Fraction(poolData.amp).divide(JSBI.BigInt(SUBGRAPH_AMP_MULTIPLIER))
-  const navigate = useNavigate()
   const [showDetail, setShowDetail] = useState(false)
 
   const { data: uniqueAndActiveFarms } = useActiveAndUniqueFarmsData()
@@ -179,7 +178,10 @@ const ItemCard = ({ poolData, myLiquidity }: ListItemProps) => {
         as={Link}
         to={
           isHaveLiquidity
-            ? `/remove/${currencyId(currency0, chainId)}/${currencyId(currency1, chainId)}/${poolData.id}`
+            ? `/${networkInfo.route}${APP_PATHS.CLASSIC_REMOVE_POOL}/${currencyId(currency0, chainId)}/${currencyId(
+                currency1,
+                chainId,
+              )}/${poolData.id}`
             : `${APP_PATHS.SWAP}/${networkInfo.route}?inputCurrency=${currencyId(
                 currency0,
                 chainId,
@@ -207,15 +209,16 @@ const ItemCard = ({ poolData, myLiquidity }: ListItemProps) => {
         )}
       </ButtonOutlined>
       <ButtonLight
-        onClick={() => {
-          const url = `/add/${currencyId(currency0, chainId)}/${currencyId(currency1, chainId)}/${poolData.id}`
-          navigate(url)
-        }}
+        as={Link}
         style={{
           padding: '10px',
           fontWeight: 500,
           height: '36px',
         }}
+        to={`/${networkInfo.route}${APP_PATHS.CLASSIC_ADD_LIQ}/${currencyId(currency0, chainId)}/${currencyId(
+          currency1,
+          chainId,
+        )}/${poolData.id}`}
       >
         <Plus size={16} />
         <Text marginLeft="4px" fontSize="12px">
diff --git a/src/components/PoolList/ListItem.tsx b/src/components/PoolList/ListItem.tsx
index a450b9173f..60a6bb925a 100644
--- a/src/components/PoolList/ListItem.tsx
+++ b/src/components/PoolList/ListItem.tsx
@@ -5,7 +5,7 @@ import { rgba } from 'polished'
 import React from 'react'
 import { AlertTriangle, Info, Minus, Plus, Share2 } from 'react-feather'
 import { useDispatch } from 'react-redux'
-import { Link, useNavigate } from 'react-router-dom'
+import { Link } from 'react-router-dom'
 import { Flex, Text } from 'rebass'
 
 import { ButtonEmpty } from 'components/Button'
@@ -43,8 +43,6 @@ const ListItem = ({ poolData, userLiquidityPositions }: ListItemGroupProps) => {
 
   const amp = new Fraction(poolData.amp).divide(JSBI.BigInt(10000))
 
-  const navigate = useNavigate()
-
   const { data: uniqueAndActiveFarms } = useActiveAndUniqueFarmsData()
   const farm = uniqueAndActiveFarms.find(f => f.id.toLowerCase() === poolData.id.toLowerCase())
 
@@ -196,10 +194,13 @@ const ListItem = ({ poolData, userLiquidityPositions }: ListItemGroupProps) => {
             width: '28px',
             height: '28px',
           }}
+          as={Link}
+          to={`/${networkInfo.route}${APP_PATHS.CLASSIC_ADD_LIQ}/${currencyId(currency0, chainId)}/${currencyId(
+            currency1,
+            chainId,
+          )}/${poolData.id}`}
           onClick={(e: React.MouseEvent) => {
             e.stopPropagation()
-            const url = `/add/${currencyId(currency0, chainId)}/${currencyId(currency1, chainId)}/${poolData.id}`
-            navigate(url)
           }}
         >
           <Plus size={16} color={theme.primary} />
@@ -208,7 +209,10 @@ const ListItem = ({ poolData, userLiquidityPositions }: ListItemGroupProps) => {
           <ButtonEmpty
             padding="0"
             as={Link}
-            to={`/remove/${currencyId(currency0, chainId)}/${currencyId(currency1, chainId)}/${poolData.id}`}
+            to={`/${networkInfo.route}${APP_PATHS.CLASSIC_REMOVE_POOL}/${currencyId(currency0, chainId)}/${currencyId(
+              currency1,
+              chainId,
+            )}/${poolData.id}`}
             style={{
               background: rgba(theme.red, 0.2),
               minWidth: '28px',
diff --git a/src/components/PositionCard/index.tsx b/src/components/PositionCard/index.tsx
index a056b70147..7fd69b0e21 100644
--- a/src/components/PositionCard/index.tsx
+++ b/src/components/PositionCard/index.tsx
@@ -720,7 +720,10 @@ export default function FullPositionCard({
                 fontSize: '14px',
               }}
               as={Link}
-              to={`/remove/${currencyId(currency0, chainId)}/${currencyId(currency1, chainId)}/${pair.address}`}
+              to={`/${networkInfo.route}${APP_PATHS.CLASSIC_REMOVE_POOL}/${currencyId(currency0, chainId)}/${currencyId(
+                currency1,
+                chainId,
+              )}/${pair.address}`}
             >
               <Text width="max-content">
                 <Trans>Remove Liquidity</Trans>
@@ -744,7 +747,10 @@ export default function FullPositionCard({
             padding="10px"
             style={{ fontSize: '14px' }}
             as={Link}
-            to={`/add/${currencyId(currency0, chainId)}/${currencyId(currency1, chainId)}/${pair.address}`}
+            to={`/${networkInfo.route}${APP_PATHS.CLASSIC_ADD_LIQ}/${currencyId(currency0, chainId)}/${currencyId(
+              currency1,
+              chainId,
+            )}/${pair.address}`}
           >
             <Text width="max-content">
               <Trans>Add Liquidity</Trans>
diff --git a/src/components/ProAmm/ProAmmPoolStat.tsx b/src/components/ProAmm/ProAmmPoolStat.tsx
index ca573fddbc..f9e83c2029 100644
--- a/src/components/ProAmm/ProAmmPoolStat.tsx
+++ b/src/components/ProAmm/ProAmmPoolStat.tsx
@@ -117,7 +117,7 @@ export default function ProAmmPoolStat({ pool, onShared, userPositions, onClickP
   return (
     <Wrapper key={pool.address}>
       <Link
-        to={`${APP_PATHS.ELASTIC_CREATE_POOL}/${token0Slug}/${token1Slug}/${pool.feeTier}`}
+        to={`/${networkInfo.route}${APP_PATHS.ELASTIC_CREATE_POOL}/${token0Slug}/${token1Slug}/${pool.feeTier}`}
         style={{
           textDecoration: 'none',
         }}
diff --git a/src/components/YieldPools/ElasticFarmGroup/FarmCard.tsx b/src/components/YieldPools/ElasticFarmGroup/FarmCard.tsx
index 84d0cd171c..d4d3a888f4 100644
--- a/src/components/YieldPools/ElasticFarmGroup/FarmCard.tsx
+++ b/src/components/YieldPools/ElasticFarmGroup/FarmCard.tsx
@@ -72,7 +72,7 @@ const FarmCard = ({
   targetPercent,
   targetPercentByNFT,
 }: Props) => {
-  const { chainId } = useActiveWeb3React()
+  const { chainId, networkInfo } = useActiveWeb3React()
   const [isRevertPrice, setIsRevertPrice] = useState(false)
   const theme = useTheme()
   const currentTimestamp = Math.floor(Date.now() / 1000)
@@ -84,7 +84,7 @@ const FarmCard = ({
   const [, setFarmAddress] = useShareFarmAddress()
   const [showPosition, setShowPosition] = useState(false)
 
-  const addliquidityElasticPool = `${APP_PATHS.ELASTIC_CREATE_POOL}/${
+  const addLiquidityElasticPoolUrl = `/${networkInfo.route}${APP_PATHS.ELASTIC_CREATE_POOL}/${
     pool.token0.isNative ? pool.token0.symbol : pool.token0.address
   }/${pool.token1.isNative ? pool.token1.symbol : pool.token1.address}/${pool.pool.fee}`
 
@@ -114,7 +114,7 @@ const FarmCard = ({
             <Flex alignItems="center">
               <DoubleCurrencyLogo currency0={pool.token0} currency1={pool.token1} size={20} />
               <Link
-                to={addliquidityElasticPool}
+                to={addLiquidityElasticPoolUrl}
                 style={{
                   textDecoration: 'none',
                 }}
@@ -362,7 +362,7 @@ const FarmCard = ({
           <Flex alignItems="center" height="36px">
             <DoubleCurrencyLogo currency0={pool.token0} currency1={pool.token1} size={20} />
             <Link
-              to={`${APP_PATHS.ELASTIC_CREATE_POOL}/${
+              to={`/${networkInfo.route}${APP_PATHS.ELASTIC_CREATE_POOL}/${
                 pool.token0.isNative ? pool.token0.symbol : pool.token0.address
               }/${pool.token1.isNative ? pool.token1.symbol : pool.token1.address}/${pool.pool.fee}`}
               style={{
diff --git a/src/components/YieldPools/ElasticFarmGroup/Row.tsx b/src/components/YieldPools/ElasticFarmGroup/Row.tsx
index 5831293825..1d213a34ec 100644
--- a/src/components/YieldPools/ElasticFarmGroup/Row.tsx
+++ b/src/components/YieldPools/ElasticFarmGroup/Row.tsx
@@ -65,7 +65,7 @@ const Row = ({
   onHarvest: () => void
   tokenPrices: { [key: string]: number }
 }) => {
-  const { chainId } = useActiveWeb3React()
+  const { chainId, networkInfo } = useActiveWeb3React()
   const theme = useTheme()
   const currentTimestamp = Math.floor(Date.now() / 1000)
   const [viewMode] = useViewMode()
@@ -312,7 +312,7 @@ const Row = ({
           <Flex alignItems="center">
             <DoubleCurrencyLogo currency0={farmingPool.token0} currency1={farmingPool.token1} />
             <Link
-              to={`${APP_PATHS.ELASTIC_CREATE_POOL}/${
+              to={`/${networkInfo.route}${APP_PATHS.ELASTIC_CREATE_POOL}/${
                 farmingPool.token0.isNative ? farmingPool.token0.symbol : farmingPool.token0.address
               }/${farmingPool.token1.isNative ? farmingPool.token1.symbol : farmingPool.token1.address}/${
                 farmingPool.pool.fee
diff --git a/src/components/YieldPools/ListItem.tsx b/src/components/YieldPools/ListItem.tsx
index ccbe85d2fa..63668d0688 100644
--- a/src/components/YieldPools/ListItem.tsx
+++ b/src/components/YieldPools/ListItem.tsx
@@ -23,7 +23,7 @@ import Harvest from 'components/Icons/Harvest'
 import Modal from 'components/Modal'
 import Row, { RowBetween, RowFit } from 'components/Row'
 import { MouseoverTooltip } from 'components/Tooltip'
-import { DMM_ANALYTICS_URL, MAX_ALLOW_APY } from 'constants/index'
+import { APP_PATHS, DMM_ANALYTICS_URL, MAX_ALLOW_APY } from 'constants/index'
 import { useActiveWeb3React } from 'hooks'
 import { useToken } from 'hooks/Tokens'
 import { ApprovalState, useApproveCallback } from 'hooks/useApproveCallback'
@@ -67,7 +67,7 @@ interface ListItemProps {
 }
 
 const ListItem = ({ farm }: ListItemProps) => {
-  const { account, chainId, isEVM } = useActiveWeb3React()
+  const { account, chainId, isEVM, networkInfo } = useActiveWeb3React()
   const toggleWalletModal = useWalletModalToggle()
   const currentTimestamp = Math.floor(Date.now() / 1000)
   const [viewMode] = useViewMode()
@@ -311,10 +311,10 @@ const ListItem = ({ farm }: ListItemProps) => {
               <Row>
                 <DoubleCurrencyLogo currency0={currency0} currency1={currency1} size={16} />
                 <Link
-                  to={`/add/${currencyIdFromAddress(farm.token0?.id, chainId)}/${currencyIdFromAddress(
-                    farm.token1?.id,
+                  to={`/${networkInfo.route}${APP_PATHS.CLASSIC_ADD_LIQ}/${currencyIdFromAddress(
+                    farm.token0?.id,
                     chainId,
-                  )}/${farm.id}`}
+                  )}/${currencyIdFromAddress(farm.token1?.id, chainId)}/${farm.id}`}
                   style={{ textDecoration: 'none', marginRight: '6px' }}
                 >
                   {farm.token0?.symbol} - {farm.token1?.symbol}
@@ -465,9 +465,18 @@ const ListItem = ({ farm }: ListItemProps) => {
         <FarmCard joined={!!userStakedBalanceUSD}>
           <Row marginBottom="12px">
             <DoubleCurrencyLogo currency0={currency0} currency1={currency1} size={20} />
-            <Text fontSize="16px" fontWeight="500" marginRight="4px" color={theme.green}>
-              {currency0?.symbol} - {currency1?.symbol}
-            </Text>
+            <Link
+              to={`/${networkInfo.route}${APP_PATHS.CLASSIC_ADD_LIQ}/${currencyIdFromAddress(
+                farm.token0?.id,
+                chainId,
+              )}/${currencyIdFromAddress(farm.token1?.id, chainId)}/${farm.id}`}
+              style={{ textDecoration: 'none', marginRight: '6px' }}
+            >
+              <Text fontSize="16px" fontWeight="500" marginRight="4px" color={theme.green}>
+                {currency0?.symbol} - {currency1?.symbol}
+              </Text>
+            </Link>
+
             <Text
               fontSize={12}
               lineHeight="16px"
@@ -782,10 +791,10 @@ const ListItem = ({ farm }: ListItemProps) => {
                   </GetLP>
                 </ExternalLink>
                 <Link
-                  to={`/add/${currencyIdFromAddress(farm.token0?.id, chainId)}/${currencyIdFromAddress(
-                    farm.token1?.id,
+                  to={`/${networkInfo.route}${APP_PATHS.CLASSIC_ADD_LIQ}/${currencyIdFromAddress(
+                    farm.token0?.id,
                     chainId,
-                  )}/${farm.id}`}
+                  )}/${currencyIdFromAddress(farm.token1?.id, chainId)}/${farm.id}`}
                   style={{ textDecoration: 'none' }}
                 >
                   <GetLP style={{ textAlign: 'right' }}>
diff --git a/src/hooks/useSyncTokenSymbolToUrl.ts b/src/hooks/useSyncTokenSymbolToUrl.ts
index 0d0279490b..6c8c47e58b 100644
--- a/src/hooks/useSyncTokenSymbolToUrl.ts
+++ b/src/hooks/useSyncTokenSymbolToUrl.ts
@@ -19,10 +19,17 @@ type TokenSymbolParams = {
   toCurrency: string
   network: string
 }
+
 const getUrlMatchParams = (params: Params): TokenSymbolParams => {
-  const fromCurrency = (params.fromCurrency || '').toLowerCase()
-  const toCurrency = (params.toCurrency || '').toLowerCase()
+  const currencyParam = (params.currency || '').toLowerCase()
   const network: string = convertToSlug(params.network || '')
+
+  let fromCurrency = '',
+    toCurrency = ''
+
+  const matches = currencyParam.split('-to-')
+  fromCurrency ||= matches[0]
+  toCurrency ||= matches[1]
   return { fromCurrency, toCurrency, network }
 }
 
diff --git a/src/pages/AddLiquidity/TokenPair.tsx b/src/pages/AddLiquidity/TokenPair.tsx
index 38c0effac0..f320fbf847 100644
--- a/src/pages/AddLiquidity/TokenPair.tsx
+++ b/src/pages/AddLiquidity/TokenPair.tsx
@@ -23,7 +23,7 @@ import TransactionConfirmationModal, {
   ConfirmationModalContent,
   TransactionErrorContent,
 } from 'components/TransactionConfirmationModal'
-import { AMP_HINT } from 'constants/index'
+import { AMP_HINT, APP_PATHS } from 'constants/index'
 import { EVMNetworkInfo } from 'constants/networks/type'
 import { NativeCurrencies } from 'constants/tokens'
 import { PairState } from 'data/Reserves'
@@ -447,7 +447,7 @@ const TokenPair = ({
                     <StyledInternalLink
                       onClick={handleDismissConfirmation}
                       id="unamplified-pool-link"
-                      to={`/add/${currencyIdA}/${currencyIdB}/${unAmplifiedPairAddress}`}
+                      to={`/${networkInfo.route}${APP_PATHS.CLASSIC_ADD_LIQ}/${currencyIdA}/${currencyIdB}/${unAmplifiedPairAddress}`}
                     >
                       Go to unamplified pool
                     </StyledInternalLink>
@@ -483,7 +483,7 @@ const TokenPair = ({
                 onSwitchCurrency={() => {
                   chainId &&
                     navigate(
-                      `/add/${
+                      `/${networkInfo.route}${APP_PATHS.CLASSIC_ADD_LIQ}/${
                         currencyAIsETHER ? WETH[chainId].address : NativeCurrencies[chainId].symbol
                       }/${currencyIdB}/${pairAddress}`,
                       { replace: true },
@@ -521,7 +521,7 @@ const TokenPair = ({
                 {pairAddress && chainId && (currencyBIsWETH || currencyBIsETHER) && (
                   <StyledInternalLink
                     replace
-                    to={`/add/${currencyIdA}/${
+                    to={`/${networkInfo.route}${APP_PATHS.CLASSIC_ADD_LIQ}/${currencyIdA}/${
                       currencyBIsETHER ? WETH[chainId].address : NativeCurrencies[chainId].symbol
                     }/${pairAddress}`}
                   >
diff --git a/src/pages/AddLiquidity/ZapIn.tsx b/src/pages/AddLiquidity/ZapIn.tsx
index 59f3b46187..d3eedc558b 100644
--- a/src/pages/AddLiquidity/ZapIn.tsx
+++ b/src/pages/AddLiquidity/ZapIn.tsx
@@ -25,7 +25,7 @@ import TransactionConfirmationModal, {
 } from 'components/TransactionConfirmationModal'
 import ZapError from 'components/ZapError'
 import FormattedPriceImpact from 'components/swapv2/FormattedPriceImpact'
-import { AMP_HINT } from 'constants/index'
+import { AMP_HINT, APP_PATHS } from 'constants/index'
 import { EVMNetworkInfo } from 'constants/networks/type'
 import { NativeCurrencies } from 'constants/tokens'
 import { PairState } from 'data/Reserves'
@@ -447,7 +447,7 @@ const ZapIn = ({
                     <StyledInternalLink
                       onClick={handleDismissConfirmation}
                       id="unamplified-pool-link"
-                      to={`/add/${currencyIdA}/${currencyIdB}/${unAmplifiedPairAddress}`}
+                      to={`/${networkInfo.route}${APP_PATHS.CLASSIC_ADD_LIQ}/${currencyIdA}/${currencyIdB}/${unAmplifiedPairAddress}`}
                     >
                       Go to unamplified pool
                     </StyledInternalLink>
@@ -499,12 +499,15 @@ const ZapIn = ({
                       replace
                       to={
                         independentField === Field.CURRENCY_A
-                          ? `/add/${
+                          ? `/${networkInfo.route}${APP_PATHS.CLASSIC_ADD_LIQ}/${
                               selectedCurrencyIsETHER
                                 ? currencyId(WETH[chainId], chainId)
                                 : currencyId(NativeCurrencies[chainId], chainId)
                             }/${currencyId(currencies[dependentField] as Currency, chainId)}/${pairAddress}`
-                          : `/add/${currencyId(currencies[dependentField] as Currency, chainId)}/${
+                          : `/${networkInfo.route}${APP_PATHS.CLASSIC_ADD_LIQ}/${currencyId(
+                              currencies[dependentField] as Currency,
+                              chainId,
+                            )}/${
                               selectedCurrencyIsETHER
                                 ? currencyId(WETH[chainId], chainId)
                                 : NativeCurrencies[chainId].symbol
diff --git a/src/pages/AddLiquidity/index.tsx b/src/pages/AddLiquidity/index.tsx
index 1a80df4b68..afeb2ad995 100644
--- a/src/pages/AddLiquidity/index.tsx
+++ b/src/pages/AddLiquidity/index.tsx
@@ -48,6 +48,7 @@ export default function AddLiquidity() {
   }, [])
 
   if (!isEVM) return <Navigate to="/" />
+
   return (
     <>
       <PageWrapper>
diff --git a/src/pages/AddLiquidityV2/redirects.tsx b/src/pages/AddLiquidityV2/RedirectElasticCreatePool.tsx
similarity index 75%
rename from src/pages/AddLiquidityV2/redirects.tsx
rename to src/pages/AddLiquidityV2/RedirectElasticCreatePool.tsx
index 562bcc8335..b39d7dafc9 100644
--- a/src/pages/AddLiquidityV2/redirects.tsx
+++ b/src/pages/AddLiquidityV2/RedirectElasticCreatePool.tsx
@@ -6,10 +6,10 @@ import { useActiveWeb3React } from 'hooks'
 
 import ProAmmAddLiquidity from './index'
 
-export function RedirectDuplicateTokenIds() {
+export default function RedirectElasticCreatePool() {
   const { currencyIdA, currencyIdB } = useParams()
 
-  const { chainId } = useActiveWeb3React()
+  const { chainId, networkInfo } = useActiveWeb3React()
 
   // prevent weth + eth
   const isETHOrWETHA = currencyIdA === 'ETH' || currencyIdA === WETH[chainId].address
@@ -20,7 +20,8 @@ export function RedirectDuplicateTokenIds() {
     currencyIdB &&
     (currencyIdA.toLowerCase() === currencyIdB.toLowerCase() || (isETHOrWETHA && isETHOrWETHB))
   ) {
-    return <Navigate to={`${APP_PATHS.ELASTIC_CREATE_POOL}/${currencyIdA}`} replace />
+    return <Navigate to={`/${networkInfo.route}${APP_PATHS.ELASTIC_CREATE_POOL}/${currencyIdA}`} replace />
   }
+
   return <ProAmmAddLiquidity />
 }
diff --git a/src/pages/AddLiquidityV2/index.tsx b/src/pages/AddLiquidityV2/index.tsx
index 13045a155e..f4e5f61dde 100644
--- a/src/pages/AddLiquidityV2/index.tsx
+++ b/src/pages/AddLiquidityV2/index.tsx
@@ -521,33 +521,33 @@ export default function AddLiquidity() {
     (currencyANew: Currency) => {
       const [idA, idB] = handleCurrencySelect(currencyANew, currencyIdB)
       if (idB === undefined) {
-        navigate(`${APP_PATHS.ELASTIC_CREATE_POOL}/${idA}`)
+        navigate(`/${networkInfo.route}${APP_PATHS.ELASTIC_CREATE_POOL}/${idA}`)
       } else {
-        navigate(`${APP_PATHS.ELASTIC_CREATE_POOL}/${idA}/${idB}`)
+        navigate(`/${networkInfo.route}${APP_PATHS.ELASTIC_CREATE_POOL}/${idA}/${idB}`)
       }
     },
-    [handleCurrencySelect, currencyIdB, navigate],
+    [handleCurrencySelect, currencyIdB, navigate, networkInfo.route],
   )
 
   const handleCurrencyBSelect = useCallback(
     (currencyBNew: Currency) => {
       const [idB, idA] = handleCurrencySelect(currencyBNew, currencyIdA)
       if (idA === undefined) {
-        navigate(`${APP_PATHS.ELASTIC_CREATE_POOL}/${idB}`)
+        navigate(`/${networkInfo.route}${APP_PATHS.ELASTIC_CREATE_POOL}/${idB}`)
       } else {
-        navigate(`${APP_PATHS.ELASTIC_CREATE_POOL}/${idA}/${idB}`)
+        navigate(`/${networkInfo.route}${APP_PATHS.ELASTIC_CREATE_POOL}/${idA}/${idB}`)
       }
     },
-    [handleCurrencySelect, currencyIdA, navigate],
+    [handleCurrencySelect, currencyIdA, navigate, networkInfo.route],
   )
 
   const handleFeePoolSelect = useCallback(
     (newFeeAmount: FeeAmount) => {
       onLeftRangeInput('')
       onRightRangeInput('')
-      navigate(`${APP_PATHS.ELASTIC_CREATE_POOL}/${currencyIdA}/${currencyIdB}/${newFeeAmount}`)
+      navigate(`/${networkInfo.route}${APP_PATHS.ELASTIC_CREATE_POOL}/${currencyIdA}/${currencyIdB}/${newFeeAmount}`)
     },
-    [currencyIdA, currencyIdB, navigate, onLeftRangeInput, onRightRangeInput],
+    [currencyIdA, currencyIdB, navigate, networkInfo.route, onLeftRangeInput, onRightRangeInput],
   )
 
   const handleDismissConfirmation = useCallback(() => {
@@ -1018,7 +1018,7 @@ export default function AddLiquidity() {
                     onSwitchCurrency={() => {
                       chainId &&
                         navigate(
-                          `${APP_PATHS.ELASTIC_CREATE_POOL}/${
+                          `/${networkInfo.route}${APP_PATHS.ELASTIC_CREATE_POOL}/${
                             baseCurrencyIsETHER ? WETH[chainId].address : NativeCurrencies[chainId].symbol
                           }/${currencyIdB}/${feeAmount}`,
                           { replace: true },
@@ -1048,7 +1048,7 @@ export default function AddLiquidity() {
                     onSwitchCurrency={() => {
                       chainId &&
                         navigate(
-                          `${APP_PATHS.ELASTIC_CREATE_POOL}/${currencyIdA}/${
+                          `/${networkInfo.route}${APP_PATHS.ELASTIC_CREATE_POOL}/${currencyIdA}/${
                             quoteCurrencyIsETHER ? WETH[chainId].address : NativeCurrencies[chainId].symbol
                           }/${feeAmount}`,
                           { replace: true },
@@ -1182,7 +1182,7 @@ export default function AddLiquidity() {
           onCleared={() => {
             onFieldAInput('0')
             onFieldBInput('0')
-            navigate(APP_PATHS.ELASTIC_CREATE_POOL)
+            navigate(`/${networkInfo.route}${APP_PATHS.ELASTIC_CREATE_POOL}`)
           }}
           onBack={() => {
             navigate(`${APP_PATHS.POOLS}/${networkInfo.route}?tab=elastic`)
@@ -1256,7 +1256,7 @@ export default function AddLiquidity() {
                   ) : (
                     <StyledInternalLink
                       replace
-                      to={`${APP_PATHS.ELASTIC_CREATE_POOL}/${currencyIdB}/${currencyIdA}/${feeAmount}`}
+                      to={`/${networkInfo.route}${APP_PATHS.ELASTIC_CREATE_POOL}/${currencyIdB}/${currencyIdA}/${feeAmount}`}
                       style={{ color: 'inherit', display: 'flex' }}
                     >
                       <SwapIcon size={24} color={theme.subText} />
diff --git a/src/pages/App.tsx b/src/pages/App.tsx
index 70275e1e7b..7782a0ebb6 100644
--- a/src/pages/App.tsx
+++ b/src/pages/App.tsx
@@ -5,7 +5,7 @@ import * as Sentry from '@sentry/react'
 import { Suspense, lazy, useEffect } from 'react'
 import { isMobile } from 'react-device-detect'
 import { AlertTriangle } from 'react-feather'
-import { Navigate, Route, Routes, useLocation } from 'react-router-dom'
+import { Navigate, Route, Routes, useLocation, useParams } from 'react-router-dom'
 import { useNetwork, usePrevious } from 'react-use'
 import { Flex, Text } from 'rebass'
 import styled from 'styled-components'
@@ -33,21 +33,17 @@ import { useGlobalMixpanelEvents } from 'hooks/useMixpanel'
 import useSessionExpiredGlobal from 'hooks/useSessionExpire'
 import { useSyncNetworkParamWithStore } from 'hooks/useSyncNetworkParamWithStore'
 import useTheme from 'hooks/useTheme'
+import { RedirectPathToSwapV3Network } from 'pages/SwapV3/redirects'
+import KyberAIExplore from 'pages/TrueSightV2'
+import TruesightFooter from 'pages/TrueSightV2/components/TruesightFooter'
+import KyberAILandingPage from 'pages/TrueSightV2/pages/LandingPage'
+import Verify from 'pages/Verify'
 import { useHolidayMode } from 'state/user/hooks'
 import DarkModeQueryParamReader from 'theme/DarkModeQueryParamReader'
 import { getLimitOrderContract, isAddressString, shortenAddress } from 'utils'
 
-import { RedirectDuplicateTokenIds } from './AddLiquidityV2/redirects'
 import ElasticLegacyNotice from './ElasticLegacy/ElasticLegacyNotice'
-import { RedirectPathToFarmNetwork } from './Farm/redirect'
 import Icons from './Icons'
-import { RedirectPathToMyPoolsNetwork } from './Pool/redirect'
-import { RedirectPathToPoolsNetwork } from './Pools/redirect'
-import { RedirectPathToSwapV3Network } from './SwapV3/redirects'
-import KyberAIExplore from './TrueSightV2'
-import TruesightFooter from './TrueSightV2/components/TruesightFooter'
-import KyberAILandingPage from './TrueSightV2/pages/LandingPage'
-import Verify from './Verify'
 
 // test page for swap only through elastic
 const ElasticSwap = lazy(() => import('./ElasticSwap'))
@@ -55,31 +51,30 @@ const SwapV2 = lazy(() => import('./SwapV2'))
 const SwapV3 = lazy(() => import('./SwapV3'))
 const Bridge = lazy(() => import('./Bridge'))
 const Pools = lazy(() => import('./Pools'))
-const Pool = lazy(() => import('./Pool'))
+const MyPools = lazy(() => import('./Pool'))
 
 const Farm = lazy(() => import('./Farm'))
 
 const PoolFinder = lazy(() => import('./PoolFinder'))
-const CreatePool = lazy(() => import('./CreatePool'))
-const ProAmmRemoveLiquidity = lazy(() => import('./RemoveLiquidityProAmm'))
-const RedirectCreatePoolDuplicateTokenIds = lazy(() => import('./CreatePool/RedirectDuplicateTokenIds'))
-const RedirectOldCreatePoolPathStructure = lazy(() => import('./CreatePool/RedirectOldCreatePoolPathStructure'))
+const ElasticRemoveLiquidity = lazy(() => import('pages/RemoveLiquidityProAmm'))
+const RedirectCreatePool = lazy(() => import('pages/CreatePool/RedirectCreatePool'))
 
-const AddLiquidity = lazy(() => import('./AddLiquidity'))
-const IncreaseLiquidity = lazy(() => import('./IncreaseLiquidity'))
+const RedirectElasticCreatePool = lazy(() => import('pages/AddLiquidityV2/RedirectElasticCreatePool'))
 
-const RemoveLiquidity = lazy(() => import('./RemoveLiquidity'))
+const AddLiquidity = lazy(() => import('pages/AddLiquidity'))
+const ElasticIncreaseLiquidity = lazy(() => import('pages/IncreaseLiquidity'))
 
-const KyberDAOStakeKNC = lazy(() => import('./KyberDAO/StakeKNC'))
-const KyberDAOVote = lazy(() => import('./KyberDAO/Vote'))
-const AboutKyberSwap = lazy(() => import('./About/AboutKyberSwap'))
-const AboutKNC = lazy(() => import('./About/AboutKNC'))
+const RemoveLiquidity = lazy(() => import('pages/RemoveLiquidity'))
 
-const BuyCrypto = lazy(() => import('./BuyCrypto'))
+const KyberDAOStakeKNC = lazy(() => import('pages/KyberDAO/StakeKNC'))
+const KyberDAOVote = lazy(() => import('pages/KyberDAO/Vote'))
+const AboutKyberSwap = lazy(() => import('pages//About/AboutKyberSwap'))
+const AboutKNC = lazy(() => import('pages/About/AboutKNC'))
+const BuyCrypto = lazy(() => import('pages/BuyCrypto'))
 
-const Campaign = lazy(() => import('./Campaign'))
-const GrantProgramPage = lazy(() => import('./GrantProgram'))
-const NotificationCenter = lazy(() => import('./NotificationCenter'))
+const Campaign = lazy(() => import('pages/Campaign'))
+const GrantProgramPage = lazy(() => import('pages/GrantProgram'))
+const NotificationCenter = lazy(() => import('pages/NotificationCenter'))
 
 const AppWrapper = styled.div`
   display: flex;
@@ -125,6 +120,83 @@ const SwapPage = () => {
   return <ProtectedRoute>{chainId === ChainId.SOLANA ? <SwapV2 /> : <SwapV3 />}</ProtectedRoute>
 }
 
+const RedirectWithNetworkPrefix = () => {
+  const { networkInfo } = useActiveWeb3React()
+  const location = useLocation()
+
+  return (
+    <Navigate
+      to={{
+        ...location,
+        pathname: `/${networkInfo.route}${location.pathname}`,
+      }}
+      replace
+    />
+  )
+}
+
+const RedirectWithNetworkSuffix = () => {
+  const { networkInfo } = useActiveWeb3React()
+  const location = useLocation()
+
+  return (
+    <Navigate
+      to={{
+        ...location,
+        pathname: `${location.pathname}/${networkInfo.route}`,
+      }}
+      replace
+    />
+  )
+}
+
+const RoutesWithNetworkPrefix = () => {
+  const { network } = useParams()
+  const { networkInfo } = useActiveWeb3React()
+  const location = useLocation()
+
+  useSyncNetworkParamWithStore()
+
+  if (!network) {
+    return <Navigate to={`/${networkInfo.route}${location.pathname}`} replace />
+  }
+
+  if (network === NETWORKS_INFO_CONFIG[ChainId.SOLANA].route) {
+    return <Navigate to="/" />
+  }
+
+  const chainInfoFromParam = Object.values(NETWORKS_INFO_CONFIG).find(info => info.route === network)
+  if (!chainInfoFromParam) {
+    return <Navigate to={location.pathname.replace(network, networkInfo.route)} replace />
+  }
+
+  return (
+    <Routes>
+      <Route path={`${APP_PATHS.CLASSIC_CREATE_POOL}/:currencyIdA?/:currencyIdB?`} element={<RedirectCreatePool />} />
+      <Route
+        path={`${APP_PATHS.CLASSIC_ADD_LIQ}/:currencyIdA/:currencyIdB?/:pairAddress?`}
+        element={<AddLiquidity />}
+      />
+      <Route
+        path={`${APP_PATHS.CLASSIC_REMOVE_POOL}/:currencyIdA/:currencyIdB/:pairAddress`}
+        element={<RemoveLiquidity />}
+      />
+
+      <Route
+        path={`${APP_PATHS.ELASTIC_CREATE_POOL}/:currencyIdA?/:currencyIdB?/:feeAmount?`}
+        element={<RedirectElasticCreatePool />}
+      />
+      <Route
+        path={`${APP_PATHS.ELASTIC_INCREASE_LIQ}/:currencyIdA?/:currencyIdB?/:feeAmount?/:tokenId?`}
+        element={<ElasticIncreaseLiquidity />}
+      />
+      <Route path={`${APP_PATHS.ELASTIC_REMOVE_POOL}/:tokenId`} element={<ElasticRemoveLiquidity />} />
+
+      <Route path="*" element={<Navigate to="/" />} />
+    </Routes>
+  )
+}
+
 export default function App() {
   const { account, chainId, networkInfo } = useActiveWeb3React()
   const { pathname } = useLocation()
@@ -242,75 +314,47 @@ export default function App() {
                   <Routes>
                     <Route element={<DarkModeQueryParamReader />} />
 
-                    <Route path={`${APP_PATHS.SWAP}/:network/:fromCurrency-to-:toCurrency`} element={<SwapPage />} />
-                    <Route path={`${APP_PATHS.SWAP}/:network/:fromCurrency`} element={<SwapPage />} />
-                    <Route path={`${APP_PATHS.SWAP}/:network`} element={<SwapPage />} />
+                    {/* From react-router-dom@6.5.0, :fromCurrency-to-:toCurrency no long works, need to manually parse the params */}
+                    <Route path={`${APP_PATHS.SWAP}/:network/:currency?`} element={<SwapPage />} />
                     {CHAINS_SUPPORT_CROSS_CHAIN.includes(chainId) && (
                       <Route path={`${APP_PATHS.CROSS_CHAIN}`} element={<SwapV3 />} />
                     )}
 
                     {getLimitOrderContract(chainId) && (
-                      <>
-                        <Route
-                          path={`${APP_PATHS.LIMIT}/:network/:fromCurrency-to-:toCurrency`}
-                          element={<SwapPage />}
-                        />
-                        <Route path={`${APP_PATHS.LIMIT}/:network/:fromCurrency`} element={<SwapPage />} />
-                        <Route path={`${APP_PATHS.LIMIT}/:network`} element={<SwapPage />} />
-                      </>
+                      <Route path={`${APP_PATHS.LIMIT}/:network/:currency?`} element={<SwapPage />} />
                     )}
 
                     <Route path={`${APP_PATHS.FIND_POOL}`} element={<PoolFinder />} />
-                    <Route path={`${APP_PATHS.POOLS}/:network`} element={<Pools />} />
-                    <Route path={`${APP_PATHS.POOLS}/:network/:currencyIdA`} element={<Pools />} />
-                    <Route path={`${APP_PATHS.POOLS}`} element={<RedirectPathToPoolsNetwork />} />
-                    <Route path={`${APP_PATHS.POOLS}/:network/:currencyIdA/:currencyIdB`} element={<Pools />} />
-                    <Route path={`${APP_PATHS.FARMS}/:network`} element={<Farm />} />
-                    <Route path={`${APP_PATHS.FARMS}`} element={<RedirectPathToFarmNetwork />} />
-                    <Route path={`${APP_PATHS.MY_POOLS}/:network`} element={<Pool />} />
-                    <Route path={`${APP_PATHS.MY_POOLS}`} element={<RedirectPathToMyPoolsNetwork />} />
-
-                    <Route path={`${APP_PATHS.CLASSIC_CREATE_POOL}`} element={<CreatePool />} />
-                    <Route
-                      path={`${APP_PATHS.CLASSIC_CREATE_POOL}/:currencyIdA`}
-                      element={<RedirectOldCreatePoolPathStructure />}
-                    />
-                    <Route
-                      path={`${APP_PATHS.CLASSIC_CREATE_POOL}/:currencyIdA/:currencyIdB`}
-                      element={<RedirectCreatePoolDuplicateTokenIds />}
-                    />
-
-                    <Route path={`${APP_PATHS.CLASSIC_ADD_LIQ}/:currencyIdA/`} element={<AddLiquidity />} />
-                    <Route path={`${APP_PATHS.CLASSIC_ADD_LIQ}/:currencyIdA/:currencyIdB`} element={<AddLiquidity />} />
-                    <Route
-                      path={`${APP_PATHS.CLASSIC_ADD_LIQ}/:currencyIdA/:currencyIdB/:pairAddress`}
-                      element={<AddLiquidity />}
-                    />
 
-                    <Route
-                      path={`${APP_PATHS.CLASSIC_REMOVE_POOL}/:currencyIdA/:currencyIdB/:pairAddress`}
-                      element={<RemoveLiquidity />}
-                    />
-                    <Route path={`${APP_PATHS.ELASTIC_REMOVE_POOL}/:tokenId`} element={<ProAmmRemoveLiquidity />} />
+                    <>
+                      {/* Pools Routes  */}
+                      <Route path={`${APP_PATHS.POOLS}`} element={<RedirectWithNetworkSuffix />} />
+                      <Route path={`${APP_PATHS.POOLS}/:network/:currencyIdA?/:currencyIdB?`} element={<Pools />} />
+                    </>
+
+                    <>
+                      {/* Farms Routes */}
+                      <Route path={`${APP_PATHS.FARMS}`} element={<RedirectWithNetworkSuffix />} />
+                      <Route path={`${APP_PATHS.FARMS}/:network`} element={<Farm />} />
+                    </>
+
+                    <>
+                      {/* My Pools Routes */}
+                      <Route path={`${APP_PATHS.MY_POOLS}`} element={<RedirectWithNetworkSuffix />} />
+                      <Route path={`${APP_PATHS.MY_POOLS}/:network`} element={<MyPools />} />
+                    </>
+
+                    <>
+                      {/* These are old routes and will soon be deprecated - Check: RoutesWithNetworkParam */}
+                      <Route path={`${APP_PATHS.ELASTIC_CREATE_POOL}/*`} element={<RedirectWithNetworkPrefix />} />
+                      <Route path={`${APP_PATHS.ELASTIC_INCREASE_LIQ}/*`} element={<RedirectWithNetworkPrefix />} />
+                      <Route path={`${APP_PATHS.ELASTIC_REMOVE_POOL}/*`} element={<RedirectWithNetworkPrefix />} />
+
+                      <Route path={`${APP_PATHS.CLASSIC_CREATE_POOL}/*`} element={<RedirectWithNetworkPrefix />} />
+                      <Route path={`${APP_PATHS.CLASSIC_ADD_LIQ}/*`} element={<RedirectWithNetworkPrefix />} />
+                      <Route path={`${APP_PATHS.CLASSIC_REMOVE_POOL}/*`} element={<RedirectWithNetworkPrefix />} />
+                    </>
 
-                    <Route path={`${APP_PATHS.ELASTIC_CREATE_POOL}/`} element={<RedirectDuplicateTokenIds />} />
-                    <Route
-                      path={`${APP_PATHS.ELASTIC_CREATE_POOL}/:currencyIdA`}
-                      element={<RedirectDuplicateTokenIds />}
-                    />
-                    <Route
-                      path={`${APP_PATHS.ELASTIC_CREATE_POOL}/:currencyIdA/:currencyIdB`}
-                      element={<RedirectDuplicateTokenIds />}
-                    />
-                    <Route
-                      path={`${APP_PATHS.ELASTIC_CREATE_POOL}/:currencyIdA/:currencyIdB/:feeAmount`}
-                      element={<RedirectDuplicateTokenIds />}
-                    />
-
-                    <Route
-                      path={`${APP_PATHS.ELASTIC_INCREASE_LIQ}/:currencyIdA/:currencyIdB/:feeAmount/:tokenId`}
-                      element={<IncreaseLiquidity />}
-                    />
                     <Route path={`${APP_PATHS.KYBERDAO_STAKE}`} element={<KyberDAOStakeKNC />} />
                     <Route path={`${APP_PATHS.KYBERDAO_VOTE}`} element={<KyberDAOVote />} />
                     <Route path={`${APP_PATHS.ABOUT}/kyberswap`} element={<AboutKyberSwap />} />
@@ -361,6 +405,8 @@ export default function App() {
 
                     <Route path={`elastic-swap`} element={<ElasticSwap />} />
 
+                    <Route path={`/:network/*`} element={<RoutesWithNetworkPrefix />} />
+
                     <Route path="*" element={<RedirectPathToSwapV3Network />} />
                   </Routes>
                 </Web3ReactManager>
diff --git a/src/pages/CreatePool/RedirectCreatePool.tsx b/src/pages/CreatePool/RedirectCreatePool.tsx
new file mode 100644
index 0000000000..a211db0975
--- /dev/null
+++ b/src/pages/CreatePool/RedirectCreatePool.tsx
@@ -0,0 +1,24 @@
+import { Navigate, useParams } from 'react-router-dom'
+
+import { APP_PATHS } from 'constants/index'
+import { useActiveWeb3React } from 'hooks'
+
+import CreatePool from './index'
+
+const OLD_PATH_STRUCTURE = /^(0x[a-fA-F0-9]{40})-(0x[a-fA-F0-9]{40})$/
+export default function RedirectCreatePool() {
+  const { currencyIdA, currencyIdB } = useParams()
+
+  const { networkInfo } = useActiveWeb3React()
+  if (currencyIdA?.toLowerCase() === currencyIdB?.toLowerCase()) {
+    return <Navigate to={`/${networkInfo.route}${APP_PATHS.CLASSIC_CREATE_POOL}/${currencyIdA}`} replace />
+  }
+
+  // Support old format
+  const match = currencyIdA?.match(OLD_PATH_STRUCTURE)
+  if (match?.length && !currencyIdB) {
+    return <Navigate to={`/${networkInfo.route}${APP_PATHS.CLASSIC_CREATE_POOL}/${match[1]}/${match[2]}`} replace />
+  }
+
+  return <CreatePool />
+}
diff --git a/src/pages/CreatePool/RedirectDuplicateTokenIds.tsx b/src/pages/CreatePool/RedirectDuplicateTokenIds.tsx
deleted file mode 100644
index fc7fb9728f..0000000000
--- a/src/pages/CreatePool/RedirectDuplicateTokenIds.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Navigate, useParams } from 'react-router-dom'
-
-import { APP_PATHS } from 'constants/index'
-
-import CreatePool from './index'
-
-export default function RedirectDuplicateTokenIds() {
-  const { currencyIdA, currencyIdB } = useParams()
-  if (currencyIdA?.toLowerCase() === currencyIdB?.toLowerCase()) {
-    return <Navigate to={`${APP_PATHS.CLASSIC_CREATE_POOL}/${currencyIdA}`} replace />
-  }
-  return <CreatePool />
-}
diff --git a/src/pages/CreatePool/RedirectOldCreatePoolPathStructure.tsx b/src/pages/CreatePool/RedirectOldCreatePoolPathStructure.tsx
deleted file mode 100644
index e0210f9470..0000000000
--- a/src/pages/CreatePool/RedirectOldCreatePoolPathStructure.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Navigate, useParams } from 'react-router-dom'
-
-import CreatePool from './index'
-
-const OLD_PATH_STRUCTURE = /^(0x[a-fA-F0-9]{40})-(0x[a-fA-F0-9]{40})$/
-export default function RedirectOldCreatePoolPathStructure() {
-  const { currencyIdA } = useParams()
-
-  const match = currencyIdA?.match(OLD_PATH_STRUCTURE)
-  if (match?.length) {
-    return <Navigate to={`/create/${match[1]}/${match[2]}`} replace />
-  }
-
-  return <CreatePool />
-}
diff --git a/src/pages/CreatePool/index.tsx b/src/pages/CreatePool/index.tsx
index 0f1602bf31..61ef21862a 100644
--- a/src/pages/CreatePool/index.tsx
+++ b/src/pages/CreatePool/index.tsx
@@ -349,32 +349,36 @@ export default function CreatePool() {
 
       // support WETH
       if (isWrappedTokenInPool(currencyA, selectedCurrencyA)) {
-        navigate(`/create/${newCurrencyIdA}/${currencyIdB}`)
+        navigate(`/${networkInfo.route}${APP_PATHS.CLASSIC_CREATE_POOL}/${newCurrencyIdA}/${currencyIdB}`)
       } else if (newCurrencyIdA === currencyIdB) {
-        navigate(`/create/${currencyIdB}/${currencyIdA}`)
+        navigate(`/${networkInfo.route}${APP_PATHS.CLASSIC_CREATE_POOL}/${currencyIdB}/${currencyIdA}`)
       } else {
-        navigate(`/create/${newCurrencyIdA}/${currencyIdB}`)
+        navigate(`/${networkInfo.route}${APP_PATHS.CLASSIC_CREATE_POOL}/${newCurrencyIdA}/${currencyIdB}`)
       }
     },
-    [currencyIdB, navigate, currencyIdA, isWrappedTokenInPool, currencyA, chainId],
+    [chainId, isWrappedTokenInPool, currencyA, currencyIdB, navigate, networkInfo.route, currencyIdA],
   )
   const handleCurrencyBSelect = useCallback(
     (selectedCurrencyB: Currency) => {
       const newCurrencyIdB = currencyId(selectedCurrencyB, chainId)
 
       if (isWrappedTokenInPool(currencyB, selectedCurrencyB)) {
-        navigate(`/create/${currencyIdA}/${newCurrencyIdB}`)
+        navigate(`/${networkInfo.route}${APP_PATHS.CLASSIC_CREATE_POOL}/${currencyIdA}/${newCurrencyIdB}`)
       } else if (newCurrencyIdB === currencyIdA) {
         if (currencyIdB) {
-          navigate(`/create/${currencyIdB}/${currencyIdA}`)
+          navigate(`/${networkInfo.route}${APP_PATHS.CLASSIC_CREATE_POOL}/${currencyIdB}/${currencyIdA}`)
         } else {
-          navigate(`/create/${newCurrencyIdB}`)
+          navigate(`/${networkInfo.route}${APP_PATHS.CLASSIC_CREATE_POOL}/${newCurrencyIdB}`)
         }
       } else {
-        navigate(`/create/${currencyIdA ? currencyIdA : 'ETH'}/${newCurrencyIdB}`)
+        navigate(
+          `/${networkInfo.route}${APP_PATHS.CLASSIC_CREATE_POOL}/${
+            currencyIdA ? currencyIdA : 'ETH'
+          }/${newCurrencyIdB}`,
+        )
       }
     },
-    [currencyIdA, navigate, currencyIdB, isWrappedTokenInPool, currencyB, chainId],
+    [chainId, isWrappedTokenInPool, currencyB, currencyIdA, navigate, networkInfo.route, currencyIdB],
   )
 
   const handleDismissConfirmation = useCallback(() => {
@@ -461,7 +465,7 @@ export default function CreatePool() {
                         <StyledInternalLink
                           onClick={handleDismissConfirmation}
                           id="unamplified-pool-link"
-                          to={`/add/${currencyIdA}/${currencyIdB}/${unAmplifiedPairAddress}`}
+                          to={`/${networkInfo.route}${APP_PATHS.CLASSIC_ADD_LIQ}/${currencyIdA}/${currencyIdB}/${unAmplifiedPairAddress}`}
                         >
                           Go to unamplified pool
                         </StyledInternalLink>
diff --git a/src/pages/Farm/redirect.tsx b/src/pages/Farm/redirect.tsx
deleted file mode 100644
index 241da3b4ce..0000000000
--- a/src/pages/Farm/redirect.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Navigate, useLocation } from 'react-router-dom'
-
-import { APP_PATHS } from 'constants/index'
-import { useActiveWeb3React } from 'hooks'
-
-export function RedirectPathToFarmNetwork() {
-  const location = useLocation()
-  const { networkInfo } = useActiveWeb3React()
-  return <Navigate to={{ ...location, pathname: `${APP_PATHS.FARMS}/` + networkInfo.route }} replace />
-}
diff --git a/src/pages/IncreaseLiquidity/index.tsx b/src/pages/IncreaseLiquidity/index.tsx
index 4cbb4269e2..79af98ae46 100644
--- a/src/pages/IncreaseLiquidity/index.tsx
+++ b/src/pages/IncreaseLiquidity/index.tsx
@@ -602,7 +602,7 @@ export default function IncreaseLiquidity() {
                           onSwitchCurrency={() => {
                             chainId &&
                               navigate(
-                                `/elastic/increase/${
+                                `/${networkInfo.route}${APP_PATHS.ELASTIC_INCREASE_LIQ}/${
                                   baseCurrencyIsETHER ? WETH[chainId].address : NativeCurrencies[chainId].symbol
                                 }/${currencyIdB}/${feeAmount}/${tokenId}`,
                                 {
@@ -641,7 +641,7 @@ export default function IncreaseLiquidity() {
                           onSwitchCurrency={() => {
                             chainId &&
                               navigate(
-                                `/elastic/increase/${currencyIdA}/${
+                                `/${networkInfo.route}${APP_PATHS.ELASTIC_INCREASE_LIQ}/${currencyIdA}/${
                                   quoteCurrencyIsETHER ? WETH[chainId].address : NativeCurrencies[chainId].symbol
                                 }/${feeAmount}/${tokenId}`,
                                 { replace: true },
diff --git a/src/pages/Pool/redirect.tsx b/src/pages/Pool/redirect.tsx
deleted file mode 100644
index 9f8e2123c7..0000000000
--- a/src/pages/Pool/redirect.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Navigate, useLocation } from 'react-router-dom'
-
-import { APP_PATHS } from 'constants/index'
-import { useActiveWeb3React } from 'hooks'
-
-export function RedirectPathToMyPoolsNetwork() {
-  const location = useLocation()
-  const { networkInfo } = useActiveWeb3React()
-  return <Navigate to={{ ...location, pathname: `${APP_PATHS.MY_POOLS}/` + networkInfo.route }} replace />
-}
diff --git a/src/pages/Pools/index.tsx b/src/pages/Pools/index.tsx
index d32462cd62..4b61ca27b9 100644
--- a/src/pages/Pools/index.tsx
+++ b/src/pages/Pools/index.tsx
@@ -154,16 +154,15 @@ const Pools = () => {
       mixpanelHandler(MIXPANEL_TYPE.ELASTIC_CREATE_POOL_INITIATED)
     }
 
-    const url =
-      tab === VERSION.CLASSIC
-        ? `/create/${currencyIdA === '' ? undefined : currencyIdA}/${currencyIdB === '' ? undefined : currencyIdB}`
-        : `${APP_PATHS.ELASTIC_CREATE_POOL}${
-            currencyIdA && currencyIdB
-              ? `/${currencyIdA}/${currencyIdB}`
-              : currencyIdA || currencyIdB
-              ? `/${currencyIdA || currencyIdB}`
-              : ''
-          }`
+    const path = tab === VERSION.CLASSIC ? APP_PATHS.CLASSIC_CREATE_POOL : APP_PATHS.ELASTIC_CREATE_POOL
+    let url = `/${networkInfo.route}${path}`
+
+    if (currencyIdA) {
+      url += `/${currencyIdA}`
+      if (currencyIdB) {
+        url += `/${currencyIdB}`
+      }
+    }
 
     navigate(url)
   }
diff --git a/src/pages/Pools/redirect.tsx b/src/pages/Pools/redirect.tsx
deleted file mode 100644
index acae9a4fcc..0000000000
--- a/src/pages/Pools/redirect.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Navigate, useLocation } from 'react-router-dom'
-
-import { APP_PATHS } from 'constants/index'
-import { useActiveWeb3React } from 'hooks'
-
-export function RedirectPathToPoolsNetwork() {
-  const location = useLocation()
-  const { networkInfo } = useActiveWeb3React()
-  return <Navigate to={{ ...location, pathname: `${APP_PATHS.POOLS}/` + networkInfo.route }} replace />
-}
diff --git a/src/pages/ProAmmPool/PositionListItem.tsx b/src/pages/ProAmmPool/PositionListItem.tsx
index 5b80c43088..fbdc5b550d 100644
--- a/src/pages/ProAmmPool/PositionListItem.tsx
+++ b/src/pages/ProAmmPool/PositionListItem.tsx
@@ -417,7 +417,7 @@ function PositionListItem({
                 <ButtonOutlined
                   padding="8px"
                   as={Link}
-                  to={`/elastic/remove/${positionDetails.tokenId}`}
+                  to={`/${networkInfo.route}${APP_PATHS.ELASTIC_REMOVE_POOL}/${positionDetails.tokenId}`}
                   onClick={() => {
                     mixpanelHandler(MIXPANEL_TYPE.ELASTIC_REMOVE_LIQUIDITY_INITIATED, {
                       token_1: token0?.symbol || '',
@@ -440,10 +440,10 @@ function PositionListItem({
                   fontSize: '14px',
                 }}
                 as={Link}
-                to={`/elastic/increase/${currencyId(currency0, chainId)}/${currencyId(
-                  currency1,
+                to={`/${networkInfo.route}${APP_PATHS.ELASTIC_INCREASE_LIQ}/${currencyId(
+                  currency0,
                   chainId,
-                )}/${feeAmount}/${positionDetails.tokenId}`}
+                )}/${currencyId(currency1, chainId)}/${feeAmount}/${positionDetails.tokenId}`}
                 onClick={() => {
                   mixpanelHandler(MIXPANEL_TYPE.ELASTIC_INCREASE_LIQUIDITY_INITIATED, {
                     token_1: token0?.symbol || '',
diff --git a/src/pages/ProAmmPools/CardItem.tsx b/src/pages/ProAmmPools/CardItem.tsx
index 6b44109c64..d446389a06 100644
--- a/src/pages/ProAmmPools/CardItem.tsx
+++ b/src/pages/ProAmmPools/CardItem.tsx
@@ -107,7 +107,7 @@ export default function ProAmmPoolCardItem({ pool, onShared, userPositions }: Li
   return (
     <Wrapper key={pool.address} data-testid={pool.address}>
       <Link
-        to={`${APP_PATHS.ELASTIC_CREATE_POOL}/${token0Slug}/${token1Slug}/${pool.feeTier}`}
+        to={`/${networkInfo.route}${APP_PATHS.ELASTIC_CREATE_POOL}/${token0Slug}/${token1Slug}/${pool.feeTier}`}
         style={{
           textDecoration: 'none',
         }}
@@ -260,7 +260,7 @@ export default function ProAmmPoolCardItem({ pool, onShared, userPositions }: Li
           padding="10px"
           style={{ height: '36px' }}
           onClick={() => {
-            const url = `${APP_PATHS.ELASTIC_CREATE_POOL}/${token0Slug}/${token1Slug}/${pool.feeTier}`
+            const url = `/${networkInfo.route}${APP_PATHS.ELASTIC_CREATE_POOL}/${token0Slug}/${token1Slug}/${pool.feeTier}`
             navigate(url)
           }}
         >
diff --git a/src/pages/ProAmmPools/ListItem.tsx b/src/pages/ProAmmPools/ListItem.tsx
index 56ec34e19c..61d1935c95 100644
--- a/src/pages/ProAmmPools/ListItem.tsx
+++ b/src/pages/ProAmmPools/ListItem.tsx
@@ -161,7 +161,7 @@ export default function ProAmmPoolListItem({ pool, onShared, userPositions }: Li
     <TableRow key={pool.address} data-testid={pool.address}>
       <div>
         <Link
-          to={`${APP_PATHS.ELASTIC_CREATE_POOL}/${token0Slug}/${token1Slug}/${pool.feeTier}`}
+          to={`/${networkInfo.route}${APP_PATHS.ELASTIC_CREATE_POOL}/${token0Slug}/${token1Slug}/${pool.feeTier}`}
           style={{
             textDecoration: 'none',
           }}
@@ -232,7 +232,7 @@ export default function ProAmmPoolListItem({ pool, onShared, userPositions }: Li
             onClick={(e: React.MouseEvent) => {
               e.stopPropagation()
 
-              const url = `${APP_PATHS.ELASTIC_CREATE_POOL}/${token0Slug}/${token1Slug}/${pool.feeTier}`
+              const url = `/${networkInfo.route}${APP_PATHS.ELASTIC_CREATE_POOL}/${token0Slug}/${token1Slug}/${pool.feeTier}`
               mixpanelHandler(MIXPANEL_TYPE.ELASTIC_ADD_LIQUIDITY_IN_LIST_INITIATED, {
                 token_1: token0Symbol,
                 token_2: token1Symbol,
diff --git a/src/pages/RemoveLiquidity/TokenPair.tsx b/src/pages/RemoveLiquidity/TokenPair.tsx
index fe67eb9399..4770c8037b 100644
--- a/src/pages/RemoveLiquidity/TokenPair.tsx
+++ b/src/pages/RemoveLiquidity/TokenPair.tsx
@@ -24,7 +24,7 @@ import TransactionConfirmationModal, {
   ConfirmationModalContent,
   TransactionErrorContent,
 } from 'components/TransactionConfirmationModal'
-import { EIP712Domain } from 'constants/index'
+import { APP_PATHS, EIP712Domain } from 'constants/index'
 import { EVMNetworkInfo } from 'constants/networks/type'
 import { NativeCurrencies } from 'constants/tokens'
 import { useActiveWeb3React, useWeb3React } from 'hooks'
@@ -660,7 +660,7 @@ export default function TokenPair({
                     {pairAddress && chainId && (currencyAIsETHER || currencyAIsWETH) && (
                       <StyledInternalLink
                         replace
-                        to={`/remove/${
+                        to={`/${networkInfo.route}${APP_PATHS.CLASSIC_REMOVE_POOL}/${
                           currencyAIsETHER ? currencyId(WETH[chainId], chainId) : NativeCurrencies[chainId].symbol
                         }/${currencyIdB}/${pairAddress}`}
                       >
@@ -686,7 +686,7 @@ export default function TokenPair({
                     {pairAddress && chainId && (currencyBIsWETH || currencyBIsETHER) && (
                       <StyledInternalLink
                         replace
-                        to={`/remove/${currencyIdA}/${
+                        to={`/${networkInfo.route}${APP_PATHS.CLASSIC_REMOVE_POOL}/${currencyIdA}/${
                           currencyBIsETHER ? currencyId(WETH[chainId], chainId) : NativeCurrencies[chainId].symbol
                         }/${pairAddress}`}
                       >
diff --git a/src/pages/RemoveLiquidity/ZapOut.tsx b/src/pages/RemoveLiquidity/ZapOut.tsx
index 25727b8c8b..fbe0d1ea79 100644
--- a/src/pages/RemoveLiquidity/ZapOut.tsx
+++ b/src/pages/RemoveLiquidity/ZapOut.tsx
@@ -35,7 +35,7 @@ import TransactionConfirmationModal, {
 } from 'components/TransactionConfirmationModal'
 import ZapError from 'components/ZapError'
 import FormattedPriceImpact from 'components/swapv2/FormattedPriceImpact'
-import { EIP712Domain } from 'constants/index'
+import { APP_PATHS, EIP712Domain } from 'constants/index'
 import { EVMNetworkInfo } from 'constants/networks/type'
 import { NativeCurrencies } from 'constants/tokens'
 import { useActiveWeb3React, useWeb3React } from 'hooks'
@@ -724,12 +724,15 @@ export default function ZapOut({
                         replace
                         to={
                           independentTokenField === Field.CURRENCY_A
-                            ? `/remove/${
+                            ? `/${networkInfo.route}${APP_PATHS.CLASSIC_REMOVE_POOL}/${
                                 selectedCurrencyIsETHER
                                   ? currencyId(WETH[chainId], chainId)
                                   : currencyId(NativeCurrencies[chainId], chainId)
                               }/${currencyId(currencies[dependentTokenField] as Currency, chainId)}/${pairAddress}`
-                            : `/remove/${currencyId(currencies[dependentTokenField] as Currency, chainId)}/${
+                            : `/${networkInfo.route}${APP_PATHS.CLASSIC_REMOVE_POOL}/${currencyId(
+                                currencies[dependentTokenField] as Currency,
+                                chainId,
+                              )}/${
                                 selectedCurrencyIsETHER
                                   ? currencyId(WETH[chainId], chainId)
                                   : currencyId(NativeCurrencies[chainId], chainId)
diff --git a/src/pages/RemoveLiquidity/index.tsx b/src/pages/RemoveLiquidity/index.tsx
index 01af26fbd9..724edb4df9 100644
--- a/src/pages/RemoveLiquidity/index.tsx
+++ b/src/pages/RemoveLiquidity/index.tsx
@@ -19,6 +19,7 @@ import { Container, LiquidityProviderModeWrapper, PageWrapper, PoolName, TopBar
 
 export default function RemoveLiquidity() {
   const { currencyIdA = '', currencyIdB = '', pairAddress = '' } = useParams()
+
   const currencyA = useCurrency(currencyIdA) ?? undefined
   const currencyB = useCurrency(currencyIdB) ?? undefined
   const { chainId, isEVM } = useActiveWeb3React()
diff --git a/yarn.lock b/yarn.lock
index 57ed56f10d..24b355fb45 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3047,10 +3047,10 @@
     conventional-recommended-bump "^6.1.0"
     semver "7.3.8"
 
-"@remix-run/router@1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.0.5.tgz#d5c65626add4c3c185a89aa5bd38b1e42daec075"
-  integrity sha512-my0Mycd+jruq/1lQuO5LBB6WTlL/e8DTCYWp44DfMTDcXz8DcTlgF0ISaLsGewt+ctHN+yA8xMq3q/N7uWJPug==
+"@remix-run/router@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.1.0.tgz#b48db8148c8a888e50580a8152b6f68161c49406"
+  integrity sha512-rGl+jH/7x1KBCQScz9p54p0dtPLNeKGb3e0wD2H5/oZj41bwQUnXdzbj2TbUAFhvD7cp9EyEQA4dEgpUFa1O7Q==
 
 "@rollup/pluginutils@^5.0.2":
   version "5.0.2"
@@ -14700,20 +14700,20 @@ react-rnd@10.4.1:
     react-draggable "4.4.5"
     tslib "2.3.1"
 
-react-router-dom@^6.4.3:
-  version "6.4.5"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.4.5.tgz#4fdb12efef4f3848c693a76afbeaed1f6ca02047"
-  integrity sha512-a7HsgikBR0wNfroBHcZUCd9+mLRqZS8R5U1Z1mzLWxFXEkUT3vR1XXmSIVoVpxVX8Bar0nQYYYc9Yipq8dWwAA==
+react-router-dom@6.5.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.5.0.tgz#3970bdcaa7c710a6e0b478a833ba0b4b8ae61a6f"
+  integrity sha512-/XzRc5fq80gW1ctiIGilyKFZC/j4kfe75uivMsTChFbkvrK4ZrF3P3cGIc1f/SSkQ4JiJozPrf+AwUHHWVehVg==
   dependencies:
-    "@remix-run/router" "1.0.5"
-    react-router "6.4.5"
+    "@remix-run/router" "1.1.0"
+    react-router "6.5.0"
 
-react-router@6.4.5:
-  version "6.4.5"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.4.5.tgz#73f382af2c8b9a86d74e761a7c5fc3ce7cb0024d"
-  integrity sha512-1RQJ8bM70YEumHIlNUYc6mFfUDoWa5EgPDenK/fq0bxD8DYpQUi/S6Zoft+9DBrh2xmtg92N5HMAJgGWDhKJ5Q==
+react-router@6.5.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.5.0.tgz#b53f15543a60750c925609d2e38037ac5aed6dd3"
+  integrity sha512-fqqUSU0NC0tSX0sZbyuxzuAzvGqbjiZItBQnyicWlOUmzhAU8YuLgRbaCL2hf3sJdtRy4LP/WBrWtARkMvdGPQ==
   dependencies:
-    "@remix-run/router" "1.0.5"
+    "@remix-run/router" "1.1.0"
 
 react-side-effect@^2.1.0:
   version "2.1.2"