diff --git a/src/Dasher.Windows/App.axaml b/src/Dasher.Windows/App.axaml
index 80c8831..db86737 100644
--- a/src/Dasher.Windows/App.axaml
+++ b/src/Dasher.Windows/App.axaml
@@ -9,37 +9,66 @@
     </Application.DataTemplates>
 
     <Application.Resources>
-        <SolidColorBrush x:Key="DasherTeal" Color="#99D4CD"/>
-        <SolidColorBrush x:Key="WarmYellow" Color="#F8E063"/>
-        <SolidColorBrush x:Key="CoralRed" Color="#EB5B5C"/>
-        <SolidColorBrush x:Key="DeepNavy" Color="#0F4B75"/>
-
-        <SolidColorBrush x:Key="BgLight" Color="#F4F7F6"/>
-        <SolidColorBrush x:Key="SurfaceLight" Color="#FFFFFF"/>
-        <SolidColorBrush x:Key="BorderLight" Color="#E0E6E8"/>
-        <SolidColorBrush x:Key="HighlightLight" Color="#E9F2F1"/>
-
-        <SolidColorBrush x:Key="TextPrimary" Color="#0F4B75"/>
-        <SolidColorBrush x:Key="TextSecondary" Color="#5A6270"/>
-        <SolidColorBrush x:Key="TextMuted" Color="#8B929A"/>
-
-        <SolidColorBrush x:Key="ControlBg" Color="#ECECED"/>
-        <SolidColorBrush x:Key="ControlBgHover" Color="#E0E0E1"/>
-        <SolidColorBrush x:Key="ControlValue" Color="#F4F0F0"/>
-
-        <x:Double x:Key="SpacingXs">4</x:Double>
-        <x:Double x:Key="SpacingSm">8</x:Double>
-        <x:Double x:Key="SpacingMd">16</x:Double>
-        <x:Double x:Key="SpacingLg">24</x:Double>
-        <x:Double x:Key="SpacingXl">32</x:Double>
-
-        <CornerRadius x:Key="RadiusSm">4</CornerRadius>
-        <CornerRadius x:Key="RadiusMd">8</CornerRadius>
-        <CornerRadius x:Key="RadiusLg">12</CornerRadius>
-
-        <x:Double x:Key="TouchTarget">48</x:Double>
-        <x:Double x:Key="ToolbarHeight">64</x:Double>
-        <x:Double x:Key="StatusBarHeight">48</x:Double>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+                <!-- Light theme -->
+                <ResourceDictionary x:Key="Light">
+                    <SolidColorBrush x:Key="DasherTeal" Color="#99D4CD"/>
+                    <SolidColorBrush x:Key="WarmYellow" Color="#F8E063"/>
+                    <SolidColorBrush x:Key="CoralRed" Color="#EB5B5C"/>
+                    <SolidColorBrush x:Key="DeepNavy" Color="#0F4B75"/>
+
+                    <SolidColorBrush x:Key="BgLight" Color="#F4F7F6"/>
+                    <SolidColorBrush x:Key="SurfaceLight" Color="#FFFFFF"/>
+                    <SolidColorBrush x:Key="BorderLight" Color="#E0E6E8"/>
+                    <SolidColorBrush x:Key="HighlightLight" Color="#E9F2F1"/>
+
+                    <SolidColorBrush x:Key="TextPrimary" Color="#0F4B75"/>
+                    <SolidColorBrush x:Key="TextSecondary" Color="#5A6270"/>
+                    <SolidColorBrush x:Key="TextMuted" Color="#8B929A"/>
+
+                    <SolidColorBrush x:Key="ControlBg" Color="#ECECED"/>
+                    <SolidColorBrush x:Key="ControlBgHover" Color="#E0E0E1"/>
+                    <SolidColorBrush x:Key="ControlValue" Color="#F4F0F0"/>
+                </ResourceDictionary>
+
+                <!-- Dark theme -->
+                <ResourceDictionary x:Key="Dark">
+                    <SolidColorBrush x:Key="DasherTeal" Color="#5BB8B0"/>
+                    <SolidColorBrush x:Key="WarmYellow" Color="#F8E063"/>
+                    <SolidColorBrush x:Key="CoralRed" Color="#EB5B5C"/>
+                    <SolidColorBrush x:Key="DeepNavy" Color="#7AB8E0"/>
+
+                    <SolidColorBrush x:Key="BgLight" Color="#1A1D1E"/>
+                    <SolidColorBrush x:Key="SurfaceLight" Color="#25282B"/>
+                    <SolidColorBrush x:Key="BorderLight" Color="#3A3F44"/>
+                    <SolidColorBrush x:Key="HighlightLight" Color="#1E3331"/>
+
+                    <SolidColorBrush x:Key="TextPrimary" Color="#E0E6E8"/>
+                    <SolidColorBrush x:Key="TextSecondary" Color="#9CA3AF"/>
+                    <SolidColorBrush x:Key="TextMuted" Color="#6B7280"/>
+
+                    <SolidColorBrush x:Key="ControlBg" Color="#353839"/>
+                    <SolidColorBrush x:Key="ControlBgHover" Color="#404348"/>
+                    <SolidColorBrush x:Key="ControlValue" Color="#3A3D42"/>
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+
+            <!-- Shared (theme-independent) resources -->
+            <x:Double x:Key="SpacingXs">4</x:Double>
+            <x:Double x:Key="SpacingSm">8</x:Double>
+            <x:Double x:Key="SpacingMd">16</x:Double>
+            <x:Double x:Key="SpacingLg">24</x:Double>
+            <x:Double x:Key="SpacingXl">32</x:Double>
+
+            <CornerRadius x:Key="RadiusSm">4</CornerRadius>
+            <CornerRadius x:Key="RadiusMd">8</CornerRadius>
+            <CornerRadius x:Key="RadiusLg">12</CornerRadius>
+
+            <x:Double x:Key="TouchTarget">48</x:Double>
+            <x:Double x:Key="ToolbarHeight">64</x:Double>
+            <x:Double x:Key="StatusBarHeight">48</x:Double>
+        </ResourceDictionary>
     </Application.Resources>
 
     <Application.Styles>
