diff --git a/WheelWizard/Views/Layout.axaml b/WheelWizard/Views/Layout.axaml
index d2886b41..1dd698b1 100644
--- a/WheelWizard/Views/Layout.axaml
+++ b/WheelWizard/Views/Layout.axaml
@@ -68,11 +68,11 @@
                     Margin="0,0,0,25">
             <components:StateBox x:Name="PlayerCountBox" Text="0" Variant="Dark"
                                  IconData="{StaticResource UserCouple}"
-                                 TipText="{x:Static lang:Phrases.Hover_PlayersOnline_0}"
+                                 ToolTip.Tip="{x:Static lang:Phrases.Hover_PlayersOnline_0}"
                                  Margin="10,0,0,0" />
             <components:StateBox x:Name="RoomCountBox" Text="0" Variant="Dark"
                                  IconData="{StaticResource RoomUsers}"
-                                 TipText="{x:Static lang:Phrases.Hover_RoomsOnline_0}"
+                                 ToolTip.Tip="{x:Static lang:Phrases.Hover_RoomsOnline_0}"
                                  Margin="10,0,0,0" />
         </StackPanel>
 
diff --git a/WheelWizard/Views/Layout.axaml.cs b/WheelWizard/Views/Layout.axaml.cs
index 9c41e809..8f5c7ba7 100644
--- a/WheelWizard/Views/Layout.axaml.cs
+++ b/WheelWizard/Views/Layout.axaml.cs
@@ -14,12 +14,10 @@
 using WheelWizard.Settings.Types;
 using WheelWizard.Shared.DependencyInjection;
 using WheelWizard.Utilities.RepeatedTasks;
-using WheelWizard.Views.Components;
 using WheelWizard.Views.Pages;
 using WheelWizard.Views.Patterns;
 using WheelWizard.Views.Popups.Generic;
 using WheelWizard.WheelWizardData.Domain;
-using WheelWizard.WiiManagement;
 using WheelWizard.WiiManagement.GameLicense;
 
 namespace WheelWizard.Views;
@@ -198,20 +196,26 @@ public void UpdatePlayerAndRoomCount(RRLiveRooms sender)
         var playerCount = sender.PlayerCount;
         var roomCount = sender.RoomCount;
         PlayerCountBox.Text = playerCount.ToString();
-        PlayerCountBox.TipText = playerCount switch
-        {
-            1 => Phrases.Hover_PlayersOnline_1,
-            0 => Phrases.Hover_PlayersOnline_0,
-            _ => Humanizer.ReplaceDynamic(Phrases.Hover_PlayersOnline_x, playerCount)
-                ?? $"There are currently {playerCount} players online",
-        };
+        ToolTip.SetTip(
+            PlayerCountBox,
+            playerCount switch
+            {
+                1 => Phrases.Hover_PlayersOnline_1,
+                0 => Phrases.Hover_PlayersOnline_0,
+                _ => Humanizer.ReplaceDynamic(Phrases.Hover_PlayersOnline_x, playerCount)
+                    ?? $"There are currently {playerCount} players online",
+            }
+        );
         RoomCountBox.Text = roomCount.ToString();
-        RoomCountBox.TipText = roomCount switch
-        {
-            1 => Phrases.Hover_RoomsOnline_1,
-            0 => Phrases.Hover_RoomsOnline_0,
-            _ => Humanizer.ReplaceDynamic(Phrases.Hover_RoomsOnline_x, roomCount) ?? $"There are currently {roomCount} rooms active",
-        };
+        ToolTip.SetTip(
+            RoomCountBox,
+            roomCount switch
+            {
+                1 => Phrases.Hover_RoomsOnline_1,
+                0 => Phrases.Hover_RoomsOnline_0,
+                _ => Humanizer.ReplaceDynamic(Phrases.Hover_RoomsOnline_x, roomCount) ?? $"There are currently {roomCount} rooms active",
+            }
+        );
         UpdateFriendCount();
     }