diff --git a/src/pages/LoginPage.tsx b/src/pages/LoginPage.tsx
index d1095d1..aa6cb1d 100644
--- a/src/pages/LoginPage.tsx
+++ b/src/pages/LoginPage.tsx
@@ -10,6 +10,7 @@ import { useTranslation } from 'react-i18next';
 import { ArrowRight, Loader2 } from 'lucide-react';
 
 import Logo from '@/components/common/Logo';
+import { ThemeSwitcher } from '@/components/common/ThemeSwitcher';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
 import { Card, CardContent, CardHeader } from '@/components/ui/card';
@@ -41,6 +42,9 @@ export default function LoginPage() {
 
   return (
     <div className="flex min-h-screen items-center justify-center bg-content-background px-4">
+      <div className="fixed right-4 top-4 z-50">
+        <ThemeSwitcher />
+      </div>
       <Card className="w-full max-w-sm shadow-sm">
         <CardHeader className="items-center text-center">
           <Logo />
diff --git a/src/pages/OAuthCallback.tsx b/src/pages/OAuthCallback.tsx
index 3b99f79..c7cf3a6 100644
--- a/src/pages/OAuthCallback.tsx
+++ b/src/pages/OAuthCallback.tsx
@@ -10,6 +10,7 @@ import { useTranslation } from 'react-i18next';
 import { Loader2 } from 'lucide-react';
 
 import { useAuthStore } from '@/stores/authStore';
+import { ThemeSwitcher } from '@/components/common/ThemeSwitcher';
 import { getBasePath } from '@/lib/basePath';
 import { exchangeCode, getStoredOAuthData, clearStoredOAuthData, getOAuthRedirectUri } from '@/services/auth/oauth';
 
@@ -82,6 +83,9 @@ export default function OAuthCallback() {
   if (error) {
     return (
       <div className="flex min-h-screen items-center justify-center bg-background px-4">
+        <div className="fixed right-4 top-4 z-50">
+          <ThemeSwitcher />
+        </div>
         <div className="w-full max-w-sm space-y-4 text-center">
           <p className="text-sm text-destructive" role="alert">
             {error}
@@ -96,6 +100,9 @@ export default function OAuthCallback() {
 
   return (
     <div className="flex min-h-screen items-center justify-center bg-background">
+      <div className="fixed right-4 top-4 z-50">
+        <ThemeSwitcher />
+      </div>
       <div className="flex flex-col items-center gap-3">
         <Loader2 className="h-8 w-8 animate-spin text-muted-foreground" />
         <p className="text-sm text-muted-foreground">{t('oauth.processing', 'Completing sign in...')}</p>