diff --git a/controlgallery/AtomUIGallery/ShowCases/Views/Layout/SpaceShowCase.axaml b/controlgallery/AtomUIGallery/ShowCases/Views/Layout/SpaceShowCase.axaml
index 3267a5a6b..f1e86358f 100644
--- a/controlgallery/AtomUIGallery/ShowCases/Views/Layout/SpaceShowCase.axaml
+++ b/controlgallery/AtomUIGallery/ShowCases/Views/Layout/SpaceShowCase.axaml
@@ -205,13 +205,45 @@
                 </atom:CompactSpace>
                 
                 <atom:CompactSpace Orientation="Horizontal" HorizontalAlignment="Stretch">
-                    <atom:Select  IsAllowClear="True" DefaultValues="Zhejiang" Mode="Multiple">
+                    <atom:Select IsAllowClear="True" DefaultValues="Zhejiang">
                         <atom:SelectOption Header="Zhejiang" Value="Zhejiang" />
                         <atom:SelectOption Header="Jiangsu" Value="Jiangsu" />
                     </atom:Select>
                     <atom:LineEdit Text="Xihu District, Hangzhou" atom:CompactSpace.ItemSize="4*"/>
                     <atom:CompactSpaceFiller atom:CompactSpace.ItemSize="4*"/>
                 </atom:CompactSpace>
+                
+                <atom:CompactSpace Orientation="Horizontal" HorizontalAlignment="Stretch">
+                    <atom:Select  IsAllowClear="True" DefaultValues="Zhejiang" Mode="Multiple" atom:CompactSpace.ItemSize="4*">
+                        <atom:SelectOption Header="Zhejiang" Value="Zhejiang" />
+                        <atom:SelectOption Header="Jiangsu" Value="Jiangsu" />
+                    </atom:Select>
+                    <atom:LineEdit Text="Xihu District, Hangzhou" atom:CompactSpace.ItemSize="4*"/>
+                    <atom:CompactSpaceFiller atom:CompactSpace.ItemSize="4*"/>
+                </atom:CompactSpace>
+                
+                <atom:CompactSpace Orientation="Horizontal" HorizontalAlignment="Stretch">
+                    <atom:SearchEdit Text="0571" atom:CompactSpace.ItemSize="3*"/>
+                    <atom:SearchEdit Text="26888888" atom:CompactSpace.ItemSize="5*"/>
+                    <atom:SearchEdit Text="+1" atom:CompactSpace.ItemSize="2*"/>
+                    <atom:CompactSpaceFiller atom:CompactSpace.ItemSize="4*"/>
+                </atom:CompactSpace>
+                
+                <atom:CompactSpace Orientation="Horizontal" HorizontalAlignment="Stretch">
+                    <atom:Select DefaultValues="Option1">
+                        <atom:SelectOption Header="Option1" Value="Option1" />
+                        <atom:SelectOption Header="Option2" Value="Option2" />
+                    </atom:Select>
+                    <atom:LineEdit Text="input content" atom:CompactSpace.ItemSize="5*"/>
+                    <atom:NumericUpDown Value="12" atom:CompactSpace.ItemSize="80"/>
+                    <atom:CompactSpaceFiller atom:CompactSpace.ItemSize="5*"/>
+                </atom:CompactSpace>
+                
+                <!-- <atom:CompactSpace Orientation="Horizontal" HorizontalAlignment="Stretch"> -->
+                <!--     <atom:LineEdit Text="input content" atom:CompactSpace.ItemSize="5*"/> -->
+                <!--     <atom:DatePicker atom:CompactSpace.ItemSize="5*"/> -->
+                <!--     <atom:CompactSpaceFiller atom:CompactSpace.ItemSize="5*"/> -->
+                <!-- </atom:CompactSpace> -->
             </StackPanel>
         </gallery:ShowCaseItem>
     </gallery:ShowCasePanel>
diff --git a/src/AtomUI.Desktop.Controls/ButtonSpinner/ButtonSpinner.cs b/src/AtomUI.Desktop.Controls/ButtonSpinner/ButtonSpinner.cs
index 5a2ebd5ea..80d359ce7 100644
--- a/src/AtomUI.Desktop.Controls/ButtonSpinner/ButtonSpinner.cs
+++ b/src/AtomUI.Desktop.Controls/ButtonSpinner/ButtonSpinner.cs
@@ -13,6 +13,7 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Avalonia.Layout;
 using Avalonia.Metadata;
 using Avalonia.VisualTree;
 
@@ -27,7 +28,8 @@ public enum ButtonSpinnerLocation
 [PseudoClasses(ButtonSpinnerPseudoClass.Left, ButtonSpinnerPseudoClass.Right)]
 public class ButtonSpinner : Spinner,
                              IMotionAwareControl,
-                             IControlSharedTokenResourcesHost
+                             IControlSharedTokenResourcesHost,
+                             ICompactSpaceAware
 {
     #region 公共属性定义
     public static readonly StyledProperty<bool> AllowSpinProperty =
@@ -185,19 +187,47 @@ public class ButtonSpinner : Spinner,
     internal static readonly StyledProperty<double> SpinnerHandleWidthProperty =
         AvaloniaProperty.Register<ButtonSpinner, double>(nameof (SpinnerHandleWidth));
     
+    internal static readonly StyledProperty<SpaceItemPosition?> CompactSpaceItemPositionProperty = 
+        CompactSpaceAwareControlProperty.CompactSpaceItemPositionProperty.AddOwner<ButtonSpinner>();
+    
+    internal static readonly StyledProperty<Orientation> CompactSpaceOrientationProperty = 
+        CompactSpaceAwareControlProperty.CompactSpaceOrientationProperty.AddOwner<ButtonSpinner>();
+    
+    internal static readonly StyledProperty<bool> IsUsedInCompactSpaceProperty = 
+        CompactSpaceAwareControlProperty.IsUsedInCompactSpaceProperty.AddOwner<ButtonSpinner>();
+    
     internal double SpinnerHandleWidth
     {
         get => GetValue(SpinnerHandleWidthProperty);
         set => SetValue(SpinnerHandleWidthProperty, value);
     }
     
+    internal SpaceItemPosition? CompactSpaceItemPosition
+    {
+        get => GetValue(CompactSpaceItemPositionProperty);
+        set => SetValue(CompactSpaceItemPositionProperty, value);
+    }
+    
+    internal Orientation CompactSpaceOrientation
+    {
+        get => GetValue(CompactSpaceOrientationProperty);
+        set => SetValue(CompactSpaceOrientationProperty, value);
+    }
+    
+    internal bool IsUsedInCompactSpace
+    {
+        get => GetValue(IsUsedInCompactSpaceProperty);
+        set => SetValue(IsUsedInCompactSpaceProperty, value);
+    }
+    
     Control IControlSharedTokenResourcesHost.HostControl => this;
     string IControlSharedTokenResourcesHost.TokenId => ButtonSpinnerToken.ID;
 
     #endregion
     
-    private ButtonSpinnerDecoratedBox? _decoratedBox;
+    internal ButtonSpinnerDecoratedBox? DecoratedBox;
     private CompositeDisposable? _addOnBindingDisposables;
+    private ButtonSpinnerHandle? _spinnerHandle;
 
     static ButtonSpinner()
     {
@@ -207,6 +237,7 @@ public class ButtonSpinner : Spinner,
     public ButtonSpinner()
     {
         this.RegisterResources();
+        // RenderTransform = new TranslateTransform(-1, 0);
     }
     
     private IconButton? _decreaseButton;
@@ -247,7 +278,7 @@ public class ButtonSpinner : Spinner,
 
     protected override Size ArrangeOverride(Size finalSize)
     {
-        var borderThickness = _decoratedBox?.BorderThickness ?? default;
+        var borderThickness = DecoratedBox?.BorderThickness ?? default;
         return base.ArrangeOverride(finalSize).Inflate(borderThickness);
     }
 
@@ -269,31 +300,42 @@ public class ButtonSpinner : Spinner,
         {
             UpdatePseudoClasses();
         }
+        
     }
 
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
-        _decoratedBox = e.NameScope.Find<ButtonSpinnerDecoratedBox>(ButtonSpinnerThemeConstants.DecoratedBoxPart);
-        base.OnApplyTemplate(e);
-        if (_decoratedBox?.SpinnerContent is ButtonSpinnerHandle spinnerHandle)
+        if (_spinnerHandle != null)
         {
-            spinnerHandle.ButtonsCreated += (sender, args) =>
-            {
-                IncreaseButton = spinnerHandle.IncreaseButton;
-                DecreaseButton = spinnerHandle.DecreaseButton;
-            };
+            _spinnerHandle.ButtonsCreated -= HandleButtonCreated;
+        }
+        DecoratedBox = e.NameScope.Find<ButtonSpinnerDecoratedBox>(ButtonSpinnerThemeConstants.DecoratedBoxPart);
+        base.OnApplyTemplate(e);
+        if (DecoratedBox?.SpinnerContent is ButtonSpinnerHandle spinnerHandle)
+        {
+            _spinnerHandle                =  spinnerHandle;
+            _spinnerHandle.ButtonsCreated += HandleButtonCreated;
         }
         SetButtonUsage();
         ConfigureAddOns();
     }
 
