diff --git a/Actions/ShowFloatingWindowAction.cs b/Actions/ShowFloatingWindowAction.cs
index 53fc169..94aceae 100644
--- a/Actions/ShowFloatingWindowAction.cs
+++ b/Actions/ShowFloatingWindowAction.cs
@@ -35,9 +35,9 @@ protected override async Task OnInvoke()
                 _logger.LogDebug("没有可用的悬浮窗组件，强制隐藏悬浮窗");
             }
 
-            if (IsRevertable)
+            if (IsRevertable && config != null)
             {
-                PreviousStates[ActionSet.Guid] = GlobalConstants.MainConfig!.Data.ShowFloatingWindow;
+                PreviousStates[ActionSet.Guid] = config.ShowFloatingWindow;
             }
 
             if (config != null)
@@ -70,8 +70,15 @@ protected override async Task OnRevert()
             return;
         }
 
-        GlobalConstants.MainConfig!.Data.ShowFloatingWindow = previousState;
-        GlobalConstants.MainConfig.Save();
+        var config = GlobalConstants.MainConfig;
+        if (config == null)
+        {
+            _logger.LogWarning("主配置为空，无法恢复悬浮窗状态");
+            return;
+        }
+
+        config.Data.ShowFloatingWindow = previousState;
+        config.Save();
         _floatingWindowService.UpdateWindowState();
 
         _logger.LogInformation("已恢复悬浮窗状态为: {State}", previousState ? "开启" : "关闭");
diff --git a/Actions/SwitchFloatingWindowThemeAction.cs b/Actions/SwitchFloatingWindowThemeAction.cs
index f641496..f33b6ae 100644
--- a/Actions/SwitchFloatingWindowThemeAction.cs
+++ b/Actions/SwitchFloatingWindowThemeAction.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Threading.Tasks;
 using ClassIsland.Core.Abstractions.Automation;
 using ClassIsland.Core.Attributes;
@@ -6,6 +7,7 @@
 using Microsoft.Extensions.Logging;
 using SystemTools.Services;
 using SystemTools.Settings;
+using SystemTools.Shared;
 
 namespace SystemTools.Actions;
 
