diff --git a/controlgallery/AtomUIGallery/ShowCases/Views/General/ButtonShowCase.axaml b/controlgallery/AtomUIGallery/ShowCases/Views/General/ButtonShowCase.axaml
index 40951a7fb..b04b1cedf 100644
--- a/controlgallery/AtomUIGallery/ShowCases/Views/General/ButtonShowCase.axaml
+++ b/controlgallery/AtomUIGallery/ShowCases/Views/General/ButtonShowCase.axaml
@@ -29,7 +29,7 @@
                 <WrapPanel HorizontalAlignment="Left" Orientation="Horizontal" Margin="0, 0, 0, 20">
                     <atom:Button ButtonType="Primary">Primary</atom:Button>
                     <atom:Button>Default</atom:Button>
-              
+
                     <atom:Button ButtonType="Text">Text</atom:Button>
                     <atom:Button ButtonType="Link">Link</atom:Button>
                 </WrapPanel>
@@ -51,8 +51,7 @@
 
         <gallerycontrols:ShowCaseItem
             Title="Size"
-            Description="AtomUI supports three sizes of buttons: small, default and large.
-If a large or small button is desired, set the size property to either large or small respectively. Omit the size property for a button with the default size.">
+            Description="AtomUI supports three sizes of buttons: small, default and large.If a large or small button is desired, set the size property to either large or small respectively. Omit the size property for a button with the default size.">
             <DockPanel Margin="0, 0, 0, 0">
                 <StackPanel Orientation="Horizontal" Spacing="5" DockPanel.Dock="Top">
                     <atom:TextBlock VerticalAlignment="Center">Expand direction:</atom:TextBlock>
@@ -104,33 +103,41 @@ If a large or small button is desired, set the size property to either large or
             Description="You can add an icon through the icon property and adjust the position of the icon using iconPosition.">
             <StackPanel Orientation="Vertical">
                 <WrapPanel HorizontalAlignment="Left" Orientation="Horizontal">
-                    <atom:Button ButtonType="Primary" Shape="Circle" Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}" />
+                    <atom:Button ButtonType="Primary" Shape="Circle"
+                                 Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}" />
                     <atom:Button ButtonType="Primary" Shape="Round"
                                  Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Search
                     </atom:Button>
 
-                    <atom:Button ButtonType="Default" Shape="Circle" Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}" />
-                    <atom:Button ButtonType="Default" Shape="Round" Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
+                    <atom:Button ButtonType="Default" Shape="Circle"
+                                 Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}" />
+                    <atom:Button ButtonType="Default" Shape="Round"
+                                 Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Search
                     </atom:Button>
 
-                    <atom:Button ButtonType="Text" Shape="Default" Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
+                    <atom:Button ButtonType="Text" Shape="Default"
+                                 Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Search
                     </atom:Button>
 
-                    <atom:Button ButtonType="Link" Shape="Default" Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
+                    <atom:Button ButtonType="Link" Shape="Default"
+                                 Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Search
                     </atom:Button>
-                    
-                    <atom:Button ButtonType="Dashed" Shape="Circle" Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}" />
-                    <atom:Button ButtonType="Link" Shape="Default" Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
+
+                    <atom:Button ButtonType="Dashed" Shape="Circle"
+                                 Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}" />
+                    <atom:Button ButtonType="Link" Shape="Default"
+                                 Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Search
                     </atom:Button>
 
                 </WrapPanel>
                 <WrapPanel HorizontalAlignment="Left" Orientation="Horizontal">
-                    <atom:Button ButtonType="Primary" IsDanger="True" Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
+                    <atom:Button ButtonType="Primary" IsDanger="True"
+                                 Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Search
                     </atom:Button>
 
@@ -148,9 +155,11 @@ If a large or small button is desired, set the size property to either large or
                                  Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Search
                     </atom:Button>
-                    
-                    <atom:Button ButtonType="Dashed" Shape="Circle" IsDanger="True" Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}" />
-                    <atom:Button ButtonType="Dashed" Shape="Default" IsDanger="True" Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
+
+                    <atom:Button ButtonType="Dashed" Shape="Circle" IsDanger="True"
+                                 Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}" />
+                    <atom:Button ButtonType="Dashed" Shape="Default" IsDanger="True"
+                                 Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Search
                     </atom:Button>
                 </WrapPanel>