+    private void HandleButtonCreated(object? sender, EventArgs e)
+    {
+        if (_spinnerHandle != null)
+        {
+            IncreaseButton = _spinnerHandle.IncreaseButton;
+            DecreaseButton = _spinnerHandle.DecreaseButton;
+        }
+    }
+
     private void ConfigureAddOns()
     {
         _addOnBindingDisposables?.Dispose();
         _addOnBindingDisposables = new CompositeDisposable();
         if (LeftAddOn is PathIcon leftAddOnIcon)
         {
-            var iconPresenter = new SizeTypeAwareIconPresenter()
+            var iconPresenter = new SizeTypeAwareIconPresenter
             {
                 Icon = leftAddOnIcon
             };
@@ -302,7 +344,7 @@ public class ButtonSpinner : Spinner,
         }
         if (InnerLeftContent is PathIcon innerLeftContent)
         {
-            var iconPresenter = new SizeTypeAwareIconPresenter()
+            var iconPresenter = new SizeTypeAwareIconPresenter
             {
                 Icon = innerLeftContent
             };
@@ -311,7 +353,7 @@ public class ButtonSpinner : Spinner,
         }
         if (RightAddOn is PathIcon rightAddOnIcon)
         {
-            var iconPresenter = new SizeTypeAwareIconPresenter()
+            var iconPresenter = new SizeTypeAwareIconPresenter
             {
                 Icon = rightAddOnIcon
             };
@@ -320,7 +362,7 @@ public class ButtonSpinner : Spinner,
         }
         if (InnerRightContent is PathIcon innerRightContent)
         {
-            var iconPresenter = new SizeTypeAwareIconPresenter()
+            var iconPresenter = new SizeTypeAwareIconPresenter
             {
                 Icon = innerRightContent
             };
@@ -391,8 +433,8 @@ public class ButtonSpinner : Spinner,
             case Key.Enter:
             {
                 //Do not Spin on enter Key when spinners have focus
-                if (((IncreaseButton != null) && (IncreaseButton.IsFocused))
-                    || ((DecreaseButton != null) && DecreaseButton.IsFocused))
+                if ((IncreaseButton != null && IncreaseButton.IsFocused)
+                    || (DecreaseButton != null && DecreaseButton.IsFocused))
                 {
                     e.Handled = true;
                 }
@@ -457,4 +499,33 @@ public class ButtonSpinner : Spinner,
             OnSpin(new SpinEventArgs(SpinEvent, direction));
         }
     }
+    
+    void ICompactSpaceAware.NotifyPositionChange(SpaceItemPosition? position)
+    {
+        IsUsedInCompactSpace     = position != null;
+        CompactSpaceItemPosition = position;
+    }
+    
+    void ICompactSpaceAware.NotifyOrientationChange(Orientation orientation)
+    {
+        CompactSpaceOrientation = orientation;
+    }
+
+    double ICompactSpaceAware.GetBorderThickness() => GetBorderThicknessForCompactSpace();
+    
+    protected virtual double GetBorderThicknessForCompactSpace()
+    {
+        if (!IsUsedInCompactSpace)
+        {
+            return 0.0;
+        }
+    
+        if (DecoratedBox == null || DecoratedBox.StyleVariant != AddOnDecoratedVariant.Outline)
+        {
+            return 0.0;
+        }
+    
+        // 都一样宽
+        return DecoratedBox.InnerBoxBorderThickness.Left;
+    }
 }
\ No newline at end of file
diff --git a/src/AtomUI.Desktop.Controls/ButtonSpinner/ButtonSpinnerDecoratedBox.cs b/src/AtomUI.Desktop.Controls/ButtonSpinner/ButtonSpinnerDecoratedBox.cs
index 018a2d302..a3a3b5d8c 100644
--- a/src/AtomUI.Desktop.Controls/ButtonSpinner/ButtonSpinnerDecoratedBox.cs
+++ b/src/AtomUI.Desktop.Controls/ButtonSpinner/ButtonSpinnerDecoratedBox.cs
@@ -223,27 +223,32 @@ internal class ButtonSpinnerDecoratedBox : AddOnDecoratedBox
 
         if (args is RawPointerEventArgs pointerEventArgs)
         {
-            var pos = this.TranslatePoint(new Point(0, 0), TopLevel.GetTopLevel(this)!);
-            if (!pos.HasValue)
+            if (pointerEventArgs.Type == RawPointerEventType.Move ||
+                pointerEventArgs.Type == RawPointerEventType.LeftButtonUp || 
+                pointerEventArgs.Type == RawPointerEventType.RightButtonDown)
             {
-                return;
-            }
-
-            var bounds = new Rect(pos.Value, Bounds.Size);
-            if (bounds.Contains(pointerEventArgs.Position))
-            {
-                if (IsShowHandle && IsHandleFloatable)
+                var pos = this.TranslatePoint(new Point(0, 0), TopLevel.GetTopLevel(this)!);
+                if (!pos.HasValue)
                 {
-                    IsSpinnerContentHover = true;
-                    UpdateHandleVisualState();
+                    return;
                 }
-            }
-            else
-            {
-                if (IsShowHandle && IsHandleFloatable)
+
+                var bounds = new Rect(pos.Value, Bounds.Size);
+                if (bounds.Contains(pointerEventArgs.Position))
                 {
-                    IsSpinnerContentHover = false;
-                    UpdateHandleVisualState();
+                    if (IsShowHandle && IsHandleFloatable)
+                    {
+                        IsSpinnerContentHover = true;
+                        UpdateHandleVisualState();
+                    }
+                }
+                else
+                {
+                    if (IsShowHandle && IsHandleFloatable)
+                    {
+                        IsSpinnerContentHover = false;
+                        UpdateHandleVisualState();
+                    }
                 }
             }
         }
diff --git a/src/AtomUI.Desktop.Controls/ButtonSpinner/ButtonSpinnerHandle.cs b/src/AtomUI.Desktop.Controls/ButtonSpinner/ButtonSpinnerHandle.cs
index dd81276b0..1c8de5791 100644
--- a/src/AtomUI.Desktop.Controls/ButtonSpinner/ButtonSpinnerHandle.cs
+++ b/src/AtomUI.Desktop.Controls/ButtonSpinner/ButtonSpinnerHandle.cs
@@ -5,7 +5,6 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Media;
-using Avalonia.Interactivity;
 
 namespace AtomUI.Desktop.Controls;
 
@@ -98,17 +97,18 @@ internal class ButtonSpinnerHandle : TemplatedControl
             var handleOffsetY = Bounds.Height / 2;
             using var optionState = context.PushRenderOptions(new RenderOptions
             {
-                EdgeMode = EdgeMode.Aliased
+                EdgeMode = EdgeMode.Antialias
             });
+            
             {
                 // 画竖线
-                var startPoint = new Point(lineWidth / 2, lineWidth);
-                var endPoint   = new Point(lineWidth / 2, Bounds.Height - lineWidth);
+                var startPoint = new Point(lineWidth, lineWidth);
+                var endPoint   = new Point(lineWidth, Bounds.Height - lineWidth);
                 context.DrawLine(new Pen(BorderBrush, lineWidth), startPoint, endPoint);
             }
             {
                 // 画横线
-                var startPoint = new Point(0, handleOffsetY); 
+                var startPoint = new Point(lineWidth, handleOffsetY); 
                 var endPoint   = new Point(Bounds.Width - lineWidth, handleOffsetY);
                 context.DrawLine(new Pen(BorderBrush, lineWidth), startPoint, endPoint);
             }
diff --git a/src/AtomUI.Desktop.Controls/ButtonSpinner/Themes/ButtonSpinnerHandleTheme.axaml b/src/AtomUI.Desktop.Controls/ButtonSpinner/Themes/ButtonSpinnerHandleTheme.axaml
index 69e595cab..cb84dc447 100644
--- a/src/AtomUI.Desktop.Controls/ButtonSpinner/Themes/ButtonSpinnerHandleTheme.axaml
+++ b/src/AtomUI.Desktop.Controls/ButtonSpinner/Themes/ButtonSpinnerHandleTheme.axaml
@@ -7,25 +7,23 @@
     <ControlTheme x:Key="{x:Type atom:ButtonSpinnerHandle}" TargetType="atom:ButtonSpinnerHandle">
         <Setter Property="Template">
             <ControlTemplate>
-                <Border
-                    BackgroundSizing="InnerBorderEdge">
-                    <UniformGrid
-                        Columns="1" Rows="2"
-                        RowSpacing="1">
-                        <atom:IconButton
-                            Name="{x:Static atom:ButtonSpinnerThemeConstants.IncreaseButtonPart}"
-                            Icon="{antdicons:AntDesignIconProvider UpOutlined}"
-                            VerticalAlignment="Stretch"
-                            HorizontalAlignment="Stretch"
-                            BackgroundSizing="InnerBorderEdge"/>
-                        <atom:IconButton
-                            Name="{x:Static atom:ButtonSpinnerThemeConstants.DecreaseButtonPart}"
-                            Icon="{antdicons:AntDesignIconProvider DownOutlined}"
-                            VerticalAlignment="Stretch"
-                            HorizontalAlignment="Stretch"
-                            BackgroundSizing="InnerBorderEdge"/>
-                    </UniformGrid>
-                </Border>
+                <UniformGrid
+                    Columns="1" 
+                    Rows="2"
+                    RowSpacing="1">
+                    <atom:IconButton
+                        Name="{x:Static atom:ButtonSpinnerThemeConstants.IncreaseButtonPart}"
+                        Icon="{antdicons:AntDesignIconProvider UpOutlined}"
+                        VerticalAlignment="Stretch"
+                        HorizontalAlignment="Stretch"
+                        BackgroundSizing="InnerBorderEdge"/>
+                    <atom:IconButton
+                        Name="{x:Static atom:ButtonSpinnerThemeConstants.DecreaseButtonPart}"
+                        Icon="{antdicons:AntDesignIconProvider DownOutlined}"
+                        VerticalAlignment="Stretch"
+                        HorizontalAlignment="Stretch"
+                        BackgroundSizing="InnerBorderEdge"/>
+                </UniformGrid>
             </ControlTemplate>
         </Setter>
         
diff --git a/src/AtomUI.Desktop.Controls/ButtonSpinner/Themes/ButtonSpinnerTheme.axaml b/src/AtomUI.Desktop.Controls/ButtonSpinner/Themes/ButtonSpinnerTheme.axaml
index 2a2cc5e7a..b5b7173db 100644
--- a/src/AtomUI.Desktop.Controls/ButtonSpinner/Themes/ButtonSpinnerTheme.axaml
+++ b/src/AtomUI.Desktop.Controls/ButtonSpinner/Themes/ButtonSpinnerTheme.axaml
@@ -24,14 +24,16 @@
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
                     Content="{TemplateBinding Content}"
