diff --git a/src/modules/colorPicker/ColorPickerUI/App.xaml b/src/modules/colorPicker/ColorPickerUI/App.xaml
index a6e26f31e2cd..00929b9947c2 100644
--- a/src/modules/colorPicker/ColorPickerUI/App.xaml
+++ b/src/modules/colorPicker/ColorPickerUI/App.xaml
@@ -2,13 +2,11 @@
     x:Class="ColorPickerUI.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+    ThemeMode="System"
     StartupUri="MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ui:ThemesDictionary Theme="Dark" />
-                <ui:ControlsDictionary />
                 <ResourceDictionary Source="Resources/Styles.xaml" />
                 <ResourceDictionary Source="Resources/ViewModelViewMappings.xaml" />
             </ResourceDictionary.MergedDictionaries>
diff --git a/src/modules/colorPicker/ColorPickerUI/ColorEditorWindow.xaml b/src/modules/colorPicker/ColorPickerUI/ColorEditorWindow.xaml
index e8ec0a0a7a56..35290b64dd6a 100644
--- a/src/modules/colorPicker/ColorPickerUI/ColorEditorWindow.xaml
+++ b/src/modules/colorPicker/ColorPickerUI/ColorEditorWindow.xaml
@@ -1,4 +1,4 @@
-<ui:FluentWindow
+<Window
     x:Class="ColorPicker.ColorEditorWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -7,41 +7,43 @@
     xmlns:e="http://schemas.microsoft.com/xaml/behaviors"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:p="clr-namespace:ColorPicker.Properties"
-    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
     Width="440"
     Height="380"
-    ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}"
-    ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}"
     AutomationProperties.Name="{x:Static p:Resources.cp_editor}"
-    ExtendsContentIntoTitleBar="True"
     ResizeMode="NoResize"
     Topmost="True"
-    WindowCornerPreference="Default"
     WindowStartupLocation="CenterScreen"
+    WindowStyle="None"
     mc:Ignorable="d">
     <e:Interaction.Behaviors>
         <behaviors:CloseZoomWindowBehavior />
     </e:Interaction.Behaviors>
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        <ui:TitleBar
-            x:Name="TitleBar"
-            Title="{x:Static p:Resources.CP_Title}"
-            Grid.Row="0"
-            Height="32"
-            Padding="16,0,16,0"
-            ShowMaximize="False"
-            ShowMinimize="False">
-            <ui:TitleBar.Icon>
-                <ui:ImageIcon Source="pack://application:,,,/Assets/ColorPicker/icon.ico" />
-            </ui:TitleBar.Icon>
-        </ui:TitleBar>
-        <ContentPresenter
+    <Border x:Name="MainBorder" BorderBrush="{DynamicResource {x:Static SystemColors.ActiveBorderBrushKey}}">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <DockPanel Grid.Row="0" Background="Transparent" MouseLeftButtonDown="TitleBar_MouseDown">
+                <Image Source="pack://application:,,,/Assets/ColorPicker/icon.ico" 
+                   Width="20" Height="20"
+                   Margin="10,5,5,8"/>
+                <TextBlock Text="{x:Static p:Resources.CP_Title}" VerticalAlignment="Center" Margin="10"/>
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                    <Button 
+                    Content="&#xE711;" 
+                    FontFamily="{StaticResource IconFontFamily}"
+                    Width="50" 
+                    Height="30"
+                    Margin="10,-10,-2,1"
+                    Style="{StaticResource TitleBarCloseButtonStyle}"
+                    Click="Close_Click"/>
+                </StackPanel>
+            </DockPanel>
+            <ContentPresenter
             x:Name="contentPresenter"
             Grid.Row="1"
             Content="{Binding Content}" />
-    </Grid>
-</ui:FluentWindow>
+        </Grid>
+    </Border>
+</Window>
diff --git a/src/modules/colorPicker/ColorPickerUI/ColorEditorWindow.xaml.cs b/src/modules/colorPicker/ColorPickerUI/ColorEditorWindow.xaml.cs
index 323fa77b5e31..9f0f4c1a9b51 100644
--- a/src/modules/colorPicker/ColorPickerUI/ColorEditorWindow.xaml.cs
+++ b/src/modules/colorPicker/ColorPickerUI/ColorEditorWindow.xaml.cs
@@ -3,25 +3,25 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-
+using System.Runtime.InteropServices;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Interop;
 using ColorPicker.Helpers;
 using ManagedCommon;
