diff --git a/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestsControl.xaml b/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestsControl.xaml
index 87f3bfc07722..104ee1bab52f 100644
--- a/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestsControl.xaml
+++ b/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestsControl.xaml
@@ -23,7 +23,7 @@
 			<ColumnDefinition Width="Auto" />
 			<ColumnDefinition Width="*" />
 		</Grid.ColumnDefinitions>
-		<StackPanel Grid.Row="0">
+		<StackPanel Grid.Row="0" Spacing="4">
 			<Grid>
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition Width="Auto" />
@@ -34,16 +34,24 @@
 				<Button
 					x:Name="runButton"
 					Grid.Column="0"
-					Content="▶ Run"
 					Click="OnRunTests"
-					Margin="0,0,4,0"/>
+					Margin="0,0,4,0">
+					<StackPanel Orientation="Horizontal" Spacing="8">
+						<SymbolIcon Symbol="Play" />
+						<TextBlock Text="Run" />
+					</StackPanel>
+				</Button>
 				<Button
 					x:Name="stopButton"
 					Grid.Column="1"
 					IsEnabled="False"
-					Content="⏹️ Stop"
 					Click="OnStopTests"
-					Margin="0,0,4,0" />
+					Margin="0,0,4,0">
+					<StackPanel Orientation="Horizontal" Spacing="8">
+						<SymbolIcon Symbol="Stop" />
+						<TextBlock Text="Stop" />
+					</StackPanel>
+				</Button>
 				<TextBox
 					x:Name="testFilter"
 					Grid.Column="2"
@@ -56,68 +64,68 @@
 					<Button.Flyout>
 						<Flyout>
 							<StackPanel>
-								<ToggleButton
-									x:Name="consoleOutput"
-									Content="🖥️ Console Output"
-									/>
-								<ToggleButton
-									x:Name="runIgnored"
-									Content="🚫 Run [Ignore]"
-									/>
-								<ToggleButton
-									x:Name="retry"
-									IsChecked="True"
-									Content="➰ Auto retry"
-									/>
+								<ToggleButton x:Name="consoleOutput">
+									<StackPanel Orientation="Horizontal" Spacing="8">
+										<FontIcon Glyph="&#xED0D;" />
+										<TextBlock Text="Console Output" />
+									</StackPanel>
+								</ToggleButton>
+								<ToggleButton x:Name="runIgnored">
+									<StackPanel Orientation="Horizontal" Spacing="8">
+										<FontIcon Glyph="&#xEE35;" />
+										<TextBlock Text="Run ignored tests" />
+									</StackPanel>
+								</ToggleButton>
+								<ToggleButton x:Name="retry" IsChecked="True">
+									<StackPanel Orientation="Horizontal" Spacing="8">
+										<FontIcon Glyph="&#xEC57;" />
+										<TextBlock Text="Auto retry" />
+									</StackPanel>
+								</ToggleButton>
 							</StackPanel>
 						</Flyout>
 					</Button.Flyout>
 				</Button>
 			</Grid>
 
-			<StackPanel Orientation="Horizontal">
+			<StackPanel Orientation="Horizontal" Margin="0,8">
 				<TextBlock Text="Status: " />
 				<TextBlock x:Name="runStatus" Text="Not initialized" />
 			</StackPanel>
 
-			<StackPanel Orientation="Horizontal">
-				<TextBlock
-					FontSize="15"
-					Text="🏃‍: "
-					/>
-				<TextBlock
-					FontSize="15"
-					x:Name="runTestCount"
-					Text="None" />
+			<StackPanel Orientation="Horizontal" Spacing="8" Margin="0,0,0,8">
+				<StackPanel.Resources>
+					<Style TargetType="TextBlock">
+						<Setter Property="VerticalAlignment" Value="Center" />
+						<Setter Property="Width" Value="40" />
+					</Style>
+					<Style TargetType="FontIcon">
+						<Setter Property="VerticalAlignment" Value="Center" />
+					</Style>
+				</StackPanel.Resources>
 
+				<FontIcon Glyph="&#xE768;" />
 				<TextBlock
-					FontSize="15"
-					Text=" 🚫: "
-					/>
-				<TextBlock
-					FontSize="15"
-					x:Name="ignoredTestCount"
-					Foreground="DarkGray"
+					x:Name="runTestCount"
 					Text="None" />
 
+				<FontIcon Glyph="&#xE73E;" Foreground="DarkGreen" />
 				<TextBlock
-					FontSize="15"
-					Text=" ✔️: "
-					/>
-				<TextBlock
-					FontSize="15"
 					x:Name="succeededTestCount"
 					Foreground="DarkGreen"
 					Text="None" />
 
+				<FontIcon Glyph="&#xE711;" Foreground="Red" />
 				<TextBlock
-					FontSize="15"
-					Text=" ❌: " />
-				<TextBlock
-					FontSize="15"
 					x:Name="failedTestCount"
 					Foreground="Red"
 					Text="None" />
+
+				<FontIcon Glyph="&#xEE35;" Foreground="DarkGray" />
+				<TextBlock
+					x:Name="ignoredTestCount"
+					Foreground="DarkGray"
+					Text="None" />
 			</StackPanel>
 		</StackPanel>
 