@@ -16,6 +18,7 @@ namespace SystemTools.Actions;
 public class SwitchFloatingWindowThemeAction(ILogger<SwitchFloatingWindowThemeAction> logger) : ActionBase<SwitchFloatingWindowThemeSettings>
 {
     private readonly ILogger<SwitchFloatingWindowThemeAction> _logger = logger;
+    private static readonly ConcurrentDictionary<Guid, int> PreviousThemes = new();
 
     protected override async Task OnInvoke()
     {
@@ -24,14 +27,25 @@ protected override async Task OnInvoke()
         try
         {
             var service = IAppHost.GetService<FloatingWindowService>();
+            var config = GlobalConstants.MainConfig?.Data;
 
             if (Settings.TargetTheme >= 0)
             {
+                if (IsRevertable && config != null)
+                {
+                    PreviousThemes[ActionSet.Guid] = config.FloatingWindowTheme;
+                }
+
                 service.SetWindowTheme(Settings.TargetTheme);
                 _logger.LogInformation("已设置悬浮窗主题为: {Theme}", GetThemeName(Settings.TargetTheme));
             }
             else
             {
+                if (IsRevertable && config != null)
+                {
+                    PreviousThemes[ActionSet.Guid] = config.FloatingWindowTheme;
+                }
+
                 service.ToggleWindowTheme();
                 _logger.LogInformation("已切换到下一个悬浮窗主题");
             }
@@ -46,6 +60,29 @@ protected override async Task OnInvoke()
         _logger.LogDebug("SwitchFloatingWindowThemeAction OnInvoke 完成");
     }
 
+    protected override async Task OnRevert()
+    {
+        await base.OnRevert();
+
+        if (!PreviousThemes.TryRemove(ActionSet.Guid, out var previousTheme))
+        {
+            _logger.LogInformation("未找到主题恢复快照，跳过悬浮窗主题恢复。ActionSet={ActionSetGuid}", ActionSet.Guid);
+            return;
+        }
+
+        try
+        {
+            var service = IAppHost.GetService<FloatingWindowService>();
+            service.SetWindowTheme(previousTheme);
+            _logger.LogInformation("已恢复悬浮窗主题为: {Theme}", GetThemeName(previousTheme));
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "恢复悬浮窗主题失败");
+            throw;
+        }
+    }
+
     private static string GetThemeName(int theme)
     {
         return theme switch
diff --git a/Actions/ToggleFloatingWindowLayerAction.cs b/Actions/ToggleFloatingWindowLayerAction.cs
index 1382ece..d1edcd3 100644
--- a/Actions/ToggleFloatingWindowLayerAction.cs
+++ b/Actions/ToggleFloatingWindowLayerAction.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Threading.Tasks;
 using ClassIsland.Core.Abstractions.Automation;
 using ClassIsland.Core.Attributes;
@@ -16,6 +17,7 @@ namespace SystemTools.Actions;
 public class ToggleFloatingWindowLayerAction(ILogger<ToggleFloatingWindowLayerAction> logger) : ActionBase<ToggleFloatingWindowLayerSettings>
 {
     private readonly ILogger<ToggleFloatingWindowLayerAction> _logger = logger;
+    private static readonly ConcurrentDictionary<Guid, int> PreviousLayers = new();
 
     protected override async Task OnInvoke()
     {
@@ -24,16 +26,27 @@ protected override async Task OnInvoke()
         try
         {
             var service = IAppHost.GetService<FloatingWindowService>();
+            var profile = service.ProfileManager.CurrentProfile;
 
             // 根据设置决定是切换还是设置到指定层级
-            // TargetLayer: -1=切换, 0=置顶, 1=置底
+            // TargetLayer: -1=切换, 0=置底, 1=置顶
             if (Settings.TargetLayer >= 0)
             {
+                if (IsRevertable)
+                {
+                    PreviousLayers[ActionSet.Guid] = profile.FloatingWindowLayer;
+                }
+
                 service.SetWindowLayer(Settings.TargetLayer);
-                _logger.LogInformation("已设置悬浮窗层级为: {Layer}", Settings.TargetLayer == 0 ? "置顶" : "置底");
+                _logger.LogInformation("已设置悬浮窗层级为: {Layer}", Settings.TargetLayer == 0 ? "置底" : "置顶");
             }
             else
             {
+                if (IsRevertable)
+                {
+                    PreviousLayers[ActionSet.Guid] = profile.FloatingWindowLayer;
+                }
+
                 service.ToggleWindowLayer();
                 _logger.LogInformation("已切换悬浮窗层级状态");
             }
@@ -47,4 +60,27 @@ protected override async Task OnInvoke()
         await base.OnInvoke();
         _logger.LogDebug("ToggleFloatingWindowLayerAction OnInvoke 完成");
     }
+
+    protected override async Task OnRevert()
+    {
+        await base.OnRevert();
+
+        if (!PreviousLayers.TryRemove(ActionSet.Guid, out var previousLayer))
+        {
+            _logger.LogInformation("未找到层级恢复快照，跳过悬浮窗层级恢复。ActionSet={ActionSetGuid}", ActionSet.Guid);
+            return;
+        }
+
+        try
+        {
+            var service = IAppHost.GetService<FloatingWindowService>();
+            service.SetWindowLayer(previousLayer);
+            _logger.LogInformation("已恢复悬浮窗层级为: {Layer}", previousLayer == 0 ? "置底" : "置顶");
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "恢复悬浮窗层级失败");
+            throw;
+        }
+    }
 }
diff --git a/Actions/ToggleFloatingWindowProfileAction.cs b/Actions/ToggleFloatingWindowProfileAction.cs
index 4f87052..fae43bb 100644
--- a/Actions/ToggleFloatingWindowProfileAction.cs
+++ b/Actions/ToggleFloatingWindowProfileAction.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Threading.Tasks;
 using ClassIsland.Core.Abstractions.Automation;
 using ClassIsland.Core.Attributes;
@@ -16,6 +17,7 @@ namespace SystemTools.Actions;
 public class ToggleFloatingWindowProfileAction(ILogger<ToggleFloatingWindowProfileAction> logger) : ActionBase<ToggleFloatingWindowProfileSettings>
 {
     private readonly ILogger<ToggleFloatingWindowProfileAction> _logger = logger;
+    private static readonly ConcurrentDictionary<Guid, string> PreviousProfiles = new();
 
     protected override async Task OnInvoke()
     {
@@ -24,16 +26,27 @@ protected override async Task OnInvoke()
         try
         {
             var service = IAppHost.GetService<FloatingWindowService>();
+            var currentProfileName = service.ProfileManager.CurrentProfileName;
 
             // 根据设置决定是切换到下一个还是切换到指定方案
             // TargetProfileName: null=切换到下一个, 其他=指定方案名称
             if (!string.IsNullOrWhiteSpace(Settings.TargetProfileName))
             {
+                if (IsRevertable)
+                {
+                    PreviousProfiles[ActionSet.Guid] = currentProfileName;
+                }
+
                 service.SwitchToProfile(Settings.TargetProfileName);
                 _logger.LogInformation("已切换到悬浮窗配置方案: {Name}", Settings.TargetProfileName);
             }
             else
             {
+                if (IsRevertable)
+                {
+                    PreviousProfiles[ActionSet.Guid] = currentProfileName;
+                }
+
                 service.ToggleWindowProfile();
                 _logger.LogInformation("已切换到下一个悬浮窗配置方案");
             }
@@ -47,4 +60,27 @@ protected override async Task OnInvoke()
         await base.OnInvoke();
         _logger.LogDebug("ToggleFloatingWindowProfileAction OnInvoke 完成");
     }
+
+    protected override async Task OnRevert()
+    {
+        await base.OnRevert();
+
+        if (!PreviousProfiles.TryRemove(ActionSet.Guid, out var previousProfile))
+        {
+            _logger.LogInformation("未找到配置方案恢复快照，跳过悬浮窗配置方案恢复。ActionSet={ActionSetGuid}", ActionSet.Guid);
+            return;
+        }
+
+        try
+        {
+            var service = IAppHost.GetService<FloatingWindowService>();
+            service.SwitchToProfile(previousProfile);
+            _logger.LogInformation("已恢复悬浮窗配置方案为: {Name}", previousProfile);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "恢复悬浮窗配置方案失败");
+            throw;
+        }
+    }
 }
diff --git a/Controls/ToggleFloatingWindowLayerSettingsControl.cs b/Controls/ToggleFloatingWindowLayerSettingsControl.cs
index c6692fd..d4cd22b 100644
--- a/Controls/ToggleFloatingWindowLayerSettingsControl.cs
+++ b/Controls/ToggleFloatingWindowLayerSettingsControl.cs
@@ -25,9 +25,9 @@ public ToggleFloatingWindowLayerSettingsControl()
         {
             HorizontalAlignment = Avalonia.Layout.HorizontalAlignment.Stretch
         };
-        _layerComboBox.Items.Add(new ComboBoxItem { Content = "切换（置顶↔置底）", Tag = -1 });
-        _layerComboBox.Items.Add(new ComboBoxItem { Content = "置顶", Tag = 0 });
-        _layerComboBox.Items.Add(new ComboBoxItem { Content = "置底", Tag = 1 });
+        _layerComboBox.Items.Add(new ComboBoxItem { Content = "切换（置底↔置顶）", Tag = -1 });
+        _layerComboBox.Items.Add(new ComboBoxItem { Content = "置底", Tag = 0 });
+        _layerComboBox.Items.Add(new ComboBoxItem { Content = "置顶", Tag = 1 });
         _layerComboBox.SelectedIndex = 0;
 
         panel.Children.Add(_layerComboBox);
diff --git a/Services/FloatingWindowService.cs b/Services/FloatingWindowService.cs
index 865e3f0..d26a7c0 100644
--- a/Services/FloatingWindowService.cs
+++ b/Services/FloatingWindowService.cs
@@ -432,6 +432,8 @@ private void OnRulesetStatusUpdated(object? sender, EventArgs e)
         CheckFloatingWindowRuleset();
         CheckButtonRulesets();
         CheckRowRulesets();
+        // 规则集变化后，重新评估窗口显隐（避免"所有按钮都被隐藏但窗口还显示"）
+        ApplyVisibility();
     }
 
     private void CheckFloatingWindowRuleset()
@@ -576,7 +578,8 @@ private void ApplyVisibility()
         }
 
         var profile = _profileManager.CurrentProfile;