-using Wpf.Ui.Controls;
 
 namespace ColorPicker
 {
     /// <summary>
     /// Interaction logic for ColorEditorWindow.xaml
     /// </summary>
-    public partial class ColorEditorWindow : FluentWindow
+    public partial class ColorEditorWindow : Window
     {
         private readonly AppStateHandler _appStateHandler;
 
         public ColorEditorWindow(AppStateHandler appStateHandler)
         {
             InitializeComponent();
-            Wpf.Ui.Appearance.SystemThemeWatcher.Watch(this);
-            WindowBackdropType = OSVersionHelper.IsWindows11() ? WindowBackdropType.Mica : WindowBackdropType = WindowBackdropType.None;
 
             _appStateHandler = appStateHandler;
             Closing += ColorEditorWindow_Closing;
@@ -36,6 +36,54 @@ private void ColorEditorWindow_Closing(object sender, System.ComponentModel.Canc
         protected override void OnSourceInitialized(EventArgs e)
         {
             base.OnSourceInitialized(e);
+            if (OSVersionHelper.IsWindows11())
+            {
+                // ResizeMode="NoResize" removes rounded corners. So force them to rounded.
+                IntPtr hWnd = new WindowInteropHelper(GetWindow(this)).EnsureHandle();
+                DWMWINDOWATTRIBUTE attribute = DWMWINDOWATTRIBUTE.DWMWA_WINDOW_CORNER_PREFERENCE;
+                DWM_WINDOW_CORNER_PREFERENCE preference = DWM_WINDOW_CORNER_PREFERENCE.DWMWCP_ROUND;
+                DwmSetWindowAttribute(hWnd, attribute, ref preference, sizeof(uint));
+            }
+            else
+            {
+                // On Windows10 ResizeMode="NoResize" removes the border so we add a new one.
+                MainBorder.BorderThickness = new System.Windows.Thickness(0.5);
+            }
+        }
+
+        private void Close_Click(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+
+        private void TitleBar_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            if (e.ChangedButton == MouseButton.Left)
+            {
+                this.DragMove();
+            }
         }
+
+        // The enum flag for DwmSetWindowAttribute's second parameter, which tells the function what attribute to set.
+        public enum DWMWINDOWATTRIBUTE
+        {
+            DWMWA_WINDOW_CORNER_PREFERENCE = 33,
+        }
+
+        public enum DWM_WINDOW_CORNER_PREFERENCE
+        {
+            DWMWCP_DEFAULT = 0,
+            DWMWCP_DONOTROUND = 1,
+            DWMWCP_ROUND = 2,
+            DWMWCP_ROUNDSMALL = 3,
+        }
+
+        // Import dwmapi.dll and define DwmSetWindowAttribute in C# corresponding to the native function.
+        [DllImport("dwmapi.dll", CharSet = CharSet.Unicode, PreserveSig = false)]
+        internal static extern void DwmSetWindowAttribute(
+            IntPtr hwnd,
+            DWMWINDOWATTRIBUTE attribute,
+            ref DWM_WINDOW_CORNER_PREFERENCE pvAttribute,
+            uint cbAttribute);
     }
 }
diff --git a/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj b/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj
index 827f479e376b..d1c55e3db7f5 100644
--- a/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj
+++ b/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj
@@ -38,7 +38,6 @@
     <PackageReference Include="System.IO.Abstractions" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" />
     <PackageReference Include="System.Drawing.Common" />
-    <PackageReference Include="WPF-UI" />
   </ItemGroup>
   <ItemGroup>
     <None Update="Properties\Settings.settings">
diff --git a/src/modules/colorPicker/ColorPickerUI/Controls/ColorFormatControl.xaml b/src/modules/colorPicker/ColorPickerUI/Controls/ColorFormatControl.xaml
index b2b398b5c631..76abb90c4c3c 100644
--- a/src/modules/colorPicker/ColorPickerUI/Controls/ColorFormatControl.xaml
+++ b/src/modules/colorPicker/ColorPickerUI/Controls/ColorFormatControl.xaml
@@ -6,7 +6,6 @@
     xmlns:local="clr-namespace:ColorPicker"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:p="clr-namespace:ColorPicker.Properties"
-    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
     mc:Ignorable="d">
     <UserControl.Resources>
         <Style x:Key="ReadonlyTextBoxStyle" TargetType="{x:Type TextBox}">
@@ -66,7 +65,6 @@
                                         HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                                         IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
                                         IsTabStop="{TemplateBinding ScrollViewer.IsTabStop}"
-                                        Style="{StaticResource DefaultTextBoxScrollViewerStyle}"
                                         TextElement.Foreground="{TemplateBinding Foreground}"
                                         VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" />
                                 </Grid>
@@ -173,7 +171,9 @@
                 Style="{StaticResource SubtleButtonStyle}"
                 ToolTipService.ToolTip="{x:Static p:Resources.Copy_to_clipboard}">
                 <Button.Content>
-                    <ui:SymbolIcon FontSize="20" Symbol="Copy20" />
+                    <TextBlock
+                        FontFamily="{StaticResource IconFontFamily}"
+                        Text="&#xE8C8;" />
                 </Button.Content>
             </Button>
         </Grid>
diff --git a/src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml b/src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml
index d66923ddb29c..83d26a3109ab 100644
--- a/src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml
+++ b/src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml
@@ -6,7 +6,6 @@
     xmlns:helpers="clr-namespace:ColorPicker.Helpers"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:p="clr-namespace:ColorPicker.Properties"
-    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
     AutomationProperties.Name="{x:Static p:Resources.Color_Palette}"
     FocusManager.IsFocusScope="True"
     KeyboardNavigation.TabNavigation="Once"
@@ -213,19 +212,27 @@
                 Style="{DynamicResource ColorShadeButtonStyle}"
                 ToolTipService.ToolTip="{x:Static p:Resources.Selected_color_tooltip}">
 
-                <ui:Flyout
+                <Popup
                     x:Name="DetailsFlyout"
                     Margin="24,0,0,0"
                     Closed="DetailsFlyout_Closed"
                     Opened="DetailsFlyout_Opened"
+                    AllowsTransparency="True"
+                    StaysOpen="False"
                     Placement="Top">
-                    <Grid x:Name="detailsGrid" KeyboardNavigation.TabNavigation="Contained">
-                        <Grid.ColumnDefinitions>
+                    <Border
+                        CornerRadius="16"
+                        BorderBrush="{DynamicResource SurfaceStrokeColorFlyoutBrush}"
+                        BorderThickness="1"
+                        Background="{DynamicResource ApplicationBackgroundBrush}"
+                        Padding="15">
+                        <Grid x:Name="detailsGrid" KeyboardNavigation.TabNavigation="Contained">
+                            <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="44" />
                             <ColumnDefinition Width="86" />
                             <ColumnDefinition Width="86" />
                             <ColumnDefinition Width="86" />
-                        </Grid.ColumnDefinitions>
+                            </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="8" />
@@ -317,38 +324,30 @@
                             Text="RGB"
                             TextAlignment="Center" />
 
-                        <ui:NumberBox
-                            x:Name="RNumberBox"
-                            Grid.Row="6"
-                            Grid.Column="1"
-                            AutomationProperties.Name="{x:Static p:Resources.Red_value}"
-                            Maximum="255"
-                            Minimum="0"
-                            SpinButtonPlacementMode="Compact"
-                            TextBoxBase.TextChanged="RGBNumberBox_TextChanged" />
-
-                        <ui:NumberBox
-                            x:Name="GNumberBox"
-                            Grid.Row="6"
-                            Grid.Column="2"
-                            Margin="4,0,0,0"
-                            AutomationProperties.Name="{x:Static p:Resources.Green_value}"
-                            Maximum="255"
-                            Minimum="0"
-                            SpinButtonPlacementMode="Compact"
-                            TextBoxBase.TextChanged="RGBNumberBox_TextChanged" />
-
-                        <ui:NumberBox
-                            x:Name="BNumberBox"
-                            Grid.Row="6"
-                            Grid.Column="3"
-                            Margin="4,0,0,0"
-                            AutomationProperties.Name="{x:Static p:Resources.Blue_value}"
-                            Maximum="255"
-                            Minimum="0"
-                            SpinButtonPlacementMode="Compact"
-                            TextBoxBase.TextChanged="RGBNumberBox_TextChanged" />
-
+                            <TextBox
+                                x:Name="RNumberBox"
+                                Grid.Row="6"
+                                Grid.Column="1"
+                                AutomationProperties.Name="{x:Static p:Resources.Red_value}"
+                                PreviewTextInput="TextBox_PreviewTextInput"
+                                TextBoxBase.TextChanged="RGBNumberBox_TextChanged" />
+                            <TextBox
+                                x:Name="GNumberBox"
+                                Grid.Row="6"
+                                Grid.Column="2"
+                                Margin="4,0,0,0"
+                                AutomationProperties.Name="{x:Static p:Resources.Green_value}"
+                                PreviewTextInput="TextBox_PreviewTextInput"
+                                TextBoxBase.TextChanged="RGBNumberBox_TextChanged" />
+                            <TextBox
+                                x:Name="BNumberBox"
+                                Grid.Row="6"
+                                Grid.Column="3"
+                                Margin="4,0,0,0"
+                                AutomationProperties.Name="{x:Static p:Resources.Blue_value}"
+                                PreviewTextInput="TextBox_PreviewTextInput"
+                                TextBoxBase.TextChanged="RGBNumberBox_TextChanged" />
+                      
                         <TextBlock
                             Grid.Row="8"
                             Width="38"
@@ -369,19 +368,21 @@
                             MaxLength="7"
                             TextChanged="HexCode_TextChanged"
                             TextWrapping="Wrap" />
-
-                        <ui:Button
-                            x:Name="OKButton"
-                            Grid.Row="9"
-                            Grid.ColumnSpan="4"
-                            Margin="0,32,0,0"
-                            HorizontalAlignment="Stretch"
-                            Appearance="Primary"
-                            AutomationProperties.Name="{x:Static p:Resources.Select}"
-                            Click="OKButton_Click"
-                            Content="{x:Static p:Resources.Select}" />
-                    </Grid>
-                </ui:Flyout>
+                            
+                            <Button
+                                x:Name="OKButton"
+                                Grid.Row="9"
+                                Grid.ColumnSpan="4"
+                                Margin="0,32,0,0"
+                                HorizontalAlignment="Stretch"
+                                Style="{StaticResource CustomAccentButtonStyle}"
+                                AutomationProperties.Name="{x:Static p:Resources.Select}"
+                                Click="OKButton_Click"
+                                Content="{x:Static p:Resources.Select}" />
+    
+                        </Grid>
+                    </Border>
+                </Popup>
             </Button>
 
 
diff --git a/src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml.cs b/src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml.cs
index 9b189e893ee1..9f65234c5ae7 100644
--- a/src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml.cs
+++ b/src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml.cs
@@ -14,7 +14,6 @@
 
 using ColorPicker.Helpers;
 using ManagedCommon;
-using Wpf.Ui.Controls;
 
 using static System.Net.Mime.MediaTypeNames;
 
@@ -76,9 +75,9 @@ private static void SelectedColorPropertyChanged(DependencyObject d, DependencyP
             control._ignoreRGBChanges = true;
 
             control.HexCode.Text = ColorToHex(newColor);
-            control.RNumberBox.Value = newColor.R;
-            control.GNumberBox.Value = newColor.G;
-            control.BNumberBox.Value = newColor.B;
+            control.RNumberBox.Text = newColor.R.ToString(CultureInfo.InvariantCulture);
+            control.GNumberBox.Text = newColor.G.ToString(CultureInfo.InvariantCulture);
+            control.BNumberBox.Text = newColor.B.ToString(CultureInfo.InvariantCulture);
             control.SetColorFromTextBoxes(System.Drawing.Color.FromArgb(newColor.R, newColor.G, newColor.B));
 
             control._ignoreRGBChanges = false;
@@ -175,9 +174,9 @@ private void UpdateTextBoxesAndCurrentColor(Color currentColor)
 
             if (!_ignoreRGBChanges)
             {
-                RNumberBox.Value = currentColor.R;
-                GNumberBox.Value = currentColor.G;
-                BNumberBox.Value = currentColor.B;
+                RNumberBox.Text = currentColor.R.ToString(CultureInfo.InvariantCulture);
+                GNumberBox.Text = currentColor.G.ToString(CultureInfo.InvariantCulture);
+                BNumberBox.Text = currentColor.B.ToString(CultureInfo.InvariantCulture);
             }
 
             _currentColor = currentColor;
@@ -231,7 +230,7 @@ private void OKButton_Click(object sender, RoutedEventArgs e)
         {
             SelectedColorChangedCommand.Execute(_currentColor);
             SessionEventHelper.Event.EditorColorAdjusted = true;
-            DetailsFlyout.Hide();
+            DetailsFlyout.IsOpen = false;
         }
 
         private void DetailsFlyout_Closed(object sender, object e)
@@ -357,15 +356,19 @@ private void HexCode_GotKeyboardFocus(object sender, KeyboardFocusChangedEventAr
             (sender as System.Windows.Controls.TextBox).SelectAll();
         }
 
+        private void TextBox_PreviewTextInput(object sender, TextCompositionEventArgs e)
+        {
+            e.Handled = !System.Text.RegularExpressions.Regex.IsMatch(e.Text, "^[0-9]+$");
+        }
+
         private void RGBNumberBox_TextChanged(object sender, TextChangedEventArgs e)
         {
             if (!_ignoreRGBChanges)
             {
-                var numberBox = sender as NumberBox;
-
-                byte r = numberBox.Name == "RNumberBox" ? GetValueFromNumberBox(numberBox) : (byte)RNumberBox.Value;
-                byte g = numberBox.Name == "GNumberBox" ? GetValueFromNumberBox(numberBox) : (byte)GNumberBox.Value;
-                byte b = numberBox.Name == "BNumberBox" ? GetValueFromNumberBox(numberBox) : (byte)BNumberBox.Value;
+                var numberBox = sender as TextBox;
+                byte r = numberBox.Name == "RNumberBox" ? GetValueFromNumberBox(numberBox, _currentColor.R) : _currentColor.R;
+                byte g = numberBox.Name == "GNumberBox" ? GetValueFromNumberBox(numberBox, _currentColor.G) : _currentColor.G;
+                byte b = numberBox.Name == "BNumberBox" ? GetValueFromNumberBox(numberBox, _currentColor.B) : _currentColor.B;
 
                 _ignoreRGBChanges = true;
                 SetColorFromTextBoxes(System.Drawing.Color.FromArgb(r, g, b));
@@ -379,22 +382,24 @@ private void RGBNumberBox_TextChanged(object sender, TextChangedEventArgs e)
         /// </summary>
         /// <param name="numberBox">numberBox control which value we want to get</param>
         /// <returns>Validated value as per numberbox conditions, if content is invalid it returns previous value</returns>
-        private static byte GetValueFromNumberBox(NumberBox numberBox)
+        private static byte GetValueFromNumberBox(TextBox numberBox, byte previousValue)
         {
+            int minimum = 0;
+            int maximum = 255;
             double? parsedValue = ParseDouble(numberBox.Text);
 
             if (parsedValue != null)
             {
                 var parsedValueByte = (byte)parsedValue;
 
-                if (parsedValueByte >= numberBox.Minimum && parsedValueByte <= numberBox.Maximum)
+                if (parsedValueByte >= minimum && parsedValueByte <= maximum)
                 {
                     return parsedValueByte;
                 }
             }
 
             // not valid input, return previous value
-            return (byte)numberBox.Value;
+            return previousValue;
         }
 
         public static double? ParseDouble(string text)
diff --git a/src/modules/colorPicker/ColorPickerUI/Helpers/AppStateHandler.cs b/src/modules/colorPicker/ColorPickerUI/Helpers/AppStateHandler.cs
index 09d2aa4d54de..4940bd75e3ad 100644
--- a/src/modules/colorPicker/ColorPickerUI/Helpers/AppStateHandler.cs
+++ b/src/modules/colorPicker/ColorPickerUI/Helpers/AppStateHandler.cs
@@ -138,14 +138,6 @@ private void ShowColorPicker()
                 Application.Current.MainWindow.Opacity = 0;
                 Application.Current.MainWindow.Visibility = Visibility.Visible;
                 _colorPickerShown = true;
-
-                // HACK: WPF UI theme watcher removes the composition target background color, among other weird stuff.
-                // https://github.com/lepoco/wpfui/blob/303f0aefcd59a142bc681415dc4360a34a15f33d/src/Wpf.Ui/Controls/Window/WindowBackdrop.cs#L280
-                // So we set it back with https://github.com/lepoco/wpfui/blob/303f0aefcd59a142bc681415dc4360a34a15f33d/src/Wpf.Ui/Controls/Window/WindowBackdrop.cs#L191
-                // And also reapply the intended backdrop.
-                // This hack fixes: https://github.com/microsoft/PowerToys/issues/31725
-                Wpf.Ui.Controls.WindowBackdrop.RemoveBackground(Application.Current.MainWindow);
-                Wpf.Ui.Controls.WindowBackdrop.ApplyBackdrop(Application.Current.MainWindow, Wpf.Ui.Controls.WindowBackdropType.None);
             }
         }
 
diff --git a/src/modules/colorPicker/ColorPickerUI/MainWindow.xaml.cs b/src/modules/colorPicker/ColorPickerUI/MainWindow.xaml.cs
index ed9feae896a1..7f16c6055e4b 100644
--- a/src/modules/colorPicker/ColorPickerUI/MainWindow.xaml.cs
+++ b/src/modules/colorPicker/ColorPickerUI/MainWindow.xaml.cs
@@ -7,7 +7,6 @@
 using System.Windows.Interop;
 
 using ColorPicker.ViewModelContracts;
-using Wpf.Ui.Controls;
 
 namespace ColorPicker
 {
@@ -20,7 +19,6 @@ public MainWindow()
         {
             Closing += MainWindow_Closing;
             Bootstrapper.InitializeContainer(this);
-            Wpf.Ui.Appearance.SystemThemeWatcher.Watch(this, WindowBackdropType.None);
             InitializeComponent();
             DataContext = this;
             Show(); // Call show just to make sure source is initialized at startup.
diff --git a/src/modules/colorPicker/ColorPickerUI/Resources/Styles.xaml b/src/modules/colorPicker/ColorPickerUI/Resources/Styles.xaml
index 857e536a3127..70ee43e2be7c 100644
--- a/src/modules/colorPicker/ColorPickerUI/Resources/Styles.xaml
+++ b/src/modules/colorPicker/ColorPickerUI/Resources/Styles.xaml
@@ -3,6 +3,8 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:converters="clr-namespace:ColorPicker.Converters"
     xmlns:helpers="clr-namespace:ColorPicker.Helpers">
+    
+    <FontFamily x:Key="IconFontFamily">Segoe Fluent Icons, Segoe MDL2 Assets</FontFamily>
     <!--  CONVERTERS  -->
     <BooleanToVisibilityConverter x:Key="bool2VisibilityConverter" />
     <converters:BoolToInvertedVisibilityConverter x:Key="bool2InvertedVisibilityConverter" />
@@ -11,6 +13,97 @@
     <converters:NumberToVisibilityConverter x:Key="numberToVisibilityConverter" />
     <converters:NumberToInvertedVisibilityConverter x:Key="numberToInvertedVisibilityConverter" />
 
+    <!--  Copied from https://github.com/dotnet/wpf/blob/v9.0.1/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/Button.xaml
+    This can be removed and use AccentButtonStyle when https://github.com/dotnet/wpf/issues/10413 gets fixed.  
+    -->
+    <Style x:Key="CustomAccentButtonStyle" TargetType="{x:Type Button}">
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="Background" Value="{DynamicResource AccentButtonBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource AccentButtonForeground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentControlElevationBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{StaticResource ButtonBorderThemeThickness}" />
+        <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border x:Name="ContentBorder" 
+                     Width="{TemplateBinding Width}" 
+                     Height="{TemplateBinding Height}" 
+                     MinWidth="{TemplateBinding MinWidth}" 
+                     MinHeight="{TemplateBinding MinHeight}" 
+                     Padding="{TemplateBinding Padding}" 
+                     HorizontalAlignment="{TemplateBinding HorizontalAlignment}" 
+                     VerticalAlignment="{TemplateBinding VerticalAlignment}" 
+                     Background="{TemplateBinding Background}" 
+                     BorderBrush="{TemplateBinding BorderBrush}" 
+                     BorderThickness="{TemplateBinding BorderThickness}" 
+                     CornerRadius="{TemplateBinding Border.CornerRadius}">
+                        <ContentPresenter x:Name="ContentPresenter" 
+                         HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
+                         VerticalAlignment="{TemplateBinding VerticalContentAlignment}" 
+                         Content="{TemplateBinding Content}" 
+                         ContentTemplate="{TemplateBinding ContentTemplate}" 
+                         TextElement.Foreground="{TemplateBinding Foreground}" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource AccentButtonBackgroundPointerOver}" />
+                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource AccentButtonForegroundPointerOver}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource AccentButtonBackgroundPressed}" />
+                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource AccentControlElevationBorderBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ButtonBackgroundDisabled}" />
+                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushDisabled}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="TitleBarCloseButtonStyle" TargetType="{x:Type Button}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border x:Name="ContentBorder" 
+                 Background="{TemplateBinding Background}" 
+                 BorderBrush="{TemplateBinding BorderBrush}" 
+                 BorderThickness="{TemplateBinding BorderThickness}" 
+                 CornerRadius="{TemplateBinding Border.CornerRadius}">
+                        <ContentPresenter x:Name="ContentPresenter" 
+                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
+                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}" 
+                     Content="{TemplateBinding Content}" 
+                     ContentTemplate="{TemplateBinding ContentTemplate}" 
+                     TextElement.Foreground="{TemplateBinding Foreground}" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="ContentBorder" Property="Background" Value="Red" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="White" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <Style x:Key="SubtleButtonStyle" TargetType="{x:Type Button}">
         <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
         <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
