diff --git a/ui/app/(prowler)/invitations/page.tsx b/ui/app/(prowler)/invitations/page.tsx
index ceb33715c5..4eb0699e9e 100644
--- a/ui/app/(prowler)/invitations/page.tsx
+++ b/ui/app/(prowler)/invitations/page.tsx
@@ -5,7 +5,6 @@ import { getInvitations } from "@/actions/invitations/invitation";
 import { getRoles } from "@/actions/roles";
 import { FilterControls } from "@/components/filters";
 import { filterInvitations } from "@/components/filters/data-filters";
-import { AddIcon } from "@/components/icons";
 import {
   ColumnsInvitation,
   SkeletonTableInvitation,
@@ -32,10 +31,7 @@ export default async function Invitations({
           <DataTableFilterCustom filters={filterInvitations || []} />
 
           <Button asChild>
-            <Link href="/invitations/new">
-              Send Invitation
-              <AddIcon size={20} />
-            </Link>
+            <Link href="/invitations/new">Send Invitation</Link>
           </Button>
         </div>
 
diff --git a/ui/app/(prowler)/roles/page.tsx b/ui/app/(prowler)/roles/page.tsx
index e63aa9138f..faed4cbe13 100644
--- a/ui/app/(prowler)/roles/page.tsx
+++ b/ui/app/(prowler)/roles/page.tsx
@@ -4,7 +4,6 @@ import { Suspense } from "react";
 import { getRoles } from "@/actions/roles";
 import { FilterControls } from "@/components/filters";
 import { filterRoles } from "@/components/filters/data-filters";
-import { AddIcon } from "@/components/icons";
 import { ColumnsRoles, SkeletonTableRoles } from "@/components/roles/table";
 import { Button } from "@/components/shadcn";
 import { ContentLayout } from "@/components/shadcn/content-layout";
@@ -27,10 +26,7 @@ export default async function Roles({
         <div className="flex flex-row items-end justify-between">
           <DataTableFilterCustom filters={filterRoles || []} />
           <Button asChild>
-            <Link href="/roles/new">
-              Add Role
-              <AddIcon size={20} />
-            </Link>
+            <Link href="/roles/new">Add Role</Link>
           </Button>
         </div>
 
diff --git a/ui/app/(prowler)/users/page.tsx b/ui/app/(prowler)/users/page.tsx
index f5d4ab4b36..0d0fa9565b 100644
--- a/ui/app/(prowler)/users/page.tsx
+++ b/ui/app/(prowler)/users/page.tsx
@@ -5,7 +5,6 @@ import { getRoles } from "@/actions/roles/roles";
 import { getCurrentUserTenantRole, getUsers } from "@/actions/users/users";
 import { auth } from "@/auth.config";
 import { FilterControls } from "@/components/filters";
-import { AddIcon } from "@/components/icons";
 import { Button } from "@/components/shadcn";
 import { ContentLayout } from "@/components/shadcn/content-layout";
 import { DataTable } from "@/components/shadcn/table";
@@ -28,10 +27,7 @@ export default async function Users({
       <div className="flex flex-col gap-6">
         <div className="flex flex-row items-end justify-end">
           <Button asChild>
-            <Link href="/invitations/new">
-              Invite User
-              <AddIcon size={20} />
-            </Link>
+            <Link href="/invitations/new">Invite User</Link>
           </Button>
         </div>
 
diff --git a/ui/components/layout/sidebar/sidebar.tsx b/ui/components/layout/sidebar/sidebar.tsx
index 16815eb6c3..79052d3551 100644
--- a/ui/components/layout/sidebar/sidebar.tsx
+++ b/ui/components/layout/sidebar/sidebar.tsx
@@ -5,7 +5,6 @@ import Link from "next/link";
 
 import { ProwlerShort } from "@/components/icons";
 import { ProwlerExtended } from "@/components/icons";
-import { Button } from "@/components/shadcn/button/button";
 import { useSidebar } from "@/hooks/use-sidebar";
 import { useStore } from "@/hooks/use-store";
 import { cn } from "@/lib/utils";
@@ -29,40 +28,30 @@ export function Sidebar() {
         onMouseLeave={() => setIsHover(false)}
         className="no-scrollbar relative flex h-full flex-col overflow-x-hidden overflow-y-auto px-3 py-6"
       >
-        <Button
+        <Link
+          href="/"
           className={cn(
-            "mb-1 transition-transform duration-300 ease-in-out",
+            "mb-6 flex w-full flex-col items-center justify-center px-3 transition-transform duration-300 ease-in-out",
             !getOpenState() ? "translate-x-1" : "translate-x-0",
+            !isOpen && "gap-0",
           )}
-          variant="link"
-          asChild
         >
-          <Link
-            href="/"
-            className={clsx(
-              "mb-6 flex w-full flex-col items-center justify-center px-3",
-              {
-                "gap-0": !isOpen,
-              },
-            )}
+          <div
+            className={clsx({
+              hidden: isOpen,
+            })}
           >
-            <div
-              className={clsx({
-                hidden: isOpen,
-              })}
-            >
-              <ProwlerShort />
-            </div>
-            <div
-              className={clsx({
-                hidden: !isOpen,
-                "mt-0!": isOpen,
-              })}
-            >
-              <ProwlerExtended />
-            </div>
-          </Link>
-        </Button>
+            <ProwlerShort />
+          </div>
+          <div
+            className={clsx({
+              hidden: !isOpen,
+              "mt-0!": isOpen,
+            })}
+          >
+            <ProwlerExtended />
+          </div>
+        </Link>
 
         <Menu isOpen={getOpenState()} />
       </div>
diff --git a/ui/pnpm-workspace.yaml b/ui/pnpm-workspace.yaml
index f3e525fc03..4196a58f5b 100644
--- a/ui/pnpm-workspace.yaml
+++ b/ui/pnpm-workspace.yaml
@@ -6,10 +6,6 @@ packages: []
 # Refuse to install on Node/pnpm outside the `engines` block in package.json.
 engineStrict: true
 
-# Hoist the HeroUI family so its legacy peer-dep pattern resolves.
-publicHoistPattern:
-  - "*@heroui/*"
-
 # Default `pnpm add` to exact versions — matches package.json convention.
 saveExact: true
 
@@ -67,8 +63,6 @@ allowBuilds:
   "@sentry/cli": true
   # esbuild: Go binary. Downloads the pre-compiled binary matching the current platform/architecture.
   esbuild: true
-  # @heroui/shared-utils: Demi pattern — detects React/Next.js version at install time and copies the compatible bundle (React 18 vs 19).
-  "@heroui/shared-utils": true
   # unrs-resolver: Rust module resolver (NAPI-RS). Verifies the correct native binding is available for the platform.
   unrs-resolver: true
   # msw: Copies mockServiceWorker.js into the directories listed in package.json's `msw.workerDirectory` (here: `public/`) so the runtime worker stays in sync with the installed msw version. Pure file copy — no native binary, no network access. Required for vitest browser tests to intercept fetches via the service worker.