diff --git a/src/pages/Settings.tsx b/src/pages/Settings.tsx
index 054635f..fd4cb51 100644
--- a/src/pages/Settings.tsx
+++ b/src/pages/Settings.tsx
@@ -1,13 +1,18 @@
 
 import { Helmet } from 'react-helmet';
+import { useNavigate } from 'react-router-dom';
 import NavBar from "@/components/NavBar";
 import Header from "@/components/Header";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
+import { Button } from "@/components/ui/button";
+import { Bell, Lock, Moon, User, HelpCircle, CreditCard } from "lucide-react";
 import SyncSettings from "@/components/SyncSettings";
 import SupabaseTestPanel from "@/components/SupabaseTestPanel";
 
 const Settings = () => {
+  const navigate = useNavigate();
+
   return (
     <div className="min-h-screen bg-background">
       <Helmet>
@@ -23,6 +28,77 @@ const Settings = () => {
           </TabsList>
           
           <TabsContent value="general" className="space-y-6">
+            {/* 프로필 관리 */}
+            <Card>
+              <CardHeader>
+                <CardTitle>사용자 설정</CardTitle>
+                <CardDescription>
+                  계정 정보 및 개인 설정을 관리합니다.
+                </CardDescription>
+              </CardHeader>
+              <CardContent className="space-y-4">
+                <Button
+                  variant="outline"
+                  className="w-full justify-between"
+                  onClick={() => navigate('/profile')}
+                >
+                  <div className="flex items-center gap-2">
+                    <User className="h-4 w-4" />
+                    <span>프로필 관리</span>
+                  </div>
+                  <span>&#8250;</span>
+                </Button>
+                
+                <Button
+                  variant="outline"
+                  className="w-full justify-between"
+                  onClick={() => navigate('/security-privacy')}
+                >
+                  <div className="flex items-center gap-2">
+                    <Lock className="h-4 w-4" />
+                    <span>보안 및 개인정보</span>
+                  </div>
+                  <span>&#8250;</span>
+                </Button>
+                
+                <Button
+                  variant="outline"
+                  className="w-full justify-between"
+                  onClick={() => navigate('/notifications')}
+                >
+                  <div className="flex items-center gap-2">
+                    <Bell className="h-4 w-4" />
+                    <span>알림 설정</span>
+                  </div>
+                  <span>&#8250;</span>
+                </Button>
+              </CardContent>
+            </Card>
+
+            {/* 결제 방법 */}
+            <Card>
+              <CardHeader>
+                <CardTitle>결제 방법</CardTitle>
+                <CardDescription>
+                  결제 카드 및 계좌 정보를 관리합니다.
+                </CardDescription>
+              </CardHeader>
+              <CardContent>
+                <Button
+                  variant="outline"
+                  className="w-full justify-between"
+                  onClick={() => navigate('/payment-methods')}
+                >
+                  <div className="flex items-center gap-2">
+                    <CreditCard className="h-4 w-4" />
+                    <span>결제 수단 관리</span>
+                  </div>
+                  <span>&#8250;</span>
+                </Button>
+              </CardContent>
+            </Card>
+            
+            {/* 동기화 설정 */}
             <Card>
               <CardHeader>
                 <CardTitle>동기화 설정</CardTitle>
@@ -40,17 +116,48 @@ const Settings = () => {
           </TabsContent>
           
           <TabsContent value="advanced" className="space-y-6">
+            {/* 테마 설정 */}
             <Card>
               <CardHeader>
-                <CardTitle>고급 설정</CardTitle>
+                <CardTitle>앱 설정</CardTitle>
                 <CardDescription>
-                  앱의 고급 기능 및 최적화 옵션을 설정합니다.
+                  앱의 기본 설정 및 테마를 관리합니다.
+                </CardDescription>
+              </CardHeader>
+              <CardContent className="space-y-4">
+                <Button
+                  variant="outline"
+                  className="w-full justify-between"
+                >
+                  <div className="flex items-center gap-2">
+                    <Moon className="h-4 w-4" />
+                    <span>테마 설정</span>
+                  </div>
+                  <span>준비 중</span>
+                </Button>
+              </CardContent>
+            </Card>
+
+            {/* 도움말 및 지원 */}
+            <Card>
+              <CardHeader>
+                <CardTitle>도움말 및 지원</CardTitle>
+                <CardDescription>
+                  문의사항 및 문제 해결을 위한 지원을 받으세요.
                 </CardDescription>
               </CardHeader>
               <CardContent>
-                <p className="text-sm text-gray-500">
-                  현재 사용 가능한 고급 설정이 없습니다.
-                </p>
+                <Button
+                  variant="outline"
+                  className="w-full justify-between"
+                  onClick={() => navigate('/help')}
+                >
+                  <div className="flex items-center gap-2">
+                    <HelpCircle className="h-4 w-4" />
+                    <span>도움말 보기</span>
+                  </div>
+                  <span>&#8250;</span>
+                </Button>
               </CardContent>
             </Card>
           </TabsContent>