diff --git a/src/components/TopBar/index.tsx b/src/components/TopBar/index.tsx
index 03e65ce4a..2585c3cdc 100644
--- a/src/components/TopBar/index.tsx
+++ b/src/components/TopBar/index.tsx
@@ -12,7 +12,7 @@ import {
 	Power,
 	ChevronDown,
 	ChevronLeft,
-	House,
+	LayoutGrid,
 	Share,
 } from "lucide-react";
 import "./index.css";
@@ -253,7 +253,7 @@ function HeaderWin() {
 								 className="no-drag"
 								 onClick={() => navigate("/history")}
 									>
-									<House className="w-4 h-4" />
+									<LayoutGrid className="w-4 h-4" />
 							</Button>
 						</TooltipSimple>
 						<Button
diff --git a/src/components/WindowControls/index.css b/src/components/WindowControls/index.css
new file mode 100644
index 000000000..fbec636e9
--- /dev/null
+++ b/src/components/WindowControls/index.css
@@ -0,0 +1,25 @@
+#window-controls {
+  -webkit-app-region: no-drag;
+}
+
+.window-controls {
+  display: flex;
+  -webkit-app-region: no-drag;
+}
+
+.control-btn {
+  width: 35px;
+  cursor: pointer;
+  text-align: center;
+  line-height: 20px;
+	height: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	pointer-events: auto;
+	-webkit-app-region: no-drag;
+}
+.control-btn:hover{
+  background-color: #f0f0f0;
+}
+
diff --git a/src/components/WindowControls/index.tsx b/src/components/WindowControls/index.tsx
new file mode 100644
index 000000000..245175101
--- /dev/null
+++ b/src/components/WindowControls/index.tsx
@@ -0,0 +1,61 @@
+import { Minus, Square, X } from "lucide-react";
+import { useRef, useEffect, useState } from "react";
+import "./index.css";
+
+export default function WindowControls() {
+	const controlsRef = useRef<HTMLDivElement>(null);
+	const [platform, setPlatform] = useState<string>("");
+
+	useEffect(() => {
+		const p = window.electronAPI.getPlatform();
+		setPlatform(p);
+
+		if (p === "darwin") {
+			if (controlsRef.current) {
+				controlsRef.current.style.display = "none";
+			}
+		}
+	}, []);
+
+	if (platform === "darwin") {
+		return null;
+	}
+
+	return (
+		<div
+			className="window-controls h-full flex items-center"
+			id="window-controls"
+			ref={controlsRef}
+			style={{ WebkitAppRegion: 'no-drag' } as React.CSSProperties}
+		>
+			<div
+				className="control-btn h-full flex-1"
+				onClick={() => window.electronAPI.minimizeWindow()}
+			>
+				<Minus className="w-4 h-4" />
+			</div>
+			<div
+				className="control-btn h-full flex-1"
+				onClick={() => window.electronAPI.toggleMaximizeWindow()}
+			>
+				<Square className="w-4 h-4" />
+			</div>
+			<div
+				className="control-btn h-full flex-1"
+				onClick={(e) => {
+					e.stopPropagation();
+					e.preventDefault();
+					// Trigger window close - this will go through the before-close handler
+					// which checks if tasks are running and shows confirmation if needed
+					window.electronAPI.closeWindow(false);
+				}}
+				onMouseDown={(e) => {
+					e.stopPropagation();
+				}}
+			>
+				<X className="w-4 h-4" />
+			</div>
+		</div>
+	);
+}
+
diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx
index aa2c79f7c..3bd0e87f1 100644
--- a/src/pages/Login.tsx
+++ b/src/pages/Login.tsx
@@ -1,6 +1,6 @@
 import { useAuthStore } from "@/store/authStore";
 import { useNavigate, useLocation } from "react-router-dom";
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useState, useRef } from "react";
 import { useStackApp } from "@stackframe/react";
 import loginGif from "@/assets/login.gif";
 import { Button } from "@/components/ui/button";
@@ -14,6 +14,7 @@ import eyeOff from "@/assets/eye-off.svg";
 import { proxyFetchPost } from "@/api/http";
 import { hasStackKeys } from "@/lib";
 import { useTranslation } from "react-i18next";
+import WindowControls from "@/components/WindowControls";
 
 const HAS_STACK_KEYS = hasStackKeys();
 let lock = false;