@@ -165,7 +174,8 @@ If a large or small button is desired, set the size property to either large or
                 <WrapPanel>
                     <atom:Button ButtonType="Primary" IsLoading="True">Loading</atom:Button>
                     <atom:Button ButtonType="Primary" SizeType="Small" IsLoading="True">Loading</atom:Button>
-                    <atom:Button ButtonType="Primary" IsLoading="True" Icon="{antdicons:AntDesignIconProvider Kind=PoweroffOutlined}" />
+                    <atom:Button ButtonType="Primary" IsLoading="True"
+                                 Icon="{antdicons:AntDesignIconProvider Kind=PoweroffOutlined}" />
                 </WrapPanel>
                 <WrapPanel>
                     <atom:Button ButtonType="Primary" Click="HandleLoadingBtnClick">Click me!</atom:Button>
@@ -254,16 +264,20 @@ If a large or small button is desired, set the size property to either large or
                         </atom:Button>
                     </WrapPanel>
                     <WrapPanel HorizontalAlignment="Stretch" Orientation="Horizontal">
-                        <atom:Button ButtonType="Primary" IsGhost="True" Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
+                        <atom:Button ButtonType="Primary" IsGhost="True"
+                                     Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                             Primary
                         </atom:Button>
-                        <atom:Button ButtonType="Default" IsGhost="True" Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
+                        <atom:Button ButtonType="Default" IsGhost="True"
+                                     Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                             Default
                         </atom:Button>
-                        <atom:Button ButtonType="Text" IsGhost="True" Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
+                        <atom:Button ButtonType="Text" IsGhost="True"
+                                     Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                             Text
                         </atom:Button>
-                        <atom:Button ButtonType="Link" IsGhost="True" Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
+                        <atom:Button ButtonType="Link" IsGhost="True"
+                                     Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                             Link
                         </atom:Button>
                         <atom:Button ButtonType="Primary" IsDanger="True" IsGhost="True"
@@ -280,90 +294,103 @@ If a large or small button is desired, set the size property to either large or
             Description="To mark a button as disabled, add the disabled property to the Button.">
             <WrapPanel HorizontalAlignment="Stretch" Orientation="Vertical">
                 <StackPanel Orientation="Horizontal">
-                    <atom:Button ButtonType="Primary">
+                    <atom:Button ButtonType="Primary" Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Primary
                     </atom:Button>
-                    <atom:Button ButtonType="Primary" IsEnabled="False">
+                    <atom:Button ButtonType="Primary" IsEnabled="False"
+                                 Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Primary(disabled)
                     </atom:Button>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
-                    <atom:Button ButtonType="Default">
+                    <atom:Button ButtonType="Default" Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Default
                     </atom:Button>
-                    <atom:Button ButtonType="Default" IsEnabled="False">
+                    <atom:Button ButtonType="Default" IsEnabled="False" Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Default(disabled)
                     </atom:Button>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
-                    <atom:Button ButtonType="Dashed">
+                    <atom:Button ButtonType="Dashed" Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Dashed
                     </atom:Button>
-                    <atom:Button ButtonType="Dashed" IsEnabled="False">
+                    <atom:Button ButtonType="Dashed" IsEnabled="False"
+                                 Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Dashed(disabled)
                     </atom:Button>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
-                    <atom:Button ButtonType="Text">
+                    <atom:Button ButtonType="Text" Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Text
                     </atom:Button>
-                    <atom:Button ButtonType="Text" IsEnabled="False">
+                    <atom:Button ButtonType="Text" IsEnabled="False"
+                                 Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Text(disabled)
                     </atom:Button>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
-                    <atom:Button ButtonType="Link">
+                    <atom:Button ButtonType="Link" Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Link
                     </atom:Button>
-                    <atom:Button ButtonType="Link" IsEnabled="False">
+                    <atom:Button ButtonType="Link" IsEnabled="False"
+                                 Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Link(disabled)
                     </atom:Button>
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal">
-                    <atom:Button ButtonType="Primary" IsDanger="True">
+                    <atom:Button ButtonType="Primary" IsDanger="True"
+                                 Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Danger Primary
                     </atom:Button>
-                    <atom:Button ButtonType="Primary" IsDanger="True" IsEnabled="False">
+                    <atom:Button ButtonType="Primary" IsDanger="True" IsEnabled="False"
+                                 Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Danger Primary(disabled)
                     </atom:Button>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
