diff --git a/src/Uno.UI.RemoteControl/HotReload/HotReloadStatusView.xaml b/src/Uno.UI.RemoteControl/HotReload/HotReloadStatusView.xaml
index 1d1ea6e0d266..47473763a2f0 100644
--- a/src/Uno.UI.RemoteControl/HotReload/HotReloadStatusView.xaml
+++ b/src/Uno.UI.RemoteControl/HotReload/HotReloadStatusView.xaml
@@ -6,14 +6,8 @@
 					xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 					xmlns:mux="using:Microsoft.UI.Xaml.Controls"
-					xmlns:xaml="clr-namespace:Microsoft.UI.Xaml;assembly=Uno.UI"
-					xmlns:controls="clr-namespace:Microsoft.UI.Xaml.Controls;assembly=Uno.UI"
 					mc:Ignorable="d">
 
-	<ResourceDictionary.MergedDictionaries>
-		<ResourceDictionary Source="ms-appx:///Uno.UI.Toolkit/Diagnostics/DiagnosticsOverlay.xaml" />
-	</ResourceDictionary.MergedDictionaries>
-	
 	<ResourceDictionary.ThemeDictionaries>
 		<ResourceDictionary x:Name="Light">
 			<SolidColorBrush x:Key="HotReloadPathFillBrush" Opacity="0.9">#000000</SolidColorBrush>
@@ -33,60 +27,60 @@
 	<SolidColorBrush x:Key="HotReloadProcessingFillBrush">#8A8A8A</SolidColorBrush>
 
 	<DataTemplate x:Key="HotReloadIconSuccess">
-		<controls:Grid>
+		<Grid>
 			<Path Data="M18.5 15.9826C18.5 18.1917 16.7091 19.9826 14.5 19.9826C12.2909 19.9826 10.5 18.1917 10.5 15.9826C10.5 13.7734 12.2909 11.9826 14.5 11.9826C16.7091 11.9826 18.5 13.7734 18.5 15.9826Z" Fill="White" />
 			<Path Data="M5.00391 14.6126C5.00391 14.0761 5.06644 13.5475 5.19151 13.0266C5.32179 12.5058 5.5172 12.0084 5.77776 11.5345C5.81945 11.4615 5.86114 11.386 5.90283 11.3079C5.94973 11.2298 5.99924 11.1569 6.05135 11.0891C6.10867 11.0162 6.1686 10.9615 6.23113 10.9251C6.29367 10.8834 6.37444 10.8626 6.47345 10.8626C6.55683 10.8626 6.6376 10.8834 6.71577 10.9251C6.79394 10.9667 6.85386 11.024 6.89555 11.097L7.93518 12.7923C7.98208 12.8704 8.04461 12.9329 8.12278 12.9798C8.20616 13.0214 8.29475 13.0423 8.38855 13.0423C8.56573 13.0423 8.70382 12.9772 8.80283 12.847C8.90706 12.7167 8.95917 12.5683 8.95917 12.4016C8.95917 12.3287 8.94875 12.2636 8.9279 12.2063C8.91227 12.1438 8.89142 12.0813 8.86537 12.0188C8.65171 11.5605 8.47714 11.11 8.34165 10.6673C8.20616 10.2194 8.13841 9.73758 8.13841 9.22195C8.13841 8.5657 8.24785 7.99018 8.46672 7.49539C8.6908 7.0006 8.99565 6.57612 9.38127 6.22195C9.77211 5.86779 10.2281 5.58133 10.7492 5.36258C11.2703 5.14383 11.8279 4.97977 12.422 4.87039C12.4428 4.86518 12.4715 4.86258 12.508 4.86258C12.6278 4.86258 12.7346 4.90164 12.8284 4.97977C12.9483 5.08393 13.0082 5.21154 13.0082 5.36258C13.0082 6.14383 13.1411 6.89123 13.4069 7.60477C13.6727 8.3131 14.04 8.97456 14.509 9.58914C14.7957 9.96414 15.0849 10.3444 15.3767 10.7298C14.8487 10.5777 14.2569 10.588 14.027 10.6121C13.9156 10.4653 13.8079 10.3222 13.7039 10.1829C13.2349 9.5631 12.8571 8.90164 12.5705 8.19852C12.2839 7.49018 12.1041 6.748 12.0311 5.97195C11.609 6.07612 11.2208 6.21935 10.8665 6.40164C10.5173 6.58393 10.2125 6.8105 9.95189 7.08133C9.69655 7.34695 9.49592 7.65945 9.35001 8.01883C9.2093 8.373 9.13895 8.77925 9.13895 9.23758C9.13895 9.65425 9.19367 10.0527 9.30311 10.4329C9.41775 10.8131 9.56627 11.1881 9.74866 11.5579C9.8164 11.6933 9.86591 11.8313 9.89718 11.972C9.93365 12.1126 9.95189 12.2584 9.95189 12.4095C9.95189 12.6282 9.91281 12.8391 9.83464 13.0423C9.76169 13.2402 9.65486 13.4147 9.51416 13.5657C9.37867 13.7115 9.21452 13.8287 9.0217 13.9173C8.8341 14.0058 8.62566 14.0501 8.39637 14.0501C8.12017 14.0501 7.86743 13.9876 7.63814 13.8626C7.41406 13.7324 7.22907 13.5501 7.08316 13.3157C6.97893 13.1542 6.87731 12.9954 6.7783 12.8391C6.6845 12.6777 6.5881 12.5162 6.48908 12.3548C6.16599 13.0735 6.00445 13.8261 6.00445 14.6126C6.00445 15.0813 6.06177 15.5371 6.17642 15.9798C6.29106 16.4173 6.45261 16.8313 6.66105 17.222C6.87471 17.6074 7.13006 17.9641 7.42709 18.2923C7.72934 18.6152 8.06546 18.8938 8.43545 19.1282C8.80544 19.3574 9.2067 19.5371 9.63922 19.6673C9.88388 19.7409 10.136 19.7937 10.3957 19.8257C10.4904 19.8374 10.5861 19.8463 10.6827 19.8524C11.1023 20.2401 11.5083 20.4995 12.0143 20.7649C11.977 20.771 11.9246 20.7814 11.8715 20.792C11.8003 20.8061 11.728 20.8205 11.6897 20.8248C11.4665 20.85 11.239 20.8626 11.0072 20.8626C10.4339 20.8626 9.88936 20.7871 9.37346 20.636C8.85755 20.4798 8.37552 20.2636 7.92736 19.9876C7.48441 19.7063 7.08316 19.3756 6.72359 18.9954C6.36402 18.61 6.05656 18.1855 5.80121 17.722C5.54587 17.2584 5.34784 16.7636 5.20714 16.2376C5.07165 15.7115 5.00391 15.1699 5.00391 14.6126Z" Fill="{ThemeResource HotReloadPathFillBrush}" />
 			<Path Data="M9.99902 15.9803C9.99902 15.3605 10.1163 14.7771 10.3508 14.2303C10.5905 13.6834 10.9136 13.2068 11.3201 12.8006C11.7265 12.3943 12.2033 12.074 12.7505 11.8396C13.2977 11.6 13.8813 11.4803 14.5015 11.4803C14.9131 11.4803 15.3092 11.5349 15.6896 11.6443C16.0752 11.7485 16.4348 11.8995 16.7683 12.0974C17.1018 12.2902 17.4067 12.5245 17.6829 12.8006C17.9591 13.0766 18.1936 13.3813 18.3864 13.7146C18.5844 14.048 18.7355 14.4073 18.8397 14.7928C18.9492 15.173 19.0039 15.5688 19.0039 15.9803C19.0039 16.6 18.884 17.1834 18.6443 17.7303C18.4098 18.2771 18.0893 18.7537 17.6829 19.1599C17.2764 19.5662 16.7996 19.8891 16.2524 20.1287C15.7052 20.3631 15.1216 20.4803 14.5015 20.4803C13.8761 20.4803 13.2899 20.3631 12.7427 20.1287C12.1955 19.8943 11.7187 19.574 11.3122 19.1678C10.9058 18.7615 10.5853 18.2849 10.3508 17.7381C10.1163 17.1912 9.99902 16.6053 9.99902 15.9803ZM13.5009 18.5428C13.6573 18.5428 13.7901 18.4881 13.8996 18.3787L17.4015 14.8787C17.5109 14.7693 17.5656 14.6365 17.5656 14.4803C17.5656 14.324 17.5109 14.1912 17.4015 14.0818C17.292 13.9724 17.1591 13.9178 17.0028 13.9178C16.8465 13.9178 16.7136 13.9724 16.6042 14.0818L13.5009 17.1834L12.3988 16.0818C12.2893 15.9724 12.1564 15.9178 12.0001 15.9178C11.8438 15.9178 11.7109 15.9724 11.6015 16.0818C11.492 16.1912 11.4373 16.324 11.4373 16.4803C11.4373 16.6365 11.492 16.7693 11.6015 16.8787L13.1023 18.3787C13.2117 18.4881 13.3446 18.5428 13.5009 18.5428Z" Fill="{StaticResource HotReloadSuccessFillBrush}"/>
