diff --git a/frontend/src/components/shared/AllToolsNavButton.tsx b/frontend/src/components/shared/AllToolsNavButton.tsx
index 39563fa06..d25893f6c 100644
--- a/frontend/src/components/shared/AllToolsNavButton.tsx
+++ b/frontend/src/components/shared/AllToolsNavButton.tsx
@@ -47,30 +47,28 @@ const AllToolsNavButton: React.FC<AllToolsNavButtonProps> = ({ activeButton, set
 
   return (
     <Tooltip content={t("quickAccess.allTools", "All Tools")} position="right" arrow containerStyle={{ marginTop: "-1rem" }} maxWidth={200}>
-      <Anchor
-        href={navProps.href}
-        onClick={handleNavClick}
-        style={{ textDecoration: 'none', color: 'inherit' }}
-      >
-        <div className="flex flex-col items-center gap-1 mt-4 mb-2">
-          <ActionIcon
-            size={'lg'}
-            variant="subtle"
-            style={{
-              backgroundColor: isActive ? 'var(--icon-tools-bg)' : 'var(--icon-inactive-bg)',
-              color: isActive ? 'var(--icon-tools-color)' : 'var(--icon-inactive-color)',
-              border: 'none',
-              borderRadius: '8px',
-            }}
-            className={isActive ? 'activeIconScale' : ''}
-          >
-            {iconNode}
-          </ActionIcon>
-          <span className={`all-tools-text ${isActive ? 'active' : 'inactive'}`}>
-            {t("quickAccess.allTools", "All Tools")}
-          </span>
-        </div>
-      </Anchor>
+      <div className="flex flex-col items-center gap-1 mt-4 mb-2">
+        <ActionIcon
+          component="a"
+          href={navProps.href}
+          onClick={handleNavClick}
+          size={'lg'}
+          variant="subtle"
+          style={{
+            backgroundColor: isActive ? 'var(--icon-tools-bg)' : 'var(--icon-inactive-bg)',
+            color: isActive ? 'var(--icon-tools-color)' : 'var(--icon-inactive-color)',
+            border: 'none',
+            borderRadius: '8px',
+            textDecoration: 'none'
+          }}
+          className={isActive ? 'activeIconScale' : ''}
+        >
+          {iconNode}
+        </ActionIcon>
+        <span className={`all-tools-text ${isActive ? 'active' : 'inactive'}`}>
+          {t("quickAccess.allTools", "All Tools")}
+        </span>
+      </div>
     </Tooltip>
   );
 };
diff --git a/frontend/src/components/shared/QuickAccessBar.tsx b/frontend/src/components/shared/QuickAccessBar.tsx
index 95134d90f..90533dca8 100644
--- a/frontend/src/components/shared/QuickAccessBar.tsx
+++ b/frontend/src/components/shared/QuickAccessBar.tsx
@@ -60,8 +60,33 @@ const QuickAccessBar = forwardRef<HTMLDivElement>(({
       config.onClick();
     };
 
-    const buttonElement = (
-      <div className="flex flex-col items-center gap-1" style={{ marginTop: index === 0 ? '0.5rem' : "0rem" }}>
+    // Render with URL navigation if available, otherwise regular div
+    if (navProps) {
+      return (
+        <div key={config.id} className="flex flex-col items-center gap-1" style={{ marginTop: index === 0 ? '0.5rem' : "0rem" }}>
+          <ActionIcon
+            component="a"
+            href={navProps.href}
+            onClick={(e: React.MouseEvent) => handleClick(e)}
+            size={isActive ? (config.size || 'lg') : 'lg'}
+            variant="subtle"
+            style={getNavButtonStyle(config, activeButton, isFilesModalOpen, configModalOpen, selectedToolKey, leftPanelView)}
+            className={isActive ? 'activeIconScale' : ''}
+            data-testid={`${config.id}-button`}
+          >
+            <span className="iconContainer">
+              {config.icon}
+            </span>
+          </ActionIcon>
+          <span className={`button-text ${isActive ? 'active' : 'inactive'}`}>
+            {config.name}
+          </span>
+        </div>
+      );
+    }
+
+    return (
+      <div key={config.id} className="flex flex-col items-center gap-1" style={{ marginTop: index === 0 ? '0.5rem' : "0rem" }}>
         <ActionIcon
           size={isActive ? (config.size || 'lg') : 'lg'}
           variant="subtle"
@@ -79,22 +104,6 @@ const QuickAccessBar = forwardRef<HTMLDivElement>(({
         </span>
       </div>
     );
-
-    // Wrap with Anchor if it has URL navigation
-    if (navProps) {
-      return (
-        <Anchor
-          key={config.id}
-          href={navProps.href}
-          onClick={handleClick}
-          style={{ textDecoration: 'none', color: 'inherit' }}
-        >
-          {buttonElement}
-        </Anchor>
-      );
-    }
-
-    return <div key={config.id}>{buttonElement}</div>;
   };
 
 
diff --git a/frontend/src/components/shared/quickAccessBar/ActiveToolButton.tsx b/frontend/src/components/shared/quickAccessBar/ActiveToolButton.tsx
index 45fd649ff..ae2dd1c51 100644
--- a/frontend/src/components/shared/quickAccessBar/ActiveToolButton.tsx
+++ b/frontend/src/components/shared/quickAccessBar/ActiveToolButton.tsx
@@ -143,7 +143,8 @@ const ActiveToolButton: React.FC<ActiveToolButtonProps> = ({ activeButton, setAc
           <div className="current-tool-content">
             <div className="flex flex-col items-center gap-1">
               <Tooltip content={isBackHover ? 'Back to all tools' : indicatorTool.name} position="right" arrow maxWidth={140}>
-                <Anchor
+                <ActionIcon
+                  component="a"
                   href={getHomeNavigation().href}
                   onClick={(e: React.MouseEvent) => {
                     // Check if it's a special click (middle click, ctrl+click, etc.)
@@ -156,31 +157,28 @@ const ActiveToolButton: React.FC<ActiveToolButtonProps> = ({ activeButton, setAc
                     setActiveButton('tools');
                     handleBackToTools();
                   }}
-                  style={{ textDecoration: 'none', color: 'inherit' }}
+                  size={'xl'}
+                  variant="subtle"
+                  onMouseEnter={() => setIsBackHover(true)}
+                  onMouseLeave={() => setIsBackHover(false)}
+                  aria-label={isBackHover ? 'Back to all tools' : indicatorTool.name}
+                  style={{
+                    backgroundColor: isBackHover ? 'var(--color-gray-300)' : 'var(--icon-tools-bg)',
+                    color: isBackHover ? '#fff' : 'var(--icon-tools-color)',
+                    border: 'none',
+                    borderRadius: '8px',
+                    cursor: 'pointer',
+                    textDecoration: 'none'
+                  }}
                 >
-                  <ActionIcon
-                    size={'xl'}
-                    variant="subtle"
-                    onMouseEnter={() => setIsBackHover(true)}
-                    onMouseLeave={() => setIsBackHover(false)}
-                    aria-label={isBackHover ? 'Back to all tools' : indicatorTool.name}
-                    style={{
-                      backgroundColor: isBackHover ? 'var(--color-gray-300)' : 'var(--icon-tools-bg)',
-                      color: isBackHover ? '#fff' : 'var(--icon-tools-color)',
-                      border: 'none',
-                      borderRadius: '8px',
-                      cursor: 'pointer'
-                    }}
-                  >
-                    <span className="iconContainer">
-                      {isBackHover ? (
-                        <ArrowBackRoundedIcon sx={{ fontSize: '1.5rem' }} />
-                      ) : (
-                        indicatorTool.icon
-                      )}
-                    </span>
-                  </ActionIcon>
-                </Anchor>
+                  <span className="iconContainer">
+                    {isBackHover ? (
+                      <ArrowBackRoundedIcon sx={{ fontSize: '1.5rem' }} />
+                    ) : (
+                      indicatorTool.icon
+                    )}
+                  </span>
+                </ActionIcon>
               </Tooltip>
               <FitText
                 as="span"
diff --git a/frontend/src/components/tools/toolPicker/ToolButton.tsx b/frontend/src/components/tools/toolPicker/ToolButton.tsx
index 8e88a2eb7..25e156571 100644
--- a/frontend/src/components/tools/toolPicker/ToolButton.tsx
+++ b/frontend/src/components/tools/toolPicker/ToolButton.tsx
@@ -48,27 +48,53 @@ const ToolButton: React.FC<ToolButtonProps> = ({ id, tool, isSelected, onSelect
     </>
   );
 
+  const handleExternalClick = (e: React.MouseEvent) => {
+    // Check if it's a special click (middle click, ctrl+click, etc.)
+    if (e.metaKey || e.ctrlKey || e.shiftKey || e.button === 1) {
+      return; // Let browser handle it via href
+    }
+
+    // For regular clicks, prevent default and use window.open
+    e.preventDefault();
+    handleClick(id);
+  };
+
   const buttonElement = navProps ? (
-    // For tools with URLs, wrap in anchor for proper link behavior
-    <Anchor
+    // For internal tools with URLs, render Button as an anchor for proper link behavior
+    <Button
+      component="a"
       href={navProps.href}
       onClick={navProps.onClick}
-      style={{ textDecoration: 'none', color: 'inherit' }}
+      variant={isSelected ? "filled" : "subtle"}
+      size="sm"
+      radius="md"
+      fullWidth
+      justify="flex-start"
+      className="tool-button"
+      styles={{ root: { borderRadius: 0, color: "var(--tools-text-and-icon-color)" } }}
     >
-      <Button
-        variant={isSelected ? "filled" : "subtle"}
-        size="sm"
-        radius="md"
-        fullWidth
-        justify="flex-start"
-        className="tool-button"
-        styles={{ root: { borderRadius: 0, color: "var(--tools-text-and-icon-color)" } }}
-      >
-        {buttonContent}
-      </Button>
-    </Anchor>
+      {buttonContent}
+    </Button>
+  ) : tool.link && !isUnavailable ? (
+    // For external links, render Button as an anchor with proper href
+    <Button
+      component="a"
+      href={tool.link}
+      target="_blank"
+      rel="noopener noreferrer"
+      onClick={handleExternalClick}
+      variant={isSelected ? "filled" : "subtle"}
+      size="sm"
+      radius="md"
+      fullWidth
+      justify="flex-start"
+      className="tool-button"
+      styles={{ root: { borderRadius: 0, color: "var(--tools-text-and-icon-color)" } }}
+    >
+      {buttonContent}
+    </Button>
   ) : (
-    // For external links and unavailable tools, use regular button
+    // For unavailable tools, use regular button
     <Button
       variant={isSelected ? "filled" : "subtle"}
       onClick={() => handleClick(id)}
diff --git a/frontend/src/hooks/useToolNavigation.ts b/frontend/src/hooks/useToolNavigation.ts
index 4e010a297..dad7625aa 100644
--- a/frontend/src/hooks/useToolNavigation.ts
+++ b/frontend/src/hooks/useToolNavigation.ts
@@ -46,7 +46,7 @@ export function useToolNavigation(): {
     };
 
     return { href, onClick };
-  }, [actions, handleToolSelect]);
+  }, [handleToolSelect]);
 
   return { getToolNavigation };
 }
\ No newline at end of file