diff --git a/src/Dasher.Windows/Dasher.Windows.csproj b/src/Dasher.Windows/Dasher.Windows.csproj
index fecdfbe..06fed5e 100644
--- a/src/Dasher.Windows/Dasher.Windows.csproj
+++ b/src/Dasher.Windows/Dasher.Windows.csproj
@@ -29,5 +29,6 @@
     </PackageReference>
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.1" />
     <PackageReference Include="DotNetTtsWrapper" Version="1.1.1" />
+    <PackageReference Include="Lucide.Avalonia" Version="0.2.10" />
   </ItemGroup>
 </Project>
diff --git a/src/Dasher.Windows/Services/UpdateChecker.cs b/src/Dasher.Windows/Services/UpdateChecker.cs
index cbdf369..bdaaf54 100644
--- a/src/Dasher.Windows/Services/UpdateChecker.cs
+++ b/src/Dasher.Windows/Services/UpdateChecker.cs
@@ -58,7 +58,7 @@ public static async Task<UpdateInfo> CheckAsync()
                 return new UpdateInfo { CurrentVersion = current };
 
             var release = releases[0];
-            var latestRaw = release.TagName.TrimStart('v');
+            var latestRaw = release.TagName!.TrimStart('v');
             var isUpdate = IsNewerVersion(latestRaw, current);
 
             return new UpdateInfo
diff --git a/src/Dasher.Windows/Views/MainWindow.axaml b/src/Dasher.Windows/Views/MainWindow.axaml
index 8fba64a..0879684 100644
--- a/src/Dasher.Windows/Views/MainWindow.axaml
+++ b/src/Dasher.Windows/Views/MainWindow.axaml
@@ -2,6 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:vm="using:Dasher.Windows.ViewModels"
         xmlns:controls="using:Dasher.Windows.Controls"
+        xmlns:lucide="using:Lucide.Avalonia"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="1024" d:DesignHeight="768"
@@ -38,12 +39,10 @@
             <Setter Property="Cursor" Value="Hand"/>
         </Style>
         <Style Selector="Border.top-bar Button.nav-btn:pointerover /template/ ContentPresenter">
-            <Setter Property="Background" Value="#EAE5E3"/>
+            <Setter Property="Background" Value="{DynamicResource ControlBgHover}"/>
         </Style>
-        <Style Selector="Border.top-bar Button.nav-btn PathIcon">
+        <Style Selector="Border.top-bar Button.nav-btn LucideIcon">
             <Setter Property="Foreground" Value="{DynamicResource TextSecondary}"/>
-            <Setter Property="Width" Value="16"/>
-            <Setter Property="Height" Value="16"/>
         </Style>
         <Style Selector="Border.top-bar Button.nav-btn.accent /template/ ContentPresenter">
             <Setter Property="Background" Value="{DynamicResource DasherTeal}"/>
@@ -51,14 +50,14 @@
         <Style Selector="Border.top-bar Button.nav-btn.accent TextBlock">
             <Setter Property="Foreground" Value="{DynamicResource DeepNavy}"/>
         </Style>
