diff --git a/src/ClaudeDo.Ui/Views/Islands/Detail/DescriptionStepsCard.axaml b/src/ClaudeDo.Ui/Views/Islands/Detail/DescriptionStepsCard.axaml
index 2b10c822..7af59769 100644
--- a/src/ClaudeDo.Ui/Views/Islands/Detail/DescriptionStepsCard.axaml
+++ b/src/ClaudeDo.Ui/Views/Islands/Detail/DescriptionStepsCard.axaml
@@ -77,7 +77,7 @@
                   Margin="0,0,4,0"
                   ToolTip.Tip="{loc:Tr details.copyFormattedTip}"
                   Click="OnCopyClick">
-            <PathIcon Data="{StaticResource Icon.Copy}" Width="11" Height="11"/>
+            <PathIcon Data="{Binding Source='mdi:ContentCopy', Converter={StaticResource IconKey}}" Width="11" Height="11"/>
           </Button>
 
           <!-- Preview/Edit toggle (Description section only) -->
@@ -212,7 +212,7 @@
                             ToolTip.Tip="{loc:Tr details.attachments.removeTip}"
                             Command="{Binding $parent[ItemsControl].((vm:DetailsIslandViewModel)DataContext).RemoveAttachmentCommand}"
                             CommandParameter="{Binding}">
-                      <PathIcon Data="{StaticResource Icon.X}" Width="11" Height="11"/>
+                      <PathIcon Data="{Binding Source='mdi:Close', Converter={StaticResource IconKey}}" Width="11" Height="11"/>
                     </Button>
                   </Grid>
                 </DataTemplate>
diff --git a/src/ClaudeDo.Ui/Views/Islands/Detail/TaskHeaderBar.axaml b/src/ClaudeDo.Ui/Views/Islands/Detail/TaskHeaderBar.axaml
index 9504c990..9d3d5a60 100644
--- a/src/ClaudeDo.Ui/Views/Islands/Detail/TaskHeaderBar.axaml
+++ b/src/ClaudeDo.Ui/Views/Islands/Detail/TaskHeaderBar.axaml
@@ -34,11 +34,7 @@
            resolve and IsVisible would fall back to its default (true). -->
       <StackPanel Orientation="Horizontal" Spacing="4" Margin="0,4,0,0"
                   IsVisible="{Binding Task.HasBranch, FallbackValue=False}">
-        <!-- Icon.GitBranch is line-art: stroke-rendered, PathIcon would fill the lines away -->
-        <Viewbox Width="10" Height="10">
-          <Path Classes="icon-stroke" Data="{StaticResource Icon.GitBranch}"
-                StrokeThickness="2.4"/>
-        </Viewbox>
+        <PathIcon Width="10" Height="10" Data="{Binding Source='mdi:SourceBranch', Converter={StaticResource IconKey}}"/>
         <TextBlock Classes="meta" Text="{Binding Task.Branch}"/>
       </StackPanel>
 
@@ -59,7 +55,7 @@
             IsVisible="{Binding !IsRunning}"
             VerticalAlignment="Top"
             Margin="6,0,0,0">
-      <PathIcon Classes="danger" Data="{StaticResource Icon.Trash}" Width="14" Height="14"/>
+      <PathIcon Classes="danger" Data="{Binding Source='mdi:TrashCanOutline', Converter={StaticResource IconKey}}" Width="14" Height="14"/>
     </Button>
 
     <!-- Column 1: skull button (running) -->
@@ -69,7 +65,7 @@
             IsVisible="{Binding IsRunning}"
             VerticalAlignment="Top"
             Margin="6,0,0,0">
-      <PathIcon Classes="danger" Data="{StaticResource Icon.Skull}" Width="14" Height="14"/>
+      <PathIcon Classes="danger" Data="{Binding Source='mdi:SkullOutline', Converter={StaticResource IconKey}}" Width="14" Height="14"/>
     </Button>
 
     <!-- Column 2: gear button with agent settings flyout -->
@@ -78,7 +74,7 @@
             IsEnabled="{Binding AgentSettings.IsEnabled}"
             VerticalAlignment="Top"
             Margin="6,0,0,0">
-      <PathIcon Data="{StaticResource Icon.Settings}" Width="15" Height="15"/>
+      <PathIcon Data="{Binding Source='mdi:Cog', Converter={StaticResource IconKey}}" Width="15" Height="15"/>
       <Button.Flyout>
         <Flyout Placement="BottomEdgeAlignedRight" ShowMode="Standard">
           <StackPanel Width="340" Spacing="10" Margin="4">
