From a63fbc5cfe5579ebcc3d767bbb4fa91f3e7d5697 Mon Sep 17 00:00:00 2001
From: morning4coffe-dev <78549750+morning4coffe-dev@users.noreply.github.com>
Date: Tue, 31 Oct 2023 19:26:40 +0100
Subject: [PATCH 1/5] chore: Update PersonPicture to winui3/release/1.4.2

---
 .../PriorityDefault/PersonPicture.xaml        |  248 ++--
 .../PersonPicture_themeresources.xaml         |   94 +-
 .../themeresources_v2.xaml                    |    9 +-
 .../PersonPicture/InitialsGenerator.cs        |  947 +++++++-------
 .../PersonPicture/PersonPicture.Properties.cs |  311 +++--
 .../Controls/PersonPicture/PersonPicture.cs   | 1087 ++++++++---------
 .../PersonPictureAutomationPeer.cs            |    6 +
 .../PersonPictureTemplateSettings.cs          |   36 +-
 8 files changed, 1318 insertions(+), 1420 deletions(-)

diff --git a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/PersonPicture.xaml b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/PersonPicture.xaml
index ba71a51e342b..6e2c9a2aa8e3 100644
--- a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/PersonPicture.xaml
+++ b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/PersonPicture.xaml
@@ -1,168 +1,84 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.UI.Xaml.Controls"
-    xmlns:wasm="http://uno.ui/wasm"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d wasm">
-
-    <Style TargetType="local:PersonPicture" BasedOn="{StaticResource DefaultPersonPictureStyle}" />
-
-    <Style x:Key="DefaultPersonPictureStyle" TargetType="local:PersonPicture">
-        <Setter Property="Foreground" Value="{ThemeResource PersonPictureForegroundThemeBrush}" />
-        <Setter Property="Background" Value="{ThemeResource PersonPictureEllipseFillThemeBrush}"/>
-        <Setter Property="BorderBrush" Value="{ThemeResource PersonPictureEllipseFillStrokeBrush}"/>
-        <Setter Property="BorderThickness" Value="{ThemeResource PersonPictureEllipseStrokeThickness}"/>
-        <Setter Property="Width" Value="96" />
-        <Setter Property="Height" Value="96" />
-        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-        <Setter Property="FontWeight" Value="SemiBold" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="AutomationProperties.AccessibilityView" Value="Raw" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="local:PersonPicture">
-                    <Grid x:Name="RootGrid">
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <!-- Visual State when a Photo is available for display -->
-                                <VisualState x:Name="Photo">
-                                    <VisualState.Setters>
-                                        <Setter Target="PersonPictureEllipse.Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ActualImageBrush}"/>
-
-                                        <!-- UNO WORKAROUND: ImageBrush is not stretching properly https://github.com/unoplatform/uno/issues/4951 -->
-                                        <wasm:Setter Target="PersonPictureImage.Source"
-														 Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ActualImageBrush.ImageSource}" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <!-- Visual State when no Photo is available (but there are initials).-->
-                                <VisualState x:Name="Initials" />
-                                <VisualState x:Name="NoPhotoOrInitials">
-                                    <VisualState.Setters>
-                                        <Setter Target="InitialsTextBlock.FontFamily" Value="{ThemeResource SymbolThemeFontFamily}"/>
-                                        <!-- Placeholder symbol for 'Contact' (https://docs.microsoft.com/en-us/windows/uwp/design/style/segoe-ui-symbol-font) -->
-                                        <Setter Target="InitialsTextBlock.Text" Value="&#xE77B;"/>
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <!-- Visual State when in Group mode -->
-                                <VisualState x:Name="Group">
-                                    <VisualState.Setters>
-                                        <Setter Target="InitialsTextBlock.FontFamily" Value="{ThemeResource SymbolThemeFontFamily}"/>
-                                        <!-- Placeholder symbol for 'People' (https://docs.microsoft.com/en-us/windows/uwp/design/style/segoe-ui-symbol-font) -->
-                                        <Setter Target="InitialsTextBlock.Text" Value="&#xE716;"/>
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="BadgeStates">
-                                <VisualState x:Name="NoBadge" />
-                                <VisualState x:Name="BadgeWithoutImageSource" >
-                                    <VisualState.Setters>
-                                        <Setter Target="BadgeGrid.Visibility" Value="Visible" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="BadgeWithImageSource">
-                                    <VisualState.Setters>
-                                        <Setter Target="BadgeGrid.Visibility" Value="Visible" />
-                                        <Setter Target="BadgingEllipse.Opacity" Value="{ThemeResource PersonPictureEllipseBadgeImageSourceStrokeOpacity}" />
-                                        <Setter Target="BadgingEllipse.Fill">
-                                            <Setter.Value>
-                                                <ImageBrush x:Name="BadgeImageBrush" Stretch="UniformToFill" />
-                                            </Setter.Value>
-                                        </Setter>
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-
-                        <Ellipse
-                            Fill="{TemplateBinding Background}"
-                            Stroke="{TemplateBinding BorderBrush}"
-                            StrokeThickness="{TemplateBinding BorderThickness}"
-                            Width="{TemplateBinding Width}"
-                            Height="{TemplateBinding Height}" />
-
-                        <TextBlock
-                            x:Name="InitialsTextBlock"
-                            AutomationProperties.AccessibilityView="Raw"
-                            FontSize="40"
-                            FontFamily="{TemplateBinding FontFamily}"
-                            Foreground="{TemplateBinding Foreground}"
-                            FontWeight="{TemplateBinding FontWeight}"
-                            TextLineBounds="Tight"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Center"
-                            IsTextScaleFactorEnabled="False"
-                            Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ActualInitials}" />
-
-                        <Ellipse
-                            x:Name="PersonPictureEllipse"
-                            x:DeferLoadStrategy="Lazy"
-                            Width="{TemplateBinding Width}"
-                            Height="{TemplateBinding Height}"
-                            FlowDirection="LeftToRight">
-                        </Ellipse>
-
-                        <!-- UNO WORKAROUND: ImageBrush is not stretching properly https://github.com/unoplatform/uno/issues/4951 -->
-                        <wasm:Border Width="{TemplateBinding Width}"
-										 Height="{TemplateBinding Height}"
-										 CornerRadius="{TemplateBinding Width}"
-										 FlowDirection="LeftToRight">
-                            <Image x:Name="PersonPictureImage"
-									   Stretch="UniformToFill"
-									   HorizontalAlignment="Center"
-									   VerticalAlignment="Center" />
-                        </wasm:Border>
-
-                        <!-- UNO WORKAROUND: Removed Margin="{ThemeResource PersonPictureBadgeGridMargin}". Clipping issue with negative margin: #-->
-                        <Grid
-                            x:Name="BadgeGrid"
-                            Visibility="Collapsed"
-                            VerticalAlignment="Top"
-                            HorizontalAlignment="Right"
-                            Margin="{ThemeResource PersonPictureBadgeGridMargin}">
-
-                            <Ellipse
-                                x:Name="BadgingBackgroundEllipse"
-                                x:DeferLoadStrategy="Lazy"
-                                Opacity="{ThemeResource PersonPictureEllipseBadgeStrokeOpacity}"
-                                Fill="{ThemeResource PersonPictureEllipseBadgeFillThemeBrush}"
-                                Stroke="{ThemeResource PersonPictureEllipseBadgeStrokeThemeBrush}"
-                                StrokeThickness="{ThemeResource PersonPictureEllipseBadgeStrokeThickness}"/>
-
-                            <Ellipse
-                                x:Name="BadgingEllipse"
-                                x:DeferLoadStrategy="Lazy"
-                                Opacity="0"
-                                FlowDirection="LeftToRight"/>
-
-                            <TextBlock
-                                x:Name="BadgeNumberTextBlock"
-                                x:DeferLoadStrategy="Lazy"
-                                AutomationProperties.AccessibilityView="Raw"
-                                Foreground="{ThemeResource PersonPictureEllipseBadgeForegroundThemeBrush}"
-                                FontFamily="{TemplateBinding FontFamily}"
-                                FontWeight="{TemplateBinding FontWeight}"
-                                TextLineBounds="Tight"
-                                VerticalAlignment="Center"
-                                HorizontalAlignment="Center"
-                                IsTextScaleFactorEnabled="False" />
-
-                            <!-- Default font family to "Segoe MDL2 Assets" -->
-                            <FontIcon
-                                x:Name="BadgeGlyphIcon"
-                                x:DeferLoadStrategy="Lazy"
-                                AutomationProperties.AccessibilityView="Raw"
-                                Foreground="{ThemeResource PersonPictureEllipseBadgeForegroundThemeBrush}"
-                                FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                FontWeight="{TemplateBinding FontWeight}"
-                                VerticalAlignment="Center"
-                                HorizontalAlignment="Center" />
-                        </Grid>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+<!-- MUX Reference PersonPicture.xaml, tag winui3/release/1.4.2 -->
+<ResourceDictionary xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:controls="using:Microsoft.UI.Xaml.Controls" xmlns:wasm="http://uno.ui/wasm" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d wasm">
+  <Style TargetType="controls:PersonPicture" BasedOn="{StaticResource DefaultPersonPictureStyle}" />
+  <Style x:Key="DefaultPersonPictureStyle" TargetType="controls:PersonPicture">
+    <Setter Property="Foreground" Value="{ThemeResource PersonPictureForegroundThemeBrush}" />
+    <Setter Property="Width" Value="96" />
+    <Setter Property="Height" Value="96" />
+    <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+    <Setter Property="FontWeight" Value="SemiBold" />
+    <Setter Property="IsTabStop" Value="False" />
+    <Setter Property="AutomationProperties.AccessibilityView" Value="Raw" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="controls:PersonPicture">
+          <Grid x:Name="RootGrid">
+            <VisualStateManager.VisualStateGroups>
+              <VisualStateGroup x:Name="CommonStates">
+                <!-- Visual State when a Photo is available for display -->
+                <VisualState x:Name="Photo">
+                  <VisualState.Setters>
+                    <Setter Target="PersonPictureEllipse.Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ActualImageBrush}" />
+                    <!-- UNO WORKAROUND: ImageBrush is not stretching properly https://github.com/unoplatform/uno/issues/4951 -->
+                    <wasm:Setter Target="PersonPictureImage.Source" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ActualImageBrush.ImageSource}" />
+                  </VisualState.Setters>
+                </VisualState>
+                <!-- Visual State when no Photo is available (but there are initials).-->
+                <VisualState x:Name="Initials" />
+                <VisualState x:Name="NoPhotoOrInitials">
+                  <VisualState.Setters>
+                    <Setter Target="InitialsTextBlock.FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
+                    <!-- Placeholder symbol for 'Contact' (https://docs.microsoft.com/en-us/windows/uwp/design/style/segoe-ui-symbol-font) -->
+                    <Setter Target="InitialsTextBlock.Text" Value="&#xE77B;" />
+                  </VisualState.Setters>
+                </VisualState>
+                <!-- Visual State when in Group mode -->
+                <VisualState x:Name="Group">
+                  <VisualState.Setters>
+                    <Setter Target="InitialsTextBlock.FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
+                    <!-- Placeholder symbol for 'People' (https://docs.microsoft.com/en-us/windows/uwp/design/style/segoe-ui-symbol-font) -->
+                    <Setter Target="InitialsTextBlock.Text" Value="&#xE716;" />
+                  </VisualState.Setters>
+                </VisualState>
+              </VisualStateGroup>
+              <VisualStateGroup x:Name="BadgeStates">
+                <VisualState x:Name="NoBadge" />
+                <VisualState x:Name="BadgeWithoutImageSource">
+                  <VisualState.Setters>
+                    <Setter Target="BadgeGrid.Visibility" Value="Visible" />
+                  </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="BadgeWithImageSource">
+                  <VisualState.Setters>
+                    <Setter Target="BadgeGrid.Visibility" Value="Visible" />
+                    <Setter Target="BadgingEllipse.Opacity" Value="{ThemeResource PersonPictureEllipseBadgeImageSourceStrokeOpacity}" />
+                    <Setter Target="BadgingEllipse.Fill">
+                      <Setter.Value>
+                        <ImageBrush x:Name="BadgeImageBrush" Stretch="UniformToFill" />
+                      </Setter.Value>
+                    </Setter>
+                  </VisualState.Setters>
+                </VisualState>
+              </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+            <Ellipse Fill="{ThemeResource PersonPictureEllipseFillThemeBrush}" Stroke="{ThemeResource PersonPictureEllipseFillStrokeBrush}" StrokeThickness="{ThemeResource PersonPictureEllipseStrokeThickness}" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" />
+            <!-- UNO WORKAROUND: ImageBrush is not stretching properly https://github.com/unoplatform/uno/issues/4951 -->
+            <wasm:Border Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" CornerRadius="{TemplateBinding Width}" FlowDirection="LeftToRight">
+                <Image x:Name="PersonPictureImage" Stretch="UniformToFill" HorizontalAlignment="Center" VerticalAlignment="Center" />
+            </wasm:Border>
+            <TextBlock x:Name="InitialsTextBlock" AutomationProperties.AccessibilityView="Raw" FontSize="40" FontFamily="{TemplateBinding FontFamily}" Foreground="{TemplateBinding Foreground}" FontWeight="{TemplateBinding FontWeight}" TextLineBounds="Tight" VerticalAlignment="Center" HorizontalAlignment="Center" IsTextScaleFactorEnabled="False" Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ActualInitials}" />
+            <Ellipse x:Name="PersonPictureEllipse" x:DeferLoadStrategy="Lazy" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" FlowDirection="LeftToRight" />
+            <Grid x:Name="BadgeGrid" Visibility="Collapsed" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="{ThemeResource PersonPictureBadgeGridMargin}">
+              <Ellipse x:Name="BadgingBackgroundEllipse" x:DeferLoadStrategy="Lazy" Opacity="{ThemeResource PersonPictureEllipseBadgeStrokeOpacity}" Fill="{ThemeResource PersonPictureEllipseBadgeFillThemeBrush}" Stroke="{ThemeResource PersonPictureEllipseBadgeStrokeThemeBrush}" StrokeThickness="{ThemeResource PersonPictureEllipseBadgeStrokeThickness}" />
+              <Ellipse x:Name="BadgingEllipse" x:DeferLoadStrategy="Lazy" Opacity="0" FlowDirection="LeftToRight" />
+              <TextBlock x:Name="BadgeNumberTextBlock" x:DeferLoadStrategy="Lazy" AutomationProperties.AccessibilityView="Raw" Foreground="{ThemeResource PersonPictureEllipseBadgeForegroundThemeBrush}" FontFamily="{TemplateBinding FontFamily}" FontWeight="{TemplateBinding FontWeight}" TextLineBounds="Tight" VerticalAlignment="Center" HorizontalAlignment="Center" IsTextScaleFactorEnabled="False" />
+              <!-- Default font family to "Segoe MDL2 Assets" -->
+              <FontIcon x:Name="BadgeGlyphIcon" x:DeferLoadStrategy="Lazy" AutomationProperties.AccessibilityView="Raw" Foreground="{ThemeResource PersonPictureEllipseBadgeForegroundThemeBrush}" FontFamily="{ThemeResource SymbolThemeFontFamily}" FontWeight="{TemplateBinding FontWeight}" VerticalAlignment="Center" HorizontalAlignment="Center" />
+            </Grid>
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 </ResourceDictionary>
diff --git a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/PersonPicture_themeresources.xaml b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/PersonPicture_themeresources.xaml
index 444debf9b1da..6b54e5fde1bd 100644
--- a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/PersonPicture_themeresources.xaml
+++ b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/PersonPicture_themeresources.xaml
@@ -1,51 +1,45 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.UI.Xaml.Controls">
-
-    <ResourceDictionary.ThemeDictionaries>
-        <ResourceDictionary x:Key="Default">
-            <StaticResource x:Key="PersonPictureForegroundThemeBrush" ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="PersonPictureEllipseBadgeForegroundThemeBrush" ResourceKey="TextOnAccentFillColorPrimaryBrush"/>
-            <StaticResource x:Key="PersonPictureEllipseBadgeFillThemeBrush" ResourceKey="AccentFillColorDefaultBrush"/>
-            <StaticResource x:Key="PersonPictureEllipseBadgeStrokeThemeBrush" ResourceKey="ControlFillColorTransparentBrush"/>
-            <StaticResource x:Key="PersonPictureEllipseFillThemeBrush" ResourceKey="ControlAltFillColorQuarternary" />
-            <StaticResource x:Key="PersonPictureEllipseFillStrokeBrush" ResourceKey="CardStrokeColorDefaultBrush" />
-            <x:Double x:Key="PersonPictureEllipseBadgeStrokeOpacity">1</x:Double>
-            <x:Double x:Key="PersonPictureEllipseBadgeImageSourceStrokeOpacity">1</x:Double>
-            <x:Double x:Key="PersonPictureEllipseStrokeThickness">1</x:Double>
-            <x:Double x:Key="PersonPictureEllipseBadgeStrokeThickness">2</x:Double>
-            <Thickness x:Key="PersonPictureBadgeGridMargin">0,-4,-4,0</Thickness>
-        </ResourceDictionary>
-
-        <ResourceDictionary x:Key="Light">
-            <StaticResource x:Key="PersonPictureForegroundThemeBrush" ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="PersonPictureEllipseBadgeForegroundThemeBrush" ResourceKey="TextOnAccentFillColorPrimaryBrush"/>
-            <StaticResource x:Key="PersonPictureEllipseBadgeFillThemeBrush" ResourceKey="AccentFillColorDefaultBrush"/>
-            <StaticResource x:Key="PersonPictureEllipseBadgeStrokeThemeBrush" ResourceKey="ControlFillColorTransparentBrush"/>
-            <StaticResource x:Key="PersonPictureEllipseFillThemeBrush" ResourceKey="ControlAltFillColorQuarternary" />
-            <StaticResource x:Key="PersonPictureEllipseFillStrokeBrush" ResourceKey="CardStrokeColorDefaultBrush" />
-            <x:Double x:Key="PersonPictureEllipseBadgeStrokeOpacity">1</x:Double>
-            <x:Double x:Key="PersonPictureEllipseBadgeImageSourceStrokeOpacity">1</x:Double>
-            <x:Double x:Key="PersonPictureEllipseStrokeThickness">1</x:Double>
-            <x:Double x:Key="PersonPictureEllipseBadgeStrokeThickness">2</x:Double>
-            <Thickness x:Key="PersonPictureBadgeGridMargin">0,-4,-4,0</Thickness>
-        </ResourceDictionary>
-
-        <ResourceDictionary x:Key="HighContrast">
-            <StaticResource x:Key="PersonPictureForegroundThemeBrush" ResourceKey="SystemControlForegroundBaseHighBrush" />
-            <SolidColorBrush x:Key="PersonPictureEllipseBadgeForegroundThemeBrush" Color="{ThemeResource SystemColorButtonTextColor}"/>
-            <SolidColorBrush x:Key="PersonPictureEllipseBadgeFillThemeBrush" Color="{ThemeResource SystemColorButtonFaceColor}"/>
-            <SolidColorBrush x:Key="PersonPictureEllipseBadgeStrokeThemeBrush" Color="{ThemeResource SystemColorButtonTextColor}"/>
-            <StaticResource x:Key="PersonPictureEllipseFillThemeBrush" ResourceKey="SystemColorHighlightTextColorBrush" />
-            <StaticResource x:Key="PersonPictureEllipseFillStrokeBrush" ResourceKey="CardStrokeColorDefaultBrush" />
-            <x:Double x:Key="PersonPictureEllipseBadgeStrokeOpacity">1</x:Double>
-            <x:Double x:Key="PersonPictureEllipseBadgeImageSourceStrokeOpacity">1</x:Double>
-            <x:Double x:Key="PersonPictureEllipseStrokeThickness">1</x:Double>
-            <x:Double x:Key="PersonPictureEllipseBadgeStrokeThickness">2</x:Double>
-            <Thickness x:Key="PersonPictureBadgeGridMargin">0,-4,-4,0</Thickness>
-        </ResourceDictionary>
-    </ResourceDictionary.ThemeDictionaries>
-
-</ResourceDictionary>
+<!-- MUX Reference PersonPicture_themeresources.xaml, tag winui3/release/1.4.2 -->
+<ResourceDictionary xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:controls="using:Microsoft.UI.Xaml.Controls" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+  <ResourceDictionary.ThemeDictionaries>
+    <ResourceDictionary x:Key="Default">
+      <StaticResource x:Key="PersonPictureForegroundThemeBrush" ResourceKey="TextFillColorPrimaryBrush" />
+      <StaticResource x:Key="PersonPictureEllipseBadgeForegroundThemeBrush" ResourceKey="TextOnAccentFillColorPrimaryBrush" />
+      <StaticResource x:Key="PersonPictureEllipseBadgeFillThemeBrush" ResourceKey="AccentFillColorDefaultBrush" />
+      <StaticResource x:Key="PersonPictureEllipseBadgeStrokeThemeBrush" ResourceKey="ControlFillColorTransparentBrush" />
+      <StaticResource x:Key="PersonPictureEllipseFillThemeBrush" ResourceKey="ControlAltFillColorQuarternary" />
+      <StaticResource x:Key="PersonPictureEllipseFillStrokeBrush" ResourceKey="CardStrokeColorDefaultBrush" />
+      <x:Double x:Key="PersonPictureEllipseBadgeStrokeOpacity">1</x:Double>
+      <x:Double x:Key="PersonPictureEllipseBadgeImageSourceStrokeOpacity">1</x:Double>
+      <x:Double x:Key="PersonPictureEllipseStrokeThickness">1</x:Double>
+      <x:Double x:Key="PersonPictureEllipseBadgeStrokeThickness">2</x:Double>
+      <Thickness x:Key="PersonPictureBadgeGridMargin">0,-4,-4,0</Thickness>
+    </ResourceDictionary>
+    <ResourceDictionary x:Key="Light">
+      <StaticResource x:Key="PersonPictureForegroundThemeBrush" ResourceKey="TextFillColorPrimaryBrush" />
+      <StaticResource x:Key="PersonPictureEllipseBadgeForegroundThemeBrush" ResourceKey="TextOnAccentFillColorPrimaryBrush" />
+      <StaticResource x:Key="PersonPictureEllipseBadgeFillThemeBrush" ResourceKey="AccentFillColorDefaultBrush" />
+      <StaticResource x:Key="PersonPictureEllipseBadgeStrokeThemeBrush" ResourceKey="ControlFillColorTransparentBrush" />
+      <StaticResource x:Key="PersonPictureEllipseFillThemeBrush" ResourceKey="ControlAltFillColorQuarternary" />
+      <StaticResource x:Key="PersonPictureEllipseFillStrokeBrush" ResourceKey="CardStrokeColorDefaultBrush" />
+      <x:Double x:Key="PersonPictureEllipseBadgeStrokeOpacity">1</x:Double>
+      <x:Double x:Key="PersonPictureEllipseBadgeImageSourceStrokeOpacity">1</x:Double>
+      <x:Double x:Key="PersonPictureEllipseStrokeThickness">1</x:Double>
+      <x:Double x:Key="PersonPictureEllipseBadgeStrokeThickness">2</x:Double>
+      <Thickness x:Key="PersonPictureBadgeGridMargin">0,-4,-4,0</Thickness>
+    </ResourceDictionary>
+    <ResourceDictionary x:Key="HighContrast">
+      <StaticResource x:Key="PersonPictureForegroundThemeBrush" ResourceKey="SystemControlForegroundBaseHighBrush" />
+      <SolidColorBrush x:Key="PersonPictureEllipseBadgeForegroundThemeBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
+      <SolidColorBrush x:Key="PersonPictureEllipseBadgeFillThemeBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
+      <SolidColorBrush x:Key="PersonPictureEllipseBadgeStrokeThemeBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
+      <StaticResource x:Key="PersonPictureEllipseFillThemeBrush" ResourceKey="SystemColorHighlightTextColorBrush" />
+      <StaticResource x:Key="PersonPictureEllipseFillStrokeBrush" ResourceKey="CardStrokeColorDefaultBrush" />
+      <x:Double x:Key="PersonPictureEllipseBadgeStrokeOpacity">1</x:Double>
+      <x:Double x:Key="PersonPictureEllipseBadgeImageSourceStrokeOpacity">1</x:Double>
+      <x:Double x:Key="PersonPictureEllipseStrokeThickness">1</x:Double>
+      <x:Double x:Key="PersonPictureEllipseBadgeStrokeThickness">2</x:Double>
+      <Thickness x:Key="PersonPictureBadgeGridMargin">0,-4,-4,0</Thickness>
+    </ResourceDictionary>
+  </ResourceDictionary.ThemeDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml b/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
index 30ed62e9026d..4c41097dfe4f 100644
--- a/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
+++ b/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
@@ -19919,9 +19919,6 @@
   <Style TargetType="controls:PersonPicture" BasedOn="{StaticResource DefaultPersonPictureStyle}" />
   <Style x:Key="DefaultPersonPictureStyle" TargetType="controls:PersonPicture">
     <Setter Property="Foreground" Value="{ThemeResource PersonPictureForegroundThemeBrush}" />
-    <Setter Property="Background" Value="{ThemeResource PersonPictureEllipseFillThemeBrush}" />
-    <Setter Property="BorderBrush" Value="{ThemeResource PersonPictureEllipseFillStrokeBrush}" />
-    <Setter Property="BorderThickness" Value="{ThemeResource PersonPictureEllipseStrokeThickness}" />
     <Setter Property="Width" Value="96" />
     <Setter Property="Height" Value="96" />
     <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
@@ -19980,13 +19977,13 @@
                 </VisualState>
               </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
-            <Ellipse Fill="{TemplateBinding Background}" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="{TemplateBinding BorderThickness}" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" />
-            <TextBlock x:Name="InitialsTextBlock" AutomationProperties.AccessibilityView="Raw" FontSize="40" FontFamily="{TemplateBinding FontFamily}" Foreground="{TemplateBinding Foreground}" FontWeight="{TemplateBinding FontWeight}" TextLineBounds="Tight" VerticalAlignment="Center" HorizontalAlignment="Center" IsTextScaleFactorEnabled="False" Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ActualInitials}" />
-            <Ellipse x:Name="PersonPictureEllipse" x:DeferLoadStrategy="Lazy" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" FlowDirection="LeftToRight" />
+            <Ellipse Fill="{ThemeResource PersonPictureEllipseFillThemeBrush}" Stroke="{ThemeResource PersonPictureEllipseFillStrokeBrush}" StrokeThickness="{ThemeResource PersonPictureEllipseStrokeThickness}" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" />
             <!-- UNO WORKAROUND: ImageBrush is not stretching properly https://github.com/unoplatform/uno/issues/4951 -->
             <wasm:Border Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" CornerRadius="{TemplateBinding Width}" FlowDirection="LeftToRight">
               <Image x:Name="PersonPictureImage" Stretch="UniformToFill" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </wasm:Border>
