diff --git a/README.md b/README.md
index 7db0ff8..88c2ec6 100644
--- a/README.md
+++ b/README.md
@@ -1003,6 +1003,8 @@ ow + toggle 시각 언어로 통일했습니다.
 - 검증: `dotnet build src/AxCopilot/AxCopilot.csproj -c Release -v minimal -p:OutputPath=bin\\verify\\ -p:IntermediateOutputPath=obj\\verify\\` 예정
 - 업데이트: 2026-04-05 22:24 (KST)
 - 런처 하단 위젯의 신규 기본값을 모두 꺼짐으로 변경했습니다. [AppSettings.cs](/E:/AX%20Copilot%20-%20Codex/src/AxCopilot/Models/AppSettings.cs) 에서 `성능 / 포모도로 / 메모 / 날씨 / 일정 / 배터리` 위젯 기본값을 `false` 로 내려 새 설치나 설정 초기화 시 하단 위젯이 기본 비노출 상태로 시작합니다.
+- 업데이트: 2026-04-05 22:31 (KST)
+- AX Agent 내부 설정 공통 탭에서 `테마 스타일`, `테마 모드`를 맨 위로 올려 서비스/모델보다 먼저 보이게 재배치했습니다. 같이 [ChatWindow.xaml](/E:/AX%20Copilot%20-%20Codex/src/AxCopilot/Views/ChatWindow.xaml) 의 좌측 패널 토글 버튼은 3줄 햄버거가 아니라 좌측 패널/본문 구조가 보이는 패널 토글 아이콘으로 변경해 메뉴 아이콘과 혼동되지 않게 정리했습니다.
 
 ---
 
diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md
index 66aa35f..1ffc149 100644
--- a/docs/DEVELOPMENT.md
+++ b/docs/DEVELOPMENT.md
@@ -4760,3 +4760,5 @@ ow + toggle ?쒓컖 ?몄뼱濡??ㅼ떆 ?뺣젹?덈떎.
 - 회귀 프롬프트 세트는 [AX_AGENT_REGRESSION_PROMPTS.md](/E:/AX%20Copilot%20-%20Codex/docs/AX_AGENT_REGRESSION_PROMPTS.md) 로 별도 분리했습니다. Chat/Cowork/Code, queue follow-up, compact 이후 다음 턴, permission, slash skill 진입까지 `claw-code`와 같은 체크리스트로 비교할 수 있습니다.
 - 업데이트: 2026-04-05 22:24 (KST)
 - 런처 하단 위젯 기본값을 전부 꺼짐으로 변경했습니다. [AppSettings.cs](/E:/AX%20Copilot%20-%20Codex/src/AxCopilot/Models/AppSettings.cs) 에서 `ShowWidgetPerf`, `ShowWidgetPomo`, `ShowWidgetNote`, `ShowWidgetWeather`, `ShowWidgetCalendar`, `ShowWidgetBattery` 기본값을 `false` 로 내려 신규 설치/초기화 시 하단 위젯이 기본 숨김 상태로 시작하도록 맞췄습니다.
+- 업데이트: 2026-04-05 22:31 (KST)
+- [ChatWindow.xaml](/E:/AX%20Copilot%20-%20Codex/src/AxCopilot/Views/ChatWindow.xaml) 의 AX Agent 내부 설정 공통 탭에서 `테마 스타일`, `테마 모드` 섹션을 서비스/모델보다 위로 재배치했습니다. 또 상단 좌측 사이드바 토글 버튼은 3줄 햄버거 아이콘 대신 좌측 패널/본문 구조를 암시하는 패널 토글형 아이콘으로 교체해 메뉴 버튼과 구분되도록 정리했습니다.
diff --git a/src/AxCopilot/Views/ChatWindow.xaml b/src/AxCopilot/Views/ChatWindow.xaml
index e10d402..491fa3e 100644
--- a/src/AxCopilot/Views/ChatWindow.xaml
+++ b/src/AxCopilot/Views/ChatWindow.xaml
@@ -1084,35 +1084,61 @@
                                             BorderThickness="{TemplateBinding BorderThickness}"
                                             CornerRadius="6">
                                         <Grid Width="28" Height="28">
