diff --git a/packages/katana/components/WETHTokenAmountInput.tsx b/packages/katana/components/WETHTokenAmountInput.tsx
index ed9057a..1f9ec89 100644
--- a/packages/katana/components/WETHTokenAmountInput.tsx
+++ b/packages/katana/components/WETHTokenAmountInput.tsx
@@ -169,7 +169,7 @@ export function WETHTokenAmountInput(props: TWETHTokenAmountInputProps): ReactEl
 								'border-regularText/15 bg-regularText/5 relative flex !h-16 items-center gap-x-1 rounded-lg border px-4 py-3'
 							}>
 							<ImageWithFallback
-								src={`https://assets.smold.app/tokens/${vault.chainID}/${selectedToken?.address === ETH_ADDRESS ? WETH_ADDRESS : selectedToken?.address}/logo-128.png`}
+								src={`https://token-assets-one.vercel.app/tokens/${vault.chainID}/${selectedToken?.address === ETH_ADDRESS ? WETH_ADDRESS : selectedToken?.address}/logo-128.png`}
 								alt={selectedToken?.symbol || 'token'}
 								width={32}
 								height={32}
@@ -193,7 +193,7 @@ export function WETHTokenAmountInput(props: TWETHTokenAmountInputProps): ReactEl
 												'hover:bg-regularText/5 flex w-full items-center gap-x-2 rounded-lg p-2'
 											}>
 											<ImageWithFallback
-												src={`https://assets.smold.app/tokens/${vault.chainID}/${token.address === ETH_ADDRESS ? WETH_ADDRESS : token.address}/logo-128.png`}
+												src={`https://token-assets-one.vercel.app/tokens/${vault.chainID}/${token.address === ETH_ADDRESS ? WETH_ADDRESS : token.address}/logo-128.png`}
 												alt={token.symbol}
 												width={24}
 												height={24}
diff --git a/packages/lib/components/common/KatanaVaultItem.tsx b/packages/lib/components/common/KatanaVaultItem.tsx
index 041ccd0..6c0f260 100644
--- a/packages/lib/components/common/KatanaVaultItem.tsx
+++ b/packages/lib/components/common/KatanaVaultItem.tsx
@@ -272,7 +272,7 @@ export const VaultItem = ({vault, price, options}: TVaultItem): ReactElement =>
 						'border-regularText/15 bg-regularText/5 col-span-3 flex cursor-alias items-center justify-start overflow-hidden rounded-xl border p-3'
 					}>
 					<ImageWithFallback
-						src={`https://assets.smold.app/tokens/${vault.chainID}/${vault.token.address}/logo-32.png`}
+						src={`https://token-assets-one.vercel.app/tokens/${vault.chainID}/${vault.token.address}/logo-32.png`}
 						altSrc={`/tokens/${vault.token.address.toLowerCase()}/logo-32.png`}
 						alt={vault.token.symbol}
 						width={28}
@@ -351,7 +351,7 @@ export const VaultItem = ({vault, price, options}: TVaultItem): ReactElement =>
 						'border-regularText/15 bg-regularText/5 flex w-full items-center rounded-xl border px-2.5 py-2'
 					}>
 					<ImageWithFallback
-						src={`https://assets.smold.app/tokens/${vault.chainID}/${vault.token.address}/logo-32.png`}
+						src={`https://token-assets-one.vercel.app/tokens/${vault.chainID}/${vault.token.address}/logo-32.png`}
 						altSrc={`/tokens/${vault.token.address.toLowerCase()}/logo-32.png`}
 						alt={vault.token.symbol}
 						width={28}
diff --git a/packages/lib/components/common/TokenAmountInput.tsx b/packages/lib/components/common/TokenAmountInput.tsx
index ef095a1..0789457 100644
--- a/packages/lib/components/common/TokenAmountInput.tsx
+++ b/packages/lib/components/common/TokenAmountInput.tsx
@@ -48,7 +48,7 @@ export function TokenAmountInput(props: TTokenAmountInputProps): ReactElement {
 						'border-regularText/15 bg-regularText/5 relative flex !h-16 items-center gap-x-2 rounded-lg border px-4 py-3 disabled:cursor-not-allowed'
 					}>
 					<ImageWithFallback
-						src={`https://assets.smold.app/tokens/${chainID}/${configuration?.tokenToSpend.token?.address}/logo-128.png`}
+						src={`https://token-assets-one.vercel.app/tokens/${chainID}/${configuration?.tokenToSpend.token?.address}/logo-128.png`}
 						alt={configuration?.tokenToSpend.token?.address || 'address'}
 						width={32}
 						height={32}