-        var shouldShow = _configHandler.Data.ShowFloatingWindow && _entries.Count > 0 && !_rulesetHidingWindow;
+        var hasVisibleButtons = HasAnyVisibleButton();
+        var shouldShow = _configHandler.Data.ShowFloatingWindow && hasVisibleButtons && !_rulesetHidingWindow;
 
         if (shouldShow)
         {
@@ -660,16 +663,7 @@ private void RefreshWindowButtons()
         _stackPanel.HorizontalAlignment = HorizontalAlignment.Center;
 
         _stackPanel.Children.Clear();
-
-        if (_isTouchDeviceDetected)
-        {
-            _touchDragHandle = CreateTouchDragHandle(scale, contentForeground);
-            _stackPanel.Children.Add(_touchDragHandle);
-        }
-        else
-        {
-            _touchDragHandle = null;
-        }
+        _touchDragHandle = null;
 
         int rowIndex = 0;
         foreach (var rowEntries in GetOrderedRows())
@@ -789,6 +783,74 @@ private void RefreshWindowButtons()
 
             rowIndex++;
         }
+
+        // 仅在"至少有一个可见按钮"时才显示拖拽把手，避免孤零零一个把手
+        var hasVisibleButtons = _stackPanel.Children.Count > 0;
+        var showDragHandle = (_isTouchDeviceDetected || _profileManager.CurrentProfile.FloatingWindowDragHandleAlwaysVisible)
+            && hasVisibleButtons;
+
+        if (showDragHandle)
+        {
+            _touchDragHandle = CreateTouchDragHandle(scale, contentForeground);
+            _stackPanel.Children.Insert(0, _touchDragHandle);
+        }
+    }
+
+    /// <summary>
+    /// 判断是否至少有 1 个按钮在"经过规则集过滤后"是可见的。
+    /// 用于避免悬浮窗在没有任何可见按钮时（被规则集全部隐藏）仍然显示。
+    /// </summary>
+    private bool HasAnyVisibleButton()
+    {
+        if (_entries.Count == 0)
+        {
+            return false;
+        }
+
+        var profile = _profileManager.CurrentProfile;
+        var rowConfigs = profile.FloatingWindowRowRulesets;
+        var hiddenRowSet = new HashSet<int>();
+
+        if (rowConfigs != null)
+        {
+            for (int i = 0; i < rowConfigs.Count; i++)
+            {
+                var cfg = rowConfigs[i];
+                var shouldHide = !cfg.IsVisible
+                    || (cfg.HideOnRule && cfg.HidingRules != null
+                        && IAppHost.TryGetService<IRulesetService>() is { } rs
+                        && rs.IsRulesetSatisfied(cfg.HidingRules));
+                if (shouldHide)
+                {
+                    hiddenRowSet.Add(i);
+                }
+            }
+        }
+
+        int rowIndex = 0;
+        foreach (var row in profile.FloatingWindowButtonRows ?? [])
+        {
+            if (!hiddenRowSet.Contains(rowIndex))
+            {
+                foreach (var id in row)
+                {
+                    if (_rulesetHiddenButtons.Contains(id))
+                    {
+                        continue;
+                    }
+                    foreach (var entry in _entries.Values)
+                    {
+                        if (string.Equals(entry.ButtonId, id, StringComparison.Ordinal))
+                        {
+                            return true;
+                        }
+                    }
+                }
+            }
+            rowIndex++;
+        }
+
+        return false;
     }
 
     private List<List<FloatingWindowEntry>> GetOrderedRows()
