diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/Abstract/TextIconExtension.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/Abstract/TextIconExtension.cs
index 000b51302b5..d553ed25399 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/Abstract/TextIconExtension.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/Abstract/TextIconExtension.cs
@@ -20,14 +20,14 @@ public abstract class TextIconExtension : MarkupExtension
public double FontSize { get; set; }
[ThreadStatic]
- private static FontFamily segoeMDL2AssetsFontFamily;
+ private static FontFamily symbolThemeFontFamily;
///
- /// Gets the reusable "Segoe MDL2 Assets" instance.
+ /// Gets the reusable "Segoe Fluent Icons,Segoe MDL2 Assets" instance.
///
- protected static FontFamily SegoeMDL2AssetsFontFamily
+ protected static FontFamily SymbolThemeFontFamily
{
- get => segoeMDL2AssetsFontFamily ??= new FontFamily("Segoe MDL2 Assets");
+ get => symbolThemeFontFamily ??= new FontFamily("Segoe Fluent Icons,Segoe MDL2 Assets");
}
///
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconExtension.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconExtension.cs
index 6572d7c1e3d..399960f27cf 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconExtension.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconExtension.cs
@@ -20,7 +20,7 @@ public class FontIconExtension : TextIconExtension
public string Glyph { get; set; }
///
- /// Gets or sets the font family to use to display the icon. If , "Segoe MDL2 Assets" will be used.
+ /// Gets or sets the font family to use to display the icon. If , "Segoe Fluent Icons,Segoe MDL2 Assets" will be used.
///
public FontFamily FontFamily { get; set; }
@@ -30,7 +30,7 @@ protected override object ProvideValue()
var fontIcon = new FontIcon
{
Glyph = Glyph,
- FontFamily = FontFamily ?? SegoeMDL2AssetsFontFamily,
+ FontFamily = FontFamily ?? SymbolThemeFontFamily,
FontWeight = FontWeight,
FontStyle = FontStyle,
IsTextScaleFactorEnabled = IsTextScaleFactorEnabled,
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconSourceExtension.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconSourceExtension.cs
index f152f57a0ad..3114ab09730 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconSourceExtension.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconSourceExtension.cs
@@ -20,7 +20,7 @@ public class FontIconSourceExtension : TextIconExtension
public string Glyph { get; set; }
///
- /// Gets or sets the font family to use to display the icon. If , "Segoe MDL2 Assets" will be used.
+ /// Gets or sets the font family to use to display the icon. If , "Segoe Fluent Icons,Segoe MDL2 Assets" will be used.
///
public FontFamily FontFamily { get; set; }
@@ -30,7 +30,7 @@ protected override object ProvideValue()
var fontIcon = new FontIconSource
{
Glyph = Glyph,
- FontFamily = FontFamily ?? SegoeMDL2AssetsFontFamily,
+ FontFamily = FontFamily ?? SymbolThemeFontFamily,
FontWeight = FontWeight,
FontStyle = FontStyle,
IsTextScaleFactorEnabled = IsTextScaleFactorEnabled,
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/SymbolIconExtension.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/SymbolIconExtension.cs
index 4e3528cb4f5..a7939a1e6a2 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/SymbolIconExtension.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/SymbolIconExtension.cs
@@ -24,7 +24,7 @@ protected override object ProvideValue()
var fontIcon = new FontIcon
{
Glyph = unchecked((char)Symbol).ToString(),
- FontFamily = SegoeMDL2AssetsFontFamily,
+ FontFamily = SymbolThemeFontFamily,
FontWeight = FontWeight,
FontStyle = FontStyle,
IsTextScaleFactorEnabled = IsTextScaleFactorEnabled,
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/SymbolIconSourceExtension.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/SymbolIconSourceExtension.cs
index 328ac1a38cd..62354d76953 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/SymbolIconSourceExtension.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/SymbolIconSourceExtension.cs
@@ -24,7 +24,7 @@ protected override object ProvideValue()
var fontIcon = new FontIconSource
{
Glyph = unchecked((char)Symbol).ToString(),
- FontFamily = SegoeMDL2AssetsFontFamily,
+ FontFamily = SymbolThemeFontFamily,
FontWeight = FontWeight,
FontStyle = FontStyle,
IsTextScaleFactorEnabled = IsTextScaleFactorEnabled,
diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_FontIconExtensionMarkupExtension.cs b/UnitTests/UnitTests.UWP/Extensions/Test_FontIconExtensionMarkupExtension.cs
index f7fb4f45cc7..3b56c496749 100644
--- a/UnitTests/UnitTests.UWP/Extensions/Test_FontIconExtensionMarkupExtension.cs
+++ b/UnitTests/UnitTests.UWP/Extensions/Test_FontIconExtensionMarkupExtension.cs
@@ -17,7 +17,7 @@ public class Test_FontIconExtensionMarkupExtension
{
[TestCategory("FontIconExtensionMarkupExtension")]
[UITestMethod]
- public void Test_FontIconExtension_MarkupExtension_ProvideSegoeMdl2Asset()
+ public void Test_FontIconExtension_MarkupExtension_ProvideSymbolThemeFont()
{
var treeroot = XamlReader.Load(@"