-        <Style Selector="Border.top-bar Button.nav-btn.accent PathIcon">
+        <Style Selector="Border.top-bar Button.nav-btn.accent LucideIcon">
             <Setter Property="Foreground" Value="{DynamicResource DeepNavy}"/>
         </Style>
 
         <Style Selector="Button.ui-circle-btn">
             <Setter Property="Width" Value="44"/>
             <Setter Property="Height" Value="44"/>
-            <Setter Property="Background" Value="#EAE5E3"/>
+            <Setter Property="Background" Value="{DynamicResource ControlBg}"/>
             <Setter Property="BorderThickness" Value="0"/>
             <Setter Property="CornerRadius" Value="22"/>
             <Setter Property="Padding" Value="0"/>
@@ -66,7 +65,7 @@
             <Setter Property="Cursor" Value="Hand"/>
         </Style>
         <Style Selector="Button.ui-circle-btn:pointerover /template/ ContentPresenter">
-            <Setter Property="Background" Value="#DFDAD7"/>
+            <Setter Property="Background" Value="{DynamicResource ControlBgHover}"/>
         </Style>
 
         <Style Selector="Button.ui-step-btn">
@@ -78,7 +77,10 @@
             <Setter Property="MinHeight" Value="28"/>
             <Setter Property="Padding" Value="0"/>
             <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="HorizontalAlignment" Value="Center"/>
             <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
             <Setter Property="Cursor" Value="Hand"/>
         </Style>
         <Style Selector="Button.ui-step-btn:pointerover /template/ ContentPresenter">
@@ -162,7 +164,7 @@
         </Style>
 
         <Style Selector="TextBox.message-area">
-            <Setter Property="Background" Value="#FFFFFF"/>
+            <Setter Property="Background" Value="{DynamicResource SurfaceLight}"/>
             <Setter Property="Foreground" Value="{DynamicResource TextPrimary}"/>
             <Setter Property="FontSize" Value="18"/>
             <Setter Property="FontFamily" Value="Arial, Segoe UI, Helvetica Neue, sans-serif"/>
@@ -177,39 +179,30 @@
         <Border Classes="top-bar" DockPanel.Dock="Top">
             <Grid ColumnDefinitions="*, Auto">
                 <StackPanel Orientation="Horizontal" Spacing="6" VerticalAlignment="Center" HorizontalAlignment="Left">
-                    <Button Classes="nav-btn" Click="OnNew">
+                    <Button Classes="nav-btn" Click="OnNew" ToolTip.Tip="New document">
                         <StackPanel Spacing="3">
-                            <PathIcon Data="M14,2H6A2,2 0 0,0 4,4V20A2,2 0 0,0 6,22H18A2,2 0 0,0 20,20V8L14,2M18,20H6V4H13V9H18V20M12,11H10V13H8V15H10V17H12V15H14V13H12V11Z"/>
+                            <LucideIcon Kind="{x:Static lucide:LucideIconKind.FilePlus}" Size="20"/>
                             <TextBlock Text="New" FontSize="11" FontWeight="Medium" HorizontalAlignment="Center" Foreground="{DynamicResource TextSecondary}"/>
                         </StackPanel>
                     </Button>
 
-                    <Button Classes="nav-btn" Click="OnOpen">
+                    <Button Classes="nav-btn" Click="OnOpen" ToolTip.Tip="Open file">
                         <StackPanel Spacing="3">
-                            <PathIcon Data="M19,20H4C2.89,20 2,19.1 2,18V6C2,4.89 2.89,4 4,4H10L12,6H19A2,2 0 0,1 21,8V18A2,2 0 0,1 19,20M19,8H4V18H19V8Z"/>
+                            <LucideIcon Kind="{x:Static lucide:LucideIconKind.FolderOpen}" Size="20"/>
                             <TextBlock Text="Open" FontSize="11" FontWeight="Medium" HorizontalAlignment="Center" Foreground="{DynamicResource TextSecondary}"/>
                         </StackPanel>
                     </Button>
 
-                    <Button Classes="nav-btn" Click="OnSave">
+                    <Button Classes="nav-btn" Click="OnSave" ToolTip.Tip="Save file">
                         <StackPanel Spacing="3">
-                            <PathIcon Data="M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z"/>
+                            <LucideIcon Kind="{x:Static lucide:LucideIconKind.Save}" Size="20"/>
                             <TextBlock Text="Save" FontSize="11" FontWeight="Medium" HorizontalAlignment="Center" Foreground="{DynamicResource TextSecondary}"/>
                         </StackPanel>
                     </Button>
 
                     <Rectangle Width="1" Height="24" Fill="{DynamicResource BorderLight}" Margin="6,0"/>
 
