diff --git a/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml b/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml
index 3d28065..3fedde9 100644
--- a/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml
@@ -9,7 +9,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrush}" />
         <Setter Property="BorderThickness" Value="{DynamicResource CalendarDatePickerBorderThickness}" />
         <Setter Property="CornerRadius" Value="{DynamicResource CalendarDatePickerCornerRadius}" />
-        <Setter Property="CalendarDatePicker.IsTodayHighlighted" Value="True" />
+        <Setter Property="IsTodayHighlighted" Value="True" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
@@ -75,7 +75,7 @@
                                     Name="ClearButton"
                                     Grid.Column="1"
                                     Padding="0,0,8,0"
-                                    Content="{DynamicResource TextBoxClearButtonData}"
+                                    Content="{DynamicResource IconButtonClearData}"
                                     Command="{Binding $parent[CalendarDatePicker].Clear}"
                                     Focusable="False"
                                     IsVisible="False"
diff --git a/src/Semi.Avalonia/Controls/ComboBox.axaml b/src/Semi.Avalonia/Controls/ComboBox.axaml
index 8d9b99c..a054633 100644
--- a/src/Semi.Avalonia/Controls/ComboBox.axaml
+++ b/src/Semi.Avalonia/Controls/ComboBox.axaml
@@ -77,7 +77,7 @@
                         <Button
                             Grid.Column="1"
                             Name="ClearButton"
-                            Content="{DynamicResource TextBoxClearButtonData}"
+                            Content="{DynamicResource IconButtonClearData}"
                             IsVisible="False"
                             Command="{Binding $parent[ComboBox].Clear}"
                             Theme="{DynamicResource InnerIconButton}" />
diff --git a/src/Semi.Avalonia/Controls/DatePicker.axaml b/src/Semi.Avalonia/Controls/DatePicker.axaml
index 18abfa0..7a3210a 100644
--- a/src/Semi.Avalonia/Controls/DatePicker.axaml
+++ b/src/Semi.Avalonia/Controls/DatePicker.axaml
@@ -230,7 +230,7 @@
                             Grid.Column="1"
                             Margin="0,0,8,0"
                             Command="{Binding $parent[DatePicker].Clear}"
-                            Content="{DynamicResource TextBoxClearButtonData}"
+                            Content="{DynamicResource IconButtonClearData}"
                             IsVisible="False"
                             Theme="{DynamicResource InnerIconButton}" />
                     </Grid>
diff --git a/src/Semi.Avalonia/Controls/TextBox.axaml b/src/Semi.Avalonia/Controls/TextBox.axaml
index c377fc5..eb0cef0 100644
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -45,25 +45,6 @@
 
     <ControlTheme x:Key="{x:Type TextBox}" TargetType="TextBox">
         <ControlTheme.Resources>
-            <ControlTheme x:Key="InputClearButton" TargetType="Button">
-                <Setter Property="Button.Foreground" Value="{DynamicResource TextBoxButtonDefaultForeground}" />
-                <Setter Property="Button.Cursor" Value="Hand" />
-                <Setter Property="Button.Template">
-                    <ControlTemplate TargetType="Button">
-                        <!--  Background must be transparent or hit test will fail  -->
-                        <ContentControl Background="Transparent">
-                            <PathIcon
-                                Width="16"
-                                Height="16"
-                                Data="{DynamicResource TextBoxClearButtonData}"
-                                Foreground="{TemplateBinding Foreground}" />
-                        </ContentControl>
-                    </ControlTemplate>
-                </Setter>
-                <Style Selector="^:pointerover">
-                    <Setter Property="Button.Foreground" Value="{DynamicResource TextBoxButtonPointeroverForeground}" />
-                </Style>
-            </ControlTheme>
             <ControlTheme x:Key="InputToggleButton" TargetType="ToggleButton">
                 <Setter Property="ToggleButton.Foreground" Value="{DynamicResource TextBoxButtonDefaultForeground}" />
                 <Setter Property="ToggleButton.Cursor" Value="Hand" />
@@ -159,8 +140,9 @@
                                 Name="PART_ClearButton"
                                 Grid.Column="2"
                                 Command="{Binding $parent[TextBox].Clear}"
+                                Content="{DynamicResource IconButtonClearData}"
                                 IsVisible="False"
-                                Theme="{StaticResource InputClearButton}" />
+                                Theme="{StaticResource InnerIconButton}" />
                             <ToggleButton
                                 Name="PART_RevealButton"
                                 Grid.Column="3"
diff --git a/src/Semi.Avalonia/Controls/TimePicker.axaml b/src/Semi.Avalonia/Controls/TimePicker.axaml
index 1c82979..3e34bd6 100644
--- a/src/Semi.Avalonia/Controls/TimePicker.axaml
+++ b/src/Semi.Avalonia/Controls/TimePicker.axaml
@@ -253,7 +253,7 @@
                             Grid.Column="1"
                             Margin="0,0,8,0"
                             Command="{Binding $parent[TimePicker].Clear}"
-                            Content="{DynamicResource TextBoxClearButtonData}"
+                            Content="{DynamicResource IconButtonClearData}"
                             IsVisible="False"
                             Theme="{DynamicResource InnerIconButton}" />
                     </Grid>