-                    <atom:Button ButtonType="Default" IsDanger="True">
+                    <atom:Button ButtonType="Default" IsDanger="True"
+                                 Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Danger Default
                     </atom:Button>
-                    <atom:Button ButtonType="Default" IsDanger="True" IsEnabled="False">
+                    <atom:Button ButtonType="Default" IsDanger="True" IsEnabled="False"
+                                 Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Danger Default(disabled)
                     </atom:Button>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
-                    <atom:Button ButtonType="Text" IsDanger="True">
+                    <atom:Button ButtonType="Text" IsDanger="True"
+                                 Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Danger Text
                     </atom:Button>
-                    <atom:Button ButtonType="Text" IsDanger="True" IsEnabled="False">
+                    <atom:Button ButtonType="Text" IsDanger="True" IsEnabled="False"
+                                 Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Danger Text(disabled)
                     </atom:Button>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
-                    <atom:Button ButtonType="Link" IsDanger="True">
+                    <atom:Button ButtonType="Link" IsDanger="True"
+                                 Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Danger Link
                     </atom:Button>
-                    <atom:Button ButtonType="Link" IsDanger="True" IsEnabled="False">
+                    <atom:Button ButtonType="Link" IsDanger="True" IsEnabled="False"
+                                 Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
                         Danger Link(disabled)
                     </atom:Button>
                 </StackPanel>
-                
+
                 <Border Background="rgb(190, 200, 200)">
-                <StackPanel Orientation="Horizontal">
-                    <atom:Button IsGhost="True">
-                        Ghost
-                    </atom:Button>
-                    <atom:Button IsGhost="True" IsEnabled="False">
-                        Ghost(disabled)
-                    </atom:Button>
-                </StackPanel>
-            </Border>
-                
+                    <StackPanel Orientation="Horizontal">
+                        <atom:Button IsGhost="True" Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
+                            Ghost
+                        </atom:Button>
+                        <atom:Button IsGhost="True" IsEnabled="False"
+                                     Icon="{antdicons:AntDesignIconProvider Kind=SearchOutlined}">
+                            Ghost(disabled)
+                        </atom:Button>
+                    </StackPanel>
+                </Border>
+
             </WrapPanel>
         </gallerycontrols:ShowCaseItem>
     </gallerycontrols:ShowCasePanel>
diff --git a/src/AtomUI.Controls.Shared/Icon/IconPresenter.cs b/src/AtomUI.Controls.Shared/Icon/IconPresenter.cs
index a9ceba012..1e7fb2605 100644
--- a/src/AtomUI.Controls.Shared/Icon/IconPresenter.cs
+++ b/src/AtomUI.Controls.Shared/Icon/IconPresenter.cs
@@ -47,9 +47,6 @@ public class IconPresenter : TemplatedControl, IMotionAwareControl
     public static readonly StyledProperty<IBrush?> SecondaryFilledBrushProperty =
         IconControl.SecondaryFilledBrushProperty.AddOwner<IconPresenter>();
     
-    public static readonly StyledProperty<IconMode> IconModeProperty =
-        IconControl.IconModeProperty.AddOwner<IconPresenter>();
-    
     public static readonly StyledProperty<bool> IsMotionEnabledProperty =
         MotionAwareControlProperty.IsMotionEnabledProperty.AddOwner<IconPresenter>();
     
@@ -108,12 +105,6 @@ public class IconPresenter : TemplatedControl, IMotionAwareControl
         set => SetValue(SecondaryFilledBrushProperty, value);
     }
     
-    public IconMode IconMode
-    {
-        get => GetValue(IconModeProperty);
-        set => SetValue(IconModeProperty, value);
-    }
-    
     public bool IsMotionEnabled
     {
         get => GetValue(IsMotionEnabledProperty);
diff --git a/src/AtomUI.Controls.Shared/Icon/Themes/IconPresenterTheme.axaml b/src/AtomUI.Controls.Shared/Icon/Themes/IconPresenterTheme.axaml
index f58698a0e..069910a4b 100644
--- a/src/AtomUI.Controls.Shared/Icon/Themes/IconPresenterTheme.axaml
+++ b/src/AtomUI.Controls.Shared/Icon/Themes/IconPresenterTheme.axaml
@@ -11,9 +11,5 @@
         <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorIcon}}" />
         <Setter Property="PrimaryFilledBrush" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorPrimary}}" />
         <Setter Property="SecondaryFilledBrush" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorInfoBg}}" />
