diff --git a/WinUIGallery/Samples/ControlPages/AppWindowPage.xaml b/WinUIGallery/Samples/ControlPages/AppWindowPage.xaml
index 8f8f5662c..57403d3ca 100644
--- a/WinUIGallery/Samples/ControlPages/AppWindowPage.xaml
+++ b/WinUIGallery/Samples/ControlPages/AppWindowPage.xaml
@@ -138,7 +138,8 @@ public sealed partial class SampleWindow1 : Window
                     
     private void Show_Click(object sender, RoutedEventArgs e)
     {
-        appWindow.Show();
+        appWindow.Hide();
+        Task.Delay(3000).ContinueWith(t => appWindow.Show());
     }
 
     private void Hide_Click(object sender, RoutedEventArgs e)
@@ -288,6 +289,7 @@ public sealed partial class SampleWindow3 : Window
         this.InitializeComponent();
 
         appWindow = GetAppWindowForCurrentWindow();
+        appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");
 
         presenter = OverlappedPresenter.Create();
         presenter.IsAlwaysOnTop = $(IsAlwaysOnTop);
@@ -386,6 +388,8 @@ public sealed partial class SampleWindow4 : Window
         this.InitializeComponent();
 
         appWindow = GetAppWindowForCurrentWindow();
+        appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");
+
         appWindow.Resize(new Windows.Graphics.SizeInt32(800, 500));
         presenter = OverlappedPresenter.Create();
         presenter.IsMaximizable = false;
@@ -416,7 +420,8 @@ public sealed partial class SampleWindow4 : Window
 
     private void RestoreBtn_Click(object sender, RoutedEventArgs e)
     {
-        presenter.Restore();
+        presenter.Minimize();
+        Task.Delay(3000).ContinueWith(t => presenter.Restore());
     }
 
     private void CloseBtn_Click(object sender, RoutedEventArgs e)
@@ -504,6 +509,7 @@ public sealed partial class SampleWindow7 : Window
         this.InitializeComponent();
 
         appWindow = GetAppWindowForCurrentWindow();
+        appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");
 
         // Creates a CompactOverlay (Picture-in-Picture) presenter
         presenter = CompactOverlayPresenter.Create();
diff --git a/WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample1_xaml.txt b/WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample1_xaml.txt
index a1815fd8a..7dfd3a1ae 100644
--- a/WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample1_xaml.txt
+++ b/WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample1_xaml.txt
@@ -3,15 +3,42 @@
         <MicaBackdrop />
     </Window.SystemBackdrop>
 
-    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="8">
-        <Button x:Name="Show" Content="Show" Click="Show_Click" Width="150" />
-        <Button x:Name="Hide" Content="Hide" Click="Hide_Click" Width="150" />
-        
-        <Button x:Name="Close" Click="Close_Click" Width="150" Margin="0,16,0,0">
+    <StackPanel HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Spacing="8">
+        <Button x:Name="Hide"
+                Content="Hide"
+                Click="Hide_Click"
+                Width="200">
+            <ToolTipService.ToolTip>
+                <TextBlock Text="Hides the window from all UX representations in the system but keeps the object alive."
+                           TextWrapping="Wrap" />
+            </ToolTipService.ToolTip>
+        </Button>
+        <Button x:Name="Show"
+                Click="Show_Click"
+                Width="200" >
+            <ToolTipService.ToolTip>
+                <TextBlock Text="Hides and then shows the window and activates it after 3 seconds."
+                           TextWrapping="Wrap" />
+            </ToolTipService.ToolTip>
+            <TextBlock Text="Hide and show the window after 3 seconds" TextWrapping="WrapWholeWords" TextAlignment="Center"/>
+        </Button>
+        <Button x:Name="Close"
+                Click="Close_Click"
+                Width="200"
+                Margin="0,16,0,0">
             <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                <SymbolIcon Symbol="Cancel" Margin="0,0,4,0" Foreground="{ThemeResource SystemFillColorCriticalBrush}" />
-                <TextBlock Text="Close" Foreground="{ThemeResource SystemFillColorCriticalBrush}" />
+                <SymbolIcon Symbol="Cancel"
+                            Foreground="{ThemeResource SystemFillColorCriticalBrush}"
+                            Margin="0,0,4,0" />
+                <TextBlock Text="Close"
+                           Foreground="{ThemeResource SystemFillColorCriticalBrush}" />
             </StackPanel>