-                    ContentTemplate="{TemplateBinding ContentTemplate}">
+                    ContentTemplate="{TemplateBinding ContentTemplate}"
+                    CompactSpaceItemPosition="{TemplateBinding CompactSpaceItemPosition}"
+                    CompactSpaceOrientation="{TemplateBinding CompactSpaceOrientation}"
+                    IsUsedInCompactSpace="{TemplateBinding IsUsedInCompactSpace}">
                     <atom:ButtonSpinnerDecoratedBox.SpinnerContent>
                         <atom:ButtonSpinnerHandle
                             ButtonSpinnerLocation="{Binding (atom:ButtonSpinner.ButtonSpinnerLocation), RelativeSource={RelativeSource AncestorType=atom:ButtonSpinner}}"
                             IsMotionEnabled="{Binding (atom:ButtonSpinner.IsMotionEnabled), RelativeSource={RelativeSource AncestorType=atom:ButtonSpinner}}"
                             CornerRadius="{Binding (atom:ButtonSpinner.CornerRadius), RelativeSource={RelativeSource AncestorType=atom:ButtonSpinner}}"
-                            Width="{Binding (atom:ButtonSpinner.SpinnerHandleWidth), RelativeSource={RelativeSource AncestorType=atom:ButtonSpinner}}"
-                        />
+                            Width="{Binding (atom:ButtonSpinner.SpinnerHandleWidth), RelativeSource={RelativeSource AncestorType=atom:ButtonSpinner}}"/>
                     </atom:ButtonSpinnerDecoratedBox.SpinnerContent>
                 </atom:ButtonSpinnerDecoratedBox>
             </ControlTemplate>
diff --git a/src/AtomUI.Desktop.Controls/Buttons/Button.cs b/src/AtomUI.Desktop.Controls/Buttons/Button.cs
index d5f7a1d9d..784065f9a 100644
--- a/src/AtomUI.Desktop.Controls/Buttons/Button.cs
+++ b/src/AtomUI.Desktop.Controls/Buttons/Button.cs
@@ -346,14 +346,6 @@ public class Button : AvaloniaButton,
         {
             ConfigureEffectiveCornerRadius();
         }
-
-        if (change.Property == CompactSpace.ItemSizeProperty)
-        {
-            if (change.NewValue is CompactSpaceSize newSize)
-            {
-                CompactSpace.ConfigureItemSize(this, newSize, IsUsedInCompactSpace, CompactSpaceOrientation);
-            }
-        }
     }
     
     private void ConfigureWaveSpiritType()
@@ -508,7 +500,6 @@ public class Button : AvaloniaButton,
 
     private void ConfigureEffectiveCornerRadius()
     {
-        CompactSpace.ConfigureItemSize(this, CompactSpace.GetItemSize(this), IsUsedInCompactSpace, CompactSpaceOrientation);
         if (!IsUsedInCompactSpace)
         {
             EffectiveCornerRadius = CornerRadius;
@@ -591,27 +582,16 @@ public class Button : AvaloniaButton,
     {
         return ButtonType == ButtonType.Primary;
     }
-    
-    protected override void ArrangeCore(Rect finalRect)
+
+    double ICompactSpaceAware.GetBorderThickness() => GetBorderThicknessForCompactSpace();
+
+    protected virtual double GetBorderThicknessForCompactSpace()
     {
-        if (CompactSpaceItemPosition == null ||
-            CompactSpaceItemPosition == SpaceItemPosition.First ||
-            CompactSpaceItemPosition == SpaceItemPosition.FirstAndLast)
+        if (!IsUsedInCompactSpace)
         {
-            base.ArrangeCore(finalRect);
-            return;
+            return 0.0;
         }
 
-        var offsetX = finalRect.X;
-        var offsetY = finalRect.Y;
-        if (CompactSpaceOrientation == Orientation.Horizontal)
-        {
-            offsetX -= BorderThickness.Left;
-        }
-        else
-        {
-            offsetY -=  BorderThickness.Top;
-        }
-        base.ArrangeCore(new Rect(offsetX, offsetY, finalRect.Width, finalRect.Height));
+        return CompactSpaceOrientation == Orientation.Horizontal ? BorderThickness.Left : BorderThickness.Top;
     }
 }
\ No newline at end of file
diff --git a/src/AtomUI.Desktop.Controls/Dialog/Themes/DialogButtonBoxTheme.axaml b/src/AtomUI.Desktop.Controls/Dialog/Themes/DialogButtonBoxTheme.axaml
index 3cc11ee32..72c88ca2c 100644
--- a/src/AtomUI.Desktop.Controls/Dialog/Themes/DialogButtonBoxTheme.axaml
+++ b/src/AtomUI.Desktop.Controls/Dialog/Themes/DialogButtonBoxTheme.axaml
@@ -30,6 +30,7 @@
         </Setter>
 
         <Setter Property="IsMotionEnabled" Value="{DynamicResource {x:Static atom:SharedTokenKey.EnableMotion}}" />
+        <Setter Property="ClipToBounds" Value="False" />
         <Style Selector="^ /template/ DockPanel">
             <Setter Property="HorizontalSpacing" Value="{DynamicResource {x:Static atom:DialogTokenKey.ButtonGroupSpacing}}" />
         </Style>
diff --git a/src/AtomUI.Desktop.Controls/Input/LineEdit.cs b/src/AtomUI.Desktop.Controls/Input/LineEdit.cs
index 3940ceb98..a2350a1f0 100644
--- a/src/AtomUI.Desktop.Controls/Input/LineEdit.cs
+++ b/src/AtomUI.Desktop.Controls/Input/LineEdit.cs
@@ -126,7 +126,7 @@ public class LineEdit : TextBox
             return 0.0;
         }
 
-        if (_addOnDecoratedBox == null || _addOnDecoratedBox.StyleVariant == AddOnDecoratedVariant.Borderless)
+        if (_addOnDecoratedBox == null || _addOnDecoratedBox.StyleVariant != AddOnDecoratedVariant.Outline)
         {
             return 0.0;
         }
diff --git a/src/AtomUI.Desktop.Controls/Input/TextBox.cs b/src/AtomUI.Desktop.Controls/Input/TextBox.cs
index 87cdff3b5..b772f5cfa 100644
--- a/src/AtomUI.Desktop.Controls/Input/TextBox.cs
+++ b/src/AtomUI.Desktop.Controls/Input/TextBox.cs
@@ -211,13 +211,6 @@ public class TextBox : AvaloniaTextBox,
             ConfigureCornerRadius();
         }
         
-        if (change.Property == CompactSpace.ItemSizeProperty)
-        {
-            if (change.NewValue is CompactSpaceSize newSize)
-            {
-                CompactSpace.ConfigureItemSize(this, newSize, IsUsedInCompactSpace, CompactSpaceOrientation);
-            }
-        }
     }
 
     private void ConfigureCornerRadius()
@@ -228,7 +221,7 @@ public class TextBox : AvaloniaTextBox,
         }
         else
         {
-            if (SpaceItemPosition.First == CompactSpaceItemPosition)
+            if ((CompactSpaceItemPosition & SpaceItemPosition.First) != 0)
             {
                 if (CompactSpaceOrientation == Orientation.Horizontal)
                 {
@@ -247,7 +240,7 @@ public class TextBox : AvaloniaTextBox,
                         bottomRight:0);
                 }
             }
-            else if (SpaceItemPosition.Middle == CompactSpaceItemPosition)
+            else if ((CompactSpaceItemPosition & SpaceItemPosition.Middle) != 0)
             {
                 EffectiveCornerRadius = new CornerRadius(
                     topLeft:0,
@@ -255,7 +248,7 @@ public class TextBox : AvaloniaTextBox,
                     topRight:0, 
                     bottomRight:0);
             }