-        
-        <Style Selector="^:disabled">
-            <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
-        </Style>
     </ControlTheme>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/AtomUI.Controls.Shared/Icon/Themes/IconTheme.axaml b/src/AtomUI.Controls.Shared/Icon/Themes/IconTheme.axaml
index 338a44d1f..b1a63f9b5 100644
--- a/src/AtomUI.Controls.Shared/Icon/Themes/IconTheme.axaml
+++ b/src/AtomUI.Controls.Shared/Icon/Themes/IconTheme.axaml
@@ -22,8 +22,5 @@
         <Setter Property="SecondaryFilledBrush" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorInfoBg}}" />
         <Setter Property="FillAnimationDuration" Value="{DynamicResource {x:Static atom:SharedTokenKey.MotionDurationMid}}" />
         
-        <Style Selector="^:disabled">
-            <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
-        </Style>
     </ControlTheme>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/AtomUI.Core/Controls/Icon/Icon.cs b/src/AtomUI.Core/Controls/Icon/Icon.cs
index 91bda6645..53784c6d9 100644
--- a/src/AtomUI.Core/Controls/Icon/Icon.cs
+++ b/src/AtomUI.Core/Controls/Icon/Icon.cs
@@ -58,9 +58,6 @@ public class Icon : PathIcon, ICustomHitTest, IMotionAwareControl
         AvaloniaProperty.Register<Icon, TimeSpan>(
             nameof(FillAnimationDuration), TimeSpan.FromMilliseconds(200));
 
-    public static readonly StyledProperty<IconMode> IconModeProperty =
-        AvaloniaProperty.Register<Icon, IconMode>(nameof(IconMode));
-
     public static readonly StyledProperty<bool> IsMotionEnabledProperty =
         MotionAwareControlProperty.IsMotionEnabledProperty.AddOwner<Icon>();
 
@@ -117,16 +114,7 @@ public class Icon : PathIcon, ICustomHitTest, IMotionAwareControl
         get => GetValue(FillAnimationDurationProperty);
         set => SetValue(FillAnimationDurationProperty, value);
     }
-
-    /// <summary>
-    /// Icon 的模式，只对 Outlined 和 Filled 类型有效
-    /// </summary>
-    public IconMode IconMode
-    {
-        get => GetValue(IconModeProperty);
-        set => SetValue(IconModeProperty, value);
-    }
-
+    
     public IconThemeType ThemeType => IconInfo?.ThemeType ?? IconThemeType.Filled;
 
     public IconAnimation LoadingAnimation
diff --git a/src/AtomUI.Desktop.Controls/Buttons/IconButton.cs b/src/AtomUI.Desktop.Controls/Buttons/IconButton.cs
index e3c99c661..aadd293c0 100644
--- a/src/AtomUI.Desktop.Controls/Buttons/IconButton.cs
+++ b/src/AtomUI.Desktop.Controls/Buttons/IconButton.cs
@@ -57,9 +57,6 @@ public class IconButton : AvaloniaButton,
 
     public static readonly StyledProperty<double> IconHeightProperty = 
         AvaloniaProperty.Register<IconButton, double>(nameof(IconHeight));
-    
-    public static readonly StyledProperty<IconMode> IconModeProperty =
-        IconControl.IconModeProperty.AddOwner<IconButton>();
 
     public static readonly StyledProperty<bool> IsEnableHoverEffectProperty = 
         AvaloniaProperty.Register<IconButton, bool>(nameof(IsEnableHoverEffect));
@@ -96,12 +93,6 @@ public class IconButton : AvaloniaButton,
         get => GetValue(IconHeightProperty);
         set => SetValue(IconHeightProperty, value);
     }