-		</controls:Grid>
+		</Grid>
 	</DataTemplate>
 
 	<DataTemplate x:Key="HotReloadIconFailed">
-		<controls:Grid>
+		<Grid>
 			<Path Data="M18.5 15.9826C18.5 18.1917 16.7091 19.9826 14.5 19.9826C12.2909 19.9826 10.5 18.1917 10.5 15.9826C10.5 13.7734 12.2909 11.9826 14.5 11.9826C16.7091 11.9826 18.5 13.7734 18.5 15.9826Z" Fill="White" />
 			<Path Data="M5.00391 14.6126C5.00391 14.0761 5.06641 13.5475 5.19141 13.0266C5.32161 12.5058 5.51693 12.0084 5.77734 11.5345C5.81901 11.4615 5.86068 11.386 5.90234 11.3079C5.94922 11.2298 5.9987 11.1569 6.05078 11.0891C6.10807 11.0162 6.16797 10.9615 6.23047 10.9251C6.29297 10.8834 6.3737 10.8626 6.47266 10.8626C6.55599 10.8626 6.63672 10.8834 6.71484 10.9251C6.79297 10.9667 6.85286 11.024 6.89453 11.097L7.93359 12.7923C7.98047 12.8704 8.04297 12.9329 8.12109 12.9798C8.20443 13.0214 8.29297 13.0423 8.38672 13.0423C8.5638 13.0423 8.70182 12.9772 8.80078 12.847C8.90495 12.7167 8.95703 12.5683 8.95703 12.4016C8.95703 12.3287 8.94661 12.2636 8.92578 12.2063C8.91016 12.1438 8.88932 12.0813 8.86328 12.0188C8.64974 11.5605 8.47526 11.11 8.33984 10.6673C8.20443 10.2194 8.13672 9.73758 8.13672 9.22195C8.13672 8.5657 8.24609 7.99018 8.46484 7.49539C8.6888 7.0006 8.99349 6.57612 9.37891 6.22195C9.76953 5.86779 10.2253 5.58133 10.7461 5.36258C11.2669 5.14383 11.8242 4.97977 12.418 4.87039C12.4388 4.86518 12.4674 4.86258 12.5039 4.86258C12.6237 4.86258 12.7305 4.90164 12.8242 4.97977C12.944 5.08393 13.0039 5.21154 13.0039 5.36258C13.0039 6.14383 13.1367 6.89123 13.4023 7.60477C13.668 8.3131 14.0352 8.97456 14.5039 9.58914C14.7904 9.96414 15.0794 10.3444 15.3711 10.7298C14.8434 10.5777 14.2519 10.588 14.0222 10.6121C13.9108 10.4653 13.8031 10.3222 13.6992 10.1829C13.2305 9.5631 12.8529 8.90164 12.5664 8.19852C12.2799 7.49018 12.1003 6.748 12.0273 5.97195C11.6055 6.07612 11.2174 6.21935 10.8633 6.40164C10.5143 6.58393 10.2096 6.8105 9.94922 7.08133C9.69401 7.34695 9.49349 7.65945 9.34766 8.01883C9.20703 8.373 9.13672 8.77925 9.13672 9.23758C9.13672 9.65425 9.19141 10.0527 9.30078 10.4329C9.41536 10.8131 9.5638 11.1881 9.74609 11.5579C9.8138 11.6933 9.86328 11.8313 9.89453 11.972C9.93099 12.1126 9.94922 12.2584 9.94922 12.4095C9.94922 12.6282 9.91016 12.8391 9.83203 13.0423C9.75911 13.2402 9.65234 13.4147 9.51172 13.5657C9.3763 13.7115 9.21224 13.8287 9.01953 13.9173C8.83203 14.0058 8.6237 14.0501 8.39453 14.0501C8.11849 14.0501 7.86589 13.9876 7.63672 13.8626C7.41276 13.7324 7.22786 13.5501 7.08203 13.3157C6.97786 13.1542 6.8763 12.9954 6.77734 12.8391C6.68359 12.6777 6.58724 12.5162 6.48828 12.3548C6.16536 13.0735 6.00391 13.8261 6.00391 14.6126C6.00391 15.0813 6.0612 15.5371 6.17578 15.9798C6.29036 16.4173 6.45182 16.8313 6.66016 17.222C6.8737 17.6074 7.12891 17.9641 7.42578 18.2923C7.72786 18.6152 8.0638 18.8938 8.43359 19.1282C8.80339 19.3574 9.20443 19.5371 9.63672 19.6673C9.88124 19.7409 10.1333 19.7937 10.3928 19.8257C10.4874 19.8374 10.583 19.8463 10.6797 19.8524C11.0991 20.2401 11.5048 20.4995 12.0105 20.7649C11.9733 20.771 11.9208 20.7814 11.8678 20.792C11.7966 20.8061 11.7244 20.8205 11.6861 20.8248C11.463 20.85 11.2356 20.8626 11.0039 20.8626C10.431 20.8626 9.88672 20.7871 9.37109 20.636C8.85547 20.4798 8.3737 20.2636 7.92578 19.9876C7.48307 19.7063 7.08203 19.3756 6.72266 18.9954C6.36328 18.61 6.05599 18.1855 5.80078 17.722C5.54557 17.2584 5.34766 16.7636 5.20703 16.2376C5.07161 15.7115 5.00391 15.1699 5.00391 14.6126Z" Fill="{ThemeResource HotReloadPathFillBrush}" />
 			<Path Data="M14.4963 11.4803C16.9816 11.4803 18.9963 13.495 18.9963 15.9803C18.9963 18.4655 16.9816 20.4803 14.4963 20.4803C12.0111 20.4803 9.99634 18.4655 9.99634 15.9803C9.99634 13.495 12.0111 11.4803 14.4963 11.4803ZM12.8977 18.3264L14.4924 16.7264L16.0873 18.3264C16.1334 18.3726 16.1899 18.411 16.2567 18.4418C16.3286 18.4674 16.3979 18.4803 16.4647 18.4803C16.6136 18.4803 16.7395 18.429 16.8423 18.3264C16.9449 18.2238 16.9963 18.0982 16.9963 17.9495C16.9963 17.8798 16.9851 17.8152 16.9625 17.7556C16.9369 17.688 16.8969 17.627 16.8423 17.5725L15.2397 15.9803L16.8423 14.388C16.9449 14.2854 16.9963 14.1598 16.9963 14.011C16.9963 13.8623 16.9449 13.7367 16.8423 13.6341C16.7395 13.5315 16.6136 13.4803 16.4647 13.4803C16.3158 13.4803 16.1899 13.5315 16.0873 13.6341L14.4924 15.2341L12.8977 13.6341C12.795 13.5315 12.6692 13.4803 12.5203 13.4803C12.3661 13.4803 12.2404 13.5315 12.1427 13.6341C12.0452 13.7367 11.9963 13.8623 11.9963 14.011C11.9963 14.0828 12.0066 14.1521 12.0271 14.2187C12.0529 14.2802 12.0913 14.3366 12.1427 14.388L13.7452 15.9803L12.1427 17.5725C12.0913 17.6239 12.0529 17.6828 12.0271 17.7495C12.0066 17.811 11.9963 17.8777 11.9963 17.9495C11.9963 18.0982 12.0452 18.2238 12.1427 18.3264C12.2455 18.429 12.3712 18.4803 12.5203 18.4803C12.6692 18.4803 12.795 18.429 12.8977 18.3264Z" Fill="{StaticResource HotReloadFailedFillBrush}"/>