+            <TextBlock x:Name="InitialsTextBlock" AutomationProperties.AccessibilityView="Raw" FontSize="40" FontFamily="{TemplateBinding FontFamily}" Foreground="{TemplateBinding Foreground}" FontWeight="{TemplateBinding FontWeight}" TextLineBounds="Tight" VerticalAlignment="Center" HorizontalAlignment="Center" IsTextScaleFactorEnabled="False" Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ActualInitials}" />
+            <Ellipse x:Name="PersonPictureEllipse" x:DeferLoadStrategy="Lazy" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" FlowDirection="LeftToRight" />
             <!-- UNO WORKAROUND: Removed Margin="{ThemeResource PersonPictureBadgeGridMargin}". Clipping issue with negative margin: #-->
             <Grid x:Name="BadgeGrid" Visibility="Collapsed" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="{ThemeResource PersonPictureBadgeGridMargin}">
               <Ellipse x:Name="BadgingBackgroundEllipse" x:DeferLoadStrategy="Lazy" Opacity="{ThemeResource PersonPictureEllipseBadgeStrokeOpacity}" Fill="{ThemeResource PersonPictureEllipseBadgeFillThemeBrush}" Stroke="{ThemeResource PersonPictureEllipseBadgeStrokeThemeBrush}" StrokeThickness="{ThemeResource PersonPictureEllipseBadgeStrokeThickness}" />
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/InitialsGenerator.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/InitialsGenerator.cs
index 41b2a180a898..a61a65214191 100644
--- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/InitialsGenerator.cs
+++ b/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/InitialsGenerator.cs
@@ -1,153 +1,83 @@
-// MUX Reference InitialsGenerator.cpp, commit de78834
-
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
+// MUX Reference InitialsGenerator.cpp, tag winui3/release/1.4.2
 
 using System;
-using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
-using Uno.UI.Helpers.WinUI;
 using Windows.ApplicationModel.Contacts;
