diff --git a/CharacterMap/CharacterMap.CX/CustomFontManager.cpp b/CharacterMap/CharacterMap.CX/CustomFontManager.cpp
index 98b45bde..989bc24b 100644
--- a/CharacterMap/CharacterMap.CX/CustomFontManager.cpp
+++ b/CharacterMap/CharacterMap.CX/CustomFontManager.cpp
@@ -108,7 +108,7 @@ ComPtr<IDWriteFontCollection3> CustomFontManager::GetFontCollectionFromPath(Plat
     ComPtr<IDWriteFontCollection> tcollection;
     ComPtr<IDWriteFontCollection3> collection;
 
-    auto factory = GetIsolatedFactory();
+    auto& factory = GetIsolatedFactory();
     ThrowIfFailed(factory->CreateCustomFontCollection(m_customLoader.Get(), key, keySize, &tcollection));
 
     tcollection.As<IDWriteFontCollection3>(&collection);
diff --git a/CharacterMap/CharacterMap.CX/DWHelpers.h b/CharacterMap/CharacterMap.CX/DWHelpers.h
index c170690f..1f2aeca5 100644
--- a/CharacterMap/CharacterMap.CX/DWHelpers.h
+++ b/CharacterMap/CharacterMap.CX/DWHelpers.h
@@ -13,9 +13,9 @@ template <class T> void SafeRelease(T** ppT)
 namespace
 {
 	/// <summary>
-/// Opposite of DWRITE_MAKE_OPENTYPE_TAG, returns String
-/// representation of OpenType tag.
-/// </summary>
+	/// Opposite of DWRITE_MAKE_OPENTYPE_TAG, returns String
+	/// representation of OpenType tag.
+	/// </summary>
 	Platform::String^ GetOpenTypeFeatureTag(UINT32 value)
 	{
 		wchar_t buffer[] = L"    ";
diff --git a/CharacterMap/CharacterMap.CX/DWriteFontAxis.h b/CharacterMap/CharacterMap.CX/DWriteFontAxis.h
index 04cf304d..4af5bbdf 100644
--- a/CharacterMap/CharacterMap.CX/DWriteFontAxis.h
+++ b/CharacterMap/CharacterMap.CX/DWriteFontAxis.h
@@ -86,10 +86,7 @@ namespace CharacterMapCX
 
 		DWRITE_FONT_AXIS_VALUE GetDWriteValue()
 		{
-			auto value = DWRITE_FONT_AXIS_VALUE();
-			value.axisTag = static_cast<DWRITE_FONT_AXIS_TAG>(m_tag_raw);
-			value.value = this->Value;
-			return value;
+			return  { static_cast<DWRITE_FONT_AXIS_TAG>(m_tag_raw), this->Value };
 		}
 
 	private:
diff --git a/CharacterMap/CharacterMap.CX/DWriteProperties.h b/CharacterMap/CharacterMap.CX/DWriteProperties.h
index 2f02ac75..aa479c1c 100644
--- a/CharacterMap/CharacterMap.CX/DWriteProperties.h
+++ b/CharacterMap/CharacterMap.CX/DWriteProperties.h
@@ -69,7 +69,7 @@ namespace CharacterMapCX
 
 		property Array<UINT8>^ Panose { Array<UINT8>^ get() 
 		{
-			DWRITE_PANOSE* pan = new DWRITE_PANOSE();
+			DWRITE_PANOSE pan[10];
 			m_font->GetPanose(pan);
 
 			bool valid = false;
diff --git a/CharacterMap/CharacterMap.CX/DirectText.cpp b/CharacterMap/CharacterMap.CX/DirectText.cpp
index edc34168..d392de24 100644
--- a/CharacterMap/CharacterMap.CX/DirectText.cpp
+++ b/CharacterMap/CharacterMap.CX/DirectText.cpp
@@ -138,7 +138,10 @@ Windows::Foundation::Size CharacterMapCX::Controls::DirectText::MeasureOverride(
 
         /* Set flow direction */
         if (this->FlowDirection == Windows::UI::Xaml::FlowDirection::RightToLeft)
-            idFormat->SetFlowDirection(DWRITE_FLOW_DIRECTION::DWRITE_FLOW_DIRECTION_RIGHT_TO_LEFT);
+            idFormat->SetReadingDirection(DWRITE_READING_DIRECTION_RIGHT_TO_LEFT);
+        else
+            idFormat->SetReadingDirection(DWRITE_READING_DIRECTION_LEFT_TO_RIGHT);
+
 
         /* Set blank fallback font */
         if (FallbackFont != nullptr)
diff --git a/CharacterMap/CharacterMap.CX/NativeInterop.cpp b/CharacterMap/CharacterMap.CX/NativeInterop.cpp
index 8396d2d9..e39b7d60 100644
--- a/CharacterMap/CharacterMap.CX/NativeInterop.cpp
+++ b/CharacterMap/CharacterMap.CX/NativeInterop.cpp
@@ -321,8 +321,10 @@ ComPtr<IDWriteTextFormat3> CharacterMapCX::NativeInterop::CreateIDWriteTextForma
 		L"en-us",
 		&tempFormat);
 
+	tempFormat->SetFlowDirection(DWRITE_FLOW_DIRECTION_TOP_TO_BOTTOM);
+	tempFormat->SetReadingDirection(DWRITE_READING_DIRECTION_LEFT_TO_RIGHT);
+
 	ComPtr<IDWriteTextFormat3> idFormat;
 	ThrowIfFailed(tempFormat.As(&idFormat));
-
 	return idFormat;
 }
diff --git a/CharacterMap/CharacterMap/Controls/SettingsPresenter.cs b/CharacterMap/CharacterMap/Controls/SettingsPresenter.cs
index dc6e430e..e9de56ea 100644
--- a/CharacterMap/CharacterMap/Controls/SettingsPresenter.cs
+++ b/CharacterMap/CharacterMap/Controls/SettingsPresenter.cs
@@ -39,14 +39,14 @@ public object Title
             DependencyProperty.Register(nameof(Title), typeof(object), typeof(SettingsPresenter), new PropertyMetadata(null));
 
 
-        public string Description
+        public object Description
         {
-            get { return (string)GetValue(DescriptionProperty); }
+            get { return (object)GetValue(DescriptionProperty); }
             set { SetValue(DescriptionProperty, value); }
         }
 
         public static readonly DependencyProperty DescriptionProperty =
-            DependencyProperty.Register(nameof(Description), typeof(string), typeof(SettingsPresenter), new PropertyMetadata(null, (d,e) =>
+            DependencyProperty.Register(nameof(Description), typeof(object), typeof(SettingsPresenter), new PropertyMetadata(null, (d,e) =>
             {
                 ((SettingsPresenter)d).UpdateDescriptionStates();
             }));
@@ -219,7 +219,7 @@ void UpdateIconStates()
 
         private void UpdateDescriptionStates()
         {
-            string state = string.IsNullOrWhiteSpace(Description) ? "NoDescriptionState" : "DescriptionState";
+            string state = Description is null ? "NoDescriptionState" : "DescriptionState";
             VisualStateManager.GoToState(this, state, true);
         }
 
diff --git a/CharacterMap/CharacterMap/Core/Converters.cs b/CharacterMap/CharacterMap/Core/Converters.cs
index 904015af..863dd3b7 100644
--- a/CharacterMap/CharacterMap/Core/Converters.cs
+++ b/CharacterMap/CharacterMap/Core/Converters.cs
@@ -95,6 +95,12 @@ public static GridLength GridLengthAorB(bool input, string a, string b)
         public static string GetLocalizedEnumName(Enum a) 
             => Localization.Get($"{a.GetType().Name}_{a}");
 
+        public static string GetFormat(string key, object arg)
+            => Localization.Get(key, arg);
+
+        public static string GetFormat2(string key, object arg, object arg2)
+            => Localization.Get(key, arg, arg2);
+
         public static FontFamily GetPreviewFontSource(FontVariant variant)
         {
             if (_settings == null)
diff --git a/CharacterMap/CharacterMap/Core/ExportManager.Font.cs b/CharacterMap/CharacterMap/Core/ExportManager.Font.cs
index 3d8d9491..5105775e 100644
--- a/CharacterMap/CharacterMap/Core/ExportManager.Font.cs
+++ b/CharacterMap/CharacterMap/Core/ExportManager.Font.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Windows.Storage.Streams;
 using Windows.Storage;
@@ -46,13 +45,19 @@ public static async void RequestExportFontFile(FontVariant variant)
             WeakReferenceMessenger.Default.Send(new AppNotificationMessage(true, new ExportFontFileResult(null, false)));
         }
 
-        internal static Task ExportCollectionAsZipAsync(IList<InstalledFont> fontList, UserFontCollection selectedCollection)
+        internal static Task ExportCollectionAsZipAsync(
+            IList<InstalledFont> fontList, 
+            UserFontCollection selectedCollection,
+            Action<string> callback = null)
         {
             var fonts = fontList.SelectMany(f => f.Variants).ToList();
-            return ExportFontsAsZipAsync(fonts, selectedCollection.Name);
+            return ExportFontsAsZipAsync(fonts, selectedCollection.Name, callback);
         }
 
-        internal static async Task ExportFontsAsZipAsync(List<FontVariant> fonts, string name)
+        internal static async Task ExportFontsAsZipAsync(
+            List<FontVariant> fonts, 
+            string name,
+            Action<string> callback = null)
         {
             if (await PickFileAsync(name, "ZIP", new[] { ".zip" }) is StorageFile file)
             {
@@ -63,7 +68,10 @@ await Task.Run(async () =>
                     using var i = await file.OpenStreamForWriteAsync();
                     i.SetLength(0);
 
+                    int c = 0;
                     using ZipArchive z = new(i, ZipArchiveMode.Create);
+                    callback?.Invoke($"0%");
+
                     foreach (var font in fonts)
                     {
                         if (DirectWrite.IsFontLocal(font.Face))
@@ -73,6 +81,9 @@ await Task.Run(async () =>
                             using IOutputStream s = entry.Open().AsOutputStream();
                             await DirectWrite.WriteToStreamAsync(font.Face, s);
                         }
+
+                        c++;
+                        callback?.Invoke($"{((double)c / (double)fonts.Count) * 100:0}%");
                     }
 
                     await i.FlushAsync();
@@ -82,20 +93,26 @@ await Task.Run(async () =>
             }
         }
 
-        internal static Task ExportCollectionToFolderAsync(IList<InstalledFont> fontList)
+        internal static Task ExportCollectionToFolderAsync(
+            IList<InstalledFont> fontList,
+            Action<string> callback = null)
         {
             var fonts = fontList.SelectMany(f => f.Variants).ToList();
-            return ExportFontsToFolderAsync(fonts);
+            return ExportFontsToFolderAsync(fonts, callback);
         }
 
-        internal static async Task ExportFontsToFolderAsync(List<FontVariant> fonts)
+        internal static async Task ExportFontsToFolderAsync(
+            List<FontVariant> fonts,
+            Action<string> callback = null)
         {
             if (await PickFolderAsync() is StorageFolder folder)
             {
                 await Task.Run(async () =>
                 {
                     ExportNamingScheme scheme = ResourceHelper.AppSettings.ExportNamingScheme;
+                    callback?.Invoke($"0%");
 
+                    int c = 0;
                     foreach (var font in fonts)
                     {
                         if (DirectWrite.IsFontLocal(font.Face))
@@ -104,6 +121,9 @@ await Task.Run(async () =>
                             StorageFile file = await folder.CreateFileAsync(fileName, CreationCollisionOption.ReplaceExisting).AsTask().ConfigureAwait(false);
                             await TryWriteToFileAsync(font, file).ConfigureAwait(false);
                         }
+
+                        c++;
+                        callback?.Invoke($"{((double)c / (double)fonts.Count) * 100:0}%");
                     }
                 });
 
@@ -144,6 +164,9 @@ private static string GetFileName(FontVariant font, ExportNamingScheme scheme)
             if (scheme == ExportNamingScheme.System && !string.IsNullOrWhiteSpace(src))
                 fileName = src;
 
+            if (scheme is ExportNamingScheme.Optimised && FontFinder.ImportFormats.Contains(ext) is false)
+                ext = ".ttf";
+
             if (string.IsNullOrWhiteSpace(fileName))
                 fileName = $"{font.FamilyName.Trim()} {font.PreferredName.Trim()}{ext}";
 
diff --git a/CharacterMap/CharacterMap/Core/FontFinder.cs b/CharacterMap/CharacterMap/Core/FontFinder.cs
index 704c47d7..92756347 100644
--- a/CharacterMap/CharacterMap/Core/FontFinder.cs
+++ b/CharacterMap/CharacterMap/Core/FontFinder.cs
@@ -102,6 +102,9 @@ public static async Task<DWriteFontSet> InitialiseAsync()
             return systemFonts;
         }
 
+        public static int SystemFamilyCount { get; private set; }
+        public static int SystemFaceCount { get; private set; }
+
         public static Task LoadFontsAsync(bool clearExisting = true)
         {
             // It's possible to go down this path if the font collection
@@ -119,8 +122,10 @@ public static Task LoadFontsAsync(bool clearExisting = true)
                 await _loadSemaphore.WaitAsync().ConfigureAwait(false);
                 NativeInterop interop = Utils.GetInterop();
 
+#if DEBUG
                 Stopwatch s = new Stopwatch();
                 s.Start();
+#endif
 
                 // Load SystemFonts and imported fonts in parallel
                 // 1.1. Load imported fonts
@@ -166,6 +171,9 @@ public static Task LoadFontsAsync(bool clearExisting = true)
                 var imports = resultList.ToDictionary(d => d.Key, v => v.Value.Clone());
 
                 /* Add all system fonts */
+                SystemFamilyCount = systemFonts.Families.Count;
+                SystemFaceCount = systemFonts.Fonts.Count;
+
                 foreach (var font in systemFonts.Fonts)
                     AddFont(resultList, font);
                 
@@ -177,8 +185,10 @@ public static Task LoadFontsAsync(bool clearExisting = true)
                 if (Fallback == null)
                     Fallback = interop.CreateEmptyFallback();
 
+#if DEBUG
                 s.Stop();
                 var elasped = s.Elapsed;
+#endif
 
                 _loadSemaphore.Release();
 
@@ -217,6 +227,12 @@ internal static List<FontVariant> GetImportedVariants()
                         .ToList();
         }
 
+        internal static List<FontVariant> GetSystemVariants()
+        {
+            return Fonts.SelectMany(f => f.Variants.Where(v => v.IsImported is false))
+                        .ToList();
+        }
+
         /* 
          * Helper method for adding fonts. 
          */
diff --git a/CharacterMap/CharacterMap/Core/Properties.cs b/CharacterMap/CharacterMap/Core/Properties.cs
index eb6d154d..92464aac 100644
--- a/CharacterMap/CharacterMap/Core/Properties.cs
+++ b/CharacterMap/CharacterMap/Core/Properties.cs
@@ -1296,5 +1296,37 @@ public static void SetRenderScale(DependencyObject obj, double value)
             }));
 
         #endregion
+
+        #region Flyout
+
+        public static FlyoutBase GetFlyout(DependencyObject obj)
+        {
+            return (FlyoutBase)obj.GetValue(FlyoutProperty);
+        }
+
+        public static void SetFlyout(DependencyObject obj, FlyoutBase value)
+        {
+            obj.SetValue(FlyoutProperty, value);
+        }
+
+        public static readonly DependencyProperty FlyoutProperty =
+            DependencyProperty.RegisterAttached("Flyout", typeof(FlyoutBase), typeof(Properties), new PropertyMetadata(null, (d,e) =>
+            {
+                if (d is ButtonBase b)
+                {
+                    b.Click -= ButtonFlyoutClick;
+                    b.Click += ButtonFlyoutClick;
+                }
+            }));
+
+        private static void ButtonFlyoutClick(object sender, RoutedEventArgs e)
+        {
+            if (sender is ButtonBase b && GetFlyout(b) is FlyoutBase fly)
+            {
+                fly.ShowAt(b);
+            }
+        }
+
+        #endregion
     }
 }
diff --git a/CharacterMap/CharacterMap/Helpers/ResourceHelper.cs b/CharacterMap/CharacterMap/Helpers/ResourceHelper.cs
index 9f568df5..e066a681 100644
--- a/CharacterMap/CharacterMap/Helpers/ResourceHelper.cs
+++ b/CharacterMap/CharacterMap/Helpers/ResourceHelper.cs
@@ -341,6 +341,9 @@ private void Element_Unloaded(object sender, RoutedEventArgs e)
 
         public void Update()
         {
+            if (DesignMode.DesignModeEnabled)
+                return;
+
             ResourceHelper.TryResolveThemeStyle3(_element);
             return;
 
diff --git a/CharacterMap/CharacterMap/Provider/SQLiteGlyphProvider.cs b/CharacterMap/CharacterMap/Provider/SQLiteGlyphProvider.cs
index 7fd892f0..e0f23334 100644
--- a/CharacterMap/CharacterMap/Provider/SQLiteGlyphProvider.cs
+++ b/CharacterMap/CharacterMap/Provider/SQLiteGlyphProvider.cs
@@ -10,6 +10,7 @@
 using Windows.ApplicationModel;
 using Windows.UI.Xaml.Controls;
 using CharacterMap.Models;
+using System.Diagnostics;
 
 namespace CharacterMap.Provider
 {
@@ -174,9 +175,9 @@ private Task<IReadOnlyList<IGlyphData>> InternalSearchAsync(string ftsTable, str
                             
                             // 1.3. If the search is ambiguous we should still search for description matches,
                             //      otherwise we can return right now
-                            if (!ambiguous)
-                                return hexresults;
-                            else
+                            //if (!ambiguous)
+                            //    return hexresults;
+                            //else
                             {
                                 hexResult = hexresults.Cast<GlyphDescription>().FirstOrDefault();
                                 break;
@@ -187,10 +188,10 @@ private Task<IReadOnlyList<IGlyphData>> InternalSearchAsync(string ftsTable, str
                     // 1.4. If the search is ambiguous we should still search for description matches,
                     //      otherwise we can return right now with no hex results
                     //      If we are a generic symbol font, that's all folks. Time to leave.
-                    if (!ambiguous)
-                    {
-                        return GlyphService.EMPTY_SEARCH;
-                    }
+                    //if (!ambiguous)
+                    //{
+                    //    return GlyphService.EMPTY_SEARCH;
+                    //}
                 }
 
                 // 2. If we're performing SQL, create the base query filter
@@ -204,12 +205,20 @@ private Task<IReadOnlyList<IGlyphData>> InternalSearchAsync(string ftsTable, str
                 /// We don't want to throw an exception if we ever hit this case, we'll just do our best.
                 foreach (var range in variant.UnicodeRanges.Take(995)) 
                 {
+                    string qr = range.First != range.Last
+                        ? "Ix BETWEEN {0} AND {1}"
+                        : "Ix == {0}";
+
                     if (next)
-                        sb.AppendFormat(" OR Ix BETWEEN {0} AND {1}", range.First, range.Last);
+                        sb.AppendFormat(range.First != range.Last
+                        ? " OR Ix BETWEEN {0} AND {1}"
+                        : " OR Ix == {0}", range.First, range.Last);
                     else
                     {
                         next = true;
-                        sb.AppendFormat("WHERE (Ix BETWEEN {0} AND {1}", range.First, range.Last);
+                        sb.AppendFormat(range.First != range.Last
+                        ? "WHERE (Ix BETWEEN {0} AND {1}"
+                        : "WHERE (Ix == {0}", range.First, range.Last);
                     }
                 }
                 sb.Append(")");
@@ -248,6 +257,25 @@ List<IGlyphData> InsertHex(List<IGlyphData> list)
                     extra = string.Format(" AND Ix NOT IN ({0})", string.Join(", ", results.Select(r => r.UnicodeIndex)));
                 }
 
+                /// BENCHMARKING FOR FTFS VS NORMAL TABLES
+                //Stopwatch sw = Stopwatch.StartNew();
+                //object res = null;
+                //for (int i = 0; i < 100; i++)
+                //{
+                //    string bsql2 = $"SELECT * FROM {table} {sb.ToString()} AND Description LIKE ? LIMIT {limit}";
+                //    res = _connection.GetGlyphData(table, bsql2, $"%{query}%");
+                //}
+                //var time = sw.ElapsedMilliseconds;
+                //sw.Restart();
+                //for (int i = 0; i < 100; i++)
+                //{
+                //    string bsql = $"SELECT * FROM {ftsTable} {sb}{extra} AND Description MATCH ? LIMIT {limit}";
+                //    res = _connection.GetGlyphData(ftsTable, bsql, $"{query}*");
+                //}
+                //var time2 = sw.ElapsedMilliseconds;
+                //Debugger.Break();
+             
+
                 // 3.3. Execute!
                 string sql = $"SELECT * FROM {ftsTable} {sb}{extra} AND Description MATCH ? LIMIT {limit}";
                 results.AddRange(_connection.GetGlyphData(ftsTable, sql, $"{query}*"));
diff --git a/CharacterMap/CharacterMap/Strings/en-US/Resources.resw b/CharacterMap/CharacterMap/Strings/en-US/Resources.resw
index 2dec75ab..a6ab15e1 100644
--- a/CharacterMap/CharacterMap/Strings/en-US/Resources.resw
+++ b/CharacterMap/CharacterMap/Strings/en-US/Resources.resw
@@ -1435,4 +1435,13 @@ Tap and hold to arrange.</value>
   <data name="SuggestOptionVietnamese.Text" xml:space="preserve">
     <value>Vietnamese</value>
   </data>
+  <data name="InstallCountLabel" xml:space="preserve">
+    <value>{0} Font Families, {1} Font Faces installed on your computer</value>
+  </data>
+  <data name="OptionSystemFonts.Text" xml:space="preserve">
+    <value>Installed Fonts</value>
+  </data>
+  <data name="SettingsExportInstalledLabel.Text" xml:space="preserve">
+    <value>Export Installed Fonts</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/CharacterMap/CharacterMap/Themes/ClassicThemeStyles.xaml b/CharacterMap/CharacterMap/Themes/ClassicThemeStyles.xaml
index c40defcb..fdd414f6 100644
--- a/CharacterMap/CharacterMap/Themes/ClassicThemeStyles.xaml
+++ b/CharacterMap/CharacterMap/Themes/ClassicThemeStyles.xaml
@@ -107,6 +107,13 @@
         <Setter Property="Margin" Value="0 0 0 12" />
     </Style>
 
+    <Style x:Key="DescriptionContentStyle" TargetType="ContentPresenter">
+        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+        <Setter Property="Opacity" Value="0.7" />
+        <Setter Property="TextWrapping" Value="Wrap" />
+        <Setter Property="Margin" Value="0 0 0 12" />
+    </Style>
+
     <Style x:Key="SectionHeaderTextBlockStyle" BasedOn="{StaticResource SubheaderTextBlockStyle}" TargetType="TextBlock">
         <Setter Property="Visibility" Value="Collapsed" />
         <Setter Property="FontFamily" Value="{StaticResource ContentControlThemeFontFamily}" />
@@ -1025,13 +1032,13 @@
                         </Border>
 
                         <RelativePanel Grid.Row="1" Margin="16 8 16 16">
-                            <TextBlock
+                            <ContentPresenter
                                 x:Name="Description"
+                                Content="{TemplateBinding Description}"
                                 RelativePanel.AlignLeftWithPanel="True"
                                 RelativePanel.AlignRightWithPanel="True"
                                 RelativePanel.AlignTopWithPanel="True"
-                                Style="{StaticResource DescriptionStyle}"
-                                Text="{TemplateBinding Description}"
+                                Style="{StaticResource DescriptionContentStyle}"
                                 Visibility="Collapsed" />
                             <ContentPresenter
                                 Content="{TemplateBinding Content}"
diff --git a/CharacterMap/CharacterMap/Themes/DefaultThemeStyles.xaml b/CharacterMap/CharacterMap/Themes/DefaultThemeStyles.xaml
index c76995c9..0480d53c 100644
--- a/CharacterMap/CharacterMap/Themes/DefaultThemeStyles.xaml
+++ b/CharacterMap/CharacterMap/Themes/DefaultThemeStyles.xaml
@@ -565,11 +565,11 @@
                             FontWeight="Bold"
                             OpticalMarginAlignment="TrimSideBearings" />
 
-                        <TextBlock
+                        <ContentPresenter
                             x:Name="Description"
                             Grid.Row="1"
-                            Style="{StaticResource DescriptionStyle}"
-                            Text="{TemplateBinding Description}"
+                            Content="{TemplateBinding Description}"
+                            Style="{StaticResource DescriptionContentStyle}"
                             Visibility="Collapsed" />
                         <ContentPresenter Grid.Row="2" Content="{TemplateBinding Content}" />
 
diff --git a/CharacterMap/CharacterMap/Themes/FluentThemeStyles.xaml b/CharacterMap/CharacterMap/Themes/FluentThemeStyles.xaml
index fa2fda5c..e4e2104d 100644
--- a/CharacterMap/CharacterMap/Themes/FluentThemeStyles.xaml
+++ b/CharacterMap/CharacterMap/Themes/FluentThemeStyles.xaml
@@ -281,27 +281,32 @@
                                 Margin="0 0 18 0"
                                 Visibility="Collapsed" />
 
-                            <StackPanel
+                            <Grid
                                 Grid.Column="1"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Center"
                                 Transitions="{StaticResource RepositionTransitions}">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
                                 <ContentPresenter
                                     HorizontalAlignment="Stretch"
                                     Content="{TemplateBinding Title}"
                                     FontFamily="{TemplateBinding FontFamily}"
                                     FontSize="14" />
-                                <TextBlock
+                                <ContentPresenter
                                     x:Name="Description"
                                     x:Load="False"
+                                    Grid.Row="1"
                                     Margin="0 2 0 0"
+                                    Content="{TemplateBinding Description}"
                                     FontFamily="{TemplateBinding FontFamily}"
                                     FontSize="12.666"
                                     Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                    Text="{TemplateBinding Description}"
                                     TextWrapping="Wrap"
                                     Visibility="Collapsed" />
-                            </StackPanel>
+                            </Grid>
 
                             <ContentPresenter
                                 x:Name="Presenter"
diff --git a/CharacterMap/CharacterMap/Themes/SystemThemes.xaml b/CharacterMap/CharacterMap/Themes/SystemThemes.xaml
index 37faa241..04b5b962 100644
--- a/CharacterMap/CharacterMap/Themes/SystemThemes.xaml
+++ b/CharacterMap/CharacterMap/Themes/SystemThemes.xaml
@@ -50,6 +50,14 @@
         <Setter Property="OpticalMarginAlignment" Value="TrimSideBearings" />
     </Style>
 
+    <Style x:Key="DescriptionContentStyle" TargetType="ContentPresenter">
+        <Setter Property="Opacity" Value="0.7" />
+        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="Margin" Value="0 0 0 8" />
+        <Setter Property="OpticalMarginAlignment" Value="TrimSideBearings" />
+        <Setter Property="TextWrapping" Value="Wrap" />
+    </Style>
+
     <Style x:Key="HintStyle" BasedOn="{StaticResource DescriptionStyle}" TargetType="TextBlock">
         <Setter Property="Margin" Value="0 4 0 2" />
         <Setter Property="FontStyle" Value="Italic" />
diff --git a/CharacterMap/CharacterMap/Themes/ZuneThemeStyles.xaml b/CharacterMap/CharacterMap/Themes/ZuneThemeStyles.xaml
index 206718be..0b9418d1 100644
--- a/CharacterMap/CharacterMap/Themes/ZuneThemeStyles.xaml
+++ b/CharacterMap/CharacterMap/Themes/ZuneThemeStyles.xaml
@@ -203,6 +203,21 @@
         <Setter Property="OpticalMarginAlignment" Value="TrimSideBearings" />
     </Style>
 
+    <Style x:Key="DescriptionContentStyle" TargetType="ContentPresenter">
+        <Setter Property="Opacity" Value="0.7" />
+        <Setter Property="FontFamily" Value="{StaticResource ThemeFontFamily}" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+        <Setter Property="Foreground" Value="{ThemeResource DefaultControlForegroundBrush}" />
+        <Setter Property="Margin" Value="0 0 0 8" />
+        <Setter Property="FontSize" Value="13.333" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+        <Setter Property="Foreground" Value="{ThemeResource TextForegroundBrush}" />
+        <Setter Property="OpticalMarginAlignment" Value="TrimSideBearings" />
+        <Setter Property="TextWrapping" Value="Wrap" />
+        <Setter Property="LineStackingStrategy" Value="MaxHeight" />
+        <Setter Property="TextLineBounds" Value="Full" />
+    </Style>
+
     <Style x:Key="HintStyle" BasedOn="{StaticResource DescriptionStyle}" TargetType="TextBlock">
         <Setter Property="Margin" Value="0 4 0 2" />
         <Setter Property="Foreground" Value="{ThemeResource DefaultControlForegroundBrush}" />
@@ -341,11 +356,11 @@
                                 FontWeight="SemiBold"
                                 Foreground="{ThemeResource DefaultControlForegroundBrush}"
                                 OpticalMarginAlignment="TrimSideBearings" />
-                            <TextBlock
+                            <ContentPresenter
                                 x:Name="Description"
                                 x:Load="False"
-                                Style="{StaticResource BaseTextStyle}"
-                                Text="{TemplateBinding Description}"
+                                Content="{TemplateBinding Description}"
+                                Style="{StaticResource DescriptionContentStyle}"
                                 Visibility="Collapsed" />
                         </StackPanel>
 
diff --git a/CharacterMap/CharacterMap/ViewModels/CollectionManagementViewModel.cs b/CharacterMap/CharacterMap/ViewModels/CollectionManagementViewModel.cs
index c13688ae..30697652 100644
--- a/CharacterMap/CharacterMap/ViewModels/CollectionManagementViewModel.cs
+++ b/CharacterMap/CharacterMap/ViewModels/CollectionManagementViewModel.cs
@@ -9,37 +9,28 @@
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using CharacterMap.Helpers;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace CharacterMap.ViewModels
 {
-    internal class CollectionManagementViewModel : ViewModelBase
+    internal partial class CollectionManagementViewModel : ViewModelBase
     {
+        protected override bool CaptureContext => true;
+
         #region Properties
 
-        public bool IsSaving                        { get => GetV(false); set => Set(value); }
-        public bool IsExporting                     { get => GetV(false); set => Set(value); }
+        [ObservableProperty] string _collectionExportProgress;
+        [ObservableProperty] bool _isSaving = false;
+        [ObservableProperty] bool _isExporting = false;
+
+        [ObservableProperty] List<UserFontCollection> _collections;
+        [ObservableProperty] ObservableCollection<InstalledFont> _fontList;
+        [ObservableProperty] ObservableCollection<InstalledFont> _collectionFonts;
 
         public ObservableCollection<InstalledFont> SelectedFonts            = new();
 
         public ObservableCollection<InstalledFont> SelectedCollectionFonts  = new();
-
-        public ObservableCollection<InstalledFont> FontList
-        {
-            get => Get<ObservableCollection<InstalledFont>>();
-            set => Set(value);
-        }
-
-        public ObservableCollection<InstalledFont> CollectionFonts
-        {
-            get => Get<ObservableCollection<InstalledFont>>();
-            set => Set(value);
-        }
-
-        public List<UserFontCollection> Collections
-        {
-            get => Get<List<UserFontCollection>>();
-            set => Set(value);
-        }
+        public UserCollectionsService CollectionService { get; private set; } = null;
 
         private UserFontCollection _selectedCollection;
         public UserFontCollection SelectedCollection
@@ -52,8 +43,6 @@ public UserFontCollection SelectedCollection
             }
         }
 
-        public UserCollectionsService CollectionService { get; private set; } = null;
-
         #endregion
 
 
@@ -154,7 +143,10 @@ internal async void ExportAsZip()
 
             try
             {
-                await ExportManager.ExportCollectionAsZipAsync(CollectionFonts, SelectedCollection);
+                await ExportManager.ExportCollectionAsZipAsync(
+                    CollectionFonts, 
+                    SelectedCollection,
+                    p => OnSyncContext(() => CollectionExportProgress = p));
             }
             finally
             {
@@ -168,7 +160,9 @@ internal async void ExportAsFolder()
 
             try
             {
-                await ExportManager.ExportCollectionToFolderAsync(CollectionFonts);
+                await ExportManager.ExportCollectionToFolderAsync(
+                    CollectionFonts,
+                    p => OnSyncContext(() => CollectionExportProgress = p));
             }
             finally
             {
diff --git a/CharacterMap/CharacterMap/ViewModels/MainViewModel.cs b/CharacterMap/CharacterMap/ViewModels/MainViewModel.cs
index c1812917..c8917435 100644
--- a/CharacterMap/CharacterMap/ViewModels/MainViewModel.cs
+++ b/CharacterMap/CharacterMap/ViewModels/MainViewModel.cs
@@ -54,6 +54,7 @@ public partial class MainViewModel : ViewModelBase
         [ObservableProperty] string _titlePrefix;
         [ObservableProperty] string _fontSearch;
         [ObservableProperty] string _filterTitle;
+        [ObservableProperty] string _collectionExportProgress;
         [ObservableProperty] bool _canFilter = true;
         [ObservableProperty] bool _isLoadingFonts;
         [ObservableProperty] bool _isSearchResults;
@@ -586,7 +587,10 @@ internal async void ExportAsZip()
 
             try
             {
-                await ExportManager.ExportCollectionAsZipAsync(FontList, SelectedCollection);
+                await ExportManager.ExportCollectionAsZipAsync(
+                    FontList, 
+                    SelectedCollection,
+                    p => OnSyncContext(() => CollectionExportProgress = p));
             }
             finally
             {
@@ -600,7 +604,9 @@ internal async void ExportAsFolder()
 
             try
             {
-                await ExportManager.ExportCollectionToFolderAsync(FontList);
+                await ExportManager.ExportCollectionToFolderAsync(
+                    FontList,
+                    p => OnSyncContext(() => CollectionExportProgress = p));
             }
             finally
             {
diff --git a/CharacterMap/CharacterMap/ViewModels/SettingsViewModel.cs b/CharacterMap/CharacterMap/ViewModels/SettingsViewModel.cs
index 1e9e5f15..ac67dd88 100644
--- a/CharacterMap/CharacterMap/ViewModels/SettingsViewModel.cs
+++ b/CharacterMap/CharacterMap/ViewModels/SettingsViewModel.cs
@@ -33,8 +33,16 @@ public partial class SettingsViewModel : ViewModelBase
         [ObservableProperty] FontFamily _previewFontSource;
         [ObservableProperty] List<InstalledFont> _previewFonts;
         [ObservableProperty] bool _isCollectionExportEnabled = true;
+        [ObservableProperty] bool _isSystemExportEnabled = true;
         [ObservableProperty] ObservableCollection<String> _rampOptions = null;
 
+        [ObservableProperty] int _systemFamilyCount = 0;
+        [ObservableProperty] int _systemFaceCount = 0;
+        [ObservableProperty] string _systemExportProgress;
+        [ObservableProperty] string _importedExportProgress;
+
+
+
         public bool ThemeHasChanged => Settings.ApplicationDesignTheme != _originalDesign;
 
         private List<ChangelogItem> _changelog;
@@ -82,6 +90,10 @@ public void UpdatePreviews(InstalledFont font, FontVariant variant)
             RampOptions = new(Settings.CustomRampOptions);
             RampOptions.CollectionChanged += RampOptions_CollectionChanged;
             RampInput = null;
+
+            // 4. Update other things
+            SystemFamilyCount = FontFinder.SystemFamilyCount;
+            SystemFaceCount = FontFinder.SystemFaceCount;
         }
 
         private void RampOptions_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
@@ -109,7 +121,9 @@ private List<ChangelogItem> CreateChangelog()
             // application, rather than things like bug-fixes or visual changes.
             return new()
             {
-                new("Latest Update (August 2023)", // August 2023
+                new("Latest Update (October 2023)", // October 2023
+                    "- Added option to export installed fonts in Settings->Font Management"),
+                new("2023.7.0.0 (August 2023)", // August 2023
                     "- Added support for Right-to-Left text in Type Ramp view, Quick Compare and Compare Fonts view\n" +
                     "- Added Unicode developer tools showing Unicode codepoint and UTF-16 value\n" +
                     "- Added experimental COLRv1 support to Preview Pane, Type Ramp View, Quick Compare and Compare Fonts View for Windows 11 builds > 25905\n" +
@@ -201,17 +215,49 @@ public static List<SupportedLanguage> GetSupportedLanguages()
             return list;
         }
 
+        internal async void ExportSystemAsZip()
+        {
+            IsSystemExportEnabled = false;
+            try { 
+                await ExportManager.ExportFontsAsZipAsync(
+                    FontFinder.GetSystemVariants(), 
+                    Localization.Get("OptionSystemFonts/Text"),
+                    p => OnSyncContext(() => SystemExportProgress = p)); 
+            }
+            finally { IsSystemExportEnabled = true; }
+        }
+
+        internal async void ExportSystemToFolder()
+        {
+            IsSystemExportEnabled = false;
+            try { 
+                await ExportManager.ExportFontsToFolderAsync(
+                    FontFinder.GetSystemVariants(),
+                    p => OnSyncContext(() => SystemExportProgress = p)); 
+            }
+            finally { IsSystemExportEnabled = true; }
+        }
+
         internal async void ExportAsZip()
         {
             IsCollectionExportEnabled = false;
-            try { await ExportManager.ExportFontsAsZipAsync(FontFinder.GetImportedVariants(), Localization.Get("OptionImportedFonts/Text")); }
+            try { 
+                await ExportManager.ExportFontsAsZipAsync(
+                    FontFinder.GetImportedVariants(), 
+                    Localization.Get("OptionImportedFonts/Text"),
+                    p => OnSyncContext(() => ImportedExportProgress = p));
+            }
             finally { IsCollectionExportEnabled = true; }
         }
 
         internal async void ExportToFolder()
         {
             IsCollectionExportEnabled = false;
-            try { await ExportManager.ExportFontsToFolderAsync(FontFinder.GetImportedVariants()); }
+            try { 
+                await ExportManager.ExportFontsToFolderAsync(
+                    FontFinder.GetImportedVariants(),
+                    p => OnSyncContext(() => ImportedExportProgress = p)); 
+            }
             finally { IsCollectionExportEnabled = true; }
         }
 
diff --git a/CharacterMap/CharacterMap/ViewModels/ViewModelBase.cs b/CharacterMap/CharacterMap/ViewModels/ViewModelBase.cs
index a8fc8c6a..b3f6e3ad 100644
--- a/CharacterMap/CharacterMap/ViewModels/ViewModelBase.cs
+++ b/CharacterMap/CharacterMap/ViewModels/ViewModelBase.cs
@@ -96,11 +96,15 @@ public abstract class BaseNotifyingModel
         /// </summary>
         protected virtual bool TrackAnimation => false;
 
+        protected virtual bool CaptureContext => false;
+
         public BaseNotifyingModel()
         {
+            if (TrackAnimation || CaptureContext)
+                _originalContext = SynchronizationContext.Current;
+
             if (TrackAnimation)
             {
-                _originalContext = SynchronizationContext.Current;
                 Register<AppSettingsChangedMessage>(m =>
                 {
                     void Notify(string s) 
diff --git a/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml b/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml
index abc277cf..aba50ad6 100644
--- a/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml
+++ b/CharacterMap/CharacterMap/Views/CollectionManagementView.xaml
@@ -7,6 +7,7 @@
     xmlns:ct="using:Microsoft.Toolkit.Uwp.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     DataContext="{x:Bind}"
     mc:Ignorable="d"
     d:DesignHeight="600"
@@ -51,7 +52,8 @@
                     HorizontalAlignment="Right"
                     VerticalAlignment="Bottom"
                     Orientation="Horizontal"
-                    Visibility="{x:Bind core:Converters.IsNotNullToVis(ViewModel.SelectedCollection), Mode=OneWay, FallbackValue=Collapsed}">
+                    Visibility="{x:Bind core:Converters.IsNotNullToVis(ViewModel.SelectedCollection), Mode=OneWay, FallbackValue=Collapsed}"
+                    d:Visibility="Visible">
                     <controls:UXButton
                         x:Uid="RenameCollectionButton"
                         Height="Auto"
@@ -93,15 +95,25 @@
                             </MenuFlyout>
                         </Button.Flyout>
                         <Grid>
-                            <ProgressRing
-                                Width="20"
-                                Height="20"
-                                MinWidth="20"
-                                MinHeight="20"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                IsActive="{x:Bind ViewModel.IsExporting, Mode=OneWay}"
-                                Visibility="{x:Bind ViewModel.IsExporting, Mode=OneWay}" />
+                            <StackPanel Spacing="4" Visibility="{x:Bind ViewModel.IsExporting, Mode=OneWay}">
+                                <muxc:ProgressRing
+                                    Width="16"
+                                    Height="16"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    IsActive="{x:Bind ViewModel.IsExporting, Mode=OneWay}" />
+                                <TextBlock
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    FontSize="11"
+                                    IsTextScaleFactorEnabled="False"
+                                    Opacity="0.7"
+                                    OpticalMarginAlignment="TrimSideBearings"
+                                    Text="{x:Bind ViewModel.CollectionExportProgress, Mode=OneWay}"
+                                    TextAlignment="Center"
+                                    TextLineBounds="Tight" />
+                            </StackPanel>
+
                             <Path
                                 Height="16"
                                 Data="F1 M 38.613281 -43.886719 L 47.167969 -52.500000 L 0.000000 -52.500000 L 0.000000 -60.000000 L 47.167969 -60.000000 L 38.613281 -68.613281 L 43.886719 -73.886719 L 61.523438 -56.250000 L 43.886719 -38.613281 Z M 62.167969 -112.500000 L 120.000000 -112.500000 L 120.000000 -22.500000 L 0.000000 -22.500000 L 0.000000 -45.000000 L 7.500000 -45.000000 L 7.500000 -30.000000 L 112.500000 -30.000000 L 112.500000 -75.000000 L 62.167969 -75.000000 L 47.167969 -90.000000 L 7.500000 -90.000000 L 7.500000 -67.500000 L 0.000000 -67.500000 L 0.000000 -97.500000 L 47.167969 -97.500000 Z M 112.500000 -82.500000 L 112.500000 -105.000000 L 65.332031 -105.000000 L 54.023438 -93.750000 L 65.332031 -82.500000 Z "
diff --git a/CharacterMap/CharacterMap/Views/MainPage.xaml b/CharacterMap/CharacterMap/Views/MainPage.xaml
index 81134ee2..397ee065 100644
--- a/CharacterMap/CharacterMap/Views/MainPage.xaml
+++ b/CharacterMap/CharacterMap/Views/MainPage.xaml
@@ -649,15 +649,24 @@
                                         </MenuFlyout>
                                     </Button.Flyout>
                                     <Grid>
-                                        <ProgressRing
-                                            Width="20"
-                                            Height="20"
-                                            MinWidth="20"
-                                            MinHeight="20"
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            IsActive="{x:Bind core:Converters.False(ViewModel.IsCollectionExportEnabled), Mode=OneWay}"
-                                            Visibility="{x:Bind core:Converters.FalseToVis(ViewModel.IsCollectionExportEnabled), Mode=OneWay}" />
+                                        <StackPanel Spacing="4" Visibility="{x:Bind core:Converters.FalseToVis(ViewModel.IsCollectionExportEnabled), Mode=OneWay}">
+                                            <muxc:ProgressRing
+                                                Width="16"
+                                                Height="16"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                IsActive="{x:Bind core:Converters.False(ViewModel.IsCollectionExportEnabled), Mode=OneWay}" />
+                                            <TextBlock
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                FontSize="11"
+                                                IsTextScaleFactorEnabled="False"
+                                                Opacity="0.7"
+                                                OpticalMarginAlignment="TrimSideBearings"
+                                                Text="{x:Bind ViewModel.CollectionExportProgress, Mode=OneWay}"
+                                                TextAlignment="Center"
+                                                TextLineBounds="Tight" />
+                                        </StackPanel>
                                         <Path
                                             Height="16"
                                             Data="F1 M 38.613281 -43.886719 L 47.167969 -52.500000 L 0.000000 -52.500000 L 0.000000 -60.000000 L 47.167969 -60.000000 L 38.613281 -68.613281 L 43.886719 -73.886719 L 61.523438 -56.250000 L 43.886719 -38.613281 Z M 62.167969 -112.500000 L 120.000000 -112.500000 L 120.000000 -22.500000 L 0.000000 -22.500000 L 0.000000 -45.000000 L 7.500000 -45.000000 L 7.500000 -30.000000 L 112.500000 -30.000000 L 112.500000 -75.000000 L 62.167969 -75.000000 L 47.167969 -90.000000 L 7.500000 -90.000000 L 7.500000 -67.500000 L 0.000000 -67.500000 L 0.000000 -97.500000 L 47.167969 -97.500000 Z M 112.500000 -82.500000 L 112.500000 -105.000000 L 65.332031 -105.000000 L 54.023438 -93.750000 L 65.332031 -82.500000 Z "
diff --git a/CharacterMap/CharacterMap/Views/SettingsView.xaml b/CharacterMap/CharacterMap/Views/SettingsView.xaml
index aa23c9e2..6610b464 100644
--- a/CharacterMap/CharacterMap/Views/SettingsView.xaml
+++ b/CharacterMap/CharacterMap/Views/SettingsView.xaml
@@ -546,15 +546,15 @@
                                             HorizontalAlignment="Stretch"
                                             IsThumbToolTipEnabled="True"
                                             Maximum="2048"
-                                            Minimum="128"
-                                            StepFrequency="64"
+                                            Minimum="32"
+                                            StepFrequency="32"
                                             TickFrequency="64"
                                             TickPlacement="Outside"
                                             Value="{x:Bind Settings.PngSize, Mode=TwoWay}" />
                                         <TextBlock Margin="0,0,0,0" Style="{StaticResource BodyTextBlockStyle}">
-                                            <Run Text="{x:Bind SldResolution.Value, Mode=OneWay}" />
+                                            <Run Text="{Binding Value, ElementName=SldResolution}" />
                                             <Run Text="x" />
-                                            <Run Text="{x:Bind SldResolution.Value, Mode=OneWay}" />
+                                            <Run Text="{Binding Value, ElementName=SldResolution}" />
                                         </TextBlock>
                                     </StackPanel>
                                 </controls:SettingsPresenter>
@@ -684,106 +684,75 @@
                             <StackPanel
                                 x:Name="FontPanel"
                                 x:Load="False"
-                                Visibility="Collapsed">
+                                Visibility="Collapsed"
+                                d:Visibility="Visible">
 
                                 <TextBlock
                                     x:Uid="SettingsFontManagementLabel"
                                     OpticalMarginAlignment="None"
                                     Style="{StaticResource SectionHeaderTextBlockStyle}" />
 
-                                <controls:SettingsPresenter Title="{core:Localizer Key=SettingsSystemFontHeader/Text}">
-                                    <controls:UXHyperlinkButton x:Uid="SettingsManageSystemFonts" NavigateUri="ms-settings:fonts" />
+                                <controls:SettingsPresenter Title="{core:Localizer Key=SettingsSystemFontHeader/Text}" ContentPlacement="Bottom">
+                                    <controls:SettingsPresenter.Description>
+                                        <TextBlock Text="{x:Bind core:Converters.GetFormat2('InstallCountLabel', ViewModel.SystemFamilyCount, ViewModel.SystemFaceCount), Mode=OneWay}" />
+                                    </controls:SettingsPresenter.Description>
+                                    <StackPanel Orientation="Horizontal" Spacing="12">
+                                        <controls:UXHyperlinkButton x:Uid="SettingsManageSystemFonts" NavigateUri="ms-settings:fonts" />
+                                        <controls:UXHyperlinkButton MinWidth="133" IsEnabled="{x:Bind ViewModel.IsSystemExportEnabled, Mode=OneWay}">
+                                            <Grid>
+                                                <StackPanel
+                                                    HorizontalAlignment="Center"
+                                                    Orientation="Horizontal"
+                                                    Spacing="12"
+                                                    Visibility="{x:Bind core:Converters.FalseToVis(ViewModel.IsSystemExportEnabled), Mode=OneWay}">
+                                                    <muxc:ProgressRing
+                                                        Width="18"
+                                                        Height="18"
+                                                        HorizontalAlignment="Center" />
+                                                    <TextBlock Text="{x:Bind ViewModel.SystemExportProgress, Mode=OneWay}" />
+                                                </StackPanel>
+
+                                                <TextBlock x:Uid="SettingsExportInstalledLabel" Visibility="{x:Bind ViewModel.IsSystemExportEnabled, Mode=OneWay}" />
+                                            </Grid>
+                                            <core:Properties.Flyout>
+                                                <MenuFlyout
+                                                    AreOpenCloseAnimationsEnabled="{x:Bind ViewModel.AllowAnimation, Mode=OneWay}"
+                                                    MenuFlyoutPresenterStyle="{StaticResource DefaultFlyoutStyle}"
+                                                    Placement="Bottom">
+                                                    <MenuFlyoutItem x:Uid="CollectionExportFolder" Click="{x:Bind ViewModel.ExportSystemToFolder}" />
+                                                    <MenuFlyoutItem x:Uid="CollectionExportZip" Click="{x:Bind ViewModel.ExportSystemAsZip}" />
+                                                </MenuFlyout>
+                                            </core:Properties.Flyout>
+                                        </controls:UXHyperlinkButton>
+                                    </StackPanel>
                                 </controls:SettingsPresenter>
 
                                 <controls:SettingsPresenter Title="{core:Localizer Key=SettingsImportedFontsLabel/Text}" ContentPlacement="Bottom">
-
-                                    <StackPanel>
-
-                                        <TextBlock x:Uid="SettingsFontImportDescription" Style="{StaticResource DescriptionStyle}" />
-
+                                    <controls:SettingsPresenter.Description>
                                         <StackPanel Spacing="6">
-                                            <TextBlock
-                                                x:Uid="ImportLabel"
-                                                Margin="0 16 0 0"
-                                                Style="{StaticResource HeaderStyle}"
-                                                d:Text="Import" />
-                                            <Grid
-                                                x:Name="ImportFontsRegion"
-                                                Width="340"
-                                                Height="80"
-                                                HorizontalAlignment="Left">
-                                                <Rectangle
-                                                    Opacity="0.4"
-                                                    Stroke="{ThemeResource SystemControlForegroundBaseHighBrush}"
-                                                    StrokeDashArray="2 2"
-                                                    StrokeThickness="1" />
 
+                                            <TextBlock x:Uid="SettingsFontImportDescription" TextWrapping="Wrap" />
+
+                                            <controls:UXHyperlinkButton
+                                                x:Name="ExportImportedButton"
+                                                MinWidth="133"
+                                                IsEnabled="{x:Bind ViewModel.IsCollectionExportEnabled, Mode=OneWay}">
                                                 <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" />
-                                                        <ColumnDefinition Width="*" />
-                                                    </Grid.ColumnDefinitions>
-
-                                                    <FontIcon
-                                                        Margin="12 12 0 12"
-                                                        VerticalAlignment="Top"
-                                                        FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                                        FontSize="30"
-                                                        Glyph="&#xE1E3;" />
-
-                                                    <StackPanel Grid.Column="1" Margin="12">
-                                                        <TextBlock
-                                                            x:Uid="ImportDragDropLabel"
-                                                            FontWeight="SemiBold"
-                                                            Opacity="0.7" />
-                                                        <TextBlock
-                                                            x:Uid="ImportDragDropDescriptionLabel"
-                                                            FontSize="12"
-                                                            Opacity="0.6"
-                                                            TextWrapping="Wrap" />
+                                                    <StackPanel
+                                                        HorizontalAlignment="Center"
+                                                        Orientation="Horizontal"
+                                                        Spacing="12"
+                                                        Visibility="{x:Bind core:Converters.FalseToVis(ViewModel.IsCollectionExportEnabled), Mode=OneWay}">
+                                                        <muxc:ProgressRing
+                                                            Width="18"
+                                                            Height="18"
+                                                            HorizontalAlignment="Center" />
+                                                        <TextBlock Text="{x:Bind ViewModel.ImportedExportProgress, Mode=OneWay}" />
                                                     </StackPanel>
 
+                                                    <TextBlock x:Uid="SettingsExportImportedLabel" Visibility="{x:Bind ViewModel.IsCollectionExportEnabled, Mode=OneWay}" />
                                                 </Grid>
-
-
-                                            </Grid>
-                                        </StackPanel>
-
-                                        <StackPanel x:Name="ImportedExportPanel" Spacing="6">
-                                            <TextBlock
-                                                x:Uid="SettingsExportHeader"
-                                                Margin="0 16 0 0"
-                                                Style="{StaticResource HeaderStyle}" />
-                                            <Button
-                                                Width="340"
-                                                Padding="12 10 12 10"
-                                                HorizontalAlignment="Left"
-                                                HorizontalContentAlignment="Left"
-                                                Background="Transparent"
-                                                BorderBrush="{ThemeResource ButtonBorderThemeBrush}"
-                                                IsEnabled="{x:Bind ViewModel.IsCollectionExportEnabled, Mode=OneWay}"
-                                                Style="{StaticResource ButtonRevealStyle}">
-                                                <StackPanel Orientation="Horizontal" Spacing="12">
-                                                    <PathIcon
-                                                        HorizontalAlignment="Center"
-                                                        VerticalAlignment="Center"
-                                                        Data="F1 M 18.046875 8.75 C 18.320313 8.75 18.575846 8.798828 18.813477 8.896484 C 19.051105 8.994141 19.257813 9.129232 19.433594 9.301758 C 19.609375 9.474284 19.747721 9.679362 19.848633 9.916992 C 19.949543 10.154623 20 10.410156 20 10.683594 C 20 10.9375 19.951172 11.184896 19.853516 11.425781 C 19.755859 11.666667 19.615885 11.878256 19.433594 12.060547 L 12.431641 19.0625 L 8.75 19.980469 L 9.667969 16.298828 L 16.669922 9.306641 C 16.858723 9.117839 17.070313 8.977865 17.304688 8.886719 C 17.539063 8.795573 17.786457 8.75 18.046875 8.75 Z M 18.544922 11.181641 C 18.681641 11.044922 18.75 10.878906 18.75 10.683594 C 18.75 10.481771 18.683268 10.317383 18.549805 10.19043 C 18.41634 10.063477 18.248697 10 18.046875 10 C 17.955729 10 17.867838 10.014648 17.783203 10.043945 C 17.698566 10.073242 17.623697 10.120443 17.558594 10.185547 L 10.800781 16.943359 L 10.46875 18.261719 L 11.787109 17.929688 Z M 7.5 15 L 8.75 15 L 7.5 16.25 L 2.861328 16.25 L 1.25 14.638672 L 1.25 2.5 C 1.25 2.324219 1.282552 2.161459 1.347656 2.011719 C 1.41276 1.86198 1.502279 1.730145 1.616211 1.616211 C 1.730143 1.502279 1.861979 1.412762 2.011719 1.347656 C 2.161458 1.282553 2.324219 1.25 2.5 1.25 L 15 1.25 C 15.17578 1.25 15.338541 1.282553 15.488281 1.347656 C 15.638021 1.412762 15.769856 1.502279 15.883789 1.616211 C 15.997721 1.730145 16.087238 1.86198 16.152344 2.011719 C 16.217447 2.161459 16.25 2.324219 16.25 2.5 L 16.25 7.5 L 15 8.75 L 15 2.5 L 13.75 2.5 L 13.75 8.75 L 3.75 8.75 L 3.75 2.5 L 2.5 2.5 L 2.5 14.111328 L 3.388672 15 L 3.75 15 L 3.75 10 L 12.5 10 L 12.5 11.25 L 11.25 12.5 L 11.25 11.25 L 5 11.25 L 5 15 L 6.25 15 L 6.25 12.5 L 7.5 12.5 Z M 5 7.5 L 12.5 7.5 L 12.5 2.5 L 5 2.5 Z " />
-                                                    <TextBlock
-                                                        x:Uid="SettingsExportImportedLabel"
-                                                        VerticalAlignment="Center"
-                                                        FontWeight="SemiBold"
-                                                        Opacity="0.7" />
-                                                    <ProgressRing
-                                                        Width="20"
-                                                        Height="20"
-                                                        MinWidth="20"
-                                                        MinHeight="20"
-                                                        HorizontalAlignment="Center"
-                                                        VerticalAlignment="Center"
-                                                        IsActive="{x:Bind core:Converters.False(ViewModel.IsCollectionExportEnabled), Mode=OneWay}"
-                                                        Visibility="{x:Bind core:Converters.FalseToVis(ViewModel.IsCollectionExportEnabled), Mode=OneWay}" />
-                                                </StackPanel>
-                                                <Button.Flyout>
+                                                <core:Properties.Flyout>
                                                     <MenuFlyout
                                                         AreOpenCloseAnimationsEnabled="{x:Bind ViewModel.AllowAnimation, Mode=OneWay}"
                                                         MenuFlyoutPresenterStyle="{StaticResource DefaultFlyoutStyle}"
@@ -791,10 +760,61 @@
                                                         <MenuFlyoutItem x:Uid="CollectionExportFolder" Click="{x:Bind ViewModel.ExportToFolder}" />
                                                         <MenuFlyoutItem x:Uid="CollectionExportZip" Click="{x:Bind ViewModel.ExportAsZip}" />
                                                     </MenuFlyout>
-                                                </Button.Flyout>
-                                            </Button>
+                                                </core:Properties.Flyout>
+                                            </controls:UXHyperlinkButton>
+
+                                            <StackPanel Spacing="6">
+                                                <TextBlock
+                                                    x:Uid="ImportLabel"
+                                                    Margin="0 10 0 0"
+                                                    Style="{StaticResource HeaderStyle}"
+                                                    TextWrapping="Wrap"
+                                                    d:Text="Import" />
+
+                                                <Grid
+                                                    x:Name="ImportFontsRegion"
+                                                    Width="340"
+                                                    Height="80"
+                                                    HorizontalAlignment="Left">
+                                                    <Rectangle
+                                                        Opacity="0.8"
+                                                        Stroke="{ThemeResource SystemControlForegroundBaseHighBrush}"
+                                                        StrokeDashArray="2 2"
+                                                        StrokeThickness="1" />
+
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" />
+                                                            <ColumnDefinition Width="*" />
+                                                        </Grid.ColumnDefinitions>
+
+                                                        <FontIcon
+                                                            Margin="12 12 0 12"
+                                                            VerticalAlignment="Top"
+                                                            FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                                            FontSize="30"
+                                                            Glyph="&#xE1E3;" />
+
+                                                        <StackPanel Grid.Column="1" Margin="12">
+                                                            <TextBlock
+                                                                x:Uid="ImportDragDropLabel"
+                                                                FontWeight="SemiBold"
+                                                                Opacity="0.8" />
+                                                            <TextBlock
+                                                                x:Uid="ImportDragDropDescriptionLabel"
+                                                                FontSize="12"
+                                                                Opacity="0.8"
+                                                                TextWrapping="Wrap" />
+                                                        </StackPanel>
+
+                                                    </Grid>
+
+
+                                                </Grid>
+                                            </StackPanel>
                                         </StackPanel>
-                                    </StackPanel>
+                                    </controls:SettingsPresenter.Description>
+
 
                                 </controls:SettingsPresenter>
 
diff --git a/CharacterMap/CharacterMap/Views/SettingsView.xaml.cs b/CharacterMap/CharacterMap/Views/SettingsView.xaml.cs
index b31a6513..d3fdd37a 100644
--- a/CharacterMap/CharacterMap/Views/SettingsView.xaml.cs
+++ b/CharacterMap/CharacterMap/Views/SettingsView.xaml.cs
@@ -162,7 +162,7 @@ private void UpdateExport()
         {
             this.RunOnUI(() =>
             {
-                ImportedExportPanel?.SetVisible(FontFinder.ImportedFonts.Count > 0);
+                ExportImportedButton?.SetVisible(FontFinder.ImportedFonts.Count > 0);
             });
         }