diff --git a/src/components/Header/Nav/NavBar.tsx b/src/components/Header/Nav/NavBar.tsx
index 12e2f9121a7..cf709758762 100644
--- a/src/components/Header/Nav/NavBar.tsx
+++ b/src/components/Header/Nav/NavBar.tsx
@@ -50,7 +50,7 @@ export const NavBar = ({ path, searchTrigger, onHideChange, productsNav, subProd
               {searchTrigger && <div className={styles.searchTrigger}>{searchTrigger}</div>}
               <div id="weglot" />
               <a
-                rel="noreferrer"
+                rel="noreferrer noopener"
                 target="_blank"
                 className={clsx(styles.button)}
                 href="https://github.com/smartcontractkit/documentation"
diff --git a/src/components/Header/Nav/ProductNavigation/Desktop/ProductNavigation.tsx b/src/components/Header/Nav/ProductNavigation/Desktop/ProductNavigation.tsx
index a365874b373..b69de3a3b50 100644
--- a/src/components/Header/Nav/ProductNavigation/Desktop/ProductNavigation.tsx
+++ b/src/components/Header/Nav/ProductNavigation/Desktop/ProductNavigation.tsx
@@ -39,7 +39,12 @@ export const ProductNavigation = ({ path, setNavMenuOpen, productsNav, subProduc
 
   return (
     <>
-      <a rel="noreferrer" target="_blank" className={clsx("home-logo", styles.logo)} href="https://chain.link/">
+      <a
+        rel="noreferrer noopener"
+        target="_blank"
+        className={clsx("home-logo", styles.logo)}
+        href="https://chain.link/"
+      >
         <img
           alt="Chainlink Home"
           title="Chainlink Home"
diff --git a/src/components/Header/Nav/ProductNavigation/Mobile/BottomBar.tsx b/src/components/Header/Nav/ProductNavigation/Mobile/BottomBar.tsx
index 4f987b7e091..86552922874 100644
--- a/src/components/Header/Nav/ProductNavigation/Mobile/BottomBar.tsx
+++ b/src/components/Header/Nav/ProductNavigation/Mobile/BottomBar.tsx
@@ -3,7 +3,12 @@ import { ResourcesIcon } from "./ResourcesIcon"
 import { Search } from "../../../aiSearch/Search"
 
 const ResourcesButton = () => (
-  <a rel="noreferrer" target="_blank" className="nav-cta" href="https://github.com/smartcontractkit/documentation">
+  <a
+    rel="noreferrer noopener"
+    target="_blank"
+    className="nav-cta"
+    href="https://github.com/smartcontractkit/documentation"
+  >
     <ResourcesIcon />
     <span
       style={{
diff --git a/src/components/Header/Nav/ProductNavigation/Mobile/ProductNavigation.tsx b/src/components/Header/Nav/ProductNavigation/Mobile/ProductNavigation.tsx
index 4f694c37d6d..12107d9f82a 100644
--- a/src/components/Header/Nav/ProductNavigation/Mobile/ProductNavigation.tsx
+++ b/src/components/Header/Nav/ProductNavigation/Mobile/ProductNavigation.tsx
@@ -50,7 +50,12 @@ export function ProductNavigation({ productsNav }: Props) {
 
   return (
     <Root open={open} onOpenChange={handleOpenChange}>
-      <a rel="noreferrer" target="_blank" className={clsx("home-logo", styles.logo)} href="https://chain.link/">
+      <a
+        rel="noreferrer noopener"
+        target="_blank"
+        className={clsx("home-logo", styles.logo)}
+        href="https://chain.link/"
+      >
         <img
           alt="Chainlink Home"
           title="Chainlink Home"
diff --git a/src/features/common/Tooltip/Tooltip.tsx b/src/features/common/Tooltip/Tooltip.tsx
index 8a61d3d5bcf..8536496a900 100644
--- a/src/features/common/Tooltip/Tooltip.tsx
+++ b/src/features/common/Tooltip/Tooltip.tsx
@@ -1,4 +1,4 @@
-import { Tooltip as ChainlinkToolTip } from "@chainlink/components"
+import { Tooltip as ChainlinkToolTip } from "@chainlink/components/src/Tooltip/Tooltip"
 
 export const Tooltip = ({
   label,