diff --git a/src/modules/colorPicker/ColorPickerUI/Views/ColorEditorView.xaml b/src/modules/colorPicker/ColorPickerUI/Views/ColorEditorView.xaml
index d63f83a40b20..942ca4dab810 100644
--- a/src/modules/colorPicker/ColorPickerUI/Views/ColorEditorView.xaml
+++ b/src/modules/colorPicker/ColorPickerUI/Views/ColorEditorView.xaml
@@ -6,7 +6,6 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:p="clr-namespace:ColorPicker.Properties"
-    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
     x:Name="colorEditorControl"
     mc:Ignorable="d">
     <Grid>
@@ -22,22 +21,26 @@
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
-            <ui:Button
-                Height="36"
-                VerticalAlignment="Top"
-                AutomationProperties.Name="{x:Static p:Resources.Pick_color}"
-                Command="{Binding OpenColorPickerCommand}"
-                TabIndex="0"
-                ToolTipService.ToolTip="{x:Static p:Resources.Pick_color}">
-                <Button.Content>
-                    <StackPanel Orientation="Horizontal">
-                        <ui:SymbolIcon FontSize="18" Symbol="Eyedropper20" />
-                        <TextBlock Margin="8,0,0,0" Text="{x:Static p:Resources.New_Label}" />
-                    </StackPanel>
+            <Button Height="36"
+                    VerticalAlignment="Top"
+                    AutomationProperties.Name="{x:Static p:Resources.Pick_color}"
+                    Command="{Binding OpenColorPickerCommand}"
+                    TabIndex="0"
+                    ToolTipService.ToolTip="{x:Static p:Resources.Pick_color}">
 
