diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml
index 58ec488..16ff776 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml
@@ -51,7 +51,10 @@
                         SelectionMode="None">
                         <ListView.ItemTemplate>
                             <DataTemplate x:DataType="models:MediaFolder">
-                                <dev:SettingsExpander Description="{x:Bind ConnectionSummary, Mode=OneWay}" HeaderIcon="{Binding SourceType, Converter={StaticResource FileSourceTypeToIconConverter}}">
+                                <dev:SettingsExpander Description="{x:Bind ConnectionSummary, Mode=OneWay}">
+                                    <dev:SettingsExpander.HeaderIcon>
+                                        <FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="{x:Bind SourceType, Converter={StaticResource FileSourceTypeToIconConverter}, Mode=OneWay}" />
+                                    </dev:SettingsExpander.HeaderIcon>
 
                                     <dev:SettingsExpander.Header>
                                         <HyperlinkButton
@@ -94,12 +97,13 @@
                                         CommandParameter="{Binding ElementName=RootGrid}"
                                         Icon="Folder" />
 
-                                    <MenuFlyoutSeparator />
+                                    <MenuFlyoutSeparator Visibility="Collapsed" />
 
                                     <MenuFlyoutItem
                                         Command="{x:Bind ViewModel.AddRemoteSourceCommand}"
                                         CommandParameter="SMB"
-                                        Text="SMB">
+                                        Text="SMB"
+                                        Visibility="Collapsed">
                                         <MenuFlyoutItem.Icon>
                                             <FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="&#xE839;" />
                                         </MenuFlyoutItem.Icon>
@@ -108,7 +112,8 @@
                                     <MenuFlyoutItem
                                         Command="{x:Bind ViewModel.AddRemoteSourceCommand}"
                                         CommandParameter="FTP"
-                                        Text="FTP">
+                                        Text="FTP"
+                                        Visibility="Collapsed">
                                         <MenuFlyoutItem.Icon>
                                             <FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="&#xE838;" />
                                         </MenuFlyoutItem.Icon>
@@ -117,7 +122,8 @@
                                     <MenuFlyoutItem
                                         Command="{x:Bind ViewModel.AddRemoteSourceCommand}"
                                         CommandParameter="WebDAV"
-                                        Text="WebDAV">
+                                        Text="WebDAV"
+                                        Visibility="Collapsed">
                                         <MenuFlyoutItem.Icon>
                                             <FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="&#xE774;" />
                                         </MenuFlyoutItem.Icon>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml
index 37dcd42..2f861df 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml
@@ -26,7 +26,6 @@
                     x:Name="HostBox"
                     Grid.Column="0"
                     l:Uids.Uid="RemoteServerConfigControlServerAddress"
-                    Header="Server Address"
                     InputScope="Url"
                     PlaceholderText="192.168.1.x"
                     TextWrapping="Wrap" />
@@ -36,7 +35,6 @@
                     Grid.Column="1"
                     MinWidth="100"
                     l:Uids.Uid="RemoteServerConfigControlPort"
-                    Header="Port"
                     LargeChange="10"
                     SmallChange="1"
                     SpinButtonPlacementMode="Inline"
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/FileSourceTypeToIconConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/FileSourceTypeToIconConverter.cs
index c205122..a4c0d7c 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/FileSourceTypeToIconConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/FileSourceTypeToIconConverter.cs
@@ -13,14 +13,14 @@ namespace BetterLyrics.WinUI3.Converter
             {
                 return type switch
                 {
-                    FileSourceType.Local => new FontIcon { Glyph = "\uE8B7" }, // Folder
-                    FileSourceType.SMB => new FontIcon { Glyph = "\uE839" },   // Network
-                    FileSourceType.FTP => new FontIcon { Glyph = "\uE838" },   // Globe
-                    FileSourceType.WebDav => new FontIcon { Glyph = "\uE753" }, // Cloud
-                    _ => new FontIcon { Glyph = "\uE8B7" }
+                    FileSourceType.Local => "\uE8B7", // Folder
+                    FileSourceType.SMB => "\uE839",   // Network
+                    FileSourceType.FTP => "\uE838",   // Globe
+                    FileSourceType.WebDav => "\uE753", // Cloud
+                    _ => "\uE8B7"
                 };
             }
-            return new FontIcon { Glyph = "\uE8B7" };
+            return "\uE8B7";
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, string language) => throw new NotImplementedException();
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingPage.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingPage.xaml
index ebca3d5..ac1afe6 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingPage.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingPage.xaml
@@ -123,6 +123,7 @@
                             ScrollingPixelsPreSecond="20">
                             <TextBlock
                                 x:Name="TitleTextBlock"
+                                Padding="2,0"
                                 FontWeight="{x:Bind LyricsWindowStatus.LyricsStyleSettings.LyricsFontWeight, Converter={StaticResource LyricsFontWeightToFontWeightConverter}, Mode=OneWay}"
                                 TextTrimming="None"
                                 Visibility="{x:Bind LyricsWindowStatus.AlbumArtLayoutSettings.ShowTitle, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
@@ -147,6 +148,7 @@
                             ScrollingPixelsPreSecond="20">
                             <TextBlock
                                 x:Name="ArtistsTextBlock"
+                                Padding="2,0"
                                 FontWeight="{x:Bind LyricsWindowStatus.LyricsStyleSettings.LyricsFontWeight, Converter={StaticResource LyricsFontWeightToFontWeightConverter}, Mode=OneWay}"
                                 Opacity="0.6"
                                 TextTrimming="None"
@@ -172,6 +174,7 @@
                             ScrollingPixelsPreSecond="20">
                             <TextBlock
                                 x:Name="AlbumTextBlock"
+                                Padding="2,0"
                                 FontWeight="{x:Bind LyricsWindowStatus.LyricsStyleSettings.LyricsFontWeight, Converter={StaticResource LyricsFontWeightToFontWeightConverter}, Mode=OneWay}"
                                 Opacity="0.3"
                                 TextTrimming="None"