diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml
index c26c30d..c133156 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml
@@ -308,6 +308,18 @@
                 <Setter Property="Padding" Value="0,0,0,36" />
             </Style>
 
+            <Style
+                x:Key="FlyoutPageStyle"
+                BasedOn="{StaticResource DefaultFlyoutPresenterStyle}"
+                TargetType="FlyoutPresenter">
+                <Setter Property="Opacity" Value="0.9" />
+                <Setter Property="MinWidth" Value="850" />
+                <Setter Property="Padding" Value="0" />
+                <Setter Property="ScrollViewer.VerticalScrollMode" Value="Disabled" />
+                <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Disabled" />
+                <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
+            </Style>
+
             <StaticResource x:Key="ToggleButtonBackgroundChecked" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ToggleButtonBackgroundCheckedPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ToggleButtonBackgroundCheckedPressed" ResourceKey="TextFillColorPrimaryBrush" />
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/SystemTray.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/SystemTray.xaml
index a6aa173..f8a363c 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/SystemTray.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/SystemTray.xaml
@@ -24,16 +24,42 @@
                 AreOpenCloseAnimationsEnabled="True"
                 LightDismissOverlayMode="On"
                 ShowMode="TransientWithDismissOnPointerMoveAway">
-                <MenuFlyoutItem x:Uid="SystemTrayLyrics" Command="{x:Bind ViewModel.OpenLyricsCommand}" />
-                <MenuFlyoutItem x:Uid="SystemTrayMusicGallery" Command="{x:Bind ViewModel.OpenMusicGalleryCommand}" />
-                <MenuFlyoutItem x:Uid="SystemTraySettings" Command="{x:Bind ViewModel.OpenSettingsCommand}" />
-                <MenuFlyoutItem x:Uid="SystemTrayResetWindowPosition" Command="{x:Bind ViewModel.ResetWindowPositionCommand}" />
-                <MenuFlyoutItem x:Uid="SystemTrayRestart" Command="{x:Bind ViewModel.RestartAppCommand}" />
-                <MenuFlyoutItem x:Uid="SystemTrayExit" Command="{x:Bind ViewModel.ExitAppCommand}" />
+                <MenuFlyout.MenuFlyoutPresenterStyle>
+                    <Style BasedOn="{StaticResource DefaultMenuFlyoutPresenterStyle}" TargetType="MenuFlyoutPresenter">
+                        <Setter Property="MinWidth" Value="600" />
+                    </Style>
+                </MenuFlyout.MenuFlyoutPresenterStyle>
+                <MenuFlyoutItem
+                    x:Uid="SystemTrayLyrics"
+                    Command="{x:Bind ViewModel.OpenLyricsCommand}"
+                    Icon="{ui:FontIcon Glyph=&#xE90B;}" />
+                <MenuFlyoutItem
+                    x:Uid="SystemTrayMusicGallery"
+                    Command="{x:Bind ViewModel.OpenMusicGalleryCommand}"
+                    Icon="{ui:FontIcon Glyph=&#xEA69;}" />
+                <MenuFlyoutItem
+                    x:Uid="SystemTraySettings"
+                    Command="{x:Bind ViewModel.OpenSettingsCommand}"
+                    Icon="{ui:FontIcon Glyph=&#xE713;}" />
+                <MenuFlyoutSeparator />
+                <MenuFlyoutItem
+                    x:Uid="SystemTrayResetWindowPosition"
+                    Command="{x:Bind ViewModel.ResetWindowPositionCommand}"
+                    Icon="{ui:FontIcon Glyph=&#xE923;}" />
                 <MenuFlyoutItem
                     x:Uid="SystemTrayUnlock"
                     Command="{x:Bind ViewModel.UnlockWindowCommand}"
+                    Icon="{ui:FontIcon Glyph=&#xE785;}"
                     Visibility="{x:Bind ViewModel.IsLyricsWindowLocked, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+                <MenuFlyoutSeparator />
+                <MenuFlyoutItem
+                    x:Uid="SystemTrayRestart"
+                    Command="{x:Bind ViewModel.RestartAppCommand}"
+                    Icon="{ui:FontIcon Glyph=&#xE777;}" />
+                <MenuFlyoutItem
+                    x:Uid="SystemTrayExit"
+                    Command="{x:Bind ViewModel.ExitAppCommand}"
+                    Icon="{ui:FontIcon Glyph=&#xE7E8;}" />
             </MenuFlyout>
         </tb:TaskbarIcon.ContextFlyout>
     </tb:TaskbarIcon>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml
index d618a87..4e5533e 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml
@@ -231,19 +231,9 @@
                                 <Flyout
                                     x:Name="LyricsSettingsFlyout"
                                     Closed="LyricsSettingsFlyout_Closed"
+                                    FlyoutPresenterStyle="{StaticResource FlyoutPageStyle}"
                                     Placement="Right"
