diff --git a/lang/zh_TW/auth.php b/lang/zh_TW/auth.php
index 6598e2c..a781294 100644
--- a/lang/zh_TW/auth.php
+++ b/lang/zh_TW/auth.php
@@ -13,8 +13,8 @@ return [
     |
     */
 
-    'failed' => 'These credentials do not match our records.',
-    'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'failed' => '帳號或密碼錯誤，請重新確認。',
+    'password' => '您輸入的密碼不正確。',
+    'throttle' => '登入嘗試次數過多。請在 :seconds 秒後再試。',
 
 ];
diff --git a/lang/zh_TW/validation.php b/lang/zh_TW/validation.php
index 4dc36c2..16a5ffc 100644
--- a/lang/zh_TW/validation.php
+++ b/lang/zh_TW/validation.php
@@ -196,6 +196,7 @@ return [
     */
 
     'attributes' => [
+        'username' => '帳號',
         'name' => '姓名',
         'email' => '電子郵件',
         'password' => '密碼',
diff --git a/public/S1_cropped.png b/public/S1_cropped.png
new file mode 100644
index 0000000..e68712d
Binary files /dev/null and b/public/S1_cropped.png differ
diff --git a/public/S1_cropped_transparent.png b/public/S1_cropped_transparent.png
new file mode 100644
index 0000000..215d1d7
Binary files /dev/null and b/public/S1_cropped_transparent.png differ
diff --git a/public/favicon.ico b/public/favicon.ico
index e69de29..aa04a47 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index e600b2d..bcf5517 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -29,6 +29,9 @@
             <div class="absolute inset-0 bg-gradient-to-tr from-blue-600 to-purple-500 opacity-90 dark:from-blue-900 dark:to-purple-900"></div>
             
             <div class="relative z-10 text-center px-6">
+                <div class="mb-6 flex justify-center">
+                    <img src="{{ asset('S1_cropped_transparent.png') }}" alt="{{ config('app.name') }} Logo" class="w-32 h-32 object-contain drop-shadow-xl">
+                </div>
                 <h2 class="text-3xl font-bold text-white sm:text-4xl">
                     {{ config('app.name', 'Star Cloud') }}
                 </h2>
@@ -42,6 +45,9 @@
         <div class="w-full md:w-1/2 lg:w-2/5 flex flex-col justify-center px-4 sm:px-6 md:px-8 lg:px-10 py-8">
             <div class="max-w-md w-full mx-auto">
                 <div class="text-center mb-8">
+                    <div class="md:hidden mb-6 flex justify-center">
+                        <img src="{{ asset('S1_cropped_transparent.png') }}" alt="{{ config('app.name') }} Logo" class="w-20 h-20 object-contain drop-shadow-md">
+                    </div>
                     <h1 class="block text-2xl font-bold text-gray-800 dark:text-white">登入</h1>
                     <p class="mt-2 text-sm text-gray-600 dark:text-gray-400">
                         請輸入您的帳號密碼以繼續
diff --git a/resources/views/components/application-logo.blade.php b/resources/views/components/application-logo.blade.php
index 46579cf..9535343 100644
--- a/resources/views/components/application-logo.blade.php
+++ b/resources/views/components/application-logo.blade.php
@@ -1,3 +1 @@
-<svg viewBox="0 0 316 316" xmlns="http://www.w3.org/2000/svg" {{ $attributes }}>
-    <path d="M305.8 81.125C305.77 80.995 305.69 80.885 305.65 80.755C305.56 80.525 305.49 80.285 305.37 80.075C305.29 79.935 305.17 79.815 305.07 79.685C304.94 79.515 304.83 79.325 304.68 79.175C304.55 79.045 304.39 78.955 304.25 78.845C304.09 78.715 303.95 78.575 303.77 78.475L251.32 48.275C249.97 47.495 248.31 47.495 246.96 48.275L194.51 78.475C194.33 78.575 194.19 78.725 194.03 78.845C193.89 78.955 193.73 79.045 193.6 79.175C193.45 79.325 193.34 79.515 193.21 79.685C193.11 79.815 192.99 79.935 192.91 80.075C192.79 80.285 192.71 80.525 192.63 80.755C192.58 80.875 192.51 80.995 192.48 81.125C192.38 81.495 192.33 81.875 192.33 82.265V139.625L148.62 164.795V52.575C148.62 52.185 148.57 51.805 148.47 51.435C148.44 51.305 148.36 51.195 148.32 51.065C148.23 50.835 148.16 50.595 148.04 50.385C147.96 50.245 147.84 50.125 147.74 49.995C147.61 49.825 147.5 49.635 147.35 49.485C147.22 49.355 147.06 49.265 146.92 49.155C146.76 49.025 146.62 48.885 146.44 48.785L93.99 18.585C92.64 17.805 90.98 17.805 89.63 18.585L37.18 48.785C37 48.885 36.86 49.035 36.7 49.155C36.56 49.265 36.4 49.355 36.27 49.485C36.12 49.635 36.01 49.825 35.88 49.995C35.78 50.125 35.66 50.245 35.58 50.385C35.46 50.595 35.38 50.835 35.3 51.065C35.25 51.185 35.18 51.305 35.15 51.435C35.05 51.805 35 52.185 35 52.575V232.235C35 233.795 35.84 235.245 37.19 236.025L142.1 296.425C142.33 296.555 142.58 296.635 142.82 296.725C142.93 296.765 143.04 296.835 143.16 296.865C143.53 296.965 143.9 297.015 144.28 297.015C144.66 297.015 145.03 296.965 145.4 296.865C145.5 296.835 145.59 296.775 145.69 296.745C145.95 296.655 146.21 296.565 146.45 296.435L251.36 236.035C252.72 235.255 253.55 233.815 253.55 232.245V174.885L303.81 145.945C305.17 145.165 306 143.725 306 142.155V82.265C305.95 81.875 305.89 81.495 305.8 81.125ZM144.2 227.205L100.57 202.515L146.39 176.135L196.66 147.195L240.33 172.335L208.29 190.625L144.2 227.205ZM244.75 114.995V164.795L226.39 154.225L201.03 139.625V89.825L219.39 100.395L244.75 114.995ZM249.12 57.105L292.81 82.265L249.12 107.425L205.43 82.265L249.12 57.105ZM114.49 184.425L96.13 194.995V85.305L121.49 70.705L139.85 60.135V169.815L114.49 184.425ZM91.76 27.425L135.45 52.585L91.76 77.745L48.07 52.585L91.76 27.425ZM43.67 60.135L62.03 70.705L87.39 85.305V202.545V202.555V202.565C87.39 202.735 87.44 202.895 87.46 203.055C87.49 203.265 87.49 203.485 87.55 203.695V203.705C87.6 203.875 87.69 204.035 87.76 204.195C87.84 204.375 87.89 204.575 87.99 204.745C87.99 204.745 87.99 204.755 88 204.755C88.09 204.905 88.22 205.035 88.33 205.175C88.45 205.335 88.55 205.495 88.69 205.635L88.7 205.645C88.82 205.765 88.98 205.855 89.12 205.965C89.28 206.085 89.42 206.225 89.59 206.325C89.6 206.325 89.6 206.325 89.61 206.335C89.62 206.335 89.62 206.345 89.63 206.345L139.87 234.775V285.065L43.67 229.705V60.135ZM244.75 229.705L148.58 285.075V234.775L219.8 194.115L244.75 179.875V229.705ZM297.2 139.625L253.49 164.795V114.995L278.85 100.395L297.21 89.825V139.625H297.2Z"/>
-</svg>
+<img src="{{ asset('S1_cropped_transparent.png') }}" alt="{{ config('app.name') }} Logo" {{ $attributes }}>
diff --git a/resources/views/components/loading-screen.blade.php b/resources/views/components/loading-screen.blade.php
index 233b0a3..1ef4362 100644
--- a/resources/views/components/loading-screen.blade.php
+++ b/resources/views/components/loading-screen.blade.php
@@ -37,8 +37,8 @@
             <div class="absolute inset-0 rounded-full bg-cyan-500/10 blur-xl animate-pulse"></div>
             
             <!-- Central Logo -->
-            <div class="relative w-20 h-20 rounded-3xl bg-slate-900/80 backdrop-blur-xl border border-white/20 flex items-center justify-center shadow-2xl">
-                <span class="text-white text-5xl font-black font-display tracking-tighter">S</span>
+            <div class="relative w-20 h-20 rounded-full bg-slate-900/80 backdrop-blur-xl border border-white/20 flex items-center justify-center shadow-2xl overflow-hidden p-1">
+                <img src="{{ asset('S1_cropped_transparent.png') }}" alt="Logo" class="w-full h-full object-contain">
             </div>
         </div>
         
diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php
index 228d990..2ee0e4d 100644
--- a/resources/views/layouts/admin.blade.php
+++ b/resources/views/layouts/admin.blade.php
@@ -58,8 +58,9 @@
     <header class="sticky top-0 inset-x-0 flex flex-wrap sm:justify-start sm:flex-nowrap z-[48] w-full bg-white/80 backdrop-blur-md border-b border-slate-200/50 text-sm py-2.5 sm:py-4 lg:pl-72 dark:bg-[#0f172a]/80 dark:border-slate-800/50 shadow-sm">
         <nav class="flex basis-full items-center w-full mx-auto px-4 sm:px-6 md:px-8" aria-label="Global">
             <div class="mr-5 lg:mr-0 lg:hidden text-center">
-                <a class="flex-none text-xl font-bold dark:text-white font-display tracking-tight" href="{{ route('admin.dashboard') }}" aria-label="Brand">
-                    Star<span class="text-cyan-500">Cloud</span>
+                <a class="flex items-center gap-x-2 flex-none text-xl font-bold dark:text-white font-display tracking-tight" href="{{ route('admin.dashboard') }}" aria-label="Brand">
+                    <img src="{{ asset('S1_cropped_transparent.png') }}" alt="{{ config('app.name') }} Logo" class="w-7 h-7 object-contain">
+                    <span>Star<span class="text-cyan-500">Cloud</span></span>
                 </a>
             </div>
 
@@ -221,9 +222,7 @@
         
         <div class="px-6 mb-8 mt-2">
             <a class="flex items-center gap-x-2 text-2xl font-bold text-slate-900 dark:text-white font-display tracking-tight whitespace-nowrap" href="{{ route('admin.dashboard') }}" aria-label="Brand">
-                <div class="w-8 h-8 rounded-lg bg-luxury-gradient flex items-center justify-center shadow-lg shadow-cyan-500/20">
-                    <span class="text-white text-base">S</span>
-                </div>
+                <img src="{{ asset('S1_cropped_transparent.png') }}" alt="{{ config('app.name') }} Logo" class="w-8 h-8 object-contain">
                 <span>Star<span class="text-cyan-500">Cloud</span></span>
             </a>
         </div>