diff --git a/frontend/src/routes/dashboard/users/+page.svelte b/frontend/src/routes/dashboard/users/+page.svelte
index 45af87ee..1edb8a30 100644
--- a/frontend/src/routes/dashboard/users/+page.svelte
+++ b/frontend/src/routes/dashboard/users/+page.svelte
@@ -17,6 +17,7 @@
 	import { Textarea } from '$lib/components/ui/textarea';
 	import { Switch } from '$lib/components/ui/switch';
 	import * as Select from '$lib/components/ui/select';
+	import * as Tooltip from '$lib/components/ui/tooltip';
 	import { Badge } from '$lib/components/ui/badge';
 	import { Checkbox } from '$lib/components/ui/checkbox';
 	import { 
@@ -1064,35 +1065,58 @@
 								</Table.Cell>
 								<Table.Cell class="text-right">
 									<div class="flex justify-end gap-2">
-										<Button 
-											variant="ghost" 
-											size="icon"
-											onclick={() => openRolesDialog(user)}
-											title="Gestionar roles"
-										>
-											<Shield class="h-4 w-4" />
-										</Button>
-										<Button 
-											variant="ghost" 
-											size="icon"
-											onclick={() => openEditDialog(user)}
-										>
-											<Pencil class="h-4 w-4" />
-										</Button>
-										<Button 
-											variant="ghost" 
-											size="icon"
-											onclick={() => openPasswordDialog(user)}
-										>
-											<Key class="h-4 w-4" />
-										</Button>
-										<Button 
-											variant="ghost" 
-											size="icon"
-											onclick={() => openDeleteDialog(user)}
-										>
-											<Trash2 class="h-4 w-4 text-destructive" />
-										</Button>
+										<Tooltip.Root>
+											<Tooltip.Trigger asChild>
+												<Button 
+													variant="ghost" 
+													size="icon"
+													onclick={() => openRolesDialog(user)}
+													aria-label="Gestionar roles"
+												>
+													<Shield class="h-4 w-4" />
+												</Button>
+											</Tooltip.Trigger>
+											<Tooltip.Content side="top">Gestionar roles</Tooltip.Content>
+										</Tooltip.Root>
+										<Tooltip.Root>
+											<Tooltip.Trigger asChild>
+												<Button 
+													variant="ghost" 
+													size="icon"
+													onclick={() => openEditDialog(user)}
+													aria-label="Editar usuario"
+												>
+													<Pencil class="h-4 w-4" />
+												</Button>
+											</Tooltip.Trigger>
+											<Tooltip.Content side="top">Editar usuario</Tooltip.Content>
+										</Tooltip.Root>
+										<Tooltip.Root>
+											<Tooltip.Trigger asChild>
+												<Button 
+													variant="ghost" 
+													size="icon"
+													onclick={() => openPasswordDialog(user)}
+													aria-label="Restablecer contrasena"
+												>
+													<Key class="h-4 w-4" />
+												</Button>
+											</Tooltip.Trigger>
+											<Tooltip.Content side="top">Restablecer contrasena</Tooltip.Content>
+										</Tooltip.Root>
+										<Tooltip.Root>
+											<Tooltip.Trigger asChild>
+												<Button 
+													variant="ghost" 
+													size="icon"
+													onclick={() => openDeleteDialog(user)}
+													aria-label="Eliminar usuario"
+												>
+													<Trash2 class="h-4 w-4 text-destructive" />
+												</Button>
+											</Tooltip.Trigger>
+											<Tooltip.Content side="top">Eliminar usuario</Tooltip.Content>
+										</Tooltip.Root>
 									</div>
 								</Table.Cell>
 							</Table.Row>