diff --git a/apps/studio/components/interfaces/Database/Indexes/Indexes.tsx b/apps/studio/components/interfaces/Database/Indexes/Indexes.tsx
index 7c9dc433c26..86958d4846c 100644
--- a/apps/studio/components/interfaces/Database/Indexes/Indexes.tsx
+++ b/apps/studio/components/interfaces/Database/Indexes/Indexes.tsx
@@ -14,6 +14,9 @@ import {
   TableHead,
   TableHeader,
   TableRow,
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
 } from 'ui'
 import { Input } from 'ui-patterns/DataInputs/Input'
 import { ConfirmationModal } from 'ui-patterns/Dialogs/ConfirmationModal'
@@ -264,13 +267,18 @@ export const Indexes = () => {
                                 View definition
                               </Button>
                               {!isSchemaLocked && (
-                                <Button
-                                  aria-label="Delete index"
-                                  variant="text"
-                                  className="px-1"
-                                  icon={<Trash />}
-                                  onClick={() => setDeleteIndexId(index.name)}
-                                />
+                                <Tooltip>
+                                  <TooltipTrigger asChild>
+                                    <Button
+                                      aria-label="Delete index"
+                                      variant="text"
+                                      className="px-1"
+                                      icon={<Trash />}
+                                      onClick={() => setDeleteIndexId(index.name)}
+                                    />
+                                  </TooltipTrigger>
+                                  <TooltipContent side="bottom">Delete index</TooltipContent>
+                                </Tooltip>
                               )}
                             </div>
                           </TableCell>
diff --git a/apps/studio/components/interfaces/Database/Policies/PolicyTableRow/PolicyRow.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyTableRow/PolicyRow.tsx
index 6a2a3a40da3..f9b6338a511 100644
--- a/apps/studio/components/interfaces/Database/Policies/PolicyTableRow/PolicyRow.tsx
+++ b/apps/studio/components/interfaces/Database/Policies/PolicyTableRow/PolicyRow.tsx
@@ -121,14 +121,20 @@ export const PolicyRow = ({
       <TableCell className="text-right whitespace-nowrap">
         {!isLocked && (
           <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-              <Button
-                variant="default"
-                className="px-1.5"
-                icon={<MoreVertical />}
-                data-testid={`policy-${policy.name}-actions-button`}
-              />
-            </DropdownMenuTrigger>
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <DropdownMenuTrigger asChild>
+                  <Button
+                    variant="default"
+                    className="px-1.5"
+                    icon={<MoreVertical />}
+                    data-testid={`policy-${policy.name}-actions-button`}
+                    aria-label={`${policy.name} actions`}
+                  />
+                </DropdownMenuTrigger>
+              </TooltipTrigger>
+              <TooltipContent side="bottom">More options</TooltipContent>
+            </Tooltip>
             <DropdownMenuContent side="bottom" align="end" className="w-52">
               <DropdownMenuItem className="gap-x-2" onClick={() => onSelectEditPolicy(policy)}>
                 <Edit size={14} />
diff --git a/apps/studio/components/interfaces/Database/Roles/RoleRow.tsx b/apps/studio/components/interfaces/Database/Roles/RoleRow.tsx
index c1ce8ba4ebc..68f082b276c 100644
--- a/apps/studio/components/interfaces/Database/Roles/RoleRow.tsx
+++ b/apps/studio/components/interfaces/Database/Roles/RoleRow.tsx
@@ -17,6 +17,9 @@ import {
   FormControl,
   FormField,
   Switch,
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
 } from 'ui'
 import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
 import * as z from 'zod'
@@ -154,14 +157,19 @@ export const RoleRow = ({ role, disabled = false, onSelectDelete }: RoleRowProps
         </CollapsibleTrigger>
         {!disabled && (
           <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-              <Button
-                variant="default"
-                className="px-1"
-                icon={<MoreVertical />}
-                aria-label={`${role.name} actions`}
-              />
-            </DropdownMenuTrigger>
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <DropdownMenuTrigger asChild>
+                  <Button
+                    variant="default"
+                    className="px-1"
+                    icon={<MoreVertical />}
+                    aria-label={`${role.name} actions`}
+                  />
+                </DropdownMenuTrigger>
+              </TooltipTrigger>
+              <TooltipContent side="bottom">More options</TooltipContent>
+            </Tooltip>
             <DropdownMenuContent side="bottom" align="end" className="w-[120px]">
               <DropdownMenuItem
                 className="space-x-2"
diff --git a/apps/studio/components/interfaces/Database/Tables/TableList.tsx b/apps/studio/components/interfaces/Database/Tables/TableList.tsx
index b25c9e57e5a..9021dc12d54 100644
--- a/apps/studio/components/interfaces/Database/Tables/TableList.tsx
+++ b/apps/studio/components/interfaces/Database/Tables/TableList.tsx
@@ -514,14 +514,19 @@ export const TableList = ({
 
                             {!isSchemaLocked && (
                               <DropdownMenu>
-                                <DropdownMenuTrigger asChild>
-                                  <Button
-                                    variant="default"
-                                    className="px-1"
-                                    icon={<MoreVertical />}
-                                    aria-label={`Table ${x.name} actions`}
-                                  />
-                                </DropdownMenuTrigger>
+                                <Tooltip>
+                                  <TooltipTrigger asChild>
+                                    <DropdownMenuTrigger asChild>
+                                      <Button
+                                        variant="default"
+                                        className="px-1"
+                                        icon={<MoreVertical />}
+                                        aria-label={`Table ${x.name} actions`}
+                                      />
+                                    </DropdownMenuTrigger>
+                                  </TooltipTrigger>
+                                  <TooltipContent side="bottom">More options</TooltipContent>
+                                </Tooltip>
                                 <DropdownMenuContent side="bottom" align="end" className="w-40">
                                   <DropdownMenuItem
                                     className="flex items-center space-x-2"
diff --git a/e2e/studio/features/rls-policies.spec.ts b/e2e/studio/features/rls-policies.spec.ts
index 899afdefac7..6d6c9195c65 100644
--- a/e2e/studio/features/rls-policies.spec.ts
+++ b/e2e/studio/features/rls-policies.spec.ts
@@ -231,7 +231,7 @@ test.describe('RLS Policies', () => {
       ).toBeVisible({ timeout: 50000 })
 
       // Verify policy appears in the list
-      await expect(page.getByRole('button', { name: policySelectName })).toBeVisible()
+      await expect(page.getByRole('button', { name: policySelectName, exact: true })).toBeVisible()
 
       // Verify policy details
       const policyRow = page.locator(`tr:has-text("${policySelectName}")`)
@@ -288,7 +288,7 @@ test.describe('RLS Policies', () => {
       })
 
       // Verify policy appears with correct details
-      await expect(page.getByRole('button', { name: policyInsertName })).toBeVisible()
+      await expect(page.getByRole('button', { name: policyInsertName, exact: true })).toBeVisible()
       const policyRow = page.locator(`tr:has-text("${policyInsertName}")`)
       await expect(policyRow.locator('code').filter({ hasText: /^INSERT$/ })).toBeVisible()
       await expect(policyRow.locator('code').filter({ hasText: /^authenticated$/ })).toBeVisible()
@@ -349,7 +349,7 @@ test.describe('RLS Policies', () => {
       })
 
       // Verify policy appears
-      await expect(page.getByRole('button', { name: policyUpdateName })).toBeVisible()
+      await expect(page.getByRole('button', { name: policyUpdateName, exact: true })).toBeVisible()
       const policyRow = page.locator(`tr:has-text("${policyUpdateName}")`)
       await expect(policyRow.locator('code').filter({ hasText: /^UPDATE$/ })).toBeVisible()
     })
@@ -401,7 +401,7 @@ test.describe('RLS Policies', () => {
       })
 
       // Verify policy appears
-      await expect(page.getByRole('button', { name: policyDeleteName })).toBeVisible()
+      await expect(page.getByRole('button', { name: policyDeleteName, exact: true })).toBeVisible()
       const policyRow = page.locator(`tr:has-text("${policyDeleteName}")`)
       await expect(policyRow.locator('code').filter({ hasText: /^DELETE$/ })).toBeVisible()
     })