-                                            <StackPanel HorizontalAlignment="Center"
-                                                        VerticalAlignment="Center">
-                                                <Border x:Name="SidebarLine1"
-                                                        Width="11"
-                                                        Height="1.4"
-                                                        CornerRadius="1"
-                                                        Background="{DynamicResource SecondaryText}"/>
-                                                <Border x:Name="SidebarLine2"
-                                                        Width="11"
-                                                        Height="1.4"
-                                                        Margin="0,2.5,0,0"
-                                                        CornerRadius="1"
-                                                        Background="{DynamicResource SecondaryText}"/>
-                                                <Border x:Name="SidebarLine3"
-                                                        Width="11"
-                                                        Height="1.4"
-                                                        Margin="0,2.5,0,0"
-                                                        CornerRadius="1"
-                                                        Background="{DynamicResource SecondaryText}"/>
-                                            </StackPanel>
+                                            <Border Width="14"
+                                                    Height="10"
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"
+                                                    CornerRadius="2"
+                                                    BorderBrush="{DynamicResource SecondaryText}"
+                                                    BorderThickness="1">
+                                                <Grid>
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition Width="4"/>
+                                                        <ColumnDefinition Width="1"/>
+                                                        <ColumnDefinition Width="*"/>
+                                                    </Grid.ColumnDefinitions>
+                                                    <Border x:Name="SidebarPane"
+                                                            Grid.Column="0"
+                                                            Margin="1,1,0,1"
+                                                            CornerRadius="1,0,0,1"
+                                                            Background="{DynamicResource SecondaryText}"/>
+                                                    <Border x:Name="SidebarDivider"
+                                                            Grid.Column="1"
+                                                            Margin="0,1,0,1"
+                                                            Background="{DynamicResource SecondaryText}"
+                                                            Opacity="0.55"/>
+                                                    <Border x:Name="SidebarBodyLine1"
+                                                            Grid.Column="2"
+                                                            Width="5"
+                                                            Height="1"
+                                                            Margin="0,3,2,0"
+                                                            HorizontalAlignment="Right"
+                                                            VerticalAlignment="Top"
+                                                            CornerRadius="1"
+                                                            Background="{DynamicResource SecondaryText}"
+                                                            Opacity="0.85"/>
+                                                    <Border x:Name="SidebarBodyLine2"
+                                                            Grid.Column="2"
+                                                            Width="5"
+                                                            Height="1"
+                                                            Margin="0,0,2,3"
+                                                            HorizontalAlignment="Right"
+                                                            VerticalAlignment="Bottom"
+                                                            CornerRadius="1"
+                                                            Background="{DynamicResource SecondaryText}"
+                                                            Opacity="0.7"/>
+                                                </Grid>
+                                            </Border>
                                         </Grid>
                                     </Border>
                                     <ControlTemplate.Triggers>
                                         <Trigger Property="IsMouseOver" Value="True">
                                             <Setter TargetName="Root" Property="Background" Value="{DynamicResource ItemHoverBackground}"/>
                                             <Setter TargetName="Root" Property="BorderBrush" Value="{DynamicResource AccentColor}"/>
-                                            <Setter TargetName="SidebarLine1" Property="Background" Value="{DynamicResource AccentColor}"/>
-                                            <Setter TargetName="SidebarLine2" Property="Background" Value="{DynamicResource AccentColor}"/>
-                                            <Setter TargetName="SidebarLine3" Property="Background" Value="{DynamicResource AccentColor}"/>
+                                            <Setter TargetName="SidebarPane" Property="Background" Value="{DynamicResource AccentColor}"/>
+                                            <Setter TargetName="SidebarDivider" Property="Background" Value="{DynamicResource AccentColor}"/>
+                                            <Setter TargetName="SidebarBodyLine1" Property="Background" Value="{DynamicResource AccentColor}"/>
+                                            <Setter TargetName="SidebarBodyLine2" Property="Background" Value="{DynamicResource AccentColor}"/>
                                         </Trigger>
                                         <Trigger Property="IsPressed" Value="True">
                                             <Setter TargetName="Root" Property="Opacity" Value="0.88"/>