-		</controls:Grid>
+		</Grid>
 	</DataTemplate>
 
 	<DataTemplate x:Key="HotReloadIconProcessing">
-		<controls:Grid>
+		<Grid>
 			<Path Data="M18.5 15.9826C18.5 18.1917 16.7091 19.9826 14.5 19.9826C12.2909 19.9826 10.5 18.1917 10.5 15.9826C10.5 13.7734 12.2909 11.9826 14.5 11.9826C16.7091 11.9826 18.5 13.7734 18.5 15.9826Z" Fill="White" />
 			<Path Data="M5.00391 14.6126C5.00391 14.0761 5.06641 13.5475 5.19141 13.0266C5.32161 12.5058 5.51693 12.0084 5.77734 11.5345C5.81901 11.4615 5.86068 11.386 5.90234 11.3079C5.94922 11.2298 5.9987 11.1569 6.05078 11.0891C6.10807 11.0162 6.16797 10.9615 6.23047 10.9251C6.29297 10.8834 6.3737 10.8626 6.47266 10.8626C6.55599 10.8626 6.63672 10.8834 6.71484 10.9251C6.79297 10.9667 6.85286 11.024 6.89453 11.097L7.93359 12.7923C7.98047 12.8704 8.04297 12.9329 8.12109 12.9798C8.20443 13.0214 8.29297 13.0423 8.38672 13.0423C8.5638 13.0423 8.70182 12.9772 8.80078 12.847C8.90495 12.7167 8.95703 12.5683 8.95703 12.4016C8.95703 12.3287 8.94661 12.2636 8.92578 12.2063C8.91016 12.1438 8.88932 12.0813 8.86328 12.0188C8.64974 11.5605 8.47526 11.11 8.33984 10.6673C8.20443 10.2194 8.13672 9.73758 8.13672 9.22195C8.13672 8.5657 8.24609 7.99018 8.46484 7.49539C8.6888 7.0006 8.99349 6.57612 9.37891 6.22195C9.76953 5.86779 10.2253 5.58133 10.7461 5.36258C11.2669 5.14383 11.8242 4.97977 12.418 4.87039C12.4388 4.86518 12.4674 4.86258 12.5039 4.86258C12.6237 4.86258 12.7305 4.90164 12.8242 4.97977C12.944 5.08393 13.0039 5.21154 13.0039 5.36258C13.0039 6.14383 13.1367 6.89123 13.4023 7.60477C13.668 8.3131 14.0352 8.97456 14.5039 9.58914C14.7904 9.96414 15.0794 10.3444 15.3711 10.7298C14.8434 10.5777 14.2519 10.588 14.0222 10.6121C13.9108 10.4653 13.8031 10.3222 13.6992 10.1829C13.2305 9.5631 12.8529 8.90164 12.5664 8.19852C12.2799 7.49018 12.1003 6.748 12.0273 5.97195C11.6055 6.07612 11.2174 6.21935 10.8633 6.40164C10.5143 6.58393 10.2096 6.8105 9.94922 7.08133C9.69401 7.34695 9.49349 7.65945 9.34766 8.01883C9.20703 8.373 9.13672 8.77925 9.13672 9.23758C9.13672 9.65425 9.19141 10.0527 9.30078 10.4329C9.41536 10.8131 9.5638 11.1881 9.74609 11.5579C9.8138 11.6933 9.86328 11.8313 9.89453 11.972C9.93099 12.1126 9.94922 12.2584 9.94922 12.4095C9.94922 12.6282 9.91016 12.8391 9.83203 13.0423C9.75911 13.2402 9.65234 13.4147 9.51172 13.5657C9.3763 13.7115 9.21224 13.8287 9.01953 13.9173C8.83203 14.0058 8.6237 14.0501 8.39453 14.0501C8.11849 14.0501 7.86589 13.9876 7.63672 13.8626C7.41276 13.7324 7.22786 13.5501 7.08203 13.3157C6.97786 13.1542 6.8763 12.9954 6.77734 12.8391C6.68359 12.6777 6.58724 12.5162 6.48828 12.3548C6.16536 13.0735 6.00391 13.8261 6.00391 14.6126C6.00391 15.0813 6.0612 15.5371 6.17578 15.9798C6.29036 16.4173 6.45182 16.8313 6.66016 17.222C6.8737 17.6074 7.12891 17.9641 7.42578 18.2923C7.72786 18.6152 8.0638 18.8938 8.43359 19.1282C8.80339 19.3574 9.20443 19.5371 9.63672 19.6673C9.88124 19.7409 10.1333 19.7937 10.3928 19.8257C10.4874 19.8374 10.583 19.8463 10.6797 19.8524C11.0991 20.2401 11.5048 20.4995 12.0105 20.7649C11.9733 20.771 11.9208 20.7814 11.8678 20.792C11.7966 20.8061 11.7244 20.8205 11.6861 20.8248C11.463 20.85 11.2356 20.8626 11.0039 20.8626C10.431 20.8626 9.88672 20.7871 9.37109 20.636C8.85547 20.4798 8.3737 20.2636 7.92578 19.9876C7.48307 19.7063 7.08203 19.3756 6.72266 18.9954C6.36328 18.61 6.05599 18.1855 5.80078 17.722C5.54557 17.2584 5.34766 16.7636 5.20703 16.2376C5.07161 15.7115 5.00391 15.1699 5.00391 14.6126Z" Fill="{ThemeResource HotReloadPathFillBrush}" />
 			<Path Data="M18.9963 15.9803C18.9963 13.495 16.9816 11.4803 14.4963 11.4803C12.0111 11.4803 9.99634 13.495 9.99634 15.9803C9.99634 18.4655 12.0111 20.4803 14.4963 20.4803C16.9816 20.4803 18.9963 18.4655 18.9963 15.9803ZM12.748 15.9803C12.748 16.3945 12.4123 16.7303 11.998 16.7303C11.5838 16.7303 11.248 16.3945 11.248 15.9803C11.248 15.566 11.5838 15.2303 11.998 15.2303C12.4123 15.2303 12.748 15.566 12.748 15.9803ZM14.4946 16.7303C14.9088 16.7303 15.2446 16.3945 15.2446 15.9803C15.2446 15.566 14.9088 15.2303 14.4946 15.2303C14.0804 15.2303 13.7446 15.566 13.7446 15.9803C13.7446 16.3945 14.0804 16.7303 14.4946 16.7303ZM16.9946 16.7303C17.4088 16.7303 17.7446 16.3945 17.7446 15.9803C17.7446 15.566 17.4088 15.2303 16.9946 15.2303C16.5804 15.2303 16.2446 15.566 16.2446 15.9803C16.2446 16.3945 16.5804 16.7303 16.9946 16.7303Z" Fill="{StaticResource HotReloadProcessingFillBrush}"/>
