diff --git a/src/ClaudeDo.Ui/Views/Islands/ListsIslandView.axaml b/src/ClaudeDo.Ui/Views/Islands/ListsIslandView.axaml
index a1c99f48..5dbc829e 100644
--- a/src/ClaudeDo.Ui/Views/Islands/ListsIslandView.axaml
+++ b/src/ClaudeDo.Ui/Views/Islands/ListsIslandView.axaml
@@ -139,12 +139,12 @@
             <Grid ColumnDefinitions="12,20,*,Auto">
               <PathIcon Grid.Column="0" Classes="list-icon" Foreground="{Binding Color, Converter={x:Static converters:ColorBrushConverter.Instance}, ConverterParameter=TextMuteBrush}"
                         Width="9" Height="9"
-                        Data="{StaticResource Icon.ChevronRight}"
+                        Data="{Binding Source='mdi:ChevronRight', Converter={StaticResource IconKey}}"
                         IsVisible="{Binding IsCollapsed}"
                         HorizontalAlignment="Left" VerticalAlignment="Center"/>
               <PathIcon Grid.Column="0" Classes="list-icon" Foreground="{Binding Color, Converter={x:Static converters:ColorBrushConverter.Instance}, ConverterParameter=TextMuteBrush}"
                         Width="9" Height="9"
-                        Data="{StaticResource Icon.ChevronDown}"
+                        Data="{Binding Source='mdi:ChevronDown', Converter={StaticResource IconKey}}"
                         IsVisible="{Binding !IsCollapsed}"
                         HorizontalAlignment="Left" VerticalAlignment="Center"/>
               <PathIcon Grid.Column="1" Classes="list-icon" Foreground="{Binding Color, Converter={x:Static converters:ColorBrushConverter.Instance}, ConverterParameter=TextMuteBrush}"
@@ -193,7 +193,7 @@
           <Border Classes="search-wrap" Margin="0,8,0,12">
             <Grid ColumnDefinitions="Auto,*,Auto" VerticalAlignment="Center">
               <PathIcon Grid.Column="0" Width="14" Height="14"
-                        Data="{StaticResource Icon.Search}"
+                        Data="{Binding Source='mdi:Magnify', Converter={StaticResource IconKey}}"
                         Foreground="{DynamicResource TextFaintBrush}"
                         Margin="2,0,0,0"/>
               <TextBox  Grid.Column="1" x:Name="SearchBox" Classes="search-inner"
@@ -249,7 +249,7 @@
         <Button Grid.Column="2" Classes="icon-btn" VerticalAlignment="Center"
                 Command="{Binding OpenSettingsCommand}"
                 ToolTip.Tip="{loc:Tr lists.settingsTip}">
-          <PathIcon Data="{StaticResource Icon.Settings}" Width="15" Height="15"/>
+          <PathIcon Data="{Binding Source='mdi:Cog', Converter={StaticResource IconKey}}" Width="15" Height="15"/>
         </Button>
       </Grid>
     </Border>
@@ -303,12 +303,12 @@
           <Button Grid.Column="1" Classes="icon-btn"
                   Command="{Binding CreateListCommand}"
                   ToolTip.Tip="{loc:Tr lists.newList}">
-            <PathIcon Data="{StaticResource Icon.Plus}" Width="13" Height="13"/>
+            <PathIcon Data="{Binding Source='mdi:Plus', Converter={StaticResource IconKey}}" Width="13" Height="13"/>
           </Button>
           <Button Grid.Column="2" Classes="icon-btn"
                   Command="{Binding OpenRepoImportCommand}"
                   ToolTip.Tip="{loc:Tr lists.addReposTip}">
-            <PathIcon Data="{StaticResource Icon.Folder}" Width="14" Height="14"/>
+            <PathIcon Data="{Binding Source='mdi:FolderOutline', Converter={StaticResource IconKey}}" Width="14" Height="14"/>
           </Button>
         </Grid>
         <!-- Folders and folder-less lists in one sequence, so either can be dragged above the