diff --git a/Wino.Core.UWP/Controls/WinoAppTitleBar.xaml b/Wino.Core.UWP/Controls/WinoAppTitleBar.xaml
index 23bf72b1..ff32a9a3 100644
--- a/Wino.Core.UWP/Controls/WinoAppTitleBar.xaml
+++ b/Wino.Core.UWP/Controls/WinoAppTitleBar.xaml
@@ -97,7 +97,7 @@
             </TextBlock>
 
             <!--  Shell Sub Content  -->
-            <Grid Grid.Column="1" Canvas.ZIndex="2">
+            <Grid Grid.Column="1" Canvas.ZIndex="999">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="Auto" />
diff --git a/Wino.Core.UWP/Controls/WinoAppTitleBar.xaml.cs b/Wino.Core.UWP/Controls/WinoAppTitleBar.xaml.cs
index 7514fdd8..cc279f66 100644
--- a/Wino.Core.UWP/Controls/WinoAppTitleBar.xaml.cs
+++ b/Wino.Core.UWP/Controls/WinoAppTitleBar.xaml.cs
@@ -154,7 +154,7 @@ namespace Wino.Core.UWP.Controls
         {
             if (IsDragArea)
             {
-                Window.Current.SetTitleBar(this);
+                Window.Current.SetTitleBar(dragbar);
             }
         }
 
diff --git a/Wino.Core.UWP/CoreGeneric.xaml b/Wino.Core.UWP/CoreGeneric.xaml
index 0c20d1d8..3387e142 100644
--- a/Wino.Core.UWP/CoreGeneric.xaml
+++ b/Wino.Core.UWP/CoreGeneric.xaml
@@ -15,6 +15,7 @@
         <ResourceDictionary Source="Styles/FontIcons.xaml" />
         <ResourceDictionary Source="Styles/WinoInfoBar.xaml" />
         <ResourceDictionary Source="Styles/SharedStyles.xaml" />
+        <ResourceDictionary Source="Styles/IconTemplates.xaml" />
 
         <styles:CustomMessageDialogStyles />
         <styles:DataTemplates />
@@ -98,3 +99,4 @@
         <ResourceDictionary Source="AppThemes/Mica.xaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
+