-                    <Button x:Name="BtnPlay" Classes="nav-btn" Click="OnPlay">
-                        <StackPanel Spacing="3">
-                            <PathIcon Data="M21,6H3C1.9,6 1,6.9 1,8V16C1,17.1 1.9,18 3,18H21C22.1,18 23,17.1 23,16V8C23,6.9 22.1,6 21,6M6,15H5V13H3V12H5V10H6V12H8V13H6V15M15.5,12A1.5,1.5 0 1,1 14,13.5A1.5,1.5 0 0,1 15.5,12M18.5,10A1.5,1.5 0 1,1 17,11.5A1.5,1.5 0 0,1 18.5,10Z"/>
-                            <TextBlock Name="TxtPlayLabel" Text="Play" FontSize="11" FontWeight="Medium" HorizontalAlignment="Center" Foreground="{DynamicResource TextSecondary}"/>
-                        </StackPanel>
-                    </Button>
-
-                    <Rectangle Width="1" Height="24" Fill="{DynamicResource BorderLight}" Margin="6,0"/>
-
-                    <Button x:Name="BtnMode" Classes="nav-btn" Width="120">
+                    <Button x:Name="BtnMode" Classes="nav-btn" Width="120" ToolTip.Tip="Pane position">
                         <Button.Flyout>
                             <MenuFlyout>
                                 <MenuItem Header="Right side" Click="OnModeRightSide"/>
@@ -220,7 +213,7 @@
                             </MenuFlyout>
                         </Button.Flyout>
                         <StackPanel Spacing="3">
-                            <PathIcon Data="M14,2H6A2,2 0 0,0 4,4V20A2,2 0 0,0 6,22H18A2,2 0 0,0 20,20V8L14,2M18,20H6V4H13V9H18V20Z"/>
+                            <LucideIcon x:Name="ModeIcon" Kind="{x:Static lucide:LucideIconKind.PanelRight}" Size="20"/>
                             <StackPanel Orientation="Horizontal" Spacing="2" HorizontalAlignment="Center">
                                 <TextBlock Name="TxtModeLabel" Text="Right side" FontSize="11" FontWeight="Medium" Foreground="{DynamicResource TextSecondary}"/>
                                 <TextBlock Text="▾" FontSize="11" Foreground="{DynamicResource TextSecondary}" VerticalAlignment="Center"/>
@@ -230,36 +223,36 @@
 
                     <Rectangle Width="1" Height="24" Fill="{DynamicResource BorderLight}" Margin="6,0"/>
 
-                    <Button x:Name="BtnKeyboard" Classes="nav-btn" Click="OnToggleMode">
+                    <Button x:Name="BtnKeyboard" Classes="nav-btn" Click="OnToggleMode" ToolTip.Tip="Toggle keyboard mode">
                         <StackPanel Spacing="3">
-                            <PathIcon Data="M19,10H5V8H19V10M19,16H5V14H19V16M5,3H19A2,2 0 0,1 21,5V19A2,2 0 0,1 19,21H5A2,2 0 0,1 3,19V5A2,2 0 0,1 5,3M7,5A1,1 0 0,0 6,6A1,1 0 0,0 7,7A1,1 0 0,0 8,6A1,1 0 0,0 7,5M10,5A1,1 0 0,0 9,6A1,1 0 0,0 10,7A1,1 0 0,0 11,6A1,1 0 0,0 10,5M14,5A1,1 0 0,0 13,6A1,1 0 0,0 14,7A1,1 0 0,0 15,6A1,1 0 0,0 14,5M18,5A1,1 0 0,0 17,6A1,1 0 0,0 18,7A1,1 0 0,0 19,6A1,1 0 0,0 18,5Z"/>
+                            <LucideIcon Kind="{x:Static lucide:LucideIconKind.Keyboard}" Size="20"/>
                             <TextBlock x:Name="TxtKeyboardLabel" Text="Keyboard" FontSize="11" FontWeight="Medium" HorizontalAlignment="Center" Foreground="{DynamicResource TextSecondary}"/>
                         </StackPanel>
                     </Button>
 
                     <Rectangle Width="1" Height="24" Fill="{DynamicResource BorderLight}" Margin="6,0"/>
 
-                    <Button x:Name="BtnGameMode" Classes="nav-btn" Click="OnToggleGameMode">
+                    <Button x:Name="BtnGameMode" Classes="nav-btn" Click="OnToggleGameMode" ToolTip.Tip="Toggle game mode">
                         <StackPanel Spacing="3">