-                </Button.Content>
-            </ui:Button>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock
+                            Margin="0,4,0,0"
+                            FontFamily="{StaticResource IconFontFamily}"
+                            Text="&#xef3c;"/>
 
+                    <!-- The label text -->
+                    <TextBlock Margin="8,0,0,0"
+                            Text="{x:Static p:Resources.New_Label}"
+                            VerticalAlignment="Center" />
+                </StackPanel>
+            </Button>
+            
             <ListView
                 x:Name="HistoryColors"
                 Grid.Column="1"
@@ -67,19 +70,25 @@
                             CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContextMenu}}, Path=PlacementTarget.SelectedItems}"
                             Header="{x:Static p:Resources.Remove}">
                             <MenuItem.Icon>
-                                <ui:SymbolIcon Symbol="Delete24" />
+                                <TextBlock 
+                                    FontFamily="{StaticResource IconFontFamily}"
+                                    Text="&#xE74D;"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <MenuItem Header="{x:Static p:Resources.Export_by}">
                             <MenuItem.Icon>
-                                <ui:SymbolIcon Symbol="ArrowExportLtr24" />
+                                <TextBlock 
+                                    FontFamily="{StaticResource IconFontFamily}"
+                                    Text="&#xEDE1;" />
                             </MenuItem.Icon>
                             <MenuItem
                                 Command="{Binding ExportColorsGroupedByColorCommand}"
                                 CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContextMenu}}, Path=PlacementTarget.SelectedItems}"
                                 Header="{x:Static p:Resources.Export_by_color}">
                                 <MenuItem.Icon>
