From 55a31e7fd64c65bb67fa9f7b1b8a433d4b325fcd Mon Sep 17 00:00:00 2001
From: Nuklon <Nuklon@users.noreply.github.com>
Date: Sat, 23 Aug 2025 13:55:15 +0200
Subject: [PATCH 1/8] Update DatePicker.xaml

---
 src/Wpf.Ui/Controls/DatePicker/DatePicker.xaml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Wpf.Ui/Controls/DatePicker/DatePicker.xaml b/src/Wpf.Ui/Controls/DatePicker/DatePicker.xaml
index c7e7415b2..0af016c30 100644
--- a/src/Wpf.Ui/Controls/DatePicker/DatePicker.xaml
+++ b/src/Wpf.Ui/Controls/DatePicker/DatePicker.xaml
@@ -1,4 +1,4 @@
-<!--
+<!--
     This Source Code Form is subject to the terms of the MIT License.
     If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
     Copyright (C) Leszek Pomianowski and WPF UI Contributors.
@@ -25,7 +25,7 @@
 
     <Style x:Key="DefaultDatePickerTextBoxStyle" TargetType="{x:Type DatePickerTextBox}">
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <!--  Universal WPF UI focus  -->
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
@@ -56,14 +56,11 @@
     </Style>
 
     <Style x:Key="DefaultDatePickerStyle" TargetType="{x:Type DatePicker}">
-        <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
-        <!--  Universal WPF UI focus  -->
         <!--  Universal WPF UI ContextMenu  -->
         <Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}" />
         <!--  Universal WPF UI ContextMenu  -->
         <!--  Default WPF UI Calendar style  -->
-        <Setter Property="CalendarStyle" Value="{DynamicResource DefaultCalendarStyle}" />
+        <Setter Property="CalendarStyle" Value="{DynamicResource DefaultCalendarDropShadowStyle}" />
         <!--  Default WPF UI Calendar style  -->
         <Setter Property="Foreground">
             <Setter.Value>
@@ -88,6 +85,7 @@
         <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DatePicker}">
@@ -125,7 +123,8 @@
                                             VerticalAlignment="Stretch"
                                             ContextMenu="{TemplateBinding ContextMenu}"
                                             Focusable="{TemplateBinding Focusable}"
-                                            Foreground="{TemplateBinding Foreground}" />
+                                            Foreground="{TemplateBinding Foreground}"
+                                            KeyboardNavigation.TabIndex="0" />
                                     </Grid>
                                     <!--  Buttons and Icons have no padding from the main element to allow absolute positions if height is larger than the text entry zone  -->
                                     <controls:Button
@@ -142,7 +141,8 @@
                                         Appearance="Secondary"
                                         Background="Transparent"
                                         BorderBrush="Transparent"
-                                        Cursor="Arrow">
+                                        Cursor="Arrow"
+                                        KeyboardNavigation.TabIndex="1">
                                         <!--  WPF overrides paddings for button  -->
                                         <controls:SymbolIcon
                                             Margin="{StaticResource DatePickerCalendarButtonPadding}"
@@ -172,7 +172,7 @@
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Top"
                             AllowsTransparency="True"
-                            Placement="Mouse"
+                            Placement="Bottom"
                             PlacementTarget="{Binding ElementName=PART_TextBox}"
                             StaysOpen="False" />
                     </Grid>

From d675194f89b55356e532668795228b4fed4b987e Mon Sep 17 00:00:00 2001
From: Nuklon <Nuklon@users.noreply.github.com>
Date: Sat, 23 Aug 2025 13:55:53 +0200
Subject: [PATCH 2/8] Update Calendar.xaml

---
 src/Wpf.Ui/Controls/Calendar/Calendar.xaml | 41 ++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/src/Wpf.Ui/Controls/Calendar/Calendar.xaml b/src/Wpf.Ui/Controls/Calendar/Calendar.xaml
index b4948930d..36756e3b6 100644
--- a/src/Wpf.Ui/Controls/Calendar/Calendar.xaml
+++ b/src/Wpf.Ui/Controls/Calendar/Calendar.xaml
@@ -517,6 +517,47 @@
         </Setter>
     </Style>
 