diff --git a/Settings/ToggleFloatingWindowLayerSettings.cs b/Settings/ToggleFloatingWindowLayerSettings.cs
index 2dc3579..28f4908 100644
--- a/Settings/ToggleFloatingWindowLayerSettings.cs
+++ b/Settings/ToggleFloatingWindowLayerSettings.cs
@@ -8,7 +8,7 @@ namespace SystemTools.Settings;
 public class ToggleFloatingWindowLayerSettings
 {
     /// <summary>
-    /// 目标层级。-1 表示切换，0 表示置顶，1 表示置底。
+    /// 目标层级。-1 表示切换，0 表示置底，1 表示置顶。
     /// </summary>
     [JsonPropertyName("targetLayer")]
     public int TargetLayer { get; set; } = -1;
diff --git a/SettingsPage/FloatingWindowEditorSettingsPage.axaml b/SettingsPage/FloatingWindowEditorSettingsPage.axaml
index 075e6f0..8a68795 100644
--- a/SettingsPage/FloatingWindowEditorSettingsPage.axaml
+++ b/SettingsPage/FloatingWindowEditorSettingsPage.axaml
@@ -17,18 +17,18 @@
 
     <ScrollViewer>
         <StackPanel Classes="settings-container animated-intro">
-            <Label FontSize="20"
-                   VerticalAlignment="Center"
-                   Foreground="{DynamicResource TextFillColorTertiaryBrush}">
+            <TextBlock FontSize="20"
+                       VerticalAlignment="Center"
+                       Foreground="{DynamicResource TextFillColorSecondaryBrush}">
                 SystemTools
-            </Label>
+            </TextBlock>
 
             <StackPanel Orientation="Horizontal" Margin="0,0,0,6">
                 <ci:FluentIcon FontSize="56"
                                Glyph="&#xEFBF;"
                                Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                                VerticalAlignment="Center" />
-                <Label VerticalAlignment="Center" FontSize="28">设置 · 悬浮窗</Label>
+                <TextBlock VerticalAlignment="Center" FontSize="28">设置 · 悬浮窗</TextBlock>
             </StackPanel>
 
             <!-- 方案管理 + 显示开关（紧凑顶部栏） -->
@@ -58,6 +58,7 @@
                               OnContent="显示" OffContent="隐藏"
                               IsChecked="{Binding ViewModel.Settings.ShowFloatingWindow, Mode=OneWay}"
                               IsEnabled="{Binding ViewModel.HasFloatingTriggerEntries}"
+                              VerticalAlignment="Center"
                               IsCheckedChanged="OnFloatingWindowVisibleToggleChanged" />
             </Grid>
 
@@ -86,9 +87,35 @@
                                         <Grid ColumnDefinitions="*,Auto" VerticalAlignment="Center">
                                             <TextBlock Text="按钮行"
                                                        Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
-                                            <Button Grid.Column="1" Content="删除行"
-                                                    Click="OnRemoveFloatingTriggerRowClick"
-                                                    Theme="{StaticResource TransparentButton}" />
+                                            <StackPanel Grid.Column="1"
+                                                        Orientation="Horizontal"
+                                                        Spacing="2"
+                                                        VerticalAlignment="Center">
+                                                <Button Content="{ci:FluentIcon &#xF17E;}"
+                                                        FontSize="12"
+                                                        Padding="4,2"
+                                                        MinWidth="24"
+                                                        MinHeight="24"
+                                                        ToolTip.Tip="行规则集"
+                                                        Click="OnRowRulesetClick"
+                                                        Theme="{StaticResource TransparentButton}" />
+                                                <Button Content="{ci:FluentIcon &#xE00D;}"
+                                                        FontSize="12"
+                                                        Padding="4,2"
+                                                        MinWidth="24"
+                                                        MinHeight="24"
+                                                        ToolTip.Tip="在下方插入一行"
+                                                        Click="OnInsertRowBelowClick"
+                                                        Theme="{StaticResource TransparentButton}" />
+                                                <Button Content="{ci:FluentIcon &#xE61D;}"
+                                                        FontSize="12"
+                                                        Padding="4,2"
+                                                        MinWidth="24"
+                                                        MinHeight="24"
+                                                        ToolTip.Tip="删除行"
+                                                        Click="OnRemoveFloatingTriggerRowClick"
+                                                        Theme="{StaticResource TransparentButton}" />
+                                            </StackPanel>
                                         </Grid>
                                         <Border MinHeight="52"
                                                 CornerRadius="6"
@@ -103,7 +130,7 @@
                                                 <ItemsControl.ItemsPanel>
                                                     <ItemsPanelTemplate>
                                                         <StackPanel Orientation="Horizontal"
-                                                                    HorizontalAlignment="Center" Spacing="14" />
+                                                                    HorizontalAlignment="Center" Spacing="8" />
                                                     </ItemsPanelTemplate>
                                                 </ItemsControl.ItemsPanel>
                                                 <ItemsControl.ItemTemplate>
@@ -111,15 +138,16 @@
                                                         <Border
                                                             Background="{DynamicResource SubtleFillColorSecondaryBrush}"
                                                             CornerRadius="6"
-                                                            Padding="8,4"
+                                                            Padding="4,2"
                                                             Margin="0,0,2,0"
                                                             DragDrop.AllowDrop="True"
                                                             DragDrop.DragOver="OnFloatingTriggerItemDragOver"
                                                             DragDrop.Drop="OnFloatingTriggerItemDrop">
-                                                            <Grid ColumnDefinitions="Auto,*" ColumnSpacing="8">
-                                                                <Border Grid.Column="0"
-                                                                        Tag="{Binding ButtonId}"
-                                                                        Padding="6,2"
+                                                            <StackPanel Orientation="Horizontal"
+                                                                        Spacing="4"
+                                                                        VerticalAlignment="Center">
+                                                                <Border Tag="{Binding ButtonId}"
+                                                                        Padding="4,2"
                                                                         CornerRadius="4"
                                                                         Background="{DynamicResource SubtleFillColorTertiaryBrush}"
                                                                         PointerPressed="OnFloatingTriggerItemPointerPressed"
@@ -130,11 +158,20 @@
                                                                                VerticalAlignment="Center"
                                                                                HorizontalAlignment="Center" />
                                                                 </Border>
-                                                                <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="6">
-                                                                    <TextBlock Text="{Binding Icon}" />
-                                                                    <TextBlock Text="{Binding ButtonName}" />
+                                                                <StackPanel Orientation="Horizontal" Spacing="4" VerticalAlignment="Center">
+                                                                    <TextBlock Text="{Binding Icon}" FontSize="14" />
+                                                                    <TextBlock Text="{Binding ButtonName}" FontSize="13" VerticalAlignment="Center" />
                                                                 </StackPanel>
-                                                            </Grid>
+                                                                <Button Content="{ci:FluentIcon &#xF17E;}"
+                                                                        FontSize="12"
+                                                                        Padding="4,2"
+                                                                        MinWidth="22"
+                                                                        MinHeight="22"
+                                                                        VerticalAlignment="Center"
+                                                                        ToolTip.Tip="按钮规则集"
+                                                                        Click="OnFloatingTriggerItemSettingsClick"
+                                                                        Theme="{StaticResource TransparentButton}" />
+                                                            </StackPanel>
                                                         </Border>
                                                     </DataTemplate>
                                                 </ItemsControl.ItemTemplate>
@@ -148,54 +185,6 @@
                 </StackPanel>
             </controls:SettingsExpander>
 
-            <!-- GridSplitter -->
-            <GridSplitter Height="4"
-                          Background="Transparent"
-                          Margin="0,2" />
-
-            <!-- 组件库 -->
-            <controls:SettingsExpander IconSource="{ci:FluentIconSource &#xE9D5;}"
-                                       Header="组件库"
-                                       Description="点击添加到悬浮窗"
-                                       IsExpanded="True"
-                                       Margin="0,4,0,0">
-                <ListBox ItemsSource="{Binding ViewModel.AvailableFloatingTriggerItems}"
-                         x:Name="ListBoxAvailableItems"
-                         Background="Transparent"
-                         Margin="-4"
-                         SelectionChanged="OnAvailableItemSelectionChanged">
-                    <ListBox.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <WrapPanel />
-                        </ItemsPanelTemplate>
-                    </ListBox.ItemsPanel>
-                    <ListBox.ItemTemplate>
-                        <DataTemplate>
-                            <Grid ColumnDefinitions="Auto,*" Margin="0,4" MinHeight="36">
-                                <controls:IconSourceElement Grid.Column="0"
-                                                            IconSource="{Binding IconSource}"
-                                                            Width="20" Height="20"
-                                                            VerticalAlignment="Center"
-                                                            Margin="0,0,6,0" />
-                                <TextBlock Grid.Column="1"
-                                           Text="{Binding ButtonName}"
-                                           FontSize="12"
-                                           VerticalAlignment="Center" />
-                            </Grid>
-                        </DataTemplate>
-                    </ListBox.ItemTemplate>
-                    <ListBox.ItemContainerTheme>
-                        <ControlTheme TargetType="ListBoxItem">
-                            <Setter Property="Padding" Value="8,4" />
-                            <Setter Property="Background" Value="{DynamicResource SubtleFillColorSecondaryBrush}" />
-                            <Setter Property="CornerRadius" Value="6" />
-                            <Setter Property="MinWidth" Value="120" />
-                            <Setter Property="Margin" Value="2" />
-                        </ControlTheme>
-                    </ListBox.ItemContainerTheme>
-                </ListBox>
-            </controls:SettingsExpander>
-
             <!-- 外观设置 -->
             <controls:SettingsExpander IconSource="{ci:FluentIconSource &#xE51E;}"
                                        Header="外观设置"
@@ -212,6 +201,7 @@
                                     Maximum="2"
                                     TickFrequency="0.1"
                                     IsSnapToTickEnabled="True"
+                                    ToolTip.Tip="{Binding ViewModel.CurrentFloatingWindowProfile.FloatingWindowScale, StringFormat='{}{0:F1}x'}"
                                     Value="{Binding ViewModel.CurrentFloatingWindowProfile.FloatingWindowScale, Mode=TwoWay}" />
                             <TextBlock
                                 Text="{Binding ViewModel.CurrentFloatingWindowProfile.FloatingWindowScale, StringFormat='{}{0:F1}x'}"
@@ -231,6 +221,7 @@
                                     Maximum="50"
                                     TickFrequency="1"
                                     IsSnapToTickEnabled="True"
+                                    ToolTip.Tip="{Binding ViewModel.CurrentFloatingWindowProfile.FloatingWindowIconSize, StringFormat='{}{0}px'}"
                                     Value="{Binding ViewModel.CurrentFloatingWindowProfile.FloatingWindowIconSize, Mode=TwoWay}" />
                             <TextBlock
                                 Text="{Binding ViewModel.CurrentFloatingWindowProfile.FloatingWindowIconSize, StringFormat='{}{0}px'}"
@@ -250,6 +241,7 @@
                                     Maximum="25"
                                     TickFrequency="1"
                                     IsSnapToTickEnabled="True"
+                                    ToolTip.Tip="{Binding ViewModel.CurrentFloatingWindowProfile.FloatingWindowTextSize, StringFormat='{}{0}px'}"
                                     Value="{Binding ViewModel.CurrentFloatingWindowProfile.FloatingWindowTextSize, Mode=TwoWay}" />
                             <TextBlock
                                 Text="{Binding ViewModel.CurrentFloatingWindowProfile.FloatingWindowTextSize, StringFormat='{}{0}px'}"
@@ -269,6 +261,7 @@
                                     Maximum="100"
                                     TickFrequency="1"
                                     IsSnapToTickEnabled="True"
+                                    ToolTip.Tip="{Binding ViewModel.CurrentFloatingWindowProfile.FloatingWindowOpacity, StringFormat='{}{0}%'}"
                                     Value="{Binding ViewModel.CurrentFloatingWindowProfile.FloatingWindowOpacity, Mode=TwoWay}" />
                             <TextBlock Text="{Binding ViewModel.CurrentFloatingWindowProfile.FloatingWindowOpacity, StringFormat='{}{0}%'}"
                                        Width="46"
diff --git a/SettingsPage/FloatingWindowEditorSettingsPage.axaml.cs b/SettingsPage/FloatingWindowEditorSettingsPage.axaml.cs
index c4ea4ca..f0db7b7 100644
--- a/SettingsPage/FloatingWindowEditorSettingsPage.axaml.cs
+++ b/SettingsPage/FloatingWindowEditorSettingsPage.axaml.cs
@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Collections.Specialized;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
@@ -7,12 +9,15 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Avalonia.Media;
 using Avalonia.VisualTree;
 using ClassIsland.Core;
 using ClassIsland.Core.Abstractions;
 using ClassIsland.Core.Abstractions.Controls;
+using ClassIsland.Core.Abstractions.Services;
 using ClassIsland.Core.Attributes;
 using ClassIsland.Core.Controls.Ruleset;
+using ClassIsland.Core.Models.Ruleset;
 using ClassIsland.Shared;
 using SystemTools.ConfigHandlers;
 using SystemTools.Services;
@@ -66,6 +71,10 @@ private enum RulesetTargetType { Button, Row, Window }
     private ToggleSwitch? _drawerHideOnRuleToggle;
     private RulesetControl? _drawerRulesetControl;
 
+    // 当前 Drawer 中正在编辑的规则集，用于实时监听其变化
+    private Ruleset? _currentDrawerRuleset;
+    private readonly List<INotifyPropertyChanged> _rulesetPropertyListeners = new();
+
     protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
     {
         base.OnDetachedFromVisualTree(e);
@@ -80,6 +89,7 @@ protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e
         ViewModel.ProfileChanged -= OnViewModelProfileChanged;
 
         UnregisterHidingRulesEvents();
+        DetachRulesetListeners();
 
         ViewModel.Dispose();
         _isDisposed = true;
@@ -143,6 +153,7 @@ or nameof(MainConfigData.FloatingWindowRulesetEnabled))
         {
             GlobalConstants.MainConfig?.Save();
             IAppHost.GetService<FloatingWindowService>().UpdateWindowState();
+            IAppHost.TryGetService<IRulesetService>()?.NotifyStatusChanged();
         }
         else if (e.PropertyName == nameof(MainConfigData.FloatingWindowRuleset))
         {
@@ -150,6 +161,7 @@ or nameof(MainConfigData.FloatingWindowRulesetEnabled))
             UnregisterHidingRulesEvents();
             RegisterHidingRulesEvents();
             GlobalConstants.MainConfig?.Save();
+            IAppHost.TryGetService<IRulesetService>()?.NotifyStatusChanged();
         }
     }
 