-using Windows.ApplicationModel.Resources;
-using Windows.Foundation;
-using Windows.Storage.Streams;
-using Microsoft.UI.Xaml.Automation;
-using Microsoft.UI.Xaml.Automation.Peers;
-using Microsoft.UI.Xaml.Media;
-
-namespace Microsoft.UI.Xaml.Controls
+
+namespace Microsoft.UI.Xaml.Controls;
+
+/// <summary>
+/// Value indicating the general character set for a given character.
+/// </summary>
+internal enum CharacterType
 {
 	/// <summary>
-	/// Value indicating the general character set for a given character.
+	/// Indicates we could not match the character set.
 	/// </summary>
-	internal enum CharacterType
-	{
-		/// <summary>
-		/// Indicates we could not match the character set.
-		/// </summary>
-		Other = 0,
-
-		/// <summary>
-		/// Member of the Latin character set.
-		/// </summary>
-		Standard = 1,
-
-		/// <summary>
-		/// Member of a symbolic character set.
-		/// </summary>
-		Symbolic = 2,
-
-		/// <summary>
-		/// Member of a character set which supports glyphs.
-		/// </summary>
-		Glyph = 3
-	}
+	Other = 0,
 
-	internal partial class InitialsGenerator
-	{
+	/// <summary>
+	/// Member of the Latin character set.
+	/// </summary>
+	Standard = 1,
 
-		/// <summary>
-		/// Helper function which takes in a Contact object and produces initials
-		/// which represent that contact.
-		/// </summary>
-		/// <remarks>
-		/// INTENDED LOGIC BEHAVIOR:
-		/// - If the name contains glyphs, return a generic icon.
-		/// - If we have access to First Name vs. Last Name data
-		///   (First Name being set regionally - i.e. it equals Given Name or Family Name based on system setting),
-		///   . If non-symbolic, use the first letter of the First Name and first letter of the Last Name
-		///   . If symbolic, use the first character of the Given Name
-		/// - If we don't have access to First/Last or Given/Family Name, (i.e. long string Dr. Jordan von Hammerspike III)
-		///   . If non-symbolic, break by space delimiter then follow the following rules:
-		///      -. Use the first letter of the first word and the first letter of the last word
-		///      -. If only one word, use a single letter
-		///   . If symbolic, use the first one or two characters of the string (decided by how squished it looks visually)
-		///      -. Note: This branch of the logic falls apart in the Family Name, Given Name case.
-		/// </remarks>
-		internal static string InitialsFromContactObject(Contact contact)
-		{
-			if (contact == null)
-			{
-				return "";
-			}
+	/// <summary>
+	/// Member of a symbolic character set.
+	/// </summary>
+	Symbolic = 2,
 
-			// Optimal case is we have a clearly defined First and Last name. If
-			// available, that is the data which should be used.
-			if (!string.IsNullOrEmpty(contact.FirstName) && !string.IsNullOrEmpty(contact.LastName))
-			{
-				CharacterType type = GetCharacterType(contact.FirstName);
-
-				// We'll attempt to make initials only if we recognize a name in the Standard character set.
-				if (type == CharacterType.Standard)
-				{
-					string firstName = contact.FirstName;
-					string lastName = contact.LastName;
-
-					string result = GetFirstFullCharacter(firstName);
-					result += GetFirstFullCharacter(lastName);
-
-					return result.ToUpperInvariant();
-				}
-				else
-				{
-					// Return empty string. In our code-behind we will produce a generic glyph as a result.
-					return "";
-				}
-			}
+	/// <summary>
+	/// Member of a character set which supports glyphs.
+	/// </summary>
+	Glyph = 3
+}
 
-			// If the supplied object does not contain granular name data, then we must
-			// extract the correct initials from the DisplayName.
-			if (!string.IsNullOrEmpty(contact.DisplayName))
-			{
-				return InitialsFromDisplayName(contact.DisplayName);
-			}
+internal partial class InitialsGenerator
+{
 
-			// Return empty string. In our code-behind we will produce a generic glyph as a result.
+	/// <summary>
+	/// Helper function which takes in a Contact object and produces initials
+	/// which represent that contact.
+	/// </summary>
+	/// <remarks>
+	/// INTENDED LOGIC BEHAVIOR:
+	/// - If the name contains glyphs, return a generic icon.
+	/// - If we have access to First Name vs. Last Name data
+	///   (First Name being set regionally - i.e. it equals Given Name or Family Name based on system setting),
+	///   . If non-symbolic, use the first letter of the First Name and first letter of the Last Name
+	///   . If symbolic, use the first character of the Given Name
+	/// - If we don't have access to First/Last or Given/Family Name, (i.e. long string Dr. Jordan von Hammerspike III)
+	///   . If non-symbolic, break by space delimiter then follow the following rules:
+	///      -. Use the first letter of the first word and the first letter of the last word
+	///      -. If only one word, use a single letter
+	///   . If symbolic, use the first one or two characters of the string (decided by how squished it looks visually)
+	///      -. Note: This branch of the logic falls apart in the Family Name, Given Name case.
+	/// </remarks>
+	internal static string InitialsFromContactObject(Contact contact)
+	{
+		if (contact == null)
+		{
 			return "";
 		}
 
-		public static string InitialsFromDisplayName(string contactDisplayName)
+		// Optimal case is we have a clearly defined First and Last name. If
+		// available, that is the data which should be used.
+		if (!string.IsNullOrEmpty(contact.FirstName) && !string.IsNullOrEmpty(contact.LastName))
 		{
-			CharacterType type = GetCharacterType(contactDisplayName);
+			CharacterType type = GetCharacterType(contact.FirstName);
 
 			// We'll attempt to make initials only if we recognize a name in the Standard character set.
 			if (type == CharacterType.Standard)
 			{
-				string displayName = contactDisplayName;
-
-				StripTrailingBrackets(ref displayName);
-
-				var words = Split(displayName, ' ', 100);
-
-				if (words.Length == 1)
-				{
-					// If there's only a single long word, we'll show one initial.
-					string firstWord = words.First();
-
-					string result = GetFirstFullCharacter(firstWord);
-
-					return result.ToUpperInvariant();
-				}
-				else if (words.Length > 1)
-				{
-					// If there's at least two words, we'll show two initials.
-					//
-					// NOTE: Based on current implementation, we could be showing punctuation.
-					// For example, "John -Smith" would be "J-".
-					string firstWord = words.First();
-					string lastWord = words.Last();
-
-					string result = GetFirstFullCharacter(firstWord);
-					result += GetFirstFullCharacter(lastWord);
-
-					return result.ToUpperInvariant();
-				}
-				else
-				{
-					// If there's only spaces in the name, we'll get a Vector size of 0.
-					return "";
-				}
+				string firstName = contact.FirstName;
+				string lastName = contact.LastName;
+
+				string result = GetFirstFullCharacter(firstName);
+				result += GetFirstFullCharacter(lastName);
+
+				return result.ToUpperInvariant();
 			}
 			else
 			{
@@ -156,443 +86,502 @@ public static string InitialsFromDisplayName(string contactDisplayName)
 			}
 		}
 
-		static string GetFirstFullCharacter(string str)
+		// If the supplied object does not contain granular name data, then we must
+		// extract the correct initials from the DisplayName.
+		if (!string.IsNullOrEmpty(contact.DisplayName))
 		{
-			// Index should begin at the first desireable character.
-			int start = 0;
+			return InitialsFromDisplayName(contact.DisplayName);
+		}
 
-			while (start < str.Length)
-			{
-				char character = str[start];
-
-				// Omit ! " # $ % & ' ( ) * + , - . /
-				if ((character >= 0x0021) && (character <= 0x002F))
-				{
-					start++;
-					continue;
-				}
-
-				// Omit : ; < = > ? @
-				if ((character >= 0x003A) && (character <= 0x0040))
-				{
-					start++;
-					continue;
-				}
-
-				// Omit { | } ~
-				if ((character >= 0x007B) && (character <= 0x007E))
-				{
-					start++;
-					continue;
-				}
+		// Return empty string. In our code-behind we will produce a generic glyph as a result.
+		return "";
+	}
 
-				break;
-			}
+	public static string InitialsFromDisplayName(string contactDisplayName)
+	{
+		CharacterType type = GetCharacterType(contactDisplayName);
 
-			// If no desireable characters exist, we'll start at index 1, as combining
-			// characters begin only after the first character.
-			if (start >= str.Length)
-			{
-				start = 0;
-			}
+		// We'll attempt to make initials only if we recognize a name in the Standard character set.
+		if (type == CharacterType.Standard)
+		{
+			string displayName = contactDisplayName;
 
-			// Combining characters begin only after the first character, so we should start
-			// looking 1 after the start character.
-			int index = start + 1;
+			StripTrailingBrackets(ref displayName);
 
-			while (index < str.Length)
+			var words = Split(displayName, ' ', 100);
+
+			if (words.Length == 1)
 			{
-				char character = str[index];
+				// If there's only a single long word, we'll show one initial.
+				string firstWord = words.First();
 
-				// Combining Diacritical Marks -- Official Unicode character block
-				if ((character < 0x0300) || (character > 0x036F))
-				{
-					break;
-				}
+				string result = GetFirstFullCharacter(firstWord);
 
-				index++;
+				return result.ToUpperInvariant();
 			}
+			else if (words.Length > 1)
+			{
+				// If there's at least two words, we'll show two initials.
+				//
+				// NOTE: Based on current implementation, we could be showing punctuation.
+				// For example, "John -Smith" would be "J-".
+				string firstWord = words.First();
+				string lastWord = words.Last();
 
-			// Determine number of diacritics by adjusting for our initial offset.
-			int strLength = index - start;
+				string result = GetFirstFullCharacter(firstWord);
+				result += GetFirstFullCharacter(lastWord);
 
-			return str.Substring(start, Math.Min(strLength, str.Length));
+				return result.ToUpperInvariant();
+			}
+			else
+			{
+				// If there's only spaces in the name, we'll get a Vector size of 0.
+				return "";
+			}
+		}
+		else
+		{
+			// Return empty string. In our code-behind we will produce a generic glyph as a result.
+			return "";
 		}
+	}
 
-		static string[] Split(string source, char delim, int maxIterations)
-			=> source.Split(new[] { delim }, maxIterations);
+	static string GetFirstFullCharacter(string str)
+	{
+		// Index should begin at the first desireable character.
+		int start = 0;
 
-		static void StripTrailingBrackets(ref string source)
+		while (start < str.Length)
 		{
-			// Guidance from the world readiness team is that text within a final set of brackets
-			// can be removed for the purposes of calculating initials. ex. John Smith (OSG)
-			string[] delimiters = { "{}", "()", "[]" };
+			char character = str[start];
 
-			if (string.IsNullOrEmpty(source))
+			// Omit ! " # $ % & ' ( ) * + , - . /
+			if ((character >= 0x0021) && (character <= 0x002F))
 			{
-				return;
+				start++;
+				continue;
 			}
 
-			foreach (var delimiter in delimiters)
+			// Omit : ; < = > ? @
+			if ((character >= 0x003A) && (character <= 0x0040))
 			{
-				if (source[source.Length - 1] != delimiter[1])
-				{
-					continue;
-				}
-
-				var start = source.LastIndexOf(delimiter[0]);
-				if (start == -1)
-				{
-					continue;
-				}
-
-				source = source.Substring(start);
-				return;
+				start++;
+				continue;
 			}
+
+			// Omit { | } ~
+			if ((character >= 0x007B) && (character <= 0x007E))
+			{
+				start++;
+				continue;
+			}
+
+			break;
 		}
 
-		static CharacterType GetCharacterType(string str)
+		// If no desireable characters exist, we'll start at index 1, as combining
+		// characters begin only after the first character.
+		if (start >= str.Length)
+		{
+			start = 0;
+		}
+
+		// Combining characters begin only after the first character, so we should start
+		// looking 1 after the start character.
+		int index = start + 1;
+
+		while (index < str.Length)
 		{
-			// Since we're doing initials, we're really only interested in the first
-			// few characters. If the first three characters aren't a glyph then
-			// we don't need to count it as such because we won't be changing meaning
-			// by truncating to one or two.
-			CharacterType result = CharacterType.Other;
+			char character = str[index];
 
-			for (int i = 0; i < Math.Min(str?.Length ?? 0, 3); i++)
+			// Combining Diacritical Marks -- Official Unicode character block
+			if ((character < 0x0300) || (character > 0x036F))
 			{
-				// Break on null character. 0xFEFF is a terminating character which appears as null.
-				if ((str[i] == '\0') || (str[i] == 0xFEFF))
-				{
-					break;
-				}
-
-				char character = str[i];
-				CharacterType evaluationResult = GetCharacterType(character);
-
-				// In mix-match scenarios, we'll want to follow this order of precedence:
-				// Glyph > Symbolic > Roman
-				switch (evaluationResult)
-				{
-					case CharacterType.Glyph:
-						result = CharacterType.Glyph;
-						break;
-					case CharacterType.Symbolic:
-						// Don't override a Glyph state with a Symbolic State.
-						if (result != CharacterType.Glyph)
-						{
-							result = CharacterType.Symbolic;
-						}
-						break;
-					case CharacterType.Standard:
-						// Don't override a Glyph or Symbolic state with a Latin state.
-						if ((result != CharacterType.Glyph) && (result != CharacterType.Symbolic))
-						{
-							result = CharacterType.Standard;
-						}
-						break;
-					default:
-						// Preserve result's current state (if we never got data other
-						// than "Other", it'll be set to other anyway).
-						break;
-				}
+				break;
 			}
 
-			return result;
+			index++;
 		}
 
-		static CharacterType GetCharacterType(char character)
+		// Determine number of diacritics by adjusting for our initial offset.
+		int strLength = index - start;
+
+		return str.Substring(start, Math.Min(strLength, str.Length));
+	}
+
+	static string[] Split(string source, char delim, int maxIterations)
+		=> source.Split(new[] { delim }, maxIterations);
+
+	static void StripTrailingBrackets(ref string source)
+	{
+		// Guidance from the world readiness team is that text within a final set of brackets
+		// can be removed for the purposes of calculating initials. ex. John Smith (OSG)
+		string[] delimiters = { "{}", "()", "[]" };
+
+		if (string.IsNullOrEmpty(source))
 		{
-			// To ensure predictable behavior, we're currently operating on an allowed list of character sets.
-			//
-			// Each block below is a HEX range in the official Unicode spec, which defines a set
-			// of Unicode characters. Changes to the character sets would only be made by Unicode, and
-			// are highly unlikely (as it would break virtually every modern text parser).
-			// Definitions available here: http://www.unicode.org/charts/
-			//
-			// GLYPH
-			//
-			// IPA Extensions
-			if ((character >= 0x0250) && (character <= 0x02AF))
-			{
-				return CharacterType.Glyph;
-			}
+			return;
+		}
 
-			// Arabic
-			if ((character >= 0x0600) && (character <= 0x06FF))
+		foreach (var delimiter in delimiters)
+		{
+			if (source[source.Length - 1] != delimiter[1])
 			{
-				return CharacterType.Glyph;
+				continue;
 			}
 
-			// Arabic Supplement
-			if ((character >= 0x0750) && (character <= 0x077F))
+			var start = source.LastIndexOf(delimiter[0]);
+			if (start == -1)
 			{
-				return CharacterType.Glyph;
+				continue;
 			}
 
-			// Arabic Extended-A
-			if ((character >= 0x08A0) && (character <= 0x08FF))
-			{
-				return CharacterType.Glyph;
-			}
+			source = source.Substring(start);
+			return;
+		}
+	}
 
-			// Arabic Presentation Forms-A
-			if ((character >= 0xFB50) && (character <= 0xFDFF))
-			{
-				return CharacterType.Glyph;
-			}
+	static CharacterType GetCharacterType(string str)
+	{
+		// Since we're doing initials, we're really only interested in the first
+		// few characters. If the first three characters aren't a glyph then
+		// we don't need to count it as such because we won't be changing meaning
+		// by truncating to one or two.
+		CharacterType result = CharacterType.Other;
 
-			// Arabic Presentation Forms-B
-			if ((character >= 0xFE70) && (character <= 0xFEFF))
+		for (int i = 0; i < Math.Min(str?.Length ?? 0, 3); i++)
+		{
+			// Break on null character. 0xFEFF is a terminating character which appears as null.
+			if ((str[i] == '\0') || (str[i] == 0xFEFF))
 			{
-				return CharacterType.Glyph;
+				break;
 			}
 
-			// Devanagari
-			if ((character >= 0x0900) && (character <= 0x097F))
-			{
-				return CharacterType.Glyph;
-			}
+			char character = str[i];
+			CharacterType evaluationResult = GetCharacterType(character);
 
-			// Devanagari Extended
-			if ((character >= 0xA8E0) && (character <= 0xA8FF))
+			// In mix-match scenarios, we'll want to follow this order of precedence:
+			// Glyph > Symbolic > Roman
+			switch (evaluationResult)
 			{
-				return CharacterType.Glyph;
+				case CharacterType.Glyph:
+					result = CharacterType.Glyph;
+					break;
+				case CharacterType.Symbolic:
+					// Don't override a Glyph state with a Symbolic State.
+					if (result != CharacterType.Glyph)
+					{
+						result = CharacterType.Symbolic;
+					}
+					break;
+				case CharacterType.Standard:
+					// Don't override a Glyph or Symbolic state with a Latin state.
+					if ((result != CharacterType.Glyph) && (result != CharacterType.Symbolic))
+					{
+						result = CharacterType.Standard;
+					}
+					break;
+				default:
+					// Preserve result's current state (if we never got data other
+					// than "Other", it'll be set to other anyway).
+					break;
 			}
+		}
 
-			// Bengali
-			if ((character >= 0x0980) && (character <= 0x09FF))
-			{
-				return CharacterType.Glyph;
-			}
+		return result;
+	}
 
-			// Gurmukhi
-			if ((character >= 0x0A00) && (character <= 0x0A7F))
-			{
-				return CharacterType.Glyph;
-			}
+	static CharacterType GetCharacterType(char character)
+	{
+		// To ensure predictable behavior, we're currently operating on an allowed list of character sets.
+		//
+		// Each block below is a HEX range in the official Unicode spec, which defines a set
+		// of Unicode characters. Changes to the character sets would only be made by Unicode, and
+		// are highly unlikely (as it would break virtually every modern text parser).
+		// Definitions available here: http://www.unicode.org/charts/
+		//
+		// GLYPH
+		//
+		// IPA Extensions
+		if ((character >= 0x0250) && (character <= 0x02AF))
+		{
+			return CharacterType.Glyph;
+		}
 
-			// Gujarati
-			if ((character >= 0x0A80) && (character <= 0x0AFF))
-			{
-				return CharacterType.Glyph;
-			}
+		// Arabic
+		if ((character >= 0x0600) && (character <= 0x06FF))
+		{
+			return CharacterType.Glyph;
+		}
 
-			// Oriya
-			if ((character >= 0x0B00) && (character <= 0x0B7F))
-			{
-				return CharacterType.Glyph;
-			}
+		// Arabic Supplement
+		if ((character >= 0x0750) && (character <= 0x077F))
+		{
+			return CharacterType.Glyph;
+		}
 
-			// Tamil
-			if ((character >= 0x0B80) && (character <= 0x0BFF))
-			{
-				return CharacterType.Glyph;
-			}
+		// Arabic Extended-A
+		if ((character >= 0x08A0) && (character <= 0x08FF))
+		{
+			return CharacterType.Glyph;
+		}
 
-			// Telugu
-			if ((character >= 0x0C00) && (character <= 0x0C7F))
-			{
-				return CharacterType.Glyph;
-			}
+		// Arabic Presentation Forms-A
+		if ((character >= 0xFB50) && (character <= 0xFDFF))
+		{
+			return CharacterType.Glyph;
+		}
 
-			// Kannada
-			if ((character >= 0x0C80) && (character <= 0x0CFF))
-			{
-				return CharacterType.Glyph;
-			}
+		// Arabic Presentation Forms-B
+		if ((character >= 0xFE70) && (character <= 0xFEFF))
+		{
+			return CharacterType.Glyph;
+		}
 
-			// Malayalam
-			if ((character >= 0x0D00) && (character <= 0x0D7F))
-			{
-				return CharacterType.Glyph;
-			}
+		// Devanagari
+		if ((character >= 0x0900) && (character <= 0x097F))
+		{
+			return CharacterType.Glyph;
+		}
 
-			// Sinhala
-			if ((character >= 0x0D80) && (character <= 0x0DFF))
-			{
-				return CharacterType.Glyph;
-			}
+		// Devanagari Extended
+		if ((character >= 0xA8E0) && (character <= 0xA8FF))
+		{
+			return CharacterType.Glyph;
+		}
 
-			// Thai
-			if ((character >= 0x0E00) && (character <= 0x0E7F))
-			{
-				return CharacterType.Glyph;
-			}
+		// Bangla
+		if ((character >= 0x0980) && (character <= 0x09FF))
+		{
+			return CharacterType.Glyph;
+		}
 
-			// Lao
-			if ((character >= 0x0E80) && (character <= 0x0EFF))
-			{
-				return CharacterType.Glyph;
-			}
+		// Gurmukhi
+		if ((character >= 0x0A00) && (character <= 0x0A7F))
+		{
+			return CharacterType.Glyph;
+		}
 
-			// SYMBOLIC
-			//
-			// CJK Unified Ideographs
-			if ((character >= 0x4E00) && (character <= 0x9FFF))
-			{
-				return CharacterType.Symbolic;
-			}
+		// Gujarati
+		if ((character >= 0x0A80) && (character <= 0x0AFF))
+		{
+			return CharacterType.Glyph;
+		}
 
-			// CJK Unified Ideographs Extension
-			if ((character >= 0x3400) && (character <= 0x4DBF))
-			{
-				return CharacterType.Symbolic;
-			}
+		// Odia
+		if ((character >= 0x0B00) && (character <= 0x0B7F))
+		{
+			return CharacterType.Glyph;
+		}
 
-			// CJK Unified Ideographs Extension B
-			if ((character >= 0x20000) && (character <= 0x2A6DF))
-			{
-				return CharacterType.Symbolic;
-			}
+		// Tamil
+		if ((character >= 0x0B80) && (character <= 0x0BFF))
+		{
+			return CharacterType.Glyph;
+		}
 
-			// CJK Unified Ideographs Extension C
-			if ((character >= 0x2A700) && (character <= 0x2B73F))
-			{
-				return CharacterType.Symbolic;
-			}
+		// Telugu
+		if ((character >= 0x0C00) && (character <= 0x0C7F))
+		{
+			return CharacterType.Glyph;
+		}
 
-			// CJK Unified Ideographs Extension D
-			if ((character >= 0x2B740) && (character <= 0x2B81F))
-			{
-				return CharacterType.Symbolic;
-			}
+		// Kannada
+		if ((character >= 0x0C80) && (character <= 0x0CFF))
+		{
+			return CharacterType.Glyph;
+		}
 
-			// CJK Radicals Supplement
-			if ((character >= 0x2E80) && (character <= 0x2EFF))
-			{
-				return CharacterType.Symbolic;
-			}
+		// Malayalam
+		if ((character >= 0x0D00) && (character <= 0x0D7F))
+		{
+			return CharacterType.Glyph;
+		}
 
-			// CJK Symbols and Punctuation
-			if ((character >= 0x3000) && (character <= 0x303F))
-			{
-				return CharacterType.Symbolic;
-			}
+		// Sinhala
+		if ((character >= 0x0D80) && (character <= 0x0DFF))
+		{
+			return CharacterType.Glyph;
+		}
 
-			// CJK Strokes
-			if ((character >= 0x31C0) && (character <= 0x31EF))
-			{
-				return CharacterType.Symbolic;
-			}
+		// Thai
+		if ((character >= 0x0E00) && (character <= 0x0E7F))
+		{
+			return CharacterType.Glyph;
+		}
 
-			// Enclosed CJK Letters and Months
-			if ((character >= 0x3200) && (character <= 0x32FF))
-			{
-				return CharacterType.Symbolic;
-			}
+		// Lao
+		if ((character >= 0x0E80) && (character <= 0x0EFF))
+		{
+			return CharacterType.Glyph;
+		}
 
-			// CJK Compatibility
-			if ((character >= 0x3300) && (character <= 0x33FF))
-			{
-				return CharacterType.Symbolic;
-			}
+		// SYMBOLIC
+		//
+		// CJK Unified Ideographs
+		if ((character >= 0x4E00) && (character <= 0x9FFF))
+		{
+			return CharacterType.Symbolic;
+		}
 
-			// CJK Compatibility Ideographs
-			if ((character >= 0xF900) && (character <= 0xFAFF))
-			{
-				return CharacterType.Symbolic;
-			}
+		// CJK Unified Ideographs Extension
+		if ((character >= 0x3400) && (character <= 0x4DBF))
+		{
+			return CharacterType.Symbolic;
+		}
 
-			// CJK Compatibility Forms
-			if ((character >= 0xFE30) && (character <= 0xFE4F))
-			{
-				return CharacterType.Symbolic;
-			}
+		// CJK Unified Ideographs Extension B
+		if ((character >= 0x20000) && (character <= 0x2A6DF))
+		{
+			return CharacterType.Symbolic;
+		}
 
-			// CJK Compatibility Ideographs Supplement
-			if ((character >= 0x2F800) && (character <= 0x2FA1F))
-			{
-				return CharacterType.Symbolic;
-			}
+		// CJK Unified Ideographs Extension C
+		if ((character >= 0x2A700) && (character <= 0x2B73F))
+		{
+			return CharacterType.Symbolic;
+		}
 
-			// Greek and Coptic
-			if ((character >= 0x0370) && (character <= 0x03FF))
-			{
-				return CharacterType.Symbolic;
-			}
+		// CJK Unified Ideographs Extension D
+		if ((character >= 0x2B740) && (character <= 0x2B81F))
+		{
+			return CharacterType.Symbolic;
+		}
 
-			// Hebrew
-			if ((character >= 0x0590) && (character <= 0x05FF))
-			{
-				return CharacterType.Symbolic;
-			}
+		// CJK Radicals Supplement
+		if ((character >= 0x2E80) && (character <= 0x2EFF))
+		{
+			return CharacterType.Symbolic;
+		}
 
-			// Armenian
-			if ((character >= 0x0530) && (character <= 0x058F))
-			{
-				return CharacterType.Symbolic;
-			}
+		// CJK Symbols and Punctuation
+		if ((character >= 0x3000) && (character <= 0x303F))
+		{
+			return CharacterType.Symbolic;
+		}
 
-			// LATIN
-			//
-			// Basic Latin
-			if ((character > 0x0000) && (character <= 0x007F))
-			{
-				return CharacterType.Standard;
-			}
+		// CJK Strokes
+		if ((character >= 0x31C0) && (character <= 0x31EF))
+		{
+			return CharacterType.Symbolic;
+		}
 
-			// Latin-1 Supplement
-			if ((character >= 0x0080) && (character <= 0x00FF))
-			{
-				return CharacterType.Standard;
-			}
+		// Enclosed CJK Letters and Months
+		if ((character >= 0x3200) && (character <= 0x32FF))
+		{
+			return CharacterType.Symbolic;
+		}
 
-			// Latin Extended-A
-			if ((character >= 0x0100) && (character <= 0x017F))
-			{
-				return CharacterType.Standard;
-			}
+		// CJK Compatibility
+		if ((character >= 0x3300) && (character <= 0x33FF))
+		{
+			return CharacterType.Symbolic;
+		}
 
-			// Latin Extended-B
-			if ((character >= 0x0180) && (character <= 0x024F))
-			{
-				return CharacterType.Standard;
-			}
+		// CJK Compatibility Ideographs
+		if ((character >= 0xF900) && (character <= 0xFAFF))
+		{
+			return CharacterType.Symbolic;
+		}
 
-			// Latin Extended-C
-			if ((character >= 0x2C60) && (character <= 0x2C7F))
-			{
-				return CharacterType.Standard;
-			}
+		// CJK Compatibility Forms
+		if ((character >= 0xFE30) && (character <= 0xFE4F))
+		{
+			return CharacterType.Symbolic;
+		}
 
-			// Latin Extended-D
-			if ((character >= 0xA720) && (character <= 0xA7FF))
-			{
-				return CharacterType.Standard;
-			}
+		// CJK Compatibility Ideographs Supplement
+		if ((character >= 0x2F800) && (character <= 0x2FA1F))
+		{
+			return CharacterType.Symbolic;
+		}
 
-			// Latin Extended-E
-			if ((character >= 0xAB30) && (character <= 0xAB6F))
-			{
-				return CharacterType.Standard;
-			}
+		// Greek and Coptic
+		if ((character >= 0x0370) && (character <= 0x03FF))
+		{
+			return CharacterType.Symbolic;
+		}
 
-			// Latin Extended Additional
-			if ((character >= 0x1E00) && (character <= 0x1EFF))
-			{
-				return CharacterType.Standard;
-			}
+		// Hebrew
+		if ((character >= 0x0590) && (character <= 0x05FF))
+		{
+			return CharacterType.Symbolic;
+		}
 
-			// Cyrillic
-			if ((character >= 0x0400) && (character <= 0x04FF))
-			{
-				return CharacterType.Standard;
-			}
+		// Armenian
+		if ((character >= 0x0530) && (character <= 0x058F))
+		{
+			return CharacterType.Symbolic;
+		}
 
-			// Cyrillic Supplement
-			if ((character >= 0x0500) && (character <= 0x052F))
-			{
-				return CharacterType.Standard;
-			}
+		// LATIN
+		//
+		// Basic Latin
+		if ((character > 0x0000) && (character <= 0x007F))
+		{
+			return CharacterType.Standard;
+		}
 
-			// Combining Diacritical Marks
-			if ((character >= 0x0300) && (character <= 0x036F))
-			{
-				return CharacterType.Standard;
-			}
+		// Latin-1 Supplement
+		if ((character >= 0x0080) && (character <= 0x00FF))
+		{
+			return CharacterType.Standard;
+		}
 
-			return CharacterType.Other;
+		// Latin Extended-A
+		if ((character >= 0x0100) && (character <= 0x017F))
+		{
+			return CharacterType.Standard;
+		}
+
+		// Latin Extended-B
+		if ((character >= 0x0180) && (character <= 0x024F))
+		{
+			return CharacterType.Standard;
+		}
+
+		// Latin Extended-C
+		if ((character >= 0x2C60) && (character <= 0x2C7F))
+		{
+			return CharacterType.Standard;
+		}
+
+		// Latin Extended-D
+		if ((character >= 0xA720) && (character <= 0xA7FF))
+		{
+			return CharacterType.Standard;
 		}
+
+		// Latin Extended-E
+		if ((character >= 0xAB30) && (character <= 0xAB6F))
+		{
+			return CharacterType.Standard;
+		}
+
+		// Latin Extended Additional
+		if ((character >= 0x1E00) && (character <= 0x1EFF))
+		{
+			return CharacterType.Standard;
+		}
+
+		// Cyrillic
+		if ((character >= 0x0400) && (character <= 0x04FF))
+		{
+			return CharacterType.Standard;
+		}
+
+		// Cyrillic Supplement
+		if ((character >= 0x0500) && (character <= 0x052F))
+		{
+			return CharacterType.Standard;
+		}
+
+		// Combining Diacritical Marks
+		if ((character >= 0x0300) && (character <= 0x036F))
+		{
+			return CharacterType.Standard;
+		}
+
+		return CharacterType.Other;
 	}
 }
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/PersonPicture.Properties.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/PersonPicture.Properties.cs
index a9a753b737ce..aca17ecc399b 100644
--- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/PersonPicture.Properties.cs
+++ b/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/PersonPicture.Properties.cs
@@ -1,167 +1,166 @@
-// MUX Reference PersonPicture.properties.cpp, commit de78834
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+// MUX Reference PersonPicture.properties.cpp, tag winui3/release/1.4.2
 
 #pragma warning disable 108 // new keyword hiding
 #pragma warning disable 114 // new keyword hiding
-using Windows.System.UserProfile;
+using Windows.ApplicationModel.Contacts;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Media;
-using Windows.ApplicationModel.Contacts;
-using System;
 
-namespace Microsoft.UI.Xaml.Controls
+namespace Microsoft.UI.Xaml.Controls;
+
+public partial class PersonPicture : Control
 {
-	public partial class PersonPicture : Control
+	public ImageSource ProfilePicture
+	{
+		get => (ImageSource)GetValue(ProfilePictureProperty);
+		set => SetValue(ProfilePictureProperty, value);
+	}
+
+	public bool PreferSmallImage
+	{
+		get => (bool)GetValue(PreferSmallImageProperty);
+		set => SetValue(PreferSmallImageProperty, value);
+	}
+
+	public bool IsGroup
+	{
+		get => (bool)GetValue(IsGroupProperty);
+		set => SetValue(IsGroupProperty, value);
+	}
+
+	public string Initials
+	{
+		get => (string)GetValue(InitialsProperty);
+		set => SetValue(InitialsProperty, value);
+	}
+
+	public string DisplayName
+	{
+		get => (string)GetValue(DisplayNameProperty);
+		set => SetValue(DisplayNameProperty, value);
+	}
+
+	public Contact Contact
+	{
+		get => (Contact)GetValue(ContactProperty);
+		set => SetValue(ContactProperty, value);
+	}
+
+	public string BadgeText
+	{
+		get => (string)GetValue(BadgeTextProperty);
+		set => SetValue(BadgeTextProperty, value);
+	}
+
+	public int BadgeNumber
+	{
+		get => (int)GetValue(BadgeNumberProperty);
+		set => SetValue(BadgeNumberProperty, value);
+	}
+
+	public ImageSource BadgeImageSource
+	{
+		get => (ImageSource)GetValue(BadgeImageSourceProperty);
+		set => SetValue(BadgeImageSourceProperty, value);
+	}
+
+	public string BadgeGlyph
+	{
+		get => (string)GetValue(BadgeGlyphProperty);
+		set => SetValue(BadgeGlyphProperty, value);
+	}
+
+	public PersonPictureTemplateSettings TemplateSettings
+	{
+		get => (PersonPictureTemplateSettings)GetValue(TemplateSettingsProperty);
+		internal set => SetValue(TemplateSettingsProperty, value);
+	}
+
+	public static DependencyProperty BadgeGlyphProperty { get; } =
+		DependencyProperty.Register(
+			nameof(BadgeGlyph),
+			typeof(string),
+			typeof(PersonPicture),
+			new FrameworkPropertyMetadata("", OnPropertyChanged));
+
+	public static DependencyProperty BadgeImageSourceProperty { get; } =
+		DependencyProperty.Register(
+			nameof(BadgeImageSource),
+			typeof(ImageSource),
+			typeof(PersonPicture),
+			new FrameworkPropertyMetadata(default(ImageSource), OnPropertyChanged));
+
+	public static DependencyProperty BadgeNumberProperty { get; } =
+		DependencyProperty.Register(
+			nameof(BadgeNumber),
+			typeof(int),
+			typeof(PersonPicture),
+			new FrameworkPropertyMetadata(0, OnPropertyChanged));
+
+	public static DependencyProperty BadgeTextProperty { get; } =
+		DependencyProperty.Register(
+			nameof(BadgeText),
+			typeof(string),
+			typeof(PersonPicture),
+			new FrameworkPropertyMetadata(string.Empty, OnPropertyChanged));
+
+	public static DependencyProperty ContactProperty { get; } =
+		DependencyProperty.Register(
+			nameof(Contact),
+			typeof(Contact),
+			typeof(PersonPicture),
+			new FrameworkPropertyMetadata(default(Contact), OnPropertyChanged));
+
+	public static DependencyProperty DisplayNameProperty { get; } =
+		DependencyProperty.Register(
+			nameof(DisplayName),
+			typeof(string),
+			typeof(PersonPicture),
+			new FrameworkPropertyMetadata("", OnPropertyChanged));
+
+	public static DependencyProperty InitialsProperty { get; } =
+		DependencyProperty.Register(
+			nameof(Initials),
+			typeof(string),
+			typeof(PersonPicture),
+			new FrameworkPropertyMetadata("", OnPropertyChanged));
+
+	public static DependencyProperty IsGroupProperty { get; } =
+		DependencyProperty.Register(
+			nameof(IsGroup),
+			typeof(bool),
+			typeof(PersonPicture),
+			new FrameworkPropertyMetadata(default(bool), OnPropertyChanged));
+
+	public static DependencyProperty PreferSmallImageProperty { get; } =
+		DependencyProperty.Register(
+			nameof(PreferSmallImage),
+			typeof(bool),
+			typeof(PersonPicture),
+			new FrameworkPropertyMetadata(default(bool), OnPropertyChanged));
+
+	public static DependencyProperty ProfilePictureProperty { get; } =
+		DependencyProperty.Register(
+			nameof(ProfilePicture),
+			typeof(ImageSource),
+			typeof(PersonPicture),
+			new FrameworkPropertyMetadata(default(ImageSource), OnPropertyChanged));
+
+	internal static DependencyProperty TemplateSettingsProperty { get; } =
+		DependencyProperty.Register(
+			nameof(TemplateSettings),
+			typeof(PersonPictureTemplateSettings),
+			typeof(PersonPicture),
+			new FrameworkPropertyMetadata(default(PersonPictureTemplateSettings), OnPropertyChanged));
+
+	private static void OnPropertyChanged(
+		DependencyObject sender,
+		DependencyPropertyChangedEventArgs args)
 	{
-		public ImageSource ProfilePicture
-		{
-			get => (ImageSource)GetValue(ProfilePictureProperty);
-			set => SetValue(ProfilePictureProperty, value);
-		}
-
-		public bool PreferSmallImage
-		{
-			get => (bool)GetValue(PreferSmallImageProperty);
-			set => SetValue(PreferSmallImageProperty, value);
-		}
-
-		public bool IsGroup
-		{
-			get => (bool)GetValue(IsGroupProperty);
-			set => SetValue(IsGroupProperty, value);
-		}
-
-		public string Initials
-		{
-			get => (string)GetValue(InitialsProperty);
-			set => SetValue(InitialsProperty, value);
-		}
-
-		public string DisplayName
-		{
-			get => (string)GetValue(DisplayNameProperty);
-			set => SetValue(DisplayNameProperty, value);
-		}
-
-		public Contact Contact
-		{
-			get => (Contact)GetValue(ContactProperty);
-			set => SetValue(ContactProperty, value);
-		}
-
-		public string BadgeText
-		{
-			get => (string)GetValue(BadgeTextProperty);
-			set => SetValue(BadgeTextProperty, value);
-		}
-
-		public int BadgeNumber
-		{
-			get => (int)GetValue(BadgeNumberProperty);
-			set => SetValue(BadgeNumberProperty, value);
-		}
-
-		public ImageSource BadgeImageSource
-		{
-			get => (ImageSource)GetValue(BadgeImageSourceProperty);
-			set => SetValue(BadgeImageSourceProperty, value);
-		}
-
-		public string BadgeGlyph
-		{
-			get => (string)GetValue(BadgeGlyphProperty);
-			set => SetValue(BadgeGlyphProperty, value);
-		}
-
-		public PersonPictureTemplateSettings TemplateSettings
-		{
-			get => (PersonPictureTemplateSettings)GetValue(TemplateSettingsProperty);
-			internal set => SetValue(TemplateSettingsProperty, value);
-		}
-
-		public static DependencyProperty BadgeGlyphProperty { get; } =
-			DependencyProperty.Register(
-				nameof(BadgeGlyph),
-				typeof(string),
-				typeof(PersonPicture),
-				new FrameworkPropertyMetadata("", OnPropertyChanged));
-
-		public static DependencyProperty BadgeImageSourceProperty { get; } =
-			DependencyProperty.Register(
-				nameof(BadgeImageSource),
-				typeof(ImageSource),
-				typeof(PersonPicture),
-				new FrameworkPropertyMetadata(default(ImageSource), OnPropertyChanged));
-
-		public static DependencyProperty BadgeNumberProperty { get; } =
-			DependencyProperty.Register(
-				nameof(BadgeNumber),
-				typeof(int),
-				typeof(PersonPicture),
-				new FrameworkPropertyMetadata(0, OnPropertyChanged));
-
-		public static DependencyProperty BadgeTextProperty { get; } =
-			DependencyProperty.Register(
-				nameof(BadgeText),
-				typeof(string),
-				typeof(PersonPicture),
-				new FrameworkPropertyMetadata(string.Empty, OnPropertyChanged));
-
-		public static DependencyProperty ContactProperty { get; } =
-			DependencyProperty.Register(
-				nameof(Contact),
-				typeof(Contact),
-				typeof(PersonPicture),
-				new FrameworkPropertyMetadata(default(Contact), OnPropertyChanged));
-
-		public static DependencyProperty DisplayNameProperty { get; } =
-			DependencyProperty.Register(
-				nameof(DisplayName),
-				typeof(string),
-				typeof(PersonPicture),
-				new FrameworkPropertyMetadata("", OnPropertyChanged));
-
-		public static DependencyProperty InitialsProperty { get; } =
-			DependencyProperty.Register(
-				nameof(Initials),
-				typeof(string),
-				typeof(PersonPicture),
-				new FrameworkPropertyMetadata("", OnPropertyChanged));
-
-		public static DependencyProperty IsGroupProperty { get; } =
-			DependencyProperty.Register(
-				nameof(IsGroup),
-				typeof(bool),
-				typeof(PersonPicture),
-				new FrameworkPropertyMetadata(default(bool), OnPropertyChanged));
-
-		public static DependencyProperty PreferSmallImageProperty { get; } =
-			DependencyProperty.Register(
-				nameof(PreferSmallImage),
-				typeof(bool),
-				typeof(PersonPicture),
-				new FrameworkPropertyMetadata(default(bool), OnPropertyChanged));
-
-		public static DependencyProperty ProfilePictureProperty { get; } =
-			DependencyProperty.Register(
-				nameof(ProfilePicture),
-				typeof(ImageSource),
-				typeof(PersonPicture),
-				new FrameworkPropertyMetadata(default(ImageSource), OnPropertyChanged));
-
-		internal static DependencyProperty TemplateSettingsProperty { get; } =
-			DependencyProperty.Register(
-				nameof(TemplateSettings),
-				typeof(PersonPictureTemplateSettings),
-				typeof(PersonPicture),
-				new FrameworkPropertyMetadata(default(PersonPictureTemplateSettings), OnPropertyChanged));
-
-		private static void OnPropertyChanged(
-			DependencyObject sender,
-			DependencyPropertyChangedEventArgs args)
-		{
-			var owner = (PersonPicture)sender;
-			owner.OnPropertyChanged(args);
-		}
+		var owner = (PersonPicture)sender;
+		owner.OnPropertyChanged(args);
 	}
 }
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/PersonPicture.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/PersonPicture.cs
index bede144fd60e..2b104b5b58b0 100644
--- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/PersonPicture.cs
+++ b/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/PersonPicture.cs
@@ -1,691 +1,690 @@
-// MUX Reference PersonPicture.cpp, commit de78834
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+// MUX Reference PersonPicture.cpp, tag winui3/release/1.4.2
 
 using System;
 using System.Globalization;
-using System.Threading.Tasks;
 using Uno.UI.Helpers.WinUI;
 using Windows.ApplicationModel.Contacts;
-using Windows.ApplicationModel.Resources;
 using Windows.Foundation;
 using Windows.Storage.Streams;
+using Windows.System;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Automation;
 using Windows.UI.Xaml.Automation.Peers;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Media.Imaging;
 using Windows.UI.Xaml.Shapes;
 
-namespace Microsoft.UI.Xaml.Controls
+namespace Microsoft.UI.Xaml.Controls;
+
+public partial class PersonPicture : Control
 {
-	public partial class PersonPicture : Control
-	{
-		/// <summary>
-		/// XAML Element for the first TextBlock matching x:Name of InitialsTextBlock.
-		/// </summary>
-		TextBlock m_initialsTextBlock;
-
-		/// <summary>
-		/// XAML Element for the first TextBlock matching x:Name of BadgeNumberTextBlock.
-		/// </summary>
-		TextBlock m_badgeNumberTextBlock;
-
-		/// <summary>
-		/// XAML Element for the first TextBlock matching x:Name of BadgeGlyphIcon.
-		/// </summary>
-		FontIcon m_badgeGlyphIcon;
-
-		/// <summary>
-		/// XAML Element for the first ImageBrush matching x:Name of BadgeImageBrush.
-		/// </summary>
-		ImageBrush m_badgeImageBrush;
-
-		/// <summary>
-		/// XAML Element for the first Ellipse matching x:Name of BadgingBackgroundEllipse.
-		/// </summary>
-		Ellipse m_badgingEllipse;
-
-		/// <summary>
-		/// XAML Element for the first Ellipse matching x:Name of BadgingEllipse.
-		/// </summary>
-		Ellipse m_badgingBackgroundEllipse;
+	/// <summary>
+	/// XAML Element for the first TextBlock matching x:Name of InitialsTextBlock.
+	/// </summary>
+	TextBlock m_initialsTextBlock;
+
+	/// <summary>
+	/// XAML Element for the first TextBlock matching x:Name of BadgeNumberTextBlock.
+	/// </summary>
+	TextBlock m_badgeNumberTextBlock;
+
+	/// <summary>
+	/// XAML Element for the first TextBlock matching x:Name of BadgeGlyphIcon.
+	/// </summary>
+	FontIcon m_badgeGlyphIcon;
+
+	/// <summary>
+	/// XAML Element for the first ImageBrush matching x:Name of BadgeImageBrush.
+	/// </summary>
+	ImageBrush m_badgeImageBrush;
+
+	/// <summary>
+	/// XAML Element for the first Ellipse matching x:Name of BadgingBackgroundEllipse.
+	/// </summary>
+	Ellipse m_badgingEllipse;
+
+	/// <summary>
+	/// XAML Element for the first Ellipse matching x:Name of BadgingEllipse.
+	/// </summary>
+	Ellipse m_badgingBackgroundEllipse;
 
 #pragma warning disable CS0649 // Field is never assigned to, and will always have its default value null
-		/// <summary>
-		/// The async operation object representing the loading and assignment of the Thumbnail.
-		/// </summary>
-		IAsyncOperation<IRandomAccessStreamWithContentType> m_profilePictureReadAsync;
+	/// <summary>
+	/// The async operation object representing the loading and assignment of the Thumbnail.
+	/// </summary>
+	IAsyncOperation<IRandomAccessStreamWithContentType> m_profilePictureReadAsync;
 #pragma warning restore CS0649 // Field is never assigned to, and will always have its default value null
 
-		/// <summary>
-		/// The initials from the DisplayName property.
-		/// </summary>
-		string m_displayNameInitials = string.Empty; // Uno docs: hstring in C++ is a struct and can't be null. So we explicitly initialize to string.Empty.
+	/// <summary>
+	/// The initials from the DisplayName property.
+	/// </summary>
+	string m_displayNameInitials = string.Empty; // Uno docs: hstring in C++ is a struct and can't be null. So we explicitly initialize to string.Empty.
 
-		/// <summary>
-		/// The initials from the Contact property.
-		/// </summary>
-		string m_contactDisplayNameInitials = string.Empty; // Uno docs: hstring in C++ is a struct and can't be null. So we explicitly initialize to string.Empty.
+	/// <summary>
+	/// The initials from the Contact property.
+	/// </summary>
+	string m_contactDisplayNameInitials = string.Empty; // Uno docs: hstring in C++ is a struct and can't be null. So we explicitly initialize to string.Empty.
 
-		/// <summary>
-		/// The ImageSource from the Contact property.
-		/// </summary>
-		ImageSource m_contactImageSource;
+	/// <summary>
+	/// The ImageSource from the Contact property.
+	/// </summary>
+	ImageSource m_contactImageSource;
 
-		public PersonPicture()
-		{
-			DefaultStyleKey = typeof(PersonPicture);
+	public PersonPicture()
+	{
+		DefaultStyleKey = typeof(PersonPicture);
 
-			TemplateSettings = new PersonPictureTemplateSettings();
+		TemplateSettings = new PersonPictureTemplateSettings();
 
-			Unloaded += OnUnloaded;
-			SizeChanged += OnSizeChanged;
-		}
+		Unloaded += OnUnloaded;
+		SizeChanged += OnSizeChanged;
+	}
 
 #if false
-		Task<BitmapImage> LoadImageAsync(IRandomAccessStreamReference thumbStreamReference)
-		{
-			m_profilePictureReadAsync = null;
-
-			// Contact is not yet supported.
-			throw new NotSupportedException("Contact is not yet supported");
-
-			//var operation = thumbStreamReference.OpenReadAsync();
-
-			//operation.Completed(
-			//	AsyncOperationCompletedHandler<IRandomAccessStreamWithContentType>(
-			//		[strongThis, completedFunction](
-			//			IAsyncOperation<IRandomAccessStreamWithContentType> operation,
-			//			AsyncStatus asyncStatus)
-			//{
-			//	strongThis.m_dispatcherHelper.RunAsync(
-			//		[strongThis, asyncStatus, completedFunction, operation]()
-			//	{
-			//		BitmapImage bitmap;
-
-			//		// Handle the failure case here to ensure we are on the UI thread.
-			//		if (asyncStatus != AsyncStatus.Completed)
-			//		{
-			//			strongThis.m_profilePictureReadAsync = null);
-			//			return;
-			//		}
-
-			//		try
-			//		{
-			//			bitmap.SetSourceAsync(operation.GetResults()).Completed(
-			//				AsyncActionCompletedHandler(
-			//					[strongThis, completedFunction, bitmap](IAsyncAction, AsyncStatus asyncStatus)
-			//			{
-			//				if (asyncStatus != AsyncStatus.Completed)
-			//				{
-			//					strongThis.m_profilePictureReadAsync = null);
-			//					return;
-			//				}
-
-			//				completedFunction(bitmap);
-			//				strongThis.m_profilePictureReadAsync = null);
-			//			}));
-			//		}
-			//		catch (hresult_error &e)
-			//		{
-			//			strongThis.m_profilePictureReadAsync = null);
-
-			//			// Ignore the exception if the image is invalid
-			//			if (e.to_abi() == E_INVALIDARG)
-			//			{
-			//				return;
-			//			}
-			//			else
-			//			{
-			//				throw;
-			//			}
-			//		}
-			//	});
-			//}));
-
-			//m_profilePictureReadAsync = operation;
-		}
+	Task<BitmapImage> LoadImageAsync(IRandomAccessStreamReference thumbStreamReference)
+	{
+		m_profilePictureReadAsync = null;
+
+		// Contact is not yet supported.
+		throw new NotSupportedException("Contact is not yet supported");
+
+		//var operation = thumbStreamReference.OpenReadAsync();
+
+		//operation.Completed(
+		//	AsyncOperationCompletedHandler<IRandomAccessStreamWithContentType>(
+		//		[strongThis, completedFunction](
+		//			IAsyncOperation<IRandomAccessStreamWithContentType> operation,
+		//			AsyncStatus asyncStatus)
+		//{
+		//	strongThis.DispatcherQueue().TryEnqueue(new DispatcherQueueHandler(
+		//		[strongThis, asyncStatus, completedFunction, operation]()
+		//	{
+		//		BitmapImage bitmap;
+
+		//		// Handle the failure case here to ensure we are on the UI thread.
+		//		if (asyncStatus != AsyncStatus.Completed)
+		//		{
+		//			strongThis.m_profilePictureReadAsync = null);
+		//			return;
+		//		}
+
+		//		try
+		//		{
+		//			bitmap.SetSourceAsync(operation.GetResults()).Completed(
+		//				AsyncActionCompletedHandler(
+		//					[strongThis, completedFunction, bitmap](IAsyncAction, AsyncStatus asyncStatus)
+		//			{
+		//				if (asyncStatus != AsyncStatus.Completed)
+		//				{
+		//					strongThis.m_profilePictureReadAsync = null);
+		//					return;
+		//				}
+
+		//				completedFunction(bitmap);
+		//				strongThis.m_profilePictureReadAsync = null);
+		//			}));
+		//		}
+		//		catch (hresult_error &e)
+		//		{
+		//			strongThis.m_profilePictureReadAsync = null);
+
+		//			// Ignore the exception if the image is invalid
+		//			if (e.to_abi() == E_INVALIDARG)
+		//			{
+		//				return;
+		//			}
+		//			else
+		//			{
+		//				throw;
+		//			}
+		//		}
+		//	}));
+		//}));
+
+		//m_profilePictureReadAsync = operation;
+	}
 #endif
 
-		protected override AutomationPeer OnCreateAutomationPeer()
+	protected override AutomationPeer OnCreateAutomationPeer()
+	{
+		return new Microsoft.UI.Xaml.Automation.Peers.PersonPictureAutomationPeer(this);
+	}
+
+	protected override void OnApplyTemplate()
+	{
+		base.OnApplyTemplate();
+
+		// Retrieve pointers to stable controls
+		m_initialsTextBlock = GetTemplateChild("InitialsTextBlock") as TextBlock;
+
+		m_badgeNumberTextBlock = GetTemplateChild("BadgeNumberTextBlock") as TextBlock;
+		m_badgeGlyphIcon = GetTemplateChild("BadgeGlyphIcon") as FontIcon;
+		m_badgingEllipse = GetTemplateChild("BadgingEllipse") as Ellipse;
+		m_badgingBackgroundEllipse = GetTemplateChild("BadgingBackgroundEllipse") as Ellipse;
+
+		UpdateBadge();
+		UpdateIfReady();
+	}
+
+	string GetInitials()
+	{
+		if (!string.IsNullOrEmpty(Initials))
+		{
+			return Initials;
+		}
+		else if (!string.IsNullOrEmpty(m_displayNameInitials))
 		{
-			return new Microsoft.UI.Xaml.Automation.Peers.PersonPictureAutomationPeer(this);
+			return m_displayNameInitials;
 		}
+		else
+		{
+			return m_contactDisplayNameInitials;
+		}
+	}
 
-		protected override void OnApplyTemplate()
+	ImageSource GetImageSource()
+	{
+		if (ProfilePicture != null)
 		{
-			base.OnApplyTemplate();
+			return ProfilePicture;
+		}
+		else
+		{
+			return m_contactImageSource;
+		}
+	}
 
-			// Retrieve pointers to stable controls
-			m_initialsTextBlock = GetTemplateChild("InitialsTextBlock") as TextBlock;
+	void UpdateIfReady()
+	{
+		string initials = GetInitials();
+		ImageSource imageSrc = GetImageSource();
 
-			m_badgeNumberTextBlock = GetTemplateChild("BadgeNumberTextBlock") as TextBlock;
-			m_badgeGlyphIcon = GetTemplateChild("BadgeGlyphIcon") as FontIcon;
-			m_badgingEllipse = GetTemplateChild("BadgingEllipse") as Ellipse;
-			m_badgingBackgroundEllipse = GetTemplateChild("BadgingBackgroundEllipse") as Ellipse;
+		var templateSettings = TemplateSettings;
+		templateSettings.ActualInitials = initials;
+		if (imageSrc != null)
+		{
+			var imageBrush = templateSettings.ActualImageBrush;
+			if (imageBrush == null)
+			{
+				imageBrush = new ImageBrush();
+				imageBrush.Stretch = Stretch.UniformToFill;
+				templateSettings.ActualImageBrush = imageBrush;
+			}
 
-			UpdateBadge();
-			UpdateIfReady();
+			imageBrush.ImageSource = imageSrc;
+		}
+		else
+		{
+			templateSettings.ActualImageBrush = null;
 		}
 
-		string GetInitials()
+		// If the control is converted to 'Group-mode', we'll clear individual-specific information.
+		// When IsGroup evaluates to false, we will restore state.
+		if (IsGroup)
 		{
-			if (!string.IsNullOrEmpty(Initials))
+			VisualStateManager.GoToState(this, "Group", false);
+		}
+		else
+		{
+			if (imageSrc != null)
 			{
-				return Initials;
+				VisualStateManager.GoToState(this, "Photo", false);
 			}
-			else if (!string.IsNullOrEmpty(m_displayNameInitials))
+			else if (!string.IsNullOrEmpty(initials))
 			{
-				return m_displayNameInitials;
+				VisualStateManager.GoToState(this, "Initials", false);
 			}
 			else
 			{
-				return m_contactDisplayNameInitials;
+				VisualStateManager.GoToState(this, "NoPhotoOrInitials", false);
 			}
 		}
 
-		ImageSource GetImageSource()
+		UpdateAutomationName();
+	}
+
+	void UpdateBadge()
+	{
+		if (BadgeImageSource != null)
 		{
-			if (ProfilePicture != null)
-			{
-				return ProfilePicture;
-			}
-			else
-			{
-				return m_contactImageSource;
-			}
+			UpdateBadgeImageSource();
 		}
-
-		void UpdateIfReady()
+		else if (BadgeNumber != 0)
 		{
-			string initials = GetInitials();
-			ImageSource imageSrc = GetImageSource();
+			UpdateBadgeNumber();
+		}
+		else if (!string.IsNullOrEmpty(BadgeGlyph))
+		{
+			UpdateBadgeGlyph();
+		}
+		// No badge properties set, so clear the badge XAML
+		else
+		{
+			VisualStateManager.GoToState(this, "NoBadge", false);
 
-			var templateSettings = TemplateSettings;
-			templateSettings.ActualInitials = initials;
-			if (imageSrc != null)
+			if (m_badgeNumberTextBlock != null)
 			{
-				var imageBrush = templateSettings.ActualImageBrush;
-				if (imageBrush == null)
-				{
-					imageBrush = new ImageBrush();
-					imageBrush.Stretch = Stretch.UniformToFill;
-					templateSettings.ActualImageBrush = imageBrush;
-				}
-
-				imageBrush.ImageSource = imageSrc;
-			}
-			else
-			{
-				templateSettings.ActualImageBrush = null;
+				m_badgeNumberTextBlock.Text = "";
 			}
 
-			// If the control is converted to 'Group-mode', we'll clear individual-specific information.
-			// When IsGroup evaluates to false, we will restore state.
-			if (IsGroup)
+			if (m_badgeGlyphIcon != null)
 			{
-				VisualStateManager.GoToState(this, "Group", false);
-			}
-			else
-			{
-				if (imageSrc != null)
-				{
-					VisualStateManager.GoToState(this, "Photo", false);
-				}
-				else if (!string.IsNullOrEmpty(initials))
-				{
-					VisualStateManager.GoToState(this, "Initials", false);
-				}
-				else
-				{
-					VisualStateManager.GoToState(this, "NoPhotoOrInitials", false);
-				}
+				m_badgeGlyphIcon.Glyph = "";
 			}
-
-			UpdateAutomationName();
 		}
 
-		void UpdateBadge()
+		UpdateAutomationName();
+	}
+
+	void UpdateBadgeNumber()
+	{
+		if (m_badgingEllipse == null || m_badgeNumberTextBlock == null)
 		{
-			if (BadgeImageSource != null)
-			{
-				UpdateBadgeImageSource();
-			}
-			else if (BadgeNumber != 0)
-			{
-				UpdateBadgeNumber();
-			}
-			else if (!string.IsNullOrEmpty(BadgeGlyph))
-			{
-				UpdateBadgeGlyph();
-			}
-			// No badge properties set, so clear the badge XAML
-			else
-			{
-				VisualStateManager.GoToState(this, "NoBadge", false);
+			return;
+		}
 
-				if (m_badgeNumberTextBlock != null)
-				{
-					m_badgeNumberTextBlock.Text = "";
-				}
+		int badgeNumber = BadgeNumber;
 
-				if (m_badgeGlyphIcon != null)
-				{
-					m_badgeGlyphIcon.Glyph = "";
-				}
-			}
+		if (badgeNumber <= 0)
+		{
+			VisualStateManager.GoToState(this, "NoBadge", false);
+			m_badgeNumberTextBlock.Text = "";
+			return;
+		}
 
-			UpdateAutomationName();
+		// should have badging number to show if we are here
+		VisualStateManager.GoToState(this, "BadgeWithoutImageSource", false);
+
+		if (badgeNumber <= 99)
+		{
+			m_badgeNumberTextBlock.Text = badgeNumber.ToString(CultureInfo.CurrentCulture);
 		}
+		else
+		{
+			m_badgeNumberTextBlock.Text = "99+";
+		}
+	}
 
-		void UpdateBadgeNumber()
+	void UpdateBadgeGlyph()
+	{
+		if (m_badgingEllipse == null || m_badgeGlyphIcon == null)
 		{
-			if (m_badgingEllipse == null || m_badgeNumberTextBlock == null)
-			{
-				return;
-			}
+			return;
+		}
 
-			int badgeNumber = BadgeNumber;
+		string badgeGlyph = BadgeGlyph;
 
-			if (badgeNumber <= 0)
-			{
-				VisualStateManager.GoToState(this, "NoBadge", false);
-				m_badgeNumberTextBlock.Text = "";
-				return;
-			}
+		if (string.IsNullOrEmpty(badgeGlyph))
+		{
+			VisualStateManager.GoToState(this, "NoBadge", false);
+			m_badgeGlyphIcon.Glyph = "";
+			return;
+		}
 
-			// should have badging number to show if we are here
-			VisualStateManager.GoToState(this, "BadgeWithoutImageSource", false);
+		// should have badging Glyph to show if we are here
+		VisualStateManager.GoToState(this, "BadgeWithoutImageSource", false);
 
-			if (badgeNumber <= 99)
-			{
-				m_badgeNumberTextBlock.Text = badgeNumber.ToString(CultureInfo.CurrentCulture);
-			}
-			else
-			{
-				m_badgeNumberTextBlock.Text = "99+";
-			}
-		}
+		m_badgeGlyphIcon.Glyph = badgeGlyph;
+	}
 
-		void UpdateBadgeGlyph()
+	void UpdateBadgeImageSource()
+	{
+		if (m_badgeImageBrush == null)
 		{
-			if (m_badgingEllipse == null || m_badgeGlyphIcon == null)
-			{
-				return;
-			}
+			m_badgeImageBrush = GetTemplateChild("BadgeImageBrush") as ImageBrush;
+		}
 
-			string badgeGlyph = BadgeGlyph;
+		if (m_badgingEllipse == null || m_badgeImageBrush == null)
+		{
+			return;
+		}
 
-			if (string.IsNullOrEmpty(badgeGlyph))
-			{
-				VisualStateManager.GoToState(this, "NoBadge", false);
-				m_badgeGlyphIcon.Glyph = "";
-				return;
-			}
+		m_badgeImageBrush.ImageSource = BadgeImageSource;
 
-			// should have badging Glyph to show if we are here
-			VisualStateManager.GoToState(this, "BadgeWithoutImageSource", false);
+		if (BadgeImageSource != null)
+		{
+			VisualStateManager.GoToState(this, "BadgeWithImageSource", false);
+		}
+		else
+		{
+			VisualStateManager.GoToState(this, "NoBadge", false);
+		}
+	}
 
-			m_badgeGlyphIcon.Glyph = badgeGlyph;
+	void UpdateAutomationName()
+	{
+		Contact contact = Contact;
+		string automationName;
+		string contactName;
+
+		// The AutomationName for the control is in the format: PersonName, BadgeInformation.
+		// PersonName is set based on the name / initial properties in the order below.
+		// if none exist, it defaults to "Person"
+		if (IsGroup)
+		{
+			contactName = ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_GroupName);
+		}
+		else if (contact != null && !string.IsNullOrEmpty(contact.DisplayName))
+		{
+			contactName = contact.DisplayName;
+		}
+		else if (!string.IsNullOrEmpty(DisplayName))
+		{
+			contactName = DisplayName;
+		}
+		else if (!string.IsNullOrEmpty(Initials))
+		{
+			contactName = Initials;
+		}
+		else
+		{
+			contactName = ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_PersonName);
 		}
 
-		void UpdateBadgeImageSource()
+		// BadgeInformation portion of the AutomationName is set to 'n items' if there is a BadgeNumber,
+		// or 'icon' for BadgeGlyph or BadgeImageSource. If BadgeText is specified, it will override
+		// the string 'items' or 'icon'
+		if (BadgeNumber > 0)
 		{
-			if (m_badgeImageBrush == null)
+			if (!string.IsNullOrEmpty(BadgeText))
 			{
-				m_badgeImageBrush = GetTemplateChild("BadgeImageBrush") as ImageBrush;
+				automationName = StringUtil.FormatString(
+					ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BadgeItemTextOverride),
+					contactName,
+					BadgeNumber,
+					BadgeText);
 			}
-
-			if (m_badgingEllipse == null || m_badgeImageBrush == null)
+			else
 			{
-				return;
+				automationName = StringUtil.FormatString(
+					GetLocalizedPluralBadgeItemStringResource(BadgeNumber),
+					contactName,
+					BadgeNumber);
 			}
-
-			m_badgeImageBrush.ImageSource = BadgeImageSource;
-
-			if (BadgeImageSource != null)
+		}
+		else if (!string.IsNullOrEmpty(BadgeGlyph) || BadgeImageSource != null)
+		{
+			if (!string.IsNullOrEmpty(BadgeText))
 			{
-				VisualStateManager.GoToState(this, "BadgeWithImageSource", false);
+				automationName = StringUtil.FormatString(
+					ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BadgeIconTextOverride),
+					contactName,
+					BadgeText);
 			}
 			else
 			{
-				VisualStateManager.GoToState(this, "NoBadge", false);
+				automationName = StringUtil.FormatString(
+					ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BadgeIcon),
+					contactName);
 			}
 		}