+    <Style
+        x:Key="DefaultCalendarDropShadowStyle"
+        BasedOn="{StaticResource DefaultCalendarStyle}"
+        TargetType="{x:Type Calendar}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Calendar}">
+                    <controls:EffectThicknessDecorator Thickness="30">
+                        <Border
+                            x:Name="PART_Root"
+                            Margin="0"
+                            Padding="0"
+                            Background="{DynamicResource CalendarViewBackground}"
+                            BorderBrush="{DynamicResource CalendarViewBorderBrush}"
+                            BorderThickness="1"
+                            CornerRadius="8">
+                            <Border.Effect>
+                                <DropShadowEffect
+                                    BlurRadius="20"
+                                    Direction="270"
+                                    Opacity="0.135"
+                                    ShadowDepth="10"
+                                    Color="#202020" />
+                            </Border.Effect>
+                            <CalendarItem
+                                x:Name="PART_CalendarItem"
+                                Margin="0"
+                                Padding="0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Style="{TemplateBinding CalendarItemStyle}" />
+                        </Border>
+                    </controls:EffectThicknessDecorator>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <Style BasedOn="{StaticResource DefaultCalendarStyle}" TargetType="{x:Type Calendar}" />
 
 </ResourceDictionary>

From 275e463db4c98d85d8e6a3ceb6b11a7d3da7e407 Mon Sep 17 00:00:00 2001
From: Nuklon <Nuklon@users.noreply.github.com>
Date: Sun, 24 Aug 2025 17:18:24 +0200
Subject: [PATCH 3/8] Update DatePicker.xaml

---
 .../Controls/DatePicker/DatePicker.xaml       | 46 ++++++++++---------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/Wpf.Ui/Controls/DatePicker/DatePicker.xaml b/src/Wpf.Ui/Controls/DatePicker/DatePicker.xaml
index 0af016c30..215d78355 100644
--- a/src/Wpf.Ui/Controls/DatePicker/DatePicker.xaml
+++ b/src/Wpf.Ui/Controls/DatePicker/DatePicker.xaml
@@ -12,20 +12,24 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+    xmlns:converters="clr-namespace:Wpf.Ui.Converters"
     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <Thickness x:Key="DatePickerBorderThemeThickness">1,1,1,0</Thickness>
     <Thickness x:Key="DatePickerAccentBorderThemeThickness">0,0,0,1</Thickness>
     <Thickness x:Key="DatePickerLeftIconMargin">10,8,0,0</Thickness>
     <Thickness x:Key="DatePickerRightIconMargin">0,8,10,0</Thickness>
-    <Thickness x:Key="DatePickerCalendarButtonMargin">0,5,4,0</Thickness>
+    <Thickness x:Key="DatePickerCalendarButtonMargin">0,2,3,3</Thickness>
     <Thickness x:Key="DatePickerCalendarButtonPadding">0,0,0,0</Thickness>
     <system:Double x:Key="DatePickerCalendarButtonHeight">24</system:Double>
     <system:Double x:Key="DatePickerCalendarButtonIconSize">14</system:Double>
 
+    <converters:NegativeThicknessConverter x:Key="DatePickerNegativeThicknessConverter" />
+    <converters:DatePickerButtonPaddingConverter x:Key="DatePickerButtonPaddingConverter" />
+
     <Style x:Key="DefaultDatePickerTextBoxStyle" TargetType="{x:Type DatePickerTextBox}">
         <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
         <!--  Universal WPF UI focus  -->
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
@@ -110,32 +114,32 @@
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 CornerRadius="{TemplateBinding Border.CornerRadius}">
                                 <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="Auto" />
-                                    </Grid.ColumnDefinitions>
-                                    <Grid Grid.Column="0">
-                                        <DatePickerTextBox
-                                            x:Name="PART_TextBox"
-                                            Margin="0"
-                                            Padding="{TemplateBinding Padding}"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Stretch"
-                                            ContextMenu="{TemplateBinding ContextMenu}"
-                                            Focusable="{TemplateBinding Focusable}"
-                                            Foreground="{TemplateBinding Foreground}"
-                                            KeyboardNavigation.TabIndex="0" />
-                                    </Grid>
+                                    <DatePickerTextBox
+                                        x:Name="PART_TextBox"
+                                        Margin="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=BorderThickness, Converter={StaticResource DatePickerNegativeThicknessConverter}}"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Stretch"
+                                        ContextMenu="{TemplateBinding ContextMenu}"
+                                        Focusable="{TemplateBinding Focusable}"
+                                        Foreground="{TemplateBinding Foreground}"
+                                        KeyboardNavigation.TabIndex="0">
+                                        <DatePickerTextBox.Padding>
+                                            <MultiBinding Converter="{StaticResource DatePickerButtonPaddingConverter}">
+                                                <Binding Path="Padding" RelativeSource="{RelativeSource Mode=TemplatedParent}" />
+                                                <Binding Source="{StaticResource DatePickerCalendarButtonMargin}" />
+                                                <Binding Source="{StaticResource DatePickerCalendarButtonHeight}" />
+                                            </MultiBinding>
+                                        </DatePickerTextBox.Padding>
+                                    </DatePickerTextBox>
                                     <!--  Buttons and Icons have no padding from the main element to allow absolute positions if height is larger than the text entry zone  -->
                                     <controls:Button
                                         x:Name="PART_Button"