-		</controls:Grid>
+		</Grid>
 	</DataTemplate>
 
 	<DataTemplate x:Key="HotReloadIconConnectionSuccess">
-		<controls:Grid>
+		<Grid>
 			<Path Data="M18.5 15.9826C18.5 18.1917 16.7091 19.9826 14.5 19.9826C12.2909 19.9826 10.5 18.1917 10.5 15.9826C10.5 13.7734 12.2909 11.9826 14.5 11.9826C16.7091 11.9826 18.5 13.7734 18.5 15.9826Z" Fill="White" />
 			<Path Data="M9.99634 15.9803C9.99634 15.3605 10.1135 14.7771 10.3479 14.2303C10.5875 13.6834 10.9104 13.2068 11.3167 12.8006C11.7229 12.3943 12.1995 12.074 12.7463 11.8396C13.2932 11.6 13.8765 11.4803 14.4963 11.4803C14.9078 11.4803 15.3036 11.5349 15.6838 11.6443C16.0693 11.7485 16.4286 11.8995 16.762 12.0974C17.0953 12.2902 17.4 12.5245 17.676 12.8006C17.9521 13.0766 18.1864 13.3813 18.3792 13.7146C18.5771 14.048 18.7281 14.4073 18.8323 14.7928C18.9417 15.173 18.9963 15.5688 18.9963 15.9803C18.9963 16.6 18.8765 17.1834 18.637 17.7303C18.4026 18.2771 18.0823 18.7537 17.676 19.1599C17.2698 19.5662 16.7932 19.8891 16.2463 20.1287C15.6995 20.3631 15.1161 20.4803 14.4963 20.4803C13.8713 20.4803 13.2854 20.3631 12.7385 20.1287C12.1917 19.8943 11.7151 19.574 11.3088 19.1678C10.9026 18.7615 10.5823 18.2849 10.3479 17.7381C10.1135 17.1912 9.99634 16.6053 9.99634 15.9803ZM13.4963 18.5428C13.6526 18.5428 13.7854 18.4881 13.8948 18.3787L17.3948 14.8787C17.5042 14.7693 17.5588 14.6365 17.5588 14.4803C17.5588 14.324 17.5042 14.1912 17.3948 14.0818C17.2854 13.9724 17.1526 13.9178 16.9963 13.9178C16.8401 13.9178 16.7073 13.9724 16.5979 14.0818L13.4963 17.1834L12.3948 16.0818C12.2854 15.9724 12.1526 15.9178 11.9963 15.9178C11.8401 15.9178 11.7073 15.9724 11.5979 16.0818C11.4885 16.1912 11.4338 16.324 11.4338 16.4803C11.4338 16.6365 11.4885 16.7693 11.5979 16.8787L13.0979 18.3787C13.2073 18.4881 13.3401 18.5428 13.4963 18.5428Z" Fill="{StaticResource HotReloadSuccessFillBrush}"/>
 			<Path Data="M8.15967 8.87057C8.71195 8.87057 9.15967 8.42286 9.15967 7.87057C9.15967 7.31829 8.71195 6.87057 8.15967 6.87057C7.60738 6.87057 7.15967 7.31829 7.15967 7.87057C7.15967 8.42286 7.60738 8.87057 8.15967 8.87057Z" Fill="{ThemeResource HotReloadPathFillBrush}" />
 			<Path Data="M18.41 5.45258C18.23 5.28258 18.02 5.13258 17.79 5.02258C17.55 4.91258 17.3 4.86258 17.04 4.86258H6.96C6.7 4.86258 6.45 4.91258 6.21 5.02258C5.97 5.13258 5.76 5.27258 5.59 5.45258C5.42 5.63258 5.27 5.84258 5.16 6.07258C5.05 6.31258 5 6.56258 5 6.82258V8.90258C5 9.16258 5.05 9.41258 5.16 9.65258C5.27 9.89258 5.41 10.1026 5.59 10.2726C5.77 10.4426 5.98 10.5926 6.21 10.7026C6.45 10.8126 6.7 10.8626 6.96 10.8626H11.8723C12.659 10.4584 13.551 10.2303 14.4963 10.2303C15.4392 10.2303 16.3292 10.4572 17.1144 10.8595C17.3411 10.8471 17.5542 10.7969 17.76 10.7026C18 10.5926 18.21 10.4526 18.4 10.2826C18.59 10.1126 18.73 9.90258 18.84 9.66258C18.95 9.42258 19 9.17258 19 8.90258V6.81258C19 6.55258 18.9607 6.33666 18.84 6.06258C18.7225 5.79585 18.4548 5.49487 18.41 5.45258ZM18 8.85258C18 8.99258 17.97 9.12258 17.92 9.24258C17.87 9.36258 17.8 9.47258 17.71 9.56258C17.62 9.65258 17.51 9.72258 17.39 9.77258C17.27 9.82258 17.14 9.85258 17 9.85258H7C6.86 9.85258 6.73 9.82258 6.61 9.77258C6.49 9.72258 6.38 9.65258 6.29 9.56258C6.2 9.47258 6.13 9.37258 6.08 9.24258C6.03 9.12258 6 8.99258 6 8.85258V6.85258C6 6.71258 6.03 6.59258 6.08 6.46258C6.13 6.34258 6.2 6.23258 6.29 6.14258C6.38 6.05258 6.49 5.98258 6.61 5.93258C6.73 5.88258 6.86 5.85258 7 5.85258H17C17.14 5.85258 17.26 5.88258 17.39 5.93258C17.51 5.98258 17.62 6.05258 17.71 6.14258C17.8 6.23258 17.87 6.34258 17.92 6.46258C17.97 6.58258 18 6.71258 18 6.85258V8.85258Z" Fill="{ThemeResource HotReloadPathFillBrush}" />
 			<Path Data="M10.483 11.8626H6.96C6.7 11.8626 6.45 11.9126 6.21 12.0226C5.97 12.1326 5.76 12.2726 5.59 12.4526C5.42 12.6326 5.27 12.8426 5.16 13.0726C5.05 13.3126 5 13.5626 5 13.8226V15.9026C5 16.1626 5.05 16.4126 5.16 16.6526C5.27 16.8926 5.41 17.1026 5.59 17.2726C5.77 17.4426 5.98 17.5926 6.21 17.7026C6.45 17.8126 6.7 17.8626 6.96 17.8626H9.06151C8.94915 17.5381 8.86503 17.2005 8.81208 16.8526H7C6.86 16.8526 6.73 16.8226 6.61 16.7726C6.49 16.7226 6.38 16.6526 6.29 16.5626C6.2 16.4726 6.13 16.3726 6.08 16.2426C6.03 16.1226 6 15.9926 6 15.8526V13.8526C6 13.7126 6.03 13.5926 6.08 13.4626C6.13 13.3426 6.2 13.2326 6.29 13.1426C6.38 13.0526 6.49 12.9826 6.61 12.9326C6.73 12.8826 6.86 12.8526 7 12.8526H9.67058C9.90424 12.4928 10.177 12.1608 10.483 11.8626Z" Fill="{ThemeResource HotReloadPathFillBrush}" />
 			<Path Data="M8.99286 14.3094C8.81369 14.0401 8.50741 13.8626 8.15967 13.8626C7.60738 13.8626 7.15967 14.3103 7.15967 14.8626C7.15967 15.4149 7.60738 15.8626 8.15967 15.8626C8.38259 15.8626 8.58848 15.7896 8.75476 15.6663C8.78003 15.1968 8.86161 14.7423 8.99286 14.3094Z" Fill="{ThemeResource HotReloadPathFillBrush}" />