-            else if (SpaceItemPosition.Last == CompactSpaceItemPosition)
+            else if ((CompactSpaceItemPosition & SpaceItemPosition.Last) != 0)
             {
                 if (CompactSpaceOrientation == Orientation.Horizontal)
                 {
@@ -341,29 +334,9 @@ public class TextBox : AvaloniaTextBox,
         CompactSpaceOrientation = orientation;
     }
 
-    protected override void ArrangeCore(Rect finalRect)
+    double ICompactSpaceAware.GetBorderThickness()
     {
-        if (CompactSpaceItemPosition == null ||
-            CompactSpaceItemPosition == SpaceItemPosition.First ||
-            CompactSpaceItemPosition == SpaceItemPosition.FirstAndLast)
-        {
-            base.ArrangeCore(finalRect);
-            return;
-        }
-        
-        var borderThickness = GetBorderThicknessForCompactSpace();
-
-        var offsetX = finalRect.X;
-        var offsetY = finalRect.Y;
-        if (CompactSpaceOrientation == Orientation.Horizontal)
-        {
-            offsetX -= borderThickness;
-        }
-        else
-        {
-            offsetY -=  borderThickness;
-        }
-        base.ArrangeCore(new Rect(offsetX, offsetY, finalRect.Width, finalRect.Height));
+        return GetBorderThicknessForCompactSpace();
     }
     
     protected virtual double GetBorderThicknessForCompactSpace()
diff --git a/src/AtomUI.Desktop.Controls/Input/Themes/LineEditTheme.axaml b/src/AtomUI.Desktop.Controls/Input/Themes/LineEditTheme.axaml
index 2a023be75..07a3ad2c5 100644
--- a/src/AtomUI.Desktop.Controls/Input/Themes/LineEditTheme.axaml
+++ b/src/AtomUI.Desktop.Controls/Input/Themes/LineEditTheme.axaml
@@ -26,7 +26,8 @@
                 CompactSpaceItemPosition="{TemplateBinding CompactSpaceItemPosition}"
                 CompactSpaceOrientation="{TemplateBinding CompactSpaceOrientation}"
                 IsUsedInCompactSpace="{TemplateBinding IsUsedInCompactSpace}"
-                Focusable="True">
+                Focusable="True"
+                ClipToBounds="{TemplateBinding ClipToBounds}">
                 <atom:AddOnDecoratedBox.ContentRightAddOn>
                     <StackPanel Orientation="Horizontal"
                                 Spacing="{DynamicResource {x:Static atom:SharedTokenKey.UniformlyPaddingXXS}}">
@@ -47,11 +48,11 @@
                             Focusable="False"
                             Content="{Binding InnerRightContent, RelativeSource={RelativeSource AncestorType=atom:LineEdit}}"
                             IsVisible="{Binding InnerRightContent, RelativeSource={RelativeSource AncestorType=atom:LineEdit}, Converter={x:Static ObjectConverters.IsNotNull}}" />
-                        <atom:TextBlock Name="TextCountIndicator" 
+                        <atom:TextBlock Name="TextCountIndicator"
                                         VerticalAlignment="Center"
                                         Foreground="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextPlaceholder}}"
                                         Text="{Binding CountText, RelativeSource={RelativeSource AncestorType=atom:LineEdit}}"
-                                        IsVisible="{Binding IsShowCount, RelativeSource={RelativeSource AncestorType=atom:LineEdit}}"/>
+                                        IsVisible="{Binding IsShowCount, RelativeSource={RelativeSource AncestorType=atom:LineEdit}}" />
                     </StackPanel>
                 </atom:AddOnDecoratedBox.ContentRightAddOn>
 
@@ -99,6 +100,7 @@
     <Style Selector="^:is(atom|LineEdit)">
         <Setter Property="IsMotionEnabled" Value="{DynamicResource {x:Static atom:SharedTokenKey.EnableMotion}}" />
         <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
+        <Setter Property="ClipToBounds" Value="False" />
         <Style Selector="^[StyleVariant=Borderless]">
             <Style Selector="^:error">
                 <Style Selector="^ /template/ ScrollViewer#PART_ScrollViewer">
diff --git a/src/AtomUI.Desktop.Controls/Input/Themes/SearchEditDecoratedBoxTheme.axaml b/src/AtomUI.Desktop.Controls/Input/Themes/SearchEditDecoratedBoxTheme.axaml
index d577032ab..76f343314 100644
--- a/src/AtomUI.Desktop.Controls/Input/Themes/SearchEditDecoratedBoxTheme.axaml
+++ b/src/AtomUI.Desktop.Controls/Input/Themes/SearchEditDecoratedBoxTheme.axaml
@@ -17,7 +17,6 @@
                         VerticalAlignment="Stretch"
                         VerticalContentAlignment="Center"
                         Focusable="False"
-                        DockPanel.Dock="Left"
                         Content="{TemplateBinding LeftAddOn}"
                         ContentTemplate="{TemplateBinding LeftAddOnTemplate}"
                         BorderThickness="{TemplateBinding LeftAddOnBorderThickness}"
@@ -26,7 +25,6 @@
 
                     <atom:SearchButton
                         Name="{x:Static atom:AddOnDecoratedBoxThemeConstants.RightAddOnPart}"
-                        DockPanel.Dock="Right"
                         Focusable="False"
                         IsEnabled="{TemplateBinding IsEnabled}"
                         Icon="{antdicons:AntDesignIconProvider SearchOutlined}"
diff --git a/src/AtomUI.Desktop.Controls/Input/Themes/SearchEditTheme.axaml b/src/AtomUI.Desktop.Controls/Input/Themes/SearchEditTheme.axaml
index 4d376903a..d9f811400 100644
--- a/src/AtomUI.Desktop.Controls/Input/Themes/SearchEditTheme.axaml
+++ b/src/AtomUI.Desktop.Controls/Input/Themes/SearchEditTheme.axaml
@@ -25,6 +25,9 @@
                     IsEnabled="{TemplateBinding IsEnabled}"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
+                    CompactSpaceItemPosition="{TemplateBinding CompactSpaceItemPosition}"
+                    CompactSpaceOrientation="{TemplateBinding CompactSpaceOrientation}"
+                    IsUsedInCompactSpace="{TemplateBinding IsUsedInCompactSpace}"
                     Focusable="True">
                     <atom:SearchEditDecoratedBox.ContentRightAddOn>
                         <StackPanel Orientation="Horizontal"
@@ -46,10 +49,10 @@
                                 Focusable="False"
                                 Content="{Binding InnerRightContent, RelativeSource={RelativeSource AncestorType=atom:SearchEdit}}"
                                 ContentTemplate="{Binding InnerRightContentTemplate, RelativeSource={RelativeSource AncestorType=atom:SearchEdit}}"
-                                IsVisible="{Binding InnerRightContent, Converter={x:Static ObjectConverters.IsNotNull}, RelativeSource={RelativeSource AncestorType=atom:SearchEdit}}"/>
+                                IsVisible="{Binding InnerRightContent, Converter={x:Static ObjectConverters.IsNotNull}, RelativeSource={RelativeSource AncestorType=atom:SearchEdit}}" />
                         </StackPanel>
                     </atom:SearchEditDecoratedBox.ContentRightAddOn>
-                    
+
                     <atom:ScrollViewer
                         Name="PART_ScrollViewer"
                         Cursor="Ibeam"
@@ -90,7 +93,7 @@
                 </atom:SearchEditDecoratedBox>
             </ControlTemplate>
         </Setter>
-        <Setter Property="ClipToBounds" Value="False"/>
+        <Setter Property="ClipToBounds" Value="False" />
         <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
     </ControlTheme>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/AtomUI.Desktop.Controls/NumericUpDown/NumericUpDown.cs b/src/AtomUI.Desktop.Controls/NumericUpDown/NumericUpDown.cs
index b64f51430..43c5eda2e 100644
--- a/src/AtomUI.Desktop.Controls/NumericUpDown/NumericUpDown.cs
+++ b/src/AtomUI.Desktop.Controls/NumericUpDown/NumericUpDown.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Globalization;
+using System.Globalization;
 using AtomUI.Controls;
 using AtomUI.Desktop.Controls.Themes;
 using AtomUI.Icons.AntDesign;
@@ -11,13 +10,18 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Data.Converters;
 using Avalonia.Input;
+using Avalonia.Layout;
 using Avalonia.Metadata;
+using Avalonia.VisualTree;
 
 namespace AtomUI.Desktop.Controls;
 
 using AvaloniaNumericUpDown = Avalonia.Controls.NumericUpDown;
 
-public class NumericUpDown : AvaloniaNumericUpDown, IMotionAwareControl, IControlSharedTokenResourcesHost
+public class NumericUpDown : AvaloniaNumericUpDown, 
+                             IMotionAwareControl, 
+                             IControlSharedTokenResourcesHost,
+                             ICompactSpaceAware
 {
     #region 公共属性定义
     public static readonly StyledProperty<PathIcon?> ClearIconProperty =
@@ -148,7 +152,6 @@ public class NumericUpDown : AvaloniaNumericUpDown, IMotionAwareControl, IContro
         set => SetValue(StringModeProperty, value);
     }
 
-
     public bool Keyboard
     {
         get => GetValue(KeyboardProperty);
@@ -182,6 +185,15 @@ public class NumericUpDown : AvaloniaNumericUpDown, IMotionAwareControl, IContro
             o => o.IsEffectiveShowClearButton,
             (o, v) => o.IsEffectiveShowClearButton = v);
     
+    internal static readonly StyledProperty<SpaceItemPosition?> CompactSpaceItemPositionProperty = 
+        CompactSpaceAwareControlProperty.CompactSpaceItemPositionProperty.AddOwner<NumericUpDown>();
+    
+    internal static readonly StyledProperty<Orientation> CompactSpaceOrientationProperty = 
+        CompactSpaceAwareControlProperty.CompactSpaceOrientationProperty.AddOwner<NumericUpDown>();
+    
+    internal static readonly StyledProperty<bool> IsUsedInCompactSpaceProperty = 
+        CompactSpaceAwareControlProperty.IsUsedInCompactSpaceProperty.AddOwner<NumericUpDown>();
+    
     internal double SpinnerHandleWidth
     {
         get => GetValue(SpinnerHandleWidthProperty);
@@ -202,6 +214,24 @@ public class NumericUpDown : AvaloniaNumericUpDown, IMotionAwareControl, IContro
         set => SetAndRaise(IsEffectiveShowClearButtonProperty, ref _isEffectiveShowClearButton, value);
     }
     
+    internal SpaceItemPosition? CompactSpaceItemPosition
+    {
+        get => GetValue(CompactSpaceItemPositionProperty);
+        set => SetValue(CompactSpaceItemPositionProperty, value);
+    }
+    
+    internal Orientation CompactSpaceOrientation
+    {
+        get => GetValue(CompactSpaceOrientationProperty);
+        set => SetValue(CompactSpaceOrientationProperty, value);
+    }
+    
+    internal bool IsUsedInCompactSpace
+    {
+        get => GetValue(IsUsedInCompactSpaceProperty);
+        set => SetValue(IsUsedInCompactSpaceProperty, value);
+    }
+    
     Control IControlSharedTokenResourcesHost.HostControl => this;
     string IControlSharedTokenResourcesHost.TokenId => NumericUpDownToken.ID;
     
@@ -216,6 +246,7 @@ public class NumericUpDown : AvaloniaNumericUpDown, IMotionAwareControl, IContro
     private bool _isUpdatingFromValue;
     private bool _isUpdatingText;
     private bool _isParsingText;
+    private ButtonSpinner? _buttonSpinner;
     
     public NumericUpDown()
     {
@@ -242,6 +273,7 @@ public class NumericUpDown : AvaloniaNumericUpDown, IMotionAwareControl, IContro
         }
         SetTextBoxPart(e.NameScope.Find<TextBox>("PART_TextBox"));
         ConfigureEffectiveShowClearButton();
+        _buttonSpinner =  e.NameScope.Find<ButtonSpinner>(NumericUpDownThemeConstants.SpinnerPart);
     }
     
     protected virtual void NotifyClearButtonClicked()
@@ -342,13 +374,13 @@ public class NumericUpDown : AvaloniaNumericUpDown, IMotionAwareControl, IContro
     {
         if (_textBoxPart != null)
         {
-            _textBoxPart.KeyDown -= HandleTextBoxKeyDown;
+            _textBoxPart.KeyDown             -= HandleTextBoxKeyDown;
             _textBoxPart.PointerWheelChanged -= HandleTextBoxPointerWheelChanged;
         }
         _textBoxPart = textBox;
         if (_textBoxPart != null)
         {
-            _textBoxPart.KeyDown += HandleTextBoxKeyDown;
+            _textBoxPart.KeyDown             += HandleTextBoxKeyDown;
             _textBoxPart.PointerWheelChanged += HandleTextBoxPointerWheelChanged;
         }
     }