-                                        Grid.Column="1"
                                         Width="{StaticResource DatePickerCalendarButtonHeight}"
                                         Height="{StaticResource DatePickerCalendarButtonHeight}"
                                         Margin="{StaticResource DatePickerCalendarButtonMargin}"
                                         Padding="{StaticResource DatePickerCalendarButtonPadding}"
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Top"
+                                        HorizontalAlignment="Right"
+                                        VerticalAlignment="Center"
                                         HorizontalContentAlignment="Center"
                                         VerticalContentAlignment="Center"
                                         Appearance="Secondary"

From 75b115a4c14d886e9bec857713903be248cd774b Mon Sep 17 00:00:00 2001
From: Nuklon <Nuklon@users.noreply.github.com>
Date: Sun, 24 Aug 2025 17:18:46 +0200
Subject: [PATCH 4/8] Create DatePickerButtonPaddingConverter.cs

---
 .../DatePickerButtonPaddingConverter.cs       | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 src/Wpf.Ui/Converters/DatePickerButtonPaddingConverter.cs

diff --git a/src/Wpf.Ui/Converters/DatePickerButtonPaddingConverter.cs b/src/Wpf.Ui/Converters/DatePickerButtonPaddingConverter.cs
new file mode 100644
index 000000000..3db66fdb9
--- /dev/null
+++ b/src/Wpf.Ui/Converters/DatePickerButtonPaddingConverter.cs
@@ -0,0 +1,32 @@
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
+// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
+// All Rights Reserved.
+
+using System.Windows.Data;
+
+namespace Wpf.Ui.Converters;
+
+internal class DatePickerButtonPaddingConverter : IMultiValueConverter
+{
+    /// <inheritdoc />
+    public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (values is [Thickness padding, Thickness buttonMargin, double buttonWidth])
+        {
+            return new Thickness(
+                                 padding.Left,
+                                 padding.Top,
+                                 padding.Right + buttonMargin.Left + buttonMargin.Right + buttonWidth,
+                                 padding.Bottom);
+        }
+
+        return default(Thickness);
+    }
+
+    /// <inheritdoc />
+    public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+    {
+        throw new NotImplementedException();
+    }
+}

From db478cb22dd50f8cbe4a165da3dd0cb17828efe3 Mon Sep 17 00:00:00 2001
From: Nuklon <Nuklon@users.noreply.github.com>
Date: Sun, 24 Aug 2025 17:19:00 +0200
Subject: [PATCH 5/8] Create NegativeThicknessConverter.cs

---
 .../Converters/NegativeThicknessConverter.cs  | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 src/Wpf.Ui/Converters/NegativeThicknessConverter.cs

diff --git a/src/Wpf.Ui/Converters/NegativeThicknessConverter.cs b/src/Wpf.Ui/Converters/NegativeThicknessConverter.cs
new file mode 100644
index 000000000..82e4319d4
--- /dev/null
+++ b/src/Wpf.Ui/Converters/NegativeThicknessConverter.cs
@@ -0,0 +1,28 @@
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
+// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
+// All Rights Reserved.
+
+using System.Windows.Data;
+
+namespace Wpf.Ui.Converters;
+
+internal class NegativeThicknessConverter : IValueConverter
+{
+    /// <inheritdoc />
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (value is Thickness margin)
+        {
+            return new Thickness(-margin.Left, -margin.Top, -margin.Right, -margin.Bottom);
+        }
+
+        return null;
+    }
+
+    /// <inheritdoc />
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        return null;
+    }
+}

From 3b17869be76eaea5b757a2a95c18284b279c9a48 Mon Sep 17 00:00:00 2001
From: Nuklon <Nuklon@users.noreply.github.com>
Date: Mon, 25 Aug 2025 15:35:23 +0200
Subject: [PATCH 6/8] Update DatePicker.xaml