@@ -160,7 +172,14 @@ private void OnViewModelProfileChanged(object? sender, EventArgs e)
 
     private void OnHidingRulesPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
+        // 规则集求值时会写入 State（Ruleset/RuleGroup/Rule），避免因此递归触发通知
+        if (IsRulesetStateProperty(e.PropertyName))
+        {
+            return;
+        }
+
         GlobalConstants.MainConfig?.Save();
+        IAppHost.TryGetService<IRulesetService>()?.NotifyStatusChanged();
     }
 
     private void OnFloatingWindowVisibleToggleChanged(object? sender, RoutedEventArgs e)
@@ -255,9 +274,26 @@ private void ButtonOpenFloatingWindowRuleset_OnClick(object? sender, RoutedEvent
     /// </summary>
     private void OpenRulesetDrawer(ClassIsland.Core.Models.Ruleset.Ruleset ruleset, bool isVisible, bool hideOnRule)
     {
+        // 先清理上一次 Drawer 的规则集监听，避免内存泄漏和重复通知
+        DetachRulesetListeners();
+
         // 每次打开时动态构建 Drawer 内容，避免资源单例问题
         var panel = new StackPanel { Spacing = 8, Margin = new Thickness(0, 8, 0, 0) };
 
+        // Window 目标下，IsVisible 由顶栏的"显示"总开关控制，这里仅显示提示
+        if (_currentRulesetTarget == RulesetTargetType.Window)
+        {
+            var hint = new TextBlock
+            {
+                Text = "此规则集用于控制整窗悬浮窗的隐藏。窗口的“显示 / 隐藏”由设置页顶栏的总开关控制。",
+                Foreground = TextFillColorSecondaryBrush(),
+                TextWrapping = TextWrapping.Wrap,
+                FontSize = 12,
+                Margin = new Thickness(0, 0, 0, 8)
+            };
+            panel.Children.Add(hint);
+        }
+
         // 开关面板
         var togglesPanel = new StackPanel { Orientation = Avalonia.Layout.Orientation.Horizontal, Spacing = 16, Margin = new Thickness(0, 0, 0, 8) };
 
@@ -288,11 +324,24 @@ private void OpenRulesetDrawer(ClassIsland.Core.Models.Ruleset.Ruleset ruleset,
         _drawerRulesetControl = new RulesetControl { Classes = { "in-drawer" }, Ruleset = ruleset };
         panel.Children.Add(_drawerRulesetControl);
 
+        // 监听规则集内容变化，编辑时实时刷新悬浮窗状态
+        AttachRulesetListeners(ruleset);
+
         // 将内容放入 Resources 并打开 Drawer
         this.Resources["RulesetDrawerContent"] = panel;
         OpenDrawer("RulesetDrawerContent");
     }
 
+    private IBrush? TextFillColorSecondaryBrush()
+    {
+        if (Application.Current?.Resources.TryGetResource("TextFillColorSecondaryBrush", null, out var res) == true
+            && res is IBrush brush)
+        {
+            return brush;
+        }
+        return null;
+    }
+
     private void OnDrawerIsVisibleChanged(object? sender, RoutedEventArgs e)
     {
         var value = _drawerIsVisibleToggle?.IsChecked == true;
@@ -309,6 +358,7 @@ private void OnDrawerIsVisibleChanged(object? sender, RoutedEventArgs e)
 
         IAppHost.GetService<FloatingWindowService>().ProfileManager.SaveProfile();
         IAppHost.GetService<FloatingWindowService>().UpdateWindowState();
+        NotifyRulesetStatusChanged();
     }
 
     private void OnDrawerHideOnRuleChanged(object? sender, RoutedEventArgs e)
@@ -331,10 +381,156 @@ private void OnDrawerHideOnRuleChanged(object? sender, RoutedEventArgs e)
 
         IAppHost.GetService<FloatingWindowService>().ProfileManager.SaveProfile();
         IAppHost.GetService<FloatingWindowService>().UpdateWindowState();
+        NotifyRulesetStatusChanged();
+    }
+
+    private void NotifyRulesetStatusChanged()
+    {
+        IAppHost.TryGetService<IRulesetService>()?.NotifyStatusChanged();
+    }
+
+    private void AttachRulesetListeners(Ruleset ruleset)
+    {
+        DetachRulesetListeners();
+        _currentDrawerRuleset = ruleset;
+
+        AddRulesetPropertyListener(ruleset);
+        ruleset.Groups.CollectionChanged += OnRulesetGroupsCollectionChanged;
+
+        foreach (var group in ruleset.Groups)
+        {
+            AddRulesetPropertyListener(group);
+            group.Rules.CollectionChanged += OnRulesetRulesCollectionChanged;
+            foreach (var rule in group.Rules)
+            {
+                AddRulesetPropertyListener(rule);
+            }
+        }
+    }
+
+    private void DetachRulesetListeners()
+    {
+        foreach (var listener in _rulesetPropertyListeners)
+        {
+            listener.PropertyChanged -= OnRulesetPropertyChanged;
+        }
+        _rulesetPropertyListeners.Clear();
+
+        if (_currentDrawerRuleset != null)
+        {
+            _currentDrawerRuleset.Groups.CollectionChanged -= OnRulesetGroupsCollectionChanged;
+            foreach (var group in _currentDrawerRuleset.Groups)
+            {
+                group.Rules.CollectionChanged -= OnRulesetRulesCollectionChanged;
+            }
+            _currentDrawerRuleset = null;
+        }
+    }
+
+    private void AddRulesetPropertyListener(INotifyPropertyChanged listener)
+    {
+        listener.PropertyChanged += OnRulesetPropertyChanged;
+        _rulesetPropertyListeners.Add(listener);
+    }
+
+    /// <summary>
+    /// 判断属性名是否为规则集求值写入的 State（避免递归通知）
+    /// </summary>
+    private static bool IsRulesetStateProperty(string? propertyName)
+    {
+        return propertyName == nameof(Ruleset.State)
+            || propertyName == nameof(RuleGroup.State)
+            || propertyName == nameof(Rule.State);
+    }
+
+    private void OnRulesetPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        // 规则集求值时会写入 State（Ruleset/RuleGroup/Rule），避免因此递归触发通知
+        if (IsRulesetStateProperty(e.PropertyName))
+        {
+            return;
+        }
+
+        NotifyRulesetStatusChanged();
+        IAppHost.TryGetService<FloatingWindowService>()?.UpdateWindowState();
+    }
+
+    private void OnRulesetGroupsCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+    {
+        if (_currentDrawerRuleset == null)
+        {
+            return;
+        }
+
+        var ruleset = _currentDrawerRuleset;
+        DetachRulesetListeners();
+        AttachRulesetListeners(ruleset);
+
+        NotifyRulesetStatusChanged();
+        IAppHost.TryGetService<FloatingWindowService>()?.UpdateWindowState();
+    }
+
+    private void OnRulesetRulesCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+    {
+        if (_currentDrawerRuleset == null)
+        {
+            return;
+        }
+
+        var ruleset = _currentDrawerRuleset;
+        DetachRulesetListeners();
+        AttachRulesetListeners(ruleset);
+
+        NotifyRulesetStatusChanged();
+        IAppHost.TryGetService<FloatingWindowService>()?.UpdateWindowState();
     }
 
     // ===== 选中状态处理 =====
 
