diff --git a/packages/api/src/repository/Feed.ts b/packages/api/src/repository/Feed.ts
index 767801b5..4a413763 100644
--- a/packages/api/src/repository/Feed.ts
+++ b/packages/api/src/repository/Feed.ts
@@ -49,8 +49,7 @@ export class FeedRepository {
 
   updateFeedAddress (
     feedFullName: string,
-    address: string,
-    contractId: string
+    { address, contractId }: { address: string; contractId: string }
   ): FeedInfo {
     const hasSameFeedFullName = (feed: FeedInfo) =>
       feed.feedFullName === feedFullName
@@ -62,13 +61,14 @@ export class FeedRepository {
     const feed = this.sortedDataFeeds[sortedDataFeedIndex]
     feed.address = address
     feed.contractId = contractId
-    // Update address in dataFeedsByNetwork
+    // Update address in dataFeedsByNetwork cache
     const dataFeedsByNetworkIndex = this.dataFeedsByNetwork[
       feed.network
     ].findIndex(hasSameFeedFullName)
     this.dataFeedsByNetwork[feed.network][
       dataFeedsByNetworkIndex
     ].address = address
+    // Update contractId in dataFeedsByNetwork cache
     this.dataFeedsByNetwork[feed.network][
       dataFeedsByNetworkIndex
     ].contractId = contractId
diff --git a/packages/api/src/resolvers.ts b/packages/api/src/resolvers.ts
index 1a266c07..e73adf9f 100644
--- a/packages/api/src/resolvers.ts
+++ b/packages/api/src/resolvers.ts
@@ -29,6 +29,7 @@ const resolvers = {
       )
     },
     lastResult: async (parent, _args, { resultRequestRepository }: Context) => {
+      // FIXME: add dataloader library to avoid overfetching
       return (await resultRequestRepository.getLastResult(parent.feedFullName))
         ?.result
     },
@@ -37,6 +38,7 @@ const resolvers = {
       _args,
       { resultRequestRepository }: Context
     ) => {
+      // FIXME: add dataloader library to avoid overfetching
       return (await resultRequestRepository.getLastResult(parent.feedFullName))
         ?.timestamp
     },
diff --git a/packages/api/src/utils/index.ts b/packages/api/src/utils/index.ts
index 2413df51..a621da80 100644
--- a/packages/api/src/utils/index.ts
+++ b/packages/api/src/utils/index.ts
@@ -100,6 +100,10 @@ export function normalizeConfig (
   return feeds
 }
 
+export function isZeroAddress (address: string) {
+  return address === '0x0000000000000000000000000000000000000000'
+}
+
 export function sleep (ms) {
   return new Promise(resolve => setTimeout(resolve, ms))
 }
diff --git a/packages/api/src/web3Middleware/index.ts b/packages/api/src/web3Middleware/index.ts
index 9a978620..96dff7bc 100644
--- a/packages/api/src/web3Middleware/index.ts
+++ b/packages/api/src/web3Middleware/index.ts
@@ -9,6 +9,7 @@ import {
   ObjectId,
   ContractInfo
 } from '../types'
+import { isZeroAddress } from '../utils/index'
 import { getProvider } from './provider'
 
 export class Web3Middleware {
@@ -29,26 +30,25 @@ export class Web3Middleware {
   }
 
   public async initializeAddresses (): Promise<Array<FeedInfo>> {
-    const promises = this.dataFeeds.map(feed => this.updateAddress(feed))
+    const promises = this.dataFeeds.map(feed => this.updateFeed(feed))
 
     return await Promise.all(promises)
   }
 
-  async updateAddress (feedInfo: FeedInfo) {
-    const contractInfo = await this.getContractAddress(feedInfo)
-    console.log('contractInfo in updateAddress', contractInfo)
+  async updateFeed (feedInfo: FeedInfo) {
+    const contractInfo = await this.getContractInfo(feedInfo)
     const feed = this.repositories.feedRepository.get(feedInfo.feedFullName)
 
     if (
-      feed &&
-      contractInfo &&
-      contractInfo.contractAddress &&
-      contractInfo.contractAddress !== feed.address
+      contractInfo?.contractAddress &&
+      contractInfo?.contractAddress !== feed?.address
     ) {
       return this.repositories.feedRepository.updateFeedAddress(
         feedInfo.feedFullName,
-        contractInfo.contractAddress,
-        contractInfo.contractId
+        {
+          address: contractInfo.contractAddress,
+          contractId: contractInfo.contractId
+        }
       )
     }
 
@@ -76,7 +76,7 @@ export class Web3Middleware {
     feeds.forEach(feed => {
       const feedInfo = feedDictionary[feed?.feedFullName]?.feedInfo
       if (feedInfo) {
-        this.updateAddress(feedInfo)
+        this.updateFeed(feedInfo)
       }
     })
 
@@ -97,7 +97,7 @@ export class Web3Middleware {
     this.intervals = []
   }
 
-  async getContractAddress (feedInfo: FeedInfo): Promise<ContractInfo | null> {
+  async getContractInfo (feedInfo: FeedInfo): Promise<ContractInfo | null> {
     try {
       return await new Promise(async (resolve, reject) => {
         try {
@@ -117,7 +117,6 @@ export class Web3Middleware {
           const contractIdentifier = await feedContract.methods
             .currencyPairId(feedInfo.id)
             .call()
-          console.log('contract Identifier!!!', feedInfo.id, contractIdentifier)
           const address = await feedContract.methods
             .getPriceFeed(contractIdentifier)
             .call()
@@ -139,15 +138,13 @@ export class Web3Middleware {
   }
 
   async listenToDataFeed (feedInfo: FeedInfo) {
-    const contractInfo = await this.getContractAddress(feedInfo)
+    const contractInfo = await this.getContractInfo(feedInfo)
     const provider = getProvider(feedInfo.network)
     if (provider) {
-      console.log('contractInfo in listenToDataFeed', contractInfo)
       if (
         contractInfo &&
         contractInfo.contractAddress &&
-        contractInfo.contractAddress !==
-          '0x0000000000000000000000000000000000000000'
+        !isZeroAddress(contractInfo.contractAddress)
       ) {
         try {
           const web3 = new this.Web3(provider)
diff --git a/packages/api/test/validateFeedsConfig.spec.ts b/packages/api/test/validateFeedsConfig.spec.ts
index 151126d4..577059d3 100644
--- a/packages/api/test/validateFeedsConfig.spec.ts
+++ b/packages/api/test/validateFeedsConfig.spec.ts
@@ -12,13 +12,62 @@ describe('validateDataFeedsConfig', () => {
     const expected = [
       {
         address: '0x0000000000000000000000000000000000000000',
+        blockExplorer: 'https://testnet.snowtrace.io/address/{address}',
+        color: '#E84142',
+        contractId: '0x0000000000000000000000000000000000000000',
+        deviation: '1',
+        feedFullName: 'avalanche-fuji_avax-usd_6',
+        finality: '900000',
+        heartbeat: '3600000',
+        id: 'Price-AVAX/USD-6',
+        label: '$',
+        name: 'avax/usd',
+        network: 'avalanche-fuji',
+        pollingPeriod: 15000,
+        routerAddress: '0x99Af0CF37d1C6b9Bdfe33cc0A89C00D97D3c42F4'
+      },
+      {
+        address: '0x0000000000000000000000000000000000000000',
+        blockExplorer: 'https://testnet.snowtrace.io/address/{address}',
+        color: '#E84142',
+        contractId: '0x0000000000000000000000000000000000000000',
+        deviation: '1',
+        feedFullName: 'avalanche-fuji_btc-usd_6',
+        finality: '900000',
+        heartbeat: '3600000',
+        id: 'Price-BTC/USD-6',
+        label: '$',
+        name: 'btc/usd',
+        network: 'avalanche-fuji',
+        pollingPeriod: 15000,
+        routerAddress: '0x99Af0CF37d1C6b9Bdfe33cc0A89C00D97D3c42F4'
+      },
+      {
+        address: '0x0000000000000000000000000000000000000000',
+        blockExplorer: 'https://testnet.snowtrace.io/address/{address}',
+        color: '#E84142',
+        contractId: '0x0000000000000000000000000000000000000000',
+        deviation: '1',
+        feedFullName: 'avalanche-fuji_eth-usd_6',
+        finality: '900000',
+        heartbeat: '3600000',
+        id: 'Price-ETH/USD-6',
+        label: '$',
+        name: 'eth/usd',
+        network: 'avalanche-fuji',
+        pollingPeriod: 15000,
+        routerAddress: '0x99Af0CF37d1C6b9Bdfe33cc0A89C00D97D3c42F4'
+      },
+      {
+        address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer:
           'https://blockexplorer.rinkeby.boba.network/address/{address}',
         color: '#1cd83d',
         deviation: '1',
         feedFullName: 'boba-rinkeby_boba-usdt_6',
         finality: '900000',
-        heartbeat: '3600000',
+        heartbeat: '86400000',
         id: 'Price-BOBA/USDT-6',
         label: '₮',
         name: 'boba/usdt',
@@ -28,13 +77,14 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer:
           'https://blockexplorer.rinkeby.boba.network/address/{address}',
         color: '#1cd83d',
         deviation: '1',
         feedFullName: 'boba-rinkeby_btc-usd_6',
         finality: '900000',
-        heartbeat: '3600000',
+        heartbeat: '86400000',
         id: 'Price-BTC/USD-6',
         label: '$',
         name: 'btc/usd',
@@ -44,13 +94,14 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer:
           'https://blockexplorer.rinkeby.boba.network/address/{address}',
         color: '#1cd83d',
         deviation: '1',
         feedFullName: 'boba-rinkeby_eth-usd_6',
         finality: '900000',
-        heartbeat: '3600000',
+        heartbeat: '86400000',
         id: 'Price-ETH/USD-6',
         label: '$',
         name: 'eth/usd',
@@ -63,10 +114,28 @@ describe('validateDataFeedsConfig', () => {
         blockExplorer:
           'https://blockexplorer.rinkeby.boba.network/address/{address}',
         color: '#1cd83d',
+        contractId: '0x0000000000000000000000000000000000000000',
+        deviation: '0.1',
+        feedFullName: 'boba-rinkeby_frax-usdt_6',
+        finality: '900000',
+        heartbeat: '86400000',
+        id: 'Price-FRAX/USDT-6',
+        label: '₮',
+        name: 'frax/usdt',
+        network: 'boba-rinkeby',
+        pollingPeriod: 15000,
+        routerAddress: '0x36928Aeedaaf7D85bcA39aDfB2A39ec529ce221a'
+      },
+      {
+        address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
+        blockExplorer:
+          'https://blockexplorer.rinkeby.boba.network/address/{address}',
+        color: '#1cd83d',
         deviation: '1',
         feedFullName: 'boba-rinkeby_fxs-usdt_6',
         finality: '900000',
-        heartbeat: '3600000',
+        heartbeat: '86400000',
         id: 'Price-FXS/USDT-6',
         label: '₮',
         name: 'fxs/usdt',
@@ -76,15 +145,16 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer:
           'https://blockexplorer.rinkeby.boba.network/address/{address}',
         color: '#1cd83d',
         deviation: '1',
         feedFullName: 'boba-rinkeby_omg-btc_9',
         finality: '900000',
-        heartbeat: '3600000',
+        heartbeat: '86400000',
         id: 'Price-OMG/BTC-9',
-        label: 'BTC',
+        label: '₿',
         name: 'omg/btc',
         network: 'boba-rinkeby',
         pollingPeriod: 15000,
@@ -92,15 +162,16 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer:
           'https://blockexplorer.rinkeby.boba.network/address/{address}',
         color: '#1cd83d',
         deviation: '1',
         feedFullName: 'boba-rinkeby_omg-eth_9',
         finality: '900000',
-        heartbeat: '3600000',
+        heartbeat: '86400000',
         id: 'Price-OMG/ETH-9',
-        label: 'ETH',
+        label: 'Ξ',
         name: 'omg/eth',
         network: 'boba-rinkeby',
         pollingPeriod: 15000,
@@ -108,13 +179,14 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer:
           'https://blockexplorer.rinkeby.boba.network/address/{address}',
         color: '#1cd83d',
         deviation: '1',
         feedFullName: 'boba-rinkeby_omg-usdt_6',
         finality: '900000',
-        heartbeat: '3600000',
+        heartbeat: '86400000',
         id: 'Price-OMG/USDT-6',
         label: '₮',
         name: 'omg/usdt',
@@ -122,10 +194,45 @@ describe('validateDataFeedsConfig', () => {
         pollingPeriod: 15000,
         routerAddress: '0x36928Aeedaaf7D85bcA39aDfB2A39ec529ce221a'
       },
+      {
+        address: '0x0000000000000000000000000000000000000000',
+        blockExplorer:
+          'https://blockexplorer.rinkeby.boba.network/address/{address}',
+        color: '#1cd83d',
+        contractId: '0x0000000000000000000000000000000000000000',
+        deviation: '0.1',
+        feedFullName: 'boba-rinkeby_usdc-usd_6',
+        finality: '900000',
+        heartbeat: '86400000',
+        id: 'Price-USDC/USD-6',
+        label: '$',
+        name: 'usdc/usd',
+        network: 'boba-rinkeby',
+        pollingPeriod: 15000,
+        routerAddress: '0x36928Aeedaaf7D85bcA39aDfB2A39ec529ce221a'
+      },
+      {
+        address: '0x0000000000000000000000000000000000000000',
+        blockExplorer:
+          'https://blockexplorer.rinkeby.boba.network/address/{address}',
+        color: '#1cd83d',
+        contractId: '0x0000000000000000000000000000000000000000',
+        deviation: '0.1',
+        feedFullName: 'boba-rinkeby_usdt-usd_6',
+        finality: '900000',
+        heartbeat: '86400000',
+        id: 'Price-USDT/USD-6',
+        label: '$',
+        name: 'usdt/usd',
+        network: 'boba-rinkeby',
+        pollingPeriod: 15000,
+        routerAddress: '0x36928Aeedaaf7D85bcA39aDfB2A39ec529ce221a'
+      },
       {
         address: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://blockexplorer.boba.network/address/{address}',
         color: '#007dff',
+        contractId: '0x0000000000000000000000000000000000000000',
         deviation: '1',
         feedFullName: 'boba-mainnet_boba-usdt_6',
         finality: '900000',
@@ -141,6 +248,7 @@ describe('validateDataFeedsConfig', () => {
         address: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://blockexplorer.boba.network/address/{address}',
         color: '#007dff',
+        contractId: '0x0000000000000000000000000000000000000000',
         deviation: '1',
         feedFullName: 'boba-mainnet_btc-usd_6',
         finality: '900000',
@@ -156,6 +264,7 @@ describe('validateDataFeedsConfig', () => {
         address: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://blockexplorer.boba.network/address/{address}',
         color: '#007dff',
+        contractId: '0x0000000000000000000000000000000000000000',
         deviation: '1',
         feedFullName: 'boba-mainnet_eth-usd_6',
         finality: '900000',
@@ -169,6 +278,55 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        blockExplorer: 'https://blockexplorer.boba.network/address/{address}',
+        color: '#007dff',
+        contractId: '0x0000000000000000000000000000000000000000',
+        deviation: '0.25',
+        feedFullName: 'boba-mainnet_frax-usdt_6',
+        finality: '900000',
+        heartbeat: '86400000',
+        id: 'Price-FRAX/USDT-6',
+        label: '₮',
+        name: 'frax/usdt',
+        network: 'boba-mainnet',
+        pollingPeriod: 15000,
+        routerAddress: '0x93f61D0D5F623144e7C390415B70102A9Cc90bA5'
+      },
+      {
+        address: '0x0000000000000000000000000000000000000000',
+        blockExplorer: 'https://blockexplorer.boba.network/address/{address}',
+        color: '#007dff',
+        contractId: '0x0000000000000000000000000000000000000000',
+        deviation: '0.25',
+        feedFullName: 'boba-mainnet_usdc-usd_6',
+        finality: '900000',
+        heartbeat: '86400000',
+        id: 'Price-USDC/USD-6',
+        label: '$',
+        name: 'usdc/usd',
+        network: 'boba-mainnet',
+        pollingPeriod: 15000,
+        routerAddress: '0x93f61D0D5F623144e7C390415B70102A9Cc90bA5'
+      },
+      {
+        address: '0x0000000000000000000000000000000000000000',
+        blockExplorer: 'https://blockexplorer.boba.network/address/{address}',
+        color: '#007dff',
+        contractId: '0x0000000000000000000000000000000000000000',
+        deviation: '0.25',
+        feedFullName: 'boba-mainnet_usdt-usd_6',
+        finality: '900000',
+        heartbeat: '86400000',
+        id: 'Price-USDT/USD-6',
+        label: '$',
+        name: 'usdt/usd',
+        network: 'boba-mainnet',
+        pollingPeriod: 15000,
+        routerAddress: '0x93f61D0D5F623144e7C390415B70102A9Cc90bA5'
+      },
+      {
+        address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer:
           'https://alfajores-blockscout.celo-testnet.org/address/{address}',
         color: '#1cd8d2',
@@ -185,6 +343,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer:
           'https://alfajores-blockscout.celo-testnet.org/address/{address}',
         color: '#1cd8d2',
@@ -201,6 +360,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer:
           'https://alfajores-blockscout.celo-testnet.org/address/{address}',
         color: '#1cd8d2',
@@ -217,6 +377,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer:
           'https://alfajores-blockscout.celo-testnet.org/address/{address}',
         color: '#1cd8d2',
@@ -233,6 +394,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://explorer.celo.org/address/{address}',
         color: '#ff8100',
         deviation: '1',
@@ -248,6 +410,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://explorer.celo.org/address/{address}',
         color: '#ff8100',
         deviation: '1',
@@ -263,6 +426,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://explorer.celo.org/address/{address}',
         color: '#ff8100',
         deviation: '3.5',
@@ -278,6 +442,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://explorer.celo.org/address/{address}',
         color: '#ff8100',
         deviation: '3.5',
@@ -293,6 +458,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://testnet.confluxscan.io/address/{address}',
         color: '#6600ff',
         deviation: '1',
@@ -308,6 +474,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://testnet.confluxscan.io/address/{address}',
         color: '#6600ff',
         deviation: '1',
@@ -323,6 +490,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://testnet.confluxscan.io/address/{address}',
         color: '#6600ff',
         deviation: '1',
@@ -338,6 +506,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://confluxscan.io/address/{address}',
         color: '#ff0000',
         deviation: '1',
@@ -353,6 +522,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://confluxscan.io/address/{address}',
         color: '#ff0000',
         deviation: '3.5',
@@ -368,6 +538,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://confluxscan.io/address/{address}',
         color: '#ff0000',
         deviation: '3.5',
@@ -383,6 +554,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://goerli.etherscan.io/address/{address}',
         color: '#ff5599',
         deviation: '1',
@@ -398,6 +570,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://goerli.etherscan.io/address/{address}',
         color: '#ff5599',
         deviation: '1',
@@ -413,6 +586,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://rinkeby.etherscan.io/address/{address}',
         color: '#ff5599',
         deviation: '1',
@@ -428,6 +602,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://rinkeby.etherscan.io/address/{address}',
         color: '#ff5599',
         deviation: '1',
@@ -443,6 +618,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://etherscan.io/address/{address}',
         color: '#ff5599',
         deviation: '3.5',
@@ -458,6 +634,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://etherscan.io/address/{address}',
         color: '#ff5599',
         deviation: '3.5',
@@ -473,6 +650,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://explorer.pops.one/address/{address}',
         color: '#f6006f',
         deviation: '1',
@@ -488,6 +666,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://explorer.pops.one/address/{address}',
         color: '#f6006f',
         deviation: '1',
@@ -503,6 +682,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://scan-testnet.kcc.network/address/{address}',
         color: '#ff0066',
         deviation: '0.5',
@@ -518,6 +698,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://scan-testnet.kcc.network/address/{address}',
         color: '#ff0066',
         deviation: '0.5',
@@ -533,6 +714,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://scan-testnet.kcc.network/address/{address}',
         color: '#ff0066',
         deviation: '0.5',
@@ -548,6 +730,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://scan.kcc.io/address/{address}',
         color: '#ff0066',
         deviation: '0.5',
@@ -563,6 +746,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://scan.kcc.io/address/{address}',
         color: '#ff0066',
         deviation: '0.5',
@@ -578,6 +762,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://scan.kcc.io/address/{address}',
         color: '#ff0066',
         deviation: '0.5',
@@ -593,6 +778,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://stardust-explorer.metis.io/address/{address}',
         color: '#ff6600',
         deviation: '1',
@@ -608,6 +794,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://stardust-explorer.metis.io/address/{address}',
         color: '#ff6600',
         deviation: '1',
@@ -623,6 +810,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://stardust-explorer.metis.io/address/{address}',
         color: '#ff6600',
         deviation: '1',
@@ -638,6 +826,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://andromeda-explorer.metis.io/address/{address}',
         color: '#ff6600',
         deviation: '2',
@@ -653,6 +842,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://mumbai.polygonscan.com/address/{address}',
         color: '#66ff00',
         deviation: '3.5',
@@ -668,6 +858,7 @@ describe('validateDataFeedsConfig', () => {
       },
       {
         address: '0x0000000000000000000000000000000000000000',
+        contractId: '0x0000000000000000000000000000000000000000',
         blockExplorer: 'https://mumbai.polygonscan.com/address/{address}',
         color: '#66ff00',
         deviation: '3.5',
@@ -680,6 +871,38 @@ describe('validateDataFeedsConfig', () => {
         network: 'polygon-goerli',
         pollingPeriod: 15000,
         routerAddress: '0x6d5544ca5b35bf2e7a78ace4E7B8d191fe5C9FAb'
+      },
+      {
+        address: '0x0000000000000000000000000000000000000000',
+        blockExplorer: 'https://polygonscan.com/address/{address}',
+        color: '#66ff00',
+        contractId: '0x0000000000000000000000000000000000000000',
+        deviation: '1',
+        feedFullName: 'polygon-mainnet_btc-usd_6',
+        finality: '900000',
+        heartbeat: '86400000',
+        id: 'Price-BTC/USD-6',
+        label: '$',
+        name: 'btc/usd',
+        network: 'polygon-mainnet',
+        pollingPeriod: 15000,
+        routerAddress: '0x3806311c7138ddF2bAF2C2093ff3633E5A73AbD4'
+      },
+      {
+        address: '0x0000000000000000000000000000000000000000',
+        blockExplorer: 'https://polygonscan.com/address/{address}',
+        color: '#66ff00',
+        contractId: '0x0000000000000000000000000000000000000000',
+        deviation: '1',
+        feedFullName: 'polygon-mainnet_eth-usd_6',
+        finality: '900000',
+        heartbeat: '86400000',
+        id: 'Price-ETH/USD-6',
+        label: '$',
+        name: 'eth/usd',
+        network: 'polygon-mainnet',
+        pollingPeriod: 15000,
+        routerAddress: '0x3806311c7138ddF2bAF2C2093ff3633E5A73AbD4'
       }
     ]
 
diff --git a/packages/ui/apollo/queries/feeds.gql b/packages/ui/apollo/queries/feeds.gql
index 188aa9ce..a7eb0974 100644
--- a/packages/ui/apollo/queries/feeds.gql
+++ b/packages/ui/apollo/queries/feeds.gql
@@ -11,6 +11,7 @@ query feeds ($network: String!) {
       blockExplorer
       color
       heartbeat
+      finality
     }
     total
   }
diff --git a/packages/ui/assets/styles/main.scss b/packages/ui/assets/styles/main.scss
index 5a74a3ea..bfa555aa 100644
--- a/packages/ui/assets/styles/main.scss
+++ b/packages/ui/assets/styles/main.scss
@@ -184,7 +184,7 @@
   --btn-secondary-border-color: #4AB6A1;
 
   //footer
-  --footer-bg: #26474B;
+  --footer-bg: #4ab6a02c;
 
   //sidebar
   --tab-gradient: linear-gradient(90deg, #2d2c39d3 95%, #4ab6a02c);
diff --git a/packages/ui/assets/svg/avalanche.svg b/packages/ui/assets/svg/avalanche.svg
index 3cd24ac6..a8f9fa48 100644
--- a/packages/ui/assets/svg/avalanche.svg
+++ b/packages/ui/assets/svg/avalanche.svg
@@ -1,4 +1,4 @@
-<svg class="size" width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg class="icon-size" width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M28.2934 6.004H6.6833V25.645H28.2934V6.004Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.9884 17.5C34.9884 27.1522 27.1587 34.9767 17.5 34.9767C7.84144 34.9767 0.0116425 27.1522 0.0116425 17.5C0.0116425 7.84788 7.84144 0.0232849 17.5 0.0232849C27.1587 0.0232849 34.9884 7.84788 34.9884 17.5ZM12.5443 24.4549H9.1503C8.43712 24.4549 8.08484 24.4549 7.87004 24.3176C7.63803 24.1672 7.49627 23.9182 7.47908 23.6434C7.46618 23.3902 7.64234 23.081 7.99463 22.4627L16.3748 7.70129C16.7314 7.07446 16.9118 6.76104 17.1395 6.64513C17.3844 6.52063 17.6766 6.52063 17.9215 6.64513C18.1492 6.76104 18.3296 7.07446 18.6862 7.70129L20.409 10.7066L20.4178 10.722C20.8029 11.3944 20.9982 11.7355 21.0835 12.0934C21.178 12.4841 21.178 12.8962 21.0835 13.2869C20.9976 13.6476 20.8042 13.9911 20.4133 14.6737L16.0114 22.4499L16 22.4698C15.6123 23.1478 15.4158 23.4914 15.1435 23.7507C14.8471 24.0341 14.4905 24.2401 14.0995 24.3562C13.7429 24.4549 13.3434 24.4549 12.5443 24.4549ZM21.1153 24.4549H25.9785C26.6959 24.4549 27.0569 24.4549 27.2718 24.3134C27.5038 24.163 27.6498 23.9096 27.6628 23.635C27.6752 23.39 27.5028 23.0928 27.1652 22.5105C27.1535 22.4907 27.1419 22.4705 27.13 22.45L24.694 18.2854L24.6663 18.2385C24.324 17.6601 24.1512 17.3679 23.9292 17.255C23.6845 17.1305 23.3964 17.1305 23.1517 17.255C22.9283 17.3709 22.7478 17.6758 22.3912 18.2897L19.9639 22.4543L19.9556 22.4686C19.6002 23.0816 19.4227 23.3879 19.4355 23.6392C19.4526 23.914 19.5944 24.1672 19.8264 24.3176C20.0369 24.4549 20.3978 24.4549 21.1153 24.4549Z" fill="#E84142"/>
 </svg>
diff --git a/packages/ui/assets/svg/avax.svg b/packages/ui/assets/svg/avax.svg
index 3cd24ac6..a8f9fa48 100644
--- a/packages/ui/assets/svg/avax.svg
+++ b/packages/ui/assets/svg/avax.svg
@@ -1,4 +1,4 @@
-<svg class="size" width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg class="icon-size" width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M28.2934 6.004H6.6833V25.645H28.2934V6.004Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.9884 17.5C34.9884 27.1522 27.1587 34.9767 17.5 34.9767C7.84144 34.9767 0.0116425 27.1522 0.0116425 17.5C0.0116425 7.84788 7.84144 0.0232849 17.5 0.0232849C27.1587 0.0232849 34.9884 7.84788 34.9884 17.5ZM12.5443 24.4549H9.1503C8.43712 24.4549 8.08484 24.4549 7.87004 24.3176C7.63803 24.1672 7.49627 23.9182 7.47908 23.6434C7.46618 23.3902 7.64234 23.081 7.99463 22.4627L16.3748 7.70129C16.7314 7.07446 16.9118 6.76104 17.1395 6.64513C17.3844 6.52063 17.6766 6.52063 17.9215 6.64513C18.1492 6.76104 18.3296 7.07446 18.6862 7.70129L20.409 10.7066L20.4178 10.722C20.8029 11.3944 20.9982 11.7355 21.0835 12.0934C21.178 12.4841 21.178 12.8962 21.0835 13.2869C20.9976 13.6476 20.8042 13.9911 20.4133 14.6737L16.0114 22.4499L16 22.4698C15.6123 23.1478 15.4158 23.4914 15.1435 23.7507C14.8471 24.0341 14.4905 24.2401 14.0995 24.3562C13.7429 24.4549 13.3434 24.4549 12.5443 24.4549ZM21.1153 24.4549H25.9785C26.6959 24.4549 27.0569 24.4549 27.2718 24.3134C27.5038 24.163 27.6498 23.9096 27.6628 23.635C27.6752 23.39 27.5028 23.0928 27.1652 22.5105C27.1535 22.4907 27.1419 22.4705 27.13 22.45L24.694 18.2854L24.6663 18.2385C24.324 17.6601 24.1512 17.3679 23.9292 17.255C23.6845 17.1305 23.3964 17.1305 23.1517 17.255C22.9283 17.3709 22.7478 17.6758 22.3912 18.2897L19.9639 22.4543L19.9556 22.4686C19.6002 23.0816 19.4227 23.3879 19.4355 23.6392C19.4526 23.914 19.5944 24.1672 19.8264 24.3176C20.0369 24.4549 20.3978 24.4549 21.1153 24.4549Z" fill="#E84142"/>
 </svg>
diff --git a/packages/ui/assets/svg/boba.svg b/packages/ui/assets/svg/boba.svg
index 6817a2c5..9582b917 100644
--- a/packages/ui/assets/svg/boba.svg
+++ b/packages/ui/assets/svg/boba.svg
@@ -1,4 +1,4 @@
-<svg class="size" viewBox="0 0 24 39" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg class="icon-size" viewBox="0 0 24 39" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M5.54579 27C4.84112 27 4.22739 26.475 4.11373 25.7674L0.0221482 1.71004C-0.0460449 1.32202 0.0448792 0.933995 0.272189 0.614445C0.499499 0.294897 0.840465 0.0894724 1.22689 0.0209981C2.02248 -0.115951 2.7726 0.431846 2.90899 1.23072L6.97785 25.2881C7.04605 25.6761 6.9551 26.0642 6.72778 26.3837C6.50051 26.7032 6.1595 26.9087 5.7731 26.9772C5.7049 27 5.61398 27 5.54579 27Z" fill="#CCFF00"/>
 <path d="M12.5228 16C10.2 16 8.01384 16.7059 6.19206 17.8901L6.69306 20.805C8.26437 19.4386 10.2911 18.6188 12.5228 18.6188C17.4188 18.6188 21.404 22.6039 21.404 27.5C21.404 32.396 17.4188 36.3812 12.5228 36.3812C7.62674 36.3812 3.64159 32.396 3.64159 27.5C3.64159 26.8396 3.7099 26.202 3.84654 25.5872L3.04951 20.9644C1.77426 22.8317 1 25.0634 1 27.5C1 33.8534 6.16933 39 12.5 39C18.8307 39 24 33.8307 24 27.5C24 21.1693 18.8762 16 12.5228 16Z" fill="#CCFF00"/>
 <path d="M11.5 34C12.3284 34 13 33.3284 13 32.5C13 31.6716 12.3284 31 11.5 31C10.6716 31 10 31.6716 10 32.5C10 33.3284 10.6716 34 11.5 34Z" fill="#1CD8D2"/>
diff --git a/packages/ui/assets/svg/btc.svg b/packages/ui/assets/svg/btc.svg
index c7639fc9..de6c1166 100644
--- a/packages/ui/assets/svg/btc.svg
+++ b/packages/ui/assets/svg/btc.svg
@@ -1,3 +1,3 @@
-<svg class="size" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg class="icon-size" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M2.87775 15.387C2.67075 15.387 2.50275 15.2318 2.50275 15.0255V15C2.50275 13.6897 2.7045 12.399 3.10275 11.1637C3.1665 10.9665 3.378 10.86 3.5745 10.9215C3.77175 10.9853 3.87975 11.1967 3.81675 11.3932C3.4425 12.5542 3.25275 13.7677 3.25275 15C3.25275 15.2063 3.0855 15.387 2.87775 15.387ZM18.6405 26.172C17.472 26.5515 16.2517 26.7457 15.0135 26.7472C14.8065 26.7472 14.6385 26.9167 14.6385 27.1222C14.6385 27.3277 14.8065 27.4972 15.0135 27.4972C16.3305 27.4957 17.6302 27.2902 18.873 26.886C19.0702 26.823 19.1768 26.6107 19.1122 26.4135C19.0485 26.217 18.8363 26.1082 18.6405 26.172ZM3.831 18.651C3.76725 18.4538 3.558 18.3465 3.3585 18.411C3.162 18.4748 3.054 18.687 3.1185 18.8835C3.525 20.1285 4.12425 21.2992 4.9005 22.3627C4.974 22.464 5.088 22.5165 5.2035 22.5165C5.28 22.5165 5.358 22.494 5.424 22.4437C5.59125 22.3215 5.628 22.0868 5.50575 21.9202C4.7775 20.9212 4.2135 19.821 3.831 18.651ZM18.5955 3.813C19.7677 4.1895 20.8702 4.7475 21.873 5.472C21.9397 5.52 22.0162 5.54325 22.092 5.54325C22.2083 5.54325 22.323 5.48925 22.3958 5.388C22.5173 5.22 22.479 4.98525 22.3125 4.8645C21.246 4.0935 20.073 3.4995 18.825 3.099C18.6278 3.03675 18.4178 3.14475 18.3533 3.34125C18.2903 3.5385 18.3983 3.75 18.5955 3.813ZM5.175 8.2725C5.29125 8.2725 5.406 8.2185 5.47875 8.11725C6.2025 7.1175 7.074 6.2415 8.07075 5.5125C8.238 5.39025 8.274 5.1555 8.15175 4.98825C8.03025 4.821 7.7955 4.785 7.6275 4.90725C6.56775 5.682 5.64075 6.61425 4.87125 7.677C4.74975 7.845 4.78725 8.079 4.95525 8.2005C5.022 8.25 5.09925 8.2725 5.175 8.2725ZM11.2215 3.8535C11.2598 3.8535 11.2995 3.8475 11.3385 3.83475C12.5055 3.45225 13.7257 3.2565 14.9647 3.2535C15.171 3.25275 15.3397 3.08475 15.339 2.87775C15.3383 2.6715 15.1695 2.5035 14.964 2.5035H14.9633C13.6455 2.50725 12.3472 2.71575 11.1053 3.12225C10.9088 3.18675 10.8015 3.39825 10.866 3.5955C10.917 3.753 11.0632 3.8535 11.2215 3.8535ZM11.382 26.1795C10.2105 25.8 9.10875 25.2405 8.1075 24.5138C7.94025 24.3908 7.70475 24.4297 7.584 24.5955C7.4625 24.765 7.5 24.999 7.66725 25.1205C8.73225 25.8923 9.9045 26.4885 11.151 26.8913C11.1892 26.9047 11.2283 26.9085 11.2665 26.9085C11.4248 26.9085 11.5717 26.8073 11.6235 26.649C11.6873 26.4548 11.5792 26.2432 11.382 26.1795ZM24.507 21.9015C23.781 22.899 22.9072 23.7735 21.9097 24.5002C21.7425 24.6225 21.7065 24.8573 21.828 25.0245C21.9023 25.125 22.0155 25.179 22.131 25.179C22.2075 25.179 22.2847 25.1558 22.3515 25.107C23.4128 24.3338 24.3413 23.4037 25.1138 22.341C25.2367 22.1723 25.1985 21.939 25.0327 21.8175C24.8625 21.696 24.6285 21.7342 24.507 21.9015ZM27.1222 14.601C26.9152 14.601 26.7472 14.7922 26.7472 15C26.7472 16.239 26.5553 17.4608 26.175 18.6292C26.112 18.8265 26.22 19.0373 26.4165 19.1017C26.4548 19.1152 26.4937 19.1198 26.5305 19.1198C26.6888 19.1198 26.8358 19.0193 26.8883 18.8595C27.2925 17.6175 27.4972 16.317 27.4972 15V14.952C27.4972 14.745 27.3292 14.601 27.1222 14.601ZM26.1615 11.3272C26.2132 11.4847 26.3603 11.5852 26.5185 11.5852C26.5583 11.5852 26.5965 11.5793 26.6355 11.5665C26.832 11.502 26.9385 11.2898 26.874 11.0933C26.4645 9.84825 25.8615 8.679 25.0837 7.6185C24.9608 7.45125 24.7253 7.41525 24.5603 7.53825C24.3938 7.66125 24.357 7.89525 24.4807 8.0625C25.2112 9.0585 25.7768 10.1572 26.1615 11.3272ZM30 15C30 23.2703 23.2703 30 15 30C6.729 30 0 23.2703 0 15C0 6.729 6.729 0 15 0C23.2703 0 30 6.729 30 15ZM28.5 15C28.5 7.55625 22.4438 1.5 15 1.5C7.55625 1.5 1.5 7.55625 1.5 15C1.5 22.4438 7.55625 28.5 15 28.5C22.4438 28.5 28.5 22.4438 28.5 15ZM16.2645 15.6135C16.014 15.5183 15.6315 15.4703 15.1185 15.4703H13.9462V17.4307C13.9507 17.7083 13.9613 17.8702 13.9785 17.9175C14.0003 17.9767 14.0355 18.0203 14.0858 18.0435C14.1353 18.066 14.2702 18.0802 14.49 18.0802H15.15C15.534 18.0802 15.8527 18.0435 16.104 17.9708C16.3575 17.9002 16.5728 17.7518 16.7482 17.526C16.9237 17.3002 17.0138 17.031 17.0138 16.7145C17.0138 16.4467 16.9508 16.2195 16.8263 16.032C16.7025 15.8497 16.515 15.7088 16.2645 15.6135ZM25.827 15C25.827 20.9797 20.9797 25.827 15 25.827C9.021 25.827 4.17375 20.9797 4.17375 15C4.17375 9.021 9.021 4.17375 15 4.17375C20.9797 4.17375 25.827 9.021 25.827 15ZM19.3665 16.9567C19.3665 16.5547 19.2712 16.191 19.0807 15.864C18.8902 15.5355 18.6308 15.2828 18.309 15.099C18.0833 14.9685 17.76 14.8492 17.3348 14.742C17.73 14.6077 18.048 14.4382 18.288 14.232C18.5288 14.0265 18.7132 13.7895 18.8415 13.5217C18.969 13.2532 19.0328 12.9698 19.0328 12.6713C19.0328 12.2603 18.912 11.8822 18.672 11.538C18.429 11.1945 18.0833 10.9298 17.6332 10.7467C17.4578 10.6755 17.2493 10.6215 17.025 10.578V8.97975H15.4913V10.47H14.5057V8.97975H12.972V10.47H10.6327V11.7225H10.9905C11.2283 11.7225 11.3895 11.745 11.4742 11.7878C11.559 11.8305 11.6182 11.8897 11.6528 11.9625C11.688 12.036 11.7052 12.2078 11.7052 12.4755V17.526C11.7052 17.7915 11.6887 17.9603 11.6528 18.036C11.6182 18.1125 11.559 18.171 11.4742 18.2108C11.3895 18.252 11.229 18.273 10.9905 18.273H10.6327V19.5255H12.972V21.015H14.5057V19.5255H15.378C15.4185 19.5255 15.4552 19.5247 15.492 19.5247V21.015H17.0257V19.3965C17.283 19.347 17.5103 19.2847 17.7015 19.206C18.2302 18.9953 18.639 18.6877 18.9307 18.2828C19.221 17.8808 19.3665 17.4375 19.3665 16.9567ZM16.0905 14.0093C16.3403 13.923 16.5262 13.7918 16.6522 13.6185C16.7775 13.4438 16.8397 13.2405 16.8397 13.011C16.8397 12.7732 16.7805 12.57 16.662 12.4012C16.5427 12.2325 16.3695 12.1125 16.146 12.0413C15.9202 11.9693 15.5175 11.9333 14.9393 11.9333H13.9462V14.1405H14.9393C15.4583 14.1398 15.8415 14.0963 16.0905 14.0093Z" fill="#FFB800"/>
 </svg>
diff --git a/packages/ui/assets/svg/celo.svg b/packages/ui/assets/svg/celo.svg
index b475b7ee..c37a53ce 100644
--- a/packages/ui/assets/svg/celo.svg
+++ b/packages/ui/assets/svg/celo.svg
@@ -1,4 +1,4 @@
-<svg class="size" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg class="icon-size" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M32 14C32 20.0933 27.0569 25 21 25C14.9431 25 10 20.0933 10 14C10 7.90678 14.9431 3 21 3C27.0569 3 32 7.90678 32 14Z" stroke="#35D07F" stroke-width="3.5"/>
 <path d="M25 21C25 27.0933 20.0569 32 14 32C7.9431 32 3 27.0933 3 21C3 14.9068 7.9431 10 14 10C20.0569 10 25 14.9068 25 21Z" stroke="#FBCC5C" stroke-width="3.5"/>
 <path d="M32 14C32 20.0933 27.0569 25 21 25C14.9431 25 10 20.0933 10 14C10 7.90678 14.9431 3 21 3C27.0569 3 32 7.90678 32 14Z" stroke="#35D07F" stroke-opacity="0.51" stroke-width="3.5"/>
diff --git a/packages/ui/assets/svg/cfx.svg b/packages/ui/assets/svg/cfx.svg
index 02d7011c..dea02f18 100644
--- a/packages/ui/assets/svg/cfx.svg
+++ b/packages/ui/assets/svg/cfx.svg
@@ -1,4 +1,4 @@
-<svg class="size" viewBox="0 0 27 34" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg class="icon-size" viewBox="0 0 27 34" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path class="fill" d="M20.5073 19.814L13.4124 26.9088L9.46382 22.9602L16.5587 15.8653L13.4034 12.71L3.11865 22.9943L13.375 33.2504L23.6594 22.966L20.5073 19.814Z" fill="#1A1A1A"/>
 <path d="M26.8383 13.4006L13.4381 0L0 13.4381L0.0428453 19.7191L13.3811 6.38127L26.8159 19.8167L26.8383 13.4006Z" fill="#38A1DB"/>
 </svg>
diff --git a/packages/ui/assets/svg/conflux.svg b/packages/ui/assets/svg/conflux.svg
index 31716b2e..b1ac1120 100644
--- a/packages/ui/assets/svg/conflux.svg
+++ b/packages/ui/assets/svg/conflux.svg
@@ -1,4 +1,4 @@
 <svg width="27" height="34" viewBox="0 0 27 34" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M20.5073 19.814L13.4124 26.9088L9.46382 22.9602L16.5587 15.8653L13.4034 12.71L3.11865 22.9943L13.375 33.2504L23.6594 22.966L20.5073 19.814Z" fill="#1A1A1A"/>
+<path class="fill" d="M20.5073 19.814L13.4124 26.9088L9.46382 22.9602L16.5587 15.8653L13.4034 12.71L3.11865 22.9943L13.375 33.2504L23.6594 22.966L20.5073 19.814Z" fill="#1A1A1A"/>
 <path d="M26.8383 13.4006L13.4381 0L0 13.4381L0.0428453 19.7191L13.3811 6.38127L26.8159 19.8167L26.8383 13.4006Z" fill="#38A1DB"/>
 </svg>
diff --git a/packages/ui/assets/svg/eth.svg b/packages/ui/assets/svg/eth.svg
index 4d48b18a..fa915ae9 100644
--- a/packages/ui/assets/svg/eth.svg
+++ b/packages/ui/assets/svg/eth.svg
@@ -1,4 +1,4 @@
-<svg class="size" viewBox="0 0 22 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg class="icon-size" viewBox="0 0 22 36" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g opacity="0.8">
 <path opacity="0.8" d="M10.998 26.8288V35.825L22.0002 20.3313L10.998 26.8288Z" fill="#4576F3"/>
 </g>
diff --git a/packages/ui/assets/svg/ethereum.svg b/packages/ui/assets/svg/ethereum.svg
index 20bbe82f..0f75a807 100644
--- a/packages/ui/assets/svg/ethereum.svg
+++ b/packages/ui/assets/svg/ethereum.svg
@@ -1,4 +1,4 @@
-<svg class="size" viewBox="0 0 22 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg class="icon-size" viewBox="0 0 22 36" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_26_79)">
 <g opacity="0.8">
 <path opacity="0.8" d="M10.998 26.8288V35.825L22.0002 20.3313L10.998 26.8288Z" fill="#4576F3"/>
diff --git a/packages/ui/assets/svg/frax.svg b/packages/ui/assets/svg/frax.svg
index 702c69b5..bc977e77 100644
--- a/packages/ui/assets/svg/frax.svg
+++ b/packages/ui/assets/svg/frax.svg
@@ -1,4 +1,4 @@
-<svg class="size" viewBox="0 0 31 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg class="icon-size" viewBox="0 0 31 31" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M15.4831 0.999998C23.4819 0.999998 29.9662 7.48432 29.9662 15.4831C29.9662 23.4819 23.4819 29.9662 15.4831 29.9662C7.48432 29.9662 1 23.4819 1 15.4831C1 7.48432 7.48432 0.999998 15.4831 0.999998Z" fill="black" stroke="black" stroke-width="1.2373" stroke-miterlimit="11.3386"/>
 <path d="M7.49348 23.5389C6.88281 22.8977 6.37901 22.3583 6.37392 22.3481C6.36883 22.3328 6.91843 21.7934 7.59526 21.1522C8.27209 20.5059 8.86241 19.941 8.90312 19.9054L8.97945 19.8342L8.84205 19.6052C7.63597 17.6103 7.38662 15.2083 8.14487 12.9997C8.28736 12.5824 8.53163 12.0481 8.74027 11.6969C8.84205 11.5239 8.88785 11.412 8.87767 11.3916C8.8675 11.3713 8.25173 10.7199 7.50875 9.94126C6.76576 9.16774 6.16018 8.52145 6.15 8.51127C6.14491 8.496 8.22629 6.48587 8.42476 6.32303L8.50109 6.25687L9.67664 7.48331C10.3229 8.16014 10.9285 8.79625 11.0201 8.89294L11.1931 9.06597L11.356 8.96419C12.1855 8.43494 13.1575 8.06853 14.2312 7.87515C14.7707 7.77846 15.7986 7.75302 16.3737 7.82426C17.4831 7.95149 18.5823 8.32298 19.483 8.8675L19.7171 9.00999L19.9665 8.76572C20.511 8.23647 22.5466 6.30267 22.5669 6.29249C22.5873 6.28232 24.8213 8.61814 24.8162 8.64867C24.8111 8.66394 23.2794 10.1346 22.343 11.015L22.0326 11.3102L22.1751 11.5443C23.371 13.5341 23.6203 15.9462 22.8468 18.1701C22.7349 18.4958 22.3939 19.2286 22.1954 19.5644L22.0987 19.7324L23.4066 21.1013C24.1241 21.8494 24.7094 22.4753 24.7043 22.4906C24.6839 22.5415 22.3939 24.7043 22.3634 24.7043C22.343 24.7043 21.768 24.119 21.081 23.3964C20.3939 22.6789 19.824 22.0886 19.8087 22.0835C19.7985 22.0784 19.7324 22.1089 19.6713 22.1547C19.4983 22.2718 19.0606 22.5109 18.8164 22.6229C18.0734 22.9639 17.3813 23.1725 16.5772 23.2896C16.1599 23.3506 14.9081 23.3608 14.5213 23.3048C13.5951 23.1725 12.8369 22.9435 12.0634 22.5567C11.8394 22.4499 11.5799 22.3074 11.4781 22.2463L11.2949 22.1344L11.0863 22.3379C10.9743 22.4499 10.4654 22.9282 9.96162 23.4117C9.45781 23.89 8.94383 24.3786 8.8217 24.5007L8.59778 24.7195L7.49348 23.5389ZM16.0378 20.2209C16.847 20.1242 17.5696 19.8494 18.2362 19.3812C18.5772 19.1421 19.0861 18.6332 19.3253 18.2922C20.684 16.3686 20.4245 13.7529 18.7146 12.1499C17.2541 10.786 15.1422 10.4807 13.3661 11.3865C12.0837 12.043 11.1779 13.244 10.8878 14.6842C10.7962 15.1422 10.7962 15.9971 10.8878 16.45C10.9743 16.8978 11.0914 17.2184 11.3102 17.6663C12.1855 19.427 14.0837 20.455 16.0378 20.2209Z" fill="white"/>
 </svg>
diff --git a/packages/ui/assets/svg/fxs.svg b/packages/ui/assets/svg/fxs.svg
index 2b3e034e..edfecd31 100644
--- a/packages/ui/assets/svg/fxs.svg
+++ b/packages/ui/assets/svg/fxs.svg
@@ -1,4 +1,4 @@
-<svg class="size" viewBox="0 0 31 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg class="icon-size" viewBox="0 0 31 31" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path class="fill" d="M15.4653 29.9306C23.4543 29.9306 29.9306 23.4543 29.9306 15.4653C29.9306 7.47633 23.4543 1 15.4653 1C7.47633 1 1 7.47633 1 15.4653C1 23.4543 7.47633 29.9306 15.4653 29.9306Z" fill="black" stroke="black" stroke-width="0.436504"/>
 <path class="reverse-fill" d="M9.05432 7.22185L8.08451 8.19167L9.31151 9.41868L10.5412 10.6457L10.4394 10.9457C10.3081 11.3396 10.2545 11.6691 10.2545 12.1058C10.2545 13.5283 10.9993 14.7393 12.3174 15.4599C12.8479 15.7493 13.7587 16.0761 14.7687 16.336C16.7405 16.8423 17.0433 16.9307 17.4317 17.1129C17.9622 17.3647 18.2247 17.638 18.3346 18.0506C18.3828 18.2301 18.3801 18.6319 18.3319 18.8248C18.2086 19.2937 17.8095 19.7652 17.3138 20.0224C16.6441 20.3733 15.4787 20.4698 14.6 20.2447C14.2731 20.1644 13.8096 19.9366 13.5766 19.7464C13.1024 19.3553 12.7327 18.6802 12.5692 17.9006C12.5424 17.7773 12.521 17.6728 12.5183 17.6675C12.5103 17.6568 9.76695 17.9247 9.75355 17.9407C9.74283 17.9488 9.75087 18.0613 9.76963 18.1899C9.85536 18.8088 10.0724 19.5455 10.3215 20.0572L10.4662 20.3546L9.274 21.5467L8.0845 22.7389L9.057 23.7114L10.0268 24.6812L11.2565 23.4516L12.4835 22.2245L12.6952 22.313C13.815 22.7845 15.4948 22.9318 17.1236 22.6961C17.5148 22.6398 18.08 22.5058 18.3774 22.396L18.5542 22.3317L19.7303 23.5078L20.9038 24.6812L21.8736 23.7114L22.8461 22.7389L21.7557 21.6486L20.668 20.5609L20.8046 20.2822C21.0886 19.7116 21.2065 19.2267 21.2306 18.5596C21.2735 17.2871 20.944 16.328 20.1938 15.5376C19.4115 14.7152 18.5301 14.324 16.0413 13.6971C14.2865 13.2578 13.531 12.955 13.231 12.5746C12.9336 12.1995 12.9068 11.6744 13.1667 11.2913C13.3167 11.069 13.6864 10.8305 14.0883 10.6966C14.541 10.5439 15.3019 10.4742 15.8672 10.5332C17.0593 10.6591 17.6594 11.1681 17.922 12.2826C17.9541 12.4192 17.9836 12.5344 17.9863 12.5398C17.9916 12.5478 19.9313 12.4782 20.5126 12.4487L20.8448 12.4326L20.8261 12.1995C20.7886 11.7253 20.6948 11.3021 20.5233 10.86L20.4296 10.6109L21.6378 9.39992L22.8461 8.19167L21.8763 7.21918L20.9038 6.24936L19.6821 7.47101L18.4578 8.69533L18.1604 8.58281C17.429 8.30955 16.7218 8.18899 15.6796 8.15952C14.541 8.13005 13.5417 8.2774 12.7755 8.58817L12.4915 8.70337L11.2592 7.47636L10.0268 6.24936L9.05432 7.22185Z" fill="white"/>
 </svg>
diff --git a/packages/ui/assets/svg/github.svg b/packages/ui/assets/svg/github.svg
index 0ffe697a..3910a188 100644
--- a/packages/ui/assets/svg/github.svg
+++ b/packages/ui/assets/svg/github.svg
@@ -1,3 +1,3 @@
-<svg class="size" viewBox="0 0 33 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg class="icon-size" viewBox="0 0 33 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16.0049 0.00146484C7.16488 0.00146484 0.00488281 7.16146 0.00488281 16.0015C0.00488281 23.0815 4.58488 29.0615 10.9449 31.1815C11.7449 31.3215 12.0449 30.8415 12.0449 30.4215C12.0449 30.0415 12.0249 28.7815 12.0249 27.4415C8.00488 28.1815 6.96488 26.4615 6.64488 25.5615C6.46488 25.1015 5.68488 23.6815 5.00488 23.3015C4.44488 23.0015 3.64488 22.2615 4.98488 22.2415C6.24488 22.2215 7.14488 23.4015 7.44488 23.8815C8.88488 26.3015 11.1849 25.6215 12.1049 25.2015C12.2449 24.1615 12.6649 23.4615 13.1249 23.0615C9.56488 22.6615 5.84488 21.2815 5.84488 15.1615C5.84488 13.4215 6.46488 11.9815 7.48488 10.8615C7.32488 10.4615 6.76488 8.82146 7.64488 6.62146C7.64488 6.62146 8.98488 6.20147 12.0449 8.26147C13.3249 7.90146 14.6849 7.72146 16.0449 7.72146C17.4049 7.72146 18.7649 7.90146 20.0449 8.26147C23.1049 6.18147 24.4449 6.62146 24.4449 6.62146C25.3249 8.82146 24.7649 10.4615 24.6049 10.8615C25.6249 11.9815 26.2449 13.4015 26.2449 15.1615C26.2449 21.3015 22.5049 22.6615 18.9449 23.0615C19.5249 23.5615 20.0249 24.5215 20.0249 26.0215C20.0249 28.1615 20.0049 29.8815 20.0049 30.4215C20.0049 30.8415 20.3049 31.3415 21.1049 31.1815C27.4249 29.0615 32.0049 23.0615 32.0049 16.0015C32.0049 7.16146 24.8449 0.00146484 16.0049 0.00146484Z" fill="#41BEA5"/>
 </svg>
diff --git a/packages/ui/assets/svg/harmony.svg b/packages/ui/assets/svg/harmony.svg
index 42aaac05..d67330e9 100644
--- a/packages/ui/assets/svg/harmony.svg
+++ b/packages/ui/assets/svg/harmony.svg
@@ -1,4 +1,4 @@
-<svg class="size" viewBox="0 0 31 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg class="icon-size" viewBox="0 0 31 31" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_26_107)">
 <path d="M6.68739 2.02249e-06C8.458 -0.00137628 10.1568 0.701769 11.4109 1.95509C12.665 3.20841 13.3719 4.90949 13.3765 6.68492V14.0969C14.0654 14.1435 14.7698 14.1729 15.5 14.1729C16.2302 14.1729 16.9312 14.2022 17.6235 14.2437V6.68492C17.6517 4.92488 18.3687 3.24649 19.6199 2.01182C20.8712 0.777149 22.5563 0.0851736 24.3117 0.0851736C26.0672 0.0851736 27.7523 0.777149 29.0036 2.01182C30.2548 3.24649 30.9718 4.92488 31 6.68492V24.3997C30.9718 26.1597 30.2548 27.8381 29.0036 29.0728C27.7523 30.3075 26.0672 30.9995 24.3117 30.9995C22.5563 30.9995 20.8712 30.3075 19.6199 29.0728C18.3687 27.8381 17.6517 26.1597 17.6235 24.3997V16.9878C16.9346 16.9411 16.2302 16.9118 15.5 16.9118C14.7698 16.9118 14.0688 16.8824 13.3765 16.841V24.3997C13.3483 26.1597 12.6313 27.8381 11.3801 29.0728C10.1288 30.3075 8.44372 30.9995 6.68825 30.9995C4.93278 30.9995 3.24766 30.3075 1.99643 29.0728C0.745206 27.8381 0.0281662 26.1597 -8.34465e-07 24.3997V6.68492C0.0045604 4.90979 0.711246 3.20897 1.96498 1.9557C3.21871 0.702428 4.91708 -0.000918656 6.68739 2.02249e-06V2.02249e-06ZM24.3126 2.7389C23.2677 2.73844 22.2652 3.15365 21.5252 3.89343C20.7852 4.6332 20.368 5.63712 20.3653 6.68492V14.5338C22.3221 14.8181 24.233 15.3599 26.0486 16.145C26.8353 16.4912 27.5758 16.9344 28.2531 17.4644V6.68492C28.2503 5.63832 27.8341 4.63544 27.0956 3.89586C26.3571 3.15628 25.3564 2.74027 24.3126 2.7389V2.7389ZM20.3653 24.3997C20.3653 25.4495 20.7812 26.4562 21.5214 27.1985C22.2617 27.9408 23.2657 28.3578 24.3126 28.3578C25.3595 28.3578 26.3635 27.9408 27.1038 27.1985C27.8441 26.4562 28.2599 25.4495 28.2599 24.3997V22.6227C28.2599 21.0529 27.0199 19.566 24.9412 18.6404C23.4765 18.0068 21.9397 17.5561 20.3653 17.2986V24.3997V24.3997ZM6.68739 28.3457C7.73234 28.3462 8.7348 27.931 9.47482 27.1912C10.2148 26.4514 10.632 25.4475 10.6347 24.3997V16.5508C8.6779 16.2665 6.767 15.7248 4.95139 14.9396C4.16474 14.5934 3.42421 14.1502 2.74694 13.6202V24.3997C2.74968 25.4463 3.16587 26.4492 3.9044 27.1888C4.64294 27.9283 5.64363 28.3444 6.68739 28.3457V28.3457ZM6.05878 12.4339C7.52348 13.0675 9.06033 13.5181 10.6347 13.7757V6.68492C10.6347 5.63517 10.2188 4.62841 9.47857 3.88612C8.7383 3.14383 7.73429 2.72681 6.68739 2.72681C5.64049 2.72681 4.63647 3.14383 3.8962 3.88612C3.15593 4.62841 2.74006 5.63517 2.74006 6.68492V8.46193C2.74006 10.0248 3.98005 11.5117 6.05878 12.4339Z" fill="url(#paint0_linear_26_107)"/>
 </g>
diff --git a/packages/ui/assets/svg/kcc.svg b/packages/ui/assets/svg/kcc.svg
index fdc70c6a..c6e686ce 100644
--- a/packages/ui/assets/svg/kcc.svg
+++ b/packages/ui/assets/svg/kcc.svg
@@ -1,4 +1,4 @@
-<svg class="size" viewBox="0 0 34 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg class="icon-size" viewBox="0 0 34 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M33.8471 13.6492L32.8875 12.042L27.6342 3.21437H27.6102L27.4423 2.90253H25.5232L18.063 16.024L25.6432 29.0734H27.5622L27.6102 29.0015L33.8711 18.2788H30.009L26.6747 24.2039L21.925 16L26.5787 7.79608L29.961 13.6252L33.8471 13.6492Z" fill="#41E6AF"/>
 <path d="M4.65367 11.5142L8.15592 5.54123L6.98051 3.64618L6.16492 2.30285L0.167916 12.8816L0 13.1694L0.95952 14.8486H16.048L23.6522 1.82309L22.5967 0L12.042 0.0239879H11.8741L10.1949 0L11.0825 1.67916L11.97 3.35832L18.8786 3.33433L14.1289 11.5142H4.65367Z" fill="#41E6AF"/>
 <path d="M12.114 4.60571C11.8501 4.60571 11.5622 4.65369 11.2744 4.74964C10.9625 4.84559 10.6507 4.98952 10.3628 5.15744C9.54725 5.66118 8.97154 6.38083 8.87558 7.05249C8.82761 7.36433 8.89957 7.6282 9.06749 7.82011C9.09148 7.86808 9.13945 7.89207 9.16344 7.94005C9.18743 7.96403 9.21142 7.96403 9.2354 7.98802C9.25939 8.01201 9.25939 8.01201 9.28338 8.036C9.33136 8.05999 9.35534 8.08397 9.40332 8.10796C9.90707 8.34784 10.6987 8.29987 11.4663 7.94005L11.4903 7.91606C11.5622 7.89207 11.6342 7.84409 11.7062 7.82011C11.7781 7.79612 11.8261 7.74814 11.8981 7.70017C11.97 7.65219 12.042 7.60421 12.114 7.55624C12.1859 7.50826 12.2339 7.46029 12.3059 7.41231L12.3538 7.38832C12.4018 7.34035 12.4498 7.31636 12.4978 7.26838C12.5218 7.24439 12.5218 7.24439 12.5457 7.22041C12.5937 7.19642 12.6177 7.14844 12.6417 7.12445C12.6657 7.10047 12.6897 7.07648 12.7137 7.0285C12.7377 6.98053 12.7856 6.95654 12.8096 6.90856C12.8336 6.88457 12.8336 6.88457 12.8576 6.86059C12.8816 6.81261 12.9296 6.78862 12.9535 6.74065L13.0015 6.69267C13.0255 6.64469 13.0495 6.62071 13.0735 6.57273C13.0735 6.57273 13.0735 6.57273 13.0735 6.54874L13.0975 6.50077C13.1454 6.45279 13.1694 6.38083 13.1934 6.33285C13.2174 6.28487 13.2414 6.21291 13.2654 6.16493L13.2894 6.14095C13.2894 6.11696 13.3134 6.09297 13.3134 6.09297C13.3134 6.06898 13.3134 6.06898 13.3374 6.04499C13.3374 5.99702 13.3613 5.97303 13.3613 5.92505C13.3613 5.87708 13.3853 5.87708 13.3853 5.85309C13.3853 5.8291 13.3853 5.80511 13.3853 5.80511C13.3853 5.75714 13.3853 5.73315 13.3853 5.70916V5.66119C13.3853 5.61321 13.3853 5.58922 13.3853 5.54125C13.3853 5.51726 13.3853 5.51726 13.3853 5.49327C13.3853 5.46928 13.3853 5.44529 13.3853 5.44529C13.3853 5.42131 13.3853 5.4213 13.3853 5.39732V5.37333C13.3853 5.32535 13.3613 5.30137 13.3374 5.25339C13.3134 5.20541 13.2894 5.18143 13.2654 5.13345C13.0975 4.77363 12.6417 4.60571 12.114 4.60571Z" fill="#41E6AF"/>
diff --git a/packages/ui/assets/svg/kcs.svg b/packages/ui/assets/svg/kcs.svg
index a1567dc2..7d6ec624 100644
--- a/packages/ui/assets/svg/kcs.svg
+++ b/packages/ui/assets/svg/kcs.svg
@@ -1,4 +1,4 @@
-<svg class="size" viewBox="0 0 34 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg class="icon-size" viewBox="0 0 34 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M33.8471 13.6492L32.8876 12.042L27.6342 3.21437H27.6102L27.4423 2.90253H25.5233L18.063 16.024L25.6432 29.0734H27.5622L27.6102 29.0015L33.8711 18.2788H30.009L26.6747 24.2039L21.9251 16L26.5787 7.79608L29.961 13.6252L33.8471 13.6492Z" fill="#41E6AF"/>
 <path d="M4.65367 11.5142L8.15592 5.54123L6.98051 3.64618L6.16492 2.30285L0.167916 12.8816L0 13.1694L0.95952 14.8486H16.048L23.6522 1.82309L22.5967 0L12.042 0.0239879H11.8741L10.1949 0L11.0825 1.67916L11.97 3.35832L18.8786 3.33433L14.1289 11.5142H4.65367Z" fill="#41E6AF"/>
 <path d="M12.114 4.60571C11.8501 4.60571 11.5623 4.65369 11.2744 4.74964C10.9626 4.84559 10.6507 4.98952 10.3629 5.15744C9.54728 5.66118 8.97157 6.38083 8.87561 7.05249C8.82764 7.36433 8.8996 7.6282 9.06752 7.82011C9.09151 7.86808 9.13948 7.89207 9.16347 7.94005C9.18746 7.96403 9.21145 7.96403 9.23543 7.98802C9.25942 8.01201 9.25942 8.01201 9.28341 8.036C9.33139 8.05999 9.35537 8.08397 9.40335 8.10796C9.9071 8.34784 10.6987 8.29987 11.4663 7.94005L11.4903 7.91606C11.5623 7.89207 11.6342 7.84409 11.7062 7.82011C11.7782 7.79612 11.8261 7.74814 11.8981 7.70017C11.9701 7.65219 12.042 7.60421 12.114 7.55624C12.186 7.50826 12.2339 7.46029 12.3059 7.41231L12.3539 7.38832C12.4019 7.34035 12.4498 7.31636 12.4978 7.26838C12.5218 7.24439 12.5218 7.24439 12.5458 7.22041C12.5938 7.19642 12.6177 7.14844 12.6417 7.12445C12.6657 7.10047 12.6897 7.07648 12.7137 7.0285C12.7377 6.98053 12.7857 6.95654 12.8096 6.90856C12.8336 6.88457 12.8336 6.88457 12.8576 6.86059C12.8816 6.81261 12.9296 6.78862 12.9536 6.74065L13.0016 6.69267C13.0255 6.64469 13.0495 6.62071 13.0735 6.57273C13.0735 6.57273 13.0735 6.57273 13.0735 6.54874L13.0975 6.50077C13.1455 6.45279 13.1695 6.38083 13.1935 6.33285C13.2174 6.28487 13.2414 6.21291 13.2654 6.16493L13.2894 6.14095C13.2894 6.11696 13.3134 6.09297 13.3134 6.09297C13.3134 6.06898 13.3134 6.06898 13.3374 6.04499C13.3374 5.99702 13.3614 5.97303 13.3614 5.92505C13.3614 5.87708 13.3854 5.87708 13.3854 5.85309C13.3854 5.8291 13.3854 5.80511 13.3854 5.80511C13.3854 5.75714 13.3854 5.73315 13.3854 5.70916V5.66119C13.3854 5.61321 13.3854 5.58922 13.3854 5.54125C13.3854 5.51726 13.3854 5.51726 13.3854 5.49327C13.3854 5.46928 13.3854 5.44529 13.3854 5.44529C13.3854 5.42131 13.3854 5.4213 13.3854 5.39732V5.37333C13.3854 5.32535 13.3614 5.30137 13.3374 5.25339C13.3134 5.20541 13.2894 5.18143 13.2654 5.13345C13.0975 4.77363 12.6417 4.60571 12.114 4.60571Z" fill="#41E6AF"/>
diff --git a/packages/ui/assets/svg/metis.svg b/packages/ui/assets/svg/metis.svg
index 80022844..9103d2db 100644
--- a/packages/ui/assets/svg/metis.svg
+++ b/packages/ui/assets/svg/metis.svg
@@ -1,3 +1,3 @@
-<svg class="size" width="35" height="34" viewBox="0 0 35 34" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg class="icon-size" width="35" height="34" viewBox="0 0 35 34" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.7367 33.9752C29.8435 31.7642 35 25.172 35 17.3835C35 7.78284 27.165 0 17.5 0C7.83502 0 0 7.78284 0 17.3835C0 24.7385 4.59837 31.0266 11.0951 33.5658C11.8698 31.7314 14.4259 25.6374 14.4259 25.0952C14.4259 24.83 15.2269 24.6687 16.1367 24.4856C17.4191 24.2274 18.9178 23.9258 18.6952 23.2279C18.4349 22.4115 16.6103 23.2515 15.4303 23.7946C14.8862 24.0452 14.4793 24.2325 14.4259 24.1652C14.2568 23.9522 15.1751 22.0702 15.5133 21.6441C15.6409 21.4833 16.2778 21.4753 17.0343 21.4658C18.282 21.4501 19.8551 21.4303 20.0056 20.7142C20.1609 19.9757 18.323 20.3959 16.9868 20.7014C16.2412 20.8719 15.6518 21.0066 15.6518 20.8846C15.6518 20.5438 16.9505 18.7043 17.5 18.406C17.6765 18.3102 18.2597 18.2335 18.9645 18.1408C20.4543 17.9449 22.4876 17.6776 22.3728 17.0074C22.2675 16.3928 20.6392 16.9231 19.4246 17.3184C18.6879 17.5583 18.1035 17.7486 18.1035 17.6039C18.1035 17.2204 19.8671 15.5514 20.3744 15.4236C20.5064 15.3903 20.865 15.3893 21.3242 15.3879C22.6306 15.3842 24.751 15.378 24.7822 14.6214C24.8106 13.9333 23.0343 14.303 21.8308 14.5535C21.2459 14.6753 20.7963 14.769 20.7548 14.6992C20.7153 14.633 21.2763 14.3492 22.0507 13.9575C23.7637 13.0909 26.5214 11.6959 26.1349 10.9572C25.7532 10.2279 23.2659 12.1421 21.6467 13.3882C20.8849 13.9745 20.3152 14.4129 20.2476 14.3584C20.1797 14.3037 20.4444 13.9465 20.8071 13.457C21.5735 12.4226 22.7776 10.7977 22.2037 10.1904C21.3583 9.29563 19.4444 15.0401 19.4444 15.0401C19.4444 15.0401 18.0612 17.0074 17.8076 17.0074C17.7179 17.0074 17.7975 16.5005 17.9004 15.8454C18.0883 14.6495 18.3538 12.9597 17.8076 12.9597C17.1875 12.9597 17.1296 15.2253 17.0929 16.6681C17.0794 17.1923 17.0688 17.608 17.035 17.7669C16.9082 18.3634 15.7246 20.1602 15.5133 20.2028C15.4483 20.2159 15.4604 19.8742 15.4775 19.3897C15.5161 18.2994 15.5803 16.4863 14.8486 16.3683C14.0245 16.2354 14.5116 19.363 14.7458 20.8677C14.8119 21.2924 14.8579 21.5879 14.8486 21.6441C14.8064 21.8998 14.4565 22.8371 14.2874 22.8371C14.2387 22.8371 14.1105 22.6011 13.9333 22.2753C13.495 21.4691 12.7575 20.1125 12.1856 20.4159C11.5634 20.746 12.6342 21.869 13.384 22.6553C13.602 22.8839 13.7928 23.084 13.907 23.2279C14.4143 23.867 13.2846 26.9868 12.9887 27.0199C12.6928 27.053 10.8752 25.9973 10.8752 25.9973C10.8752 25.9973 9.8607 25.5286 9.43799 25.1878C9.17803 24.9782 8.95002 24.2205 8.75397 23.5692C8.6313 23.1615 8.52115 22.7954 8.42352 22.6314C8.3163 22.4513 8.10329 22.4082 7.88354 22.3638C7.5835 22.3031 7.27087 22.24 7.19767 21.8219C7.13777 21.4797 7.18164 21.1565 7.22231 20.8569C7.26773 20.5223 7.30917 20.217 7.19767 19.9473C7.11827 19.7551 6.7823 19.6292 6.39376 19.4835C5.74812 19.2415 4.95734 18.9452 4.95734 18.2004L4.6193 16.9222C4.6193 16.9222 4.36555 15.7717 4.95734 15.6439C5.25522 15.5796 5.15679 15.2562 5.03409 14.853C4.91303 14.4552 4.76834 13.9797 4.95734 13.5988C5.3379 12.8319 7.36688 10.1904 8.42352 10.0199C9.16459 9.90039 9.23078 9.71795 9.2985 9.5315C9.32733 9.45209 9.35641 9.3719 9.43799 9.29563C9.44594 9.28814 9.45761 9.27714 9.47291 9.26283C9.98227 8.78385 14.4614 4.57245 15.6518 4.7793C15.7092 4.78927 15.7703 4.79995 15.8347 4.81121C17.1478 5.0407 19.8674 5.516 21.3583 5.29058C22.9225 5.05409 24.9938 5.54621 25.8814 6.48355C26.534 7.17276 26.8211 8.06929 27.0281 8.71584C27.1027 8.94856 27.1668 9.14898 27.2339 9.29563C27.323 9.49026 27.5427 9.72178 27.7939 9.98646C28.2573 10.4748 28.8277 11.076 28.8824 11.7667C28.925 12.3028 28.8147 12.8261 28.7216 13.2681C28.6297 13.7045 28.5545 14.0615 28.6594 14.2732C28.7465 14.4489 29.2433 14.8491 29.8 15.2976C30.5936 15.937 31.509 16.6745 31.5338 17C31.5576 17.3115 31.1037 17.5422 30.7019 17.7464C30.3893 17.9052 30.1083 18.048 30.1083 18.2004C30.1083 18.3958 30.2281 18.7341 30.3332 19.0311C30.4155 19.2633 30.4887 19.4702 30.4887 19.5638C30.4887 19.6612 30.4356 19.714 30.366 19.7835C30.2832 19.8659 30.177 19.9716 30.1083 20.2028C30.0364 20.4446 30.1686 20.5355 30.2964 20.6233C30.3939 20.6903 30.4887 20.7555 30.4887 20.8846C30.4887 21.1435 30.3614 21.3703 30.1894 21.6766C30.1633 21.723 30.1362 21.7713 30.1083 21.8219C30.0289 21.966 29.9972 22.2963 29.9618 22.6662C29.9028 23.2812 29.8334 24.0056 29.5167 24.1652C29.3179 24.2653 28.6719 24.3001 27.9086 24.3412C26.723 24.405 25.2544 24.4841 24.7401 24.8469C23.8947 25.4434 21.3466 31.0602 21.5157 31.9123C21.5901 32.287 21.8457 32.5711 22.1046 32.8589C22.3953 33.182 22.6901 33.5096 22.7367 33.9752Z" fill="#00DACC"/>
 </svg>
diff --git a/packages/ui/assets/svg/omg.svg b/packages/ui/assets/svg/omg.svg
index 6e34efdc..77aaba7f 100644
--- a/packages/ui/assets/svg/omg.svg
+++ b/packages/ui/assets/svg/omg.svg
@@ -1,4 +1,4 @@
-<svg class="size" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 249.4 249.1" style="enable-background:new 0 0 249.4 249.1;" xml:space="preserve">
+<svg class="icon-size" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 249.4 249.1" style="enable-background:new 0 0 249.4 249.1;" xml:space="preserve">
 <g transform="translate(0.000000,250.000000) scale(0.100000,-0.100000)">
 	<path class="fill" d="M1092.3,2493.4c-538-73-971-478-1070-1001c-62-330,6-661,195-944c66-98,231-264,326-327c145-95,293-157,464-194   c118-25,362-25,480,0c244,52,441,154,615,318c184,175,306,387,360,626c94,414-21,835-312,1144c-171,180-419,317-665,364   C1382.3,2499.4,1185.3,2506.4,1092.3,2493.4z M1372.3,2394.4c297-34,578-186,761-412c118-147,186-283,231-468c22-88,26-128,27-250   c0-174-18-281-75-425c-301-773-1296-982-1879-395c-329,330-426,810-251,1243c89,223,275,438,481,555   C892.3,2371.4,1126.3,2421.4,1372.3,2394.4z"/>
 	<path class="fill" d="M440.3,1548.4c-130-47-213-208-183-358c15-75,32-110,79-159c62-67,102-82,211-82c87,0,100,3,148,29c89,50,138,129,149,241   c14,154-75,298-206,335C587.3,1568.4,489.3,1565.4,440.3,1548.4z M659.3,1423.4c59-43,89-142,68-229c-40-168-261-201-337-50   c-46,90-22,231,48,280C496.3,1466.4,599.3,1465.4,659.3,1423.4z"/>
diff --git a/packages/ui/assets/svg/one.svg b/packages/ui/assets/svg/one.svg
index 42aaac05..d67330e9 100644
--- a/packages/ui/assets/svg/one.svg
+++ b/packages/ui/assets/svg/one.svg
@@ -1,4 +1,4 @@
-<svg class="size" viewBox="0 0 31 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg class="icon-size" viewBox="0 0 31 31" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_26_107)">
 <path d="M6.68739 2.02249e-06C8.458 -0.00137628 10.1568 0.701769 11.4109 1.95509C12.665 3.20841 13.3719 4.90949 13.3765 6.68492V14.0969C14.0654 14.1435 14.7698 14.1729 15.5 14.1729C16.2302 14.1729 16.9312 14.2022 17.6235 14.2437V6.68492C17.6517 4.92488 18.3687 3.24649 19.6199 2.01182C20.8712 0.777149 22.5563 0.0851736 24.3117 0.0851736C26.0672 0.0851736 27.7523 0.777149 29.0036 2.01182C30.2548 3.24649 30.9718 4.92488 31 6.68492V24.3997C30.9718 26.1597 30.2548 27.8381 29.0036 29.0728C27.7523 30.3075 26.0672 30.9995 24.3117 30.9995C22.5563 30.9995 20.8712 30.3075 19.6199 29.0728C18.3687 27.8381 17.6517 26.1597 17.6235 24.3997V16.9878C16.9346 16.9411 16.2302 16.9118 15.5 16.9118C14.7698 16.9118 14.0688 16.8824 13.3765 16.841V24.3997C13.3483 26.1597 12.6313 27.8381 11.3801 29.0728C10.1288 30.3075 8.44372 30.9995 6.68825 30.9995C4.93278 30.9995 3.24766 30.3075 1.99643 29.0728C0.745206 27.8381 0.0281662 26.1597 -8.34465e-07 24.3997V6.68492C0.0045604 4.90979 0.711246 3.20897 1.96498 1.9557C3.21871 0.702428 4.91708 -0.000918656 6.68739 2.02249e-06V2.02249e-06ZM24.3126 2.7389C23.2677 2.73844 22.2652 3.15365 21.5252 3.89343C20.7852 4.6332 20.368 5.63712 20.3653 6.68492V14.5338C22.3221 14.8181 24.233 15.3599 26.0486 16.145C26.8353 16.4912 27.5758 16.9344 28.2531 17.4644V6.68492C28.2503 5.63832 27.8341 4.63544 27.0956 3.89586C26.3571 3.15628 25.3564 2.74027 24.3126 2.7389V2.7389ZM20.3653 24.3997C20.3653 25.4495 20.7812 26.4562 21.5214 27.1985C22.2617 27.9408 23.2657 28.3578 24.3126 28.3578C25.3595 28.3578 26.3635 27.9408 27.1038 27.1985C27.8441 26.4562 28.2599 25.4495 28.2599 24.3997V22.6227C28.2599 21.0529 27.0199 19.566 24.9412 18.6404C23.4765 18.0068 21.9397 17.5561 20.3653 17.2986V24.3997V24.3997ZM6.68739 28.3457C7.73234 28.3462 8.7348 27.931 9.47482 27.1912C10.2148 26.4514 10.632 25.4475 10.6347 24.3997V16.5508C8.6779 16.2665 6.767 15.7248 4.95139 14.9396C4.16474 14.5934 3.42421 14.1502 2.74694 13.6202V24.3997C2.74968 25.4463 3.16587 26.4492 3.9044 27.1888C4.64294 27.9283 5.64363 28.3444 6.68739 28.3457V28.3457ZM6.05878 12.4339C7.52348 13.0675 9.06033 13.5181 10.6347 13.7757V6.68492C10.6347 5.63517 10.2188 4.62841 9.47857 3.88612C8.7383 3.14383 7.73429 2.72681 6.68739 2.72681C5.64049 2.72681 4.63647 3.14383 3.8962 3.88612C3.15593 4.62841 2.74006 5.63517 2.74006 6.68492V8.46193C2.74006 10.0248 3.98005 11.5117 6.05878 12.4339Z" fill="url(#paint0_linear_26_107)"/>
 </g>
diff --git a/packages/ui/assets/svg/polygon.svg b/packages/ui/assets/svg/polygon.svg
index 4ac8b3b1..80e506ad 100644
--- a/packages/ui/assets/svg/polygon.svg
+++ b/packages/ui/assets/svg/polygon.svg
@@ -1,3 +1,3 @@
-<svg class="size" viewBox="0 0 35 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg class="icon-size" viewBox="0 0 35 31" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M26.1575 9.29044C25.5262 8.92964 24.7144 8.92964 23.9928 9.29044L18.9417 12.267L15.5141 14.1612L10.5532 17.1377C9.92183 17.4985 9.11004 17.4985 8.38845 17.1377L4.50992 14.7925C3.87853 14.4317 3.42754 13.7102 3.42754 12.8984V8.38845C3.42754 7.66687 3.78833 6.94528 4.50992 6.49429L8.38845 4.23933C9.01984 3.87853 9.83163 3.87853 10.5532 4.23933L14.4317 6.58448C15.0631 6.94528 15.5141 7.66687 15.5141 8.47865V11.4552L18.9417 9.47083V6.40409C18.9417 5.6825 18.5809 4.96091 17.8593 4.50992L10.6434 0.270595C10.012 -0.0901984 9.20024 -0.0901984 8.47865 0.270595L1.08238 4.60012C0.360794 4.96091 0 5.6825 0 6.40409V14.8827C0 15.6043 0.360794 16.3259 1.08238 16.7769L8.38845 21.0162C9.01984 21.377 9.83163 21.377 10.5532 21.0162L15.5141 18.1299L18.9417 16.1455L23.9026 13.2592C24.534 12.8984 25.3458 12.8984 26.0673 13.2592L29.9459 15.5141C30.5773 15.8749 31.0283 16.5965 31.0283 17.4083V21.9182C31.0283 22.6398 30.6675 23.3614 29.9459 23.8124L26.1575 26.0673C25.5262 26.4281 24.7144 26.4281 23.9928 26.0673L20.1142 23.8124C19.4829 23.4516 19.0319 22.73 19.0319 21.9182V19.0319L15.6043 21.0162V23.9928C15.6043 24.7144 15.9651 25.436 16.6867 25.8869L23.9928 30.1263C24.6242 30.4871 25.436 30.4871 26.1575 30.1263L33.4636 25.8869C34.095 25.5262 34.546 24.8046 34.546 23.9928V15.4239C34.546 14.7023 34.1852 13.9808 33.4636 13.5298L26.1575 9.29044Z" fill="#8247E5"/>
 </svg>
diff --git a/packages/ui/assets/svg/usdc.svg b/packages/ui/assets/svg/usdc.svg
index 0e2039e1..8c1a0773 100644
--- a/packages/ui/assets/svg/usdc.svg
+++ b/packages/ui/assets/svg/usdc.svg
@@ -1,4 +1,4 @@
-<svg class="size" data-name="86977684-12db-4850-8f30-233a7c267d11" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2000 2000">
+<svg class="icon-size" data-name="86977684-12db-4850-8f30-233a7c267d11" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2000 2000">
   <path d="M1000 2000c554.17 0 1000-445.83 1000-1000S1554.17 0 1000 0 0 445.83 0 1000s445.83 1000 1000 1000z" fill="#2775ca"></path>
   <path d="M1275 1158.33c0-145.83-87.5-195.83-262.5-216.66-125-16.67-150-50-150-108.34s41.67-95.83 125-95.83c75 0 116.67 25 137.5 87.5 4.17 12.5 16.67 20.83 29.17 20.83h66.66c16.67 0 29.17-12.5 29.17-29.16v-4.17c-16.67-91.67-91.67-162.5-187.5-170.83v-100c0-16.67-12.5-29.17-33.33-33.34h-62.5c-16.67 0-29.17 12.5-33.34 33.34v95.83c-125 16.67-204.16 100-204.16 204.17 0 137.5 83.33 191.66 258.33 212.5 116.67 20.83 154.17 45.83 154.17 112.5s-58.34 112.5-137.5 112.5c-108.34 0-145.84-45.84-158.34-108.34-4.16-16.66-16.66-25-29.16-25h-70.84c-16.66 0-29.16 12.5-29.16 29.17v4.17c16.66 104.16 83.33 179.16 220.83 200v100c0 16.66 12.5 29.16 33.33 33.33h62.5c16.67 0 29.17-12.5 33.34-33.33v-100c125-20.84 208.33-108.34 208.33-220.84z" fill="#fff"></path>
   <path d="M787.5 1595.83c-325-116.66-491.67-479.16-370.83-800 62.5-175 200-308.33 370.83-370.83 16.67-8.33 25-20.83 25-41.67V325c0-16.67-8.33-29.17-25-33.33-4.17 0-12.5 0-16.67 4.16-395.83 125-612.5 545.84-487.5 941.67 75 233.33 254.17 412.5 487.5 487.5 16.67 8.33 33.34 0 37.5-16.67 4.17-4.16 4.17-8.33 4.17-16.66v-58.34c0-12.5-12.5-29.16-25-37.5zM1229.17 295.83c-16.67-8.33-33.34 0-37.5 16.67-4.17 4.17-4.17 8.33-4.17 16.67v58.33c0 16.67 12.5 33.33 25 41.67 325 116.66 491.67 479.16 370.83 800-62.5 175-200 308.33-370.83 370.83-16.67 8.33-25 20.83-25 41.67V1700c0 16.67 8.33 29.17 25 33.33 4.17 0 12.5 0 16.67-4.16 395.83-125 612.5-545.84 487.5-941.67-75-237.5-258.34-416.67-487.5-491.67z" fill="#fff"></path>
diff --git a/packages/ui/assets/svg/usdt.svg b/packages/ui/assets/svg/usdt.svg
index 705923cb..0b372bdd 100644
--- a/packages/ui/assets/svg/usdt.svg
+++ b/packages/ui/assets/svg/usdt.svg
@@ -1,4 +1,4 @@
-<svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" class="size" viewBox="0 0 339.43 295.27">
+<svg class="icon-size" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 339.43 295.27">
   <path d="m62.15 1.45-61.89 130a2.52 2.52 0 0 0 .54 2.94l167.15 160.17a2.55 2.55 0 0 0 3.53 0L338.63 134.4a2.52 2.52 0 0 0 .54-2.94l-61.89-130A2.5 2.5 0 0 0 275 0H64.45a2.5 2.5 0 0 0-2.3 1.45Z" style="fill:#50af95;fill-rule:evenodd"></path>
   <path d="M191.19 144.8c-1.2.09-7.4.46-21.23.46-11 0-18.81-.33-21.55-.46-42.51-1.87-74.24-9.27-74.24-18.13s31.73-16.25 74.24-18.15v28.91c2.78.2 10.74.67 21.74.67 13.2 0 19.81-.55 21-.66v-28.9c42.42 1.89 74.08 9.29 74.08 18.13s-31.65 16.24-74.08 18.12Zm0-39.25V79.68h59.2V40.23H89.21v39.45h59.19v25.86c-48.11 2.21-84.29 11.74-84.29 23.16s36.18 20.94 84.29 23.16v82.9h42.78v-82.93c48-2.21 84.12-11.73 84.12-23.14s-36.09-20.93-84.12-23.15Zm0 0Z" style="fill:#fff;fill-rule:evenodd"></path>
 </svg>
\ No newline at end of file
diff --git a/packages/ui/assets/svg/xau.svg b/packages/ui/assets/svg/xau.svg
index 98024f19..95a79ed1 100644
--- a/packages/ui/assets/svg/xau.svg
+++ b/packages/ui/assets/svg/xau.svg
@@ -1,4 +1,4 @@
-<svg class="size" viewBox="0 0 31 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg class="icon-size" viewBox="0 0 31 31" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M20.0467 25.5934H10.8987L11.8747 19.8972H19.0638L20.0467 25.5934ZM9.74138 25.5934H0.593175L1.57129 19.8972H8.7604L9.74138 25.5934Z" fill="#FFB800" stroke="#FFB800"/>
 <path d="M10.9248 11.0967L11.9027 5.40625H19.0974L20.0754 11.0967H10.9248Z" fill="#FFB800" stroke="#FFB800"/>
 <path d="M16.1103 18.3451L17.0883 12.6492H24.2772L25.2553 18.3451H16.1103Z" fill="#FFB800" stroke="#FFB800"/>
diff --git a/packages/ui/components/BreadCrumbs.vue b/packages/ui/components/BreadCrumbs.vue
index 018bf85f..d571804e 100644
--- a/packages/ui/components/BreadCrumbs.vue
+++ b/packages/ui/components/BreadCrumbs.vue
@@ -46,11 +46,18 @@ export default {
 @media screen and (max-width: 1100px) {
   .breadcrumbs {
     &.container {
-      padding: 0 16px;
+      padding: 0 24px;
     }
   }
 }
 @media (max-width: 850px) {
+  .breadcrumbs {
+    &.container {
+      padding: 0 24px;
+    }
+  }
+}
+@media screen and (max-width: 300px) {
   .breadcrumbs {
     &.container {
       padding: 0 16px;
diff --git a/packages/ui/components/DataFeedDetails.vue b/packages/ui/components/DataFeedDetails.vue
index 3e873e43..a8896aff 100644
--- a/packages/ui/components/DataFeedDetails.vue
+++ b/packages/ui/components/DataFeedDetails.vue
@@ -8,7 +8,7 @@
       :last-result-value="lastResultvalue"
       :data-label="feed.label"
       :name="feedName"
-      :heartbeat="heartbeat"
+      :time-to-update="maxTimeToResolve"
       :decimals="feedDecimals"
       @change-range="updateQuery"
     />
@@ -175,16 +175,21 @@ export default {
     },
     heartbeat() {
       if (this.feed) {
-        return Number(this.feed.heartbeat) + Number(this.feed.finality)
+        return Number(this.feed.heartbeat)
       } else {
-        return ''
+        return 0
+      }
+    },
+    finality() {
+      if (this.feed) {
+        return Number(this.feed.finality)
+      } else {
+        return 0
       }
     },
     feedTimeToUpdate() {
       if (this.feed) {
-        return formatMilliseconds(
-          Number(this.feed.heartbeat) + Number(this.feed.finality)
-        )
+        return formatMilliseconds(this.heartbeat + this.finality)
       } else {
         return ''
       }
@@ -200,9 +205,7 @@ export default {
       }
     },
     maxTimeToResolve() {
-      return this.feed
-        ? (Number(this.feed.heartbeat) + Number(this.feed.finality)).toString()
-        : ''
+      return this.heartbeat + this.finality
     },
     numberOfPages() {
       return this.feed
diff --git a/packages/ui/components/DataFeedStatus.vue b/packages/ui/components/DataFeedStatus.vue
index b0f4077d..e4acc861 100644
--- a/packages/ui/components/DataFeedStatus.vue
+++ b/packages/ui/components/DataFeedStatus.vue
@@ -9,7 +9,7 @@
 import { getDataFeedStatus } from '@/utils/getDataFeedStatus'
 export default {
   props: {
-    heartbeat: {
+    timeToUpdate: {
       type: Number,
       required: true,
     },
@@ -20,10 +20,12 @@ export default {
   },
   computed: {
     statusColor() {
-      return getDataFeedStatus(this.heartbeat, this.lastResultTimestamp).color
+      return getDataFeedStatus(this.timeToUpdate, this.lastResultTimestamp)
+        .color
     },
     statusLabel() {
-      return getDataFeedStatus(this.heartbeat, this.lastResultTimestamp).label
+      return getDataFeedStatus(this.timeToUpdate, this.lastResultTimestamp)
+        .label
     },
   },
 }
diff --git a/packages/ui/components/DataFeeds.vue b/packages/ui/components/DataFeeds.vue
index 30515adc..bfe5003e 100644
--- a/packages/ui/components/DataFeeds.vue
+++ b/packages/ui/components/DataFeeds.vue
@@ -6,7 +6,7 @@
       :details-path="feed.detailsPath"
       :name="feed.name"
       :decimals="feed.decimals"
-      :heartbeat="feed.heartbeat"
+      :time-to-update="feed.timeToUpdate"
       :img="feed.img"
       :value="feed.value"
       :last-result-timestamp="feed.lastResultTimestamp"
@@ -61,7 +61,6 @@ export default {
             return !!feed.lastResult
           })
           .map((feed) => {
-            console.log(feed)
             return {
               detailsPath: {
                 name: 'feeds-id',
@@ -72,7 +71,7 @@ export default {
               value: feed.lastResult,
               lastResultTimestamp: feed.lastResultTimestamp || '0',
               label: feed.label,
-              heartbeat: feed.heartbeat,
+              timeToUpdate: Number(feed.heartbeat) + Number(feed.finality),
               img: {
                 name: formatSvgName(feed.name),
                 alt: feed.name,
@@ -103,28 +102,36 @@ export default {
   display: grid;
   grid-gap: 16px;
   width: 100%;
-  grid-template: repeat(auto-fit, 80px) / repeat(auto-fit, 300px);
+  grid-template-rows: repeat(auto-fill, 80px);
+  grid-template-columns: repeat(3, minmax(300px, 1fr));
   justify-content: flex-start;
   align-items: center;
 }
 
-@media screen and (max-width: 600px) {
+@media screen and (max-width: 1100px) {
+  .feeds-container {
+    grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
+  }
+}
+@media screen and (max-width: 900px) {
   .feeds-container {
+    grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
     padding: 0;
-    justify-content: center;
   }
 }
-@media screen and (max-width: 300px) {
+@media screen and (max-width: 600px) {
   .feeds-container {
+    grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
     padding: 0;
     justify-content: center;
-    grid-template: none;
-    grid-template-columns: 1fr;
   }
 }
-@media screen and (max-width: 900px) {
+@media screen and (max-width: 300px) {
   .feeds-container {
     padding: 0;
+    justify-content: center;
+    grid-template-rows: repeat(auto-fill, 120px);
+    grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
   }
 }
 </style>
diff --git a/packages/ui/components/FeedCard.vue b/packages/ui/components/FeedCard.vue
index 0624a679..df3b4c2f 100644
--- a/packages/ui/components/FeedCard.vue
+++ b/packages/ui/components/FeedCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <nuxt-link :to="localeRoute(detailsPath)">
+  <nuxt-link v-if="detailsPath.params.id" :to="localeRoute(detailsPath)">
     <div class="card-container" :class="dataFeedStatusKey">
       <div class="title">
         <SvgIcon class="img" :name="img.name" />
@@ -55,8 +55,8 @@ export default {
       type: String,
       required: true,
     },
-    heartbeat: {
-      type: String,
+    timeToUpdate: {
+      type: Number,
       required: true,
     },
     network: {
@@ -73,13 +73,15 @@ export default {
       return formatNumber(parseFloat(this.value) / 10 ** this.decimals)
     },
     statusColor() {
-      return getDataFeedStatus(this.heartbeat, this.lastResultTimestamp).color
+      return getDataFeedStatus(this.timeToUpdate, this.lastResultTimestamp)
+        .color
     },
     dataFeedStatusKey() {
-      return getDataFeedStatus(this.heartbeat, this.lastResultTimestamp).key
+      return getDataFeedStatus(this.timeToUpdate, this.lastResultTimestamp).key
     },
     dataFeedStatusLabel() {
-      return getDataFeedStatus(this.heartbeat, this.lastResultTimestamp).label
+      return getDataFeedStatus(this.timeToUpdate, this.lastResultTimestamp)
+        .label
     },
   },
   methods: {
@@ -101,7 +103,7 @@ a {
   color: var(--value-color);
 }
 .card-container {
-  width: 300px;
+  width: 100%;
   height: max-content;
   background: var(--card-background);
   box-shadow: var(--card-box-shadow);
diff --git a/packages/ui/components/Main.vue b/packages/ui/components/Main.vue
index 11ec18c5..c6351492 100644
--- a/packages/ui/components/Main.vue
+++ b/packages/ui/components/Main.vue
@@ -75,7 +75,6 @@ export default {
       return result.join(', ').replace(/, ([^,]*)$/, ' and $1')
     },
   },
-  mounted() {},
   methods: {
     updateOptions(index) {
       this.$store.commit('deleteEmptyNetwork', { index })
@@ -140,11 +139,19 @@ export default {
     justify-self: center;
   }
 }
+@media screen and (max-width: 1100px) {
+  .list-container {
+    margin-right: 16px;
+  }
+}
 
 @media (max-width: 850px) {
+  .list-container {
+    margin-right: 0;
+  }
   .main {
     grid-template-columns: 1fr;
-    padding: 0 16px;
+    padding: 0 24px;
   }
   .section-header {
     padding: 0 32px 32px 32px;
@@ -158,9 +165,15 @@ export default {
     padding: 0 16px 16px 16px;
   }
   .list-container {
+    margin-right: 0;
     .pagination {
       margin-bottom: 48px;
     }
   }
 }
+@media screen and (max-width: 300px) {
+  .main {
+    padding: 0 16px;
+  }
+}
 </style>
diff --git a/packages/ui/components/NavBar.vue b/packages/ui/components/NavBar.vue
index 57790099..3bad551b 100644
--- a/packages/ui/components/NavBar.vue
+++ b/packages/ui/components/NavBar.vue
@@ -1,21 +1,23 @@
 <template>
   <div :class="{ drop: isMenuVisible }">
     <nav class="navbar" :class="{ open: isMenuVisible }">
-      <nuxt-link :to="localePath('/')">
-        <h1 class="logo-container">
-          <WitnetLogo class="witnet-logo" />
-          <p class="logo-subtitle">Witnet</p>
-          <p class="logo-subtitle">Data Feeds</p>
-        </h1>
-      </nuxt-link>
-      <label class="responsive-menu" @click="toggleMenu">
-        <a class="target-burger" :class="{ visible: isMenuVisible }">
-          <ul class="buns">
-            <li class="bun"></li>
-            <li class="bun"></li>
-          </ul>
-        </a>
-      </label>
+      <div class="menu-container">
+        <nuxt-link :to="localePath('/')">
+          <h1 class="logo-container">
+            <WitnetLogo class="witnet-logo" />
+            <p class="logo-subtitle">Witnet</p>
+            <p class="logo-subtitle">Data Feeds</p>
+          </h1>
+        </nuxt-link>
+        <label class="responsive-menu" @click="toggleMenu">
+          <a class="target-burger" :class="{ visible: isMenuVisible }">
+            <ul class="buns">
+              <li class="bun"></li>
+              <li class="bun"></li>
+            </ul>
+          </a>
+        </label>
+      </div>
       <transition name="dropdown" class="dropdown">
         <ul class="tab-container" :class="{ visible: isMenuVisible }">
           <div
@@ -36,8 +38,8 @@
               {{ capitalizeFirstLetter(optionFromSelected(option)) }}
             </div>
           </div>
-          <li class="tab" @click="closeMenu">
-            <a :href="requestDataFeedUrl" target="_blank">
+          <li class="tab last-item" @click="closeMenu">
+            <a class="btn-container" :href="requestDataFeedUrl" target="_blank">
               <Button class="btn">{{ $t('navbar.request_data_feed') }}</Button>
             </a>
           </li>
@@ -133,12 +135,11 @@ export default {
     grid-template-columns: max-content max-content;
     grid-template-rows: 1fr 1fr;
     align-items: center;
-    padding: 16px 16px 16px 0;
+    padding-top: 16px;
     text-decoration: none;
     column-gap: 8px;
 
     .witnet-logo {
-      width: 90px;
       grid-row: 1 / span 2;
     }
     .logo-subtitle-color {
@@ -160,13 +161,14 @@ export default {
     list-style: none;
     display: flex;
     align-items: center;
+    justify-content: center;
+    padding: 24px 0;
     .networks {
       display: none;
       &.visible {
         background: var(--bg);
         display: block;
-        padding: 0;
-        margin-top: 24px;
+        padding: 32px 0;
       }
     }
     &.visible {
@@ -181,8 +183,15 @@ export default {
       align-items: center;
       text-decoration: none;
       transition: color 0.1s ease;
+      &.last-item {
+        display: flex;
+        justify-content: center;
+      }
+      .btn-container {
+        width: max-content;
+      }
       .btn {
-        max-width: max-content;
+        max-width: 100%;
         margin: 16px 0;
         margin: 0;
       }
@@ -195,7 +204,6 @@ export default {
       }
       &:last-child {
         padding-right: 0;
-        padding-top: 24px;
       }
     }
     .option {
@@ -216,12 +224,8 @@ export default {
 
 @media screen and (max-width: 1100px) {
   .navbar {
-    margin: 0;
     height: max-content;
-    margin-right: 16px;
-    .logo-container {
-      margin: 0 16px;
-    }
+    margin: 0 16px;
     &.open {
       height: 100vh;
     }
@@ -246,17 +250,16 @@ export default {
 
   .navbar {
     display: block;
-    padding: 0;
-    .logo-container {
-      margin: 0 16px;
+    margin: 0;
+    .menu-container {
+      display: flex;
+      justify-content: space-between;
+      padding: 0 16px;
     }
     .responsive-menu {
       display: block;
       cursor: pointer;
-      position: absolute;
-      top: 8px;
       width: 32px;
-      right: 24px;
     }
     .tab-container {
       list-style: none;
diff --git a/packages/ui/components/SvgIcon.vue b/packages/ui/components/SvgIcon.vue
index 7e2a1de9..e5d8b1b3 100644
--- a/packages/ui/components/SvgIcon.vue
+++ b/packages/ui/components/SvgIcon.vue
@@ -13,7 +13,7 @@ export default {
 </script>
 
 <style lang="scss">
-.size {
+.icon-size {
   width: 24px;
   height: 30px;
 }
diff --git a/packages/ui/components/WitnetLogo.vue b/packages/ui/components/WitnetLogo.vue
index ac598680..87de2364 100644
--- a/packages/ui/components/WitnetLogo.vue
+++ b/packages/ui/components/WitnetLogo.vue
@@ -34,4 +34,9 @@
     fill: $white;
   }
 }
+.dark {
+  .main {
+    fill: var(--bg);
+  }
+}
 </style>
diff --git a/packages/ui/components/chart/Chart.vue b/packages/ui/components/chart/Chart.vue
index a777bfb8..0ec4168f 100644
--- a/packages/ui/components/chart/Chart.vue
+++ b/packages/ui/components/chart/Chart.vue
@@ -4,7 +4,7 @@
       :name="name"
       :last-result-value="lastResultValue"
       :last-result-timestamp="lastResultTimestamp"
-      :heartbeat="heartbeat"
+      :time-to-update="timeToUpdate"
     />
     <div class="switcher">
       <div
@@ -53,8 +53,8 @@ export default {
       type: String,
       required: true,
     },
-    heartbeat: {
-      type: String,
+    timeToUpdate: {
+      type: Number,
       required: true,
     },
     decimals: {
diff --git a/packages/ui/components/ChartMovingTooltip.vue b/packages/ui/components/chart/ChartMovingTooltip.vue
similarity index 94%
rename from packages/ui/components/ChartMovingTooltip.vue
rename to packages/ui/components/chart/ChartMovingTooltip.vue
index bb972994..cc58b86a 100644
--- a/packages/ui/components/ChartMovingTooltip.vue
+++ b/packages/ui/components/chart/ChartMovingTooltip.vue
@@ -43,7 +43,6 @@ export default {
 
 <style scoped lang="scss">
 .tooltip {
-  font-family: Almarai, sans-serif;
   position: relative;
   font-weight: bold;
   margin-top: -60px;
@@ -54,7 +53,6 @@ export default {
   color: var(--text);
   z-index: 1000;
   .value {
-    font-family: Almarai, sans-serif;
     font-size: var(--text-size);
   }
   .time {
diff --git a/packages/ui/components/chart/ChartTooltip.vue b/packages/ui/components/chart/ChartTooltip.vue
index 672dcd39..dfcc9fad 100644
--- a/packages/ui/components/chart/ChartTooltip.vue
+++ b/packages/ui/components/chart/ChartTooltip.vue
@@ -15,7 +15,7 @@
       <p class="value-title">{{ $t('chart.status') }}</p>
       <DataFeedStatus
         :last-result-timestamp="lastResultTimestamp"
-        :heartbeat="heartbeat"
+        :time-to-update="timeToUpdate"
       />
     </div>
     <InnerLink class="link" hash="integrate">
@@ -45,7 +45,7 @@ export default {
       type: String,
       default: '',
     },
-    heartbeat: {
+    timeToUpdate: {
       type: Number,
       required: true,
     },
@@ -88,7 +88,6 @@ export default {
   align-self: start;
 }
 .tooltip {
-  font-family: Almarai, sans-serif;
   font-weight: bold;
   font-size: var(--text-size-title);
   background-color: var(--bg);
@@ -119,7 +118,6 @@ export default {
     font-size: var(--text-size-small);
   }
   .value {
-    font-family: Almarai, sans-serif;
     font-size: var(--text-size);
     margin-bottom: 8px;
     .time {
@@ -129,6 +127,11 @@ export default {
   }
 }
 @media screen and (max-width: 1100px) {
+  .tooltip-container {
+    padding: 0 24px;
+  }
+}
+@media screen and (max-width: 300px) {
   .tooltip-container {
     padding: 0 16px;
   }
diff --git a/packages/ui/components/chart/Heartbeat.vue b/packages/ui/components/chart/Heartbeat.vue
index 83ffcd6d..13f8dee7 100644
--- a/packages/ui/components/chart/Heartbeat.vue
+++ b/packages/ui/components/chart/Heartbeat.vue
@@ -14,7 +14,7 @@ const DAY_IN_MILLISECONDS = 86400000
 export default {
   props: {
     milliseconds: {
-      type: String,
+      type: Number,
       required: true,
     },
     lastResultTimestamp: {
@@ -34,9 +34,7 @@ export default {
     },
     countdown() {
       // Last result timestamp to milliseconds plus heartbeat
-      return (
-        Number(`${this.lastResultTimestamp}000`) + Number(this.milliseconds)
-      )
+      return Number(`${this.lastResultTimestamp}000`) + this.milliseconds
     },
     hours() {
       const hours = Math.floor(
diff --git a/packages/ui/pages/feeds/_id/index.vue b/packages/ui/pages/feeds/_id/index.vue
index 6d607004..0bb0229f 100644
--- a/packages/ui/pages/feeds/_id/index.vue
+++ b/packages/ui/pages/feeds/_id/index.vue
@@ -1,4 +1,3 @@
-<script>
-import Index from '~/pages/_lang/feeds/_id/index.vue'
-export default Index
-</script>
+<template>
+  <DataFeedDetails />
+</template>
diff --git a/packages/ui/pages/index.vue b/packages/ui/pages/index.vue
index 4599bdfc..bbb04789 100644
--- a/packages/ui/pages/index.vue
+++ b/packages/ui/pages/index.vue
@@ -1,4 +1,3 @@
-<script>
-import Index from '~/pages/_lang/index.vue'
-export default Index
-</script>
+<template>
+  <Main />
+</template>
diff --git a/packages/ui/tests/utils/generateSelectOptions.spec.js b/packages/ui/tests/utils/generateSelectOptions.spec.js
index 8726a5e4..37f79d2b 100644
--- a/packages/ui/tests/utils/generateSelectOptions.spec.js
+++ b/packages/ui/tests/utils/generateSelectOptions.spec.js
@@ -11,12 +11,28 @@ describe('generateSelectOptions.js', () => {
 
     const options = generateSelectOptions(networks)
 
-    expect(options).toStrictEqual([
-      { label: 'ethereum-rinkeby', key: 'Ethereum Rinkeby' },
-      { label: 'ethereum-goerli', key: 'Ethereum Goerli' },
-      { label: 'conflux-testnet', key: 'Conflux Testnet' },
-      { label: 'boba-rinkeby', key: 'Boba Rinkeby' },
-    ])
+    expect(options).toStrictEqual({
+      boba: [{ key: 'Boba Rinkeby', label: 'boba-rinkeby', network: 'Boba' }],
+      conflux: [
+        {
+          key: 'Conflux Testnet',
+          label: 'conflux-testnet',
+          network: 'Conflux',
+        },
+      ],
+      ethereum: [
+        {
+          key: 'Ethereum Rinkeby',
+          label: 'ethereum-rinkeby',
+          network: 'Ethereum',
+        },
+        {
+          key: 'Ethereum Goerli',
+          label: 'ethereum-goerli',
+          network: 'Ethereum',
+        },
+      ],
+    })
   })
 
   it('should generate an empty list if the arguments are empty', () => {
@@ -24,7 +40,7 @@ describe('generateSelectOptions.js', () => {
 
     const options = generateSelectOptions(networks)
 
-    expect(options).toStrictEqual([])
+    expect(options).toStrictEqual({})
   })
 
   it('should generate empty list if no argument is provided', () => {
@@ -32,6 +48,6 @@ describe('generateSelectOptions.js', () => {
 
     const options = generateSelectOptions(networks)
 
-    expect(options).toStrictEqual([])
+    expect(options).toStrictEqual({})
   })
 })
diff --git a/packages/ui/utils/calculateTimeAgo.js b/packages/ui/utils/calculateTimeAgo.js
index e0b4faf8..c5d7cb71 100644
--- a/packages/ui/utils/calculateTimeAgo.js
+++ b/packages/ui/utils/calculateTimeAgo.js
@@ -1,6 +1,6 @@
 /// calculate the time passed from a given date
 import { es, enGB } from 'date-fns/locale'
-import { formatDistanceToNow } from 'date-fns'
+import { formatDistanceToNowStrict } from 'date-fns'
 
 export const LANGUAGES = {
   es: { name: 'Español', locale: 'es', fnsLocale: es },
@@ -11,7 +11,7 @@ export function calculateTimeAgo(date, currentLocale) {
   const timestampLength = date.toString().length
   const d = timestampLength < 13 ? Number(date) + '000' : Number(date)
   const currentDate = new Date(Number(d))
-  const formatedTime = formatDistanceToNow(currentDate, {
+  const formatedTime = formatDistanceToNowStrict(currentDate, {
     addSuffix: true,
     locale: LANGUAGES[currentLocale].fnsLocale,
   })
diff --git a/packages/ui/utils/formatMilliseconds.js b/packages/ui/utils/formatMilliseconds.js
index 4a3f3875..5c957d12 100644
--- a/packages/ui/utils/formatMilliseconds.js
+++ b/packages/ui/utils/formatMilliseconds.js
@@ -2,7 +2,7 @@ import { intervalToDuration, formatDuration } from 'date-fns'
 
 export function formatMilliseconds(milliseconds) {
   return formatDuration(intervalToDuration({ start: 0, end: milliseconds }), {
-    format: ['hours', 'minutes'],
+    format: ['days', 'hours', 'minutes', 'seconds'],
     delimiter: ' and ',
   })
 }