diff --git a/apps/desktop/src/renderer/components/OpenInButton/OpenInButton.tsx b/apps/desktop/src/renderer/components/OpenInButton/OpenInButton.tsx
index e98e8717df9..8f40b42d88b 100644
--- a/apps/desktop/src/renderer/components/OpenInButton/OpenInButton.tsx
+++ b/apps/desktop/src/renderer/components/OpenInButton/OpenInButton.tsx
@@ -153,13 +153,13 @@ export function OpenInButton({
 			{label && (
 				<Tooltip>
 					<TooltipTrigger asChild>
-						<Button
-							variant="outline"
-							size="sm"
-							className="gap-1.5"
-							onClick={handleOpenLastUsed}
-							disabled={!path}
-						>
+					<Button
+						variant="outline"
+						size="sm"
+						className="gap-1.5 cursor-pointer"
+						onClick={handleOpenLastUsed}
+						disabled={!path}
+					>
 							<img
 								src={currentApp.icon}
 								alt=""
@@ -180,7 +180,7 @@ export function OpenInButton({
 					<Button
 						variant="outline"
 						size="sm"
-						className="gap-1"
+						className="gap-1 cursor-pointer"
 						disabled={!path}
 					>
 						<span>Open</span>
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/OpenInMenuButton/OpenInMenuButton.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/OpenInMenuButton/OpenInMenuButton.tsx
index e152554b311..42e1c428bc6 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/OpenInMenuButton/OpenInMenuButton.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/OpenInMenuButton/OpenInMenuButton.tsx
@@ -90,6 +90,7 @@ export const OpenInMenuButton = memo(function OpenInMenuButton({
 							"hover:bg-secondary hover:border-border",
 							"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
 							"active:scale-[0.98]",
+							"cursor-pointer",
 							isLoading && "opacity-50 pointer-events-none",
 						)}
 					>
@@ -137,6 +138,7 @@ export const OpenInMenuButton = memo(function OpenInMenuButton({
 							"hover:bg-secondary hover:border-border hover:text-foreground",
 							"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
 							"active:scale-[0.98]",
+							"cursor-pointer",
 							isLoading && "opacity-50 pointer-events-none",
 						)}
 					>
diff --git a/apps/desktop/src/renderer/screens/main/components/SettingsButton/SettingsButton.tsx b/apps/desktop/src/renderer/screens/main/components/SettingsButton/SettingsButton.tsx
index 00be6e09c3d..1da759163f9 100644
--- a/apps/desktop/src/renderer/screens/main/components/SettingsButton/SettingsButton.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/SettingsButton/SettingsButton.tsx
@@ -15,7 +15,7 @@ export function SettingsButton() {
 					size="icon"
 					onClick={() => navigate({ to: "/settings/account" })}
 					aria-label="Open settings"
-					className="no-drag"
+					className="no-drag cursor-pointer"
 				>
 					<CiSettings className="size-5" />
 				</Button>
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectHeader.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectHeader.tsx
index 197e01342f8..872c37611f0 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectHeader.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectHeader.tsx
@@ -189,7 +189,7 @@ export function ProjectHeader({
 									onClick={onToggleCollapse}
 									className={cn(
 										"flex items-center justify-center size-8 rounded-md",
-										"hover:bg-muted/50 transition-colors",
+										"hover:bg-muted/50 transition-colors cursor-pointer",
 									)}
 								>
 									<ProjectThumbnail
@@ -309,7 +309,7 @@ export function ProjectHeader({
 										onNewWorkspace();
 									}}
 									onContextMenu={(e) => e.stopPropagation()}
-									className="p-1 rounded hover:bg-muted transition-colors shrink-0 ml-1"
+									className="p-1 rounded hover:bg-muted transition-colors shrink-0 ml-1 cursor-pointer"
 								>
 									<HiMiniPlus className="size-4 text-muted-foreground" />
 								</button>
@@ -325,7 +325,7 @@ export function ProjectHeader({
 							onClick={onToggleCollapse}
 							onContextMenu={(e) => e.stopPropagation()}
 							aria-expanded={!isCollapsed}
-							className="p-1 rounded hover:bg-muted transition-colors shrink-0 ml-1"
+							className="p-1 rounded hover:bg-muted transition-colors shrink-0 ml-1 cursor-pointer"
 						>
 							<HiChevronRight
 								className={cn(
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx
index 0ffbff2c9f0..9044aa289dc 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx
@@ -255,7 +255,7 @@ export function WorkspaceListItem({
 				onMouseEnter={handleMouseEnter}
 				className={cn(
 					"relative flex items-center justify-center size-8 rounded-md",
-					"hover:bg-muted/50 transition-colors",
+					"hover:bg-muted/50 transition-colors cursor-pointer",
 					isActive && "bg-muted",
 				)}
 			>
@@ -492,15 +492,15 @@ export function WorkspaceListItem({
 								) : (
 									<Tooltip delayDuration={300}>
 										<TooltipTrigger asChild>
-											<button
-												type="button"
-												onClick={(e) => {
-													e.stopPropagation();
-													handleDeleteClick();
-												}}
-												className="opacity-0 group-hover:opacity-100 transition-opacity flex items-center justify-center text-muted-foreground hover:text-foreground"
-												aria-label="Close workspace"
-											>
+									<button
+										type="button"
+										onClick={(e) => {
+											e.stopPropagation();
+											handleDeleteClick();
+										}}
+										className="opacity-0 group-hover:opacity-100 transition-opacity flex items-center justify-center text-muted-foreground hover:text-foreground cursor-pointer"
+										aria-label="Close workspace"
+									>
 												<HiMiniXMark className="size-3.5" />
 											</button>
 										</TooltipTrigger>
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/BranchSwitcher/BranchSwitcher.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/BranchSwitcher/BranchSwitcher.tsx
index 3230eaa3851..74a79947801 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/BranchSwitcher/BranchSwitcher.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/BranchSwitcher/BranchSwitcher.tsx
@@ -120,7 +120,7 @@ export function BranchSwitcher({
 				<button
 					type="button"
 					className={cn(
-						"flex items-center gap-0.5 px-1 py-0.5 rounded text-xs text-muted-foreground hover:text-foreground hover:bg-muted/50 transition-colors",
+						"flex items-center gap-0.5 px-1 py-0.5 rounded text-xs text-muted-foreground hover:text-foreground hover:bg-muted/50 transition-colors cursor-pointer",
 						isOpen && "bg-muted/50 text-foreground",
 						className,
 					)}
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/NewWorkspaceButton.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/NewWorkspaceButton.tsx
index 2f301f4aefa..cdc5264e21c 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/NewWorkspaceButton.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/NewWorkspaceButton.tsx
@@ -51,7 +51,7 @@ export function NewWorkspaceButton({
 					<button
 						type="button"
 						onClick={handleClick}
-						className="group flex items-center justify-center size-8 rounded-md hover:bg-accent/50 transition-colors"
+						className="group flex items-center justify-center size-8 rounded-md hover:bg-accent/50 transition-colors cursor-pointer"
 					>
 						<div className="flex items-center justify-center size-5 rounded bg-accent">
 							<LuPlus className="size-3" strokeWidth={STROKE_WIDTH_THICK} />
@@ -69,7 +69,7 @@ export function NewWorkspaceButton({
 		<button
 			type="button"
 			onClick={handleClick}
-			className="group flex items-center gap-2 px-2 py-1.5 w-full text-sm font-medium text-muted-foreground hover:text-foreground hover:bg-accent/50 rounded-md transition-colors"
+			className="group flex items-center gap-2 px-2 py-1.5 w-full text-sm font-medium text-muted-foreground hover:text-foreground hover:bg-accent/50 rounded-md transition-colors cursor-pointer"
 		>
 			<div className="flex items-center justify-center size-5 rounded bg-accent">
 				<LuPlus className="size-3" strokeWidth={STROKE_WIDTH_THICK} />
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx
index 7273f98e349..c36beaae4af 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx
@@ -45,39 +45,39 @@ export function WorkspaceSidebarHeader({
 			<div className="flex flex-col items-center border-b border-border py-2 gap-2">
 				<Tooltip delayDuration={300}>
 					<TooltipTrigger asChild>
-						<button
-							type="button"
-							onClick={handleWorkspacesClick}
-							className={cn(
-								"flex items-center justify-center size-8 rounded-md transition-colors",
-								isWorkspacesListOpen
-									? "text-foreground bg-accent"
-									: "text-muted-foreground hover:text-foreground hover:bg-accent/50",
-							)}
-						>
-							<LuLayers className="size-4" strokeWidth={STROKE_WIDTH} />
-						</button>
+					<button
+						type="button"
+						onClick={handleWorkspacesClick}
+						className={cn(
+							"flex items-center justify-center size-8 rounded-md transition-colors cursor-pointer",
+							isWorkspacesListOpen
+								? "text-foreground bg-accent"
+								: "text-muted-foreground hover:text-foreground hover:bg-accent/50",
+						)}
+					>
+						<LuLayers className="size-4" strokeWidth={STROKE_WIDTH} />
+					</button>
 					</TooltipTrigger>
 					<TooltipContent side="right">Workspaces</TooltipContent>
 				</Tooltip>
 
 				<Tooltip delayDuration={300}>
 					<TooltipTrigger asChild>
-						<button
-							type="button"
-							onClick={handleTasksClick}
-							className={cn(
-								"flex items-center justify-center size-8 rounded-md transition-colors",
-								isTasksOpen
-									? "text-foreground bg-accent"
-									: "text-muted-foreground hover:text-foreground hover:bg-accent/50",
-							)}
-						>
-							<HiOutlineClipboardDocumentList
-								className="size-4"
-								strokeWidth={STROKE_WIDTH}
-							/>
-						</button>
+					<button
+						type="button"
+						onClick={handleTasksClick}
+						className={cn(
+							"flex items-center justify-center size-8 rounded-md transition-colors cursor-pointer",
+							isTasksOpen
+								? "text-foreground bg-accent"
+								: "text-muted-foreground hover:text-foreground hover:bg-accent/50",
+						)}
+					>
+						<HiOutlineClipboardDocumentList
+							className="size-4"
+							strokeWidth={STROKE_WIDTH}
+						/>
+					</button>
 					</TooltipTrigger>
 					<TooltipContent side="right">Tasks</TooltipContent>
 				</Tooltip>
@@ -93,7 +93,7 @@ export function WorkspaceSidebarHeader({
 				type="button"
 				onClick={handleWorkspacesClick}
 				className={cn(
-					"flex items-center gap-2 px-2 py-1.5 w-full rounded-md transition-colors",
+					"flex items-center gap-2 px-2 py-1.5 w-full rounded-md transition-colors cursor-pointer",
 					isWorkspacesListOpen
 						? "text-foreground bg-accent"
 						: "text-muted-foreground hover:text-foreground hover:bg-accent/50",
@@ -109,7 +109,7 @@ export function WorkspaceSidebarHeader({
 				type="button"
 				onClick={handleTasksClick}
 				className={cn(
-					"flex items-center gap-2 px-2 py-1.5 w-full rounded-md transition-colors",
+					"flex items-center gap-2 px-2 py-1.5 w-full rounded-md transition-colors cursor-pointer",
 					isTasksOpen
 						? "text-foreground bg-accent"
 						: "text-muted-foreground hover:text-foreground hover:bg-accent/50",