+		else
+		{
+			automationName = contactName;
+		}
+
+		AutomationProperties.SetName(this, automationName);
+	}
 
-		void UpdateAutomationName()
+	string GetLocalizedPluralBadgeItemStringResource(int numericValue)
+	{
+		int valueMod10 = numericValue % 10;
+		string value;
+
+		if (numericValue == 1)  // Singular
+		{
+			value = ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BadgeItemSingular);
+		}
+		else if (numericValue == 2) // 2
+		{
+			value = ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BadgeItemPlural7);
+		}
+		else if (numericValue == 3 || numericValue == 4) // 3,4
+		{
+			value = ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BadgeItemPlural2);
+		}
+		else if (numericValue >= 5 && numericValue <= 10) // 5-10
 		{
-			Contact contact = Contact;
-			string automationName;
-			string contactName;
+			value = ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BadgeItemPlural5);
+		}
+		else if (numericValue >= 11 && numericValue <= 19) // 11-19
+		{
+			value = ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BadgeItemPlural6);
+		}
+		else if (valueMod10 == 1) // 21, 31, 41, etc.
+		{
+			value = ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BadgeItemPlural1);
+		}
+		else if (valueMod10 >= 2 && valueMod10 <= 4) // 22-24, 32-34, 42-44, etc.
+		{
+			value = ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BadgeItemPlural3);
+		}
+		else // Everything else... 0, 20, 25-30, 35-40, etc.
+		{
+			value = ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BadgeItemPlural4);
+		}
 
