diff --git a/src/components/back-button.tsx b/src/components/back-button.tsx
index ecd2827..37583fc 100644
--- a/src/components/back-button.tsx
+++ b/src/components/back-button.tsx
@@ -1,14 +1,8 @@
 import Link from "next/link";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
 import { useTranslations } from "next-intl";
 import { ArrowLeftIcon } from "lucide-react";
-import { Button } from "@/components/ui/button";
+import { TooltipButton } from "@/components/tooltip-button";
 
 interface BackButtonProps {
   href: string;
@@ -19,23 +13,14 @@ export const BackButton = ({ href, className }: BackButtonProps) => {
   const t = useTranslations();
 
   return (
-    <TooltipProvider delayDuration={0}>
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <Button
-            variant="ghost"
-            className={cn("h-8 w-auto p-2", className)}
-            asChild
-          >
-            <Link href={href}>
-              <ArrowLeftIcon size={16} aria-hidden="true" />
-            </Link>
-          </Button>
-        </TooltipTrigger>
-        <TooltipContent className="px-2 py-1 text-xs">
-          {t("BackButton")}
-        </TooltipContent>
-      </Tooltip>
-    </TooltipProvider>
+    <TooltipButton
+      tooltipContent={t("BackButton")}
+      className={cn("h-8 w-auto p-2", className)}
+      asChild
+    >
+      <Link href={href}>
+        <ArrowLeftIcon size={16} aria-hidden="true" />
+      </Link>
+    </TooltipButton>
   );
 };
diff --git a/src/components/tooltip-button.tsx b/src/components/tooltip-button.tsx
index 935a935..64bc608 100644
--- a/src/components/tooltip-button.tsx
+++ b/src/components/tooltip-button.tsx
@@ -14,7 +14,7 @@ interface TooltipButtonProps extends ButtonProps {
   className?: string;
 }
 
-const TooltipButton = ({
+export const TooltipButton = ({
   children,
   delayDuration = 0,
   tooltipContent,
@@ -43,5 +43,3 @@ const TooltipButton = ({
     </TooltipProvider>
   );
 };
-
-export { TooltipButton };