From 34397e930d3cbefb71d194cec7cdd08fbef8f1a1 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Thu, 12 Feb 2026 10:42:22 +0100
Subject: [PATCH] Fix conflict

---
 .../Settings.UI/SettingsXAML/OobeWindow.xaml          | 11 +++--------
 .../Settings.UI/SettingsXAML/OobeWindow.xaml.cs       |  2 --
 .../Settings.UI/SettingsXAML/ScoobeWindow.xaml        | 11 +++--------
 .../Settings.UI/SettingsXAML/ScoobeWindow.xaml.cs     |  2 --
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml
index 93e197f66e..1d352758d0 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml
@@ -28,14 +28,9 @@
             IsBackButtonVisible="False"
             IsPaneToggleButtonVisible="False"
             PaneToggleRequested="TitleBar_PaneButtonClick">
-            <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
-            <TitleBar.LeftHeader>
-                <ImageIcon
-                    x:Name="TitleBarIcon"
-                    Height="16"
-                    Margin="16,0,0,0"
-                    Source="/Assets/Settings/icon.ico" />
-            </TitleBar.LeftHeader>
+            <TitleBar.IconSource>
+                <ImageIconSource ImageSource="/Assets/Settings/icon.ico" />
+            </TitleBar.IconSource>
         </TitleBar>
         <NavigationView
             x:Name="navigationView"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml.cs
index cc98149397..6643b8401a 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml.cs
@@ -120,12 +120,10 @@ namespace Microsoft.PowerToys.Settings.UI
         {
             if (args.DisplayMode == NavigationViewDisplayMode.Compact || args.DisplayMode == NavigationViewDisplayMode.Minimal)
             {
-                TitleBarIcon.Margin = new Thickness(0, 0, 8, 0); // Workaround, see XAML comment
                 AppTitleBar.IsPaneToggleButtonVisible = true;
             }
             else
             {
-                TitleBarIcon.Margin = new Thickness(16, 0, 0, 0);  // Workaround, see XAML comment
                 AppTitleBar.IsPaneToggleButtonVisible = false;
             }
         }
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/ScoobeWindow.xaml b/src/settings-ui/Settings.UI/SettingsXAML/ScoobeWindow.xaml
index 3e6bb53da5..6c1de90b70 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/ScoobeWindow.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/ScoobeWindow.xaml
@@ -27,14 +27,9 @@
             IsBackButtonVisible="False"
             IsPaneToggleButtonVisible="False"
             PaneToggleRequested="TitleBar_PaneButtonClick">
-            <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
-            <TitleBar.LeftHeader>
-                <ImageIcon
-                    x:Name="TitleBarIcon"
-                    Height="16"
-                    Margin="16,0,0,0"
-                    Source="/Assets/Settings/icon.ico" />
-            </TitleBar.LeftHeader>
+            <TitleBar.IconSource>
+                <ImageIconSource ImageSource="/Assets/Settings/icon.ico" />
+            </TitleBar.IconSource>
         </TitleBar>
         <NavigationView
             x:Name="navigationView"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/ScoobeWindow.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/ScoobeWindow.xaml.cs
index 378df70063..ce8e6d0f7a 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/ScoobeWindow.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/ScoobeWindow.xaml.cs
@@ -194,12 +194,10 @@ namespace Microsoft.PowerToys.Settings.UI
         {
             if (args.DisplayMode == NavigationViewDisplayMode.Compact || args.DisplayMode == NavigationViewDisplayMode.Minimal)
             {
-                TitleBarIcon.Margin = new Thickness(0, 0, 8, 0); // Workaround, see XAML comment
                 AppTitleBar.IsPaneToggleButtonVisible = true;
             }
             else
             {
-                TitleBarIcon.Margin = new Thickness(16, 0, 0, 0);  // Workaround, see XAML comment
                 AppTitleBar.IsPaneToggleButtonVisible = false;
             }
         }