diff --git a/src/Semi.Avalonia/Themes/Shared/Button.axaml b/src/Semi.Avalonia/Themes/Shared/Button.axaml
index 275ccea..0532163 100644
--- a/src/Semi.Avalonia/Themes/Shared/Button.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Button.axaml
@@ -9,4 +9,6 @@
     <Thickness x:Key="ButtonBorderThickness">1</Thickness>
 
     <CornerRadius x:Key="ButtonCornerRadius">3</CornerRadius>
+    
+    <StreamGeometry x:Key="IconButtonClearData">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17.0352 16.8626C16.4597 17.4585 15.5101 17.4751 14.9142 16.8996L12.0368 14.121L9.25822 16.9984C8.68274 17.5943 7.73314 17.6109 7.13722 17.0354C6.5413 16.4599 6.52472 15.5103 7.1002 14.9144L9.87883 12.037L7.00147 9.2584C6.40555 8.68293 6.38897 7.73332 6.96445 7.1374C7.53992 6.54148 8.48953 6.52491 9.08545 7.10038L11.9628 9.87901L14.7414 7.00165C15.3169 6.40573 16.2665 6.38916 16.8624 6.96463C17.4584 7.54011 17.4749 8.48971 16.8995 9.08563L14.1208 11.963L16.9982 14.7416C17.5941 15.3171 17.6107 16.2667 17.0352 16.8626Z</StreamGeometry>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/TextBox.axaml b/src/Semi.Avalonia/Themes/Shared/TextBox.axaml
index 46d2a43..ddbb9a4 100644
--- a/src/Semi.Avalonia/Themes/Shared/TextBox.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/TextBox.axaml
@@ -19,7 +19,6 @@
     <Thickness x:Key="TextBoxContentPadding">8 0</Thickness>
     <Thickness x:Key="TextBoxBorderThickness">1</Thickness>
 
-    <StreamGeometry x:Key="TextBoxClearButtonData">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17.0352 16.8626C16.4597 17.4585 15.5101 17.4751 14.9142 16.8996L12.0368 14.121L9.25822 16.9984C8.68274 17.5943 7.73314 17.6109 7.13722 17.0354C6.5413 16.4599 6.52472 15.5103 7.1002 14.9144L9.87883 12.037L7.00147 9.2584C6.40555 8.68293 6.38897 7.73332 6.96445 7.1374C7.53992 6.54148 8.48953 6.52491 9.08545 7.10038L11.9628 9.87901L14.7414 7.00165C15.3169 6.40573 16.2665 6.38916 16.8624 6.96463C17.4584 7.54011 17.4749 8.48971 16.8995 9.08563L14.1208 11.963L16.9982 14.7416C17.5941 15.3171 17.6107 16.2667 17.0352 16.8626Z</StreamGeometry>
     <StreamGeometry x:Key="PasswordBoxRevealButtonData">M12 4C5 4 1 10 1 12C1 14 5 20 12 20C19 20 23 14 23 12C23 10 19 4 12 4ZM17 12C17 14.7614 14.7614 17 12 17C9.23858 17 7 14.7614 7 12C7 9.23858 9.23858 7 12 7C14.7614 7 17 9.23858 17 12ZM12 15C13.6569 15 15 13.6569 15 12C15 10.3431 13.6569 9 12 9C10.3431 9 9 10.3431 9 12C9 13.6569 10.3431 15 12 15Z</StreamGeometry>
     <StreamGeometry x:Key="PasswordBoxHideButtonData">M2.02949 4.67856C2.7593 4.28654 3.66871 4.56038 4.06073 5.29018C6.21313 9.29726 8.83179 11.5 12.0001 11.5C15.1685 11.5 17.7871 9.29726 19.9395 5.29018C20.3315 4.56038 21.241 4.28655 21.9708 4.67856C22.7006 5.07058 22.9744 5.97999 22.5824 6.7098C21.9049 7.97104 21.1385 9.15419 20.2743 10.199L23.2001 14.1C23.6971 14.7627 23.5628 15.7029 22.9001 16.2C22.2373 16.697 21.2971 16.5627 20.8001 15.9L18.1186 12.3246C17.448 12.8501 16.7322 13.2957 15.9687 13.6441L17.4046 17.4733C17.6955 18.249 17.3025 19.1136 16.5268 19.4045C15.7511 19.6954 14.8865 19.3024 14.5956 18.5267L13.0956 14.5267C13.0852 14.4988 13.0756 14.4709 13.0669 14.4428C12.7193 14.4806 12.3638 14.5 12.0001 14.5C11.6365 14.5 11.281 14.4806 10.9333 14.4428C10.9246 14.4709 10.9151 14.4988 10.9046 14.5267L9.40463 18.5267C9.11375 19.3024 8.24913 19.6954 7.47345 19.4045C6.69777 19.1136 6.30476 18.249 6.59564 17.4733L8.03159 13.6441C7.26806 13.2957 6.55223 12.8501 5.88163 12.3246L3.20009 15.9C2.70303 16.5627 1.76283 16.697 1.10009 16.2C0.437347 15.7029 0.303032 14.7627 0.800088 14.1L3.72589 10.1989C2.86177 9.15415 2.09533 7.97101 1.41787 6.70979C1.02585 5.97999 1.29969 5.07057 2.02949 4.67856Z</StreamGeometry>
 </ResourceDictionary>
\ No newline at end of file