-			// The AutomationName for the control is in the format: PersonName, BadgeInformation.
-			// PersonName is set based on the name / initial properties in the order below.
-			// if none exist, it defaults to "Person"
-			if (IsGroup)
-			{
-				contactName = ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_GroupName);
-			}
-			else if (contact != null && !string.IsNullOrEmpty(contact.DisplayName))
-			{
-				contactName = contact.DisplayName;
-			}
-			else if (!string.IsNullOrEmpty(DisplayName))
-			{
-				contactName = DisplayName;
-			}
-			else if (!string.IsNullOrEmpty(Initials))
-			{
-				contactName = Initials;
-			}
-			else
-			{
-				contactName = ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_PersonName);
-			}
+		return value;
+	}
 
-			// BadgeInformation portion of the AutomationName is set to 'n items' if there is a BadgeNumber,
-			// or 'icon' for BadgeGlyph or BadgeImageSource. If BadgeText is specified, it will override
-			// the string 'items' or 'icon'
-			if (BadgeNumber > 0)
-			{
-				if (!string.IsNullOrEmpty(BadgeText))
-				{
-					automationName = StringUtil.FormatString(
-						ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BadgeItemTextOverride),
-						contactName,
-						BadgeNumber,
-						BadgeText);
-				}
-				else
-				{
-					automationName = StringUtil.FormatString(
-						GetLocalizedPluralBadgeItemStringResource(BadgeNumber),
-						contactName,
-						BadgeNumber);
-				}
-			}
-			else if (!string.IsNullOrEmpty(BadgeGlyph) || BadgeImageSource != null)
-			{
-				if (!string.IsNullOrEmpty(BadgeText))
-				{
-					automationName = StringUtil.FormatString(
-						ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BadgeIconTextOverride),
-						contactName,
-						BadgeText);
-				}
-				else
-				{
-					automationName = StringUtil.FormatString(
-						ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BadgeIcon),
-						contactName);
-				}
-			}
-			else
-			{
-				automationName = contactName;
-			}
+	void UpdateControlForContact(bool isNewContact)
+	{
+		Contact contact = Contact;
 
-			AutomationProperties.SetName(this, automationName);
+		if (contact == null)
+		{
+			// Explicitly setting to empty/null ensures the bound XAML is
+			// correctly updated.
+			m_contactDisplayNameInitials = "";
+			m_contactImageSource = null;
+			UpdateIfReady();
+			return;
 		}
 
-		string GetLocalizedPluralBadgeItemStringResource(int numericValue)
+		// It's possible for a second update to occur before the first finished loading
+		// a profile picture (regardless of second having a picture or not).
+		// Cancellation of any previously-activated tasks will mitigate race conditions.
+		if (m_profilePictureReadAsync != null)
 		{
-			int valueMod10 = numericValue % 10;
-			string value;
+			m_profilePictureReadAsync.Cancel();
+		}
 
-			if (numericValue == 1)  // Singular
-			{
-				value = ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BadgeItemSingular);
-			}
-			else if (numericValue == 2) // 2
-			{
-				value = ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BadgeItemPlural7);
-			}
-			else if (numericValue == 3 || numericValue == 4) // 3,4
-			{
-				value = ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BadgeItemPlural2);
-			}
-			else if (numericValue >= 5 && numericValue <= 10) // 5-10
-			{
-				value = ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BadgeItemPlural5);
-			}
-			else if (numericValue >= 11 && numericValue <= 19) // 11-19
+		m_contactDisplayNameInitials = InitialsGenerator.InitialsFromContactObject(contact);
+
+		// Order of preference (but all work): Large, Small, Source, Thumbnail
+		IRandomAccessStreamReference thumbStreamReference = null;
+
+		if (PreferSmallImage && contact.SmallDisplayPicture != null)
+		{
+			thumbStreamReference = contact.SmallDisplayPicture;
+		}
+		else
+		{
+			if (contact.LargeDisplayPicture != null)
 			{
-				value = ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BadgeItemPlural6);
+				thumbStreamReference = contact.LargeDisplayPicture;
 			}