@@ -2605,6 +2631,108 @@
                                                        Foreground="{DynamicResource SecondaryText}"/>
                                         </StackPanel>
                                     </Border>
+                                    <StackPanel x:Name="OverlayThemeStylePanel"
+                                                Visibility="Collapsed"
+                                                Margin="0,0,0,12">
+                                        <TextBlock Text="테마 스타일"
+                                                   FontSize="12.5"
+                                                   FontWeight="SemiBold"
+                                                   Foreground="{DynamicResource PrimaryText}"/>
+                                        <TextBlock Text="AX Agent 전용 시각 언어를 고릅니다. 채팅 본문과 설정 카드 모두 같은 스타일로 바뀝니다."
+                                                   Margin="0,4,0,8"
+                                                   FontSize="11"
+                                                   TextWrapping="Wrap"
+                                                   Foreground="{DynamicResource SecondaryText}"/>
+                                        <WrapPanel>
+                                            <Border x:Name="OverlayThemeStyleClawCard"
+                                                    Cursor="Hand"
+                                                    CornerRadius="8"
+                                                    BorderThickness="1"
+                                                    BorderBrush="{DynamicResource BorderColor}"
+                                                    Padding="10,7"
+                                                    Margin="0,0,8,8"
+                                                    MouseLeftButtonUp="OverlayThemeStyleClawCard_MouseLeftButtonUp">
+                                                <TextBlock Text="Claw"
+                                                           FontSize="12"
+                                                           Foreground="{DynamicResource PrimaryText}"/>
+                                            </Border>
+                                            <Border x:Name="OverlayThemeStyleCodexCard"
+                                                    Cursor="Hand"
+                                                    CornerRadius="8"
+                                                    BorderThickness="1"
+                                                    BorderBrush="{DynamicResource BorderColor}"
+                                                    Padding="10,7"
+                                                    Margin="0,0,8,8"
+                                                    MouseLeftButtonUp="OverlayThemeStyleCodexCard_MouseLeftButtonUp">
+                                                <TextBlock Text="Codex"
+                                                           FontSize="12"
+                                                           Foreground="{DynamicResource PrimaryText}"/>
+                                            </Border>
+                                            <Border x:Name="OverlayThemeStyleSlateCard"
+                                                    Cursor="Hand"
+                                                    CornerRadius="8"
+                                                    BorderThickness="1"
+                                                    BorderBrush="{DynamicResource BorderColor}"
+                                                    Padding="10,7"
+                                                    Margin="0,0,8,8"
+                                                    MouseLeftButtonUp="OverlayThemeStyleSlateCard_MouseLeftButtonUp">
+                                                <TextBlock Text="Slate"
+                                                           FontSize="12"
+                                                           Foreground="{DynamicResource PrimaryText}"/>
+                                            </Border>
+                                        </WrapPanel>
+                                    </StackPanel>
+                                    <StackPanel x:Name="OverlayThemePanel"
+                                                Visibility="Collapsed"
+                                                Margin="0,0,0,12">
+                                        <TextBlock Text="테마 모드"
+                                                   FontSize="12.5"
+                                                   FontWeight="SemiBold"
+                                                   Foreground="{DynamicResource PrimaryText}"/>
+                                        <TextBlock Text="시스템 테마를 따르거나, AX Agent만 별도로 라이트/다크 모드로 고정할 수 있습니다."
+                                                   Margin="0,4,0,8"
+                                                   FontSize="11"
+                                                   TextWrapping="Wrap"
+                                                   Foreground="{DynamicResource SecondaryText}"/>
+                                        <WrapPanel>
+                                            <Border x:Name="OverlayThemeSystemCard"
+                                                    Cursor="Hand"
+                                                    CornerRadius="8"
+                                                    BorderThickness="1"
+                                                    BorderBrush="{DynamicResource BorderColor}"
+                                                    Padding="10,7"
+                                                    Margin="0,0,8,8"
+                                                    MouseLeftButtonUp="OverlayThemeSystemCard_MouseLeftButtonUp">
+                                                <TextBlock Text="System"
+                                                           FontSize="12"
+                                                           Foreground="{DynamicResource PrimaryText}"/>
+                                            </Border>
+                                            <Border x:Name="OverlayThemeLightCard"
+                                                    Cursor="Hand"
+                                                    CornerRadius="8"
+                                                    BorderThickness="1"
+                                                    BorderBrush="{DynamicResource BorderColor}"
+                                                    Padding="10,7"
+                                                    Margin="0,0,8,8"
+                                                    MouseLeftButtonUp="OverlayThemeLightCard_MouseLeftButtonUp">
+                                                <TextBlock Text="Light"
+                                                           FontSize="12"
+                                                           Foreground="{DynamicResource PrimaryText}"/>
+                                            </Border>
+                                            <Border x:Name="OverlayThemeDarkCard"
+                                                    Cursor="Hand"
+                                                    CornerRadius="8"
+                                                    BorderThickness="1"
+                                                    BorderBrush="{DynamicResource BorderColor}"
+                                                    Padding="10,7"
+                                                    Margin="0,0,8,8"
+                                                    MouseLeftButtonUp="OverlayThemeDarkCard_MouseLeftButtonUp">
+                                                <TextBlock Text="Dark"
+                                                           FontSize="12"
+                                                           Foreground="{DynamicResource PrimaryText}"/>
+                                            </Border>
+                                        </WrapPanel>
+                                    </StackPanel>
                                     <Border x:Name="OverlaySectionService"
                                             Background="Transparent"
                                             BorderBrush="{DynamicResource BorderColor}"