-                                    <ui:SymbolIcon Symbol="Color20" />
+                                    <TextBlock 
+                                        FontFamily="{StaticResource IconFontFamily}"
+                                        Text="&#xE790;" />
                                 </MenuItem.Icon>
                             </MenuItem>
                             <MenuItem
@@ -87,7 +96,9 @@
                                 CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContextMenu}}, Path=PlacementTarget.SelectedItems}"
                                 Header="{x:Static p:Resources.Export_by_format}">
                                 <MenuItem.Icon>
-                                    <ui:SymbolIcon Symbol="Code20" />
+                                    <TextBlock 
+                                        FontFamily="{StaticResource IconFontFamily}"
+                                        Text="&#xE943;" />
                                 </MenuItem.Icon>
                             </MenuItem>
                         </MenuItem>
@@ -195,7 +206,10 @@
                 TabIndex="2"
                 ToolTipService.ToolTip="{x:Static p:Resources.Open_settings}">
                 <Button.Content>
-                    <ui:SymbolIcon FontSize="18" Symbol="Settings20" />
+                    <TextBlock 
+                        FontFamily="{StaticResource IconFontFamily}"
+                        FontSize="18"
+                        Text="&#xE713;" />
                 </Button.Content>
             </Button>
         </Grid>
@@ -263,7 +277,11 @@
             VerticalAlignment="Center"
             Orientation="Vertical"
             Visibility="{Binding ColorsHistory.Count, Converter={StaticResource numberToInvertedVisibilityConverter}}">