@@ -590,4 +622,39 @@ public class NumericUpDown : AvaloniaNumericUpDown, IMotionAwareControl, IContro
             return _owner.FormatDisplayText(raw, culture);
         }
     }
+    
+    void ICompactSpaceAware.NotifyPositionChange(SpaceItemPosition? position)
+    {
+        IsUsedInCompactSpace     = position != null;
+        CompactSpaceItemPosition = position;
+    }
+    
+    void ICompactSpaceAware.NotifyOrientationChange(Orientation orientation)
+    {
+        CompactSpaceOrientation = orientation;
+    }
+    
+    double ICompactSpaceAware.GetBorderThickness()
+    {
+        if (!IsUsedInCompactSpace)
+        {
+            return 0.0;
+        }
+
+        var addOnDecoratedBox = _buttonSpinner?.DecoratedBox;
+        if (addOnDecoratedBox == null && this.GetVisualRoot() is ILayoutRoot visualRoot)
+        {
+            var layoutManager = visualRoot.GetLayoutManager();
+            layoutManager.ExecuteLayoutPass();
+            addOnDecoratedBox = _buttonSpinner?.DecoratedBox;
+        }
+        
+        if (addOnDecoratedBox == null || StyleVariant != AddOnDecoratedVariant.Outline)
+        {
+            return 0.0;
+        }
+
+        // 都一样宽
+        return addOnDecoratedBox.InnerBoxBorderThickness.Left;
+    }
 }
diff --git a/src/AtomUI.Desktop.Controls/NumericUpDown/Themes/NumericUpDownTheme.axaml b/src/AtomUI.Desktop.Controls/NumericUpDown/Themes/NumericUpDownTheme.axaml
index b5692a4e6..e0ad11022 100644
--- a/src/AtomUI.Desktop.Controls/NumericUpDown/Themes/NumericUpDownTheme.axaml
+++ b/src/AtomUI.Desktop.Controls/NumericUpDown/Themes/NumericUpDownTheme.axaml
@@ -22,7 +22,10 @@
                     RightAddOnTemplate="{TemplateBinding RightAddOnTemplate}"
                     InnerLeftContent="{TemplateBinding InnerLeftContent}"
                     InnerLeftContentTemplate="{TemplateBinding InnerLeftContentTemplate}"
-                    SpinnerHandleWidth="{TemplateBinding SpinnerHandleWidth}">
+                    SpinnerHandleWidth="{TemplateBinding SpinnerHandleWidth}"
+                    CompactSpaceItemPosition="{TemplateBinding CompactSpaceItemPosition}"
+                    CompactSpaceOrientation="{TemplateBinding CompactSpaceOrientation}"
+                    IsUsedInCompactSpace="{TemplateBinding IsUsedInCompactSpace}">
                     <atom:ButtonSpinner.InnerRightContent>
                         <StackPanel Orientation="Horizontal"
                                     Spacing="{DynamicResource {x:Static atom:SharedTokenKey.UniformlyPaddingXXS}}">
diff --git a/src/AtomUI.Desktop.Controls/Primitives/AddOnDecoratedBox/AddOnDecoratedBox.cs b/src/AtomUI.Desktop.Controls/Primitives/AddOnDecoratedBox/AddOnDecoratedBox.cs
index 895ca3fd6..cbee2d54c 100644
--- a/src/AtomUI.Desktop.Controls/Primitives/AddOnDecoratedBox/AddOnDecoratedBox.cs
+++ b/src/AtomUI.Desktop.Controls/Primitives/AddOnDecoratedBox/AddOnDecoratedBox.cs
@@ -411,7 +411,7 @@ internal class AddOnDecoratedBox : ContentControl,
         
         if (IsUsedInCompactSpace)
         {
-            if (CompactSpaceItemPosition == SpaceItemPosition.First)
+            if ((CompactSpaceItemPosition & SpaceItemPosition.First) != 0)
             {
                 if (CompactSpaceOrientation == Orientation.Horizontal)
                 {
@@ -436,7 +436,7 @@ internal class AddOnDecoratedBox : ContentControl,
                         bottomRight: 0);
                 }
             }
-            else if (CompactSpaceItemPosition == SpaceItemPosition.Middle)
+            else if ((CompactSpaceItemPosition & SpaceItemPosition.Middle) != 0)
             {
                 LeftAddOnCornerRadius = new CornerRadius(topLeft:0,
                     topRight:0,
@@ -447,7 +447,7 @@ internal class AddOnDecoratedBox : ContentControl,
                     bottomLeft: 0,
                     bottomRight: 0);
             }
-            else if (CompactSpaceItemPosition == SpaceItemPosition.Last)
+            else if ((CompactSpaceItemPosition & SpaceItemPosition.Last) != 0)
             {
                 if (CompactSpaceOrientation == Orientation.Horizontal)
                 {
@@ -584,7 +584,7 @@ internal class AddOnDecoratedBox : ContentControl,
 
             if (IsUsedInCompactSpace)
             {
-                if (CompactSpaceItemPosition == SpaceItemPosition.First)
+                if ((CompactSpaceItemPosition & SpaceItemPosition.First) != 0)
                 {
                     if (CompactSpaceOrientation == Orientation.Horizontal)
                     {
@@ -597,14 +597,14 @@ internal class AddOnDecoratedBox : ContentControl,
                         bottomRightRadius = 0;
                     }
                 }
-                else if (CompactSpaceItemPosition == SpaceItemPosition.Middle)
+                else if ((CompactSpaceItemPosition & SpaceItemPosition.Middle) != 0)
                 {
                      topLeftRadius     = 0;
                      topRightRadius    = 0;
                      bottomLeftRadius  = 0;
                      bottomRightRadius = 0;
                 }
-                else if (CompactSpaceItemPosition == SpaceItemPosition.Last)
+                else if ((CompactSpaceItemPosition & SpaceItemPosition.Last) != 0)
                 {
                     if (CompactSpaceOrientation == Orientation.Horizontal)
                     {
diff --git a/src/AtomUI.Desktop.Controls/Primitives/AddOnDecoratedBox/Themes/AddOnDecoratedBoxTheme.axaml b/src/AtomUI.Desktop.Controls/Primitives/AddOnDecoratedBox/Themes/AddOnDecoratedBoxTheme.axaml
index b5625de62..31af23233 100644
--- a/src/AtomUI.Desktop.Controls/Primitives/AddOnDecoratedBox/Themes/AddOnDecoratedBoxTheme.axaml
+++ b/src/AtomUI.Desktop.Controls/Primitives/AddOnDecoratedBox/Themes/AddOnDecoratedBoxTheme.axaml
@@ -76,6 +76,7 @@
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="UseLayoutRounding" Value="False" />
         <Setter Property="VerticalAlignment" Value="Top" />
+        <Setter Property="ClipToBounds" Value="False" />
         <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
         <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorText}}" />
         <Setter Property="BorderThickness" Value="{DynamicResource {x:Static atom:SharedTokenKey.BorderThickness}}" />
diff --git a/src/AtomUI.Desktop.Controls/Select/AbstractSelect.cs b/src/AtomUI.Desktop.Controls/Select/AbstractSelect.cs
index ec50ed2ca..b0b05c843 100644
--- a/src/AtomUI.Desktop.Controls/Select/AbstractSelect.cs
+++ b/src/AtomUI.Desktop.Controls/Select/AbstractSelect.cs
@@ -652,14 +652,6 @@ public class AbstractSelect : TemplatedControl,
         {
             ConfigureMaxDropdownHeight();
         }
-        
-        if (change.Property == CompactSpace.ItemSizeProperty)
-        {
-            if (change.NewValue is CompactSpaceSize newSize)
-            {
-                CompactSpace.ConfigureItemSize(this, newSize, IsUsedInCompactSpace, CompactSpaceOrientation);
-            }
-        }
     }
 
     protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
@@ -701,13 +693,11 @@ public class AbstractSelect : TemplatedControl,
 
         if (Popup != null)
         {
-            Popup.IgnoreFirstDetected =  false;
             Popup.ClickHidePredicate  =  PopupClosePredicate;
             Popup.Opened              += PopupOpened;
             Popup.Closed              += PopupClosed;
         }
         _addOnDecoratedBox = e.NameScope.Find<AddOnDecoratedBox>(AddOnDecoratedBox.AddOnDecoratedBoxPart);
-        CompactSpace.ConfigureItemSize(this, CompactSpace.GetItemSize(this), IsUsedInCompactSpace, CompactSpaceOrientation);
     }
     
     protected virtual void PopupClosed(object? sender, EventArgs e)
@@ -883,29 +873,9 @@ public class AbstractSelect : TemplatedControl,
         CompactSpaceOrientation = orientation;
     }
     
-    protected override void ArrangeCore(Rect finalRect)
+    double ICompactSpaceAware.GetBorderThickness()
     {
-        if (CompactSpaceItemPosition == null ||
-            CompactSpaceItemPosition == SpaceItemPosition.First ||
-            CompactSpaceItemPosition == SpaceItemPosition.FirstAndLast)
-        {
-            base.ArrangeCore(finalRect);
-            return;
-        }
-        
-        var borderThickness = GetBorderThicknessForCompactSpace();
-
-        var offsetX = finalRect.X;
-        var offsetY = finalRect.Y;
-        if (CompactSpaceOrientation == Orientation.Horizontal)
-        {
-            offsetX -= borderThickness;
-        }
-        else
-        {
-            offsetY -=  borderThickness;
-        }
-        base.ArrangeCore(new Rect(offsetX, offsetY, finalRect.Width, finalRect.Height));
+        return GetBorderThicknessForCompactSpace();
     }
     
     protected virtual double GetBorderThicknessForCompactSpace()
