diff --git a/src/DesktopMagic/Dialogs/ColorDialog.xaml b/src/DesktopMagic/Dialogs/ColorDialog.xaml
index 96c3fd1..16bf62b 100644
--- a/src/DesktopMagic/Dialogs/ColorDialog.xaml
+++ b/src/DesktopMagic/Dialogs/ColorDialog.xaml
@@ -62,9 +62,7 @@
                 </DockPanel>
             </Grid>
             <DockPanel Margin="0 5 0 0">
-                <Border CornerRadius="1" BorderThickness="1.5" BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}" Background="White" Height="35" Width="35" Margin="0,0,5,0">
-                    <Rectangle x:Name="colorRechtangle" Fill="White" />
-                </Border>
+                <Border x:Name="colorRechtangle" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource ControlElevationBorderBrush}" Background="White" Height="30" Width="30" Margin="0,0,10,0" />
                 <TextBox x:Name="colorHexTextBox" MaxLength="9" CharacterCasing="Upper" TextWrapping="Wrap" TextChanged="ColorHexTextBox_TextChanged" RenderTransformOrigin="0.5,0.5" VerticalContentAlignment="Center"/>
             </DockPanel>
         </StackPanel>
diff --git a/src/DesktopMagic/Dialogs/ColorDialog.xaml.cs b/src/DesktopMagic/Dialogs/ColorDialog.xaml.cs
index 4669e7c..0b860a8 100644
--- a/src/DesktopMagic/Dialogs/ColorDialog.xaml.cs
+++ b/src/DesktopMagic/Dialogs/ColorDialog.xaml.cs
@@ -88,7 +88,7 @@ public partial class ColorDialog : FluentWindow
 
             ResultBrush = brush;
             ResultColor = systemColor;
-            colorRechtangle.Fill = brush;
+            colorRechtangle.Background = brush;
             colorHexTextBox.Foreground = FindResource("TextFillColorPrimaryBrush") as Brush;
         }
         else
diff --git a/src/DesktopMagic/Dialogs/ThemeDialog.xaml b/src/DesktopMagic/Dialogs/ThemeDialog.xaml
index 826709f..e97fad9 100644
--- a/src/DesktopMagic/Dialogs/ThemeDialog.xaml
+++ b/src/DesktopMagic/Dialogs/ThemeDialog.xaml
@@ -70,21 +70,15 @@
                     </Grid.RowDefinitions>
 
                     <DockPanel Grid.Row="0">
-                        <Border CornerRadius="1" BorderThickness="1.5" BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}" Background="White" Height="30" Width="30" Margin="0,0,5,0">
-                            <Rectangle x:Name="primaryColorRechtangle" Fill="White" />
-                        </Border>
+                        <Border x:Name="primaryColorRechtangle" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource ControlElevationBorderBrush}" Background="White" Height="30" Width="30" Margin="0,0,10,0" />
                         <Button Content="Change Primary Color" FontWeight="Regular" Click="ChangePrimaryColorButton_Click" HorizontalAlignment="Stretch" />
                     </DockPanel>
                     <DockPanel Grid.Row="1">
-                        <Border CornerRadius="1" BorderThickness="1.5" BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}" Background="White" Height="30" Width="30" Margin="0,0,5,0">
-                            <Rectangle x:Name="secondaryColorRechtangle" Fill="White" />
-                        </Border>
+                        <Border x:Name="secondaryColorRechtangle" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource ControlElevationBorderBrush}" Background="White" Height="30" Width="30" Margin="0,0,10,0" />
                         <Button Content="Change Secondary Color" FontWeight="Regular" Click="ChangeSecondaryColorButton_Click" HorizontalAlignment="Stretch" />
                     </DockPanel>
                     <DockPanel Grid.Row="2">
-                        <Border CornerRadius="1" BorderThickness="1.5" BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}" Background="White" Height="30" Width="30" Margin="0,0,5,0">
-                            <Rectangle x:Name="backgroundColorRechtangle" Fill="White" />
-                        </Border>
+                        <Border x:Name="backgroundColorRechtangle" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource ControlElevationBorderBrush}" Background="White" Height="30" Width="30" Margin="0,0,10,0" />
                         <Button Content="Change Background Color" FontWeight="Regular" Click="ChangeBackgroundColorButton_Click" HorizontalAlignment="Stretch" />
                     </DockPanel>
                 </Grid>
diff --git a/src/DesktopMagic/Dialogs/ThemeDialog.xaml.cs b/src/DesktopMagic/Dialogs/ThemeDialog.xaml.cs
index 65e91d6..38fbb19 100644
--- a/src/DesktopMagic/Dialogs/ThemeDialog.xaml.cs
+++ b/src/DesktopMagic/Dialogs/ThemeDialog.xaml.cs
@@ -24,9 +24,9 @@ public partial class ThemeDialog : Wpf.Ui.Controls.FluentWindow
 
         cornerRadiusTextBox.Value = theme.CornerRadius;
         marginTextBox.Value = theme.Margin;
-        primaryColorRechtangle.Fill = new SolidColorBrush(MultiColorConverter.ConvertToMediaColor(theme.PrimaryColor));
-        secondaryColorRechtangle.Fill = new SolidColorBrush(MultiColorConverter.ConvertToMediaColor(theme.SecondaryColor));
-        backgroundColorRechtangle.Fill = new SolidColorBrush(MultiColorConverter.ConvertToMediaColor(theme.BackgroundColor));
+        primaryColorRechtangle.Background = new SolidColorBrush(MultiColorConverter.ConvertToMediaColor(theme.PrimaryColor));
+        secondaryColorRechtangle.Background = new SolidColorBrush(MultiColorConverter.ConvertToMediaColor(theme.SecondaryColor));
+        backgroundColorRechtangle.Background = new SolidColorBrush(MultiColorConverter.ConvertToMediaColor(theme.BackgroundColor));
 
         label.Content = content;
         Title = title;
@@ -81,7 +81,7 @@ public partial class ThemeDialog : Wpf.Ui.Controls.FluentWindow
         if (colorDialog.ShowDialog() == true)
         {
             theme.PrimaryColor = colorDialog.ResultColor;
-            primaryColorRechtangle.Fill = colorDialog.ResultBrush;
+            primaryColorRechtangle.Background = colorDialog.ResultBrush;
         }
     }
 
@@ -95,7 +95,7 @@ public partial class ThemeDialog : Wpf.Ui.Controls.FluentWindow
         if (colorDialog.ShowDialog() == true)
         {
             theme.SecondaryColor = colorDialog.ResultColor;
-            secondaryColorRechtangle.Fill = colorDialog.ResultBrush;
+            secondaryColorRechtangle.Background = colorDialog.ResultBrush;
         }
     }
 
@@ -109,7 +109,7 @@ public partial class ThemeDialog : Wpf.Ui.Controls.FluentWindow
         if (colorDialog.ShowDialog() == true)
         {
             theme.BackgroundColor = colorDialog.ResultColor;
-            backgroundColorRechtangle.Fill = colorDialog.ResultBrush;
+            backgroundColorRechtangle.Background = colorDialog.ResultBrush;
         }
     }