diff --git a/package.json b/package.json
index aa8a940..9016eea 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "stability-ui",
   "type": "module",
-  "version": "0.7.8-alpha",
+  "version": "0.7.9-alpha",
   "scripts": {
     "dev": "astro dev",
     "start": "astro dev",
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 6ff02f0..775a6ce 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -346,6 +346,14 @@ const {
     	position:relative;
 	}
 
+	.tippy-box[data-theme~="custom"] {
+		background-color: #26282f !important; 
+		color: white !important;
+	}
+	.tippy-box[data-theme~="custom"] .tippy-arrow {
+  		color:#26282f !important; 
+	}
+
 	.tooltip .visible__tooltip {
 		width:250px;
 		left:50%;
diff --git a/src/modules/SonicVaults/index.tsx b/src/modules/SonicVaults/index.tsx
index 924dc74..4a7c9f4 100644
--- a/src/modules/SonicVaults/index.tsx
+++ b/src/modules/SonicVaults/index.tsx
@@ -2,6 +2,8 @@ import { useState, useEffect, useRef, useMemo } from "react";
 
 import { useWeb3Modal } from "@web3modal/wagmi/react";
 
+import Tippy from "@tippyjs/react";
+
 // import { formatUnits} from "viem";
 
 import { useStore } from "@nanostores/react";
@@ -10,7 +12,6 @@ import { isMobile } from "react-device-detect";
 
 // import { deployments } from "@stabilitydao/stability";
 
-import { APRModal } from "./components/modals/APRModal";
 import { VSHoldModal } from "./components/modals/VSHoldModal";
 import { ColumnSort } from "./components/ColumnSort";
 import { Pagination } from "./components/Pagination";
@@ -64,6 +65,8 @@ import {
 
 import { PlatformABI } from "@web3";
 
+import "tippy.js/dist/tippy.css";
+
 import type {
   TVault,
   TTableColumn,
@@ -72,7 +75,7 @@ import type {
   // TPendingPlatformUpgrade,
   // TAddress,
   // TUpgradesTable,
-  TEarningData,
+  // TEarningData,
   TVaults,
   TAPRPeriod,
   TPendingPlatformUpgrade,
@@ -141,14 +144,6 @@ const SonicVaults = (): JSX.Element => {
 
   const [localVaults, setLocalVaults] = useState<TVault[]>([]);
   const [filteredVaults, setFilteredVaults] = useState<TVault[]>([]);
-  const [aprModal, setAprModal] = useState({
-    earningData: {} as TEarningData,
-    daily: 0,
-    lastHardWork: "0",
-    symbol: "",
-    state: false,
-    pool: {},
-  });
 
   const [vsHoldModal, setVsHoldModal] = useState<TVSHoldModalState>({
     assetsVsHold: [],
@@ -765,35 +760,12 @@ const SonicVaults = (): JSX.Element => {
                             )}
                           </div>
                         </td>
-                        <td
-                          onClick={(e) => {
-                            if (isMobile) {
-                              e.stopPropagation();
-                              setAprModal({
-                                earningData: vault.earningData,
-                                daily: vault.daily,
-                                lastHardWork: vault.lastHardWork,
-                                symbol: vault?.risk?.symbol as string,
-                                state: true,
-                                pool: vault?.pool,
-                              });
-                            }
-                          }}
-                          className="px-2 min-[1130px]:px-3 py-2 tooltip cursor-help"
-                        >
-                          <div
-                            className={`whitespace-nowrap w-full text-end flex items-center justify-end gap-[2px] ${
-                              vault?.risk?.isRektStrategy
-                                ? "text-[#818181]"
-                                : "text-[#eaecef]"
-                            }`}
-                          >
-                            <p className="text-end">
-                              {formatNumber(aprValue, "formatAPR")}%
-                            </p>
-                          </div>
-                          <div className="visible__tooltip">
-                            <div className="flex items-start flex-col gap-4">
+
+                        <Tippy
+                          theme="custom"
+                          delay={0}
+                          content={
+                            <div className="flex font-manrope items-start flex-col gap-4 w-[250px] bg-[#26282f] px-5 py-[10px]">
                               <div className="flex flex-col gap-1 w-full">
                                 {!!vault?.risk?.isRektStrategy && (
                                   <div className="flex flex-col items-center gap-2 mb-[10px]">
@@ -859,9 +831,31 @@ const SonicVaults = (): JSX.Element => {
                                 />
                               </div>
                             </div>
-                            <i></i>
-                          </div>
-                        </td>
+                          }
+                          placement="top"
+                        >
+                          <td
+                            onClick={(e) => {
+                              if (isMobile) {
+                                e.stopPropagation();
+                              }
+                            }}
+                            className="px-2 min-[1130px]:px-3 py-2 tooltip cursor-help"
+                          >
+                            <div
+                              className={`whitespace-nowrap w-full text-end flex items-center justify-end gap-[2px] ${
+                                vault?.risk?.isRektStrategy
+                                  ? "text-[#818181]"
+                                  : "text-[#eaecef]"
+                              }`}
+                            >
+                              <p className="text-end">
+                                {formatNumber(aprValue, "formatAPR")}%
+                              </p>
+                            </div>
+                          </td>
+                        </Tippy>
+
                         {/* <td
                           onClick={(e) => {
                             if (isMobile) {
@@ -1051,9 +1045,6 @@ const SonicVaults = (): JSX.Element => {
         tab={currentTab}
         setTab={setCurrentTab}
       />
-      {aprModal.state && (
-        <APRModal state={aprModal} setModalState={setAprModal} />
-      )}
       {vsHoldModal.state && (
         <VSHoldModal state={vsHoldModal} setModalState={setVsHoldModal} />
       )}
diff --git a/src/modules/Vault/components/InfoBar.tsx b/src/modules/Vault/components/InfoBar.tsx
index 24dfa18..e77b8a2 100644
--- a/src/modules/Vault/components/InfoBar.tsx
+++ b/src/modules/Vault/components/InfoBar.tsx
@@ -22,7 +22,7 @@ import { formatFromBigInt, formatNumber } from "@utils";
 import { CHAINS } from "@constants";
 
 import type { TAPRPeriod, TVault } from "@types";
-import {seeds} from "@stabilitydao/stability";
+import { seeds } from "@stabilitydao/stability";
 
 interface IProps {
   network: string;
@@ -65,7 +65,7 @@ const InfoBar: React.FC<IProps> = memo(({ network, vault }) => {
   }, [$aprFilter, userBalances]);
 
   useEffect(() => {
-    if (vault?.balance && vault?.shareprice) {
+    if (vault?.shareprice) {
       const vaultBalance = BigInt(vault?.balance);
       const shareBalance = Number(
         formatFromBigInt(vault?.balance, 18).toFixed(5)
@@ -80,6 +80,7 @@ const InfoBar: React.FC<IProps> = memo(({ network, vault }) => {
       setUserBalances({ shareBalance, USDBalance });
     }
   }, [vault]);
+
   const vaultChain = useMemo(
     () => CHAINS.find((item) => item.id === network),
     [network]
diff --git a/src/modules/Vault/components/InvestForm/index.tsx b/src/modules/Vault/components/InvestForm/index.tsx
index 1a1102a..9ac8b2c 100644
--- a/src/modules/Vault/components/InvestForm/index.tsx
+++ b/src/modules/Vault/components/InvestForm/index.tsx
@@ -1455,6 +1455,7 @@ const InvestForm: React.FC<IProps> = ({ network, vault }) => {
     if (shortId === "IQMF" || shortId === "IRMF") {
       localAssets = vault.assets.map((asset) => asset.address);
     }
+
     if (underlyingToken?.address === option[0]) {
       const decimalPercent = BigInt(Math.floor(Number(settings.slippage)));
 
@@ -1511,6 +1512,7 @@ const InvestForm: React.FC<IProps> = ({ network, vault }) => {
         if (transaction.status === "success") {
           resetFormAfterTx();
         }
+
         lastTx.set(transaction?.transactionHash);
         setLoader(false);
       } catch (err) {
@@ -1584,6 +1586,7 @@ const InvestForm: React.FC<IProps> = ({ network, vault }) => {
         if (transaction.status === "success") {
           resetFormAfterTx();
         }
+
         lastTx.set(transaction?.transactionHash);
         setLoader(false);
       } catch (err) {
@@ -1674,6 +1677,7 @@ const InvestForm: React.FC<IProps> = ({ network, vault }) => {
         if (transaction.status === "success") {
           resetFormAfterTx();
         }
+
         lastTx.set(transaction?.transactionHash);
         setLoader(false);
       } catch (err) {