diff --git a/demo/Ursa.Demo/Ursa.Demo.csproj b/demo/Ursa.Demo/Ursa.Demo.csproj
index 289e90c..5e1d73c 100644
--- a/demo/Ursa.Demo/Ursa.Demo.csproj
+++ b/demo/Ursa.Demo/Ursa.Demo.csproj
@@ -19,7 +19,7 @@
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
-        <PackageReference Include="Semi.Avalonia" Version="11.2.1" />
+        <PackageReference Include="Semi.Avalonia" Version="11.2.1.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Ursa.Themes.Semi/Controls/DatePicker.axaml b/src/Ursa.Themes.Semi/Controls/DatePicker.axaml
index 1ee23c4..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"
-                                Padding="0,0,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 1eab25a..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"
@@ -67,7 +67,7 @@
                             <Button
                                 Name="{x:Static u:DateRangePicker.PART_Button}"
                                 Grid.Column="3"
-                                Padding="8,0"
+                                Margin="8,0"
                                 Content="{DynamicResource CalendarDatePickerIconGlyph}"
                                 Focusable="False"
                                 IsVisible="{Binding !#ClearButton.IsVisible}"
diff --git a/src/Ursa.Themes.Semi/Controls/DateTimePicker.axaml b/src/Ursa.Themes.Semi/Controls/DateTimePicker.axaml
index 172e73c..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"
@@ -59,7 +59,7 @@
                             <Button
                                 Name="PART_Button"
                                 Grid.Column="1"
-                                Padding="0,0,8,0"
+                                Margin="8 0"
                                 IsVisible="{Binding !#ClearButton.IsVisible}"
                                 Content="{DynamicResource DateTimePickerGlyph}"
                                 Focusable="False"
diff --git a/src/Ursa.Themes.Semi/Controls/KeyGestureInput.axaml b/src/Ursa.Themes.Semi/Controls/KeyGestureInput.axaml
index 62d013d..0a0dfa9 100644
--- a/src/Ursa.Themes.Semi/Controls/KeyGestureInput.axaml
+++ b/src/Ursa.Themes.Semi/Controls/KeyGestureInput.axaml
@@ -51,9 +51,8 @@
                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                 Text="{TemplateBinding Gesture,
                                                        Converter={StaticResource KeyGestureConverter}}" />
-                            <Button Grid.Column="0" Grid.ColumnSpan="3"
+                            <Button Grid.Column="1"
                                 Name="PART_ClearButton"
-                                Margin="0,0,8,0"
                                 HorizontalAlignment="Right"
                                 Command="{Binding $parent[u:KeyGestureInput].Clear}"
                                 Content="{DynamicResource IconButtonClearData}"
diff --git a/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml b/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
index 0b6a828..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"
@@ -84,12 +84,9 @@
                                 <PathIcon
                                     x:Name="DropDownGlyph"
                                     Grid.Column="4"
-                                    Width="12"
-                                    Height="12"
-                                    Margin="0,0,10,0"
-                                    HorizontalAlignment="Right"
-                                    VerticalAlignment="Center"
                                     IsVisible="{Binding #ClearButton.IsVisible, Converter={x:Static BoolConverters.Not}}"
+                                    Theme="{DynamicResource InnerPathIcon}"
+                                    Width="{DynamicResource ComboBoxIconWidth}"
                                     Data="{DynamicResource ComboBoxIcon}"
                                     Foreground="{DynamicResource ComboBoxIconDefaultForeground}"
                                     IsHitTestVisible="False"
@@ -97,6 +94,7 @@
                                 <Button
                                     Name="ClearButton"
                                     Grid.Column="4"
+                                    Width="{DynamicResource ComboBoxIconWidth}"
                                     Command="{Binding $parent[u:MultiComboBox].Clear}"
                                     Content="{DynamicResource IconButtonClearData}"
                                     IsVisible="False"
@@ -232,6 +230,7 @@
                             Grid.Column="0"
                             Width="{DynamicResource CheckBoxBoxGlyphWidth}"
                             Height="{DynamicResource CheckBoxBoxGlyphHeight}"
+                            Theme="{DynamicResource InnerPathIcon}"
                             Margin="8,0"
                             VerticalAlignment="Center"
                             Data="{DynamicResource CheckBoxCheckGlyph}"
diff --git a/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml b/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml
index 0baf38e..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"
@@ -88,11 +88,10 @@
                     <PathIcon
                         x:Name="DropDownGlyph"
                         Grid.Column="3"
-                        Width="12"
-                        Height="12"
-                        Margin="0,0,12,0"
+                        Margin="8 0"
                         HorizontalAlignment="Right"
                         VerticalAlignment="Center"
+                        Theme="{DynamicResource InnerPathIcon}"
                         Data="{DynamicResource ComboBoxIcon}"
                         Foreground="{DynamicResource ComboBoxIconDefaultForeground}"
                         IsHitTestVisible="True"