-            <ui:SymbolIcon FontSize="40" Symbol="Eyedropper20" />
+            <TextBlock 
+                FontFamily="{StaticResource IconFontFamily}"
+                HorizontalAlignment="Center"
+                FontSize="36"
+                Text="&#xEF3C;" />
             <TextBlock
                 Margin="24,16,24,16"
                 HorizontalAlignment="Center"
@@ -274,7 +292,8 @@
                 TextWrapping="Wrap" />
         </StackPanel>
 
-        <Border
+        <Border 
+            Background="{DynamicResource {x:Static SystemColors.AccentColorBrushKey}}"
             x:Name="CopiedBorderIndicator"
             Grid.Row="1"
             Grid.ColumnSpan="2"
@@ -284,20 +303,18 @@
             BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
             BorderThickness="0,1,0,0"
             Opacity="0">
-            <Border.Background>
-                <SolidColorBrush Color="{DynamicResource SystemAccentColorPrimary}" />
-            </Border.Background>
             <StackPanel
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
                 AutomationProperties.LiveSetting="Assertive"
                 AutomationProperties.Name="{x:Static p:Resources.Copied_to_clipboard}"
                 Orientation="Horizontal">
-                <ui:SymbolIcon
+                <TextBlock 
+                    FontFamily="{StaticResource IconFontFamily}"
                     Margin="0,0,8,0"
                     FontSize="20"
                     Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"
-                    Symbol="Copy20" />
+                    Text="&#xE8C8;" />
                 <TextBlock
                     FontSize="16"
                     Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"
diff --git a/src/modules/colorPicker/ColorPickerUI/Views/ZoomView.xaml b/src/modules/colorPicker/ColorPickerUI/Views/ZoomView.xaml
index ec3af482207a..2bcddd9e2271 100644
--- a/src/modules/colorPicker/ColorPickerUI/Views/ZoomView.xaml
+++ b/src/modules/colorPicker/ColorPickerUI/Views/ZoomView.xaml
@@ -7,7 +7,6 @@
     xmlns:e="http://schemas.microsoft.com/xaml/behaviors"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:shaders="clr-namespace:ColorPicker.Shaders"
-    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
     Background="Transparent"
     Focusable="False"
     mc:Ignorable="d">
@@ -61,7 +60,7 @@
                     Width="40"
                     Height="40"
                     Background="Transparent">
-                    <ui:SymbolIcon Symbol="Dismiss20" />
+                    Text="&#xE094;" />
                 </Button>
             </Border>
         </Grid>