diff --git a/src/ClaudeDo.Ui/Views/Islands/NotesEditorView.axaml b/src/ClaudeDo.Ui/Views/Islands/NotesEditorView.axaml
index b04a09f6..489ec4c9 100644
--- a/src/ClaudeDo.Ui/Views/Islands/NotesEditorView.axaml
+++ b/src/ClaudeDo.Ui/Views/Islands/NotesEditorView.axaml
@@ -42,7 +42,7 @@
     <Border DockPanel.Dock="Top" Classes="add-task" Margin="16,14,16,10">
       <Grid ColumnDefinitions="Auto,*,Auto">
         <Border Grid.Column="0" Classes="add-task-plus" VerticalAlignment="Center">
-          <PathIcon Width="12" Height="12" Data="{StaticResource Icon.Plus}"
+          <PathIcon Width="12" Height="12" Data="{Binding Source='mdi:Plus', Converter={StaticResource IconKey}}"
                     Foreground="{DynamicResource TextFaintBrush}"/>
         </Border>
         <!-- Enter/Shift+Enter are handled in the code-behind's tunnel handler, same as the note
@@ -86,13 +86,13 @@
                             VerticalAlignment="Center"
                             IsVisible="{Binding FromAgent}"
                             ToolTip.Tip="{loc:Tr notes.fromAgentTip}"
-                            Data="{StaticResource Icon.AgentSuggested}"
+                            Data="{Binding Source='mdi:CreationOutline', Converter={StaticResource IconKey}}"
                             Foreground="{DynamicResource TextFaintBrush}"/>
                   <Button Grid.Column="3" Classes="icon-btn note-del"
                           VerticalAlignment="Center"
                           ToolTip.Tip="{loc:Tr notes.deleteTip}"
                           Click="OnDeleteBulletClick">
-                    <PathIcon Classes="danger" Data="{StaticResource Icon.Trash}" Width="12" Height="12"/>
+                    <PathIcon Classes="danger" Data="{Binding Source='mdi:TrashCanOutline', Converter={StaticResource IconKey}}" Width="12" Height="12"/>
                   </Button>
                 </Grid>
               </Border>
diff --git a/src/ClaudeDo.Ui/Views/Islands/TaskRowView.axaml b/src/ClaudeDo.Ui/Views/Islands/TaskRowView.axaml
index e309d8a4..ef5c7d81 100644
--- a/src/ClaudeDo.Ui/Views/Islands/TaskRowView.axaml
+++ b/src/ClaudeDo.Ui/Views/Islands/TaskRowView.axaml
@@ -57,9 +57,9 @@
                 VerticalAlignment="Center"
                 ToolTip.Tip="{loc:Tr tasks.toggleSubtasksTip}">
           <Panel>
-            <PathIcon Width="12" Height="12" Data="{StaticResource Icon.ChevronDown}"
+            <PathIcon Width="12" Height="12" Data="{Binding Source='mdi:ChevronDown', Converter={StaticResource IconKey}}"
                       IsVisible="{Binding IsExpanded}"/>
-            <PathIcon Width="12" Height="12" Data="{StaticResource Icon.ChevronRight}"
+            <PathIcon Width="12" Height="12" Data="{Binding Source='mdi:ChevronRight', Converter={StaticResource IconKey}}"
                       IsVisible="{Binding !IsExpanded}"/>
           </Panel>
         </Button>
@@ -117,14 +117,14 @@
 
             <!-- Roadblock badge -->
             <PathIcon Width="13" Height="13" VerticalAlignment="Center"
-                      Data="{StaticResource Icon.Warning}"
+                      Data="{Binding Source='mdi:AlertOutline', Converter={StaticResource IconKey}}"
                       Foreground="#E0A800"
                       IsVisible="{Binding HasRoadblock}"
                       ToolTip.Tip="{Binding RoadblockTooltip}"/>
 
             <!-- Agent-suggested badge -->
             <PathIcon Width="10" Height="10" VerticalAlignment="Center"
-                      Data="{StaticResource Icon.AgentSuggested}"
+                      Data="{Binding Source='mdi:CreationOutline', Converter={StaticResource IconKey}}"
                       Foreground="#5C8FA8"
                       IsVisible="{Binding IsAgentSuggested}"
                       ToolTip.Tip="{loc:Tr tasks.agentSuggestedTip}"/>
@@ -165,7 +165,7 @@
                   <Binding Path="ShowRowActions"/>
                 </MultiBinding>
               </Button.IsVisible>
-              <PathIcon Width="10" Height="10" Data="{StaticResource Icon.X}"/>
+              <PathIcon Width="10" Height="10" Data="{Binding Source='mdi:Close', Converter={StaticResource IconKey}}"/>
             </Button>
 
             <!-- List chip with dot -->
@@ -213,9 +213,7 @@
                 <Binding Path="ShowRowActions"/>
               </MultiBinding>
             </Button.IsVisible>
-            <Viewbox Width="16" Height="16">
-              <Path Classes="icon-stroke" Data="{StaticResource Icon.Refine}"/>
-            </Viewbox>
+            <PathIcon Width="16" Height="16" Data="{Binding Source='mdi:AutoFix', Converter={StaticResource IconKey}}"/>
           </Button>
           <Ellipse Classes="spinner"
                    IsVisible="{Binding IsRefining}"
@@ -236,7 +234,7 @@
               <Binding Path="ShowRowActions"/>
             </MultiBinding>
           </Button.IsVisible>
-          <PathIcon Width="14" Height="14" Data="{StaticResource Icon.Star}"/>
+          <PathIcon Width="14" Height="14" Data="{Binding Source='mdi:Star', Converter={StaticResource IconKey}}"/>
         </Button>
         </Grid>
       </Border>
diff --git a/src/ClaudeDo.Ui/Views/Islands/TasksIslandView.axaml b/src/ClaudeDo.Ui/Views/Islands/TasksIslandView.axaml
index cef4a1df..a78b7177 100644
--- a/src/ClaudeDo.Ui/Views/Islands/TasksIslandView.axaml
+++ b/src/ClaudeDo.Ui/Views/Islands/TasksIslandView.axaml
@@ -72,7 +72,7 @@
             IsVisible="{Binding !IsNotesList}">
       <Grid ColumnDefinitions="Auto,*,Auto">
         <Border Grid.Column="0" Classes="add-task-plus" VerticalAlignment="Center">
-          <PathIcon Width="12" Height="12" Data="{StaticResource Icon.Plus}"
+          <PathIcon Width="12" Height="12" Data="{Binding Source='mdi:Plus', Converter={StaticResource IconKey}}"
                     Foreground="{DynamicResource TextFaintBrush}"/>
         </Border>
         <TextBox Grid.Column="1" x:Name="AddTaskBox" Classes="add-task-input"
@@ -138,7 +138,7 @@
                       Command="{Binding ActionCommand}"
                       ToolTip.Tip="{loc:Tr tasks.clearCompletedTip}"
                       VerticalAlignment="Center">
-                <PathIcon Classes="danger" Data="{StaticResource Icon.Trash}" Width="13" Height="13"/>
+                <PathIcon Classes="danger" Data="{Binding Source='mdi:TrashCanOutline', Converter={StaticResource IconKey}}" Width="13" Height="13"/>
               </Button>
             </Grid>
           </DataTemplate>