-		</controls:Grid>
+		</Grid>
 	</DataTemplate>
 
 	<DataTemplate x:Key="HotReloadIconConnectionFailed">
-		<controls:Grid>
+		<Grid>
 			<Path Data="M18.5 15.9826C18.5 18.1917 16.7091 19.9826 14.5 19.9826C12.2909 19.9826 10.5 18.1917 10.5 15.9826C10.5 13.7734 12.2909 11.9826 14.5 11.9826C16.7091 11.9826 18.5 13.7734 18.5 15.9826Z" Fill="White" />
 			<Path Data="M14.4963 11.4803C16.9816 11.4803 18.9963 13.495 18.9963 15.9803C18.9963 18.4655 16.9816 20.4803 14.4963 20.4803C12.0111 20.4803 9.99634 18.4655 9.99634 15.9803C9.99634 13.495 12.0111 11.4803 14.4963 11.4803ZM12.8977 18.3264L14.4924 16.7264L16.0873 18.3264C16.1334 18.3726 16.1899 18.411 16.2567 18.4418C16.3286 18.4674 16.3979 18.4803 16.4647 18.4803C16.6136 18.4803 16.7395 18.429 16.8423 18.3264C16.9449 18.2238 16.9963 18.0982 16.9963 17.9495C16.9963 17.8798 16.9851 17.8152 16.9625 17.7556C16.9369 17.688 16.8969 17.627 16.8423 17.5725L15.2397 15.9803L16.8423 14.388C16.9449 14.2854 16.9963 14.1598 16.9963 14.011C16.9963 13.8623 16.9449 13.7367 16.8423 13.6341C16.7395 13.5315 16.6136 13.4803 16.4647 13.4803C16.3158 13.4803 16.1899 13.5315 16.0873 13.6341L14.4924 15.2341L12.8977 13.6341C12.795 13.5315 12.6692 13.4803 12.5203 13.4803C12.3661 13.4803 12.2404 13.5315 12.1427 13.6341C12.0452 13.7367 11.9963 13.8623 11.9963 14.011C11.9963 14.0828 12.0066 14.1521 12.0271 14.2187C12.0529 14.2802 12.0913 14.3366 12.1427 14.388L13.7452 15.9803L12.1427 17.5725C12.0913 17.6239 12.0529 17.6828 12.0271 17.7495C12.0066 17.811 11.9963 17.8777 11.9963 17.9495C11.9963 18.0982 12.0452 18.2238 12.1427 18.3264C12.2455 18.429 12.3712 18.4803 12.5203 18.4803C12.6692 18.4803 12.795 18.429 12.8977 18.3264Z" Fill="{StaticResource HotReloadFailedFillBrush}"/>
 			<Path Data="M8.15967 8.87057C8.71195 8.87057 9.15967 8.42286 9.15967 7.87057C9.15967 7.31829 8.71195 6.87057 8.15967 6.87057C7.60738 6.87057 7.15967 7.31829 7.15967 7.87057C7.15967 8.42286 7.60738 8.87057 8.15967 8.87057Z" Fill="{ThemeResource HotReloadPathFillBrush}" />
 			<Path Data="M18.41 5.45258C18.23 5.28258 18.02 5.13258 17.79 5.02258C17.55 4.91258 17.3 4.86258 17.04 4.86258H6.96C6.7 4.86258 6.45 4.91258 6.21 5.02258C5.97 5.13258 5.76 5.27258 5.59 5.45258C5.42 5.63258 5.27 5.84258 5.16 6.07258C5.05 6.31258 5 6.56258 5 6.82258V8.90258C5 9.16258 5.05 9.41258 5.16 9.65258C5.27 9.89258 5.41 10.1026 5.59 10.2726C5.77 10.4426 5.98 10.5926 6.21 10.7026C6.45 10.8126 6.7 10.8626 6.96 10.8626H11.8723C12.659 10.4584 13.551 10.2303 14.4963 10.2303C15.4392 10.2303 16.3292 10.4572 17.1144 10.8595C17.3411 10.8471 17.5542 10.7969 17.76 10.7026C18 10.5926 18.21 10.4526 18.4 10.2826C18.59 10.1126 18.73 9.90258 18.84 9.66258C18.95 9.42258 19 9.17258 19 8.90258V6.81258C19 6.55258 18.9607 6.33666 18.84 6.06258C18.7225 5.79585 18.4548 5.49487 18.41 5.45258ZM18 8.85258C18 8.99258 17.97 9.12258 17.92 9.24258C17.87 9.36258 17.8 9.47258 17.71 9.56258C17.62 9.65258 17.51 9.72258 17.39 9.77258C17.27 9.82258 17.14 9.85258 17 9.85258H7C6.86 9.85258 6.73 9.82258 6.61 9.77258C6.49 9.72258 6.38 9.65258 6.29 9.56258C6.2 9.47258 6.13 9.37258 6.08 9.24258C6.03 9.12258 6 8.99258 6 8.85258V6.85258C6 6.71258 6.03 6.59258 6.08 6.46258C6.13 6.34258 6.2 6.23258 6.29 6.14258C6.38 6.05258 6.49 5.98258 6.61 5.93258C6.73 5.88258 6.86 5.85258 7 5.85258H17C17.14 5.85258 17.26 5.88258 17.39 5.93258C17.51 5.98258 17.62 6.05258 17.71 6.14258C17.8 6.23258 17.87 6.34258 17.92 6.46258C17.97 6.58258 18 6.71258 18 6.85258V8.85258Z" Fill="{ThemeResource HotReloadPathFillBrush}" />
 			<Path Data="M10.483 11.8626H6.96C6.7 11.8626 6.45 11.9126 6.21 12.0226C5.97 12.1326 5.76 12.2726 5.59 12.4526C5.42 12.6326 5.27 12.8426 5.16 13.0726C5.05 13.3126 5 13.5626 5 13.8226V15.9026C5 16.1626 5.05 16.4126 5.16 16.6526C5.27 16.8926 5.41 17.1026 5.59 17.2726C5.77 17.4426 5.98 17.5926 6.21 17.7026C6.45 17.8126 6.7 17.8626 6.96 17.8626H9.06151C8.94915 17.5381 8.86503 17.2005 8.81208 16.8526H7C6.86 16.8526 6.73 16.8226 6.61 16.7726C6.49 16.7226 6.38 16.6526 6.29 16.5626C6.2 16.4726 6.13 16.3726 6.08 16.2426C6.03 16.1226 6 15.9926 6 15.8526V13.8526C6 13.7126 6.03 13.5926 6.08 13.4626C6.13 13.3426 6.2 13.2326 6.29 13.1426C6.38 13.0526 6.49 12.9826 6.61 12.9326C6.73 12.8826 6.86 12.8526 7 12.8526H9.67058C9.90424 12.4928 10.177 12.1608 10.483 11.8626Z" Fill="{ThemeResource HotReloadPathFillBrush}" />
 			<Path Data="M8.99286 14.3094C8.81369 14.0401 8.50741 13.8626 8.15967 13.8626C7.60738 13.8626 7.15967 14.3103 7.15967 14.8626C7.15967 15.4149 7.60738 15.8626 8.15967 15.8626C8.38259 15.8626 8.58848 15.7896 8.75476 15.6663C8.78003 15.1968 8.86161 14.7423 8.99286 14.3094Z" Fill="{ThemeResource HotReloadPathFillBrush}" />