-			else if (valueMod10 == 1) // 21, 31, 41, etc.
+			else if (contact.SmallDisplayPicture != null)
 			{
-				value = ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BadgeItemPlural1);
+				thumbStreamReference = contact.SmallDisplayPicture;
 			}
-			else if (valueMod10 >= 2 && valueMod10 <= 4) // 22-24, 32-34, 42-44, etc.
+			else if (contact.SourceDisplayPicture != null)
 			{
-				value = ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BadgeItemPlural3);
+				thumbStreamReference = contact.SourceDisplayPicture;
 			}
-			else // Everything else... 0, 20, 25-30, 35-40, etc.
+			else if (contact.Thumbnail != null)
 			{
-				value = ResourceAccessor.GetLocalizedStringResource(ResourceAccessor.SR_BadgeItemPlural4);
+				thumbStreamReference = contact.Thumbnail;
 			}
-
-			return value;
 		}
 
-		void UpdateControlForContact(bool isNewContact)
+		// If we have profile picture data available per the above, async load the picture from the platform.
+		if (thumbStreamReference != null)
 		{
-			Contact contact = Contact;
-
-			if (contact == null)
+			if (isNewContact)
 			{
-				// Explicitly setting to empty/null ensures the bound XAML is
-				// correctly updated.
-				m_contactDisplayNameInitials = "";
+				// Prevent the case where context of a contact changes, but we show an old person while the new one is loaded.
 				m_contactImageSource = null;
-				UpdateIfReady();
-				return;
 			}
 
-			// It's possible for a second update to occur before the first finished loading
-			// a profile picture (regardless of second having a picture or not).
-			// Cancellation of any previously-activated tasks will mitigate race conditions.
-			if (m_profilePictureReadAsync != null)
+			// The dispatcher is not available in design mode, so when in design mode bypass the call to LoadImageAsync.
+			if (!SharedHelpers.IsInDesignMode())
 			{
-				m_profilePictureReadAsync.Cancel();
-			}
+				// Contact is not yet supported
+				throw new NotSupportedException("Contact is not yet supported");
 
-			m_contactDisplayNameInitials = InitialsGenerator.InitialsFromContactObject(contact);
+				//LoadImageAsync(
+				//	thumbStreamReference,
+				//	[strongThis](BitmapImage profileBitmap)
+				//{
+				//	profileBitmap.DecodePixelType(DecodePixelType.Logical);
 
-			// Order of preference (but all work): Large, Small, Source, Thumbnail
-			IRandomAccessStreamReference thumbStreamReference = null;
+				//	// We want to constrain the shorter side to the same dimension as the control, allowing the decoder to
+				//	// choose the other dimension without distorting the image.
+				//	if (profileBitmap.PixelHeight() < profileBitmap.PixelWidth())
+				//	{
+				//		profileBitmap.DecodePixelHeight((int)(strongThis.Height()));
+				//	}
+				//	else
+				//	{
+				//		profileBitmap.DecodePixelWidth((int)(strongThis.Width()));
+				//	}
 
-			if (PreferSmallImage && contact.SmallDisplayPicture != null)
-			{
-				thumbStreamReference = contact.SmallDisplayPicture;
-			}
-			else
-			{
-				if (contact.LargeDisplayPicture != null)
-				{
-					thumbStreamReference = contact.LargeDisplayPicture;
-				}
-				else if (contact.SmallDisplayPicture != null)
-				{
-					thumbStreamReference = contact.SmallDisplayPicture;
-				}
-				else if (contact.SourceDisplayPicture != null)
-				{
-					thumbStreamReference = contact.SourceDisplayPicture;
-				}
-				else if (contact.Thumbnail != null)
-				{
-					thumbStreamReference = contact.Thumbnail;
-				}
+				//	strongThis.m_contactImageSource = ImageSource(profileBitmap));
+				//	strongThis.UpdateIfReady();
+				//});
 			}
+		}
+		else
+		{
+			// Else clause indicates that (Contact.Thumbnail == null).
+			m_contactImageSource = null;
+		}
 
