diff --git a/samples/ControlCatalog/App.xaml.cs b/samples/ControlCatalog/App.xaml.cs
index d4a4d0a209..2976e20120 100644
--- a/samples/ControlCatalog/App.xaml.cs
+++ b/samples/ControlCatalog/App.xaml.cs
@@ -37,7 +37,7 @@ namespace ControlCatalog
             _colorPickerFluent = (IStyle)Resources["ColorPickerFluent"]!;
             _colorPickerSimple = (IStyle)Resources["ColorPickerSimple"]!;
 
-            SetCatalogThemes(CatalogTheme.Fluent2);
+            SetCatalogThemes(CatalogTheme.Fluent2, skipWindowCreation: true);
         }
 
         public override void OnFrameworkInitializationCompleted()
@@ -108,12 +108,12 @@ namespace ControlCatalog
 
         private CatalogTheme _prevTheme;
         public static CatalogTheme CurrentTheme => ((App)Current!)._prevTheme;
-        public static void SetCatalogThemes(CatalogTheme theme)
+        public static void SetCatalogThemes(CatalogTheme theme, bool skipWindowCreation = false)
         {
             var app = (App)Current!;
             var prevTheme = app._prevTheme;
             app._prevTheme = theme;
-            var shouldReopenWindow = prevTheme != theme;
+            var shouldReopenWindow = prevTheme != theme && !skipWindowCreation;
 
             if (app._themeStylesContainer.Count == 0)
             {
diff --git a/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml b/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml
index c21a772c2a..d3c0caedda 100644
--- a/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml
+++ b/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml
@@ -15,6 +15,11 @@
                      ShowButtonSpinner="{Binding #showSpinCheck.IsChecked}">
         <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="Everest"/>
       </ButtonSpinner>
+      <ButtonSpinner Spin="OnSpin" Height="30" Classes="fluent2-compact"
+                     AllowSpin="{Binding #allowSpinCheck.IsChecked}"
+                     ShowButtonSpinner="{Binding #showSpinCheck.IsChecked}">
+        <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="Everest"/>
+      </ButtonSpinner>
       <ButtonSpinner Spin="OnSpin" Height="30" ButtonSpinnerLocation="Left"
                      AllowSpin="{Binding #allowSpinCheck.IsChecked}"
                      ShowButtonSpinner="{Binding #showSpinCheck.IsChecked}">
diff --git a/samples/ControlCatalog/Pages/CarouselPage.xaml b/samples/ControlCatalog/Pages/CarouselPage.xaml
index bdb40b9038..7674c6b277 100644
--- a/samples/ControlCatalog/Pages/CarouselPage.xaml
+++ b/samples/ControlCatalog/Pages/CarouselPage.xaml
@@ -9,7 +9,7 @@
           MaxWidth="760"
           HorizontalAlignment="Stretch" Margin="0 16 0 0">
       <Button Name="left" Grid.Column="0" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" Padding="10,20" Margin="4">
-        <Path Name="leftArrow" Data="M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z" Fill="Black"/>
+        <PathIcon Name="leftArrow" Data="M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z"/>
       </Button>
       <Carousel Name="carousel" Grid.Column="1" Grid.Row="1" Background="Transparent" Height="400" Focusable="True" ViewportFraction="1.0">
         <Carousel.PageTransition>
@@ -44,7 +44,7 @@
         </Border>
       </Carousel>
       <Button Name="right" Grid.Column="2" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" Padding="10,20" Margin="4">
-        <Path Name="rightArrow" Data="M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z" Fill="Black"/>
+        <PathIcon Name="rightArrow" Data="M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z"/>
       </Button>
     </Grid>
 
diff --git a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
index dcc84c3ae8..267b48315e 100644
--- a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
+++ b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
@@ -123,6 +123,15 @@
                      PlaceholderForeground="Orange"/>
     </StackPanel>
 
+    <StackPanel Margin="10">
+      <Label FontSize="14" FontWeight="Bold" Target="InnerContent"
+             Content="Clear Button"/>
+      <NumericUpDown
+                     TextAlignment="Right"
+                     Classes="clearButton"
+                     x:Name="ClearButton"/>
+    </StackPanel>
+
     <StackPanel Margin="10">
       <Label FontSize="14" FontWeight="Bold" Target="InnerContent"
              Content="Inner Contents"/>