-    
-    public IconMode IconMode
-    {
-        get => GetValue(IconModeProperty);
-        set => SetValue(IconModeProperty, value);
-    }
 
     public bool IsEnableHoverEffect
     {
diff --git a/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/BaseButtonTheme.axaml b/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/BaseButtonTheme.axaml
index 72957a0c6..4874d342d 100644
--- a/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/BaseButtonTheme.axaml
+++ b/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/BaseButtonTheme.axaml
@@ -138,6 +138,15 @@
                 <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:ButtonTokenKey.DefaultActiveColor}}" />
             </Style>
         </Style>
+        
+        <Style Selector="^:disabled">
+            <Style Selector="^ /template/ atom|IconPresenter#PART_ButtonIcon">
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
+            </Style>
+            <Style Selector="^ /template/ atom|Icon#PART_LoadingIcon">
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
+            </Style>
+        </Style>
 
         <!--  text 和 icon 都存在的情况 -->
         <Style Selector="^[SizeType=Large]">
diff --git a/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/DashedButtonTheme.axaml b/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/DashedButtonTheme.axaml
index 7eaaced8a..63110b498 100644
--- a/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/DashedButtonTheme.axaml
+++ b/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/DashedButtonTheme.axaml
@@ -211,6 +211,15 @@
             </Style>
             
         </Style>
+        
+        <Style Selector="^:disabled">
+            <Style Selector="^ /template/ atom|IconPresenter#PART_ButtonIcon">
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
+            </Style>
+            <Style Selector="^ /template/ atom|Icon#PART_LoadingIcon">
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
+            </Style>
+        </Style>
 
         <Style Selector="^ /template/ Border#ShadowsFrame">
             <Setter Property="BoxShadow" Value="{DynamicResource {x:Static atom:ButtonTokenKey.DefaultShadow}}" />
diff --git a/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/DefaultButtonTheme.axaml b/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/DefaultButtonTheme.axaml
index d3e652101..d992d571c 100644
--- a/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/DefaultButtonTheme.axaml
+++ b/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/DefaultButtonTheme.axaml
@@ -147,6 +147,15 @@
             </Style>
         </Style>
         
+        <Style Selector="^:disabled">
+            <Style Selector="^ /template/ atom|IconPresenter#PART_ButtonIcon">
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
+            </Style>
+            <Style Selector="^ /template/ atom|Icon#PART_LoadingIcon">
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
+            </Style>
+        </Style>
+        
         <Style Selector="^ /template/ Border#ShadowsFrame">
             <Setter Property="BoxShadow" Value="{DynamicResource {x:Static atom:ButtonTokenKey.DefaultShadow}}" />
         </Style>
diff --git a/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/LinkButtonTheme.axaml b/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/LinkButtonTheme.axaml
index 2f2850f4e..e4d42841c 100644
--- a/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/LinkButtonTheme.axaml
+++ b/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/LinkButtonTheme.axaml
@@ -72,6 +72,15 @@
                 <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorLinkActive}}" />
             </Style>
         </Style>
+        
+        <Style Selector="^:disabled">
+            <Style Selector="^ /template/ atom|IconPresenter#PART_ButtonIcon">
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
+            </Style>
+            <Style Selector="^ /template/ atom|Icon#PART_LoadingIcon">
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
+            </Style>
+        </Style>
 
         <Style Selector="^:danger">
             <Style Selector="^ /template/ atom|IconPresenter#PART_ButtonIcon">
@@ -98,6 +107,15 @@
                     <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorErrorActive}}" />
                 </Style>
             </Style>
+            
+            <Style Selector="^:disabled">
+                <Style Selector="^ /template/ atom|IconPresenter#PART_ButtonIcon">
+                    <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
+                </Style>
+                <Style Selector="^ /template/ atom|Icon#PART_LoadingIcon">
+                    <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
+                </Style>
+            </Style>
         </Style>
     </Style>
 </ControlTheme>
\ No newline at end of file
diff --git a/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/PrimaryButtonTheme.axaml b/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/PrimaryButtonTheme.axaml
index d0269009e..b7e30ca7a 100644
--- a/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/PrimaryButtonTheme.axaml
+++ b/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/PrimaryButtonTheme.axaml
@@ -104,6 +104,15 @@
                 <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:ButtonTokenKey.PrimaryColor}}" />
             </Style>
         </Style>