-			// If we have profile picture data available per the above, async load the picture from the platform.
-			if (thumbStreamReference != null)
-			{
-				if (isNewContact)
-				{
-					// Prevent the case where context of a contact changes, but we show an old person while the new one is loaded.
-					m_contactImageSource = null;
-				}
-
-				// The dispatcher is not available in design mode, so when in design mode bypass the call to LoadImageAsync.
-				if (!SharedHelpers.IsInDesignMode())
-				{
-					// Contact is not yet supported
-					throw new NotSupportedException("Contact is not yet supported");
-
-					//LoadImageAsync(
-					//	thumbStreamReference,
-					//	[strongThis](BitmapImage profileBitmap)
-					//{
-					//	profileBitmap.DecodePixelType(DecodePixelType.Logical);
-
-					//	// We want to constrain the shorter side to the same dimension as the control, allowing the decoder to
-					//	// choose the other dimension without distorting the image.
-					//	if (profileBitmap.PixelHeight() < profileBitmap.PixelWidth())
-					//	{
-					//		profileBitmap.DecodePixelHeight((int)(strongThis.Height()));
-					//	}
-					//	else
-					//	{
-					//		profileBitmap.DecodePixelWidth((int)(strongThis.Width()));
-					//	}
-
-					//	strongThis.m_contactImageSource = ImageSource(profileBitmap));
-					//	strongThis.UpdateIfReady();
-					//});
-				}
-			}
-			else
-			{
-				// Else clause indicates that (Contact.Thumbnail == null).
-				m_contactImageSource = null;
-			}
+		UpdateIfReady();
+	}
+
+	void OnPropertyChanged(DependencyPropertyChangedEventArgs args)
+	{
+		DependencyProperty property = args.Property;
 
+		if (property == BadgeNumberProperty ||
+			property == BadgeGlyphProperty ||
+			property == BadgeImageSourceProperty)
+		{
+			UpdateBadge();
+		}
+		else if (property == BadgeTextProperty)
+		{
+			UpdateAutomationName();
+		}
+		else if (property == ContactProperty)
+		{
+			OnContactChanged(args);
+		}
+		else if (property == DisplayNameProperty)
+		{
+			OnDisplayNameChanged(args);
+		}
+		else if (property == ProfilePictureProperty ||
+			property == InitialsProperty ||
+			property == IsGroupProperty)
+		{
 			UpdateIfReady();
 		}
+		// No additional action required for s_PreferSmallImageProperty
+	}
+
+	void OnDisplayNameChanged(DependencyPropertyChangedEventArgs args)
+	{
+		m_displayNameInitials = InitialsGenerator.InitialsFromDisplayName(DisplayName);
+
+		UpdateIfReady();
+	}
 
-		void OnPropertyChanged(DependencyPropertyChangedEventArgs args)
+	void OnContactChanged(DependencyPropertyChangedEventArgs args)
+	{
+		bool isNewContact = true;
+
+		if (args != null && args.OldValue != null && args.NewValue != null)
 		{
-			DependencyProperty property = args.Property;
+			Contact oldContact = args.OldValue as Contact;
+			Contact newContact = args.NewValue as Contact;
 
-			if (property == BadgeNumberProperty ||
-				property == BadgeGlyphProperty ||
-				property == BadgeImageSourceProperty)
+			// Verify that the IDs are not null before comparing the old and new contact object.
+			// If both contact IDs are null, it will be treated as a newcontact.
+			if (!string.IsNullOrWhiteSpace(oldContact.Id) || !string.IsNullOrWhiteSpace(newContact.Id))
 			{
-				UpdateBadge();
+				isNewContact = oldContact.Id != newContact.Id;
 			}
-			else if (property == BadgeTextProperty)
+		}
+
+		UpdateControlForContact(isNewContact);
+	}
+
+	void OnSizeChanged(object sender, SizeChangedEventArgs args)
+	{
+		{
+			bool widthChanged = (args.NewSize.Width != args.PreviousSize.Width);
+			bool heightChanged = (args.NewSize.Height != args.PreviousSize.Height);
+			double newSize;
+
+			if (widthChanged && heightChanged)
 			{
-				UpdateAutomationName();
+				// Maintain circle by enforcing the new size on both Width and Height.
+				// To do so, we will use the minimum value.
+				newSize = (args.NewSize.Width < args.NewSize.Height) ? args.NewSize.Width : args.NewSize.Height;
 			}
-			else if (property == ContactProperty)
+			else if (widthChanged)
 			{
-				OnContactChanged(args);
+				newSize = args.NewSize.Width;
 			}
-			else if (property == DisplayNameProperty)
+			else if (heightChanged)
 			{
-				OnDisplayNameChanged(args);
+				newSize = args.NewSize.Height;
 			}
-			else if (property == ProfilePictureProperty ||
-				property == InitialsProperty ||
-				property == IsGroupProperty)
+			else
 			{
-				UpdateIfReady();
+				return;
 			}
-			// No additional action required for s_PreferSmallImageProperty
-		}
-
-		void OnDisplayNameChanged(DependencyPropertyChangedEventArgs args)
-		{
-			m_displayNameInitials = InitialsGenerator.InitialsFromDisplayName(DisplayName);
 
-			UpdateIfReady();
+			Height = newSize;
+			Width = newSize;
 		}
 
-		void OnContactChanged(DependencyPropertyChangedEventArgs args)
-		{
-			bool isNewContact = true;
+		// Calculate the FontSize of the control's text. Design guidelines have specified the
+		// font size to be 42% of the container. Since it's circular, 42% of either Width or Height.
+		// Note that we cap it to a minimum of 1, since a font size of less than 1 is an invalid value
+		// that will result in a failure.
+		double fontSize = Math.Max(1.0, Width * .42);
 
-			if (args != null && args.OldValue != null && args.NewValue != null)
-			{
-				Contact oldContact = args.OldValue as Contact;
-				Contact newContact = args.NewValue as Contact;
-
-				// Verify that the IDs are not null before comparing the old and new contact object.
-				// If both contact IDs are null, it will be treated as a newcontact.
-				if (!string.IsNullOrWhiteSpace(oldContact.Id) || !string.IsNullOrWhiteSpace(newContact.Id))
-				{
-					isNewContact = oldContact.Id != newContact.Id;
-				}
-			}
-
-			UpdateControlForContact(isNewContact);
+		if (m_initialsTextBlock != null)
+		{
+			m_initialsTextBlock.FontSize = fontSize;
 		}
 
-		void OnSizeChanged(object sender, SizeChangedEventArgs args)
+		if (m_badgingEllipse != null && m_badgingBackgroundEllipse != null && m_badgeNumberTextBlock != null && m_badgeGlyphIcon != null)
 		{
-			{
-				bool widthChanged = (args.NewSize.Width != args.PreviousSize.Width);
-				bool heightChanged = (args.NewSize.Height != args.PreviousSize.Height);
-				double newSize;
-
-				if (widthChanged && heightChanged)
-				{
-					// Maintain circle by enforcing the new size on both Width and Height.
-					// To do so, we will use the minimum value.
-					newSize = (args.NewSize.Width < args.NewSize.Height) ? args.NewSize.Width : args.NewSize.Height;
-				}
-				else if (widthChanged)
-				{
-					newSize = args.NewSize.Width;
-				}
-				else if (heightChanged)
-				{
-					newSize = args.NewSize.Height;
-				}
-				else
-				{
-					return;
-				}
-
-				Height = newSize;
-				Width = newSize;
-			}
-
-			// Calculate the FontSize of the control's text. Design guidelines have specified the
-			// font size to be 42% of the container. Since it's circular, 42% of either Width or Height.
-			// Note that we cap it to a minimum of 1, since a font size of less than 1 is an invalid value
-			// that will result in a failure.
-			double fontSize = Math.Max(1.0, Width * .42);
-
-			if (m_initialsTextBlock != null)
-			{
-				m_initialsTextBlock.FontSize = fontSize;
-			}
-
-			if (m_badgingEllipse != null && m_badgingBackgroundEllipse != null && m_badgeNumberTextBlock != null && m_badgeGlyphIcon != null)
-			{
-				// Maintain badging circle and font size by enforcing the new size on both Width and Height.
-				// Design guidelines have specified the font size to be 60% of the badging plate, and we want to keep
-				// badging plate to be about 50% of the control so that don't block the initial/profile picture.
-				double newSize = (args.NewSize.Width < args.NewSize.Height) ? args.NewSize.Width : args.NewSize.Height;
-				m_badgingEllipse.Height = newSize * 0.5;
-				m_badgingEllipse.Width = newSize * 0.5;
-				m_badgingBackgroundEllipse.Height = newSize * 0.5;
-				m_badgingBackgroundEllipse.Width = newSize * 0.5;
-				m_badgeNumberTextBlock.FontSize = Math.Max(1.0, m_badgingEllipse.Height * 0.6);
-				m_badgeGlyphIcon.FontSize = Math.Max(1.0, m_badgingEllipse.Height * 0.6);
-			}
+			// Maintain badging circle and font size by enforcing the new size on both Width and Height.
+			// Design guidelines have specified the font size to be 60% of the badging plate, and we want to keep
+			// badging plate to be about 50% of the control so that don't block the initial/profile picture.
+			double newSize = (args.NewSize.Width < args.NewSize.Height) ? args.NewSize.Width : args.NewSize.Height;
+			m_badgingEllipse.Height = newSize * 0.5;
+			m_badgingEllipse.Width = newSize * 0.5;
+			m_badgingBackgroundEllipse.Height = newSize * 0.5;
+			m_badgingBackgroundEllipse.Width = newSize * 0.5;
+			m_badgeNumberTextBlock.FontSize = Math.Max(1.0, m_badgingEllipse.Height * 0.6);
+			m_badgeGlyphIcon.FontSize = Math.Max(1.0, m_badgingEllipse.Height * 0.6);
 		}
+	}
 
-		void OnUnloaded(object sender, RoutedEventArgs e)
+	void OnUnloaded(object sender, RoutedEventArgs e)
+	{
+		if (m_profilePictureReadAsync != null)
 		{
-			if (m_profilePictureReadAsync != null)
-			{
-				m_profilePictureReadAsync.Cancel();
-			}
+			m_profilePictureReadAsync.Cancel();
 		}
 	}
 }
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/PersonPictureAutomationPeer.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/PersonPictureAutomationPeer.cs
index b0898a65a6e3..5e8d979ccd7b 100644
--- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/PersonPictureAutomationPeer.cs
+++ b/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/PersonPictureAutomationPeer.cs
@@ -1,3 +1,7 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+// MUX Reference PersonPictureAutomationPeer.cpp, tag winui3/release/1.4.2
+
 using Microsoft.UI.Xaml.Controls;
 using Windows.UI.Xaml.Automation.Peers;
 
@@ -9,6 +13,8 @@ public PersonPictureAutomationPeer(PersonPicture owner) : base(owner)
 	{
 	}
 
+	//IAutomationPeerOverrides
+
 	protected override AutomationControlType GetAutomationControlTypeCore() => AutomationControlType.Text;
 
 	protected override string GetClassNameCore() => nameof(PersonPicture);
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/PersonPictureTemplateSettings.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/PersonPictureTemplateSettings.cs
index be5b2d363b46..a743448b1892 100644
--- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/PersonPictureTemplateSettings.cs
+++ b/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/PersonPictureTemplateSettings.cs
@@ -1,31 +1,29 @@
-// MUX Reference PersonPictureTemplateSettings.properties.cpp, commit de78834
-
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
+// MUX Reference PersonPictureTemplateSettings.properties.cpp, tag winui3/release/1.4.2
 
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Media;
 
-namespace Microsoft.UI.Xaml.Controls
+namespace Microsoft.UI.Xaml.Controls;
+
+public partial class PersonPictureTemplateSettings : DependencyObject
 {
-	public partial class PersonPictureTemplateSettings : DependencyObject
+	public ImageBrush ActualImageBrush
 	{
-		public ImageBrush ActualImageBrush
-		{
-			get { return (ImageBrush)GetValue(ActualImageBrushProperty); }
-			internal set { SetValue(ActualImageBrushProperty, value); }
-		}
-
-		public static DependencyProperty ActualImageBrushProperty { get; } =
-			DependencyProperty.Register(nameof(ActualImageBrush), typeof(ImageBrush), typeof(PersonPictureTemplateSettings), new FrameworkPropertyMetadata(null));
+		get => (ImageBrush)GetValue(ActualImageBrushProperty);
+		internal set => SetValue(ActualImageBrushProperty, value);
+	}
 
-		public string ActualInitials
-		{
-			get { return (string)GetValue(ActualInitialsProperty); }
-			internal set { SetValue(ActualInitialsProperty, value); }
-		}
+	public static DependencyProperty ActualImageBrushProperty { get; } =
+		DependencyProperty.Register(nameof(ActualImageBrush), typeof(ImageBrush), typeof(PersonPictureTemplateSettings), new FrameworkPropertyMetadata(null));
 
-		public static DependencyProperty ActualInitialsProperty { get; } =
-			DependencyProperty.Register(nameof(ActualInitials), typeof(string), typeof(PersonPictureTemplateSettings), new FrameworkPropertyMetadata(""));
+	public string ActualInitials
+	{
+		get => (string)GetValue(ActualInitialsProperty); 
+		internal set => SetValue(ActualInitialsProperty, value);
 	}
+
+	public static DependencyProperty ActualInitialsProperty { get; } =
+		DependencyProperty.Register(nameof(ActualInitials), typeof(string), typeof(PersonPictureTemplateSettings), new FrameworkPropertyMetadata(""));
 }