+            <ToolTipService.ToolTip>
+                <TextBlock Text="Closes the window and releases all resources."
+                           TextWrapping="Wrap" />
+            </ToolTipService.ToolTip>
         </Button>
     </StackPanel>
 </Window>
\ No newline at end of file
diff --git a/WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample2_cs.txt b/WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample2_cs.txt
index ca03b11b1..7a7147aaf 100644
--- a/WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample2_cs.txt
+++ b/WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample2_cs.txt
@@ -15,6 +15,7 @@ public sealed partial class SampleWindow2 : Window
     {
         this.InitializeComponent();
         appWindow = GetAppWindowForCurrentWindow();
+        appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");
 
         // Center the window on the screen.
         CenterWindow(appWindow);
diff --git a/WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample3_xaml.txt b/WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample3_xaml.txt
index 5ef243703..7369b125e 100644
--- a/WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample3_xaml.txt
+++ b/WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample3_xaml.txt
@@ -3,15 +3,33 @@
         <MicaBackdrop />
     </Window.SystemBackdrop>
 
-    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="8">
-        <Button x:Name="MaximizeBtn" Content="Maximize" Click="MaximizeBtn_Click" Width="150" />
-        <Button x:Name="RestoreBtn" Content="Restore" Click="RestoreBtn_Click" Width="150" />
-        <Button x:Name="MinimizeBtn" Content="Minimize" Click="MinimizeBtn_Click" Width="150" />
-
-        <Button x:Name="CloseBtn" Click="CloseBtn_Click" Width="150" Margin="0,16,0,0">
-            <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                <SymbolIcon Symbol="Cancel" Margin="0,0,4,0" Foreground="{ThemeResource SystemFillColorCriticalBrush}" />
-                <TextBlock Text="Close" Foreground="{ThemeResource SystemFillColorCriticalBrush}" />
+    <StackPanel HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Spacing="10">
+        <Button x:Name="MaximizeBtn"
+                Content="Maximize"
+                Click="MaximizeBtn_Click"
+                Width="200" />
+        <Button x:Name="MinimizeBtn"
+                Content="Minimize"
+                Click="MinimizeBtn_Click"
+                Width="200" />
+        <Button x:Name="RestoreBtn"
+                Click="RestoreBtn_Click"
+                Width="200" >
+            <TextBlock Text="Minimize and restore the window after 3 seconds" TextWrapping="WrapWholeWords" TextAlignment="Center"/>
+        </Button>
+        <Button x:Name="CloseBtn"
+                Click="CloseBtn_Click"
+                Width="200"
+                Margin="0,16,0,0">
+            <StackPanel Orientation="Horizontal"
+                        VerticalAlignment="Center">
+                <SymbolIcon Symbol="Cancel"
+                            Margin="0,0,4,0"
+                            Foreground="{ThemeResource SystemFillColorCriticalBrush}" />
+                <TextBlock Text="Close"
+                           Foreground="{ThemeResource SystemFillColorCriticalBrush}" />
             </StackPanel>
         </Button>
     </StackPanel>
diff --git a/WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample6_cs.txt b/WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample6_cs.txt
index 692a4069b..6b3335432 100644
--- a/WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample6_cs.txt
+++ b/WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample6_cs.txt
@@ -14,6 +14,7 @@ public sealed partial class SampleWindow6 : Window
     {
         this.InitializeComponent();
         appWindow = GetAppWindowForCurrentWindow();
+        appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");
 
         // Set the window to Full-Screen mode
         appWindow.SetPresenter(AppWindowPresenterKind.FullScreen);
diff --git a/WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample6_xaml.txt b/WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample6_xaml.txt
index 95847230f..31b7cd666 100644
--- a/WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample6_xaml.txt
+++ b/WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample6_xaml.txt
@@ -3,12 +3,23 @@
         <MicaBackdrop />
     </Window.SystemBackdrop>
 
-    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="8">
-        <TextBlock Text="This window is running in Fullscreen mode" Style="{ThemeResource TitleTextBlockStyle}" TextAlignment="Center" />
-        <Button x:Name="Close" Click="Close_Click" Width="150" HorizontalAlignment="Center">
-            <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                <SymbolIcon Symbol="Cancel" Foreground="{ThemeResource SystemFillColorCriticalBrush}" Margin="0,0,4,0" />
-                <TextBlock Text="Close" Foreground="{ThemeResource SystemFillColorCriticalBrush}" />
+    <StackPanel HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Spacing="8">
+        <TextBlock Text="This window is running in Fullscreen mode"
+                       Style="{ThemeResource TitleTextBlockStyle}"
+                       TextAlignment="Center" />
+        <Button x:Name="Close"
+                Click="Close_Click"
+                Width="200"
+                HorizontalAlignment="Center">
+            <StackPanel Orientation="Horizontal"
+                        VerticalAlignment="Center">
+                <SymbolIcon Symbol="Cancel"
+                            Foreground="{ThemeResource SystemFillColorCriticalBrush}"
+                            Margin="0,0,4,0" />
+                <TextBlock Text="Close"
+                           Foreground="{ThemeResource SystemFillColorCriticalBrush}" />
             </StackPanel>
         </Button>
     </StackPanel>
diff --git a/WinUIGallery/Samples/SamplePages/ModalWindow.xaml.cs b/WinUIGallery/Samples/SamplePages/ModalWindow.xaml.cs
index cc594c813..51d5c9fea 100644
--- a/WinUIGallery/Samples/SamplePages/ModalWindow.xaml.cs
+++ b/WinUIGallery/Samples/SamplePages/ModalWindow.xaml.cs
@@ -15,7 +15,8 @@ public ModalWindow()
     {
         this.InitializeComponent();
         appWindow = GetAppWindowForCurrentWindow();
-        appWindow.Resize(new Windows.Graphics.SizeInt32(400,300));
+        appWindow.Resize(new Windows.Graphics.SizeInt32(400,300));
+        appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");
 
         OverlappedPresenter presenter = OverlappedPresenter.CreateForDialog();
 
diff --git a/WinUIGallery/Samples/SamplePages/SampleWindow1.xaml b/WinUIGallery/Samples/SamplePages/SampleWindow1.xaml
index c3257a81d..077f89843 100644
--- a/WinUIGallery/Samples/SamplePages/SampleWindow1.xaml
+++ b/WinUIGallery/Samples/SamplePages/SampleWindow1.xaml
@@ -13,28 +13,27 @@
     <StackPanel HorizontalAlignment="Center"
                 VerticalAlignment="Center"
                 Spacing="8">
-        <Button x:Name="Show"
-                Content="Show"
-                Click="Show_Click"
-                Width="150">
-            <ToolTipService.ToolTip>
-                <TextBlock Text="Shows the window and activates it."
-                           TextWrapping="Wrap" />
-            </ToolTipService.ToolTip>
-        </Button>
         <Button x:Name="Hide"
                 Content="Hide"
                 Click="Hide_Click"
-                Width="150">
+                Width="200">
             <ToolTipService.ToolTip>
                 <TextBlock Text="Hides the window from all UX representations in the system but keeps the object alive."
                            TextWrapping="Wrap" />
             </ToolTipService.ToolTip>
         </Button>
-      
+        <Button x:Name="Show"
+                Click="Show_Click"
+                Width="200" >
+            <ToolTipService.ToolTip>
+                <TextBlock Text="Hides and then shows the window and activates it after 3 seconds."
+                           TextWrapping="Wrap" />
+            </ToolTipService.ToolTip>
+            <TextBlock Text="Hide and show the window after 3 seconds" TextWrapping="WrapWholeWords" TextAlignment="Center"/>
+        </Button>
         <Button x:Name="Close"
                 Click="Close_Click"
-                Width="150"
+                Width="200"
                 Margin="0,16,0,0">
             <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                 <SymbolIcon Symbol="Cancel"
diff --git a/WinUIGallery/Samples/SamplePages/SampleWindow1.xaml.cs b/WinUIGallery/Samples/SamplePages/SampleWindow1.xaml.cs
index 494dfc81e..1ea1f9312 100644
--- a/WinUIGallery/Samples/SamplePages/SampleWindow1.xaml.cs
+++ b/WinUIGallery/Samples/SamplePages/SampleWindow1.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using Microsoft.UI;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
@@ -49,13 +50,14 @@ private AppWindow GetAppWindowForCurrentWindow()
     }
 
     private void Show_Click(object sender, RoutedEventArgs e)
-    {
-        appWindow.Show();
+    {
+        appWindow.Hide();
+        Task.Delay(3000).ContinueWith(t => appWindow.Show());
     }
 
     private void Hide_Click(object sender, RoutedEventArgs e)
     {
-        appWindow.Hide();
+        appWindow.Hide();
     }
 
     private void Close_Click(object sender, RoutedEventArgs e)
diff --git a/WinUIGallery/Samples/SamplePages/SampleWindow2.xaml.cs b/WinUIGallery/Samples/SamplePages/SampleWindow2.xaml.cs
index 1aa196aa9..a2b8576b8 100644
--- a/WinUIGallery/Samples/SamplePages/SampleWindow2.xaml.cs
+++ b/WinUIGallery/Samples/SamplePages/SampleWindow2.xaml.cs
@@ -15,6 +15,7 @@ public SampleWindow2()
     {
         this.InitializeComponent();
         appWindow = GetAppWindowForCurrentWindow();
+        appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");
 
         // Center the window on the screen.
         CenterWindow(appWindow);
diff --git a/WinUIGallery/Samples/SamplePages/SampleWindow3.xaml b/WinUIGallery/Samples/SamplePages/SampleWindow3.xaml
index b48816e82..a181b4256 100644
--- a/WinUIGallery/Samples/SamplePages/SampleWindow3.xaml
+++ b/WinUIGallery/Samples/SamplePages/SampleWindow3.xaml
@@ -18,19 +18,19 @@
         <Button x:Name="MaximizeBtn"
                 Content="Maximize"
                 Click="MaximizeBtn_Click"
-                Width="150" />
-        <Button x:Name="RestoreBtn"
-                Content="Restore"
-                Click="RestoreBtn_Click"
-                Width="150" />
+                Width="200" />
         <Button x:Name="MinimizeBtn"
                 Content="Minimize"
                 Click="MinimizeBtn_Click"
-                Width="150" />
-
+                Width="200" />
+        <Button x:Name="RestoreBtn"
+                Click="RestoreBtn_Click"
+                Width="200" >
+            <TextBlock Text="Minimize and restore the window after 3 seconds" TextWrapping="WrapWholeWords" TextAlignment="Center"/>
+        </Button>
         <Button x:Name="CloseBtn"
                 Click="CloseBtn_Click"
-                Width="150"
+                Width="200"
                 Margin="0,16,0,0">
             <StackPanel Orientation="Horizontal"
                         VerticalAlignment="Center">
diff --git a/WinUIGallery/Samples/SamplePages/SampleWindow3.xaml.cs b/WinUIGallery/Samples/SamplePages/SampleWindow3.xaml.cs
index 78f7e27f5..a9f131658 100644
--- a/WinUIGallery/Samples/SamplePages/SampleWindow3.xaml.cs
+++ b/WinUIGallery/Samples/SamplePages/SampleWindow3.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using Microsoft.UI;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
@@ -21,7 +22,8 @@ public SampleWindow3(bool IsAlwaysOnTop, bool IsMaximizable, bool IsMinimizable,
         presenter.IsMinimizable = IsMinimizable;
         presenter.IsResizable = IsResizable;
         presenter.SetBorderAndTitleBar(HasBorder,HasTitleBar);
-        appWindow.SetPresenter(presenter);
+        appWindow.SetPresenter(presenter);
+        appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");
     }
 
     private AppWindow GetAppWindowForCurrentWindow()
@@ -38,12 +40,13 @@ private void MaximizeBtn_Click(object sender, RoutedEventArgs e)
 
     private void MinimizeBtn_Click(object sender, RoutedEventArgs e)
     {
-        presenter.Minimize();
+        presenter.Minimize();
     }
 
     private void RestoreBtn_Click(object sender, RoutedEventArgs e)
-    {
-        presenter.Restore();
+    {
+        presenter.Minimize();
+        Task.Delay(3000).ContinueWith(t => presenter.Restore());
     }
 
     private void CloseBtn_Click(object sender, RoutedEventArgs e)
diff --git a/WinUIGallery/Samples/SamplePages/SampleWindow4.xaml b/WinUIGallery/Samples/SamplePages/SampleWindow4.xaml
index 0c935f5e8..1f453c91b 100644
--- a/WinUIGallery/Samples/SamplePages/SampleWindow4.xaml
+++ b/WinUIGallery/Samples/SamplePages/SampleWindow4.xaml
@@ -16,20 +16,21 @@
         HorizontalAlignment="Center"
         VerticalAlignment="Center"
         Spacing="10">
-        <Button
-            x:Name="RestoreBtn"
-            Width="150"
-            Click="RestoreBtn_Click"
-            Content="Restore" />
         <Button
             x:Name="MinimizeBtn"
-            Width="150"
+            Width="200"
             Click="MinimizeBtn_Click"
             Content="Minimize" />
 
+        <Button x:Name="RestoreBtn"
+                Click="RestoreBtn_Click"
+                Width="200" >
+            <TextBlock Text="Minimize and restore the window after 3 seconds" TextWrapping="WrapWholeWords" TextAlignment="Center"/>
+        </Button>
+
         <Button
             x:Name="CloseBtn"
-            Width="150"
+            Width="200"
             Margin="0,16,0,0"
             Click="CloseBtn_Click">
             <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
diff --git a/WinUIGallery/Samples/SamplePages/SampleWindow4.xaml.cs b/WinUIGallery/Samples/SamplePages/SampleWindow4.xaml.cs
index ef9baaa83..9b558e9e8 100644
--- a/WinUIGallery/Samples/SamplePages/SampleWindow4.xaml.cs
+++ b/WinUIGallery/Samples/SamplePages/SampleWindow4.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using Microsoft.UI;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
@@ -24,6 +25,7 @@ public SampleWindow4(int MinWidth, int MinHeight, int MaxWidth, int MaxHeight)
         presenter.PreferredMaximumHeight = MaxHeight;
         presenter.IsMaximizable = false;
         appWindow.SetPresenter(presenter);
+        appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");
     }
 
     private AppWindow GetAppWindowForCurrentWindow()
@@ -40,7 +42,8 @@ private void MinimizeBtn_Click(object sender, RoutedEventArgs e)
 
     private void RestoreBtn_Click(object sender, RoutedEventArgs e)
     {
-        presenter.Restore();
+        presenter.Minimize();
+        Task.Delay(3000).ContinueWith(t => presenter.Restore());
     }
 
     private void CloseBtn_Click(object sender, RoutedEventArgs e)
diff --git a/WinUIGallery/Samples/SamplePages/SampleWindow6.xaml b/WinUIGallery/Samples/SamplePages/SampleWindow6.xaml
index f6389b401..d9020a3b4 100644
--- a/WinUIGallery/Samples/SamplePages/SampleWindow6.xaml
+++ b/WinUIGallery/Samples/SamplePages/SampleWindow6.xaml
@@ -19,7 +19,7 @@
                        TextAlignment="Center" />
         <Button x:Name="Close"
                 Click="Close_Click"
-                Width="150"
+                Width="200"
                 HorizontalAlignment="Center">
             <StackPanel Orientation="Horizontal"
                         VerticalAlignment="Center">
diff --git a/WinUIGallery/Samples/SamplePages/SampleWindow6.xaml.cs b/WinUIGallery/Samples/SamplePages/SampleWindow6.xaml.cs
index 6530d0ba5..5a71e712a 100644
--- a/WinUIGallery/Samples/SamplePages/SampleWindow6.xaml.cs
+++ b/WinUIGallery/Samples/SamplePages/SampleWindow6.xaml.cs
@@ -14,6 +14,7 @@ public SampleWindow6()
     {
         this.InitializeComponent();
         appWindow = GetAppWindowForCurrentWindow();
+        appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");
 
         // Set the window to Full-Screen mode
         appWindow.SetPresenter(AppWindowPresenterKind.FullScreen);
diff --git a/WinUIGallery/Samples/SamplePages/SampleWindow7.xaml.cs b/WinUIGallery/Samples/SamplePages/SampleWindow7.xaml.cs
index 891ee02ea..8b7fc4e22 100644
--- a/WinUIGallery/Samples/SamplePages/SampleWindow7.xaml.cs
+++ b/WinUIGallery/Samples/SamplePages/SampleWindow7.xaml.cs
@@ -16,6 +16,7 @@ public SampleWindow7(string InitialSize)
         this.InitializeComponent();
 
         appWindow = GetAppWindowForCurrentWindow();
+        appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");
 
         presenter = CompactOverlayPresenter.Create();
         presenter.InitialSize = InitialSize switch