-                            <PathIcon Data="M16.5,9L14,7.5L16.5,6L19,7.5L16.5,9M8.5,13L6,11.5L8.5,10L11,11.5L8.5,13M16.5,13L14,11.5L16.5,10L19,11.5L16.5,13M12.5,5L10,3.5L12.5,2L15,3.5L12.5,5M6,19V15H8V19H10V15H12V19H14V15H16V19H18V15H20V19C20,20.1 19.1,21 18,21H8C6.9,21 6,20.1 6,19Z"/>
+                            <LucideIcon x:Name="GameIcon" Kind="{x:Static lucide:LucideIconKind.Gamepad2}" Size="20"/>
                             <TextBlock x:Name="TxtGameLabel" Text="Game" FontSize="11" FontWeight="Medium" HorizontalAlignment="Center" Foreground="{DynamicResource TextSecondary}"/>
                         </StackPanel>
                     </Button>
 
                     <Rectangle Width="1" Height="24" Fill="{DynamicResource BorderLight}" Margin="6,0"/>
 
-                    <Button x:Name="BtnControlMode" Classes="nav-btn" Click="OnToggleControlMode">
+                    <Button x:Name="BtnControlMode" Classes="nav-btn" Click="OnToggleControlMode" ToolTip.Tip="Toggle control mode">
                         <StackPanel Spacing="3">
-                            <PathIcon Data="M12,8A4,4 0 0,1 16,12A4,4 0 0,1 12,16A4,4 0 0,1 8,12A4,4 0 0,1 12,8M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10M11,1H13V4H11V1M11,20H13V23H11V20M3.55,5.42L5,4L7.05,6.05L5.59,7.5L3.55,5.42M17,17.59L18.41,16L20.46,18.05L19,19.5L17,17.59M1,11H4V13H1V11M20,11H23V13H20V11M5.59,16.5L7.05,17.91L5,19.91L3.55,18.45L5.59,16.5M19,4L20.46,5.42L18.41,7.5L17,6.05L19,4Z"/>
+                            <LucideIcon Kind="{x:Static lucide:LucideIconKind.MousePointerClick}" Size="20"/>
                             <TextBlock x:Name="TxtControlLabel" Text="Control" FontSize="11" FontWeight="Medium" HorizontalAlignment="Center" Foreground="{DynamicResource TextSecondary}"/>
                         </StackPanel>
                     </Button>
 
                     <Rectangle Width="1" Height="24" Fill="{DynamicResource BorderLight}" Margin="6,0"/>
 
-                    <Button x:Name="BtnPrefs" Classes="nav-btn" Click="OnTogglePrefs">
+                    <Button x:Name="BtnPrefs" Classes="nav-btn" Click="OnTogglePrefs" ToolTip.Tip="Preferences">
                         <StackPanel Spacing="3">
-                            <PathIcon Data="M12,1H10V5H12V1M12,19H10V23H12V19M16,1H14V11H16V1M16,23H14V13H16V23M8,1H6V13H8V1M8,23H6V15H8V23M13,5H9V7H13V5M17,11H13V13H17V11M9,13H5V15H9V13Z"/>
+                            <LucideIcon Kind="{x:Static lucide:LucideIconKind.Settings}" Size="20"/>
                             <TextBlock Text="Prefs" FontSize="11" FontWeight="Medium" HorizontalAlignment="Center" Foreground="{DynamicResource TextSecondary}"/>
                         </StackPanel>
                     </Button>
@@ -288,15 +281,15 @@
             <Button Width="28" Height="20" CornerRadius="6" Background="{DynamicResource ControlBg}" BorderThickness="0"
                     HorizontalAlignment="Center" Click="OnToggleStatusBar"
                     ToolTip.Tip="Show status bar">
-                <PathIcon Data="M5,11H19V13H5V11M5,11" Width="14" Height="14" Foreground="{DynamicResource TextMuted}"/>
+                <LucideIcon Kind="{x:Static lucide:LucideIconKind.ChevronUp}" Size="16" Foreground="{DynamicResource TextMuted}"/>
             </Button>
         </Border>
 
         <Border x:Name="BottomBar" Classes="bottom-bar" DockPanel.Dock="Bottom" IsVisible="{Binding !IsStatusBarHidden}">
             <StackPanel Orientation="Horizontal" Spacing="0" VerticalAlignment="Center">
