diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/BreadcrumbItemTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/BreadcrumbItemTemplate.xaml
index 7315ca31..f3f65312 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/BreadcrumbItemTemplate.xaml
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/BreadcrumbItemTemplate.xaml
@@ -28,7 +28,6 @@
                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
                     <i:IconPresenter x:Name="IpIcon"
-                                     Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                      Content="{Binding Icon, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                      Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                     <ContentPresenter VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ButtonTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ButtonTemplate.xaml
index f546d0f5..e6ecd36c 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ButtonTemplate.xaml
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ButtonTemplate.xaml
@@ -118,7 +118,6 @@
                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
                 <i:IconPresenter x:Name="IpIcon"
                                  DockPanel.Dock="{Binding Path=(local:ButtonHelper.IconPlacement), Converter={StaticResource {x:Static irs:ConverterKeys.IconPlacementToDockConverter}}, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                 Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                  Content="{Binding Path=(local:ButtonHelper.Icon), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                  Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                 <ContentPresenter VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ColorPickerTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ColorPickerTemplate.xaml
index 61e44940..4c3cc6cf 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ColorPickerTemplate.xaml
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ColorPickerTemplate.xaml
@@ -30,7 +30,6 @@
                         <ColumnDefinition />
                     </Grid.ColumnDefinitions>
                     <i:IconPresenter x:Name="IpIcon"
-                                     Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                      Content="{Binding Icon, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                      Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                     <ToggleButton Grid.Column="1"
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ComboBoxItemTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ComboBoxItemTemplate.xaml
index 92438e33..2b6bcec3 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ComboBoxItemTemplate.xaml
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ComboBoxItemTemplate.xaml
@@ -28,7 +28,6 @@
                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
                     <i:IconPresenter x:Name="IpIcon"
-                                     Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                      Content="{Binding Path=(local:ComboBoxItemHelper.Icon), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                      Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                     <ContentPresenter Margin="{TemplateBinding Padding}" />
@@ -138,7 +137,6 @@
                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
                     <i:IconPresenter x:Name="IpIcon"
-                                     Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                      Content="{Binding Path=(local:ComboBoxItemHelper.Icon), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                      Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                     <Grid Margin="{TemplateBinding Padding}">
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ComboBoxTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ComboBoxTemplate.xaml
index f59c84ff..9b12bed5 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ComboBoxTemplate.xaml
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ComboBoxTemplate.xaml
@@ -28,7 +28,6 @@
                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
                     <i:IconPresenter x:Name="IpIcon"
-                                     Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                      Content="{Binding Path=(local:ComboBoxHelper.Icon), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                      Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                     <ToggleButton Focusable="False"
@@ -319,7 +318,6 @@
                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
                     <i:IconPresenter x:Name="IpIcon"
-                                     Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                      Content="{Binding Path=(local:ComboBoxHelper.Icon), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                      Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                     <ToggleButton Padding="{TemplateBinding Padding}"
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/DateTimePickerTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/DateTimePickerTemplate.xaml
index 2d461382..0dd3229f 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/DateTimePickerTemplate.xaml
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/DateTimePickerTemplate.xaml
@@ -30,7 +30,6 @@
                         <ColumnDefinition />
                     </Grid.ColumnDefinitions>
                     <i:IconPresenter x:Name="IpIcon"
-                                     Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                      Content="{Binding Icon, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                      Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                     <ToggleButton Grid.Column="1"
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ListBoxItemTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ListBoxItemTemplate.xaml
index c8038d11..ad3b78f1 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ListBoxItemTemplate.xaml
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ListBoxItemTemplate.xaml
@@ -39,7 +39,6 @@
                     <Border Width="{Binding Path=(local:ListBoxHelper.ItemsIconWidth), RelativeSource={RelativeSource AncestorType=ListBox}, Mode=OneWay}">
                         <i:IconPresenter x:Name="IpIcon"
                                          DockPanel.Dock="{Binding Path=(local:ListBoxItemHelper.IconPlacement), Converter={StaticResource {x:Static irs:ConverterKeys.IconPlacementToDockConverter}}, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                         Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                          Content="{Binding Path=(local:ListBoxItemHelper.Icon), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                          Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                     </Border>
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/MenuItemTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/MenuItemTemplate.xaml
index 50cf3d5f..e57af4f8 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/MenuItemTemplate.xaml
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/MenuItemTemplate.xaml
@@ -34,7 +34,6 @@
                         </Grid.ColumnDefinitions>
                         <Grid Width="{Binding Path=(local:MenuHelper.TopLevelItemsIconWidth), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}">
                             <i:IconPresenter x:Name="IpIcon"
-                                             Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                              Content="{TemplateBinding Icon}"
                                              Source="{Binding RelativeSource={RelativeSource AncestorType=MenuItem}, Mode=OneWay}" />
                             <ContentControl x:Name="CcChecked"
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/MultiComboBoxItemTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/MultiComboBoxItemTemplate.xaml
index b9314d39..120c297d 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/MultiComboBoxItemTemplate.xaml
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/MultiComboBoxItemTemplate.xaml
@@ -33,7 +33,6 @@
                     <Grid Width="{Binding ItemsIconWidth, RelativeSource={RelativeSource AncestorType=local:MultiComboBox}, Mode=OneWay}">
                         <Border x:Name="BdrIcon">
                             <i:IconPresenter x:Name="IpIcon"
-                                             Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                              Content="{TemplateBinding Icon}"
                                              Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                         </Border>
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/MultiComboBoxTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/MultiComboBoxTemplate.xaml
index 42bd7e0d..fd5f0acf 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/MultiComboBoxTemplate.xaml
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/MultiComboBoxTemplate.xaml
@@ -48,7 +48,6 @@
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
                         <i:IconPresenter x:Name="IpIcon"
-                                         Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                          Content="{TemplateBinding Icon}"
                                          Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                         <ToggleButton Grid.Column="1"
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/PasswordBoxTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/PasswordBoxTemplate.xaml
index 754eb8e2..39c27b8a 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/PasswordBoxTemplate.xaml
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/PasswordBoxTemplate.xaml
@@ -27,7 +27,6 @@
                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
                 <i:IconPresenter x:Name="IpIcon"
-                                 Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                  Content="{Binding Path=(local:PasswordBoxHelper.Icon), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                  Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                 <Grid>
@@ -67,7 +66,6 @@
                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
                 <i:IconPresenter x:Name="IpIcon"
-                                 Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                  Content="{Binding Path=(local:PasswordBoxHelper.Icon), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                  Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                 <Grid>
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/RepeatButtonTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/RepeatButtonTemplate.xaml
index b8d980b9..01c6ca7b 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/RepeatButtonTemplate.xaml
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/RepeatButtonTemplate.xaml
@@ -117,7 +117,6 @@
                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
                 <i:IconPresenter x:Name="IpIcon"
                                  DockPanel.Dock="{Binding Path=(local:RepeatButtonHelper.IconPlacement), Converter={StaticResource {x:Static irs:ConverterKeys.IconPlacementToDockConverter}}, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                 Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                  Content="{Binding Path=(local:RepeatButtonHelper.Icon), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                  Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                 <ContentPresenter VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/SearchBoxItemTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/SearchBoxItemTemplate.xaml
index 2d05c90a..2ac7ffcb 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/SearchBoxItemTemplate.xaml
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/SearchBoxItemTemplate.xaml
@@ -28,7 +28,6 @@
                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
                     <i:IconPresenter x:Name="IpIcon"
-                                     Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                      Content="{Binding Path=(local:ComboBoxItemHelper.Icon), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                      Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                     <ContentPresenter Margin="{TemplateBinding Padding}" />
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/TextBoxTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/TextBoxTemplate.xaml
index e41d02ce..19b6087a 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/TextBoxTemplate.xaml
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/TextBoxTemplate.xaml
@@ -27,7 +27,6 @@
                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
                 <i:IconPresenter x:Name="IpIcon"
-                                 Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                  Content="{Binding Path=(local:TextBoxHelper.Icon), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                  Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                 <Grid>
@@ -69,7 +68,6 @@
                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
                 <i:IconPresenter x:Name="IpIcon"
-                                 Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                  Content="{Binding Path=(local:TextBoxHelper.Icon), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                  Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
 
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ToggleButtonTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ToggleButtonTemplate.xaml
index b189e423..080695b0 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ToggleButtonTemplate.xaml
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ToggleButtonTemplate.xaml
@@ -168,7 +168,6 @@
                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
                 <i:IconPresenter x:Name="IpIcon"
                                  DockPanel.Dock="{Binding Path=(local:ButtonHelper.IconPlacement), Converter={StaticResource {x:Static irs:ConverterKeys.IconPlacementToDockConverter}}, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                 Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                  Content="{Binding Path=(local:ButtonHelper.Icon), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                  Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                 <ContentPresenter x:Name="CpContent"
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI/Properties/AssemblyInfo.cs b/SourceCode/SharedResources/Panuon.WPF.UI/Properties/AssemblyInfo.cs
index 4e4250de..b895788d 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI/Properties/AssemblyInfo.cs
+++ b/SourceCode/SharedResources/Panuon.WPF.UI/Properties/AssemblyInfo.cs
@@ -25,5 +25,5 @@
     ResourceDictionaryLocation.SourceAssembly
 )]
 
-[assembly: AssemblyVersion("1.1.11.9")]
-[assembly: AssemblyFileVersion("1.1.11.9")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.1.11.10")]
+[assembly: AssemblyFileVersion("1.1.11.10")]
\ No newline at end of file