+        
+        <Style Selector="^:disabled">
+            <Style Selector="^ /template/ atom|IconPresenter#PART_ButtonIcon">
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
+            </Style>
+            <Style Selector="^ /template/ atom|Icon#PART_LoadingIcon">
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
+            </Style>
+        </Style>
 
         <Style Selector="^[IsGhost=True]">
             <Style Selector="^ /template/ atom|IconPresenter#PART_ButtonIcon">
diff --git a/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/TextButtonTheme.axaml b/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/TextButtonTheme.axaml
index e97d91111..a31d74f77 100644
--- a/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/TextButtonTheme.axaml
+++ b/src/AtomUI.Desktop.Controls/Buttons/Themes/Button/TextButtonTheme.axaml
@@ -70,6 +70,15 @@
                 <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:ButtonTokenKey.DefaultColor}}" />
             </Style>
         </Style>
+        
+        <Style Selector="^:disabled">
+            <Style Selector="^ /template/ atom|IconPresenter#PART_ButtonIcon">
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
+            </Style>
+            <Style Selector="^ /template/ atom|Icon#PART_LoadingIcon">
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
+            </Style>
+        </Style>
 
         <Style Selector="^:danger">
             <Style Selector="^ /template/ atom|IconPresenter#PART_ButtonIcon">
@@ -96,6 +105,15 @@
                     <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorErrorActive}}" />
                 </Style>
             </Style>
+            
+            <Style Selector="^:disabled">
+                <Style Selector="^ /template/ atom|IconPresenter#PART_ButtonIcon">
+                    <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
+                </Style>
+                <Style Selector="^ /template/ atom|Icon#PART_LoadingIcon">
+                    <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
+                </Style>
+            </Style>
         </Style>
     </Style>
 
diff --git a/src/AtomUI.Desktop.Controls/Buttons/Themes/HyperLinkButtonTheme.axaml b/src/AtomUI.Desktop.Controls/Buttons/Themes/HyperLinkButtonTheme.axaml
index 540f59bc2..a55ded66e 100644
--- a/src/AtomUI.Desktop.Controls/Buttons/Themes/HyperLinkButtonTheme.axaml
+++ b/src/AtomUI.Desktop.Controls/Buttons/Themes/HyperLinkButtonTheme.axaml
@@ -94,6 +94,15 @@
                 <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorLinkActive}}" />
             </Style>
         </Style>
+        
+        <Style Selector="^:disabled">
+            <Style Selector="^ /template/ atom|IconPresenter#PART_ButtonIcon">
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
+            </Style>
+            <Style Selector="^ /template/ atom|Icon#PART_LoadingIcon">
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
+            </Style>
+        </Style>
 
         <Style Selector="^:danger">
             <Style Selector="^ /template/ atom|IconPresenter#PART_ButtonIcon">
@@ -120,6 +129,15 @@
                     <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorErrorActive}}" />
                 </Style>
             </Style>
+            
+            <Style Selector="^:disabled">
+                <Style Selector="^ /template/ atom|IconPresenter#PART_ButtonIcon">
+                    <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
+                </Style>
+                <Style Selector="^ /template/ atom|Icon#PART_LoadingIcon">
+                    <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
+                </Style>
+            </Style>
         </Style>
         
         <!--  text 和 icon 都存在的情况 -->
diff --git a/src/AtomUI.Desktop.Controls/Input/Themes/SearchButtonTheme.axaml b/src/AtomUI.Desktop.Controls/Input/Themes/SearchButtonTheme.axaml
index aabeebded..01eca4091 100644
--- a/src/AtomUI.Desktop.Controls/Input/Themes/SearchButtonTheme.axaml
+++ b/src/AtomUI.Desktop.Controls/Input/Themes/SearchButtonTheme.axaml
@@ -75,6 +75,15 @@
                 <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:ButtonTokenKey.DefaultActiveColor}}" />
             </Style>
         </Style>
+        
+        <Style Selector="^:disabled">
+            <Style Selector="^ /template/ atom|IconPresenter#PART_ButtonIcon">
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
+            </Style>
+            <Style Selector="^ /template/ atom|Icon#PART_LoadingIcon">
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
+            </Style>
+        </Style>
     </Style>
 
 </ControlTheme>