-                <Button Width="32" Height="32" CornerRadius="16" Background="#ECEFF1" BorderThickness="0"
-                        VerticalAlignment="Center" Click="OnBack">
-                    <PathIcon Data="M15.41,16.58L10.83,12L15.41,7.41L14,6L8,12L14,18L15.41,16.58Z" Width="10" Height="10" Foreground="{DynamicResource TextMuted}"/>
+                <Button Width="32" Height="32" CornerRadius="16" Background="{DynamicResource ControlBg}" BorderThickness="0"
+                        VerticalAlignment="Center" Click="OnBack" ToolTip.Tip="Back">
+                    <LucideIcon Kind="{x:Static lucide:LucideIconKind.ChevronLeft}" Size="16" Foreground="{DynamicResource TextMuted}"/>
                 </Button>
                 <Rectangle Width="1" Height="24" Fill="{DynamicResource BorderLight}" Margin="8,0"/>
                 <ComboBox x:Name="LangPicker"
@@ -344,7 +337,7 @@
                 <Button Width="28" Height="28" CornerRadius="14" Background="Transparent" BorderThickness="0"
                         VerticalAlignment="Center" Click="OnToggleStatusBar"
                         ToolTip.Tip="Hide/show status bar">
-                    <PathIcon Data="M19,13H5V11H19V12M19,13" Width="14" Height="14" Foreground="{DynamicResource TextMuted}"/>
+                    <LucideIcon Kind="{x:Static lucide:LucideIconKind.ChevronDown}" Size="16" Foreground="{DynamicResource TextMuted}"/>
                 </Button>
             </StackPanel>
         </Border>
@@ -364,40 +357,40 @@
                 <Grid RowDefinitions="Auto, Auto, Auto, *">
                     <ScrollViewer Grid.Row="0" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Disabled">
                         <StackPanel Orientation="Horizontal" Spacing="8" Margin="10,6" Height="48">
-                            <Button Width="32" Height="32" CornerRadius="16" Background="#ECEFF1" BorderThickness="0" VerticalAlignment="Center">
-                                <PathIcon Data="M15.41,16.58L10.83,12L15.41,7.41L14,6L8,12L14,18L15.41,16.58Z" Width="10" Height="10" Foreground="{DynamicResource TextMuted}"/>
+                            <Button Width="32" Height="32" CornerRadius="16" Background="{DynamicResource ControlBg}" BorderThickness="0" VerticalAlignment="Center" ToolTip.Tip="Back">
+                                <LucideIcon Kind="{x:Static lucide:LucideIconKind.ChevronLeft}" Size="16" Foreground="{DynamicResource TextMuted}"/>
                             </Button>
 
-                            <Button Classes="ui-circle-btn" Click="OnToggleMode">
-                                <PathIcon Data="M12,9A3,3 0 0,0 9,12A3,3 0 0,0 12,15A3,3 0 0,0 15,12A3,3 0 0,0 12,9M12,17A5,5 0 0,1 7,12A5,5 0 0,1 12,7A5,5 0 0,1 17,12A5,5 0 0,1 12,17M12,4.5C7,4.5 2.73,7.61 1,12C2.73,16.39 7,19.5 12,19.5C17,19.5 21.27,16.39 23,12C21.27,7.61 17,4.5 12,4.5Z" Width="16" Height="16" Foreground="#735A52"/>
+                            <Button Classes="ui-circle-btn" Click="OnToggleMode" ToolTip.Tip="Toggle pane position">
+                                <LucideIcon Kind="{x:Static lucide:LucideIconKind.Eye}" Size="18" Foreground="{DynamicResource TextSecondary}"/>
                             </Button>
 
-                            <Button Classes="ui-circle-btn" Click="OnQuickSpeak">
-                                <PathIcon Data="M14,3.23V5.29C16.89,6.15 19,8.83 19,12C19,15.17 16.89,17.85 14,18.71V20.77C18.01,19.86 21,16.28 21,12C21,7.72 18.01,4.14 14,3.23M16.5,12C16.5,10.23 15.5,8.71 14,7.97V16C15.5,15.29 16.5,13.77 16.5,12M3,9V15H7L12,20V4L7,9H3Z" Width="16" Height="16" Foreground="#735A52"/>
+                            <Button Classes="ui-circle-btn" Click="OnQuickSpeak" ToolTip.Tip="Quick speak">
+                                <LucideIcon Kind="{x:Static lucide:LucideIconKind.Volume2}" Size="18" Foreground="{DynamicResource TextSecondary}"/>
                             </Button>
 
