diff --git a/src/ClaudeDo.App/Assets/ClaudeTask.ico b/src/ClaudeDo.App/Assets/ClaudeTask.ico
index 6e429ce..1ca3aef 100644
Binary files a/src/ClaudeDo.App/Assets/ClaudeTask.ico and b/src/ClaudeDo.App/Assets/ClaudeTask.ico differ
diff --git a/src/ClaudeDo.Ui/ClaudeDo.Ui.csproj b/src/ClaudeDo.Ui/ClaudeDo.Ui.csproj
index f8d6a0e..dc83e5e 100644
--- a/src/ClaudeDo.Ui/ClaudeDo.Ui.csproj
+++ b/src/ClaudeDo.Ui/ClaudeDo.Ui.csproj
@@ -22,6 +22,7 @@
     <AvaloniaResource Include="Assets/Fonts/*.ttf" />
     <AvaloniaResource Include="Assets/Fonts/OFL-InterTight.txt" />
     <AvaloniaResource Include="Assets/Fonts/OFL-JetBrainsMono.txt" />
+    <AvaloniaResource Include="..\ClaudeDo.App\Assets\ClaudeTask.ico" Link="Assets\ClaudeTask.ico" />
   </ItemGroup>
 
 </Project>
diff --git a/src/ClaudeDo.Ui/Views/MainWindow.axaml b/src/ClaudeDo.Ui/Views/MainWindow.axaml
index 0f76871..05128f8 100644
--- a/src/ClaudeDo.Ui/Views/MainWindow.axaml
+++ b/src/ClaudeDo.Ui/Views/MainWindow.axaml
@@ -7,7 +7,9 @@
         Title="ClaudeDo"
         Width="1280" Height="820" MinWidth="780" MinHeight="600"
         Background="{DynamicResource VoidBrush}"
-        SystemDecorations="None"
+        Icon="avares://ClaudeDo.Ui/Assets/ClaudeTask.ico"
+        CanResize="True"
+        SystemDecorations="BorderOnly"
         ExtendClientAreaToDecorationsHint="True"
         ExtendClientAreaTitleBarHeightHint="-1">
   <Window.KeyBindings>
@@ -26,11 +28,11 @@
         <!-- Left: brand block -->
         <StackPanel Grid.Column="0" Orientation="Horizontal" Spacing="8"
                     VerticalAlignment="Center" Margin="14,0,0,0">
-          <!-- Green checkbox glyph -->
-          <PathIcon Classes="title-brand-icon"
-                    Data="{StaticResource Icon.BrandCheck}"
-                    Width="14" Height="14"
-                    Foreground="{DynamicResource MossBrush}" />
+          <!-- App icon (matches taskbar) -->
+          <Image Source="avares://ClaudeDo.Ui/Assets/ClaudeTask.ico"
+                 Width="16" Height="16"
+                 VerticalAlignment="Center"
+                 RenderOptions.BitmapInterpolationMode="HighQuality"/>
           <!-- CLAUDEDO label -->
           <TextBlock Classes="title-brand-name"
                      Text="CLAUDEDO"