From ca52a6bcf8226476f79162f33c953d03df9e6197 Mon Sep 17 00:00:00 2001
From: morning4coffe-dev <78549750+morning4coffe-dev@users.noreply.github.com>
Date: Tue, 31 Oct 2023 20:13:14 +0100
Subject: [PATCH 2/5] fix: Formatting on PersonPictureTemplateSettings

---
 .../Controls/PersonPicture/PersonPictureTemplateSettings.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/PersonPictureTemplateSettings.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/PersonPictureTemplateSettings.cs
index a743448b1892..1682b29b31e9 100644
--- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/PersonPictureTemplateSettings.cs
+++ b/src/Uno.UI/Microsoft/UI/Xaml/Controls/PersonPicture/PersonPictureTemplateSettings.cs
@@ -20,7 +20,7 @@ public ImageBrush ActualImageBrush
 
 	public string ActualInitials
 	{
-		get => (string)GetValue(ActualInitialsProperty); 
+		get => (string)GetValue(ActualInitialsProperty);
 		internal set => SetValue(ActualInitialsProperty, value);
 	}
 

From 5513ff62e79d2d91626f8a97619838ef53bb4691 Mon Sep 17 00:00:00 2001
From: morning4coffe-dev <78549750+morning4coffe-dev@users.noreply.github.com>
Date: Tue, 31 Oct 2023 20:34:07 +0100
Subject: [PATCH 3/5] chore: Remove unessesary workaround on wasm

---
 .../Resources/Version2/PriorityDefault/PersonPicture.xaml  | 6 ------
 src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml           | 7 -------
 2 files changed, 13 deletions(-)

diff --git a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/PersonPicture.xaml b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/PersonPicture.xaml
index 6e2c9a2aa8e3..71d17e4c9510 100644
--- a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/PersonPicture.xaml
+++ b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/PersonPicture.xaml
@@ -20,8 +20,6 @@
                 <VisualState x:Name="Photo">
                   <VisualState.Setters>
                     <Setter Target="PersonPictureEllipse.Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ActualImageBrush}" />
-                    <!-- UNO WORKAROUND: ImageBrush is not stretching properly https://github.com/unoplatform/uno/issues/4951 -->
-                    <wasm:Setter Target="PersonPictureImage.Source" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ActualImageBrush.ImageSource}" />
                   </VisualState.Setters>
                 </VisualState>
                 <!-- Visual State when no Photo is available (but there are initials).-->
@@ -63,10 +61,6 @@
               </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
             <Ellipse Fill="{ThemeResource PersonPictureEllipseFillThemeBrush}" Stroke="{ThemeResource PersonPictureEllipseFillStrokeBrush}" StrokeThickness="{ThemeResource PersonPictureEllipseStrokeThickness}" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" />
-            <!-- UNO WORKAROUND: ImageBrush is not stretching properly https://github.com/unoplatform/uno/issues/4951 -->
-            <wasm:Border Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" CornerRadius="{TemplateBinding Width}" FlowDirection="LeftToRight">
-                <Image x:Name="PersonPictureImage" Stretch="UniformToFill" HorizontalAlignment="Center" VerticalAlignment="Center" />
-            </wasm:Border>
             <TextBlock x:Name="InitialsTextBlock" AutomationProperties.AccessibilityView="Raw" FontSize="40" FontFamily="{TemplateBinding FontFamily}" Foreground="{TemplateBinding Foreground}" FontWeight="{TemplateBinding FontWeight}" TextLineBounds="Tight" VerticalAlignment="Center" HorizontalAlignment="Center" IsTextScaleFactorEnabled="False" Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ActualInitials}" />
             <Ellipse x:Name="PersonPictureEllipse" x:DeferLoadStrategy="Lazy" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" FlowDirection="LeftToRight" />
             <Grid x:Name="BadgeGrid" Visibility="Collapsed" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="{ThemeResource PersonPictureBadgeGridMargin}">
diff --git a/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml b/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
index 4c41097dfe4f..20300c339b0e 100644
--- a/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
+++ b/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
@@ -19935,8 +19935,6 @@
                 <VisualState x:Name="Photo">
                   <VisualState.Setters>
                     <Setter Target="PersonPictureEllipse.Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ActualImageBrush}" />
-                    <!-- UNO WORKAROUND: ImageBrush is not stretching properly https://github.com/unoplatform/uno/issues/4951 -->
-                    <wasm:Setter Target="PersonPictureImage.Source" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ActualImageBrush.ImageSource}" />
                   </VisualState.Setters>
                 </VisualState>
                 <!-- Visual State when no Photo is available (but there are initials).-->
@@ -19978,13 +19976,8 @@
               </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
             <Ellipse Fill="{ThemeResource PersonPictureEllipseFillThemeBrush}" Stroke="{ThemeResource PersonPictureEllipseFillStrokeBrush}" StrokeThickness="{ThemeResource PersonPictureEllipseStrokeThickness}" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" />
-            <!-- UNO WORKAROUND: ImageBrush is not stretching properly https://github.com/unoplatform/uno/issues/4951 -->
-            <wasm:Border Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" CornerRadius="{TemplateBinding Width}" FlowDirection="LeftToRight">
-              <Image x:Name="PersonPictureImage" Stretch="UniformToFill" HorizontalAlignment="Center" VerticalAlignment="Center" />
-            </wasm:Border>
             <TextBlock x:Name="InitialsTextBlock" AutomationProperties.AccessibilityView="Raw" FontSize="40" FontFamily="{TemplateBinding FontFamily}" Foreground="{TemplateBinding Foreground}" FontWeight="{TemplateBinding FontWeight}" TextLineBounds="Tight" VerticalAlignment="Center" HorizontalAlignment="Center" IsTextScaleFactorEnabled="False" Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ActualInitials}" />
             <Ellipse x:Name="PersonPictureEllipse" x:DeferLoadStrategy="Lazy" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" FlowDirection="LeftToRight" />
-            <!-- UNO WORKAROUND: Removed Margin="{ThemeResource PersonPictureBadgeGridMargin}". Clipping issue with negative margin: #-->
             <Grid x:Name="BadgeGrid" Visibility="Collapsed" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="{ThemeResource PersonPictureBadgeGridMargin}">
               <Ellipse x:Name="BadgingBackgroundEllipse" x:DeferLoadStrategy="Lazy" Opacity="{ThemeResource PersonPictureEllipseBadgeStrokeOpacity}" Fill="{ThemeResource PersonPictureEllipseBadgeFillThemeBrush}" Stroke="{ThemeResource PersonPictureEllipseBadgeStrokeThemeBrush}" StrokeThickness="{ThemeResource PersonPictureEllipseBadgeStrokeThickness}" />
               <Ellipse x:Name="BadgingEllipse" x:DeferLoadStrategy="Lazy" Opacity="0" FlowDirection="LeftToRight" />

From b6483fe7ac15e1c826ebf59265b2ee71310197d0 Mon Sep 17 00:00:00 2001
From: morning4coffe-dev <78549750+morning4coffe-dev@users.noreply.github.com>
Date: Tue, 31 Oct 2023 20:43:44 +0100
Subject: [PATCH 4/5] chore: Remove platform specific xmlns

---
 .../Resources/Version2/PriorityDefault/PersonPicture.xaml       | 2 +-
 src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/PersonPicture.xaml b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/PersonPicture.xaml
index 71d17e4c9510..31edcd198810 100644
--- a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/PersonPicture.xaml
+++ b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/PersonPicture.xaml
@@ -1,6 +1,6 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
 <!-- MUX Reference PersonPicture.xaml, tag winui3/release/1.4.2 -->
-<ResourceDictionary xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:controls="using:Microsoft.UI.Xaml.Controls" xmlns:wasm="http://uno.ui/wasm" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d wasm">
+<ResourceDictionary xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:controls="using:Microsoft.UI.Xaml.Controls" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
   <Style TargetType="controls:PersonPicture" BasedOn="{StaticResource DefaultPersonPictureStyle}" />
   <Style x:Key="DefaultPersonPictureStyle" TargetType="controls:PersonPicture">
     <Setter Property="Foreground" Value="{ThemeResource PersonPictureForegroundThemeBrush}" />
diff --git a/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml b/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
index 20300c339b0e..193539caedcf 100644
--- a/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
+++ b/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="ios android wasm skia" xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)" xmlns:controls="using:Microsoft.UI.Xaml.Controls" xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives" xmlns:media="using:Microsoft.UI.Xaml.Media" xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)" xmlns:contract6Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,6)" xmlns:not_win="http://uno.ui/not_win" xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:not_mux="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:contract5Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,5)" xmlns:contract5NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,5)" xmlns:contract6NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,6)" xmlns:local="using:Windows.UI.Xaml.Controls" xmlns:wasm="http://uno.ui/wasm" xmlns:contract8Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,8)" xmlns:contract14Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,14)" xmlns:uno="using:Uno.UI.Xaml.Controls" xmlns:automation="clr-namespace:Windows.UI.Xaml.Automation" xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals" xmlns:animatedVisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals" xmlns:contract4Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,4)" xmlns:contract9NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,9)" xmlns:contract12Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,12)" xmlns:contract14NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,14)" xmlns:contract12NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,12)" xmlns:contract8NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,8)" xmlns:netstdref="http://uno.ui/netstdref" xmlns:skia="http://uno.ui/skia" xmlns:primitiveContract7Present="using:Microsoft.UI.Xaml.Controls.Primitives?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)" xmlns:contract4NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,4)" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:unouwp="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Uno.WinUI,1)" xmlns:ios="http://uno.ui/ios" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+<ResourceDictionary xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="ios android wasm skia" xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)" xmlns:controls="using:Microsoft.UI.Xaml.Controls" xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives" xmlns:media="using:Microsoft.UI.Xaml.Media" xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)" xmlns:contract6Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,6)" xmlns:not_win="http://uno.ui/not_win" xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:not_mux="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:contract5Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,5)" xmlns:contract5NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,5)" xmlns:contract6NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,6)" xmlns:local="using:Windows.UI.Xaml.Controls" xmlns:wasm="http://uno.ui/wasm" xmlns:contract8Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,8)" xmlns:contract14Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,14)" xmlns:uno="using:Uno.UI.Xaml.Controls" xmlns:automation="clr-namespace:Windows.UI.Xaml.Automation" xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals" xmlns:animatedVisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals" xmlns:contract4Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,4)" xmlns:contract9NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,9)" xmlns:contract12Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,12)" xmlns:contract14NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,14)" xmlns:contract12NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,12)" xmlns:contract8NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,8)" xmlns:netstdref="http://uno.ui/netstdref" xmlns:skia="http://uno.ui/skia" xmlns:primitiveContract7Present="using:Microsoft.UI.Xaml.Controls.Primitives?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)" xmlns:contract4NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,4)" xmlns:unouwp="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Uno.WinUI,1)" xmlns:ios="http://uno.ui/ios" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
   <ResourceDictionary.ThemeDictionaries>
     <ResourceDictionary xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="ios android wasm skia" x:Key="Default">
       <SolidColorBrush x:Key="SystemControlTransparentBrush" Color="Transparent" />

From d8e19d8f52b922e3220f2a230c2c29dcec4136cf Mon Sep 17 00:00:00 2001
From: morning4coffe-dev <78549750+morning4coffe-dev@users.noreply.github.com>
Date: Sun, 5 Nov 2023 17:59:40 +0100
Subject: [PATCH 5/5] chore: Revert to use overwriteable properties

---
 .../Resources/Version2/PriorityDefault/PersonPicture.xaml    | 5 ++++-
 src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml             | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/PersonPicture.xaml b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/PersonPicture.xaml
index 31edcd198810..6c1e82fa6e2e 100644
--- a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/PersonPicture.xaml
+++ b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/PersonPicture.xaml
@@ -4,6 +4,9 @@
   <Style TargetType="controls:PersonPicture" BasedOn="{StaticResource DefaultPersonPictureStyle}" />
   <Style x:Key="DefaultPersonPictureStyle" TargetType="controls:PersonPicture">
     <Setter Property="Foreground" Value="{ThemeResource PersonPictureForegroundThemeBrush}" />
+    <Setter Property="Background" Value="{ThemeResource PersonPictureEllipseFillThemeBrush}"/>
+    <Setter Property="BorderBrush" Value="{ThemeResource PersonPictureEllipseFillStrokeBrush}"/>
+    <Setter Property="BorderThickness" Value="{ThemeResource PersonPictureEllipseStrokeThickness}"/>
     <Setter Property="Width" Value="96" />
     <Setter Property="Height" Value="96" />
     <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
@@ -60,7 +63,7 @@
                 </VisualState>
               </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
-            <Ellipse Fill="{ThemeResource PersonPictureEllipseFillThemeBrush}" Stroke="{ThemeResource PersonPictureEllipseFillStrokeBrush}" StrokeThickness="{ThemeResource PersonPictureEllipseStrokeThickness}" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" />
+            <Ellipse Fill="{TemplateBinding Background}" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="{TemplateBinding BorderThickness}" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" />
             <TextBlock x:Name="InitialsTextBlock" AutomationProperties.AccessibilityView="Raw" FontSize="40" FontFamily="{TemplateBinding FontFamily}" Foreground="{TemplateBinding Foreground}" FontWeight="{TemplateBinding FontWeight}" TextLineBounds="Tight" VerticalAlignment="Center" HorizontalAlignment="Center" IsTextScaleFactorEnabled="False" Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ActualInitials}" />
             <Ellipse x:Name="PersonPictureEllipse" x:DeferLoadStrategy="Lazy" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" FlowDirection="LeftToRight" />
             <Grid x:Name="BadgeGrid" Visibility="Collapsed" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="{ThemeResource PersonPictureBadgeGridMargin}">
diff --git a/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml b/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
index 193539caedcf..3ba12f5909c9 100644
--- a/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
+++ b/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
@@ -19919,6 +19919,9 @@
   <Style TargetType="controls:PersonPicture" BasedOn="{StaticResource DefaultPersonPictureStyle}" />
   <Style x:Key="DefaultPersonPictureStyle" TargetType="controls:PersonPicture">
     <Setter Property="Foreground" Value="{ThemeResource PersonPictureForegroundThemeBrush}" />
+    <Setter Property="Background" Value="{ThemeResource PersonPictureEllipseFillThemeBrush}" />
+    <Setter Property="BorderBrush" Value="{ThemeResource PersonPictureEllipseFillStrokeBrush}" />
+    <Setter Property="BorderThickness" Value="{ThemeResource PersonPictureEllipseStrokeThickness}" />
     <Setter Property="Width" Value="96" />
     <Setter Property="Height" Value="96" />
     <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
@@ -19975,7 +19978,7 @@
                 </VisualState>
               </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
-            <Ellipse Fill="{ThemeResource PersonPictureEllipseFillThemeBrush}" Stroke="{ThemeResource PersonPictureEllipseFillStrokeBrush}" StrokeThickness="{ThemeResource PersonPictureEllipseStrokeThickness}" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" />
+            <Ellipse Fill="{TemplateBinding Background}" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="{TemplateBinding BorderThickness}" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" />
             <TextBlock x:Name="InitialsTextBlock" AutomationProperties.AccessibilityView="Raw" FontSize="40" FontFamily="{TemplateBinding FontFamily}" Foreground="{TemplateBinding Foreground}" FontWeight="{TemplateBinding FontWeight}" TextLineBounds="Tight" VerticalAlignment="Center" HorizontalAlignment="Center" IsTextScaleFactorEnabled="False" Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ActualInitials}" />
             <Ellipse x:Name="PersonPictureEllipse" x:DeferLoadStrategy="Lazy" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" FlowDirection="LeftToRight" />
             <Grid x:Name="BadgeGrid" Visibility="Collapsed" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="{ThemeResource PersonPictureBadgeGridMargin}">