\ No newline at end of file
diff --git a/src/AtomUI.Desktop.Controls/Menu/Themes/MenuItemTheme.axaml b/src/AtomUI.Desktop.Controls/Menu/Themes/MenuItemTheme.axaml
index 59f7b7ae5..869e6d2ef 100644
--- a/src/AtomUI.Desktop.Controls/Menu/Themes/MenuItemTheme.axaml
+++ b/src/AtomUI.Desktop.Controls/Menu/Themes/MenuItemTheme.axaml
@@ -195,10 +195,6 @@
 
         <Style Selector="^:disabled">
             <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:MenuTokenKey.ItemDisabledColor}}" />
-
-            <Style Selector="^ /template/ atom|IconPresenter#ItemIconPresenter">
-                <Setter Property="IconMode" Value="Disabled" />
-            </Style>
         </Style>
     </Style>
 </ControlTheme>
\ No newline at end of file
diff --git a/src/AtomUI.Desktop.Controls/NavMenu/Themes/BaseNavMenuItemHeaderTheme.axaml b/src/AtomUI.Desktop.Controls/NavMenu/Themes/BaseNavMenuItemHeaderTheme.axaml
index 2f774bfa5..7f1dbe0a3 100644
--- a/src/AtomUI.Desktop.Controls/NavMenu/Themes/BaseNavMenuItemHeaderTheme.axaml
+++ b/src/AtomUI.Desktop.Controls/NavMenu/Themes/BaseNavMenuItemHeaderTheme.axaml
@@ -113,16 +113,6 @@
             </Style>
         </Style>
 
-        <Style Selector="^[IsSelected=True]">
-            <Style Selector="^ /template/ atom|Icon#MenuIndicatorIcon">
-                <Setter Property="IconMode" Value="Selected" />
-            </Style>
-
-            <Style Selector="^ /template/ atom|IconPresenter#ItemIconPresenter">
-                <Setter Property="IconMode" Value="Selected" />
-            </Style>
-        </Style>
-
         <Style Selector="^[HasSubMenu=False]">
             <Style Selector="^ /template/ atom|Icon#MenuIndicatorIcon">
                 <Setter Property="IsVisible" Value="False" />
@@ -155,13 +145,6 @@
             </Style>
         </Style>
 
-        <Style Selector="^:disabled">
-            <Style Selector="^ /template/ atom|IconPresenter#ItemIconPresenter">
-                <Setter Property="Foreground"
-                        Value="{DynamicResource {x:Static atom:NavMenuTokenKey.ItemDisabledColor}}" />
-            </Style>
-        </Style>
-
         <Style Selector="^[IsDarkStyle=True]">
             <Style Selector="^ /template/ atom|IconPresenter#ItemIconPresenter">
                 <Setter Property="Foreground"
@@ -180,13 +163,7 @@
                             Value="{DynamicResource {x:Static atom:NavMenuTokenKey.DarkItemSelectedColor}}" />
                 </Style>
             </Style>
-
-            <Style Selector="^:disabled">
-                <Style Selector="^ /template/ atom|IconPresenter#ItemIconPresenter">
-                    <Setter Property="Foreground"
-                            Value="{DynamicResource {x:Static atom:NavMenuTokenKey.DarkItemDisabledColor}}" />
-                </Style>
-            </Style>
+            
         </Style>
 
         <Style Selector="^:icon">
@@ -198,12 +175,12 @@
         <Style Selector="^:disabled">
             <Setter Property="Foreground"
                     Value="{DynamicResource {x:Static atom:NavMenuTokenKey.ItemDisabledColor}}" />
-            <Style Selector="^ /template/ atom|IconPresenter#ItemIconPresenter">
-                <Setter Property="IconMode" Value="Disabled" />
-            </Style>
-            <Style Selector="^ /template/ atom|Icon#MenuIndicatorIcon">
-                <Setter Property="IconMode" Value="Disabled" />
-            </Style>
+        </Style>
+        
+        
+        <Style Selector="^ /template/ atom|IconPresenter#ItemIconPresenter:disabled">
+            <Setter Property="Foreground"
+                    Value="{DynamicResource {x:Static atom:NavMenuTokenKey.ItemDisabledColor}}" />
         </Style>
 
         <Style Selector="^[IsDarkStyle=True]">
@@ -211,6 +188,10 @@
                 <Setter Property="Foreground"
                         Value="{DynamicResource {x:Static atom:NavMenuTokenKey.DarkItemDisabledColor}}" />
             </Style>
