diff --git a/src/components/contextual/pages/pool/PoolStatCards.vue b/src/components/contextual/pages/pool/PoolStatCards.vue
index ca613e0d33..1ca6d8a319 100644
--- a/src/components/contextual/pages/pool/PoolStatCards.vue
+++ b/src/components/contextual/pages/pool/PoolStatCards.vue
@@ -14,6 +14,7 @@ import { Pool } from '@/services/pool/types';
 import { AprBreakdown } from '@balancer-labs/sdk';
 import { useCrossChainSync } from '@/providers/cross-chain-sync.provider';
 import useNetwork from '@/composables/useNetwork';
+import useWeb3 from '@/services/web3/useWeb3';
 
 /**
  * TYPES
@@ -41,6 +42,7 @@ const { fNum } = useNumbers();
 const { t } = useI18n();
 const { l2VeBalBalances } = useCrossChainSync();
 const { networkId } = useNetwork();
+const { isWalletReady } = useWeb3();
 
 /**
  * COMPUTED
@@ -49,7 +51,7 @@ const aprLabel = computed((): string => {
   const poolAPRs = props.poolApr;
   if (!poolAPRs) return '0';
 
-  return totalAprLabel(poolAPRs, props.pool?.boost);
+  return totalAprLabel(poolAPRs, props.pool?.boost, isWalletReady.value);
 });
 
 const syncVeBalTooltip = computed(() => {
diff --git a/src/components/tables/PoolsTable/PoolsTable.vue b/src/components/tables/PoolsTable/PoolsTable.vue
index 0533f4a1eb..bd214b749f 100644
--- a/src/components/tables/PoolsTable/PoolsTable.vue
+++ b/src/components/tables/PoolsTable/PoolsTable.vue
@@ -38,6 +38,7 @@ import { poolMetadata } from '@/lib/config/metadata';
 import PoolsTableExtraInfo from './PoolsTableExtraInfo.vue';
 import PoolsTableActionSelector from './PoolsTableActionSelector.vue';
 import { PoolAction } from '@/components/contextual/pages/pools/types';
+import useWeb3 from '@/services/web3/useWeb3';
 
 /**
  * TYPES
@@ -102,6 +103,7 @@ const { trackGoal, Goals } = useFathom();
 const { darkMode } = useDarkMode();
 const { upToLargeBreakpoint, upToSmallBreakpoint } = useBreakpoints();
 const { networkSlug } = useNetwork();
+const { isWalletReady } = useWeb3();
 
 const wideCompositionWidth = computed(() => {
   if (upToSmallBreakpoint.value) return 250;
@@ -271,7 +273,7 @@ function aprLabelFor(pool: Pool): string {
   const poolAPRs = pool?.apr;
   if (!poolAPRs) return '0';
 
-  return totalAprLabel(poolAPRs, boostFor(pool));
+  return totalAprLabel(poolAPRs, boostFor(pool), isWalletReady.value);
 }
 
 function lockedUntil(lockEndDate?: number) {
diff --git a/src/components/tooltips/APRTooltip/APRTooltip.spec.ts b/src/components/tooltips/APRTooltip/APRTooltip.spec.ts
index 40e67323f2..fd799b6372 100644
--- a/src/components/tooltips/APRTooltip/APRTooltip.spec.ts
+++ b/src/components/tooltips/APRTooltip/APRTooltip.spec.ts
@@ -47,7 +47,7 @@ describe('APRTooltip', () => {
       expect(getByTestId('total-apr').textContent).toBe('Total APR15.22%');
       expect(getByTestId('swap-fee-apr')).toBeTruthy();
       expect(getByTestId('swap-fee-apr').textContent).toBe(
-        '15.22% Swap fees APR'
+        'Swap fees APR 15.22%'
       );
     });
   });
@@ -75,7 +75,7 @@ describe('APRTooltip', () => {
         'Total APR0.78% - 1.95%'
       );
       expect(getByTestId('vebal-apr').textContent).toContain(
-        '1.17% Max locking/veBAL APR'
+        'Max locking/veBAL APR1.17%'
       );
     });
   });
@@ -101,19 +101,17 @@ describe('APRTooltip', () => {
         'Total APR0.44% - 5.67%'
       );
       expect(getByTestId('swap-fee-apr').textContent).toBe(
-        '0.00% Swap fees APR'
+        'Swap fees APR 0.00%'
+      );
+      expect(getByTestId('staking-apr').textContent).toContain(
+        'Staking APR 0.44% - 5.67%'
+      );
+      expect(getByTestId('staking-apr').textContent).toContain(
+        'Min BAL APR 0.44%'
+      );
+      expect(getByTestId('staking-apr').textContent).toContain(
+        'Max BAL APR 5.67%'
       );
-      expect(
-        getByTestId('staking-apr').children[0].children[0].textContent
-      ).toBe('0.44% Min staking APR');
-      expect(
-        getByTestId('staking-apr').children[0].children[1].children[0]
-          .textContent
-      ).toBe('0.44% Min BAL APR');
-      expect(
-        getByTestId('staking-apr').children[0].children[1].children[1]
-          .textContent
-      ).toBe('5.67% Max BAL APR');
     });
 
     it('Should show swap fees and staking rewards', () => {
@@ -137,19 +135,17 @@ describe('APRTooltip', () => {
         'Total APR2.71% - 7.78%'
       );
       expect(getByTestId('swap-fee-apr').textContent).toBe(
-        '2.23% Swap fees APR'
+        'Swap fees APR 2.23%'
+      );
+      expect(getByTestId('staking-apr').textContent).toContain(
+        'Staking APR 0.48% - 5.55%'
+      );
+      expect(getByTestId('staking-apr').textContent).toContain(
+        'Min BAL APR 0.48%'
+      );
+      expect(getByTestId('staking-apr').textContent).toContain(
+        'Max BAL APR 5.55%'
       );
-      expect(
-        getByTestId('staking-apr').children[0].children[0].textContent
-      ).toBe('0.48% Min staking APR');
-      expect(
-        getByTestId('staking-apr').children[0].children[1].children[0]
-          .textContent
-      ).toBe('0.48% Min BAL APR');
-      expect(
-        getByTestId('staking-apr').children[0].children[1].children[1]
-          .textContent
-      ).toBe('5.55% Max BAL APR');
     });
 
     it('Should show staking rewards as a single line item if min and max are the same', () => {
@@ -169,18 +165,18 @@ describe('APRTooltip', () => {
           poolApr: aprBreakdown,
         },
       });
-      expect(getByTestId('staking-apr').textContent).toBe('7.63% Staking APR');
+      expect(getByTestId('staking-apr').textContent).toBe('Staking APR 7.63%');
     });
   });
 
   describe('Token Aprs', () => {
-    it('Should show stETH token APRs', () => {
+    it('Should show WETH token APRs', () => {
       const aprBreakdown: AprBreakdown = {
         ...EmptyAprBreakdownMock,
         tokenAprs: {
           total: 166,
           breakdown: {
-            [configService.network.tokens.Addresses.wstETH || '']: 166,
+            [configService.network.tokens.Addresses.WETH || '']: 166,
           },
         },
         min: 166,
@@ -188,7 +184,7 @@ describe('APRTooltip', () => {
       };
       const poolMock: Pool = {
         ...EmptyPoolMock,
-        tokensList: [configService.network.tokens.Addresses.wstETH || ''],
+        tokensList: [configService.network.tokens.Addresses.WETH || ''],
       };
       const { getByTestId } = renderComponent(APRTooltip, {
         props: {
@@ -196,61 +192,8 @@ describe('APRTooltip', () => {
           poolApr: aprBreakdown,
         },
       });
-      expect(getByTestId('total-apr').textContent).toBe('Total APR1.66%');
-      expect(getByTestId('yield-apr').textContent).toBe('1.66% Token APR');
-    });
-
-    it('Should show stMATIC token APRs', () => {
-      const aprBreakdown: AprBreakdown = {
-        ...EmptyAprBreakdownMock,
-        tokenAprs: {
-          total: 153,
-          breakdown: {
-            '0x3a58a54c066fdc0f2d55fc9c89f0415c92ebf3c4': 153,
-          },
-        },
-        min: 153,
-        max: 153,
-      };
-      const poolMock: Pool = {
-        ...EmptyPoolMock,
-        tokensList: [configService.network.tokens.Addresses.stMATIC || ''],
-      };
-      const { getByTestId } = renderComponent(APRTooltip, {
-        props: {
-          pool: poolMock,
-          poolApr: aprBreakdown,
-        },
-      });
-      expect(getByTestId('total-apr').textContent).toBe('Total APR1.53%');
-      expect(getByTestId('yield-apr').textContent).toBe('1.53% stMATIC APR');
-    });
-
-    it('Should show rETH token APRs', () => {
-      const aprBreakdown: AprBreakdown = {
-        ...EmptyAprBreakdownMock,
-        swapFees: 29,
-        tokenAprs: {
-          total: 73,
-          breakdown: {
-            [configService.network.tokens.Addresses.rETH || '']: 73,
-          },
-        },
-        min: 102,
-        max: 102,
-      };
-      const poolMock: Pool = {
-        ...EmptyPoolMock,
-        tokensList: [configService.network.tokens.Addresses.rETH || ''],
-      };
-      const { getByTestId } = renderComponent(APRTooltip, {
-        props: {
-          pool: poolMock,
-          poolApr: aprBreakdown,
-        },
-      });
-      expect(getByTestId('total-apr').textContent).toBe('Total APR1.02%');
-      expect(getByTestId('yield-apr').textContent).toBe('0.73% Token APR');
+      expect(getByTestId('total-apr').textContent).toContain('Total APR1.66%');
+      expect(getByTestId('yield-apr').textContent).toContain('WETH APR 1.66%');
     });
 
     it('Should show multiple token APRs with a generic header', () => {
@@ -279,17 +222,11 @@ describe('APRTooltip', () => {
         },
       });
       expect(getByTestId('total-apr').textContent).toBe('Total APR1.02%');
-      const yieldAprBreakdown = getByTestId('yield-apr').children[0];
-      expect(yieldAprBreakdown.children[0].textContent).toBe('2.54% Token APR');
-      expect(yieldAprBreakdown.children[1].children[0].textContent).toBe(
-        '1.18% wstETH APR'
-      );
-      expect(yieldAprBreakdown.children[1].children[1].textContent).toBe(
-        '1.04% sfrxETH APR'
-      );
-      expect(yieldAprBreakdown.children[1].children[2].textContent).toBe(
-        '0.32% rETH APR'
-      );
+      const yieldAprBreakdown = getByTestId('yield-apr');
+      expect(yieldAprBreakdown.textContent).toContain('Boosted APR 2.54%');
+      expect(yieldAprBreakdown.textContent).toContain('wstETH APR 1.18%');
+      expect(yieldAprBreakdown.textContent).toContain('sfrxETH APR 1.04%');
+      expect(yieldAprBreakdown.textContent).toContain('rETH APR 0.32%');
     });
 
     it('Should show a breakdown of a boosted pools linear pool APRs and staking rewards', () => {
@@ -329,30 +266,20 @@ describe('APRTooltip', () => {
       expect(getByTestId('total-apr').textContent).toBe(
         'Total APR1.75% - 2.20%'
       );
-      const yieldAprBreakdown = getByTestId('yield-apr').children[0];
-      expect(yieldAprBreakdown.children[0].textContent).toBe(
-        '1.31% Boosted APR'
-      );
-      expect(yieldAprBreakdown.children[1].children[0].textContent).toBe(
-        '1.15% bb-a-USDT APR'
+      const yieldAprBreakdown = getByTestId('yield-apr');
+      expect(yieldAprBreakdown.textContent).toContain('Boosted APR 1.31%');
+      expect(yieldAprBreakdown.textContent).toContain('bb-a-USDT APR 1.15%');
+      expect(yieldAprBreakdown.textContent).toContain('bb-a-USDC APR 0.04%');
+      expect(yieldAprBreakdown.textContent).toContain('bb-a-DAI APR 0.12%');
+      expect(getByTestId('staking-apr').textContent).toContain(
+        'Staking APR 0.30% - 0.75%'
       );
-      expect(yieldAprBreakdown.children[1].children[1].textContent).toBe(
-        '0.04% bb-a-USDC APR'
+      expect(getByTestId('staking-apr').textContent).toContain(
+        'Min BAL APR 0.30%'
       );
-      expect(yieldAprBreakdown.children[1].children[2].textContent).toBe(
-        '0.12% bb-a-DAI APR'
+      expect(getByTestId('staking-apr').textContent).toContain(
+        'Max BAL APR 0.75%'
       );
-      expect(
-        getByTestId('staking-apr').children[0].children[0].textContent
-      ).toBe('0.30% Min staking APR');
-      expect(
-        getByTestId('staking-apr').children[0].children[1].children[0]
-          .textContent
-      ).toBe('0.30% Min BAL APR');
-      expect(
-        getByTestId('staking-apr').children[0].children[1].children[1]
-          .textContent
-      ).toBe('0.75% Max BAL APR');
     });
 
     it('Should show boosted staking rewards as a line item for pools that contain a boosted pool', () => {
@@ -380,18 +307,18 @@ describe('APRTooltip', () => {
       expect(getByTestId('total-apr').textContent).toBe(
         'Total APR5.95% - 14.46%'
       );
-      expect(getByTestId('yield-apr').textContent).toBe('0.28% Boosted APR');
-      expect(
-        getByTestId('staking-apr').children[0].children[0].textContent
-      ).toBe('5.67% Min staking APR');
-      expect(
-        getByTestId('staking-apr').children[0].children[1].children[0]
-          .textContent
-      ).toBe('5.67% Min BAL APR');
-      expect(
-        getByTestId('staking-apr').children[0].children[1].children[1]
-          .textContent
-      ).toBe('14.18% Max BAL APR');
+      expect(getByTestId('yield-apr').textContent).toContain(
+        'Boosted APR 0.28%'
+      );
+      expect(getByTestId('staking-apr').textContent).toContain(
+        'Staking APR 5.67% - 14.18%'
+      );
+      expect(getByTestId('staking-apr').textContent).toContain(
+        'Min BAL APR 5.67%'
+      );
+      expect(getByTestId('staking-apr').textContent).toContain(
+        'Max BAL APR 14.18%'
+      );
     });
 
     it('Should show veBAL staking rewards as a line item for pools that contain the 80/20 veBAL pool', () => {
@@ -414,7 +341,9 @@ describe('APRTooltip', () => {
         },
       });
       expect(getByTestId('total-apr').textContent).toBe('Total APR0.17%');
-      expect(getByTestId('yield-apr').textContent).toBe('0.17% veBAL APR');
+      expect(getByTestId('yield-apr').textContent).toContain(
+        'Boosted APR 0.17%'
+      );
     });
   });
 
@@ -445,23 +374,20 @@ describe('APRTooltip', () => {
         'Total APR1.67% - 6.45%'
       );
       expect(getByTestId('swap-fee-apr').textContent).toBe(
-        '0.00% Swap fees APR'
+        'Swap fees APR 0.00%'
+      );
+      expect(getByTestId('staking-apr').textContent).toContain(
+        'Staking APR 1.67% - 6.45%'
+      );
+      expect(getByTestId('staking-apr').textContent).toContain(
+        'Min BAL APR 0.44%'
+      );
+      expect(getByTestId('staking-apr').textContent).toContain(
+        'Max BAL APR 5.22%'
+      );
+      expect(getByTestId('staking-apr').textContent).toContain(
+        'Rewards APR 1.23%'
       );
-      expect(
-        getByTestId('staking-apr').children[0].children[0].textContent
-      ).toBe('1.67% Min staking APR');
-      expect(
-        getByTestId('staking-apr').children[0].children[1].children[0]
-          .textContent
-      ).toBe('0.44% Min BAL APR');
-      expect(
-        getByTestId('staking-apr').children[0].children[1].children[1]
-          .textContent
-      ).toBe('5.22% Max BAL APR');
-      expect(
-        getByTestId('staking-apr').children[0].children[1].children[2]
-          .textContent
-      ).toBe('1.23% Rewards APR');
     });
 
     it('Should show BAL + staking rewards as line items if staking APR is the same but there are rewards', () => {
@@ -486,17 +412,13 @@ describe('APRTooltip', () => {
           poolApr: aprBreakdown,
         },
       });
-      expect(
-        getByTestId('staking-apr').children[0].children[0].textContent
-      ).toBe('10.51% Staking APR');
-      expect(
-        getByTestId('staking-apr').children[0].children[1].children[0]
-          .textContent
-      ).toBe('7.63% BAL APR');
-      expect(
-        getByTestId('staking-apr').children[0].children[1].children[1]
-          .textContent
-      ).toBe('2.88% Rewards APR');
+      expect(getByTestId('staking-apr').textContent).toContain(
+        'Staking APR 10.51%'
+      );
+      expect(getByTestId('staking-apr').textContent).toContain('BAL APR 7.63%');
+      expect(getByTestId('staking-apr').textContent).toContain(
+        'Rewards APR 2.88%'
+      );
     });
   });
 });
diff --git a/src/components/tooltips/APRTooltip/APRTooltip.vue b/src/components/tooltips/APRTooltip/APRTooltip.vue
index 1800443973..884d5dcb92 100644
--- a/src/components/tooltips/APRTooltip/APRTooltip.vue
+++ b/src/components/tooltips/APRTooltip/APRTooltip.vue
@@ -12,6 +12,7 @@ import VeBalBreakdown from './components/VeBalBreakdown.vue';
 import YieldBreakdown from './components/YieldBreakdown.vue';
 import { AprBreakdown } from '@balancer-labs/sdk';
 import { hasStakingRewards } from '@/composables/useAPR';
+import useWeb3 from '@/services/web3/useWeb3';
 
 /**
  * TYPES
@@ -30,6 +31,7 @@ const props = defineProps<Props>();
  * COMPOSABLES
  */
 const { fNum } = useNumbers();