-		</controls:Grid>
+		</Grid>
 	</DataTemplate>
 
 	<DataTemplate x:Key="HotReloadIconConnectionWarning">
-		<controls:Grid>
+		<Grid>
 			<Path Data="M18.5 15.9826C18.5 18.1917 16.7091 19.9826 14.5 19.9826C12.2909 19.9826 10.5 18.1917 10.5 15.9826C10.5 13.7734 12.2909 11.9826 14.5 11.9826C16.7091 11.9826 18.5 13.7734 18.5 15.9826Z" Fill="White" />
 			<Path Data="M14.4963 20.4803C16.9816 20.4803 18.9963 18.4655 18.9963 15.9803C18.9963 13.495 16.9816 11.4803 14.4963 11.4803C12.0111 11.4803 9.99634 13.495 9.99634 15.9803C9.99634 18.4655 12.0111 20.4803 14.4963 20.4803ZM13.9963 13.0628V16.5674C13.9963 16.7252 14.0541 16.8617 14.1696 16.977C14.2849 17.0923 14.4216 17.1499 14.5797 17.1499C14.7377 17.1499 14.8744 17.0923 14.9899 16.977C15.1052 16.8617 15.163 16.7252 15.163 16.5674V13.0628C15.163 12.9051 15.1052 12.7685 14.9899 12.6532C14.8744 12.5379 14.7377 12.4803 14.5797 12.4803C14.4216 12.4803 14.2849 12.5379 14.1696 12.6532C14.0541 12.7685 13.9963 12.9051 13.9963 13.0628ZM14.1604 18.4881C14.051 18.5973 13.9963 18.7339 13.9963 18.8977C13.9963 19.0555 14.0541 19.192 14.1696 19.3073C14.2849 19.4226 14.4216 19.4803 14.5797 19.4803C14.7377 19.4803 14.8744 19.4226 14.9899 19.3073C15.1052 19.192 15.163 19.0555 15.163 18.8977C15.163 18.7399 15.1052 18.6034 14.9899 18.4881C14.8744 18.3728 14.7377 18.3151 14.5797 18.3151C14.4156 18.3151 14.2759 18.3728 14.1604 18.4881Z" Fill="{StaticResource HotReloadInitializingFillBrush}"/>
 			<Path Data="M8.15967 8.87057C8.71195 8.87057 9.15967 8.42286 9.15967 7.87057C9.15967 7.31829 8.71195 6.87057 8.15967 6.87057C7.60738 6.87057 7.15967 7.31829 7.15967 7.87057C7.15967 8.42286 7.60738 8.87057 8.15967 8.87057Z" Fill="{ThemeResource HotReloadPathFillBrush}" />
 			<Path Data="M18.41 5.45258C18.23 5.28258 18.02 5.13258 17.79 5.02258C17.55 4.91258 17.3 4.86258 17.04 4.86258H6.96C6.7 4.86258 6.45 4.91258 6.21 5.02258C5.97 5.13258 5.76 5.27258 5.59 5.45258C5.42 5.63258 5.27 5.84258 5.16 6.07258C5.05 6.31258 5 6.56258 5 6.82258V8.90258C5 9.16258 5.05 9.41258 5.16 9.65258C5.27 9.89258 5.41 10.1026 5.59 10.2726C5.77 10.4426 5.98 10.5926 6.21 10.7026C6.45 10.8126 6.7 10.8626 6.96 10.8626H11.8723C12.659 10.4584 13.551 10.2303 14.4963 10.2303C15.4392 10.2303 16.3292 10.4572 17.1144 10.8595C17.3411 10.8471 17.5542 10.7969 17.76 10.7026C18 10.5926 18.21 10.4526 18.4 10.2826C18.59 10.1126 18.73 9.90258 18.84 9.66258C18.95 9.42258 19 9.17258 19 8.90258V6.81258C19 6.55258 18.9607 6.33666 18.84 6.06258C18.7225 5.79585 18.4548 5.49487 18.41 5.45258ZM18 8.85258C18 8.99258 17.97 9.12258 17.92 9.24258C17.87 9.36258 17.8 9.47258 17.71 9.56258C17.62 9.65258 17.51 9.72258 17.39 9.77258C17.27 9.82258 17.14 9.85258 17 9.85258H7C6.86 9.85258 6.73 9.82258 6.61 9.77258C6.49 9.72258 6.38 9.65258 6.29 9.56258C6.2 9.47258 6.13 9.37258 6.08 9.24258C6.03 9.12258 6 8.99258 6 8.85258V6.85258C6 6.71258 6.03 6.59258 6.08 6.46258C6.13 6.34258 6.2 6.23258 6.29 6.14258C6.38 6.05258 6.49 5.98258 6.61 5.93258C6.73 5.88258 6.86 5.85258 7 5.85258H17C17.14 5.85258 17.26 5.88258 17.39 5.93258C17.51 5.98258 17.62 6.05258 17.71 6.14258C17.8 6.23258 17.87 6.34258 17.92 6.46258C17.97 6.58258 18 6.71258 18 6.85258V8.85258Z" Fill="{ThemeResource HotReloadPathFillBrush}" />
 			<Path Data="M10.483 11.8626H6.96C6.7 11.8626 6.45 11.9126 6.21 12.0226C5.97 12.1326 5.76 12.2726 5.59 12.4526C5.42 12.6326 5.27 12.8426 5.16 13.0726C5.05 13.3126 5 13.5626 5 13.8226V15.9026C5 16.1626 5.05 16.4126 5.16 16.6526C5.27 16.8926 5.41 17.1026 5.59 17.2726C5.77 17.4426 5.98 17.5926 6.21 17.7026C6.45 17.8126 6.7 17.8626 6.96 17.8626H9.06151C8.94915 17.5381 8.86503 17.2005 8.81208 16.8526H7C6.86 16.8526 6.73 16.8226 6.61 16.7726C6.49 16.7226 6.38 16.6526 6.29 16.5626C6.2 16.4726 6.13 16.3726 6.08 16.2426C6.03 16.1226 6 15.9926 6 15.8526V13.8526C6 13.7126 6.03 13.5926 6.08 13.4626C6.13 13.3426 6.2 13.2326 6.29 13.1426C6.38 13.0526 6.49 12.9826 6.61 12.9326C6.73 12.8826 6.86 12.8526 7 12.8526H9.67058C9.90424 12.4928 10.177 12.1608 10.483 11.8626Z" Fill="{ThemeResource HotReloadPathFillBrush}" />
 			<Path Data="M8.99286 14.3094C8.81369 14.0401 8.50741 13.8626 8.15967 13.8626C7.60738 13.8626 7.15967 14.3103 7.15967 14.8626C7.15967 15.4149 7.60738 15.8626 8.15967 15.8626C8.38259 15.8626 8.58848 15.7896 8.75476 15.6663C8.78003 15.1968 8.86161 14.7423 8.99286 14.3094Z" Fill="{ThemeResource HotReloadPathFillBrush}" />
