diff --git a/components/selectors/color-selector.tsx b/components/selectors/color-selector.tsx
index 493e2e4..2ca86ac 100644
--- a/components/selectors/color-selector.tsx
+++ b/components/selectors/color-selector.tsx
@@ -129,7 +129,7 @@ export const ColorSelector = ({ open, onOpenChange }: ColorSelectorProps) => {
       </PopoverTrigger>
       <PopoverContent
         sideOffset={5}
-        className="my-1 rounded-tl-lg border border-border bg-muted px-1 py-2 transition-all [&::-webkit-scrollbar]:w-[0.4rem] scrollbar-gutter-stable [&::-webkit-scrollbar-thumb]:bg-border [&::-webkit-scrollbar-track]:bg-transparent flex max-h-80 w-48 flex-col overflow-hidden overflow-y-auto p-1 shadow-xl"
+        className="my-1 rounded-tl-lg border border-border bg-muted px-1 py-2 transition-all [&::-webkit-scrollbar]:w-[0.4rem] [&::-webkit-scrollbar-thumb]:bg-border [&::-webkit-scrollbar-track]:bg-transparent flex max-h-80 w-48 flex-col overflow-hidden overflow-y-auto p-1 shadow-xl"
         align="start"
       >
         <div className="flex flex-col">
diff --git a/components/table-controls.tsx b/components/table-controls.tsx
index e1e7c0b..895552b 100644
--- a/components/table-controls.tsx
+++ b/components/table-controls.tsx
@@ -13,7 +13,12 @@ import {
   X,
 } from "lucide-react";
 import { Button } from "./ui/button";
-
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
+import { useHoverTooltip } from "@/hooks/useHoverTooltip";
 interface TableControlsProps {
   editor: Editor;
 }
@@ -49,7 +54,7 @@ export const TableControls = ({ editor }: TableControlsProps) => {
 
   const menuRef = useRef<HTMLDivElement>(null);
   const pillRef = useRef<HTMLDivElement>(null);
-
+  const tooltip = useHoverTooltip();
   const focusCell = useCallback(
     (cell: HTMLElement) => {
       try {
@@ -231,30 +236,52 @@ export const TableControls = ({ editor }: TableControlsProps) => {
   const pill = (
     <div
       ref={pillRef}
-      className="fixed flex items-center gap-0.5 bg-muted border border-border rounded-tl-md shadow-md px-0.5 py-0.5 z-[9998]"
+      className="fixed flex items-center gap-0.5 bg-muted border border-border rounded-tl-lg shadow-md px-0.5 py-0.5 z-[9998]"
       style={{ left: pillX, top: pillY }}
       onMouseDown={(e) => e.stopPropagation()}
     >
-      <Button
-        variant="ghost"
-        title="Add row below"
-        aria-label="Add row below"
-        onClick={quickAdd}
-        className=" w-6 h-6 "
-        size="icon"
-      >
-        <Plus className="w-3.5 h-3.5 " />
-      </Button>
-      <Button
-        variant="ghost"
-        title="Cell options"
-        aria-label="Cell options"
-        onClick={openMenu}
-        className=" w-6 h-6"
-        size="icon"
-      >
-        <ChevronDown className="w-3.5 h-3.5" />
-      </Button>
+      <Tooltip disableHoverableContent delayDuration={100}>
+        <TooltipTrigger asChild>
+          <Button
+            variant="ghost"
+            aria-label="Add row below"
+            onClick={quickAdd}
+            className=" w-6 h-6 "
+            size="icon"
+          >
+            <Plus className="w-3.5 h-3.5 " />
+          </Button>
+        </TooltipTrigger>
+        <TooltipContent
+          side="bottom"
+          alignOffset={0}
+          align="end"
+          className=" text-xs py-0.5 px-1.5"
+        >
+          Add row below
+        </TooltipContent>
+      </Tooltip>
+      <Tooltip disableHoverableContent delayDuration={100}>
+        <TooltipTrigger asChild>
+          <Button
+            variant="ghost"
+            aria-label="Cell options"
+            onClick={openMenu}
+            className=" w-6 h-6 !rounded-none"
+            size="icon"
+          >
+            <ChevronDown className="w-3.5 h-3.5" />
+          </Button>
+        </TooltipTrigger>
+        <TooltipContent
+          side="bottom"
+          alignOffset={0}
+          align="end"
+          className=" text-xs py-0.5 px-1.5"
+        >
+          Cell options
+        </TooltipContent>
+      </Tooltip>
     </div>
   );