diff --git a/packages/lib/components/common/TokenSelector.tsx b/packages/lib/components/common/TokenSelector.tsx
index 5ba2172..d126a92 100644
--- a/packages/lib/components/common/TokenSelector.tsx
+++ b/packages/lib/components/common/TokenSelector.tsx
@@ -122,7 +122,7 @@ export function TokenSelector({
 					'border-regularText/15 bg-regularText/5 relative flex !h-16 items-center gap-x-1 rounded-lg border px-4 py-3 disabled:cursor-not-allowed'
 				}>
 				<ImageWithFallback
-					src={`https://assets.smold.app/tokens/${chainID}/${configuration?.tokenToSpend.token?.address}/logo-128.png`}
+					src={`https://token-assets-one.vercel.app/tokens/${chainID}/${configuration?.tokenToSpend.token?.address}/logo-128.png`}
 					alt={configuration?.tokenToSpend.token?.address || 'address'}
 					width={32}
 					height={32}
diff --git a/packages/lib/components/common/TokenSelectorDropdown.tsx b/packages/lib/components/common/TokenSelectorDropdown.tsx
index 67a9845..01d7e3c 100644
--- a/packages/lib/components/common/TokenSelectorDropdown.tsx
+++ b/packages/lib/components/common/TokenSelectorDropdown.tsx
@@ -68,7 +68,7 @@ function TokenItem(props: {item: TToken; onSelected: (token: TToken) => void}):
 			<div className={'flex gap-x-4'}>
 				<div className={'flex items-center'}>
 					<ImageWithFallback
-						src={`https://assets.smold.app/tokens/${props.item.chainID}/${props.item.address}/logo-128.png`}
+						src={`https://token-assets-one.vercel.app/tokens/${props.item.chainID}/${props.item.address}/logo-128.png`}
 						alt={props.item.name}
 						width={32}
 						height={32}
diff --git a/packages/lib/components/common/VaultItem.tsx b/packages/lib/components/common/VaultItem.tsx
index 99e88a1..94019e5 100644
--- a/packages/lib/components/common/VaultItem.tsx
+++ b/packages/lib/components/common/VaultItem.tsx
@@ -241,7 +241,7 @@ export const VaultItem = ({vault, price, options}: TVaultItem): ReactElement =>
 						'border-regularText/15 bg-regularText/5 col-span-2 flex cursor-alias items-center justify-start overflow-hidden rounded-xl border p-3'
 					}>
 					<ImageWithFallback
-						src={`https://assets.smold.app/tokens/${vault.chainID}/${vault.token.address}/logo-32.png`}
+						src={`https://token-assets-one.vercel.app/tokens/${vault.chainID}/${vault.token.address}/logo-32.png`}
 						alt={vault.token.symbol}
 						width={28}
 						height={28}
@@ -312,7 +312,7 @@ export const VaultItem = ({vault, price, options}: TVaultItem): ReactElement =>
 						'border-regularText/15 bg-regularText/5 flex w-full items-center rounded-xl border px-2.5 py-2'
 					}>
 					<ImageWithFallback
-						src={`https://assets.smold.app/tokens/${vault.chainID}/${vault.token.address}/logo-32.png`}
+						src={`https://token-assets-one.vercel.app/tokens/${vault.chainID}/${vault.token.address}/logo-32.png`}
 						alt={vault.token.symbol}
 						width={28}
 						height={28}
diff --git a/packages/lib/components/common/VaultLink.tsx b/packages/lib/components/common/VaultLink.tsx
index 61503db..f6ad75e 100644
--- a/packages/lib/components/common/VaultLink.tsx
+++ b/packages/lib/components/common/VaultLink.tsx
@@ -21,7 +21,7 @@ export const VaultLink = (props: TVaultLinkProps): ReactElement => (
 		}>
 		<div className={'flex w-full cursor-alias items-center'}>
 			<ImageWithFallback
-				src={`https://assets.smold.app/tokens/${props.vault.chainID}/${props.vault.token.address}/logo-32.png`}
+				src={`https://token-assets-one.vercel.app/tokens/${props.vault.chainID}/${props.vault.token.address}/logo-32.png`}
 				alt={props.vault.token.symbol}
 				width={28}
 				height={28}
diff --git a/packages/lib/components/common/WithdrawModal.tsx b/packages/lib/components/common/WithdrawModal.tsx
index 279eca0..6209778 100644
--- a/packages/lib/components/common/WithdrawModal.tsx
+++ b/packages/lib/components/common/WithdrawModal.tsx
@@ -256,7 +256,7 @@ function OutputComponent(props: {isReady: boolean; availableBalance: TNormalized
 					)}>
 					<div className={'flex w-full items-center gap-x-2'}>
 						<ImageWithFallback
-							src={`https://assets.smold.app/tokens/${configuration?.vault?.chainID}/${configuration?.tokenToReceive.token?.address}/logo-128.png`}
+							src={`https://token-assets-one.vercel.app/tokens/${configuration?.vault?.chainID}/${configuration?.tokenToReceive.token?.address}/logo-128.png`}
 							alt={configuration?.tokenToReceive.token?.address || 'address'}
 							width={32}
 							height={32}