diff --git a/src/AtomUI.Desktop.Controls/Select/Select.AsyncOptionsLoad.cs b/src/AtomUI.Desktop.Controls/Select/Select.AsyncOptionsLoad.cs
index 7ae550859..26c4f7fd7 100644
--- a/src/AtomUI.Desktop.Controls/Select/Select.AsyncOptionsLoad.cs
+++ b/src/AtomUI.Desktop.Controls/Select/Select.AsyncOptionsLoad.cs
@@ -109,6 +109,10 @@ public partial class Select
         if (isDropDownOpen != IsDropDownOpen)
         {
             IgnorePropertyChange = true;
+            if (isDropDownOpen)
+            {
+                Popup!.IgnoreFirstDetected = true;
+            }
             SetCurrentValue(IsDropDownOpenProperty, isDropDownOpen);
         }
         if (IsDropDownOpen)
diff --git a/src/AtomUI.Desktop.Controls/Select/Select.cs b/src/AtomUI.Desktop.Controls/Select/Select.cs
index 61edf8abe..13463a6c3 100644
--- a/src/AtomUI.Desktop.Controls/Select/Select.cs
+++ b/src/AtomUI.Desktop.Controls/Select/Select.cs
@@ -422,6 +422,7 @@ public partial class Select : AbstractSelect, IControlSharedTokenResourcesHost
         }
         else if (!IsDropDownOpen && (e.Key == Key.Down || e.Key == Key.Up))
         {
+            Popup!.IgnoreFirstDetected = false;
             SetCurrentValue(IsDropDownOpenProperty, true);
             e.Handled = true;
         }
@@ -432,6 +433,7 @@ public partial class Select : AbstractSelect, IControlSharedTokenResourcesHost
         }
         else if (!IsDropDownOpen && (e.Key == Key.Enter || e.Key == Key.Space))
         {
+            Popup!.IgnoreFirstDetected = false;
             SetCurrentValue(IsDropDownOpenProperty, true);
             e.Handled = true;
         }
@@ -532,6 +534,7 @@ public partial class Select : AbstractSelect, IControlSharedTokenResourcesHost
         }
         else
         {
+            Popup!.IgnoreFirstDetected = true;
             SetCurrentValue(IsDropDownOpenProperty, true);
         }
     }
diff --git a/src/AtomUI.Desktop.Controls/Space/CompactSpace.cs b/src/AtomUI.Desktop.Controls/Space/CompactSpace.cs
index e27e77eb3..d0c1e4b19 100644
--- a/src/AtomUI.Desktop.Controls/Space/CompactSpace.cs
+++ b/src/AtomUI.Desktop.Controls/Space/CompactSpace.cs
@@ -1,6 +1,5 @@
 using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Reactive.Disposables;
 using AtomUI.Controls;
 using AtomUI.Data;
@@ -15,15 +14,16 @@ using Avalonia.Input;
 using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.Metadata;
+using Avalonia.VisualTree;
 
 namespace AtomUI.Desktop.Controls;
 
+[Flags]
 internal enum SpaceItemPosition
 {
-    First,
-    Last,
-    Middle,
-    FirstAndLast
+    First  = 0x01,
+    Middle = 0x02,
+    Last   = 0x04,
 }
 
 public class CompactSpace : TemplatedControl,
@@ -129,37 +129,50 @@ public class CompactSpace : TemplatedControl,
         switch (e.Action)
         {
             case NotifyCollectionChangedAction.Add:
-                var newItems = e.NewItems!.OfType<Control>().ToList();
+            {
+                var newItems          = e.NewItems!.OfType<Control>().ToList();
+                var compactSpaceItems = new List<CompactSpaceItem>();
                 foreach (var newItem in newItems)
                 {
                     EnsureCompactSpaceItem(newItem);
-                    NotifyAddCompactSpaceItem(newItem);
+                    var compactSpaceItem = new CompactSpaceItem()
+                    {
+                        Child = newItem
+                    };
+                    NotifyAddCompactSpaceItem(compactSpaceItem);
+                    compactSpaceItems.Add(compactSpaceItem);
                 }
-                _contentLayout.Children.InsertRange(e.NewStartingIndex, newItems);
+                _contentLayout.Children.InsertRange(e.NewStartingIndex, compactSpaceItems);
                 break;
+            }
 
             case NotifyCollectionChangedAction.Move:
                 _contentLayout.Children.MoveRange(e.OldStartingIndex, e.OldItems!.Count, e.NewStartingIndex);
                 break;
 
             case NotifyCollectionChangedAction.Remove:
-                var oldItems = e.OldItems!.OfType<Control>().ToList();
-                foreach (var oldItem in oldItems)
+            {
+                var oldItems          = e.OldItems!.OfType<Control>().ToList();
+                var oldCompactSpaceItems = new List<CompactSpaceItem>();
+                foreach (var oldItem in _contentLayout.Children)
                 {
-                    NotifyRemoveCompactSpaceItem(oldItem);
+                    if (oldItem is CompactSpaceItem compactSpaceItem)
+                    {
+                        if (oldItems.Contains(compactSpaceItem.Child!))
+                        {
+                            oldCompactSpaceItems.Add(compactSpaceItem);
+                        }
+                    }
                 }
-                _contentLayout.Children.RemoveAll(oldItems);
+                foreach (var compactSpaceItem in oldCompactSpaceItems)
+                {
+                    NotifyRemoveCompactSpaceItem(compactSpaceItem);
+                }
+                _contentLayout.Children.RemoveAll(oldCompactSpaceItems);
                 break;
+            }
 
             case NotifyCollectionChangedAction.Replace:
-                for (var i = 0; i < e.OldItems!.Count; ++i)
-                {
-                    var index = i + e.OldStartingIndex;
-                    var child = (Control)e.NewItems![i]!;
-                    _contentLayout.Children[index] = child;
-                }
-                break;
-
             case NotifyCollectionChangedAction.Reset:
                 throw new NotSupportedException();
         }
@@ -177,65 +190,93 @@ public class CompactSpace : TemplatedControl,
         }
     }
 
-    private void NotifyAddCompactSpaceItem(Control child)
+    private void NotifyAddCompactSpaceItem(CompactSpaceItem compactSpaceItem)
     {
-        child.GotFocus       += HandleGotFocus;
-        child.PointerEntered += HandlePointerEntered;
-        child.PointerExited  += HandlePointerExited;
-        NotifyCollectionChangedEventHandler childClassesChangedHandler = delegate (object? sender, NotifyCollectionChangedEventArgs e)
+        if (compactSpaceItem.Child != null)
         {
-            HandleChildFocusWithinChanged(child, child.Classes.Contains(StdPseudoClass.FocusWithIn));
-        };
-        _childClassesChangedHandlers.Add(child, childClassesChangedHandler);
-        child.Classes.CollectionChanged += childClassesChangedHandler;
-        if (child is ICompactSpaceAware compactSpaceAware && compactSpaceAware.IsAlwaysActiveZIndex())
-        {
-            child.ZIndex = ACTIVE_ZINDEX;
-        }
+            var target = compactSpaceItem.Child;
+            
+            target.GotFocus       += HandleGotFocus;
+            target.PointerEntered += HandlePointerEntered;
+            target.PointerExited  += HandlePointerExited;
 
-        if (child is ISizeTypeAware)
-        {
-            var disposables = new CompositeDisposable(2);
-            disposables.Add(BindUtils.RelayBind(this, SizeTypeProperty, child, SizeTypeProperty));
-            _itemsBindingDisposables.Add(child, disposables);
+            target.PropertyChanged += CompactSpaceItemChildPropertyChanged;
+            SetItemSize(compactSpaceItem, GetItemSize(target));
+        
+            NotifyCollectionChangedEventHandler childClassesChangedHandler = delegate (object? sender, NotifyCollectionChangedEventArgs e)
+            {
+                HandleChildFocusWithinChanged(compactSpaceItem, target.Classes.Contains(StdPseudoClass.FocusWithIn));
+            };
+            _childClassesChangedHandlers.Add(target, childClassesChangedHandler);
+            target.Classes.CollectionChanged += childClassesChangedHandler;
+            if (target is ICompactSpaceAware compactSpaceAware && compactSpaceAware.IsAlwaysActiveZIndex())
+            {
+                compactSpaceItem.ZIndex = ACTIVE_ZINDEX;
+            }
+
+            if (target is ISizeTypeAware)
+            {
+                var disposables = new CompositeDisposable(2);
+                disposables.Add(BindUtils.RelayBind(this, SizeTypeProperty, target, SizeTypeProperty));
+                _itemsBindingDisposables.Add(target, disposables);
+            }
         }
     }
     
-    private void NotifyRemoveCompactSpaceItem(Control child)
+    private void NotifyRemoveCompactSpaceItem(CompactSpaceItem compactSpaceItem)
     {
-        child.GotFocus       -= HandleGotFocus;
-        child.PointerEntered -= HandlePointerEntered;
-        child.PointerExited  -= HandlePointerExited;
-        if (_childClassesChangedHandlers.TryGetValue(child, out var childClassesChangedHandler))
+        if (compactSpaceItem.Child != null)
         {
-            child.Classes.CollectionChanged -= childClassesChangedHandler;
-            _childClassesChangedHandlers.Remove(child);
-        }
+            var target = compactSpaceItem.Child;
+            target.GotFocus        -= HandleGotFocus;
+            target.PointerEntered  -= HandlePointerEntered;
+            target.PointerExited   -= HandlePointerExited;
+            target.PropertyChanged -= CompactSpaceItemChildPropertyChanged;
+        
+            if (_childClassesChangedHandlers.TryGetValue(target, out var childClassesChangedHandler))
+            {
+                target.Classes.CollectionChanged -= childClassesChangedHandler;
+                _childClassesChangedHandlers.Remove(target);
+            }
 
-        if (_itemsBindingDisposables.TryGetValue(child, out var disposables))
-        {
-            disposables.Dispose();
-            _itemsBindingDisposables.Remove(child);
+            if (_itemsBindingDisposables.TryGetValue(target, out var disposables))
+            {
+                disposables.Dispose();
+                _itemsBindingDisposables.Remove(target);
+            }
         }
+        
     }
 