-                            <Button Classes="ui-circle-btn" Click="OnStopSpeak">
-                                <PathIcon Data="M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M12,16.5A4.5,4.5 0 0,1 7.5,12A4.5,4.5 0 0,1 12,7.5A4.5,4.5 0 0,1 16.5,12A4.5,4.5 0 0,1 12,16.5Z" Width="16" Height="16" Foreground="#735A52"/>
+                            <Button Classes="ui-circle-btn" Click="OnStopSpeak" ToolTip.Tip="Stop speaking">
+                                <LucideIcon Kind="{x:Static lucide:LucideIconKind.CircleStop}" Size="18" Foreground="{DynamicResource TextSecondary}"/>
                             </Button>
 
                             <Rectangle Width="1" Height="20" Fill="{DynamicResource BorderLight}" VerticalAlignment="Center"/>
 
                             <StackPanel Orientation="Horizontal" Spacing="6">
-                                <Button Width="46" Height="44" CornerRadius="6" Background="{DynamicResource ControlBg}" BorderThickness="0" Click="OnCopySelection">
+                                <Button Width="46" Height="44" CornerRadius="6" Background="{DynamicResource ControlBg}" BorderThickness="0" Click="OnCopySelection" ToolTip.Tip="Copy selection">
                                     <StackPanel Spacing="2" VerticalAlignment="Center">
-                                        <PathIcon Data="M16 1H4C2.9 1 2 1.9 2 3V17H4V3H16V1M19 5H8C6.9 5 6 5.9 6 7V21C6 22.1 6.9 23 8 23H19C20.1 23 21 22.1 21 21V7C21 5.9 20.1 5 19 5M19 21H8V7H19V21Z" Width="13" Height="13" Foreground="{DynamicResource TextSecondary}"/>
+                                        <LucideIcon Kind="{x:Static lucide:LucideIconKind.Copy}" Size="16" Foreground="{DynamicResource TextSecondary}"/>
                                         <TextBlock Text="Copy" FontSize="9" Foreground="{DynamicResource TextMuted}" HorizontalAlignment="Center"/>
                                     </StackPanel>
                                 </Button>
-                                <Button Width="46" Height="44" CornerRadius="6" Background="{DynamicResource ControlBg}" BorderThickness="0" Click="OnCopyAll">
+                                <Button Width="46" Height="44" CornerRadius="6" Background="{DynamicResource ControlBg}" BorderThickness="0" Click="OnCopyAll" ToolTip.Tip="Copy all text">
                                     <StackPanel Spacing="2" VerticalAlignment="Center">
-                                        <PathIcon Data="M16,1H4C2.9,1 2,1.9 2,3V17H4V3H16V1M19,5H8C6.9,5 6,5.9 6,7V21C6,22.1 6.9,23 8,23H19C20.1,23 21,22.1 21,21V7C21,5.9 20.1,5 19,5M19,21H8V7H19V21Z" Width="13" Height="13" Foreground="{DynamicResource TextSecondary}"/>
+                                        <LucideIcon Kind="{x:Static lucide:LucideIconKind.ClipboardCopy}" Size="16" Foreground="{DynamicResource TextSecondary}"/>
                                         <TextBlock Text="Copy a." FontSize="9" Foreground="{DynamicResource TextMuted}" HorizontalAlignment="Center"/>
                                     </StackPanel>
                                 </Button>
-                                <Button Width="46" Height="44" CornerRadius="6" Background="{DynamicResource ControlBg}" BorderThickness="0" Click="OnPaste">
+                                <Button Width="46" Height="44" CornerRadius="6" Background="{DynamicResource ControlBg}" BorderThickness="0" Click="OnPaste" ToolTip.Tip="Paste">
                                     <StackPanel Spacing="2" VerticalAlignment="Center">
-                                        <PathIcon Data="M19,2H14V1H10V2H5C3.9,2 3,2.9 3,4V20C3,21.1 3.9,22 5,22H19C20.1,22 21,21.1 21,20V4C21,2.9 20.1,2 19,2M12,2A1,1 0 1,1 11,3A1,1 0 0,1 12,2M19,20H5V4H7V7H17V4H19V20Z" Width="13" Height="13" Foreground="{DynamicResource TextSecondary}"/>
+                                        <LucideIcon Kind="{x:Static lucide:LucideIconKind.ClipboardPaste}" Size="16" Foreground="{DynamicResource TextSecondary}"/>
                                         <TextBlock Text="Paste" FontSize="9" Foreground="{DynamicResource TextMuted}" HorizontalAlignment="Center"/>
                                     </StackPanel>
                                 </Button>
@@ -405,9 +398,9 @@
 
                             <Rectangle Width="1" Height="20" Fill="{DynamicResource BorderLight}" VerticalAlignment="Center"/>
 
-                            <Button Width="46" Height="44" CornerRadius="6" Background="{DynamicResource ControlBg}" BorderThickness="0">
+                            <Button Width="46" Height="44" CornerRadius="6" Background="{DynamicResource ControlBg}" BorderThickness="0" ToolTip.Tip="More options">
                                 <StackPanel Spacing="2" VerticalAlignment="Center">