+const { isWalletReady } = useWeb3();
 
 /**
  * COMPUTED
@@ -48,12 +50,14 @@ const hasYieldAPR = computed(() => {
 const hasVebalAPR = computed((): boolean => isVeBalPool(props.pool.id));
 
 const totalLabel = computed((): string =>
-  apr.value ? totalAprLabel(apr.value, props.pool.boost) : '0'
+  apr.value
+    ? totalAprLabel(apr.value, props.pool.boost, isWalletReady.value)
+    : '0'
 );
 </script>
 
 <template v-slot:aprCell="pool">
-  <BalTooltip v-if="validAPR" width="auto" noPad>
+  <BalTooltip v-if="validAPR" width="64" noPad>
     <template #activator>
       <div class="ml-1">
         <StarsIcon
@@ -84,29 +88,32 @@ const totalLabel = computed((): string =>
         </div>
       </div>
       <div class="p-3 text-left">
-        <!-- SWAP FEE APR -->
-        <div
-          class="flex items-center mb-1 whitespace-nowrap"
-          data-testid="swap-fee-apr"
-        >
-          {{ fNum(apr?.swapFees || '0', FNumFormats.bp) }}
-          <span class="ml-1 text-xs text-secondary">
-            {{ $t('swapFeeAPR') }}
-          </span>
-        </div>
-
         <!-- VeBal APR -->
-        <VeBalBreakdown v-if="hasVebalAPR" :apr="apr?.protocolApr || 0" />
+        <VeBalBreakdown
+          v-if="hasVebalAPR"
+          :apr="apr?.protocolApr || 0"
+          class="mb-3"
+        />
+
+        <!-- STAKING APR BREAKDOWN -->
+        <StakingBreakdown :pool="pool" :poolApr="apr" class="mb-3" />
 
         <!-- YIELD APR BREAKDOWN -->
         <YieldBreakdown
           v-if="apr?.tokenAprs && hasYieldAPR"
           :yieldAPR="apr?.tokenAprs"
           :pool="pool"
+          class="mb-3"
         />
 
-        <!-- STAKING APR BREAKDOWN -->
-        <StakingBreakdown :pool="pool" :poolApr="apr" />
+        <!-- SWAP FEE APR -->
+        <div
+          class="flex justify-between items-center mb-1 text-sm font-bold whitespace-nowrap"
+          data-testid="swap-fee-apr"
+        >
+          <span>{{ $t('swapFeeAPR') }}</span>
+          {{ fNum(apr?.swapFees || '0', FNumFormats.bp) }}
+        </div>
       </div>
     </div>
   </BalTooltip>
diff --git a/src/components/tooltips/APRTooltip/components/StakingBreakdown.vue b/src/components/tooltips/APRTooltip/components/StakingBreakdown.vue
index e4f59ec6bd..9a68e38137 100644
--- a/src/components/tooltips/APRTooltip/components/StakingBreakdown.vue
+++ b/src/components/tooltips/APRTooltip/components/StakingBreakdown.vue
@@ -6,7 +6,7 @@ import { bnum } from '@/lib/utils';
 import { Pool } from '@/services/pool/types';
 import { AprBreakdown } from '@balancer-labs/sdk';
 import { useTokens } from '@/providers/tokens.provider';
-import { hasBalEmissions, hasStakingRewards } from '@/composables/useAPR';
+import { hasBalEmissions } from '@/composables/useAPR';
 
 /**
  * TYPES
@@ -50,6 +50,13 @@ const hasRewardTokens = computed((): boolean =>
   bnum(rewardTokensAPR.value).gt(0)
 );
 
+const realMinAPR = computed((): number =>
+  bnum(minBalAPR.value).plus(rewardTokensAPR.value).toNumber()
+);
+const realMaxAPR = computed((): number =>
+  bnum(maxBalAPR.value).plus(rewardTokensAPR.value).toNumber()
+);
+
 /**
  * @summary The total APR if we have the user's boost.
  */