diff --git a/src/ClaudeDo.Ui/Views/Islands/Detail/WorkConsole.axaml b/src/ClaudeDo.Ui/Views/Islands/Detail/WorkConsole.axaml
index 362af2fb..e5656226 100644
--- a/src/ClaudeDo.Ui/Views/Islands/Detail/WorkConsole.axaml
+++ b/src/ClaudeDo.Ui/Views/Islands/Detail/WorkConsole.axaml
@@ -164,7 +164,7 @@
               Padding="14,8">
         <StackPanel Spacing="6">
           <StackPanel Orientation="Horizontal" Spacing="8">
-            <PathIcon Data="{StaticResource Icon.Warning}"
+            <PathIcon Data="{Binding Source='mdi:AlertOutline', Converter={StaticResource IconKey}}"
                       Foreground="{DynamicResource BloodBrush}"
                       Width="14" Height="14" VerticalAlignment="Center" />
             <TextBlock Classes="meta" Text="{Binding RoadblockMessage}"
@@ -369,7 +369,7 @@
                         Command="{Binding Merge.OpenWorktreeCommand}">
                   <StackPanel Orientation="Horizontal" Spacing="5">
                     <TextBlock Text="{loc:Tr details.workConsole.worktree}" />
-                    <PathIcon Data="{StaticResource Icon.ArrowOut}" Width="11" Height="11" />
+                    <PathIcon Data="{Binding Source='mdi:OpenInNew', Converter={StaticResource IconKey}}" Width="11" Height="11" />
                   </StackPanel>
                 </Button>
                 <Button Classes="btn" Content="{loc:Tr details.workConsole.reviewCombinedDiff}" Margin="0,0,8,8"
@@ -388,7 +388,7 @@
               <!-- Gate: you must open the diff before Approve & Merge unlocks. -->
               <StackPanel Spacing="2" IsVisible="{Binding ShowReviewDiffHint}">
                 <StackPanel Orientation="Horizontal" Spacing="6">
-                  <PathIcon Data="{StaticResource Icon.ArrowOut}" Width="11" Height="11"
+                  <PathIcon Data="{Binding Source='mdi:OpenInNew', Converter={StaticResource IconKey}}" Width="11" Height="11"
                             Foreground="{DynamicResource AmberBrush}" VerticalAlignment="Center" />
                   <TextBlock Classes="meta" VerticalAlignment="Center"
                              Foreground="{DynamicResource AmberBrush}"
@@ -402,7 +402,7 @@
                    until it finishes (mirrors the worker-side guard). -->
               <StackPanel Orientation="Horizontal" Spacing="6"
                           IsVisible="{Binding ShowMergeDrainHint}">
-                <PathIcon Data="{StaticResource Icon.Warning}" Width="11" Height="11"
+                <PathIcon Data="{Binding Source='mdi:AlertOutline', Converter={StaticResource IconKey}}" Width="11" Height="11"
                           Foreground="{DynamicResource AmberBrush}" VerticalAlignment="Center" />
                 <TextBlock Classes="meta" VerticalAlignment="Center"
                            Foreground="{DynamicResource AmberBrush}"
@@ -475,7 +475,7 @@
                     BorderBrush="{DynamicResource BloodBrush}"
                     BorderThickness="1" CornerRadius="8" Padding="10,8">
               <StackPanel Orientation="Horizontal" Spacing="8">
-                <PathIcon Data="{StaticResource Icon.Warning}"
+                <PathIcon Data="{Binding Source='mdi:AlertOutline', Converter={StaticResource IconKey}}"
                           Foreground="{DynamicResource BloodBrush}"
                           Width="14" Height="14" VerticalAlignment="Center" />
                 <TextBlock Classes="meta" Text="{Binding ChildrenAttentionText}"
diff --git a/src/ClaudeDo.Ui/Views/Islands/DetailsIslandView.axaml b/src/ClaudeDo.Ui/Views/Islands/DetailsIslandView.axaml
index 775a25ee..6a013a5e 100644
--- a/src/ClaudeDo.Ui/Views/Islands/DetailsIslandView.axaml
+++ b/src/ClaudeDo.Ui/Views/Islands/DetailsIslandView.axaml
@@ -50,7 +50,7 @@
                   BorderThickness="1" CornerRadius="10">
             <StackPanel Spacing="6">
               <StackPanel Orientation="Horizontal" Spacing="8">
-                <PathIcon Data="{StaticResource Icon.Warning}"
+                <PathIcon Data="{Binding Source='mdi:AlertOutline', Converter={StaticResource IconKey}}"
                           Foreground="{DynamicResource StatusReviewBrush}"
                           Width="14" Height="14" VerticalAlignment="Center"/>
                 <TextBlock Classes="section-label" Text="{loc:Tr details.roadblockLabel}"