diff --git a/components/ffAssetOverview/ffAssetOverview.js b/components/ffAssetOverview/ffAssetOverview.js
index a2fd276..3c1e861 100644
--- a/components/ffAssetOverview/ffAssetOverview.js
+++ b/components/ffAssetOverview/ffAssetOverview.js
@@ -40,7 +40,7 @@ export default function ffAssetOverview({ asset }) {
       <Grid container spacing={3} className={ classes.assetTitleContainer }>
         <Grid item lg={4} md={4} sm={12} xs={12}>
         <div className={ classes.assetTitle }>
-          <img className={ classes.assetIcon } src={ asset ? `https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${asset.address}/logo-128.png` : '/unknown-logo.png'} alt='' height='60px' width='60px' />
+          <img className={ classes.assetIcon } src={ asset ? `https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${asset.logoAddress || asset.address}/logo-128.png` : '/unknown-logo.png'} alt='' height='60px' width='60px' />
           <div>
             <Typography className={ classes.assetName }>{ asset ? asset.name : '' }</Typography>
             <Typography className={ classes.assetPrice }>${ formatCurrency(asset ? asset.price : 0) }</Typography>
diff --git a/components/ffAssets/ffAssetsTable.js b/components/ffAssets/ffAssetsTable.js
index eaae478..620472a 100644
--- a/components/ffAssets/ffAssetsTable.js
+++ b/components/ffAssets/ffAssetsTable.js
@@ -290,7 +290,7 @@ export default function EnhancedTable({ assets }) {
                     <div className={classes.inline}>
                       <img
                         className={classes.imgLogo}
-                        src={`https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${row.address}/logo-128.png`}
+                        src={`https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${row.logoAddress || row.address}/logo-128.png`}
                         width='35'
                         height='35'
                         alt=''
diff --git a/components/ffClaimAll/ffClaimAllTable.js b/components/ffClaimAll/ffClaimAllTable.js
index 0ddcc94..cc140c9 100644
--- a/components/ffClaimAll/ffClaimAllTable.js
+++ b/components/ffClaimAll/ffClaimAllTable.js
@@ -301,7 +301,7 @@ export default function EnhancedTable({ claimable, crv, ibEUR, rKP3R }) {
                       {
                         row?.type === 'Fixed Forex' && <img className={ classes.imgLogo } src={`/images/ff-icon.svg`} width='35' height='35' alt='' />}
                       {
-                        row?.type !== 'Fixed Forex' && <img className={ classes.imgLogo } src={`https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${row.address}/logo-128.png`} width='35' height='35' alt='' />
+                        row?.type !== 'Fixed Forex' && <img className={ classes.imgLogo } src={`https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${row.logoAddress || row.address}/logo-128.png`} width='35' height='35' alt='' />
                       }
                       <div>
                         <Typography variant="h2" className={classes.textSpaced}>
diff --git a/components/ffDashboardClaimAll/ffDashboardClaimAllTable.js b/components/ffDashboardClaimAll/ffDashboardClaimAllTable.js
index ce44edf..94f3dea 100644
--- a/components/ffDashboardClaimAll/ffDashboardClaimAllTable.js
+++ b/components/ffDashboardClaimAll/ffDashboardClaimAllTable.js
@@ -298,7 +298,7 @@ export default function EnhancedTable({ claimable, crv, ibEUR, rKP3R }) {
                               {
                               row?.type === 'Fixed Forex' && <img className={ classes.imgLogo } src={`/images/ff-icon.svg`} width='35' height='35' alt='' />}
                               {
-                              row?.type !== 'Fixed Forex' && <img className={ classes.imgLogo } src={`https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${row.address}/logo-128.png`} width='35' height='35' alt='' />
+                              row?.type !== 'Fixed Forex' && <img className={ classes.imgLogo } src={`https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${row.logoAddress || row.address}/logo-128.png`} width='35' height='35' alt='' />
                               }
                             </Grid>
 
diff --git a/components/ffGauges/ffGaugesTable.js b/components/ffGauges/ffGaugesTable.js
index ada0e92..b5764cb 100644
--- a/components/ffGauges/ffGaugesTable.js
+++ b/components/ffGauges/ffGaugesTable.js
@@ -294,7 +294,7 @@ export default function EnhancedTable({ gauges, setParentSliderValues, defaultVo
                 <TableRow key={row.gauge.address}>
                   <TableCell className={classes.cell}>
                     <div className={ classes.inline }>
-                      <img className={ classes.imgLogo } src={`https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${row.address}/logo-128.png`} width='35' height='35' alt='' />
+                      <img className={ classes.imgLogo } src={`https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${row.logoAddress || row.address}/logo-128.png`} width='35' height='35' alt='' />
                       <div>
                         <Typography variant="h2" className={classes.textSpaced}>
                           { row?.gauge?.coin0?.symbol } - { row?.gauge?.coin1?.symbol }
diff --git a/components/ffSwap/setup.js b/components/ffSwap/setup.js
index ec03c9e..91ae617 100644
--- a/components/ffSwap/setup.js
+++ b/components/ffSwap/setup.js
@@ -432,7 +432,7 @@ function AssetSelect({ type, value, assetOptions, onSelect }) {
             <img
               className={ classes.displayAssetIconSmall }
               alt=""
-              src={ (asset && asset.icon) ? asset.icon : `https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${asset?.address}/logo-128.png` }
+              src={ (asset && asset.icon) ? asset.icon : `https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${asset?.logoAddress || asset?.address}/logo-128.png` }
               height='60px'
               onError={(e)=>{e.target.onerror = null; e.target.src="/tokens/unknown-logo.png"}}
             />
@@ -458,7 +458,7 @@ function AssetSelect({ type, value, assetOptions, onSelect }) {
             <img
               className={ classes.displayAssetIcon }
               alt=""
-              src={ (value && value.icon) ? value.icon : `https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${value?.address}/logo-128.png` }
+              src={ (value && value.icon) ? value.icon : `https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${value?.logoAddress || value?.address}/logo-128.png` }
               height='100px'
               onError={(e)=>{e.target.onerror = null; e.target.src="/tokens/unknown-logo.png"}}
             />
diff --git a/stores/fixedForexStore.js b/stores/fixedForexStore.js
index 9955a58..8029741 100644
--- a/stores/fixedForexStore.js
+++ b/stores/fixedForexStore.js
@@ -555,6 +555,7 @@ class Store {
     const assets = [
       {
         address: KP3RETH_ADDRESS,
+        logoAddress: KP3RETH_ADDRESS,
         symbol: "ETH+KP3R",
         shouldUseNewABI: true,
         decimals: 18,
@@ -582,6 +583,7 @@ class Store {
         },
       {
         address: IBAUDUSDC_ADDRESS,
+        logoAddress: IBAUDUSDC_ADDRESS,
         symbol: "ibAUD+USDC",
         shouldUseNewABI: true,
         decimals: 18,
@@ -609,6 +611,7 @@ class Store {
       },
       {
         address: IBCHFUSDC_ADDRESS,
+        logoAddress: IBCHFUSDC_ADDRESS,
         symbol: "ibCHF+USDC",
         shouldUseNewABI: true,
         decimals: 18,
@@ -636,6 +639,7 @@ class Store {
       },
       {
         address: IBEURUSDC_ADDRESS,
+        logoAddress: IBEURUSDC_ADDRESS,
         symbol: "ibEUR+USDC",
         shouldUseNewABI: true,
         decimals: 18,
@@ -663,6 +667,7 @@ class Store {
       },
       {
         address: IBGBPUSDC_ADDRESS,
+        logoAddress: IBGBPUSDC_ADDRESS,
         symbol: "ibGBP+USDC",
         shouldUseNewABI: true,
         decimals: 18,
@@ -690,6 +695,7 @@ class Store {
       },      
       {
         address: IBJPYUSDC_ADDRESS,
+        logoAddress: IBJPYUSDC_ADDRESS,
         symbol: "ibJPY+USDC",
         shouldUseNewABI: true,
         decimals: 18,
@@ -717,6 +723,7 @@ class Store {
       },
       {
         address: IBKRWUSDC_ADDRESS,
+        logoAddress: IBKRWUSDC_ADDRESS,
         symbol: "ibKRW+USDC",
         shouldUseNewABI: true,
         decimals: 18,
@@ -744,6 +751,7 @@ class Store {
       },
       {
         address: IBEUR_ADDRESS,
+        logoAddress: IBEUR_GAUGE_ADDRESS,
         symbol: "ibEUR",
         decimals: 18,
         name: "Iron Bank EUR",
@@ -771,6 +779,7 @@ class Store {
       },
       {
         address: IBKRW_ADDRESS,
+        logoAddress: IBKRW_GAUGE_ADDRESS,
         symbol: "ibKRW",
         decimals: 18,
         name: "Iron Bank KRW",
@@ -798,6 +807,7 @@ class Store {
       },
       {
         address: IBGBP_ADDRESS,
+        logoAddress: IBGBP_GAUGE_ADDRESS,
         symbol: "ibGBP",
         decimals: 18,
         name: "Iron Bank GBP",
@@ -825,6 +835,7 @@ class Store {
       },
       {
         address: IBCHF_ADDRESS,
+        logoAddress: IBCHF_GAUGE_ADDRESS,
         symbol: "ibCHF",
         decimals: 18,
         name: "Iron Bank CHF",
@@ -852,6 +863,7 @@ class Store {
       },
       {
         address: IBAUD_ADDRESS,
+        logoAddress: IBAUD_GAUGE_ADDRESS,
         symbol: "ibAUD",
         decimals: 18,
         name: "Iron Bank AUD",
@@ -879,6 +891,7 @@ class Store {
       },
       {
         address: IBJPY_ADDRESS,
+        logoAddress: IBJPY_GAUGE_ADDRESS,
         symbol: "ibJPY",
         decimals: 18,
         name: "Iron Bank JPY",
@@ -906,6 +919,7 @@ class Store {
       },
       {
         address: IBEUR_AG_ADDRESS,
+        logoAddress: IBEUR_AG_GAUGE_ADDRESS,
         symbol: "ibEUR",
         decimals: 18,
         name: "Iron Bank EUR",