---
 .../Controls/DatePicker/DatePicker.xaml       | 173 ++++++------------
 1 file changed, 57 insertions(+), 116 deletions(-)

diff --git a/src/Wpf.Ui/Controls/DatePicker/DatePicker.xaml b/src/Wpf.Ui/Controls/DatePicker/DatePicker.xaml
index 215d78355..5461f46c5 100644
--- a/src/Wpf.Ui/Controls/DatePicker/DatePicker.xaml
+++ b/src/Wpf.Ui/Controls/DatePicker/DatePicker.xaml
@@ -15,48 +15,26 @@
     xmlns:converters="clr-namespace:Wpf.Ui.Converters"
     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/TextBox/TextBox.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
     <Thickness x:Key="DatePickerBorderThemeThickness">1,1,1,0</Thickness>
     <Thickness x:Key="DatePickerAccentBorderThemeThickness">0,0,0,1</Thickness>
     <Thickness x:Key="DatePickerLeftIconMargin">10,8,0,0</Thickness>
     <Thickness x:Key="DatePickerRightIconMargin">0,8,10,0</Thickness>
-    <Thickness x:Key="DatePickerCalendarButtonMargin">0,2,3,3</Thickness>
+    <Thickness x:Key="DatePickerCalendarButtonMargin">0,6,4,6</Thickness>
     <Thickness x:Key="DatePickerCalendarButtonPadding">0,0,0,0</Thickness>
     <system:Double x:Key="DatePickerCalendarButtonHeight">24</system:Double>
     <system:Double x:Key="DatePickerCalendarButtonIconSize">14</system:Double>
 
-    <converters:NegativeThicknessConverter x:Key="DatePickerNegativeThicknessConverter" />
     <converters:DatePickerButtonPaddingConverter x:Key="DatePickerButtonPaddingConverter" />
 
-    <Style x:Key="DefaultDatePickerTextBoxStyle" TargetType="{x:Type DatePickerTextBox}">
-        <!--  Universal WPF UI focus  -->
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
-        <!--  Universal WPF UI focus  -->
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Stretch" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Foreground">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
-            </Setter.Value>
-        </Setter>
-        <Setter Property="CaretBrush">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
-            </Setter.Value>
-        </Setter>
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type DatePickerTextBox}">
-                    <Border Margin="{TemplateBinding Margin}">
-                        <Decorator x:Name="PART_ContentHost" Margin="{TemplateBinding Padding}" />
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
+    <Style
+        x:Key="DefaultDatePickerTextBoxStyle"
+        BasedOn="{StaticResource DefaultTextBoxStyle}"
+        TargetType="{x:Type DatePickerTextBox}">
+        <Setter Property="Border.CornerRadius" Value="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" />
     </Style>
 
     <Style x:Key="DefaultDatePickerStyle" TargetType="{x:Type DatePicker}">
@@ -82,7 +60,7 @@
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Top" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
         <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
         <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
@@ -102,73 +80,64 @@
                             Grid.Row="0"
                             HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalAlignment}">
-                            <Border
-                                x:Name="ContentBorder"
+                            <DatePickerTextBox
+                                x:Name="PART_TextBox"
                                 MinWidth="{TemplateBinding MinWidth}"
                                 MinHeight="{TemplateBinding MinHeight}"
