diff --git a/demo/Ursa.Demo/Pages/AvatarDemo.axaml b/demo/Ursa.Demo/Pages/AvatarDemo.axaml
index 9f5ba46..1a07543 100644
--- a/demo/Ursa.Demo/Pages/AvatarDemo.axaml
+++ b/demo/Ursa.Demo/Pages/AvatarDemo.axaml
@@ -25,10 +25,14 @@
                 <u:Avatar.HoverMask>
                     <Border Opacity="0.6">
                         <Panel>
-                            <Ellipse Fill="#16161A"
-                                     Width="{Binding $parent[u:Avatar].Width}"
-                                     Height="{Binding $parent[u:Avatar].Height}" />
-                            <PathIcon Width="16" Height="16" Data="{StaticResource IconCamera}" />
+                            <Border
+                                Background="#16161A"
+                                Width="{Binding $parent[u:Avatar].Width}"
+                                Height="{Binding $parent[u:Avatar].Height}" />
+                            <PathIcon
+                                Data="{StaticResource IconCamera}"
+                                Width="{Binding $parent[u:Avatar].FontSize}"
+                                Height="{Binding $parent[u:Avatar].FontSize}" />
                         </Panel>
                     </Border>
                 </u:Avatar.HoverMask>
@@ -71,7 +75,22 @@
             <u:Avatar Classes="Square Default Green" />
             <u:Avatar Classes="Square Medium Green" />
             <u:Avatar Classes="Square Large Green" />
-            <u:Avatar Classes="Square ExtraLarge Green" />
+            <u:Avatar Classes="Square ExtraLarge Green" Source="../Assets/Ursa.ico">
+                <u:Avatar.HoverMask>
+                    <Border Opacity="0.6">
+                        <Panel>
+                            <Border
+                                Background="#16161A"
+                                Width="{Binding $parent[u:Avatar].Width}"
+                                Height="{Binding $parent[u:Avatar].Height}" />
+                            <PathIcon
+                                Data="{StaticResource IconCamera}"
+                                Width="{Binding $parent[u:Avatar].FontSize}"
+                                Height="{Binding $parent[u:Avatar].FontSize}" />
+                        </Panel>
+                    </Border>
+                </u:Avatar.HoverMask>
+            </u:Avatar>
         </StackPanel>
     </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/Avatar.axaml b/src/Ursa.Themes.Semi/Controls/Avatar.axaml
index f36d22e..4fe9705 100644
--- a/src/Ursa.Themes.Semi/Controls/Avatar.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Avatar.axaml
@@ -32,6 +32,7 @@
                             Content="{TemplateBinding Content}"
                             HorizontalContentAlignment="Center"
                             VerticalContentAlignment="Center" />
+                        <Image Source="{TemplateBinding Source}" />
                         <ContentPresenter
                             Name="PART_HoverMask"
                             IsVisible="False"
@@ -39,7 +40,6 @@
                             CornerRadius="{TemplateBinding CornerRadius}"
                             HorizontalContentAlignment="Center"
                             VerticalContentAlignment="Center" />
-                        <Image Source="{TemplateBinding Source}" />
                     </Panel>
                 </Border>
             </ControlTemplate>