+            <Style Selector="^ /template/ atom|IconPresenter#ItemIconPresenter:disabled">
+                <Setter Property="Foreground"
+                        Value="{DynamicResource {x:Static atom:NavMenuTokenKey.DarkItemDisabledColor}}" />
+            </Style>
         </Style>
     </Style>
 </ControlTheme>
\ No newline at end of file
diff --git a/src/AtomUI.Desktop.Controls/Primitives/SizeTypeAwareIconPresenter/SizeTypeAwareIconPresenter.axaml b/src/AtomUI.Desktop.Controls/Primitives/SizeTypeAwareIconPresenter/SizeTypeAwareIconPresenter.axaml
index 63bc36ff4..9de9b82c0 100644
--- a/src/AtomUI.Desktop.Controls/Primitives/SizeTypeAwareIconPresenter/SizeTypeAwareIconPresenter.axaml
+++ b/src/AtomUI.Desktop.Controls/Primitives/SizeTypeAwareIconPresenter/SizeTypeAwareIconPresenter.axaml
@@ -17,8 +17,7 @@
                     PrimaryFilledBrush="{TemplateBinding PrimaryFilledBrush}"
                     SecondaryFilledBrush="{TemplateBinding SecondaryFilledBrush}"
                     Width="{TemplateBinding IconWidth}"
-                    Height="{TemplateBinding IconHeight}"
-                    IconMode="{TemplateBinding IconMode}" />
+                    Height="{TemplateBinding IconHeight}"/>
             </ControlTemplate>
         </Setter>
 
diff --git a/src/AtomUI.Desktop.Controls/Primitives/SizeTypeAwareIconPresenter/SizeTypeAwareIconPresenter.cs b/src/AtomUI.Desktop.Controls/Primitives/SizeTypeAwareIconPresenter/SizeTypeAwareIconPresenter.cs
index b3f86af66..450247349 100644
--- a/src/AtomUI.Desktop.Controls/Primitives/SizeTypeAwareIconPresenter/SizeTypeAwareIconPresenter.cs
+++ b/src/AtomUI.Desktop.Controls/Primitives/SizeTypeAwareIconPresenter/SizeTypeAwareIconPresenter.cs
@@ -49,9 +49,6 @@ internal class SizeTypeAwareIconPresenter : TemplatedControl, ISizeTypeAware
     public static readonly StyledProperty<double> IconHeightProperty =
         AvaloniaProperty.Register<SizeTypeAwareIconPresenter, double>(nameof(IconHeight), double.NaN);
     
-    public static readonly StyledProperty<IconMode> IconModeProperty =
-        IconControl.IconModeProperty.AddOwner<SizeTypeAwareIconPresenter>();
-    
     public SizeType SizeType
     {
         get => GetValue(SizeTypeProperty);
@@ -124,12 +121,6 @@ internal class SizeTypeAwareIconPresenter : TemplatedControl, ISizeTypeAware
         get => GetValue(SecondaryFilledBrushProperty);
         set => SetValue(SecondaryFilledBrushProperty, value);
     }
-    
-    public IconMode IconMode
-    {
-        get => GetValue(IconModeProperty);
-        set => SetValue(IconModeProperty, value);
-    }
 
     #endregion
     
diff --git a/src/AtomUI.Desktop.Controls/ProgressBar/Themes/AbstractProgressBarTheme.axaml b/src/AtomUI.Desktop.Controls/ProgressBar/Themes/AbstractProgressBarTheme.axaml
index 73d96787b..de25bb5ce 100644
--- a/src/AtomUI.Desktop.Controls/ProgressBar/Themes/AbstractProgressBarTheme.axaml
+++ b/src/AtomUI.Desktop.Controls/ProgressBar/Themes/AbstractProgressBarTheme.axaml
@@ -118,10 +118,6 @@
             <Setter Property="StrokeBrush"
                     Value="{DynamicResource {x:Static atom:SharedTokenKey.ControlItemBgActiveDisabled}}" />
             <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextDisabled}}" />
-        
-            <Style Selector="^ /template/ atom|IconPresenter">
-                <Setter Property="IconMode" Value="Disabled" />
-            </Style>
         </Style>
     </Style>
 </ControlTheme>
\ No newline at end of file