-                                Padding="0"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Stretch"
-                                Background="{TemplateBinding Background}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Border.CornerRadius}">
-                                <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                                    <DatePickerTextBox
-                                        x:Name="PART_TextBox"
-                                        Margin="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=BorderThickness, Converter={StaticResource DatePickerNegativeThicknessConverter}}"
-                                        HorizontalAlignment="Stretch"
-                                        VerticalAlignment="Stretch"
-                                        ContextMenu="{TemplateBinding ContextMenu}"
-                                        Focusable="{TemplateBinding Focusable}"
-                                        Foreground="{TemplateBinding Foreground}"
-                                        KeyboardNavigation.TabIndex="0">
-                                        <DatePickerTextBox.Padding>
-                                            <MultiBinding Converter="{StaticResource DatePickerButtonPaddingConverter}">
-                                                <Binding Path="Padding" RelativeSource="{RelativeSource Mode=TemplatedParent}" />
-                                                <Binding Source="{StaticResource DatePickerCalendarButtonMargin}" />
-                                                <Binding Source="{StaticResource DatePickerCalendarButtonHeight}" />
-                                            </MultiBinding>
-                                        </DatePickerTextBox.Padding>
-                                    </DatePickerTextBox>
-                                    <!--  Buttons and Icons have no padding from the main element to allow absolute positions if height is larger than the text entry zone  -->
-                                    <controls:Button
-                                        x:Name="PART_Button"
-                                        Width="{StaticResource DatePickerCalendarButtonHeight}"
-                                        Height="{StaticResource DatePickerCalendarButtonHeight}"
-                                        Margin="{StaticResource DatePickerCalendarButtonMargin}"
-                                        Padding="{StaticResource DatePickerCalendarButtonPadding}"
-                                        HorizontalAlignment="Right"
-                                        VerticalAlignment="Center"
-                                        HorizontalContentAlignment="Center"
-                                        VerticalContentAlignment="Center"
-                                        Appearance="Secondary"
-                                        Background="Transparent"
-                                        BorderBrush="Transparent"
-                                        Cursor="Arrow"
-                                        KeyboardNavigation.TabIndex="1">
-                                        <!--  WPF overrides paddings for button  -->
-                                        <controls:SymbolIcon
-                                            Margin="{StaticResource DatePickerCalendarButtonPadding}"
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            FontSize="{StaticResource DatePickerCalendarButtonIconSize}"
-                                            Foreground="{TemplateBinding Foreground}"
-                                            Symbol="CalendarRtl24" />
-                                    </controls:Button>
-                                </Grid>
-                            </Border>
+                                ContextMenu="{TemplateBinding ContextMenu}"
+                                Focusable="{TemplateBinding Focusable}"
+                                FontFamily="{TemplateBinding FontFamily}"
+                                FontSize="{TemplateBinding FontSize}"
+                                Foreground="{TemplateBinding Foreground}"
+                                KeyboardNavigation.TabIndex="0"
+                                Tag="{TemplateBinding Border.CornerRadius}">
+                                <DatePickerTextBox.Padding>
+                                    <MultiBinding Converter="{StaticResource DatePickerButtonPaddingConverter}">
+                                        <Binding Path="Padding" RelativeSource="{RelativeSource Mode=TemplatedParent}" />
+                                        <Binding Source="{StaticResource DatePickerCalendarButtonMargin}" />
+                                        <Binding Source="{StaticResource DatePickerCalendarButtonHeight}" />
+                                    </MultiBinding>
+                                </DatePickerTextBox.Padding>
+                            </DatePickerTextBox>
+                            <!--  Buttons and Icons have no padding from the main element to allow absolute positions if height is larger than the text entry zone  -->
+                            <controls:Button
+                                x:Name="PART_Button"
+                                Width="{StaticResource DatePickerCalendarButtonHeight}"
+                                Height="{StaticResource DatePickerCalendarButtonHeight}"
+                                Margin="{StaticResource DatePickerCalendarButtonMargin}"
+                                Padding="{StaticResource DatePickerCalendarButtonPadding}"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Stretch"
+                                HorizontalContentAlignment="Center"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Appearance="Secondary"
+                                Background="Transparent"
+                                BorderBrush="Transparent"
+                                Cursor="Arrow"
+                                KeyboardNavigation.TabIndex="1">
+                                <!--  WPF overrides paddings for button  -->
+                                <controls:SymbolIcon
+                                    Margin="{StaticResource DatePickerCalendarButtonPadding}"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    FontSize="{StaticResource DatePickerCalendarButtonIconSize}"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    Symbol="CalendarRtl24" />
+                            </controls:Button>
                             <!--  The Accent Border is a separate element so that changes to the border thickness do not affect the position of the element  -->
                             <Border
                                 x:Name="AccentBorder"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Stretch"
+                                BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
                                 BorderThickness="{StaticResource DatePickerAccentBorderThemeThickness}"
-                                CornerRadius="{TemplateBinding Border.CornerRadius}">
-                                <Border.BorderBrush>
-                                    <SolidColorBrush Color="{DynamicResource ControlStrongStrokeColorDefault}" />
-                                </Border.BorderBrush>
-                            </Border>
+                                CornerRadius="{TemplateBinding Border.CornerRadius}" />
                         </Grid>
                         <Popup
                             x:Name="PART_Popup"