-                                    <PathIcon Data="M12,16A2,2 0 1,1 14,18A2,2 0 0,1 12,16M12,10A2,2 0 1,1 14,12A2,2 0 0,1 12,10M12,4A2,2 0 1,1 14,6A2,2 0 0,1 12,4Z" Width="13" Height="13" Foreground="{DynamicResource TextSecondary}"/>
+                                    <LucideIcon Kind="{x:Static lucide:LucideIconKind.EllipsisVertical}" Size="16" Foreground="{DynamicResource TextSecondary}"/>
                                     <TextBlock Text="More" FontSize="9" Foreground="{DynamicResource TextMuted}" HorizontalAlignment="Center"/>
                                 </StackPanel>
                             </Button>
@@ -433,4 +426,4 @@
             </Border>
         </Grid>
     </DockPanel>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/src/Dasher.Windows/Views/MainWindow.axaml.cs b/src/Dasher.Windows/Views/MainWindow.axaml.cs
index 2e7d19d..2a31d10 100644
--- a/src/Dasher.Windows/Views/MainWindow.axaml.cs
+++ b/src/Dasher.Windows/Views/MainWindow.axaml.cs
@@ -18,6 +18,7 @@
 using Dasher.Windows.Services;
 using Dasher.Windows.Speech;
 using Dasher.Windows.ViewModels;
+using Lucide.Avalonia;
 
 namespace Dasher.Windows.Views;
 
@@ -429,6 +430,13 @@ private void ApplyPaneLayout()
                 PanePosition.Top => "Top",
                 _ => "Right side",
             };
+            ModeIcon.Kind = position switch
+            {
+                PanePosition.Left => LucideIconKind.PanelLeft,
+                PanePosition.Bottom => LucideIconKind.PanelBottom,
+                PanePosition.Top => LucideIconKind.PanelTop,
+                _ => LucideIconKind.PanelRight,
+            };
             BtnMode.Classes.Remove("accent");
             if (txtKeyboardLabel != null) txtKeyboardLabel.Text = "Keyboard";
             BtnKeyboard.Classes.Remove("accent");
@@ -668,16 +676,7 @@ private async void OnSave(object? sender, RoutedEventArgs e)
         catch { }
     }
 
-    private void OnPlay(object? sender, RoutedEventArgs e)
-    {
-        if (_vm == null) return;
-        _vm.IsPlaying = !_vm.IsPlaying;
-        TxtPlayLabel.Text = _vm.IsPlaying ? "Pause" : "Play";
-        if (_vm.IsPlaying)
-            BtnPlay.Classes.Add("accent");
-        else
-            BtnPlay.Classes.Remove("accent");
-    }
+
 
     private void OnStats(object? sender, RoutedEventArgs e)
     {
@@ -835,7 +834,7 @@ private void ApplyOutputFontSettings()
     {
         var settings = OutputTextSettings.Load();
         OnOutputFontChanged(settings.FontFamily, settings.FontSize);
-        _vm.KeyboardModeOpacity = settings.KeyboardOpacity;
+        _vm!.KeyboardModeOpacity = settings.KeyboardOpacity;
     }
 
     private void OnKeyboardOpacityChanged(double opacity)
@@ -877,8 +876,8 @@ private void OnToggleGameMode(object? sender, RoutedEventArgs e)
             NativeBridge.dasher_leave_game_mode(_vm.Handle);
             _gameModeActive = false;
             NativeBridge.dasher_game_set_canvas_text(_vm.Handle, 1);
-            var txtGameLabel = this.FindControl<TextBlock>("TxtGameLabel");
-            if (txtGameLabel != null) txtGameLabel.Text = "Game";
+            GameIcon.Kind = LucideIconKind.Gamepad2;
+            TxtGameLabel.Text = "Game";
             var gameBar = this.FindControl<Border>("GameTargetBar");
             if (gameBar != null) gameBar.IsVisible = false;
         }
@@ -889,8 +888,8 @@ private void OnToggleGameMode(object? sender, RoutedEventArgs e)
             {
                 _gameModeActive = true;
                 NativeBridge.dasher_game_set_canvas_text(_vm.Handle, 0);
-                var txtGameLabel = this.FindControl<TextBlock>("TxtGameLabel");
-                if (txtGameLabel != null) txtGameLabel.Text = "Leave";
+                GameIcon.Kind = LucideIconKind.Pause;
+                TxtGameLabel.Text = "Leave";
                 var gameBar = this.FindControl<Border>("GameTargetBar");
                 if (gameBar != null) gameBar.IsVisible = true;
             }