+    private void OnFloatingTriggerItemSettingsClick(object? sender, RoutedEventArgs e)
+    {
+        if (sender is not Control { DataContext: FloatingTriggerItem item })
+        {
+            return;
+        }
+
+        _currentRulesetTarget = RulesetTargetType.Button;
+        _currentButtonTarget = item;
+        _currentRowTarget = null;
+
+        OpenRulesetDrawer(item.Config.HidingRules, item.Config.IsVisible, item.Config.HideOnRule);
+    }
+
+    private void OnRowRulesetClick(object? sender, RoutedEventArgs e)
+    {
+        if (sender is not Control { DataContext: FloatingTriggerRow row })
+        {
+            return;
+        }
+
+        _currentRulesetTarget = RulesetTargetType.Row;
+        _currentButtonTarget = null;
+        _currentRowTarget = row;
+
+        OpenRulesetDrawer(row.RowRuleset.HidingRules, row.RowRuleset.IsVisible, row.RowRuleset.HideOnRule);
+    }
+
+    private void OnInsertRowBelowClick(object? sender, RoutedEventArgs e)
+    {
+        if (sender is not Control { DataContext: FloatingTriggerRow row })
+        {
+            return;
+        }
+
+        var index = ViewModel.FloatingTriggerRows.IndexOf(row);
+        if (index < 0)
+        {
+            return;
+        }
+
+        ViewModel.InsertFloatingTriggerRow(index + 1);
+    }
+
     private void OnAvailableItemSelectionChanged(object? sender, SelectionChangedEventArgs e)
     {
         if (sender is not ListBox listBox || listBox.SelectedItem is not FloatingTriggerItem item)
@@ -364,11 +560,17 @@ private void OnFloatingTriggerItemPointerPressed(object? sender, PointerPressedE
 
         _floatingDragSourceBorder = border;
         _floatingDragStartPoint = e.GetPosition(border);
+        // 主动 capture，避免鼠标移出 Border 后丢失 PointerMoved/PointerReleased
+        e.Pointer.Capture(border);
         e.Handled = e.Pointer.Type is PointerType.Touch or PointerType.Pen;
     }
 
     private void OnFloatingTriggerItemPointerReleased(object? sender, PointerReleasedEventArgs e)
     {
+        if (e.Pointer.Captured == sender)
+        {
+            e.Pointer.Capture(null);
+        }
         _floatingDragSourceBorder = null;
         _floatingDragStartPoint = null;
     }
@@ -401,8 +603,10 @@ private async void OnFloatingTriggerItemPointerMoved(object? sender, PointerEven
 
         _floatingDragSourceBorder = null;
         _floatingDragStartPoint = null;
+        // 在 await 之前缓存 Pointer.Type，避免事件参数被回收后访问
+        var isTouchOrPen = e.Pointer.Type is PointerType.Touch or PointerType.Pen;
         await DragDrop.DoDragDrop(e, data, DragDropEffects.Move);
-        e.Handled = e.Pointer.Type is PointerType.Touch or PointerType.Pen;
+        e.Handled = isTouchOrPen;
     }
 
     private static bool TryGetDragButtonId(DragEventArgs e, out string buttonId)
@@ -487,6 +691,7 @@ private void OnFloatingTriggerRowDrop(object? sender, DragEventArgs e)
         var row = ViewModel.FloatingTriggerRows[rowIndex];
         var insertIndex = GetRowInsertIndex(senderControl, row, e);
         ViewModel.MoveFloatingTrigger(buttonId, rowIndex, insertIndex);
+        e.Handled = true;
     }
 
     private void OnFloatingTriggerItemDragOver(object? sender, DragEventArgs e)