@@ -181,38 +150,10 @@
                             StaysOpen="False" />
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsKeyboardFocusWithin" Value="True">
-                            <Setter TargetName="AccentBorder" Property="BorderThickness" Value="0,0,0,2" />
-                            <Setter TargetName="AccentBorder" Property="BorderBrush">
-                                <Setter.Value>
-                                    <SolidColorBrush Color="{DynamicResource SystemAccentColorSecondary}" />
-                                </Setter.Value>
-                            </Setter>
-                            <Setter TargetName="ContentBorder" Property="Background">
-                                <Setter.Value>
-                                    <SolidColorBrush Color="{DynamicResource ControlFillColorInputActive}" />
-                                </Setter.Value>
-                            </Setter>
-                        </Trigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsEnabled" Value="True" />
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsKeyboardFocusWithin" Value="False" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentBorder" Property="Background">
-                                <Setter.Value>
-                                    <SolidColorBrush Color="{DynamicResource ControlFillColorSecondary}" />
-                                </Setter.Value>
-                            </Setter>
-                        </MultiTrigger>
                         <Trigger Property="IsEnabled" Value="True">
                             <Setter Property="Cursor" Value="IBeam" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ControlFillColorDisabledBrush}" />
-                            <Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource ControlStrokeColorDefaultBrush}" />
-                            <Setter TargetName="AccentBorder" Property="BorderBrush" Value="{DynamicResource ControlStrokeColorDefaultBrush}" />
                             <Setter Property="Foreground" Value="{DynamicResource TextFillColorDisabledBrush}" />
                         </Trigger>
                     </ControlTemplate.Triggers>

From 1514d525301f8c3b832b80345db0c5c215b8c377 Mon Sep 17 00:00:00 2001
From: Nuklon <Nuklon@users.noreply.github.com>
Date: Mon, 25 Aug 2025 15:35:46 +0200
Subject: [PATCH 7/8] Delete
 src/Wpf.Ui/Converters/NegativeThicknessConverter.cs

---
 .../Converters/NegativeThicknessConverter.cs  | 28 -------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 src/Wpf.Ui/Converters/NegativeThicknessConverter.cs

diff --git a/src/Wpf.Ui/Converters/NegativeThicknessConverter.cs b/src/Wpf.Ui/Converters/NegativeThicknessConverter.cs
deleted file mode 100644
index 82e4319d4..000000000
--- a/src/Wpf.Ui/Converters/NegativeThicknessConverter.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
-// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
-// All Rights Reserved.
-
-using System.Windows.Data;
-
-namespace Wpf.Ui.Converters;
-
-internal class NegativeThicknessConverter : IValueConverter
-{
-    /// <inheritdoc />
-    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        if (value is Thickness margin)
-        {
-            return new Thickness(-margin.Left, -margin.Top, -margin.Right, -margin.Bottom);
-        }
-
-        return null;
-    }
-
-    /// <inheritdoc />
-    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        return null;
-    }
-}

From 8a9ec96a59c82652e180643fe379e87df47980c2 Mon Sep 17 00:00:00 2001
From: Nuklon <Nuklon@users.noreply.github.com>
Date: Mon, 25 Aug 2025 16:47:43 +0200
Subject: [PATCH 8/8] Do the same styling here as TextBox

Reference: https://github.com/lepoco/wpfui/pull/1520/files
---
 src/Wpf.Ui/Controls/DatePicker/DatePicker.xaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Wpf.Ui/Controls/DatePicker/DatePicker.xaml b/src/Wpf.Ui/Controls/DatePicker/DatePicker.xaml
index 5461f46c5..2ed4c77b8 100644
--- a/src/Wpf.Ui/Controls/DatePicker/DatePicker.xaml
+++ b/src/Wpf.Ui/Controls/DatePicker/DatePicker.xaml
@@ -120,7 +120,11 @@
                                 Background="Transparent"
                                 BorderBrush="Transparent"
                                 Cursor="Arrow"
-                                KeyboardNavigation.TabIndex="1">
+                                KeyboardNavigation.TabIndex="1"
+                                MouseOverBackground="{DynamicResource SubtleFillColorSecondaryBrush}"
+                                MouseOverBorderBrush="Transparent"
+                                PressedBackground="{DynamicResource SubtleFillColorTertiaryBrush}"
+                                PressedBorderBrush="Transparent">
                                 <!--  WPF overrides paddings for button  -->
                                 <controls:SymbolIcon
                                     Margin="{StaticResource DatePickerCalendarButtonPadding}"