-		</controls:Grid>
+		</Grid>
 	</DataTemplate>
 
 	<local:EntryIconToObjectConverter
@@ -274,7 +268,7 @@
 							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
 
-						<Button Height="24">
+						<Button Height="24">	
 							<Button.Resources>
 								<SolidColorBrush x:Key="FilledButtonForegroundPointerOver" Color="Transparent" />
 							</Button.Resources>
@@ -288,7 +282,7 @@
 										</Style>
 									</Flyout.FlyoutPresenterStyle>
 
-									<StackPanel Spacing="10" >
+									<StackPanel Spacing="10">
 										<TextBlock
 											Text="Events"
 											FontSize="11"
diff --git a/src/Uno.UI.Toolkit/Diagnostics/DiagnosticsOverlay.xaml b/src/Uno.UI.Toolkit/Diagnostics/DiagnosticsOverlay.xaml
index c5f0459995da..ab12ed24ad07 100644
--- a/src/Uno.UI.Toolkit/Diagnostics/DiagnosticsOverlay.xaml
+++ b/src/Uno.UI.Toolkit/Diagnostics/DiagnosticsOverlay.xaml
@@ -45,6 +45,9 @@
 						Height="{TemplateBinding Height}"
 						Orientation="Horizontal"
 						Spacing="4">
+						<StackPanel.Resources>
+							<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+						</StackPanel.Resources>
 						<VisualStateManager.VisualStateGroups>
 							<VisualStateGroup x:Name="DisplayMode">
 								<VisualState x:Name="Compact">