diff --git a/packages/frontend/src/App.vue b/packages/frontend/src/App.vue
index a2c9d7e..e5c99b1 100644
--- a/packages/frontend/src/App.vue
+++ b/packages/frontend/src/App.vue
@@ -248,11 +248,13 @@ const isElementVisibleAndFocusable = (element: HTMLElement): boolean => {
   <div id="app-container">
     <!-- *** 修改 v-if 条件以使用 isHeaderVisible *** -->
     <!-- Header with Tailwind classes using theme variables -->
-    <header v-if="!isWorkspaceRoute || isHeaderVisible" class="sticky top-0 z-10 flex items-center h-14 px-6 bg-header border-b border-border shadow-sm"> <!-- Use border-b with explicit border-border color -->
+    <header v-if="!isWorkspaceRoute || isHeaderVisible" class="sticky top-0 z-10 flex items-center h-14 pl-3 pr-6 bg-header border-b border-border shadow-sm"> <!-- 减少左侧内边距 -->
       <!-- Nav with Tailwind classes -->
       <nav ref="navRef" class="flex items-center justify-between w-full relative"> <!-- Added relative positioning for underline -->
         <!-- Left navigation links with Tailwind classes using theme variables -->
         <div class="flex items-center space-x-1">
+          <!-- 项目 Logo -->
+          <img src="./assets/logo.png" alt="Project Logo" class="h-10 w-auto"> <!-- 移除右侧外边距，使其更靠左 -->
             <!-- <RouterLink to="/">{{ t('nav.dashboard') }}</RouterLink> --> <!-- 隐藏仪表盘链接 -->
             <RouterLink to="/workspace" class="px-3 py-2 rounded-md text-sm font-medium text-secondary hover:text-link-hover hover:bg-nav-active-bg hover:no-underline transition duration-150 ease-in-out whitespace-nowrap" active-class="text-link-active bg-nav-active-bg">{{ t('nav.terminal') }}</RouterLink>
             <RouterLink to="/proxies" class="px-3 py-2 rounded-md text-sm font-medium text-secondary hover:text-link-hover hover:bg-nav-active-bg hover:no-underline transition duration-150 ease-in-out whitespace-nowrap" active-class="text-link-active bg-nav-active-bg">{{ t('nav.proxies') }}</RouterLink>
diff --git a/packages/frontend/src/assets/logo.png b/packages/frontend/src/assets/logo.png
new file mode 100644
index 0000000..95d7ff7
Binary files /dev/null and b/packages/frontend/src/assets/logo.png differ
diff --git a/packages/frontend/src/views/LoginView.vue b/packages/frontend/src/views/LoginView.vue
index a2c0a59..41d6f92 100644
--- a/packages/frontend/src/views/LoginView.vue
+++ b/packages/frontend/src/views/LoginView.vue
@@ -33,7 +33,11 @@ const handleSubmit = async () => {
 
 <template>
   <div class="flex justify-center items-center min-h-[calc(100vh-150px)] p-8 bg-background">
-    <div class="bg-dialog text-dialog-text p-8 md:p-12 rounded-lg shadow-lg w-full max-w-md">
+    <div class="bg-background text-foreground p-8 md:p-12 rounded-lg shadow-lg w-full max-w-md border border-border"> <!-- Changed bg-dialog to bg-background, text-dialog-text to text-foreground, added border -->
+      <!-- Logo -->
+      <div class="flex justify-center mb-6">
+        <img src="../assets/logo.png" alt="Project Logo" class="h-20 w-auto"> <!-- 增大 logo 高度 -->
+      </div>
       <h2 class="text-center text-2xl font-semibold mb-6 text-foreground">{{ t('login.title') }}</h2>
       <form @submit.prevent="handleSubmit">
         <!-- Regular Login Fields -->
diff --git a/packages/frontend/src/views/SetupView.vue b/packages/frontend/src/views/SetupView.vue
index 36cd3ba..0653b02 100644
--- a/packages/frontend/src/views/SetupView.vue
+++ b/packages/frontend/src/views/SetupView.vue
@@ -1,6 +1,10 @@
 <template>
   <div class="flex justify-center items-center min-h-[calc(100vh-150px)] p-8 bg-background">
-    <div class="bg-dialog text-dialog-text p-8 md:p-12 rounded-lg shadow-lg w-full max-w-md border border-border">
+    <div class="bg-background text-foreground p-8 md:p-12 rounded-lg shadow-lg w-full max-w-md border border-border"> <!-- Changed bg-dialog to bg-background, text-dialog-text to text-foreground -->
+      <!-- Logo -->
+      <div class="flex justify-center mb-6">
+        <img src="../assets/logo.png" alt="Project Logo" class="h-20 w-auto"> <!-- 增大 logo 高度 -->
+      </div>
       <h2 class="text-center text-2xl font-semibold mb-4 text-foreground">{{ $t('setup.title') }}</h2>
       <p class="text-center text-sm text-text-secondary mb-6">
         {{ $t('setup.description') }}