diff --git a/Wox/MainWindow.xaml b/Wox/MainWindow.xaml
index 63c980ec7..278ce5754 100644
--- a/Wox/MainWindow.xaml
+++ b/Wox/MainWindow.xaml
@@ -13,7 +13,7 @@
         Icon="Images\app.png"
         >
     <Window.Resources>
-        <ResourceDictionary Source="/PresentationFramework.Classic,Version=3.0.0.0,Culture=neutral,PublicKeyToken=31bf3856ad364e35,processorArchitecture=MSIL;component/themes/Classic.xaml"/>
+        <ResourceDictionary Source="/PresentationFramework.Classic;component/themes/Classic.xaml"/>
     </Window.Resources>
     <Border Style="{DynamicResource WindowBorderStyle}" MouseDown="Border_OnMouseDown">
         <StackPanel Orientation="Vertical">
diff --git a/Wox/SettingWindow.xaml b/Wox/SettingWindow.xaml
index 9b9b4aafb..1d9e0d941 100644
--- a/Wox/SettingWindow.xaml
+++ b/Wox/SettingWindow.xaml
@@ -188,7 +188,7 @@
                     </Grid.ColumnDefinitions>
                     <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Grid.ColumnSpan="2" Grid.Row="0" Margin="10">
                         <StackPanel.Resources>
-                            <ResourceDictionary Source="/PresentationFramework.Classic,Version=3.0.0.0,Culture=neutral,PublicKeyToken=31bf3856ad364e35,processorArchitecture=MSIL;component/themes/Classic.xaml"/>
+                            <ResourceDictionary Source="/PresentationFramework.Classic;component/themes/Classic.xaml"/>
                         </StackPanel.Resources>
                         <Border Width="500" Style="{DynamicResource WindowBorderStyle}">
                             <Grid>
@@ -203,10 +203,10 @@
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2"  Margin="10">
                         <TextBlock Text="Query Box Font:" />
-                        <ComboBox x:Name="cbQueryBoxFont" ItemsSource="{x:Static Fonts.SystemFontFamilies}" SelectionChanged="CbQueryBoxFont_OnSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="120"/>
+                        <ComboBox x:Name="cbQueryBoxFont" ItemsSource="{x:Static Fonts.SystemFontFamilies}" SelectionChanged="CbQueryBoxFont_OnSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="180"/>
                         <ComboBox
                           x:Name="cbQueryBoxFontFaces"
-                          ItemsSource="{Binding ElementName=cbQueryBoxFont,Path=SelectedValue.FamilyTypefaces}" SelectionChanged="CbQueryBoxFontFaces_OnSelectionChanged">
+                          ItemsSource="{Binding ElementName=cbQueryBoxFont,Path=SelectedValue.FamilyTypefaces}" SelectionChanged="CbQueryBoxFontFaces_OnSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="120">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate>
                                     <ItemsControl ItemsSource="{Binding AdjustedFaceNames}">
@@ -222,10 +222,10 @@
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="10">
                         <TextBlock Text="Result Item Font:" />
-                        <ComboBox x:Name="cbResultItemFont" ItemsSource="{x:Static Fonts.SystemFontFamilies}" SelectionChanged="CbResultItemFont_OnSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="120"/>
+                        <ComboBox x:Name="cbResultItemFont" ItemsSource="{x:Static Fonts.SystemFontFamilies}" SelectionChanged="CbResultItemFont_OnSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="180"/>
                         <ComboBox
                           x:Name="cbResultItemFontFaces"
-                          ItemsSource="{Binding ElementName=cbResultItemFont,Path=SelectedValue.FamilyTypefaces}" SelectionChanged="CbResultItemFontFaces_OnSelectionChanged">
+                          ItemsSource="{Binding ElementName=cbResultItemFont,Path=SelectedValue.FamilyTypefaces}" SelectionChanged="CbResultItemFontFaces_OnSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="120">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate>
                                     <ItemsControl ItemsSource="{Binding AdjustedFaceNames}">