-                                    ShouldConstrainToRootBounds="False">
-                                    <Flyout.FlyoutPresenterStyle>
-                                        <Style TargetType="FlyoutPresenter">
-                                            <Setter Property="MinWidth" Value="850" />
-                                            <Setter Property="Padding" Value="0" />
-                                            <Setter Property="CornerRadius" Value="12" />
-                                            <Setter Property="ScrollViewer.VerticalScrollMode" Value="Disabled" />
-                                            <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Disabled" />
-                                            <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
-                                        </Style>
-                                    </Flyout.FlyoutPresenterStyle>
-                                </Flyout>
+                                    ShouldConstrainToRootBounds="False" />
                             </Button.ContextFlyout>
                         </Button>
 
@@ -260,19 +250,9 @@
                                 <Flyout
                                     x:Name="PlaybackSettingsFlyout"
                                     Closed="PlaybackSettingsFlyout_Closed"
+                                    FlyoutPresenterStyle="{StaticResource FlyoutPageStyle}"
                                     Placement="Right"
-                                    ShouldConstrainToRootBounds="False">
-                                    <Flyout.FlyoutPresenterStyle>
-                                        <Style TargetType="FlyoutPresenter">
-                                            <Setter Property="MinWidth" Value="850" />
-                                            <Setter Property="Padding" Value="0" />
-                                            <Setter Property="CornerRadius" Value="12" />
-                                            <Setter Property="ScrollViewer.VerticalScrollMode" Value="Disabled" />
-                                            <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Disabled" />
-                                            <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
-                                        </Style>
-                                    </Flyout.FlyoutPresenterStyle>
-                                </Flyout>
+                                    ShouldConstrainToRootBounds="False" />
                             </Button.ContextFlyout>
                         </Button>
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml
index 98d8fee..d3722ab 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml
@@ -86,34 +86,47 @@
                                 <ToggleMenuFlyoutItem
                                     x:Name="AOTFlyoutItem"
                                     x:Uid="BaseWindowAOTFlyoutItem"
-                                    Click="AOTFlyoutItem_Click" />
+                                    Click="AOTFlyoutItem_Click"
+                                    Icon="{ui:FontIcon Glyph=&#xE718;}" />
                                 <ToggleMenuFlyoutItem
                                     x:Name="FullScreenFlyoutItem"
                                     x:Uid="BaseWindowFullScreenFlyoutItem"
-                                    Click="FullScreenFlyoutItem_Click" />
+                                    Click="FullScreenFlyoutItem_Click"
+                                    Icon="{ui:FontIcon Glyph=&#xE740;}" />
+                                <MenuFlyoutSeparator />
                                 <ToggleMenuFlyoutItem
                                     x:Name="DockFlyoutItem"
                                     x:Uid="HostWindowDockFlyoutItem"
                                     Click="DockFlyoutItem_Click"
+                                    Icon="{ui:FontIcon Glyph=&#xE66A;}"
                                     IsChecked="{x:Bind ViewModel.IsDockMode, Mode=OneWay}" />
                                 <ToggleMenuFlyoutItem
                                     x:Name="DesktopFlyoutItem"
                                     x:Uid="HostWindowDesktopFlyoutItem"
                                     Click="DesktopFlyoutItem_Click"
+                                    Icon="{ui:FontIcon Glyph=&#xE66C;}"
                                     IsChecked="{x:Bind ViewModel.IsDesktopMode, Mode=OneWay}" />
                                 <ToggleMenuFlyoutItem
                                     x:Name="MiniFlyoutItem"
                                     x:Uid="BaseWindowMiniFlyoutItem"
-                                    Click="MiniFlyoutItem_Click" />
+                                    Click="MiniFlyoutItem_Click"
+                                    Icon="{ui:FontIcon Glyph=&#xEE49;}" />
+                                <MenuFlyoutSeparator />
                                 <MenuFlyoutItem
                                     x:Name="MusicGalleryFlyoutItem"
                                     x:Uid="SystemTrayMusicGallery"
-                                    Click="MusicGalleryMenuFlyoutItem_Click" />
+                                    Click="MusicGalleryMenuFlyoutItem_Click"
+                                    Icon="{ui:FontIcon Glyph=&#xEA69;}" />
                                 <MenuFlyoutItem
                                     x:Name="SettingsFlyoutItem"
                                     x:Uid="SystemTraySettings"
-                                    Click="SettingsMenuFlyoutItem_Click" />
-                                <MenuFlyoutItem x:Uid="SystemTrayExit" Click="ExitAppMenuFlyoutItem_Click" />
+                                    Click="SettingsMenuFlyoutItem_Click"
+                                    Icon="{ui:FontIcon Glyph=&#xE713;}" />
+                                <MenuFlyoutSeparator />
+                                <MenuFlyoutItem
+                                    x:Uid="SystemTrayExit"
+                                    Click="ExitAppMenuFlyoutItem_Click"
+                                    Icon="{ui:FontIcon Glyph=&#xE7E8;}" />
                             </MenuFlyout>
                         </Button.Flyout>
                     </Button>