diff --git a/src/Ursa.Themes.Semi/Controls/DialogShared.axaml b/src/Ursa.Themes.Semi/Controls/DialogShared.axaml
index 4ddc3a6..bcaf861 100644
--- a/src/Ursa.Themes.Semi/Controls/DialogShared.axaml
+++ b/src/Ursa.Themes.Semi/Controls/DialogShared.axaml
@@ -9,7 +9,7 @@
     </Design.PreviewWith>
 
     <ControlTheme x:Key="OverlayCloseButton" TargetType="Button">
-        <Setter Property="CornerRadius" Value="6" />
+        <Setter Property="CornerRadius" Value="3" />
         <Setter Property="Height" Value="24" />
         <Setter Property="Width" Value="24" />
         <Setter Property="Padding" Value="4" />
diff --git a/src/Ursa.Themes.Semi/Controls/DualBadge.axaml b/src/Ursa.Themes.Semi/Controls/DualBadge.axaml
index 79859b1..2e2a3fb 100644
--- a/src/Ursa.Themes.Semi/Controls/DualBadge.axaml
+++ b/src/Ursa.Themes.Semi/Controls/DualBadge.axaml
@@ -49,6 +49,7 @@
                             Name="{x:Static u:DualBadge.PART_ContentPresenter}"
                             Grid.Column="1"
                             TextElement.FontSize="{TemplateBinding FontSize}"
+                            IsVisible="{TemplateBinding Content,Converter={x:Static ObjectConverters.IsNotNull}}"
                             Foreground="{TemplateBinding Foreground}"
                             Background="{TemplateBinding Background}"
                             Padding="{TemplateBinding Padding}"
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/NavigationMenu.axaml b/src/Ursa.Themes.Semi/Themes/Shared/NavigationMenu.axaml
index 7b8ec35..e6de440 100644
--- a/src/Ursa.Themes.Semi/Themes/Shared/NavigationMenu.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Shared/NavigationMenu.axaml
@@ -1,25 +1,23 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=netstandard">
-    <Geometry x:Key="NavigationMenuExpandIconGlyph">M5 2H19C20.6569 2 22 3.34315 22 5V19C22 20.6569 20.6569 22 19 22H5C3.34315 22 2 20.6569 2 19V5C2 3.34315 3.34315 2 5 2ZM6 4C5.44772 4 5 4.44772 5 5V19C5 19.5523 5.44772 20 6 20H9C9.55229 20 10 19.5523 10 19V5C10 4.44772 9.55229 4 9 4H6Z</Geometry>
-    <Geometry x:Key="NavigationMenuItemExpandIconGlyph">M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z</Geometry>
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StaticResource x:Key="NavigationMenuItemExpandIconGlyph" ResourceKey="SemiIconChevronDown" />
 
-    <sys:Double x:Key="NavigationMenuExpandWidth">260</sys:Double>
-    <sys:Double x:Key="NavigationMenuClosedWidth">80</sys:Double>
-    <sys:Double x:Key="NavigationMenuExpandIconWidth">16</sys:Double>
-    <sys:Double x:Key="NavigationMenuExpandIconHeight">16</sys:Double>
+    <x:Double x:Key="NavigationMenuExpandWidth">260</x:Double>
+    <x:Double x:Key="NavigationMenuClosedWidth">80</x:Double>
+    <x:Double x:Key="NavigationMenuExpandIconWidth">16</x:Double>
+    <x:Double x:Key="NavigationMenuExpandIconHeight">16</x:Double>
 
-    <sys:Double x:Key="NavigationMenuItemIconMinWidth">24</sys:Double>
-    <sys:Double x:Key="NavigationMenuItemExpandIconWidth">8</sys:Double>
-    <sys:Double x:Key="NavigationMenuItemExpandIconHeight">8</sys:Double>
+    <x:Double x:Key="NavigationMenuItemIconMinWidth">24</x:Double>
+    <x:Double x:Key="NavigationMenuItemExpandIconWidth">8</x:Double>
+    <x:Double x:Key="NavigationMenuItemExpandIconHeight">8</x:Double>
     <Thickness x:Key="NavigationMenuItemIconMargin">0</Thickness>
-    <sys:Double x:Key="NavigationMenuItemCollapsedHeight">0</sys:Double>
-    <sys:Double x:Key="NavigationMenuItemCollapsedOpacity">0</sys:Double>
+    <x:Double x:Key="NavigationMenuItemCollapsedHeight">0</x:Double>
+    <x:Double x:Key="NavigationMenuItemCollapsedOpacity">0</x:Double>
 
-    <sys:Double x:Key="NavigationMenuSeparatorHeaderFontSize">12</sys:Double>
-    <sys:Double x:Key="NavigationMenuSeparatorBorderHeight">1</sys:Double>
-    <sys:Double x:Key="NavigationMenuSeparatorClosedWidth">32</sys:Double>
+    <x:Double x:Key="NavigationMenuSeparatorHeaderFontSize">12</x:Double>
+    <x:Double x:Key="NavigationMenuSeparatorBorderHeight">1</x:Double>
+    <x:Double x:Key="NavigationMenuSeparatorClosedWidth">32</x:Double>
 
 
     <Thickness x:Key="NavigationMenuHeaderMargin">12</Thickness>