diff --git a/README.md b/README.md
index 88c2ec6..6cf1ec8 100644
--- a/README.md
+++ b/README.md
@@ -1017,3 +1017,5 @@ MIT License
 
 
 
+- 업데이트: 2026-04-05 19:38 (KST)
+  - AX Agent 상단 탭이 깨져 보이던 문제를 수정하고, `채팅 / Cowork / 코드` pill 세그먼트 형태를 안정적으로 복구했다.
diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md
index 1ffc149..1e86df3 100644
--- a/docs/DEVELOPMENT.md
+++ b/docs/DEVELOPMENT.md
@@ -4762,3 +4762,5 @@ ow + toggle ?쒓컖 ?몄뼱濡??ㅼ떆 ?뺣젹?덈떎.
 - 런처 하단 위젯 기본값을 전부 꺼짐으로 변경했습니다. [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줄 햄버거 아이콘 대신 좌측 패널/본문 구조를 암시하는 패널 토글형 아이콘으로 교체해 메뉴 버튼과 구분되도록 정리했습니다.
+- 업데이트: 2026-04-05 19:38 (KST)
+  - `ChatWindow.xaml`의 상단 탭 스타일과 헤더 래퍼를 정리해 AX Agent의 `채팅 / Cowork / 코드` 탭이 예전 pill 형태로 다시 보이도록 복구했다.
diff --git a/src/AxCopilot/Views/ChatWindow.xaml b/src/AxCopilot/Views/ChatWindow.xaml
index 491fa3e..8e6a8d1 100644
--- a/src/AxCopilot/Views/ChatWindow.xaml
+++ b/src/AxCopilot/Views/ChatWindow.xaml
@@ -174,37 +174,42 @@
         <!-- 탭 버튼 -->
         <Style x:Key="TopTabBtn" TargetType="RadioButton">
             <Setter Property="Foreground" Value="{DynamicResource SecondaryText}"/>
-            <Setter Property="FontSize" Value="14.5"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="BorderBrush" Value="Transparent"/>
+            <Setter Property="FontSize" Value="13.5"/>
             <Setter Property="FontWeight" Value="SemiBold"/>
             <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Margin" Value="2.5"/>
-            <Setter Property="Padding" Value="24,10"/>
-            <Setter Property="MinWidth" Value="78"/>
+            <Setter Property="Margin" Value="2"/>
+            <Setter Property="Padding" Value="18,8"/>
+            <Setter Property="MinWidth" Value="62"/>
+            <Setter Property="MinHeight" Value="32"/>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="RadioButton">
                         <Border x:Name="Bd"
-                                Background="Transparent"
-                                BorderBrush="Transparent"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="1"
-                                CornerRadius="999" Padding="{TemplateBinding Padding}">
-                            <ContentPresenter x:Name="Cp" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                CornerRadius="11"
+                                Padding="{TemplateBinding Padding}"
+                                SnapsToDevicePixels="True">
+                            <ContentPresenter HorizontalAlignment="Center"
+                                              VerticalAlignment="Center"
+                                              RecognizesAccessKey="True"/>
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource ItemHoverBackground}"/>
+                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource HintBackground}"/>
                                 <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource BorderColor}"/>
                                 <Setter Property="Foreground" Value="{DynamicResource PrimaryText}"/>
                             </Trigger>
-                            <!-- IsChecked를 뒤에 두어 호버보다 선택 상태가 항상 우선 적용 -->
                             <Trigger Property="IsChecked" Value="True">
-                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource ItemBackground}"/>
+                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource LauncherBackground}"/>
                                 <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource BorderColor}"/>
                                 <Setter Property="Foreground" Value="{DynamicResource PrimaryText}"/>
-                                <Setter Property="FontWeight" Value="Bold"/>
                             </Trigger>
                             <Trigger Property="IsEnabled" Value="False">
-                                <Setter Property="Opacity" Value="0.3"/>
+                                <Setter Property="Opacity" Value="0.35"/>
                                 <Setter Property="Cursor" Value="Arrow"/>
                             </Trigger>
                         </ControlTemplate.Triggers>
@@ -1151,10 +1156,11 @@
                         <!-- 중앙: 탭 메뉴 -->
                         <Border Grid.Column="1"
                                 HorizontalAlignment="Center" VerticalAlignment="Center"
-                                Background="{DynamicResource HintBackground}"
+                                Background="{DynamicResource ItemBackground}"
                                 BorderBrush="{DynamicResource BorderColor}"
                                 BorderThickness="1"
-                                CornerRadius="999" Padding="6"
+                                CornerRadius="16" Padding="4"
+                                MinHeight="40"
                                 WindowChrome.IsHitTestVisibleInChrome="True">
                             <StackPanel Orientation="Horizontal">
                                 <RadioButton x:Name="TabChat" Content="채팅" Style="{StaticResource TopTabBtn}"