diff --git a/packages/lib/contexts/WithContexts.tsx b/packages/lib/contexts/WithContexts.tsx
index 0f6228c..5830c57 100644
--- a/packages/lib/contexts/WithContexts.tsx
+++ b/packages/lib/contexts/WithContexts.tsx
@@ -14,14 +14,13 @@ import {WalletContextApp} from './useWallet';
 import type {AppProps} from 'next/app';
 import type {ReactElement} from 'react';
 
-
 export default function WithContexts(props: AppProps & {chainIds?: number[]}): ReactElement {
 	const {Component} = props;
 	return (
 		<WithFonts>
 			<WithMom
 				supportedChains={supportedNetworks}
-				tokenLists={['https://raw.githubusercontent.com/SmolDapp/tokenLists/main/lists/yearn-min.json']}>
+				tokenLists={['https://raw.githubusercontent.com/yearn/tokenLists/main/lists/yearn-min.json']}>
 				<WalletContextApp chainIds={props.chainIds}>
 					<WithPopularTokens>
 						<WithPrices supportedNetworks={supportedNetworks}>
diff --git a/packages/lib/contexts/WithTokenList.tsx b/packages/lib/contexts/WithTokenList.tsx
index 0ab58b8..6a001d9 100755
--- a/packages/lib/contexts/WithTokenList.tsx
+++ b/packages/lib/contexts/WithTokenList.tsx
@@ -76,8 +76,8 @@ type TTokenListProviderProps = {
 export const WithTokenList = ({
 	children,
 	lists = [
-		'https://raw.githubusercontent.com/SmolDapp/tokenLists/main/lists/etherscan.json',
-		'https://raw.githubusercontent.com/SmolDapp/tokenLists/main/lists/tokenlistooor.json'
+		'https://raw.githubusercontent.com/yearn/tokenLists/main/lists/etherscan.json',
+		'https://raw.githubusercontent.com/yearn/tokenLists/main/lists/tokenlistooor.json'
 	]
 }: TTokenListProviderProps): ReactElement => {
 	const {chainID} = useWeb3();
diff --git a/packages/lib/contexts/usePopularTokens.tsx b/packages/lib/contexts/usePopularTokens.tsx
index 94f1699..b808556 100644
--- a/packages/lib/contexts/usePopularTokens.tsx
+++ b/packages/lib/contexts/usePopularTokens.tsx
@@ -23,7 +23,7 @@ const defaultProps: TPopularTokensProps = {
 	onChangeListsURI: () => {},
 	listTokens: () => []
 };
-const POPULAR_LIST_URI = 'https://raw.githubusercontent.com/smoldapp/tokenLists/main/lists/popular.json';
+const POPULAR_LIST_URI = 'https://raw.githubusercontent.com/yearn/tokenLists/main/lists/popular.json';
 const PopularTokensContext = createContext<TPopularTokensProps>(defaultProps);
 export const WithPopularTokens = ({children}: {children: ReactElement}): ReactElement => {
 	const {chainID} = useWeb3();
diff --git a/packages/lib/next.config.js b/packages/lib/next.config.js
index f5672d7..3848bf7 100644
--- a/packages/lib/next.config.js
+++ b/packages/lib/next.config.js
@@ -25,7 +25,7 @@ module.exports = withPlausibleProxy({
 				},
 				{
 					protocol: 'https',
-					hostname: 'assets.smold.app'
+					hostname: 'token-assets-one.vercel.app'
 				},
 				{
 					protocol: 'https',
@@ -131,7 +131,7 @@ module.exports = withPlausibleProxy({
 			WALLETCONNECT_PROJECT_URL: 'https://yearn.space',
 			WALLETCONNECT_PROJECT_ICON: 'https://yearn.space/favicons/ms-icon-310x310.png',
 			SHOULD_USE_FORKNET: process.env.SHOULD_USE_FORKNET === 'false',
-			SMOL_ASSETS_URL: 'https://assets.smold.app/api',
+			SMOL_ASSETS_URL: 'https://token-assets-one.vercel.app/api',
 			PLAUSIBLE_DOMAIN: 'yearn.space',
 			YDAEMON_BASE_URI: process.env.YDAEMON_BASE_URI || 'https://ydaemon.yearn.fi'
 		}
diff --git a/packages/lib/public/tokens/manualTokens.json b/packages/lib/public/tokens/manualTokens.json
index 8f98b09..2f78775 100644
--- a/packages/lib/public/tokens/manualTokens.json
+++ b/packages/lib/public/tokens/manualTokens.json
@@ -14,7 +14,7 @@
 			"address": "0x00000000eFE302BEAA2b3e6e1b18d08D69a9012a",
 			"name": "Agora USD",
 			"symbol": "AUSD",
-			"logoURI": "https://assets.smold.app/api/token/1/0x00000000eFE302BEAA2b3e6e1b18d08D69a9012a/logo-128.png",
+			"logoURI": "https://token-assets-one.vercel.app/api/token/1/0x00000000eFE302BEAA2b3e6e1b18d08D69a9012a/logo-128.png",
 			"chainId": 747474,
 			"decimals": 6
 		}