diff --git a/liquidity/components/Tooltip/Tooltip.tsx b/liquidity/components/Tooltip/Tooltip.tsx
index 0559962a0..6006fbf3a 100644
--- a/liquidity/components/Tooltip/Tooltip.tsx
+++ b/liquidity/components/Tooltip/Tooltip.tsx
@@ -1,4 +1,4 @@
-import { Tooltip as ChakraTooltip, TooltipProps } from '@chakra-ui/react';
+import { Tooltip as ChakraTooltip, type TooltipProps } from '@chakra-ui/react';
 
 export const Tooltip = ({ ...props }: TooltipProps) => {
   return <ChakraTooltip hasArrow bg="gray.900" p={3} borderRadius="4px" {...props} />;
diff --git a/liquidity/components/WithdrawModal/WithdrawModal.tsx b/liquidity/components/WithdrawModal/WithdrawModal.tsx
index 4c174c9ae..94134a8ee 100644
--- a/liquidity/components/WithdrawModal/WithdrawModal.tsx
+++ b/liquidity/components/WithdrawModal/WithdrawModal.tsx
@@ -26,7 +26,7 @@ export function WithdrawModal({
   onClose: () => void;
   isDebtWithdrawal?: boolean;
 }) {
-  const [txState, setTxState] = useState({
+  const [state, setState] = useState({
     step: 1,
     status: 'idle',
   });
@@ -50,25 +50,24 @@ export function WithdrawModal({
 
   const { mutateAsync: unwrapStata } = useUnwrapStataUSDC();
 
-  const { mutation: withdrawMain } = useWithdraw({
+  const { mutation: withdrawMain, isReady: isReadyWithdrawMain } = useWithdraw({
     amount: withdrawAmount,
     accountId: params.accountId,
-    collateralTypeAddress: isDebtWithdrawal ? systemToken?.address : collateralType?.tokenAddress,
+    token: isDebtWithdrawal ? systemToken : collateralType,
   });
 
-  const { mutation: withdrawAndromeda } = useWithdrawBaseAndromeda({
-    amountToWithdraw: withdrawAmount,
-  });
+  const { mutation: withdrawAndromeda, isReady: isReadyWithdrawAndromeda } =
+    useWithdrawBaseAndromeda({ amount: withdrawAmount });
 
   const onSubmit = async () => {
     try {
-      if (txState.status === 'success') {
+      if (state.status === 'success') {
         onClose();
       }
 
-      let step = txState.step;
+      let step = state.step;
       if (step === 1) {
-        setTxState({
+        setState({
           step: 1,
           status: 'pending',
         });
@@ -81,12 +80,12 @@ export function WithdrawModal({
 
         if (isStataUSDC) {
           step = 2;
-          setTxState({
+          setState({
             step: 2,
             status: 'pending',
           });
         } else {
-          setTxState({
+          setState({
             step: 2,
             status: 'success',
           });
@@ -97,7 +96,7 @@ export function WithdrawModal({
           throw new Error('Not ready');
         }
 
-        setTxState({
+        setState({
           step: 2,
           status: 'pending',
         });
@@ -111,7 +110,7 @@ export function WithdrawModal({
         const balance = await StaticAaveUSDCContract.balanceOf(activeWallet?.address);
         await unwrapStata(balance);
 
-        setTxState({
+        setState({
           step: 2,
           status: 'success',
         });
@@ -119,7 +118,7 @@ export function WithdrawModal({
 
       setWithdrawAmount(ZEROWEI);
     } catch (error) {
-      setTxState((state) => ({
+      setState((state) => ({
         ...state,
         status: 'error',
       }));
@@ -143,10 +142,6 @@ export function WithdrawModal({
     }
   };
 
-  const amount = withdrawAmount;
-  const symbol = isDebtWithdrawal ? systemToken?.symbol : collateralType?.displaySymbol;
-  const state = txState;
-
   if (state.status === 'success') {
     return (
       <LiquidityPositionUpdated
@@ -180,7 +175,14 @@ export function WithdrawModal({
       <Multistep
         step={1}
         title="Withdraw"
-        subtitle={<Amount value={amount} suffix={` ${symbol} will be withdrawn`} />}
+        subtitle={
+          <Amount
+            value={withdrawAmount}
+            suffix={` ${
+              isDebtWithdrawal ? systemToken?.symbol : collateralType?.displaySymbol
+            } will be withdrawn`}
+          />
+        }
         status={{
           failed: state.step === 1 && state.status === 'error',
           success: state.step > 1,
@@ -200,7 +202,12 @@ export function WithdrawModal({
         />
       )}
       <Button
-        isDisabled={state.status === 'pending' || isPendingStaticAaveUSDC || !provider}
+        isDisabled={
+          (network?.preset === 'andromeda' && !isReadyWithdrawAndromeda) ||
+          (network?.preset !== 'andromeda' && !isReadyWithdrawMain) ||
+          state.status === 'pending' ||
+          isPendingStaticAaveUSDC
+        }
         onClick={onSubmit}
         width="100%"
         mt="6"
diff --git a/liquidity/cypress/cypress.config.js b/liquidity/cypress/cypress.config.js
index 96d6cd58e..c4ab3197b 100644
--- a/liquidity/cypress/cypress.config.js
+++ b/liquidity/cypress/cypress.config.js
@@ -29,6 +29,8 @@ module.exports = defineConfig({
       require('cypress-terminal-report/src/installLogsPrinter')(on, {
         printLogsToConsole: 'always',
         includeSuccessfulHookLogs: true,
+        defaultTrimLength: 10_000,
+        commandTrimLength: 10_000,
       });
       require('@cypress/code-coverage/task')(on, config);
       //      }
diff --git a/liquidity/cypress/cypress/e2e/8453-andromeda/stataUSDC_Withdraw.e2e.js b/liquidity/cypress/cypress/e2e/8453-andromeda/stataUSDC_Withdraw.e2e.js
index d6403edf7..6523155be 100644
--- a/liquidity/cypress/cypress/e2e/8453-andromeda/stataUSDC_Withdraw.e2e.js
+++ b/liquidity/cypress/cypress/e2e/8453-andromeda/stataUSDC_Withdraw.e2e.js
@@ -58,7 +58,7 @@ describe(__filename, () => {
     cy.get('[data-cy="withdraw confirm button"]').click();
 
     cy.contains('[data-status="success"]', 'Collateral successfully Withdrawn', {
-      timeout: 180_000,
+      timeout: 60_000,
     }).should('exist');
   });
 });
diff --git a/liquidity/lib/useWithdraw/useWithdraw.tsx b/liquidity/lib/useWithdraw/useWithdraw.tsx
index 81e1e9da4..c0ec939b8 100644
--- a/liquidity/lib/useWithdraw/useWithdraw.tsx
+++ b/liquidity/lib/useWithdraw/useWithdraw.tsx
@@ -17,11 +17,11 @@ const log = debug('snx:useWithdraw');
 
 export const useWithdraw = ({
   accountId,
-  collateralTypeAddress,
+  token,
   amount,
 }: {
   accountId?: string;
-  collateralTypeAddress?: string;
+  token?: { address: string; decimals: number };
   amount: Wei;
 }) => {
   const [txnState, dispatch] = useReducer(reducer, initialState);
@@ -33,39 +33,22 @@ export const useWithdraw = ({
   const signer = useSigner();
   const provider = useProvider();
 
+  const isReady = signer && network && provider && CoreProxy && token && amount && amount.gt(0);
   const queryClient = useQueryClient();
   const mutation = useMutation({
     mutationFn: async () => {
-      if (!signer || !network || !provider) throw new Error('No signer or network');
-
-      if (!(CoreProxy && collateralTypeAddress && amount)) {
+      if (!isReady) {
         throw new Error('Not ready');
       }
-      if (amount?.eq(0)) {
-        throw new Error('Amount less than 0');
-      }
-
       const walletAddress = await signer.getAddress();
 
       dispatch({ type: 'prompting' });
 
-      const contract = new ethers.Contract(
-        collateralTypeAddress,
-        ['function decimals() view returns (uint8)'],
-        provider
-      );
-
-      const decimals = await contract.decimals();
-
-      const collateralAmount = amount.gt(0)
-        ? parseUnits(amount.toString(), decimals)
-        : BigNumber.from(0);
-
       const CoreProxyContract = new ethers.Contract(CoreProxy.address, CoreProxy.abi, signer);
       const populatedTxnPromised = CoreProxyContract.populateTransaction.withdraw(
         BigNumber.from(accountId),
-        collateralTypeAddress,
-        collateralAmount
+        token.address,
+        parseUnits(amount.toString(), token.decimals)
       );
 
       const callsPromise = Promise.all([populatedTxnPromised]);
@@ -122,6 +105,7 @@ export const useWithdraw = ({
     },
   });
   return {
+    isReady,
     mutation,
     txnState,
     settle: () => dispatch({ type: 'settled' }),
diff --git a/liquidity/lib/useWithdrawBaseAndromeda/useWithdrawBaseAndromeda.tsx b/liquidity/lib/useWithdrawBaseAndromeda/useWithdrawBaseAndromeda.tsx
index 771a60bfd..9451a218f 100644
--- a/liquidity/lib/useWithdrawBaseAndromeda/useWithdrawBaseAndromeda.tsx
+++ b/liquidity/lib/useWithdrawBaseAndromeda/useWithdrawBaseAndromeda.tsx
@@ -23,7 +23,7 @@ import { useReducer } from 'react';
 
 const log = debug('snx:useWithdrawBaseAndromeda');
 
-export const useWithdrawBaseAndromeda = ({ amountToWithdraw }: { amountToWithdraw: Wei }) => {
+export const useWithdrawBaseAndromeda = ({ amount }: { amount: Wei }) => {
   const [params] = useParams<PositionPageSchemaType>();
   const { data: collateralType } = useCollateralType(params.collateralSymbol);
   const { data: liquidityPosition } = useLiquidityPosition({
@@ -45,43 +45,42 @@ export const useWithdrawBaseAndromeda = ({ amountToWithdraw }: { amountToWithdra
   const signer = useSigner();
   const provider = useProvider();
 
+  const isReady =
+    signer &&
+    network &&
+    provider &&
+    CoreProxy &&
+    SpotMarketProxy &&
+    USDProxy &&
+    accountId &&
+    usdTokens &&
+    params.collateralSymbol &&
+    collateralType &&
+    liquidityPosition;
+
   const queryClient = useQueryClient();
   const mutation = useMutation({
     mutationFn: async () => {
-      if (!signer || !network || !provider) throw new Error('No signer or network');
-      if (
-        !(
-          CoreProxy &&
-          SpotMarketProxy &&
-          USDProxy &&
-          accountId &&
-          usdTokens?.sUSD &&
-          usdTokens.snxUSD &&
-          params.collateralSymbol &&
-          collateralType &&
-          liquidityPosition
-        )
-      ) {
+      if (!isReady) {
         throw new Error('Not ready');
       }
-
       const total = liquidityPosition.availableSystemToken.add(
         liquidityPosition.availableCollateral
       );
       log('total', total);
 
-      log('amountToWithdraw', amountToWithdraw);
-      if (total.lt(amountToWithdraw)) {
+      log('amountToWithdraw', amount);
+      if (total.lt(amount)) {
         throw new Error('Exceeds balance');
       }
 
-      const wrappedCollateralAmount = amountToWithdraw.gt(liquidityPosition.availableCollateral)
+      const wrappedCollateralAmount = amount.gt(liquidityPosition.availableCollateral)
         ? liquidityPosition.availableCollateral
-        : amountToWithdraw;
+        : amount;
       log('wrappedCollateralAmount', wrappedCollateralAmount);
 
-      const snxUSDAmount = amountToWithdraw.sub(wrappedCollateralAmount).gt(0)
-        ? amountToWithdraw.sub(wrappedCollateralAmount)
+      const snxUSDAmount = amount.sub(wrappedCollateralAmount).gt(0)
+        ? amount.sub(wrappedCollateralAmount)
         : ZEROWEI;
 
       log('snxUSDAmount', snxUSDAmount);
@@ -120,7 +119,7 @@ export const useWithdrawBaseAndromeda = ({ amountToWithdraw }: { amountToWithdra
       const withdraw_snxUSD = snxUSDAmount.gt(0)
         ? CoreProxyContract.populateTransaction.withdraw(
             ethers.BigNumber.from(accountId),
-            usdTokens?.snxUSD,
+            usdTokens.snxUSD,
             snxUSDAmount.toBN()
           )
         : undefined;
@@ -242,6 +241,7 @@ export const useWithdrawBaseAndromeda = ({ amountToWithdraw }: { amountToWithdra
   });
 
   return {
+    isReady,
     mutation,
     txnState,
     settle: () => dispatch({ type: 'settled' }),
diff --git a/liquidity/ui/.env.example b/liquidity/ui/.env.example
index 1c340a7f6..80e9d5f9d 100644
--- a/liquidity/ui/.env.example
+++ b/liquidity/ui/.env.example
@@ -1,4 +1,3 @@
 INFURA_KEY=''
-WC_PROJECT_ID=''
 PYTH_MAINNET_ENDPOINT=https://hermes.pyth.network/
 PYTH_TESTNET_ENDPOINT=https://hermes.pyth.network/
diff --git a/liquidity/ui/src/App.tsx b/liquidity/ui/src/App.tsx
index fef1cd95f..002759059 100644
--- a/liquidity/ui/src/App.tsx
+++ b/liquidity/ui/src/App.tsx
@@ -63,22 +63,22 @@ export const App = () => {
     <>
       <Head>
         {/* open graph */}
-        <meta property="og:url" content="https://liquidity.synthetix.eth.limo/" />
+        <meta property="og:url" content="https://liquidity.synthetix.io/" />
         <meta property="og:type" content="website" />
         <meta property="og:title" content="Synthetix | Liquidity" />
         <meta
           property="og:description"
           content="The Liquidity Layer of DeFi. Provide liquidity for the next generation of permissionless protocols"
         />
-        <meta property="og:image" content="https://liquidity.synthetix.eth.limo/Liquidity.jpg" />
+        <meta property="og:image" content="https://liquidity.synthetix.io/Liquidity.jpg" />
         <meta property="og:image:alt" content="Synthetix | Liquidity" />
         <meta property="og:site_name" content="" />
         {/* twitter */}
         <meta name="twitter:card" content="summary_large_image" />
         <meta name="twitter:site" content="@synthetix_io" />
         <meta name="twitter:creator" content="@synthetix_io" />
-        <meta name="twitter:image" content="https://liquidity.synthetix.eth.limo/Liquidity.jpg" />
-        <meta name="twitter:url" content="https://liquidity.synthetix.eth.limo/" />
+        <meta name="twitter:image" content="https://liquidity.synthetix.io/Liquidity.jpg" />
+        <meta name="twitter:url" content="https://liquidity.synthetix.io/" />
       </Head>
       <QueryClientProvider client={queryClient}>
         <Web3OnboardProvider web3Onboard={onboard}>
diff --git a/liquidity/ui/src/NetworkController.tsx b/liquidity/ui/src/NetworkController.tsx
index edc6bf11c..ded505dc4 100644
--- a/liquidity/ui/src/NetworkController.tsx
+++ b/liquidity/ui/src/NetworkController.tsx
@@ -80,243 +80,251 @@ export function NetworkController() {
   const notConnected = !activeWallet;
   const notSupported = activeWallet && !activeNetwork;
 
+  if (!activeWallet) {
+    return (
+      <Button
+        data-cy="connect wallet button"
+        onClick={() => connect()}
+        type="button"
+        size="sm"
+        ml={2}
+        py={5}
+      >
+        Connect Wallet
+      </Button>
+    );
+  }
   return (
     <Flex>
-      <Menu>
-        <MenuButton
-          as={Button}
-          variant="outline"
-          colorScheme="gray"
-          sx={{ '> span': { display: 'flex', alignItems: 'center' } }}
-          mr={1}
-          px={3}
-        >
-          <NetworkIcon
-            filter={activeNetwork?.isTestnet ? 'grayscale(1)' : ''}
-            networkId={notConnected ? 8453 : notSupported ? 0 : activeNetwork?.id}
-          />
-        </MenuButton>
-        <MenuList border="1px" borderColor="gray.900">
-          {mainnets.map(({ id, preset, label }) => (
-            <MenuItem
-              key={`${id}-${preset}`}
-              onClick={() => setNetwork(id)}
-              isDisabled={window.$chainId ? window.$chainId !== id : false}
-            >
-              <NetworkIcon networkId={id} size="20px" />
-              <Text variant="nav" ml={2}>
-                {label}
-              </Text>
-            </MenuItem>
-          ))}
-
-          {showTestnets && <Divider color="gray.900" />}
-
-          <MenuOptionGroup>
-            <Flex py={4} px={3} alignItems="center" justifyContent="space-between">
-              <Text fontSize="14px" fontFamily="heading" lineHeight="20px">
-                Show Testnets
-              </Text>
-              <Switch
-                mr={2}
-                size="sm"
-                color="gray.900"
-                colorScheme="gray"
-                isChecked={showTestnets}
-                onChange={() => setShowTestnets(!showTestnets)}
-              />
-            </Flex>
-          </MenuOptionGroup>
-
-          {(showTestnets ? testnets : []).map(({ id, preset, label }) => (
-            <MenuItem
-              key={`${id}-${preset}`}
-              onClick={() => setNetwork(id)}
-              isDisabled={window.$chainId ? window.$chainId !== id : false}
-            >
-              <NetworkIcon filter="grayscale(1)" networkId={id} size="20px" />
-              <Text variant="nav" ml={2}>
-                {label}
-              </Text>
-            </MenuItem>
-          ))}
-        </MenuList>
-      </Menu>
-      {activeWallet ? (
-        <Menu placement="bottom-end">
+      {activeNetwork ? (
+        <Menu>
           <MenuButton
             as={Button}
             variant="outline"
             colorScheme="gray"
-            ml={2}
-            height={10}
-            py="6px"
-            px="9.5px"
-            whiteSpace="nowrap"
-            data-cy="wallet button"
+            sx={{ '> span': { display: 'flex', alignItems: 'center' } }}
+            mr={1}
+            px={3}
           >
-            <WalletIcon color="white" />
-            <Text
-              as="span"
-              ml={1}
-              color="white"
-              fontWeight={700}
-              fontSize="xs"
-              userSelect="none"
-              data-cy="short wallet address"
-            >
-              {activeWallet.ens?.name || prettyString(activeWallet.address)}
+            <NetworkIcon
+              filter={activeNetwork.isTestnet ? 'grayscale(1)' : ''}
+              networkId={notConnected ? 8453 : notSupported ? 0 : activeNetwork.id}
+            />
+            <Text variant="nav" ml={2} display={{ base: 'none', md: 'inline-block' }}>
+              {activeNetwork.label}
             </Text>
           </MenuButton>
-          <MenuList>
-            <Flex
-              border="1px solid"
-              rounded="base"
-              borderColor="gray.900"
-              w="370px"
-              _hover={{ bg: 'navy.700' }}
-              backgroundColor="navy.700"
-              opacity={1}
-              p="4"
-            >
-              <Flex flexDir="column" w="100%" gap="2">
-                <Flex justifyContent="space-between">
-                  <Text fontSize="14px" color="gray.500">
-                    Connected with {walletsInfo?.label}
-                  </Text>
-                  <Button
+          <MenuList border="1px" borderColor="gray.900">
+            {mainnets.map(({ id, preset, label }) => (
+              <MenuItem
+                key={`${id}-${preset}`}
+                onClick={() => setNetwork(id)}
+                isDisabled={window.$chainId ? window.$chainId !== id : false}
+              >
+                <NetworkIcon networkId={id} size="20px" />
+                <Text variant="nav" ml={2}>
+                  {label}
+                </Text>
+              </MenuItem>
+            ))}
+
+            {showTestnets && <Divider color="gray.900" />}
+
+            <MenuOptionGroup>
+              <Flex py={4} px={3} alignItems="center" justifyContent="space-between">
+                <Text fontSize="14px" fontFamily="heading" lineHeight="20px">
+                  Show Testnets
+                </Text>
+                <Switch
+                  mr={2}
+                  size="sm"
+                  color="gray.900"
+                  colorScheme="gray"
+                  isChecked={showTestnets}
+                  onChange={() => setShowTestnets(!showTestnets)}
+                />
+              </Flex>
+            </MenuOptionGroup>
+
+            {(showTestnets ? testnets : []).map(({ id, preset, label }) => (
+              <MenuItem
+                key={`${id}-${preset}`}
+                onClick={() => setNetwork(id)}
+                isDisabled={window.$chainId ? window.$chainId !== id : false}
+              >
+                <NetworkIcon filter="grayscale(1)" networkId={id} size="20px" />
+                <Text variant="nav" ml={2}>
+                  {label}
+                </Text>
+              </MenuItem>
+            ))}
+          </MenuList>
+        </Menu>
+      ) : null}
+      <Menu placement="bottom-end">
+        <MenuButton
+          as={Button}
+          variant="outline"
+          colorScheme="gray"
+          ml={2}
+          height={10}
+          py="6px"
+          px="9.5px"
+          whiteSpace="nowrap"
+          data-cy="wallet button"
+        >
+          <WalletIcon color="white" />
+          <Text
+            as="span"
+            ml={1}
+            color="white"
+            fontWeight={700}
+            fontSize="xs"
+            userSelect="none"
+            data-cy="short wallet address"
+          >
+            {activeWallet.ens?.name || prettyString(activeWallet.address)}
+          </Text>
+        </MenuButton>
+        <MenuList>
+          <Flex
+            border="1px solid"
+            rounded="base"
+            borderColor="gray.900"
+            w="370px"
+            _hover={{ bg: 'navy.700' }}
+            backgroundColor="navy.700"
+            opacity={1}
+            p="4"
+          >
+            <Flex flexDir="column" w="100%" gap="2">
+              <Flex justifyContent="space-between">
+                <Text fontSize="14px" color="gray.500">
+                  Connected with {walletsInfo?.label}
+                </Text>
+                <Button
+                  onClick={() => {
+                    if (walletsInfo) {
+                      disconnect(walletsInfo);
+                    }
+                  }}
+                  size="xs"
+                  variant="outline"
+                  colorScheme="gray"
+                  color="white"
+                >
+                  Disconnect
+                </Button>
+              </Flex>
+              <Flex fontWeight={700} color="white" fontSize="16px" alignItems="center">
+                <Tooltip label={activeWallet.address} fontFamily="monospace" fontSize="0.9em">
+                  <Text>{prettyString(activeWallet.address)}</Text>
+                </Tooltip>
+                <Tooltip label={toolTipLabel} closeOnClick={false}>
+                  <CopyIcon
+                    ml="2"
                     onClick={() => {
-                      if (walletsInfo) {
-                        disconnect(walletsInfo);
-                      }
+                      navigator.clipboard.writeText(activeWallet.address);
+                      setTooltipLabel('Copied');
+                      setTimeout(() => {
+                        setTooltipLabel('Copy');
+                      }, 10000);
+                    }}
+                  />
+                </Tooltip>
+              </Flex>
+              <Flex
+                flexDir="column"
+                p="2"
+                border="1px solid"
+                borderColor="gray.900"
+                rounded="base"
+                gap="2"
+              >
+                <Flex w="100%" justifyContent="space-between">
+                  <Text fontWeight={400} fontSize="14px">
+                    Account(s)
+                  </Text>
+                  <Link
+                    href={`?${makeSearch({ page: 'settings', accountId: params.accountId })}`}
+                    onClick={(e) => {
+                      e.preventDefault();
+                      setParams({ page: 'settings', accountId: params.accountId });
                     }}
-                    size="xs"
-                    variant="outline"
-                    colorScheme="gray"
-                    color="white"
                   >
-                    Disconnect
-                  </Button>
-                </Flex>
-                <Text fontWeight={700} color="white" fontSize="16px">
-                  {prettyString(activeWallet.address)}{' '}
-                  <Tooltip label={toolTipLabel} closeOnClick={false}>
-                    <CopyIcon
-                      ml="2"
-                      onClick={() => {
-                        navigator.clipboard.writeText(activeWallet.address);
-                        setTooltipLabel('Copied');
-                        setTimeout(() => {
-                          setTooltipLabel('Copy');
-                        }, 10000);
-                      }}
+                    <IconButton
+                      variant="outline"
+                      colorScheme="gray"
+                      size="xs"
+                      icon={<SettingsIcon />}
+                      aria-label="account settings"
                     />
-                  </Tooltip>
-                </Text>
-                <Flex
-                  flexDir="column"
-                  p="2"
-                  border="1px solid"
-                  borderColor="gray.900"
-                  rounded="base"
-                  gap="2"
-                >
-                  <Flex w="100%" justifyContent="space-between">
-                    <Text fontWeight={400} fontSize="14px">
-                      Account(s)
-                    </Text>
-                    <Link
-                      href={`?${makeSearch({ page: 'settings', accountId: params.accountId })}`}
+                  </Link>
+                </Flex>
+                <Flex data-cy="accounts list" flexDir="column">
+                  {accounts?.map((accountId) => (
+                    <Text
+                      key={accountId.toString()}
+                      display="flex"
+                      alignItems="center"
+                      color="white"
+                      fontWeight={700}
+                      fontSize="16px"
+                      cursor="pointer"
+                      p="3"
+                      data-cy="account id"
+                      data-account-id={accountId}
+                      _hover={{ bg: 'whiteAlpha.300' }}
                       onClick={(e) => {
-                        e.preventDefault();
-                        setParams({ page: 'settings', accountId: params.accountId });
+                        e.stopPropagation();
+                        setParams({ ...params, accountId: accountId.toString() });
                       }}
                     >
-                      <IconButton
-                        variant="outline"
-                        colorScheme="gray"
-                        size="xs"
-                        icon={<SettingsIcon />}
-                        aria-label="account settings"
-                      />
-                    </Link>
-                  </Flex>
-                  <Flex data-cy="accounts list" flexDir="column">
-                    {accounts?.map((accountId) => (
-                      <Text
-                        key={accountId.toString()}
-                        display="flex"
-                        alignItems="center"
-                        color="white"
-                        fontWeight={700}
-                        fontSize="16px"
-                        cursor="pointer"
-                        p="3"
-                        data-cy="account id"
-                        data-account-id={accountId}
-                        _hover={{ bg: 'whiteAlpha.300' }}
-                        onClick={(e) => {
-                          e.stopPropagation();
-                          setParams({ ...params, accountId: accountId.toString() });
-                        }}
-                      >
-                        {renderAccountId(accountId)}
-                        {paramsAccountId && accountId.eq(paramsAccountId) ? (
-                          <Badge ml={2} colorScheme="cyan" variant="outline">
-                            Connected
-                          </Badge>
-                        ) : null}
-                      </Text>
-                    ))}
-                  </Flex>
-
-                  <Button
-                    onClick={(e) => {
-                      e.preventDefault();
-                      e.stopPropagation();
-                      createAccount.mutation.mutate();
-                    }}
-                    isDisabled={!createAccount.enabled || createAccount.mutation.isPending}
-                    size="xs"
-                    variant="outline"
-                    colorScheme="gray"
-                    color="white"
-                    leftIcon={
-                      <svg
-                        width="8"
-                        height="8"
-                        viewBox="0 0 8 8"
-                        fill="none"
-                        xmlns="http://www.w3.org/2000/svg"
-                      >
-                        <path
-                          d="M3.5 3.5V0.5H4.5V3.5H7.5V4.5H4.5V7.5H3.5V4.5H0.5V3.5H3.5Z"
-                          fill="white"
-                        />
-                      </svg>
-                    }
-                    w="130px"
-                    data-cy="create new account button"
-                  >
-                    Create Account
-                  </Button>
+                      {renderAccountId(accountId)}
+                      {paramsAccountId && accountId.eq(paramsAccountId) ? (
+                        <Badge ml={2} colorScheme="cyan" variant="outline">
+                          Connected
+                        </Badge>
+                      ) : null}
+                    </Text>
+                  ))}
                 </Flex>
+
+                <Button
+                  onClick={(e) => {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    createAccount.mutation.mutate();
+                  }}
+                  isDisabled={!createAccount.enabled || createAccount.mutation.isPending}
+                  size="xs"
+                  variant="outline"
+                  colorScheme="gray"
+                  color="white"
+                  leftIcon={
+                    <svg
+                      width="8"
+                      height="8"
+                      viewBox="0 0 8 8"
+                      fill="none"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M3.5 3.5V0.5H4.5V3.5H7.5V4.5H4.5V7.5H3.5V4.5H0.5V3.5H3.5Z"
+                        fill="white"
+                      />
+                    </svg>
+                  }
+                  w="130px"
+                  data-cy="create new account button"
+                >
+                  Create Account
+                </Button>
               </Flex>
             </Flex>
-          </MenuList>
-        </Menu>
-      ) : (
-        <Button
-          data-cy="connect wallet button"
-          onClick={() => connect()}
-          type="button"
-          size="sm"
-          ml={2}
-          py={5}
-        >
-          Connect Wallet
-        </Button>
-      )}
+          </Flex>
+        </MenuList>
+      </Menu>
     </Flex>
   );
 }
diff --git a/liquidity/ui/src/utils/onboard.ts b/liquidity/ui/src/utils/onboard.ts
index 3266cb060..18432743e 100644
--- a/liquidity/ui/src/utils/onboard.ts
+++ b/liquidity/ui/src/utils/onboard.ts
@@ -41,7 +41,7 @@ export const onboard = init({
         coinbaseModule(),
         injectedModule({ displayUnavailable: [ProviderLabel.MetaMask, ProviderLabel.Trust] }),
         trezorModule({
-          appUrl: 'https://liquidity.synthetix.eth.limo',
+          appUrl: 'https://liquidity.synthetix.io',
           email: 'info@synthetix.io',
         }),
         ledgerModule({
@@ -51,7 +51,7 @@ export const onboard = init({
         walletConnectModule({
           version: 2,
           projectId: 'd6eac005846a1c3be1f8eea3a294eed9',
-          dappUrl: 'liquidity.synthetix.eth.limo',
+          dappUrl: 'liquidity.synthetix.io',
         }),
         gnosisModule(),
       ],
diff --git a/liquidity/ui/webpack.config.js b/liquidity/ui/webpack.config.js
index 645e9a3a3..502f14f95 100644
--- a/liquidity/ui/webpack.config.js
+++ b/liquidity/ui/webpack.config.js
@@ -154,7 +154,6 @@ module.exports = {
     .concat(
       new webpack.DefinePlugin({
         'process.env.INFURA_KEY': JSON.stringify(process.env.INFURA_KEY),
-        'process.env.WC_PROJECT_ID': JSON.stringify(process.env.WC_PROJECT_ID),
         'process.env.PYTH_MAINNET_ENDPOINT': JSON.stringify(process.env.PYTH_MAINNET_ENDPOINT),
         'process.env.PYTH_TESTNET_ENDPOINT': JSON.stringify(process.env.PYTH_TESTNET_ENDPOINT),
       })