diff --git a/src/assets/scss/components/_modal.scss b/src/assets/scss/components/_modal.scss
index 671ff886..7cb27a60 100644
--- a/src/assets/scss/components/_modal.scss
+++ b/src/assets/scss/components/_modal.scss
@@ -377,6 +377,15 @@
           .value {
             font-weight: 600;
           }
+
+          .price.secondary {
+            .price-label span {
+              font-size: 14px;
+            }
+            .price-value {
+              font-size: 12px;
+            }
+          }
         }
       }
       .old-value {
@@ -401,13 +410,13 @@
           padding: 6px 10px;
 
           .field-left {
-            font-size: 15px;
+            font-size: 16px;
             font-weight: 600;
             color: $text-color-primary;
           }
 
           .field-right {
-            font-size: 15px;
+            font-size: 16px;
             .value {
               font-weight: 700;
             }
diff --git a/src/components/Actions/Borrow.component.tsx b/src/components/Actions/Borrow.component.tsx
index 083ba390..21a41bf5 100644
--- a/src/components/Actions/Borrow.component.tsx
+++ b/src/components/Actions/Borrow.component.tsx
@@ -252,7 +252,7 @@ export const BorrowModal: FC<IProtocolActionModalProps> = ({
 
             <ActionAccordion
               fieldName="You Will Receive"
-              token={selectedTokenInfo.symbol}
+              pool={poolId}
               values={{
                 gasOnDestination: 'string',
                 fee: convertBigIntValueToNormal(
diff --git a/src/components/Actions/Repay.component.tsx b/src/components/Actions/Repay.component.tsx
index 150e876d..a8c0ce95 100644
--- a/src/components/Actions/Repay.component.tsx
+++ b/src/components/Actions/Repay.component.tsx
@@ -267,7 +267,7 @@ export const RepayModal: FC<IProtocolActionModalProps> = ({
 
             <ActionAccordion
               fieldName="You Will Pay"
-              token={selectedTokenInfo.symbol}
+              pool={poolId}
               values={{
                 gasOnDestination: 'string',
                 fee: convertBigIntValueToNormal(
diff --git a/src/components/Actions/Supply.component.tsx b/src/components/Actions/Supply.component.tsx
index d0c6d75b..386203e2 100644
--- a/src/components/Actions/Supply.component.tsx
+++ b/src/components/Actions/Supply.component.tsx
@@ -23,7 +23,6 @@ import {
   ActionAccordion,
   RewardInfo,
   Alert
-  // Alert
 } from '@/components'
 import {
   DEFAULT_WEI_DECIMAL,
@@ -96,8 +95,6 @@ export const SupplyModal: FC<IProtocolActionModalProps> = ({
     validationError
   } = useProtocolAction(poolId, chain, eProtocolAction.DEPOSIT)
 
-  console.log({ selectedTokenInfo })
-
   const healthFactor = useHealthFactor(
     poolId,
     eProtocolAction.DEPOSIT,
@@ -276,7 +273,7 @@ export const SupplyModal: FC<IProtocolActionModalProps> = ({
 
             <ActionAccordion
               fieldName="Your total deposit"
-              token={selectedTokenInfo.symbol}
+              pool={poolId}
               values={{
                 gasOnDestination: 'string',
                 fee: convertBigIntValueToNormal(
diff --git a/src/components/Actions/Withdraw.component.tsx b/src/components/Actions/Withdraw.component.tsx
index 20d46a90..eab9fd1f 100644
--- a/src/components/Actions/Withdraw.component.tsx
+++ b/src/components/Actions/Withdraw.component.tsx
@@ -237,7 +237,7 @@ export const WithdrawModal: FC<IProtocolActionModalProps> = ({
 
             <ActionAccordion
               fieldName="You Will Receive"
-              token={selectedTokenInfo.symbol}
+              pool={poolId}
               values={{
                 gasOnDestination: 'string',
                 fee: convertBigIntValueToNormal(
diff --git a/src/components/Drawer/TokenInfo.component.tsx b/src/components/Drawer/TokenInfo.component.tsx
index 20fe4701..dcbf7658 100644
--- a/src/components/Drawer/TokenInfo.component.tsx
+++ b/src/components/Drawer/TokenInfo.component.tsx
@@ -12,7 +12,7 @@ import { type IChain } from '@/@types'
 import { useNetwork } from 'wagmi'
 import { cedroClient } from '@/configs/chainConfig'
 import { usePoolDetails } from '@/hooks/usePoolDetails'
-import { DEFAULT_WEI_DECIMAL, TokenIconMapping, TooltipText } from '@/constants'
+import { DEFAULT_WEI_DECIMAL, getPoolIcon, TooltipText } from '@/constants'
 import { type IAPYTrendData } from '@/@types/pool.types'
 import { AboutTooltip } from '../AboutTooltip'
 import { ProtocolActionButton } from '../Actions/ActionButton.component'
@@ -63,7 +63,7 @@ export const TokenInfo: FC<TokenInfoProps> = ({ isOpen, onClose, data }) => {
             <div className="info">
               <div className="network">
                 <span>
-                  <Icon name={TokenIconMapping[data.pool]} height={44} width={44} />
+                  <Icon name={getPoolIcon(data.pool)} height={44} width={44} />
                 </span>
                 <span>{tokenConfig.symbol}</span>
               </div>
diff --git a/src/components/EnableToken/EnableToken.component.tsx b/src/components/EnableToken/EnableToken.component.tsx
index 381a94aa..cdff5be4 100644
--- a/src/components/EnableToken/EnableToken.component.tsx
+++ b/src/components/EnableToken/EnableToken.component.tsx
@@ -2,7 +2,7 @@
 import { type FC, useMemo, useCallback, useState } from 'react'
 import { Button, Modal, Icon } from '@/components'
 import type { tPoolIds, tSupportedChains, tSupportedTokens } from '@cedro-finance/sdk'
-import { TokenIconMapping } from '@/constants'
+import { getPoolIcon } from '@/constants'
 import { toast } from 'react-toastify'
 import { cedroClient } from '@/configs/chainConfig'
 
@@ -50,7 +50,7 @@ export const EnableToken: FC<EnableTokenProps> = ({ poolId, onApprove, selectedC
           </div>
           <div className="modal-body">
             <div className="enable-token-content">
-              <Icon name={TokenIconMapping[selectedToken]} width={80} height={80}/>
+              <Icon name={getPoolIcon(poolId)} width={80} height={80}/>
 
               <div className="modal-subtitle">
                 To Supply {token} to Cedro Protocol as
diff --git a/src/components/LiquidityTooltip/LiquidityTooltip.component.tsx b/src/components/LiquidityTooltip/LiquidityTooltip.component.tsx
index c560d86c..b8c18d00 100644
--- a/src/components/LiquidityTooltip/LiquidityTooltip.component.tsx
+++ b/src/components/LiquidityTooltip/LiquidityTooltip.component.tsx
@@ -2,7 +2,7 @@ import type { tSupportedChains } from '@cedro-finance/sdk'
 import { type FC } from 'react'
 import { Tooltip } from 'react-tooltip'
 import { Icon } from '../icon'
-import { ChainIconMapping, getChainConfig } from '@/constants'
+import { getChainConfig, getChainIcon } from '@/constants'
 import { NETWORK_TYPE } from '@/configs/env'
 
 interface ILiquidityTooltipProps {
@@ -35,7 +35,7 @@ export const LiquidityTooltip: FC<ILiquidityTooltipProps> = ({ id }) => {
                 <div className="liquidity-tooltip-item field-row" key={chain}>
                   <div className="field-left">
                     <Icon
-                      name={ChainIconMapping[chain as tSupportedChains]}
+                      name={getChainIcon(chain as tSupportedChains)}
                       height={24}
                       width={24}
                     />
diff --git a/src/components/Navbar/AvailableTokens.component.tsx b/src/components/Navbar/AvailableTokens.component.tsx
index e70e5587..717d7522 100644
--- a/src/components/Navbar/AvailableTokens.component.tsx
+++ b/src/components/Navbar/AvailableTokens.component.tsx
@@ -1,4 +1,4 @@
-import { TokenIconMapping } from '@/constants'
+import { getPoolIcon } from '@/constants'
 import { truncateString, toFixedCutZero, toFixedNumber } from '@/utils'
 import { getIconName } from '@/utils/misc'
 import { Dropdown } from '../Dropdown'
@@ -22,7 +22,7 @@ export const AvailableTokens: FC = () => {
     <Dropdown.Toggler id="tokenDropDown">
       <button className={'dropdown-toggler-btn'}>
         <Icon name={getIconName(connector?.name ?? '')} height={25} width={25} />
-        {truncateString(address as string, 3, 4)}
+        {truncateString(address as string, 4, 3)}
         <Icon name="arrowDown" stroke="black" />
       </button>
     </Dropdown.Toggler>
@@ -39,7 +39,7 @@ export const AvailableTokens: FC = () => {
                   <div className='token'>
                     <div className="token-name">
                       <div>
-                        <Icon name={TokenIconMapping[token.poolId]} height={30} width={30} />
+                        <Icon name={getPoolIcon(token.poolId)} height={30} width={30} />
                       </div>
                       <div>
                         <div className='token-symbol'>{tokenSymbol}</div>
diff --git a/src/components/Navbar/NavbarSharedCompoent.tsx b/src/components/Navbar/NavbarSharedCompoent.tsx
index 2d4a0d2c..067c9840 100644
--- a/src/components/Navbar/NavbarSharedCompoent.tsx
+++ b/src/components/Navbar/NavbarSharedCompoent.tsx
@@ -4,7 +4,7 @@ import { toFixedCutZero } from '@/utils'
 import { useAvailableBalance } from '@/hooks/useAvailableBalance'
 import { Dropdown } from '@/components/Dropdown'
 import { Icon, type TIcons } from '@/components/icon'
-import { ChainIconMapping, TokenIconMapping } from '@/constants'
+import { getChainIcon } from '@/constants'
 import { WalletConnect } from '@/components/wallet'
 import { Button } from '../Button'
 import { useChainContext } from '@/context/chain.context'
@@ -31,9 +31,7 @@ export const SwitchNetworkDropdown: FC = () => {
 
   const iconName = useMemo<TIcons>(() => {
     return (
-      ChainIconMapping[(connectedChain as ConnectedChain)?.chain ?? 'eth'] ||
-      TokenIconMapping.unknown
-    )
+      getChainIcon((connectedChain as ConnectedChain)?.chain ?? 'eth'))
   }, [connectedChain?.id])
 
   return (
@@ -59,7 +57,7 @@ export const SwitchNetworkDropdown: FC = () => {
                 }}
               >
                 <Icon
-                  name={ChainIconMapping[chain]}
+                  name={getChainIcon(chain)}
                   height={30}
                   width={30}
                 />
diff --git a/src/components/Price/Price.component.tsx b/src/components/Price/Price.component.tsx
index 5e2e9efb..3cccd06b 100644
--- a/src/components/Price/Price.component.tsx
+++ b/src/components/Price/Price.component.tsx
@@ -36,9 +36,10 @@ export interface IValueWithPriceProps {
   displayUnit?: boolean
   variant?: 'primary' | 'secondary'
   unit?: string
+  prefix?: string
 }
 
-export const ValueWithPrice: FC<IValueWithPriceProps> = ({ pool, value, displayUnit = false, unit, variant = 'primary' }) => {
+export const ValueWithPrice: FC<IValueWithPriceProps> = ({ pool, value, displayUnit = false, unit, variant = 'primary', prefix = '' }) => {
   const { oraclePrices } = useAppSelector(state => state.pool)
 
   const poolPrice = useMemo(() => {
@@ -58,7 +59,7 @@ export const ValueWithPrice: FC<IValueWithPriceProps> = ({ pool, value, displayU
       <div>
         {/* TODO should the precision be 4 for tokens?  */}
         <div className="price-label" style={{ fontWeight: 600 }}>
-          <span className="number">{toFixedNumber(value, 4, true)}</span>{' '}
+          <span className="number">{prefix} {toFixedNumber(value, 4, true)}</span>
           <span className="unit">{displayUnit ? unit ?? getTokenSymbol(pool) : ''}</span>
         </div>
         <div className="price-value">${toFixedCutZero(dollarEquivalent, 2, true)}</div>
diff --git a/src/components/modal/LiquidationList.component.tsx b/src/components/modal/LiquidationList.component.tsx
index 9a67b4fe..78fd3035 100644
--- a/src/components/modal/LiquidationList.component.tsx
+++ b/src/components/modal/LiquidationList.component.tsx
@@ -5,7 +5,7 @@ import { type ColumnDef } from '@tanstack/react-table'
 import { type Address, type ILiquidationData } from '@cedro-finance/sdk'
 import { cedroClient } from '@/configs/chainConfig'
 import { useAccount } from 'wagmi'
-import { DEFAULT_WEI_DECIMAL, TokenIconMapping, ZERO_ADDRESS } from '@/constants'
+import { DEFAULT_WEI_DECIMAL, getPoolIcon, ZERO_ADDRESS } from '@/constants'
 import { convertBigIntValueToNormal } from '@/utils'
 
 interface LiquidationListProps {
@@ -44,7 +44,7 @@ const liquidationListColumnDefinition: Array<ColumnDef<unknown>> = [
     header: 'Asset',
     cell: (props) => {
       const pool = (props.row.original as ILiquidationData).collateralId
-      return <Icon name={TokenIconMapping[pool]} height={25}/>
+      return <Icon name={getPoolIcon(pool)} height={25}/>
     },
     meta: {
       getCellContext () {
@@ -84,7 +84,7 @@ const liquidationListColumnDefinition: Array<ColumnDef<unknown>> = [
     header: 'Asset',
     cell: (props) => {
       const pool = (props.row.original as ILiquidationData).debtId
-      return <Icon name={TokenIconMapping[pool]} height={25}/>
+      return <Icon name={getPoolIcon(pool)} height={25}/>
     },
     meta: {
       getCellContext: () => {
diff --git a/src/components/modal/SwitchNetwork.component.tsx b/src/components/modal/SwitchNetwork.component.tsx
index 8fd4f7d9..0a4105c3 100644
--- a/src/components/modal/SwitchNetwork.component.tsx
+++ b/src/components/modal/SwitchNetwork.component.tsx
@@ -3,7 +3,7 @@ import { type FC } from 'react'
 import { Button, Modal, Icon } from '@/components'
 import { type IChainConfig } from '@/@types'
 import { useNetwork } from 'wagmi'
-import { NETWORK_SWITCH_TYPE, NetworkIconMapping } from '@/constants'
+import { getNetworkIcon, NETWORK_SWITCH_TYPE } from '@/constants'
 
 interface SwitchNetworkProps {
   isVisible: boolean
@@ -70,7 +70,7 @@ export const SwitchNetwork: FC<SwitchNetworkProps> = ({ switchType, isVisible, t
             <div className="switch-network-content">
               {switchType !== NETWORK_SWITCH_TYPE.UNSUPPORTED
                 ? <> <div className="switch-network-item">
-                <Icon name={NetworkIconMapping[currentNetwork?.id]} width={65} height={65}/>
+                <Icon name={getNetworkIcon(currentNetwork?.id)} width={65} height={65}/>
                 <div className="switch-network-item__name">
                   {currentNetwork?.name}
                 </div>
@@ -82,7 +82,7 @@ export const SwitchNetwork: FC<SwitchNetworkProps> = ({ switchType, isVisible, t
                 : null}
 
               <div className="switch-network-item">
-                <Icon name={NetworkIconMapping[switchToNetwork?.chainId]} width={65} height={65}/>
+                <Icon name={getNetworkIcon(switchToNetwork?.chainId)} width={65} height={65}/>
                 <div className="switch-network-item__name">
                   {switchToNetwork?.name}
                   </div>
diff --git a/src/components/modal/TestTokens.component.tsx b/src/components/modal/TestTokens.component.tsx
index e679c8f0..a8e94515 100644
--- a/src/components/modal/TestTokens.component.tsx
+++ b/src/components/modal/TestTokens.component.tsx
@@ -9,12 +9,13 @@ import { useChainContext } from '@/context/chain.context'
 import { useAccount } from 'wagmi'
 import { erc20MockAbi } from '@/abis'
 import { Faucet, getTokenSymbol } from '@/constants'
-import { TokenIconMapping } from '@/constants/icons'
+import { getPoolIcon } from '@/constants/icons'
 import { type IChainConfig } from '@/@types'
 import { Tooltip } from 'react-tooltip'
 import { truncateString } from '@/utils'
 import { toast } from 'react-toastify'
 import { cedroClient } from '@/configs/chainConfig'
+import { type tPoolIds } from '@cedro-finance/sdk'
 
 interface IToken {
   symbol: string
@@ -111,7 +112,7 @@ export const TestTokens: FC<TestTokensProps> = ({
                 <div className="left">
                   {/* // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment */}
                   <Icon
-                    name={TokenIconMapping[tokenData.symbol]}
+                    name={getPoolIcon(tokenData.symbol as tPoolIds)} // TODO fix this assertion
                     height={30}
                     width={30}
                   />
diff --git a/src/components/shared/ChainlistCheckbox/ChainlistCheckbox.component.tsx b/src/components/shared/ChainlistCheckbox/ChainlistCheckbox.component.tsx
index b3c7b9db..32c40762 100644
--- a/src/components/shared/ChainlistCheckbox/ChainlistCheckbox.component.tsx
+++ b/src/components/shared/ChainlistCheckbox/ChainlistCheckbox.component.tsx
@@ -3,7 +3,7 @@ import { Dropdown } from '@/components/Dropdown'
 import { Icon } from '@/components/icon'
 import { Button } from '@/components/Button'
 import { type tSupportedChains } from '@cedro-finance/sdk'
-import { ChainIconMapping } from '@/constants'
+import { getChainIcon } from '@/constants'
 import { cedroClient } from '@/configs/chainConfig'
 
 interface IChainlistCheckboxProps {
@@ -85,7 +85,7 @@ export const ChainListCheckbox: FC<IChainlistCheckboxProps> = ({ checkedChainLis
                 readOnly
                 id={chainInfo.symbol}
               />
-              <Icon name={ChainIconMapping[chain]} height={30} width={30} />
+              <Icon name={getChainIcon(chain)} height={30} width={30} />
               <span className="item-txt">{chainInfo.name}</span>
             </button>
           </Dropdown.Item>
diff --git a/src/components/shared/actions/ActionAccordion.component.tsx b/src/components/shared/actions/ActionAccordion.component.tsx
index 24577aac..faf27498 100644
--- a/src/components/shared/actions/ActionAccordion.component.tsx
+++ b/src/components/shared/actions/ActionAccordion.component.tsx
@@ -1,9 +1,13 @@
 import React, { type FC } from 'react'
 import { Accordion } from './Accordion.component'
+import { ValueWithPrice } from '@/components/Price'
+import { type tPoolIds } from '@cedro-finance/sdk'
+import { AboutTooltip } from '@/components/AboutTooltip'
+import { TooltipText } from '@/constants'
 
 interface ActionAccordionProps {
   fieldName: string
-  token: string
+  pool: tPoolIds
   values: {
     gasOnDestination: string
     fee: string
@@ -13,7 +17,7 @@ interface ActionAccordionProps {
   }
   children: React.ReactNode
 }
-export const ActionAccordion: FC<ActionAccordionProps> = ({ fieldName, token, children, values }) => {
+export const ActionAccordion: FC<ActionAccordionProps> = ({ fieldName, pool, children, values }) => {
   // const [airdropAmount, setAirdropAmount] = useState<number>()
   // const handleAirdropAmountChange = (e: ChangeEvent<HTMLInputElement>): void => {
   //   setAirdropAmount(Number(e.target.value))
@@ -30,9 +34,19 @@ export const ActionAccordion: FC<ActionAccordionProps> = ({ fieldName, token, ch
   const accordionContent = (
     <>
       <div className="borrow-limit field-row">
-        <div className="field-left">Rebalancing Reward</div>
+        <div className="field-left about-tooltip-parent">
+          Rebalancing Reward
+          <AboutTooltip id="rebalancing-reward" message={TooltipText.rebalancingReward} />
+        </div>
         <div className="field-right">
-          + {values.reward} {token}
+          {/* TODO add loading to value with price */}
+          <ValueWithPrice
+            pool={pool}
+            value={values.reward}
+            variant='secondary'
+            displayUnit={true}
+            prefix='+'
+          />
         </div>
       </div>
       {/* <div className="borrow-limit field-row">
@@ -53,25 +67,52 @@ export const ActionAccordion: FC<ActionAccordionProps> = ({ fieldName, token, ch
         </div>
       </div> */}
       <div className="borrow-limit field-row">
-        <div className="field-left">Rebalancing Fee</div>
+        <div className="field-left about-tooltip-parent">
+          Rebalancing Fee
+          <AboutTooltip id="rebalancing-fee" message={TooltipText.rebalancingFee} />
+        </div>
         <div className="field-right">
-          - {values.fee} {token}
+          <ValueWithPrice
+            pool={pool}
+            value={values.fee}
+            variant='secondary'
+            displayUnit={true}
+            prefix='-'
+          />
         </div>
       </div>
 
       {values.gasFee && (
       <div className="borrow-limit field-row">
-        <div className="field-left">Transaction Fee</div>
+        <div className="field-left about-tooltip-parent">
+          Gas Fee
+          <AboutTooltip id="gas-fee" message={TooltipText.gasFee} />
+        </div>
         <div className="field-right">
-          - {values.gasFee} {token}
+          <ValueWithPrice
+            pool={pool}
+            value={values.gasFee}
+            variant='secondary'
+            displayUnit={true}
+            prefix='-'
+          />
         </div>
       </div>)}
 
       {values.layerzero && (
       <div className="borrow-limit field-row">
-        <div className="field-left">LayerZero Fee</div>
+        <div className="field-left about-tooltip-parent">
+          LayerZero Fee
+          <AboutTooltip id="layerzero-fee" message={TooltipText.rebalancingFee} />
+        </div>
         <div className="field-right">
-          - {values.layerzero} {token}
+          <ValueWithPrice
+            pool={pool}
+            value={values.layerzero}
+            variant='secondary'
+            displayUnit={true}
+            prefix='-'
+          />
         </div>
       </div>)}
     </>
diff --git a/src/components/shared/actions/AmountInput.component.tsx b/src/components/shared/actions/AmountInput.component.tsx
index b1efa31c..72fa4e7b 100644
--- a/src/components/shared/actions/AmountInput.component.tsx
+++ b/src/components/shared/actions/AmountInput.component.tsx
@@ -69,8 +69,6 @@ export const AmountInput: FC<AmountInputProps> = ({ inputType, switchInputType,
     newNativeBalance = bigIntMin(newNativeBalance, maxNativeAmount)
     newDollarBalance = bigIntMin(newDollarBalance, maxDollarAmount)
 
-    console.log({ newNativeBalance, newDollarBalance })
-
     setInputValues(prev => ({ ...prev, native: formatUnits(newNativeBalance, 18), usdc: formatUnits(newDollarBalance, 18) }))
   }
 
diff --git a/src/components/shared/actions/DestinationChain.component.tsx b/src/components/shared/actions/DestinationChain.component.tsx
index d4454e41..e8c47eb6 100644
--- a/src/components/shared/actions/DestinationChain.component.tsx
+++ b/src/components/shared/actions/DestinationChain.component.tsx
@@ -6,7 +6,7 @@ import {
   type tPoolIds,
   type tSupportedChains
 } from '@cedro-finance/sdk'
-import { ChainIconMapping, DEFAULT_WEI_DECIMAL } from '@/constants'
+import { DEFAULT_WEI_DECIMAL, getChainIcon } from '@/constants'
 import { usePoolDetails } from '@/hooks/usePoolDetails'
 import { convertBigIntValueToNormal, weiMultiply } from '@/utils'
 import { cedroClient } from '@/configs/chainConfig'
@@ -49,7 +49,7 @@ export const DestinationChain: FC<DestinationChainProps> = ({
                 <Dropdown.Toggler id="chainDropdown">
                   <button className={'dropdown-toggler-btn'}>
                     <Icon
-                      name={ChainIconMapping[selectedChain]}
+                      name={getChainIcon(selectedChain)}
                       height={24}
                       width={24}
                     />
@@ -83,7 +83,7 @@ export const DestinationChain: FC<DestinationChainProps> = ({
                               }}
                             >
                               <Icon
-                                name={ChainIconMapping[chain as tSupportedChains]}
+                                name={getChainIcon(chain as tSupportedChains)}
                                 height={24}
                                 width={24}
                               />
@@ -120,7 +120,7 @@ export const DestinationChain: FC<DestinationChainProps> = ({
             <div className="single-chain">
               <div className='selected-chain'>
                 <Icon
-                  name={ChainIconMapping[selectedChain]}
+                  name={getChainIcon(selectedChain)}
                   height={24}
                   width={24}
                   className="chain-img"
diff --git a/src/components/shared/actions/RewardInfo.component.tsx b/src/components/shared/actions/RewardInfo.component.tsx
index 20e7b8dc..bec37137 100644
--- a/src/components/shared/actions/RewardInfo.component.tsx
+++ b/src/components/shared/actions/RewardInfo.component.tsx
@@ -3,7 +3,7 @@ import { Icon } from '@/components'
 import type { tPoolIds, tSupportedChains } from '@cedro-finance/sdk'
 import { type FC } from 'react'
 import { Tooltip } from 'react-tooltip'
-import { ChainIconMapping, DEFAULT_WEI_DECIMAL } from '@/constants'
+import { DEFAULT_WEI_DECIMAL, getChainIcon } from '@/constants'
 import { convertBigIntValueToNormal, weiMultiply } from '@/utils'
 import { usePoolDetails } from '@/hooks/usePoolDetails'
 import { cedroClient } from '@/configs/chainConfig'
@@ -49,7 +49,7 @@ export const RewardInfo: FC<RewardInfoProps> = ({
                 <div className="field-row">
                   <div className="switch-chain-list-item field-left">
                     <Icon
-                      name={ChainIconMapping[chain as tSupportedChains]}
+                      name={getChainIcon(chain as tSupportedChains)}
                       height={24}
                       width={24}
                     />
diff --git a/src/constants/icons.ts b/src/constants/icons.ts
index 7e2aec1f..ca5b0ebf 100644
--- a/src/constants/icons.ts
+++ b/src/constants/icons.ts
@@ -38,16 +38,22 @@ export const TokenIconMapping: Record<string, TIcons> = {
 export const NetworkIconMapping: Record<number, TIcons> = {
   [eChainIds.AVALANCHE_MAIN]: 'network.avax',
   [eChainIds.AVALANCHE_TEST]: 'network.avax',
-  97: 'network.bsc',
-  5: 'network.ethereum',
-  4002: 'network.ftm',
-  80001: 'network.polygon',
-  421613: 'token.arbitrum',
-  3441005: 'token.manta',
-  1: 'network.ethereum',
-  [eChainIds.BSC_MAIN]: 'network.bsc',
   [eChainIds.ARBITRUM_MAIN]: 'token.arbitrum',
-  [cedroClient.Config.getChainId(eSupportedChains.OPTIMISM)]: 'network.optimism'
+  [eChainIds.ARBITRUM_TEST]: 'token.arbitrum',
+  [eChainIds.BSC_MAIN]: 'network.bsc',
+  [eChainIds.BSC_TEST]: 'network.bsc',
+  [eChainIds.ETH]: 'network.ethereum',
+  [eChainIds.GOERLI]: 'network.ethereum',
+  [eChainIds.FANTOM_MAIN]: 'network.ftm',
+  [eChainIds.FANOTOM_TEST]: 'network.ftm',
+  [eChainIds.MANTA_MAIN]: 'token.manta',
+  [eChainIds.MANTA_TEST]: 'token.manta',
+  [eChainIds.POLYGON]: 'network.polygon',
+  [eChainIds.MUMBAI]: 'network.polygon',
+  // [eChainIds.OPTIMISM_MAIN]: 'network.optimism',
+  [eChainIds.OPTIMISM_TEST]: 'network.optimism',
+  [eChainIds.ZKSYNC_MAIN]: 'network.zksync',
+  [eChainIds.ZKSYNC_TEST]: 'network.zksync'
 }
 
 export const ChainIconMapping: Record<tSupportedChains, TIcons> = {
diff --git a/src/constants/tableColumns.tsx b/src/constants/tableColumns.tsx
index 45269c44..ac7e43f2 100644
--- a/src/constants/tableColumns.tsx
+++ b/src/constants/tableColumns.tsx
@@ -19,14 +19,14 @@ import {
   getChainConfig,
   getChainIcon,
   getTokenSymbol,
-  TokenIconMapping,
   getChainNameFromChainId,
   getTokenSymbol as getTokenSymbolFromHex,
   TxTypeIconMapping,
   type TxType,
   type TxStatus,
   TxStatusIconMapping,
-  DEFAULT_WEI_DECIMAL
+  DEFAULT_WEI_DECIMAL,
+  getPoolIcon
 } from '@/constants'
 import { type ILiquidationHistoryData } from '@/graphql/hooks'
 import { type ILiquidableUsers } from '@/components/Liquidation/LiquidationTable'
@@ -45,7 +45,7 @@ export const borrowListColumns: Array<ColumnDef<IDashboardData>> = [
       return (
         <div className="asset">
           <Icon
-            name={TokenIconMapping[(props.row.original).pool]}
+            name={getPoolIcon((props.row.original).pool)}
             height={35}
             width={35}
             style={{ borderRadius: '50%' }}
@@ -162,7 +162,7 @@ export const supplyListColumns: Array<ColumnDef<IDashboardData>> = [
       return (
         <div className="asset">
           <Icon
-            name={TokenIconMapping[(props.row.original).pool]}
+            name={getPoolIcon((props.row.original).pool)}
             height={35}
             width={35}
             style={{ borderRadius: '50%' }}
@@ -302,7 +302,8 @@ export const HistoryTableColumns: Array<ColumnDef<unknown>> =
 
             return (
               <span className='datatable-assets'>
-              <Icon name={TokenIconMapping[iconName]} height={30} width={30} />
+              <Icon name={getPoolIcon(iconName as tPoolIds)} height={30} width={30} />
+              {iconName}
               {/* // @ts-expect-error Unsafe any value as index */}
               {/* {CHAINNAME_MAP[chainName]?.name || chainName} */}
             </span>)
diff --git a/src/constants/tooltip.ts b/src/constants/tooltip.ts
index 2e6c46cf..6d7d01be 100644
--- a/src/constants/tooltip.ts
+++ b/src/constants/tooltip.ts
@@ -5,5 +5,9 @@ export const TooltipText = {
   netApy: 'The APY you’re earning or paying across all of your supplies and borrows.',
   interestEarned: 'Total interest earned minus total interest payable.',
   transactionFee: 'Fee required to pay gas on source chain, messaging protocol, and destination chain.',
-  availableLiquidity: 'Total supplied liquidity minus total borrowed liquidity.'
+  availableLiquidity: 'Total supplied liquidity minus total borrowed liquidity.',
+  rebalancingReward: 'Rebalancing Reward', // TODO - Add tooltip text
+  rebalancingFee: 'Fee required to rebalance the pool.', // TODO - Add tooltip text
+  layerZeroFee: 'Fee required to pay gas on LayerZero', // TODO - Add tooltip text
+  gasFee: 'Fee required to pay gas on source chain' // TODO - Add tooltip text
 }
diff --git a/src/containers/market.tsx b/src/containers/market.tsx
index 204c41a3..0bddb454 100644
--- a/src/containers/market.tsx
+++ b/src/containers/market.tsx
@@ -20,9 +20,9 @@ import { useMemo, type FC, useState } from 'react'
 import { type ColumnDef } from '@tanstack/react-table'
 import {
   DEFAULT_WEI_DECIMAL,
-  TokenIconMapping,
   getChainConfig,
   getChainIcon,
+  getPoolIcon,
   getTokenSymbol
 } from '@/constants'
 import { ValueWithPrice } from '@/components/Price/Price.component'
@@ -54,7 +54,7 @@ export const MarketColumnDefinition: Array<ColumnDef<IDashboardData>> = [
       return (
         <div className="asset">
           <Icon
-            name={TokenIconMapping[(props.row.original).pool]}
+            name={getPoolIcon((props.row.original).pool)}
             height={40}
             width={40}
             style={{ borderRadius: '50%' }}
@@ -307,8 +307,6 @@ export const Market: FC = () => {
     return ((changedValue < 0.01) && (changedValue >= 0.00)) ? 'neutral' : (changedValue > 0 ? 'up' : 'down')
   }
 
-  console.log({ borrowChange, v: getChipRateDirection(-1.00) })
-
   return (
     <Layout>
       <div className="market">