diff --git a/src/pages/editor/components/sidebar/ObjectSettings.tsx b/src/pages/editor/components/sidebar/ObjectSettings.tsx
index d5ee651..6d94c76 100644
--- a/src/pages/editor/components/sidebar/ObjectSettings.tsx
+++ b/src/pages/editor/components/sidebar/ObjectSettings.tsx
@@ -30,7 +30,7 @@ const ObjectSettings = ({
 }: ObjectSettingsProps) => {
     return (
         <div className="space-y-4">
-            <div className="flex items-center justify-between pb-4 border-b border-border">
+            <div className="flex items-center justify-between pb-4">
                 <h3 className="text-sm font-medium">تنظیمات شیء</h3>
                 <button
                     onClick={() => onDelete(selectedObject.id)}
@@ -40,6 +40,12 @@ const ObjectSettings = ({
                 </button>
             </div>
 
+            <AlignmentSettings
+                pageWidth={pageWidth}
+                pageHeight={pageHeight}
+                onUpdate={onUpdate}
+            />
+
             {/* Mask Settings for all objects */}
             <MaskSettings objectId={selectedObject.id} />
 
@@ -65,6 +71,8 @@ const ObjectSettings = ({
                 <VideoSettings selectedObject={selectedObject} onUpdate={onUpdate} />
             )}
 
+
+
             {(selectedObject.type === "document" || selectedObject.type === "sticker") && (
                 <SizeSettings
                     selectedObject={selectedObject}
@@ -78,11 +86,7 @@ const ObjectSettings = ({
                 <GridSettings selectedObject={selectedObject} onUpdate={onUpdate} />
             )}
 
-            <AlignmentSettings
-                pageWidth={pageWidth}
-                pageHeight={pageHeight}
-                onUpdate={onUpdate}
-            />
+
             <TransformSettings selectedObject={selectedObject} onUpdate={onUpdate} />
         </div>
     );
diff --git a/src/pages/editor/components/sidebar/settings/MaskSettings.tsx b/src/pages/editor/components/sidebar/settings/MaskSettings.tsx
index b767de1..d1bbec4 100644
--- a/src/pages/editor/components/sidebar/settings/MaskSettings.tsx
+++ b/src/pages/editor/components/sidebar/settings/MaskSettings.tsx
@@ -55,7 +55,7 @@ const MaskSettings = ({ objectId }: MaskSettingsProps) => {
 
   return (
     <div className={clx(
-      "p-4 border-b space-y-4",
+      "p-4 border-b space-y-4 border-t border-border",
       !canBeMask && "border-b-0 p-0"
     )}>
       {/* Section 1: Convert shape to mask (only for shapes) */}