diff --git a/src/SamplesApp/UITests.Shared/Microsoft_UI/ColorHelperTests.xaml.cs b/src/SamplesApp/UITests.Shared/Microsoft_UI/ColorHelperTests.xaml.cs
index 0155e2831db5..03d6d24773cb 100644
--- a/src/SamplesApp/UITests.Shared/Microsoft_UI/ColorHelperTests.xaml.cs
+++ b/src/SamplesApp/UITests.Shared/Microsoft_UI/ColorHelperTests.xaml.cs
@@ -9,7 +9,7 @@
 
 namespace UITests.Shared.Microsoft_UI;
 
-[Sample("Microsoft.UI", "ColorHelper", Description = "Demonstrates use of Microsoft.UI.ColorHelper. Until WinUI3 1.6+ this currently only works on Uno targets", ViewModelType = typeof(ColorHelperTestsViewModel), IgnoreInSnapshotTests = true)]
+[Sample("Microsoft.UI", Description = "Demonstrates use of Microsoft.UI.ColorHelper. Until WinUI3 1.6+ this currently only works on Uno targets", ViewModelType = typeof(ColorHelperTestsViewModel), IgnoreInSnapshotTests = true)]
 public sealed partial class ColorHelperTests : UserControl
 {
 	public ColorHelperTests()
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/CheckBoxTests/CheckBox_Automated.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/CheckBoxTests/CheckBox_Automated.xaml.cs
index 50a99bfa6f21..f685e04294ba 100644
--- a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/CheckBoxTests/CheckBox_Automated.xaml.cs
+++ b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/CheckBoxTests/CheckBox_Automated.xaml.cs
@@ -19,7 +19,7 @@
 
 namespace UITests.Shared.Windows_UI_Xaml_Controls.CheckBoxTests
 {
-	[SampleControlInfo("CheckBox")]
+	[SampleControlInfo("Buttons")]
 	public sealed partial class CheckBox_Automated : UserControl
 	{
 		public CheckBox_Automated()
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/CheckBoxTests/CheckBox_States.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/CheckBoxTests/CheckBox_States.xaml.cs
index 0062a4824139..cda0da1d5da8 100644
--- a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/CheckBoxTests/CheckBox_States.xaml.cs
+++ b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/CheckBoxTests/CheckBox_States.xaml.cs
@@ -16,7 +16,7 @@
 
 namespace UITests.Windows_UI_Xaml_Controls.CheckBoxTests
 {
-	[Sample("CheckBox")]
+	[Sample("Buttons")]
 	public sealed partial class CheckBox_States : Page
 	{
 		public CheckBox_States()
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/TextBlockControl/Simple_Contrained_Horizontal_Center_Wrap.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/TextBlockControl/Simple_Contrained_Horizontal_Center_Wrap.xaml.cs
index 1bd7cc5da875..3f393d804864 100644
--- a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/TextBlockControl/Simple_Contrained_Horizontal_Center_Wrap.xaml.cs
+++ b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/TextBlockControl/Simple_Contrained_Horizontal_Center_Wrap.xaml.cs
@@ -3,7 +3,7 @@
 
 namespace Uno.UI.Samples.Content.UITests.TextBlockControl
 {
-	[Sample]
+	[Sample("TextBlock")]
 	public sealed partial class Simple_Contrained_Horizontal_Center_Wrap : Page
 	{
 		public Simple_Contrained_Horizontal_Center_Wrap()
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/TextBlockControl/Simple_Text_Arabic.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/TextBlockControl/Simple_Text_Arabic.xaml.cs
index 84123a85b0b9..82a810453641 100644
--- a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/TextBlockControl/Simple_Text_Arabic.xaml.cs
+++ b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/TextBlockControl/Simple_Text_Arabic.xaml.cs
@@ -3,7 +3,7 @@
 
 namespace Uno.UI.Samples.Content.UITests.TextBlockControl
 {
-	[SampleControlInfo("TextBlockControl", "Simple_Text_Arabic")]
+	[SampleControlInfo("TextBlock", "Simple_Text_Arabic")]
 	public sealed partial class Simple_Text_Arabic : UserControl
 	{
 		public Simple_Text_Arabic()
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Media/CompositionTargetTests/CompositionTarget_Rendering.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Media/CompositionTargetTests/CompositionTarget_Rendering.xaml.cs
index 05cdb6c82f12..726ccad5b5f7 100644
--- a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Media/CompositionTargetTests/CompositionTarget_Rendering.xaml.cs
+++ b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Media/CompositionTargetTests/CompositionTarget_Rendering.xaml.cs
@@ -18,7 +18,7 @@
 
 namespace UITests.Shared.Windows_UI_Xaml_Media.CompositionTargetTests
 {
-	[SampleControlInfo("Composition", "CompositionTarget_Rendering", description: "Demonstrates the CompositionTarget.Rendering event")]
+	[SampleControlInfo("Microsoft.UI.Xaml.Media", "CompositionTarget_Rendering", description: "Demonstrates the CompositionTarget.Rendering event")]
 	public sealed partial class CompositionTarget_Rendering : UserControl
 	{
 		public CompositionTarget_Rendering()