diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index 5980151..b7344a5 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -45,7 +45,7 @@
                                     Grid.Column="1"
                                     Margin="0,24,24,0"
                                     DockPanel.Dock="Right"
-                                    Theme="{DynamicResource CloseButton}" />
+                                    Theme="{DynamicResource OverlayCloseButton}" />
                             </Grid>
                         </Grid>
                     </Border>
@@ -192,7 +192,7 @@
                                     Grid.Column="2"
                                     Margin="0,24,24,0"
                                     DockPanel.Dock="Right"
-                                    Theme="{DynamicResource CloseButton}" />
+                                    Theme="{DynamicResource OverlayCloseButton}" />
                             </Grid>
                             <StackPanel
                                 Grid.Row="2"
diff --git a/src/Ursa.Themes.Semi/Controls/DialogShared.axaml b/src/Ursa.Themes.Semi/Controls/DialogShared.axaml
index e4a1fd2..cc84e71 100644
--- a/src/Ursa.Themes.Semi/Controls/DialogShared.axaml
+++ b/src/Ursa.Themes.Semi/Controls/DialogShared.axaml
@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Add Resources Here  -->
-    
     <ControlTheme x:Key="CloseButton" TargetType="Button">
         <Setter Property="CornerRadius" Value="6" />
         <Setter Property="Margin" Value="0, 4" />
@@ -39,4 +38,34 @@
         </Style>
     </ControlTheme>
     
+    <ControlTheme x:Key="OverlayCloseButton" TargetType="Button">
+        <Setter Property="CornerRadius" Value="6" />
+        <Setter Property="Margin" Value="0, 4" />
+        <Setter Property="Padding" Value="4" />
+        <Setter Property="Height" Value="28" />
+        <Setter Property="Width" Value="28" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="Button">
+                <Border
+                    Name="PART_Border"
+                    Padding="{TemplateBinding Padding}"
+                    Background="Transparent"
+                    CornerRadius="{TemplateBinding CornerRadius}">
+                    <PathIcon
+                        Width="12"
+                        Height="12"
+                        Data="{DynamicResource WindowCloseIconGlyph}"/>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:pointerover /template/ Border">
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
+        </Style>
+        <Style Selector="^:pressed /template/ Border">
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
+        </Style>
+    </ControlTheme>
+    
 </ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Controls/Drawer.axaml b/src/Ursa.Themes.Semi/Controls/Drawer.axaml
index e397fcd..28df5ea 100644
--- a/src/Ursa.Themes.Semi/Controls/Drawer.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Drawer.axaml
@@ -35,7 +35,7 @@
                                     Grid.Column="1"
                                     Margin="0,24,24,0"
                                     DockPanel.Dock="Right"
-                                    Theme="{DynamicResource CloseButton}" />
+                                    Theme="{DynamicResource OverlayCloseButton}" />
                             </Grid>
                         </Grid>
                     </Border>
@@ -107,7 +107,7 @@
                                     Grid.Column="1"
                                     Margin="0,24,24,0"
                                     DockPanel.Dock="Right"
-                                    Theme="{DynamicResource CloseButton}" />
+                                    Theme="{DynamicResource OverlayCloseButton}" />
                             </Grid>
                             <StackPanel
                                 Grid.Row="2"
diff --git a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
index 97cbdc7..33813af 100644
--- a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
@@ -193,7 +193,7 @@
                                     Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
                                     Grid.Column="2"
                                     Margin="0,24,24,0"
-                                    Theme="{DynamicResource CloseButton}" />
+                                    Theme="{DynamicResource OverlayCloseButton}" />
                             </Grid>
                             <Grid
                                 Grid.Row="1"