@@ -527,5 +732,6 @@ private void OnFloatingTriggerItemDrop(object? sender, DragEventArgs e)
         }
 
         ViewModel.MoveFloatingTrigger(buttonId, rowIndex, targetIndex);
+        e.Handled = true;
     }
 }
diff --git a/SettingsPage/SystemToolsSettingsViewModel.cs b/SettingsPage/SystemToolsSettingsViewModel.cs
index c468eec..f548d4f 100644
--- a/SettingsPage/SystemToolsSettingsViewModel.cs
+++ b/SettingsPage/SystemToolsSettingsViewModel.cs
@@ -13,6 +13,8 @@
 using System.Threading.Tasks;
 using SystemTools.Shared;
 using SystemTools.Services;
+using ClassIsland.Core.Abstractions.Services;
+using ClassIsland.Shared;
 
 namespace SystemTools;
 
@@ -101,9 +103,6 @@ public partial class SystemToolsSettingsViewModel : ObservableObject, IDisposabl
     [ObservableProperty] private FloatingTriggerRow? _selectedFloatingTriggerRow;
     [ObservableProperty] private FloatingTriggerItem? _selectedFloatingTriggerItem;
 
-    // 可用按钮池（未添加到悬浮窗的按钮）
-    [ObservableProperty] private ObservableCollection<FloatingTriggerItem> _availableFloatingTriggerItems = new();
-
     // 悬浮窗配置方案
     [ObservableProperty] private ObservableCollection<string> _floatingWindowProfileNames = new();
     [ObservableProperty] private string _selectedFloatingWindowProfile = "Default";
@@ -358,6 +357,30 @@ public void RefreshFloatingTriggers()
             _floatingWindowService.ProfileManager.SaveProfile();
         }
 
+        // 新注册且尚未配置的按钮自动追加到第一行
+        // 已存在按钮配置（如被用户移除/隐藏）的按钮不再自动添加
+        var newButtonIds = entries.Values
+            .Where(e => !configuredIds.Contains(e.ButtonId))
+            .Where(e => !profile.FloatingWindowButtonRulesets.ContainsKey(e.ButtonId))
+            .Select(e => e.ButtonId)
+            .ToList();
+        if (newButtonIds.Count > 0)
+        {
+            if (profile.FloatingWindowButtonRows == null || profile.FloatingWindowButtonRows.Count == 0)
+            {
+                profile.FloatingWindowButtonRows = [newButtonIds];
+            }
+            else
+            {
+                profile.FloatingWindowButtonRows[0] = [.. profile.FloatingWindowButtonRows[0], .. newButtonIds];
+            }
+            foreach (var id in newButtonIds)
+            {
+                configuredIds.Add(id);
+            }
+            _floatingWindowService.ProfileManager.SaveProfile();
+        }
+
         // 注销旧对象上的事件处理程序，避免重复注册和内存泄漏
         foreach (var oldRow in FloatingTriggerRows)
         {
@@ -448,21 +471,6 @@ public void RefreshFloatingTriggers()
             FloatingTriggerRows.Add(emptyRow);
         }
 
