diff --git a/src/Wpf.Ui.Test/MainWindow.xaml b/src/Wpf.Ui.Test/MainWindow.xaml
index 5968422..1c52615 100644
--- a/src/Wpf.Ui.Test/MainWindow.xaml
+++ b/src/Wpf.Ui.Test/MainWindow.xaml
@@ -534,37 +534,19 @@
                             Text="PersonPicture" />
                         <StackPanel Margin="0,8,0,0" Orientation="Horizontal">
                             <TextBlock
+                                MinWidth="80"
                                 VerticalAlignment="Center"
                                 FontSize="14"
                                 Foreground="{DynamicResource TextFillColorTertiaryBrush}"
                                 Text="Normal" />
-                            <Border Width="45" Height="45">
-                                <vio:PersonPicture
-                                    Width="45"
-                                    Height="45"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Top"
-                                    BadgeGlyph="\uE765"
-                                    BadgeNumber="1"
-                                    DisplayName="James Bond"
-                                    Initials="JB" />
-                            </Border>
-                            <Border MaxWidth="45" MaxHeight="45">
-                                <vio:PersonPicture
-                                    Width="45"
-                                    Height="45"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Top"
-                                    ProfilePicture="pack://application:,,,/Wpf.Ui.Test;component/Resources/Images/ProfilePicture.ico" />
-                            </Border>
-                            <Border MaxWidth="45" MaxHeight="45">
-                                <vio:PersonPicture
-                                    Width="45"
-                                    Height="45"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Top"
-                                    ProfilePicture="https://docs.microsoft.com/windows/uwp/contacts-and-calendar/images/shoulder-tap-static-payload.png" />
-                            </Border>
+                            <vio:PersonPicture
+                                Margin="16,0,0,0"
+                                BadgeGlyph="\uE765"
+                                BadgeNumber="1"
+                                DisplayName="James Bond"
+                                Initials="JB" />
+                            <vio:PersonPicture Margin="16,0,0,0" ProfilePicture="pack://application:,,,/Wpf.Ui.Test;component/Resources/Images/ProfilePicture.ico" />
+                            <vio:PersonPicture Margin="16,0,0,0" ProfilePicture="https://docs.microsoft.com/zh-cn/windows/uwp/contacts-and-calendar/images/shoulder-tap-static-payload.png" />
                         </StackPanel>
                     </StackPanel>
                 </StackPanel>
diff --git a/src/Wpf.Ui.Violeta/Controls/PersonPicture/PersonPicture.cs b/src/Wpf.Ui.Violeta/Controls/PersonPicture/PersonPicture.cs
index 7f3157b..aa7028d 100644
--- a/src/Wpf.Ui.Violeta/Controls/PersonPicture/PersonPicture.cs
+++ b/src/Wpf.Ui.Violeta/Controls/PersonPicture/PersonPicture.cs
@@ -103,7 +103,7 @@ void UpdateIfReady()
         }
         else
         {
-            templateSettings.ActualImageBrush = null;
+            templateSettings.ActualImageBrush = null!;
         }
 
         // If the control is converted to 'Group-mode', we'll clear individual-specific information.
@@ -233,7 +233,7 @@ void UpdateBadgeImageSource()
     {
         if (m_badgeImageBrush == null)
         {
-            m_badgeImageBrush = GetTemplateChild("BadgeImageBrush") as ImageBrush;
+            m_badgeImageBrush = (ImageBrush)GetTemplateChild("BadgeImageBrush");
         }
 
         if (m_badgingEllipse == null || m_badgeImageBrush == null)
diff --git a/src/Wpf.Ui.Violeta/Controls/PersonPicture/PersonPicture.xaml b/src/Wpf.Ui.Violeta/Controls/PersonPicture/PersonPicture.xaml
index 2c75145..2c6ebb7 100644
--- a/src/Wpf.Ui.Violeta/Controls/PersonPicture/PersonPicture.xaml
+++ b/src/Wpf.Ui.Violeta/Controls/PersonPicture/PersonPicture.xaml
@@ -19,8 +19,8 @@
 
     <Style TargetType="local:PersonPicture">
         <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
-        <Setter Property="Width" Value="96" />
-        <Setter Property="Height" Value="96" />
+        <Setter Property="Width" Value="60" />
+        <Setter Property="Height" Value="NaN" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
         <Setter Property="FontWeight" Value="SemiBold" />
         <Setter Property="IsTabStop" Value="False" />