+    private void CompactSpaceItemChildPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
+    {
+        if (sender is Control currentControl && sender is ICompactSpaceAware)
+        {
+            var compactSpaceItem = currentControl.FindAncestorOfType<CompactSpaceItem>();
+            if (compactSpaceItem != null && e.Property == ItemSizeProperty && e.NewValue is CompactSpaceSize compactSpaceSize)
+            {
+                SetItemSize(compactSpaceItem, compactSpaceSize);
+            }
+        }
+    }
+    
     #region 孩子的 ZIndex 处理方法
 
     private void HandleGotFocus(object? sender, GotFocusEventArgs e)
     {
-        if (sender is Control currentControl)
+        if (sender is Control currentControl && _contentLayout != null)
         {
-            foreach (var child in Children)
+            foreach (var child in _contentLayout.Children)
             {
-                if (child != null && child is ICompactSpaceAware compactSpaceAware)
+                if (child is CompactSpaceItem compactSpaceItem && compactSpaceItem.Child is ICompactSpaceAware compactSpaceAware)
                 {
-                    if (child == currentControl)
+                    if (compactSpaceItem.Child == currentControl)
                     {
-                        child.ZIndex = ACTIVE_ZINDEX;
+                        compactSpaceItem.ZIndex = ACTIVE_ZINDEX;
                     }
                     else if (!compactSpaceAware.IsAlwaysActiveZIndex())
                     {
-                        child.ZIndex = NORMAL_ZINDEX;
+                        compactSpaceItem.ZIndex = NORMAL_ZINDEX;
                     }
                 }
             }
@@ -244,19 +285,19 @@ public class CompactSpace : TemplatedControl,
 
     private void HandlePointerEntered(object? sender, PointerEventArgs e)
     {
-        if (sender is Control currentControl)
+        if (sender is Control currentControl && _contentLayout != null)
         {
-            foreach (var child in Children)
+            foreach (var child in _contentLayout.Children)
             {
-                if (child != null && child is ICompactSpaceAware compactSpaceAware)
+                if (child is CompactSpaceItem compactSpaceItem && compactSpaceItem.Child is ICompactSpaceAware compactSpaceAware)
                 {
-                    if (child == currentControl)
+                    if (compactSpaceItem.Child == currentControl)
                     {
-                        child.ZIndex = ACTIVE_ZINDEX;
+                        compactSpaceItem.ZIndex = ACTIVE_ZINDEX;
                     }
-                    else  if (!IsEffectiveFocused(child) && !compactSpaceAware.IsAlwaysActiveZIndex())
+                    else  if (!IsEffectiveFocused(compactSpaceItem) && !compactSpaceAware.IsAlwaysActiveZIndex())
                     {
-                        child.ZIndex = NORMAL_ZINDEX;
+                        compactSpaceItem.ZIndex = NORMAL_ZINDEX;
                     }
                 }
             }
@@ -265,11 +306,11 @@ public class CompactSpace : TemplatedControl,
 
     private void HandlePointerExited(object? sender, PointerEventArgs e)
     {
-        if (sender is Control control && control is ICompactSpaceAware compactSpaceAware)
+        if (sender is CompactSpaceItem compactSpaceItem && compactSpaceItem.Child is ICompactSpaceAware compactSpaceAware)
         {
-            if (!IsEffectiveFocused(control) && !compactSpaceAware.IsAlwaysActiveZIndex())
+            if (!IsEffectiveFocused(compactSpaceItem) && !compactSpaceAware.IsAlwaysActiveZIndex())
             {
-                control.ZIndex = NORMAL_ZINDEX;
+                compactSpaceItem.ZIndex = NORMAL_ZINDEX;
             }
         }
     }
@@ -282,9 +323,14 @@ public class CompactSpace : TemplatedControl,
         }
     }
 
-    private bool IsEffectiveFocused(Control control)
+    private bool IsEffectiveFocused(CompactSpaceItem control)
     {
-        return control.Classes.Contains(StdPseudoClass.FocusWithIn) || control.IsFocused;
+        if (control.Child == null)
+        {
+            return false;
+        }
+        var target = control.Child;
+        return target.Classes.Contains(StdPseudoClass.FocusWithIn) || target.IsFocused;
     }
     #endregion
     
@@ -297,32 +343,65 @@ public class CompactSpace : TemplatedControl,
     {
         base.OnApplyTemplate(e);
         _contentLayout = e.NameScope.Get<Grid>(CompactSpaceThemeConstants.ContentLayoutPart);
-
+        var compactSpaceItems = new List<CompactSpaceItem>();
         foreach (var child in Children)
         {
             EnsureCompactSpaceItem(child);
-            NotifyAddCompactSpaceItem(child);
+            var compactSpaceItem = new CompactSpaceItem()
+            {
+                Child = child,
+            };
+            NotifyAddCompactSpaceItem(compactSpaceItem);
+            compactSpaceItems.Add(compactSpaceItem);
         }
-        _contentLayout.Children.AddRange(Children);
+        _contentLayout.Children.AddRange(compactSpaceItems);
 
         ConfigureSizeDefinitions();
         _childIndexChanged?.Invoke(this, ChildIndexChangedEventArgs.ChildIndexesReset);
         InvalidateMeasureOnChildrenChanged();
     }
 
+    protected override Size MeasureCore(Size availableSize)
+    {
+        if (_contentLayout != null)
+        {
+            // 检查 filler 位置和数量
+            var fillerCount = 0;
+            var childrenCount = _contentLayout.Children.Count;
+            for (var i = 0; i < childrenCount; i++)
+            {
+                var child = _contentLayout.Children[i];
+                if (child is CompactSpaceFiller)
+                {
+                    ++fillerCount;
+                    if (i != fillerCount - 1)
+                    {
+                        throw new InvalidSpaceFillerUsageException("The CompactSpaceFiller is misplaced, it can only be the last child.");
+                    }
+                }
+            }
+
+            if (fillerCount > 1)
+            {
+                throw new InvalidSpaceFillerUsageException("There can only be one CompactSpaceFiller.");
+            }
+        }
+        return base.MeasureCore(availableSize);
+    }
+
     private void ConfigureSizeDefinitions()
     {
-        if (_contentLayout == null || Children.Count == 0)
+        if (_contentLayout == null || _contentLayout.Children.Count == 0)
         {
             return;
         }
-
+        var children = _contentLayout.Children;
         if (Orientation == Orientation.Horizontal)
         {
             var columnDefinitions = new ColumnDefinitions();
-            for (var i = 0; i < Children.Count; i++)
+            for (var i = 0; i < children.Count; i++)
             {
-                var child    = Children[i];
+                var child    = children[i];
                 Grid.SetColumn(child, i);
                 var itemSize = GetItemSize(child);
                 if (itemSize.IsAbsolute)
@@ -343,9 +422,9 @@ public class CompactSpace : TemplatedControl,
         else
         {
             var rowDefinitions = new RowDefinitions();
-            for (var i = 0; i < Children.Count; i++)
+            for (var i = 0; i < children.Count; i++)
             {
-                var child    = Children[i];
+                var child    = children[i];
                 Grid.SetRow(child, i);
                 var itemSize = GetItemSize(child);
                 if (itemSize.IsAbsolute)
@@ -365,17 +444,21 @@ public class CompactSpace : TemplatedControl,
         }
         
         // 计算位置
-        var realChildren = Children.Where(child => child is not CompactSpaceFiller).ToList();
+        var realChildren = children.Where(child => child is CompactSpaceItem compactSpaceItem && compactSpaceItem.Child is not CompactSpaceFiller).ToList();
         if (realChildren.Count == 1)
         {
             if (realChildren[0] is ICompactSpaceAware compactSpaceAware)
             {
-                compactSpaceAware.NotifyPositionChange(SpaceItemPosition.FirstAndLast);
+                compactSpaceAware.NotifyPositionChange(SpaceItemPosition.First | SpaceItemPosition.Last);
             }
         }
         for (var i = 0; i < realChildren.Count; i++)
         {
             var child = realChildren[i];
+            if (child is CompactSpaceItem compactSpaceItem)
+            {
+                compactSpaceItem.PositionIndex = i;
+            }
             if (child is ICompactSpaceAware compactSpaceAware)
             {
                 compactSpaceAware.NotifyOrientationChange(Orientation);
@@ -455,54 +538,4 @@ public class CompactSpace : TemplatedControl,
         }
         return null;
     }
-
-    internal static void ConfigureItemSize(Control control, 
-                                           CompactSpaceSize size,
-                                           bool isUsedInCompactSpace,
-                                           Orientation compactSpaceOrientation) 
-    {
-        Debug.Assert(control is ICompactSpaceAware);
-        if (!isUsedInCompactSpace)
-        {
-            control.ClearValue(HorizontalAlignmentProperty);
-            control.ClearValue(VerticalAlignmentProperty);
-        }
-        else
-        {
-            if (compactSpaceOrientation == Orientation.Horizontal)
-            {
-                if (size.IsStar)
-                {
-                    control.ClearValue(WidthProperty);
-                    control.SetCurrentValue(HorizontalAlignmentProperty, HorizontalAlignment.Stretch);
-                }
-                else if (size.IsAbsolute)
-                {
-                    control.SetCurrentValue(WidthProperty, size.Value);
-                }
-                else
-                {
-                    control.ClearValue(WidthProperty);
-                    control.ClearValue(HorizontalAlignmentProperty);
-                }
-            }
-            else
-            {
-                if (size.IsStar)
-                {
-                    control.ClearValue(HeightProperty);
-                    control.SetCurrentValue(VerticalAlignmentProperty, HorizontalAlignment.Stretch);
-                }
-                else if (size.IsAbsolute)
-                {
-                    control.SetCurrentValue(HeightProperty, size.Value);
-                }
-                else
-                {
-                    control.ClearValue(HeightProperty);
-                    control.ClearValue(VerticalAlignmentProperty);
-                }
-            }
-        }
-    }
 }
\ No newline at end of file
diff --git a/src/AtomUI.Desktop.Controls/Space/CompactSpaceFiller.cs b/src/AtomUI.Desktop.Controls/Space/CompactSpaceFiller.cs
index f549b9b6f..085d78e95 100644
--- a/src/AtomUI.Desktop.Controls/Space/CompactSpaceFiller.cs
+++ b/src/AtomUI.Desktop.Controls/Space/CompactSpaceFiller.cs
@@ -14,4 +14,6 @@ public class CompactSpaceFiller : Control, ICompactSpaceAware
     {
         // no op
     }
+
+    double ICompactSpaceAware.GetBorderThickness() => 0.0;
 }
\ No newline at end of file
diff --git a/src/AtomUI.Desktop.Controls/Space/CompactSpaceItem.cs b/src/AtomUI.Desktop.Controls/Space/CompactSpaceItem.cs
new file mode 100644
index 000000000..7e71e292e
--- /dev/null
+++ b/src/AtomUI.Desktop.Controls/Space/CompactSpaceItem.cs
@@ -0,0 +1,195 @@
+using System.Reactive.Disposables;
+using AtomUI.Data;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Media;
+
+namespace AtomUI.Desktop.Controls;
+
+internal class CompactSpaceItem : Decorator, ICompactSpaceAware
+{
+    internal static readonly StyledProperty<SpaceItemPosition?> CompactSpaceItemPositionProperty = 
+        CompactSpaceAwareControlProperty.CompactSpaceItemPositionProperty.AddOwner<CompactSpaceItem>();
+    
+    internal static readonly StyledProperty<Orientation> CompactSpaceOrientationProperty = 
+        CompactSpaceAwareControlProperty.CompactSpaceOrientationProperty.AddOwner<CompactSpaceItem>();
+    
+    internal static readonly StyledProperty<bool> IsUsedInCompactSpaceProperty = 
+        CompactSpaceAwareControlProperty.IsUsedInCompactSpaceProperty.AddOwner<CompactSpaceItem>();
+    
+    public static readonly StyledProperty<int> PositionIndexProperty = 
+        AvaloniaProperty.Register<CompactSpaceItem, int>(nameof(PositionIndex));
+    
+    internal SpaceItemPosition? CompactSpaceItemPosition
+    {
+        get => GetValue(CompactSpaceItemPositionProperty);
+        set => SetValue(CompactSpaceItemPositionProperty, value);
+    }
+    
+    internal Orientation CompactSpaceOrientation
+    {
+        get => GetValue(CompactSpaceOrientationProperty);
+        set => SetValue(CompactSpaceOrientationProperty, value);
+    }
+    
+    internal bool IsUsedInCompactSpace
+    {
+        get => GetValue(IsUsedInCompactSpaceProperty);
+        set => SetValue(IsUsedInCompactSpaceProperty, value);
+    }
+    
+    internal int PositionIndex
+    {
+        get => GetValue(PositionIndexProperty);
+        set => SetValue(PositionIndexProperty, value);
+    }
+    
+    private CompositeDisposable? _disposables;
+
+    static CompactSpaceItem()
+    {
+        AffectsMeasure<CompactSpaceItem>(CompactSpaceItemPositionProperty, CompactSpaceOrientationProperty, IsUsedInCompactSpaceProperty);
+        ClipToBoundsProperty.OverrideDefaultValue<CompactSpaceItem>(false);
+    }
+
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+    {
+        base.OnPropertyChanged(change);
+        if (change.Property == ChildProperty)
+        {
+            if (change.OldValue != null)
+            {
+                _disposables?.Dispose();
+            }
+
+            if (change.NewValue != null && change.NewValue is ICompactSpaceAware && Child != null)
+            {
+                _disposables = new CompositeDisposable();
+                _disposables.Add(BindUtils.RelayBind(this, CompactSpaceItemPositionProperty, Child, CompactSpaceItemPositionProperty));
+                _disposables.Add(BindUtils.RelayBind(this, CompactSpaceOrientationProperty, Child, CompactSpaceOrientationProperty));
+                _disposables.Add(BindUtils.RelayBind(this, IsUsedInCompactSpaceProperty, Child, IsUsedInCompactSpaceProperty));
+            }
+        }
+        if (change.Property == ChildProperty ||
+            change.Property == CompactSpace.ItemSizeProperty ||
+            change.Property == CompactSpaceOrientationProperty ||
+            change.Property == IsUsedInCompactSpaceProperty ||
+            change.Property == CompactSpaceItemPositionProperty)
+        {
+            ConfigureItemSize(CompactSpace.GetItemSize(this), IsUsedInCompactSpace, CompactSpaceOrientation);
+        }
+    }
+    
+    void ICompactSpaceAware.NotifyPositionChange(SpaceItemPosition? position)
+    {
+        IsUsedInCompactSpace     = position != null;
+        CompactSpaceItemPosition = position;
+    }
+
+    bool ICompactSpaceAware.IsAlwaysActiveZIndex()
+    {
+        if (Child is ICompactSpaceAware compactSpaceAware)
+        {
+            return compactSpaceAware.IsAlwaysActiveZIndex();
+        }
+
+        return false;
+    }
+
+    protected override Size MeasureOverride(Size availableSize)
+    {
+        var size = base.MeasureOverride(availableSize);
+
+        if (CompactSpaceItemPosition == null ||
+            CompactSpaceItemPosition == SpaceItemPosition.First ||
+            (CompactSpaceItemPosition.Value.HasFlag(SpaceItemPosition.First) && CompactSpaceItemPosition.Value.HasFlag(SpaceItemPosition.Last)))
+        {
+            return size;
+        }
+        var borderThickness = (this as ICompactSpaceAware).GetBorderThickness();
+        var delta           = borderThickness * PositionIndex;
+        if (CompactSpaceOrientation == Orientation.Horizontal)
+        {
+            RenderTransform = new TranslateTransform(-delta, 0);
+        }
+        else
+        {
+            RenderTransform = new TranslateTransform(0, -delta);
+        }
+        return size;
+    }
+
+    void ICompactSpaceAware.NotifyOrientationChange(Orientation orientation)
+    {
+        CompactSpaceOrientation = orientation;
+    }
+
+    double ICompactSpaceAware.GetBorderThickness()
+    {
+        if (Child is ICompactSpaceAware compactSpaceAware)
+        {
+            return compactSpaceAware.GetBorderThickness();
+        }
+
+        return 0.0;
+    }
+    
+    private void ConfigureItemSize(CompactSpaceSize size, bool isUsedInCompactSpace, Orientation compactSpaceOrientation) 
+    {
+        if (!isUsedInCompactSpace)
+        {
+            ClearValue(HorizontalAlignmentProperty);
+            ClearValue(VerticalAlignmentProperty);
+        }
+        else
+        {
+            if (compactSpaceOrientation == Orientation.Horizontal)
+            {
+                if (size.IsStar)
+                {
+                    ClearValue(WidthProperty);
+                    SetCurrentValue(HorizontalAlignmentProperty, HorizontalAlignment.Stretch);
+                }
+                else if (size.IsAbsolute)
+                {
+                    SetCurrentValue(HorizontalAlignmentProperty, HorizontalAlignment.Left);
+                    SetCurrentValue(WidthProperty, size.Value);
+                }
+                else
+                {
+                    ClearValue(WidthProperty);
+                    ClearValue(HorizontalAlignmentProperty);
+                }
+
+                if (Child != null)
+                {
+                    Child.SetCurrentValue(HorizontalAlignmentProperty, HorizontalAlignment.Stretch);
+                }
+            }
+            else
+            {
+                if (size.IsStar)
+                {
+                    ClearValue(HeightProperty);
+                    SetCurrentValue(VerticalAlignmentProperty, HorizontalAlignment.Stretch);
+                }
+                else if (size.IsAbsolute)
+                {
+                    SetCurrentValue(VerticalAlignmentProperty, VerticalAlignment.Top);
+                    SetCurrentValue(HeightProperty, size.Value);
+                }
+                else
+                {
+                    ClearValue(HeightProperty);
+                    ClearValue(VerticalAlignmentProperty);
+                }
+                
+                if (Child != null)
+                {
+                    Child.SetCurrentValue(VerticalAlignmentProperty, VerticalAlignment.Stretch);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/AtomUI.Desktop.Controls/Space/ICompactSpaceAware.cs b/src/AtomUI.Desktop.Controls/Space/ICompactSpaceAware.cs
index 0f3553493..be970468f 100644
--- a/src/AtomUI.Desktop.Controls/Space/ICompactSpaceAware.cs
+++ b/src/AtomUI.Desktop.Controls/Space/ICompactSpaceAware.cs
@@ -12,6 +12,8 @@ internal interface ICompactSpaceAware
     {
         return false;
     }
+
+    double GetBorderThickness();
 }
 
 internal abstract class CompactSpaceAwareControlProperty
diff --git a/src/AtomUI.Desktop.Controls/Space/InvalidSpaceFillerUsageException.cs b/src/AtomUI.Desktop.Controls/Space/InvalidSpaceFillerUsageException.cs
new file mode 100644
index 000000000..c2e735ac9
--- /dev/null
+++ b/src/AtomUI.Desktop.Controls/Space/InvalidSpaceFillerUsageException.cs
@@ -0,0 +1,8 @@
+namespace AtomUI.Desktop.Controls;
+
+public class InvalidSpaceFillerUsageException : SystemException
+{
+    public InvalidSpaceFillerUsageException(string message) : base(message)
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/AtomUI.Desktop.Controls/Space/Themes/CompactSpaceTheme.axaml b/src/AtomUI.Desktop.Controls/Space/Themes/CompactSpaceTheme.axaml
index c52fcc104..355cb9385 100644
--- a/src/AtomUI.Desktop.Controls/Space/Themes/CompactSpaceTheme.axaml
+++ b/src/AtomUI.Desktop.Controls/Space/Themes/CompactSpaceTheme.axaml
@@ -6,10 +6,11 @@
     <ControlTheme x:Key="{x:Type atom:CompactSpace}" TargetType="atom:CompactSpace">
         <Setter Property="Template">
             <ControlTemplate>
-                <Grid Name="{x:Static atom:CompactSpaceThemeConstants.ContentLayoutPart}"/>
+                <Grid Name="{x:Static atom:CompactSpaceThemeConstants.ContentLayoutPart}" UseLayoutRounding="False"/>
             </ControlTemplate>
         </Setter>
+
+        <Setter Property="ClipToBounds" Value="False" />
         
-        <Setter Property="ClipToBounds" Value="False"/>
     </ControlTheme>
 </ResourceDictionary>
\ No newline at end of file