diff --git a/src/Ursa.Themes.Semi/Controls/DatePicker.axaml b/src/Ursa.Themes.Semi/Controls/DatePicker.axaml
index 341da07..84fa4e1 100644
--- a/src/Ursa.Themes.Semi/Controls/DatePicker.axaml
+++ b/src/Ursa.Themes.Semi/Controls/DatePicker.axaml
@@ -51,7 +51,7 @@
                             <Button
                                 Name="ClearButton"
                                 Grid.Column="1"
-                                Padding="0,0,8,0"
+                                Margin="8,0"
                                 Command="{Binding $parent[u:DatePicker].Clear}"
                                 Content="{DynamicResource IconButtonClearData}"
                                 Focusable="False"
@@ -60,7 +60,7 @@
                             <Button
                                 Name="PART_Button"
                                 Grid.Column="1"
-                                Margin="8 0"
+                                Margin="8,0"
                                 IsVisible="{Binding !#ClearButton.IsVisible}"
                                 Content="{DynamicResource CalendarDatePickerIconGlyph}"
                                 Focusable="False"
diff --git a/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml b/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml
index 1209fcd..c9ba2ed 100644
--- a/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml
+++ b/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml
@@ -58,7 +58,7 @@
                             <Button
                                 Name="ClearButton"
                                 Grid.Column="3"
-                                Padding="8,0"
+                                Margin="8,0"
                                 Command="{Binding $parent[u:DateRangePicker].Clear}"
                                 Content="{DynamicResource IconButtonClearData}"
                                 Focusable="False"
diff --git a/src/Ursa.Themes.Semi/Controls/DateTimePicker.axaml b/src/Ursa.Themes.Semi/Controls/DateTimePicker.axaml
index 0d100c6..802b563 100644
--- a/src/Ursa.Themes.Semi/Controls/DateTimePicker.axaml
+++ b/src/Ursa.Themes.Semi/Controls/DateTimePicker.axaml
@@ -50,7 +50,7 @@
                             <Button
                                 Name="ClearButton"
                                 Grid.Column="1"
-                                Padding="0,0,8,0"
+                                Margin="8 0"
                                 Command="{Binding $parent[u:DateTimePicker].Clear}"
                                 Content="{DynamicResource IconButtonClearData}"
                                 Focusable="False"
diff --git a/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml b/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
index 4ed9a59..d69b19e 100644
--- a/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
@@ -26,7 +26,7 @@
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             CornerRadius="{TemplateBinding CornerRadius}">
-                            <Grid Name="PART_RootGrid" ColumnDefinitions="Auto, *, Auto, Auto, 32">
+                            <Grid Name="PART_RootGrid" ColumnDefinitions="Auto, *, Auto, Auto, Auto">
                                 <Border
                                     Name="{x:Static u:MultiComboBox.PART_BackgroundBorder}"
                                     Grid.Column="0"
@@ -94,6 +94,7 @@
                                 <Button
                                     Name="ClearButton"
                                     Grid.Column="4"
+                                    Width="{DynamicResource ComboBoxIconWidth}"
                                     Command="{Binding $parent[u:MultiComboBox].Clear}"
                                     Content="{DynamicResource IconButtonClearData}"
                                     IsVisible="False"
diff --git a/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml b/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml
index 7492707..09c273b 100644
--- a/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml
@@ -79,7 +79,7 @@
                     <Button
                         Name="PART_ClearButton"
                         Grid.Column="3"
-                        Margin="0,0,8,0"
+                        Margin="8 0"
                         Command="{Binding $parent[u:TreeComboBox].Clear}"
                         Content="{DynamicResource IconButtonClearData}"
                         IsVisible="False"