diff --git a/packages/ui/src/components/layout/MainLayout.tsx b/packages/ui/src/components/layout/MainLayout.tsx
index 7b39875d..40889c77 100644
--- a/packages/ui/src/components/layout/MainLayout.tsx
+++ b/packages/ui/src/components/layout/MainLayout.tsx
@@ -606,58 +606,54 @@ export const MainLayout: React.FC = () => {
                     <div className="flex flex-1 flex-col overflow-hidden">
                         <Header />
                         <div className="relative flex flex-1 min-h-0 overflow-hidden bg-sidebar" data-page-scroll-lock="true">
-                            {isSidebarOpen ? (
-                                <>
-                                    <div
-                                        aria-hidden
-                                        className="pointer-events-none absolute top-0 z-0 bg-sidebar"
-                                        style={{
-                                            left: `${visibleSidebarWidth}px`,
-                                            width: '10px',
-                                            height: '10px',
-                                            WebkitMaskImage: 'radial-gradient(circle at 100% 100%, transparent calc(10px - 1px), black 10px)',
-                                            maskImage: 'radial-gradient(circle at 100% 100%, transparent calc(10px - 1px), black 10px)',
-                                        }}
-                                    />
-                                    <div
-                                        aria-hidden
-                                        className="pointer-events-none absolute bottom-0 z-0 bg-sidebar"
-                                        style={{
-                                            left: `${visibleSidebarWidth}px`,
-                                            width: '10px',
-                                            height: '10px',
-                                            WebkitMaskImage: 'radial-gradient(circle at 100% 0%, transparent calc(10px - 1px), black 10px)',
-                                            maskImage: 'radial-gradient(circle at 100% 0%, transparent calc(10px - 1px), black 10px)',
-                                        }}
-                                    />
-                                </>
-                            ) : null}
-                            {isRightSidebarOpen ? (
-                                <>
-                                    <div
-                                        aria-hidden
-                                        className="pointer-events-none absolute top-0 z-0 bg-sidebar"
-                                        style={{
-                                            right: `${visibleRightSidebarWidth}px`,
-                                            width: '10px',
-                                            height: '10px',
-                                            WebkitMaskImage: 'radial-gradient(circle at 0 100%, transparent calc(10px - 1px), black 10px)',
-                                            maskImage: 'radial-gradient(circle at 0 100%, transparent calc(10px - 1px), black 10px)',
-                                        }}
-                                    />
-                                    <div
-                                        aria-hidden
-                                        className="pointer-events-none absolute bottom-0 z-0 bg-sidebar"
-                                        style={{
-                                            right: `${visibleRightSidebarWidth}px`,
-                                            width: '10px',
-                                            height: '10px',
-                                            WebkitMaskImage: 'radial-gradient(circle at 0 0, transparent calc(10px - 1px), black 10px)',
-                                            maskImage: 'radial-gradient(circle at 0 0, transparent calc(10px - 1px), black 10px)',
-                                        }}
-                                    />
-                                </>
-                            ) : null}
+                            <div
+                                aria-hidden
+                                className="pointer-events-none absolute top-0 z-0 bg-sidebar transition-[left,opacity] duration-200 ease-[cubic-bezier(0.22,1,0.36,1)] motion-reduce:transition-none"
+                                style={{
+                                    left: `${isSidebarOpen ? visibleSidebarWidth : 0}px`,
+                                    opacity: isSidebarOpen ? 1 : 0,
+                                    width: '10px',
+                                    height: '10px',
+                                    WebkitMaskImage: 'radial-gradient(circle at 100% 100%, transparent calc(10px - 1px), black 10px)',
+                                    maskImage: 'radial-gradient(circle at 100% 100%, transparent calc(10px - 1px), black 10px)',
+                                }}
+                            />
+                            <div
+                                aria-hidden
+                                className="pointer-events-none absolute bottom-0 z-0 bg-sidebar transition-[left,opacity] duration-200 ease-[cubic-bezier(0.22,1,0.36,1)] motion-reduce:transition-none"
+                                style={{
+                                    left: `${isSidebarOpen ? visibleSidebarWidth : 0}px`,
+                                    opacity: isSidebarOpen ? 1 : 0,
+                                    width: '10px',
+                                    height: '10px',
+                                    WebkitMaskImage: 'radial-gradient(circle at 100% 0%, transparent calc(10px - 1px), black 10px)',
+                                    maskImage: 'radial-gradient(circle at 100% 0%, transparent calc(10px - 1px), black 10px)',
+                                }}
+                            />
+                            <div
+                                aria-hidden
+                                className="pointer-events-none absolute top-0 z-0 bg-sidebar transition-[right,opacity] duration-200 ease-[cubic-bezier(0.22,1,0.36,1)] motion-reduce:transition-none"
+                                style={{
+                                    right: `${isRightSidebarOpen ? visibleRightSidebarWidth : 0}px`,
+                                    opacity: isRightSidebarOpen ? 1 : 0,
+                                    width: '10px',
+                                    height: '10px',
+                                    WebkitMaskImage: 'radial-gradient(circle at 0 100%, transparent calc(10px - 1px), black 10px)',
+                                    maskImage: 'radial-gradient(circle at 0 100%, transparent calc(10px - 1px), black 10px)',
+                                }}
+                            />
+                            <div
+                                aria-hidden
+                                className="pointer-events-none absolute bottom-0 z-0 bg-sidebar transition-[right,opacity] duration-200 ease-[cubic-bezier(0.22,1,0.36,1)] motion-reduce:transition-none"
+                                style={{
+                                    right: `${isRightSidebarOpen ? visibleRightSidebarWidth : 0}px`,
+                                    opacity: isRightSidebarOpen ? 1 : 0,
+                                    width: '10px',
+                                    height: '10px',
+                                    WebkitMaskImage: 'radial-gradient(circle at 0 0, transparent calc(10px - 1px), black 10px)',
+                                    maskImage: 'radial-gradient(circle at 0 0, transparent calc(10px - 1px), black 10px)',
+                                }}
+                            />
                             <Sidebar
                                 isOpen={isSidebarOpen}
                                 isMobile={isMobile}
@@ -668,9 +664,9 @@ export const MainLayout: React.FC = () => {
                             <div className={cn(
                                 'relative flex flex-1 min-w-0 flex-col overflow-hidden',
                                 'bg-background',
-                                'border-y border-border/50',
-                                isSidebarOpen && 'border-l border-border/50 rounded-tl-[10px] rounded-bl-[10px]',
-                                isRightSidebarOpen && 'border-r border-border/50 rounded-tr-[10px] rounded-br-[10px]'
+                                'border border-border/50 rounded-[10px]',
+                                !isSidebarOpen && 'border-l-transparent',
+                                !isRightSidebarOpen && 'border-r-transparent'
                             )} data-page-scroll-lock="true">
                                 <div className="flex flex-1 min-h-0 overflow-hidden" data-page-scroll-lock="true">
                                     <div className="relative flex flex-1 min-h-0 min-w-0 overflow-hidden" data-page-scroll-lock="true">
diff --git a/packages/ui/src/components/layout/RightSidebar.tsx b/packages/ui/src/components/layout/RightSidebar.tsx
index 44c59f68..d671c6ac 100644
--- a/packages/ui/src/components/layout/RightSidebar.tsx
+++ b/packages/ui/src/components/layout/RightSidebar.tsx
@@ -34,12 +34,13 @@ export const RightSidebar: React.FC<RightSidebarProps> = ({ isOpen, children, cl
       return;
     }
 
-    sidebar.style.setProperty('--oc-right-sidebar-width', `${nextWidth}px`);
+    sidebar.style.width = `${nextWidth}px`;
+    sidebar.style.minWidth = `${nextWidth}px`;
+    sidebar.style.maxWidth = `${nextWidth}px`;
   }, []);
 
-  const appliedWidth = isOpen
-    ? Math.min(RIGHT_SIDEBAR_MAX_WIDTH, Math.max(RIGHT_SIDEBAR_MIN_WIDTH, rightSidebarWidth || RIGHT_SIDEBAR_CONTENT_WIDTH))
-    : 0;
+  const openWidth = Math.min(RIGHT_SIDEBAR_MAX_WIDTH, Math.max(RIGHT_SIDEBAR_MIN_WIDTH, rightSidebarWidth || RIGHT_SIDEBAR_CONTENT_WIDTH));
+  const appliedWidth = isOpen ? openWidth : 0;
 
   const handlePointerDown = (event: React.PointerEvent) => {
     if (!isOpen) {
@@ -101,22 +102,25 @@ export const RightSidebar: React.FC<RightSidebarProps> = ({ isOpen, children, cl
     }
   }, [isResizing]);
 
+  const currentWidth = isResizing ? (resizingWidthRef.current ?? appliedWidth) : appliedWidth;
+
   return (
     <aside
       ref={sidebarRef}
       className={cn(
-        'relative flex h-full overflow-hidden border-l border-border/40',
+        'relative flex h-full overflow-hidden border-l border-border/40 will-change-[width] motion-reduce:transition-none',
         'bg-sidebar',
-        isResizing ? 'transition-none' : 'transition-[width] duration-300 ease-in-out',
         !isOpen && 'border-l-0',
         className,
       )}
       style={{
-        width: 'var(--oc-right-sidebar-width)',
-        minWidth: 'var(--oc-right-sidebar-width)',
-        maxWidth: 'var(--oc-right-sidebar-width)',
-        ['--oc-right-sidebar-width' as string]: `${isResizing ? (resizingWidthRef.current ?? appliedWidth) : appliedWidth}px`,
+        width: `${currentWidth}px`,
+        minWidth: `${currentWidth}px`,
+        maxWidth: `${currentWidth}px`,
         overflowX: 'clip',
+        transitionProperty: isResizing ? 'none' : 'width, min-width, max-width',
+        transitionDuration: '200ms',
+        transitionTimingFunction: 'cubic-bezier(0.22, 1, 0.36, 1)',
       }}
       aria-hidden={!isOpen || appliedWidth === 0}
     >
@@ -137,10 +141,11 @@ export const RightSidebar: React.FC<RightSidebarProps> = ({ isOpen, children, cl
       )}
       <div
         className={cn(
-          'relative z-10 flex h-full min-h-0 w-full flex-col transition-opacity duration-300 ease-in-out',
+          'relative z-10 flex h-full min-h-0 shrink-0 flex-col transition-opacity duration-200 ease-[cubic-bezier(0.22,1,0.36,1)] motion-reduce:transition-none',
           isResizing && 'pointer-events-none',
           !isOpen && 'pointer-events-none select-none opacity-0'
         )}
+        style={{ width: `${openWidth}px` }}
         aria-hidden={!isOpen}
       >
         {isOpen ? children : null}
diff --git a/packages/ui/src/components/layout/Sidebar.tsx b/packages/ui/src/components/layout/Sidebar.tsx
index c12636c8..22665d6d 100644
--- a/packages/ui/src/components/layout/Sidebar.tsx
+++ b/packages/ui/src/components/layout/Sidebar.tsx
@@ -36,7 +36,9 @@ export const Sidebar: React.FC<SidebarProps> = ({ isOpen, isMobile, children, cl
             return;
         }
 
-        sidebar.style.setProperty('--oc-left-sidebar-width', `${nextWidth}px`);
+        sidebar.style.width = `${nextWidth}px`;
+        sidebar.style.minWidth = `${nextWidth}px`;
+        sidebar.style.maxWidth = `${nextWidth}px`;
     }, []);
 
     React.useEffect(() => {
@@ -56,10 +58,11 @@ export const Sidebar: React.FC<SidebarProps> = ({ isOpen, isMobile, children, cl
         return null;
     }
 
-    const appliedWidth = isOpen ? Math.min(
+    const openWidth = Math.min(
         SIDEBAR_MAX_WIDTH,
         Math.max(SIDEBAR_MIN_WIDTH, sidebarWidth || SIDEBAR_CONTENT_WIDTH)
-    ) : 0;
+    );
+    const appliedWidth = isOpen ? openWidth : 0;
 
     const handlePointerDown = (event: React.PointerEvent) => {
         if (!isOpen) {
@@ -114,22 +117,25 @@ export const Sidebar: React.FC<SidebarProps> = ({ isOpen, isMobile, children, cl
         setSidebarWidth(finalWidth);
     };
 
+    const currentWidth = isResizing ? (resizingWidthRef.current ?? appliedWidth) : appliedWidth;
+
     return (
         <aside
             ref={sidebarRef}
             className={cn(
-                'relative flex h-full overflow-hidden border-r border-border/40',
+                'relative flex h-full overflow-hidden border-r border-border/40 will-change-[width] motion-reduce:transition-none',
                 'bg-sidebar',
-                isResizing ? 'transition-none' : 'transition-[width] duration-300 ease-in-out',
                 !isOpen && 'border-r-0',
                 className,
             )}
             style={{
-                width: 'var(--oc-left-sidebar-width)',
-                minWidth: 'var(--oc-left-sidebar-width)',
-                maxWidth: 'var(--oc-left-sidebar-width)',
-                ['--oc-left-sidebar-width' as string]: `${isResizing ? (resizingWidthRef.current ?? appliedWidth) : appliedWidth}px`,
+                width: `${currentWidth}px`,
+                minWidth: `${currentWidth}px`,
+                maxWidth: `${currentWidth}px`,
                 overflowX: 'clip',
+                transitionProperty: isResizing ? 'none' : 'width, min-width, max-width',
+                transitionDuration: '200ms',
+                transitionTimingFunction: 'cubic-bezier(0.22, 1, 0.36, 1)',
             }}
             aria-hidden={!isOpen || appliedWidth === 0}
         >
@@ -150,11 +156,11 @@ export const Sidebar: React.FC<SidebarProps> = ({ isOpen, isMobile, children, cl
             )}
             <div
                 className={cn(
-                    'relative z-10 flex h-full flex-col transition-opacity duration-300 ease-in-out',
+                    'relative z-10 flex h-full shrink-0 flex-col transition-opacity duration-200 ease-[cubic-bezier(0.22,1,0.36,1)] motion-reduce:transition-none',
                     isResizing && 'pointer-events-none',
                     !isOpen && 'pointer-events-none select-none opacity-0'
                 )}
-                style={{ width: 'var(--oc-left-sidebar-width)', overflowX: 'hidden' }}
+                style={{ width: `${openWidth}px`, overflowX: 'hidden' }}
                 aria-hidden={!isOpen}
             >
                 <div className="flex-1 overflow-y-auto">