@@ -2837,108 +2965,6 @@
                                                                  FontSize="12"/>
                                                 </StackPanel>
                                             </Grid>
-                                            <StackPanel x:Name="OverlayThemeStylePanel"
-                                                        Visibility="Collapsed"
-                                                        Margin="0,14,0,12">
-                                                <TextBlock Text="테마 스타일"
-                                                           FontSize="12.5"
-                                                           FontWeight="SemiBold"
-                                                           Foreground="{DynamicResource PrimaryText}"/>
-                                                <TextBlock Text="AX Agent 전용 시각 언어를 고릅니다. 채팅 본문과 설정 카드 모두 같은 스타일로 바뀝니다."
-                                                           Margin="0,4,0,8"
-                                                           FontSize="11"
-                                                           TextWrapping="Wrap"
-                                                           Foreground="{DynamicResource SecondaryText}"/>
-                                                <WrapPanel>
-                                                    <Border x:Name="OverlayThemeStyleClawCard"
-                                                            Cursor="Hand"
-                                                            CornerRadius="8"
-                                                            BorderThickness="1"
-                                                            BorderBrush="{DynamicResource BorderColor}"
-                                                            Padding="10,7"
-                                                            Margin="0,0,8,8"
-                                                            MouseLeftButtonUp="OverlayThemeStyleClawCard_MouseLeftButtonUp">
-                                                        <TextBlock Text="Claw"
-                                                                   FontSize="12"
-                                                                   Foreground="{DynamicResource PrimaryText}"/>
-                                                    </Border>
-                                                    <Border x:Name="OverlayThemeStyleCodexCard"
-                                                            Cursor="Hand"
-                                                            CornerRadius="8"
-                                                            BorderThickness="1"
-                                                            BorderBrush="{DynamicResource BorderColor}"
-                                                            Padding="10,7"
-                                                            Margin="0,0,8,8"
-                                                            MouseLeftButtonUp="OverlayThemeStyleCodexCard_MouseLeftButtonUp">
-                                                        <TextBlock Text="Codex"
-                                                                   FontSize="12"
-                                                                   Foreground="{DynamicResource PrimaryText}"/>
-                                                    </Border>
-                                                    <Border x:Name="OverlayThemeStyleSlateCard"
-                                                            Cursor="Hand"
-                                                            CornerRadius="8"
-                                                            BorderThickness="1"
-                                                            BorderBrush="{DynamicResource BorderColor}"
-                                                            Padding="10,7"
-                                                            Margin="0,0,8,8"
-                                                            MouseLeftButtonUp="OverlayThemeStyleSlateCard_MouseLeftButtonUp">
-                                                        <TextBlock Text="Slate"
-                                                                   FontSize="12"
-                                                                   Foreground="{DynamicResource PrimaryText}"/>
-                                                    </Border>
-                                                </WrapPanel>
-                                            </StackPanel>
-                                            <StackPanel x:Name="OverlayThemePanel"
-                                                        Visibility="Collapsed"
-                                                        Margin="0,0,0,12">
-                                                <TextBlock Text="테마 모드"
-                                                           FontSize="12.5"
-                                                           FontWeight="SemiBold"
-                                                           Foreground="{DynamicResource PrimaryText}"/>
-                                                <TextBlock Text="시스템 테마를 따르거나, AX Agent만 별도로 라이트/다크 모드로 고정할 수 있습니다."
-                                                           Margin="0,4,0,8"
-                                                           FontSize="11"
-                                                           TextWrapping="Wrap"
-                                                           Foreground="{DynamicResource SecondaryText}"/>
-                                                <WrapPanel>
-                                                    <Border x:Name="OverlayThemeSystemCard"
-                                                            Cursor="Hand"
-                                                            CornerRadius="8"
-                                                            BorderThickness="1"
-                                                            BorderBrush="{DynamicResource BorderColor}"
-                                                            Padding="10,7"
-                                                            Margin="0,0,8,8"
-                                                            MouseLeftButtonUp="OverlayThemeSystemCard_MouseLeftButtonUp">
-                                                        <TextBlock Text="System"
-                                                                   FontSize="12"
-                                                                   Foreground="{DynamicResource PrimaryText}"/>
-                                                    </Border>
-                                                    <Border x:Name="OverlayThemeLightCard"
-                                                            Cursor="Hand"
-                                                            CornerRadius="8"
-                                                            BorderThickness="1"
-                                                            BorderBrush="{DynamicResource BorderColor}"
-                                                            Padding="10,7"
-                                                            Margin="0,0,8,8"
-                                                            MouseLeftButtonUp="OverlayThemeLightCard_MouseLeftButtonUp">
-                                                        <TextBlock Text="Light"
-                                                                   FontSize="12"
-                                                                   Foreground="{DynamicResource PrimaryText}"/>
-                                                    </Border>
-                                                    <Border x:Name="OverlayThemeDarkCard"
-                                                            Cursor="Hand"
-                                                            CornerRadius="8"
-                                                            BorderThickness="1"
-                                                            BorderBrush="{DynamicResource BorderColor}"
-                                                            Padding="10,7"
-                                                            Margin="0,0,8,8"
-                                                            MouseLeftButtonUp="OverlayThemeDarkCard_MouseLeftButtonUp">
-                                                        <TextBlock Text="Dark"
-                                                                   FontSize="12"
-                                                                   Foreground="{DynamicResource PrimaryText}"/>
-                                                    </Border>
-                                                </WrapPanel>
-                                            </StackPanel>
                                         </StackPanel>
                                     </Border>
                                     <Border x:Name="OverlaySectionQuick"