@@ -66,15 +73,14 @@ const boostedTotalAPR = computed((): string => {
   return fNum(rewardTokensAPR.value, FNumFormats.bp);
 });
 
-/**
- * @summary The total APR if we have don't have the user's boost.
- */
-const unboostedTotalAPR = computed((): string =>
-  fNum(
-    bnum(minBalAPR.value).plus(rewardTokensAPR.value).toString(),
+const stakingAprRange = computed(() => {
+  if (isMinMaxSame.value) return fNum(realMinAPR.value, FNumFormats.bp);
+
+  return `${fNum(realMinAPR.value, FNumFormats.bp)} - ${fNum(
+    realMaxAPR.value,
     FNumFormats.bp
-  )
-);
+  )}`;
+});
 
 const breakdownItems = computed((): Array<any> => {
   const items: Array<any> = [];
@@ -109,36 +115,28 @@ const breakdownItems = computed((): Array<any> => {
 
 <template>
   <div data-testid="staking-apr">
-    <div v-if="hasBoost">
-      <div class="flex items-center">
+    <template v-if="hasBoost">
+      <BalHStack justify="between" class="font-bold">
+        <span>Staking APR</span>
         {{ boostedTotalAPR }}
-        <span class="ml-1 text-secondarytext-xs">
-          {{ $t('staking.stakingApr') }}
-        </span>
-      </div>
-    </div>
+      </BalHStack>
+    </template>
     <template v-else>
-      <BalBreakdown
-        v-if="hasBalEmissions(apr) || hasStakingRewards(apr)"
-        :items="breakdownItems"
-      >
-        <div class="flex items-center">
-          {{ unboostedTotalAPR }}
-          <span class="ml-1 text-xs text-secondary">
-            {{
-              isMinMaxSame
-                ? $t('staking.stakingApr')
-                : $t('staking.minimumStakingApr')
-            }}
-          </span>
-        </div>
-        <template #item="{ item: [label, amount] }">
+      <BalHStack justify="between" class="font-bold">
+        <span>Staking APR</span>
+        {{ stakingAprRange }}
+      </BalHStack>
+      <BalVStack spacing="xs" class="mt-1">
+        <BalHStack
+          v-for="([label, amount], i) in breakdownItems"
+          :key="i"
+          justify="between"
+          class="text-gray-500"
+        >
+          <span class="ml-2">{{ label }} {{ $t('apr') }} </span>
           {{ fNum(amount, FNumFormats.bp) }}
-          <span class="ml-1 text-xs capitalize text-secondary">
-            {{ label }} {{ $t('apr') }}
-          </span>
-        </template>
-      </BalBreakdown>
+        </BalHStack>
+      </BalVStack>
     </template>
   </div>
 </template>
diff --git a/src/components/tooltips/APRTooltip/components/VeBalBreakdown.vue b/src/components/tooltips/APRTooltip/components/VeBalBreakdown.vue
index 31247b281c..a105a829e6 100644
--- a/src/components/tooltips/APRTooltip/components/VeBalBreakdown.vue
+++ b/src/components/tooltips/APRTooltip/components/VeBalBreakdown.vue
@@ -1,6 +1,5 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
 
 import useNumbers, { FNumFormats } from '@/composables/useNumbers';
 
@@ -20,31 +19,19 @@ const props = defineProps<Props>();
  * COMPOSABLES
  */
 const { fNum } = useNumbers();
-const { t } = useI18n();
 
 /**
  * COMPUTED
  */
 const aprLabel = computed((): string => fNum(props.apr, FNumFormats.bp));
-
-const items = computed((): string[] => [
-  t('tooltips.veBalApr.breakdown1'),
-  t('tooltips.veBalApr.breakdown2'),
-]);
 </script>
 
 <template>
-  <div data-testid="vebal-apr">
-    <BalBreakdown :items="items">
-      {{ aprLabel }}
-      <span class="ml-1 text-xs text-secondary">
-        {{ $t('tooltips.veBalApr.title') }}
-      </span>
-      <template #item="{ item }">
-        <div class="text-xs text-secondary">
-          {{ item }}
-        </div>
-      </template>
-    </BalBreakdown>
+  <div
+    data-testid="vebal-apr"
+    class="flex justify-between items-center text-sm font-bold"
+  >
+    <span>{{ $t('tooltips.veBalApr.title') }}</span>
+    <span>{{ aprLabel }}</span>
   </div>
 </template>
diff --git a/src/components/tooltips/APRTooltip/components/YieldBreakdown.vue b/src/components/tooltips/APRTooltip/components/YieldBreakdown.vue
index affeeb9a40..91aea89476 100644
--- a/src/components/tooltips/APRTooltip/components/YieldBreakdown.vue
+++ b/src/components/tooltips/APRTooltip/components/YieldBreakdown.vue
@@ -3,14 +3,8 @@ import { Pool } from '@/services/pool/types';
 import { AprBreakdown } from '@balancer-labs/sdk';
 import { getAddress } from '@ethersproject/address';
 import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
 
 import useNumbers, { FNumFormats } from '@/composables/useNumbers';
-import {
-  hasBoostedAPR,
-  isDeep,
-  isVeBalPoolAddress,
-} from '@/composables/usePoolHelpers';
 import { useTokens } from '@/providers/tokens.provider';
 
 /**
@@ -29,9 +23,8 @@ const props = defineProps<Props>();
 /**
  * COMPOSABLES
  */
-const { getToken, getTokens } = useTokens();
+const { getTokens } = useTokens();
 const { fNum } = useNumbers();
-const { t } = useI18n();
 
 /**
  * COMPUTED
@@ -40,38 +33,6 @@ const yieldAPRTokens = computed(() => {
   return getTokens(Object.keys(props.yieldAPR.breakdown));
 });
 
-const hasMultiRewardTokens = computed(
-  () => Object.keys(yieldAPRTokens.value).length > 1
-);
-
-const yieldAPRLabel = computed(() => {
-  const yieldTokensList = Object.keys(props.yieldAPR.breakdown);
-
-  if (isDeep(props.pool)) return t('yieldAprRewards.apr.boosted');
-
-  if (yieldTokensList.length > 1) {
-    return t('yieldAprRewards.apr.token');
-  }
-
-  if (yieldTokensList.length === 1) {
-    if (hasBoostedAPR(yieldTokensList[0]))
-      return t('yieldAprRewards.apr.boosted');
-    if (isVeBalPoolAddress(yieldTokensList[0]))
-      return t('yieldAprRewards.apr.veBAL');
-
-    const tokenAddress = getAddress(yieldTokensList[0]);
-    const token = getToken(tokenAddress);
-
-    if (!token) {
-      return t('yieldAprRewards.apr.token');
-    }
-
-    return `${token.symbol} ${t('apr')}`;
-  }
-
-  return '';
-});
-
 const yieldBreakdownItems = computed((): [string, number][] =>
   Object.entries(props.yieldAPR.breakdown)
 );
@@ -79,20 +40,22 @@ const yieldBreakdownItems = computed((): [string, number][] =>
 
 <template>
   <div data-testid="yield-apr">
-    <BalBreakdown
-      :items="yieldBreakdownItems"
-      :hideItems="!hasMultiRewardTokens"
-    >
-      <div class="flex items-center">
-        {{ fNum(yieldAPR.total, FNumFormats.bp) }}
-        <span class="ml-1 text-xs text-secondary"> {{ yieldAPRLabel }} </span>
-      </div>
-      <template v-if="hasMultiRewardTokens" #item="{ item: [address, amount] }">
-        {{ fNum(amount, FNumFormats.bp) }}
-        <span class="ml-1 text-xs text-secondary">
-          {{ yieldAPRTokens[getAddress(address)].symbol }} {{ $t('apr') }}
+    <BalHStack justify="between" class="font-bold">
+      <span>{{ $t('yieldAprRewards.apr.boosted') }}</span>
+      {{ fNum(yieldAPR.total, FNumFormats.bp) }}
+    </BalHStack>
+    <BalVStack spacing="xs" class="mt-1">
+      <BalHStack
+        v-for="([address, amount], index) in yieldBreakdownItems"
+        :key="index"
+        justify="between"
+        class="text-gray-500"
+      >
+        <span class="ml-2">
+          {{ yieldAPRTokens[getAddress(address)]?.symbol }} {{ $t('apr') }}
         </span>
-      </template>
-    </BalBreakdown>
+        {{ fNum(amount, FNumFormats.bp) }}
+      </BalHStack>
+    </BalVStack>
   </div>
 </template>
diff --git a/src/composables/usePoolHelpers.spec.ts b/src/composables/usePoolHelpers.spec.ts
index ebc43863f6..5d93b4125a 100644
--- a/src/composables/usePoolHelpers.spec.ts
+++ b/src/composables/usePoolHelpers.spec.ts
@@ -601,7 +601,7 @@ test('generates APR label with boost', async () => {
     },
   });
 
-  expect(totalAprLabel(aprBreakdown, boost)).toBe('0.17%'); // swapFees + tokenAprsTotal + rewardAprsTotal
+  expect(totalAprLabel(aprBreakdown, boost, true)).toBe('0.17%'); // swapFees + tokenAprsTotal + rewardAprsTotal
 });
 
 test('generates APR label with boost', async () => {
@@ -634,7 +634,7 @@ test('generates APR label with boost', async () => {
   // (swapFees + tokenAprsTotal + rewardAprsTotal) = 10 + 5 + 2 = 17
   // (stakingAprMin * boost ) = 1.5 * 2.5 = 3.75
   // total = 17 + 3.75 = 20.75 --> 0.21%
-  expect(totalAprLabel(aprBreakdown, boost)).toBe('0.21%');
+  expect(totalAprLabel(aprBreakdown, boost, true)).toBe('0.21%');
 });
 
 test('generates absMaxApr when no boost', async () => {
diff --git a/src/composables/usePoolHelpers.ts b/src/composables/usePoolHelpers.ts
index e4e58be40a..c6d27f33fc 100644
--- a/src/composables/usePoolHelpers.ts
+++ b/src/composables/usePoolHelpers.ts
@@ -301,11 +301,16 @@ export function absMaxApr(aprs: AprBreakdown, boost?: string): string {
 /**
  * @summary Returns total APR label, whether range or single value.
  */
-export function totalAprLabel(aprs: AprBreakdown, boost?: string): string {
+export function totalAprLabel(
+  aprs: AprBreakdown,
+  boost?: string,
+  isConnected?: boolean
+): string {
   if (aprs.swapFees > APR_THRESHOLD) {
     return '-';
   }
-  if (boost) {
+  if (boost && boost !== '1' && isConnected) {
+    console.log('boosted');
     return numF(absMaxApr(aprs, boost), FNumFormats.bp);
   }
   if (
diff --git a/src/dependencies/Multicaller.mocks.ts b/src/dependencies/Multicaller.mocks.ts
index c4550f8d3d..702174dad7 100644
--- a/src/dependencies/Multicaller.mocks.ts
+++ b/src/dependencies/Multicaller.mocks.ts
@@ -46,12 +46,22 @@ export function initMulticallPoolId(id: string) {
   poolId = id;
 }
 
+let lastCall;
+
 export function initMulticallerAsPoolMulticallerMock() {
   // Used for tests which code uses Multicaller from pool.multicaller, that is, to fetch onchain data to decorate a given SDL pool
   // pool.multicaller defines its output type RawOnchainPoolDataMap that we can use in this mock
   // We will replace this mock with MulticallerMock in future PRs
   class MulticallerMock {
     execute() {
+      if (
+        lastCall.address === 'gauge id' &&
+        lastCall.function === 'balanceOf'
+      ) {
+        // Special case when multicaller call is made from useStakedSharesQuery
+        return Promise.resolve([]);
+      }
+
       const result = mockDeep<RawOnchainPoolDataMap>();
       const chainDataMock = mockDeep<RawOnchainPoolData>();
       chainDataMock.amp = {
@@ -70,7 +80,8 @@ export function initMulticallerAsPoolMulticallerMock() {
       result[poolId] = chainDataMock;
       return Promise.resolve(result);
     }
-    call() {
+    call(args) {
+      lastCall = args;
       return this;
     }
   }
diff --git a/src/dependencies/default-mocks.ts b/src/dependencies/default-mocks.ts
index d899580b07..e78c35d4e1 100644
--- a/src/dependencies/default-mocks.ts
+++ b/src/dependencies/default-mocks.ts
@@ -15,7 +15,6 @@ export function initDependenciesWithDefaultMocks() {
   initBalancerApiWithDefaultMocks();
   initBalancerSdkWithDefaultMocks();
   initRpcProviderServiceWithDefaultMocks();
-  //@ts-ignore
   initOldMulticallerWithDefaultMocks();
   initMulticallerWithDefaultMocks();
   initEthersContractWithDefaultMocks();
diff --git a/src/lib/config/avalanche/pools.ts b/src/lib/config/avalanche/pools.ts
index 6a2737ed8a..6cc80e2ed6 100644
--- a/src/lib/config/avalanche/pools.ts
+++ b/src/lib/config/avalanche/pools.ts
@@ -9,7 +9,7 @@ const pools: Pools = {
     PerPool: 10,
     PerPoolInitial: 5,
   },
-  BoostsEnabled: false,
+  BoostsEnabled: true,
   DelegateOwner: '0xba1ba1ba1ba1ba1ba1ba1ba1ba1ba1ba1ba1ba1b',
   ZeroAddress: '0x0000000000000000000000000000000000000000',
   DynamicFees: {
diff --git a/src/lib/config/base/pools.ts b/src/lib/config/base/pools.ts
index 9b9846b0ab..172b0d1c17 100644
--- a/src/lib/config/base/pools.ts
+++ b/src/lib/config/base/pools.ts
@@ -7,7 +7,7 @@ const pools: Pools = {
     PerPool: 10,
     PerPoolInitial: 5,
   },
-  BoostsEnabled: false,
+  BoostsEnabled: true,
   DelegateOwner: '0xba1ba1ba1ba1ba1ba1ba1ba1ba1ba1ba1ba1ba1b',
   ZeroAddress: '0x0000000000000000000000000000000000000000',
   DynamicFees: {
diff --git a/src/lib/utils/styles.ts b/src/lib/utils/styles.ts
index 5eb5daa147..39e5dcf657 100644
--- a/src/lib/utils/styles.ts
+++ b/src/lib/utils/styles.ts
@@ -24,6 +24,7 @@ export const alignItemVariants = {
 
 export const ySpacingVariants = {
   none: 'space-y-0',
+  xs: 'space-y-1',
   sm: 'space-y-2',
   md: 'space-y-4',
   lg: 'space-y-8',
diff --git a/src/providers/local/pool-staking.provider.ts b/src/providers/local/pool-staking.provider.ts
index f337645ace..b617738b2d 100644
--- a/src/providers/local/pool-staking.provider.ts
+++ b/src/providers/local/pool-staking.provider.ts
@@ -92,7 +92,7 @@ export const poolStakingProvider = (_poolId?: string) => {
   const boost = computed((): string => {
     if (!boostsMap.value || !poolId.value) return '1';
 
-    return boostsMap[poolId.value];
+    return boostsMap[poolId.value] || '1';
   });
 
   // Addresses of all pool gauges.
diff --git a/src/providers/local/pool.provider.ts b/src/providers/local/pool.provider.ts
index 01a0dcc721..1447e98c82 100644
--- a/src/providers/local/pool.provider.ts
+++ b/src/providers/local/pool.provider.ts
@@ -6,12 +6,15 @@ import { Pool } from '@/services/pool/types';
 import { safeInject } from '../inject';
 import useAlerts, { AlertPriority, AlertType } from '@/composables/useAlerts';
 import { useI18n } from 'vue-i18n';
+import { useUserData } from '../user-data.provider';
 
 export function poolProvider(poolId: string) {
   const { addAlert, removeAlert } = useAlerts();
   const { t } = useI18n();
 
   const poolQuery = usePoolQuery(poolId);
+  const { userBoostsQuery } = useUserData();
+  const { data: poolBoostsMap } = userBoostsQuery;
 
   const initialPool = computed((): Pool | undefined => {
     return poolQuery.data.value;
@@ -26,8 +29,20 @@ export function poolProvider(poolId: string) {
     (): boolean => isQueryLoading(poolQuery) || !initialPool.value
   );
 
+  const userBoost = computed((): string | undefined => {
+    if (!poolBoostsMap.value || !poolId) return '1';
+    const boost = poolBoostsMap.value[poolId];
+    return boost ? boost : '1';
+  });
+
   const pool = computed((): Pool | undefined => {
-    return decoratedPool.value || initialPool.value;
+    const _pool = decoratedPool.value || initialPool.value;
+    if (!_pool) return undefined;
+
+    return {
+      boost: userBoost.value,
+      ..._pool,
+    };
   });
 
   watch(poolQuery.error, () => {
diff --git a/tests/mount-helpers.ts b/tests/mount-helpers.ts
index 72507ecc49..4491895bc9 100644
--- a/tests/mount-helpers.ts
+++ b/tests/mount-helpers.ts
@@ -17,6 +17,7 @@ import { mount, MountResult } from './mount-composable-tester';
 import { registerTestPlugins } from './registerTestPlugins';
 import { DeepPartial } from './unit/types';
 import { Router } from 'vue-router';
+import { provideUserData } from '@/providers/user-data.provider';
 
 export const defaultStakedShares = '5';
 
@@ -37,6 +38,7 @@ export function mountComposable<R>(
   return mount<R>(callback, {
     provider: () => {
       provideWallets();
+      provideUserData();
       provideUserSettings();
       provideTokenLists();
       provideFakePoolStaking();