diff --git a/Wino.Mail.WinUI/ShellWindow.xaml b/Wino.Mail.WinUI/ShellWindow.xaml
index 49cf1839..a71cab7a 100644
--- a/Wino.Mail.WinUI/ShellWindow.xaml
+++ b/Wino.Mail.WinUI/ShellWindow.xaml
@@ -146,11 +146,25 @@
                                 </Grid>
                             </Flyout>
                         </Button.Flyout>
-                        <PersonPicture
-                            x:Name="WinoAccountButtonPicture"
-                            Width="30"
-                            Height="30"
-                            Initials="W" />
+                        <Grid>
+                            <PersonPicture
+                                x:Name="WinoAccountButtonPicture"
+                                Width="30"
+                                Height="30"
+                                Initials="W"
+                                Visibility="Collapsed" />
+                            <Border
+                                x:Name="WinoAccountSignedOutIcon"
+                                Width="30"
+                                Height="30"
+                                Background="{ThemeResource AccentFillColorDefaultBrush}"
+                                CornerRadius="15">
+                                <FontIcon
+                                    FontSize="16"
+                                    Foreground="White"
+                                    Glyph="&#xE77B;" />
+                            </Border>
+                        </Grid>
                     </Button>
                 </StackPanel>
             </TitleBar.RightHeader>
diff --git a/Wino.Mail.WinUI/ShellWindow.xaml.cs b/Wino.Mail.WinUI/ShellWindow.xaml.cs
index 24a4b588..5efed719 100644
--- a/Wino.Mail.WinUI/ShellWindow.xaml.cs
+++ b/Wino.Mail.WinUI/ShellWindow.xaml.cs
@@ -372,6 +372,9 @@ public sealed partial class ShellWindow : WindowEx, IWinoShellWindow,
         WinoAccountSignedOutView.Visibility = isSignedIn ? Visibility.Collapsed : Visibility.Visible;
         WinoAccountSignedInView.Visibility = isSignedIn ? Visibility.Visible : Visibility.Collapsed;
 
+        WinoAccountButtonPicture.Visibility = isSignedIn ? Visibility.Visible : Visibility.Collapsed;
+        WinoAccountSignedOutIcon.Visibility = isSignedIn ? Visibility.Collapsed : Visibility.Visible;
+
         var initials = GetInitials(account?.Email);
 
         WinoAccountButtonPicture.Initials = initials;