@@ -34,6 +35,8 @@ export default function Login() {
 	});
 	const [isLoading, setIsLoading] = useState(false);
 	const [generalError, setGeneralError] = useState("");
+	const titlebarRef = useRef<HTMLDivElement>(null);
+	const [platform, setPlatform] = useState<string>("");
 
 	const validateEmail = (email: string) => {
 		const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
@@ -211,12 +214,72 @@ export default function Login() {
 		};
 	}, []);
 
+	useEffect(() => {
+		const p = window.electronAPI.getPlatform();
+		setPlatform(p);
+
+		if (platform === "darwin") {
+			titlebarRef.current?.classList.add("mac");
+		}
+	}, [platform]);
+
+	// Handle before-close event for login page
+	useEffect(() => {
+		const handleBeforeClose = () => {
+			// On login page, always close directly without confirmation
+			window.electronAPI.closeWindow(true);
+		};
+
+		window.ipcRenderer?.on("before-close", handleBeforeClose);
+
+		return () => {
+			window.ipcRenderer?.off("before-close", handleBeforeClose);
+		};
+	}, []);
+
 	return (
-		<div className={`p-2 flex items-center justify-center gap-2 h-full`}>
-			<div className="flex items-center justify-center h-[calc(800px-16px)] rounded-3xl bg-white-100%">
-				<img src={loginGif} className=" rounded-3xl h-full object-cover" />
+		<div className="h-full flex flex-col relative overflow-hidden">
+			{/* Titlebar with drag region and window controls */}
+			<div
+				className="absolute top-0 left-0 right-0 flex !h-9 items-center justify-between pl-2 py-1 z-50"
+				id="login-titlebar"
+				ref={titlebarRef}
+				style={{ WebkitAppRegion: 'drag' } as React.CSSProperties}
+			>
+				{/* Left spacer for macOS */}
+				<div
+					className={`${
+						platform === "darwin" ? "w-[70px]" : "w-0"
+					} flex items-center justify-center`}
+					style={{ WebkitAppRegion: 'no-drag' } as React.CSSProperties}
+				>
+					{platform === "darwin" && <span className="text-label-md text-text-heading font-bold">Eigent</span>}
+				</div>
+
+				{/* Center drag region */}
+				<div 
+					className="h-full flex-1 flex items-center"
+					style={{ WebkitAppRegion: 'drag' } as React.CSSProperties}
+				>
+					<div className="flex-1 h-10"></div>
+				</div>
+
+				{/* Right window controls */}
+				<div 
+					style={{ WebkitAppRegion: 'no-drag', pointerEvents: 'auto' } as React.CSSProperties}
+					onMouseDown={(e) => e.stopPropagation()}
+					onClick={(e) => e.stopPropagation()}
+				>
+					<WindowControls />
+				</div>
 			</div>
-			<div className="h-full flex-1 flex flex-col items-center justify-center">
+
+			{/* Main content - image extends to top, form has padding */}
+			<div className={`p-2 flex items-center justify-center gap-2 h-full`}>
+				<div className="flex items-center justify-center h-full rounded-3xl bg-white-100%">
+					<img src={loginGif} className="rounded-3xl h-full object-cover" />
+				</div>
+				<div className="h-full flex-1 flex flex-col items-center justify-center pt-11">
 				<div className="flex-1 flex flex-col w-80 items-center justify-center">
 						<div className="flex self-stretch items-end justify-between mb-4">
 							  <div className="text-text-heading text-heading-lg font-bold ">
@@ -319,6 +382,7 @@ export default function Login() {
 				>
 					{t("layout.privacy-policy")}
 				</Button>
+				</div>
 			</div>
 		</div>
 	);
diff --git a/utils/__pycache__/__init__.cpython-310.pyc b/utils/__pycache__/__init__.cpython-310.pyc
index 10d1d4a69..744ca18d8 100644
Binary files a/utils/__pycache__/__init__.cpython-310.pyc and b/utils/__pycache__/__init__.cpython-310.pyc differ
diff --git a/utils/__pycache__/traceroot_wrapper.cpython-310.pyc b/utils/__pycache__/traceroot_wrapper.cpython-310.pyc
index d695ee21d..b86cd68b6 100644
Binary files a/utils/__pycache__/traceroot_wrapper.cpython-310.pyc and b/utils/__pycache__/traceroot_wrapper.cpython-310.pyc differ