-        // 构建可用按钮池（未配置的按钮）
-        AvailableFloatingTriggerItems.Clear();
-        foreach (var entry in entries.Values)
-        {
-            if (!configuredIds.Contains(entry.ButtonId))
-            {
-                AvailableFloatingTriggerItems.Add(new FloatingTriggerItem
-                {
-                    ButtonId = entry.ButtonId,
-                    Icon = FloatingWindowService.ConvertIcon(entry.Icon),
-                    ButtonName = entry.LayoutName
-                });
-            }
-        }
-
         // 如果有新创建的默认配置，确保保存
         if (needSave)
         {
@@ -473,14 +481,35 @@ public void RefreshFloatingTriggers()
 
     private void OnButtonConfigPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
+        // 规则集求值时会写入 State（Ruleset/RuleGroup/Rule），避免因此递归触发通知
+        if (IsRulesetStateProperty(e.PropertyName))
+        {
+            return;
+        }
+
         _floatingWindowService.ProfileManager.SaveProfile();
         _floatingWindowService.UpdateWindowState();
+        IAppHost.TryGetService<IRulesetService>()?.NotifyStatusChanged();
     }
 
     private void OnRowRulesetPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
+        // 规则集求值时会写入 State（Ruleset/RuleGroup/Rule），避免因此递归触发通知
+        if (IsRulesetStateProperty(e.PropertyName))
+        {
+            return;
+        }
+
         _floatingWindowService.ProfileManager.SaveProfile();
         _floatingWindowService.UpdateWindowState();
+        IAppHost.TryGetService<IRulesetService>()?.NotifyStatusChanged();
+    }
+
+    private static bool IsRulesetStateProperty(string? propertyName)
+    {
+        return propertyName == nameof(ClassIsland.Core.Models.Ruleset.Ruleset.State)
+            || propertyName == nameof(ClassIsland.Core.Models.Ruleset.RuleGroup.State)
+            || propertyName == nameof(ClassIsland.Core.Models.Ruleset.Rule.State);
     }
 
     public void AddFloatingTriggerRow()
@@ -610,7 +639,7 @@ public bool MoveFloatingTrigger(string buttonId, int targetRowIndex, int targetI
     }
 
     /// <summary>
-    /// 从可用按钮池添加按钮到指定行
+    /// 将已注册但不在行中的按钮添加到指定行（用于拖拽等场景）
     /// </summary>
     public bool AddTriggerFromPool(string buttonId, int targetRowIndex, int targetIndex)
     {
@@ -619,8 +648,8 @@ public bool AddTriggerFromPool(string buttonId, int targetRowIndex, int targetIn
             return false;
         }
 
-        var poolItem = AvailableFloatingTriggerItems.FirstOrDefault(x => x.ButtonId == buttonId);
-        if (poolItem == null)
+        var entry = _floatingWindowService.Entries.FirstOrDefault(e => e.ButtonId == buttonId);
+        if (entry == null)
         {
             return false;
         }
@@ -629,59 +658,33 @@ public bool AddTriggerFromPool(string buttonId, int targetRowIndex, int targetIn
         var destinationRow = FloatingTriggerRows[targetRowIndex];
         targetIndex = Math.Clamp(targetIndex, 0, destinationRow.Buttons.Count);
 
-        AvailableFloatingTriggerItems.Remove(poolItem);
-
-        // 确保按钮有 Config（池项可能没有），并注册事件监听
         var profile = CurrentFloatingWindowProfile;
         if (!profile.FloatingWindowButtonRulesets.TryGetValue(buttonId, out var btnConfig))
         {
             btnConfig = new ButtonRulesetConfig();
             profile.FloatingWindowButtonRulesets[buttonId] = btnConfig;
         }
-        poolItem.Config = btnConfig;
-        poolItem.Config.PropertyChanged += OnButtonConfigPropertyChanged;
-        if (poolItem.Config.HidingRules is INotifyPropertyChanged btnHidingRules)
+        // 重新添加到行中时恢复可见
+        btnConfig.IsVisible = true;
+
+        var item = new FloatingTriggerItem
+        {
+            ButtonId = entry.ButtonId,
+            Icon = FloatingWindowService.ConvertIcon(entry.Icon),
+            ButtonName = entry.LayoutName,
+            Config = btnConfig
+        };
+        item.Config.PropertyChanged += OnButtonConfigPropertyChanged;
+        if (item.Config.HidingRules is INotifyPropertyChanged btnHidingRules)
         {
             btnHidingRules.PropertyChanged += OnButtonConfigPropertyChanged;
         }
 
-        destinationRow.Buttons.Insert(targetIndex, poolItem);
+        destinationRow.Buttons.Insert(targetIndex, item);
         PersistFloatingTriggerRows();
         return true;
     }
 
-    /// <summary>
-    /// 将按钮从行中移除，放回可用按钮池
-    /// </summary>
-    public bool RemoveTriggerToPool(string buttonId)
-    {
-        if (string.IsNullOrWhiteSpace(buttonId))
-        {
-            return false;
-        }
-
-        foreach (var row in FloatingTriggerRows)
-        {
-            var item = row.Buttons.FirstOrDefault(x => x.ButtonId == buttonId);
-            if (item != null)
-            {
-                // 注销事件处理程序
-                item.Config.PropertyChanged -= OnButtonConfigPropertyChanged;
-                if (item.Config.HidingRules is INotifyPropertyChanged btnHidingRules)
-                {
-                    btnHidingRules.PropertyChanged -= OnButtonConfigPropertyChanged;
-                }
-
-                row.Buttons.Remove(item);
-                AvailableFloatingTriggerItems.Add(item);
-                PersistFloatingTriggerRows();
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     public void PersistFloatingTriggerRows(bool updateWindow = true, bool forceSave = true)
     {
         var profile = CurrentFloatingWindowProfile;