diff --git a/apps/desktop2/src/components/main/body/contacts/index.tsx b/apps/desktop2/src/components/main/body/contacts/index.tsx
index cba691924..2487ac910 100644
--- a/apps/desktop2/src/components/main/body/contacts/index.tsx
+++ b/apps/desktop2/src/components/main/body/contacts/index.tsx
@@ -134,7 +134,7 @@ function ContactView({ tab }: { tab: Tab }) {
   };
 
   return (
-    <div className="flex h-full">
+    <div className="flex h-full rounded-lg border">
       <OrganizationsColumn
         selectedOrganization={selectedOrganization}
         setSelectedOrganization={setSelectedOrganization}
diff --git a/apps/desktop2/src/components/main/body/folders.tsx b/apps/desktop2/src/components/main/body/folders.tsx
index f1a358bcf..47516d36c 100644
--- a/apps/desktop2/src/components/main/body/folders.tsx
+++ b/apps/desktop2/src/components/main/body/folders.tsx
@@ -69,7 +69,7 @@ function TabContentFolderTopLevel() {
   );
 
   return (
-    <div className="flex flex-col gap-4 p-4">
+    <div className="flex flex-col gap-4 p-4 rounded-lg border">
       <h2 className="text-lg font-semibold">All Folders</h2>
       <div className="grid grid-cols-4 gap-4">
         {topLevelFolderIds?.map((folderId) => <FolderCard key={folderId} folderId={folderId} />)}
@@ -123,7 +123,7 @@ function TabContentFolderSpecific({ folderId }: { folderId: string }) {
   );
 
   return (
-    <div className="flex flex-col gap-4 p-4">
+    <div className="flex flex-col gap-4 p-4 rounded-lg border">
       <TabContentFolderBreadcrumb folderId={folderId} />
 
       {(childFolderIds?.length ?? 0) > 0 && (
diff --git a/apps/desktop2/src/components/main/body/index.tsx b/apps/desktop2/src/components/main/body/index.tsx
index a315fd1b6..3eb6f315e 100644
--- a/apps/desktop2/src/components/main/body/index.tsx
+++ b/apps/desktop2/src/components/main/body/index.tsx
@@ -20,7 +20,7 @@ export function Body() {
   }
 
   return (
-    <div className="flex flex-col">
+    <div className="flex flex-col p-1 gap-2">
       <Header tabs={tabs} />
       <Content tab={currentTab} />
     </div>
@@ -36,13 +36,13 @@ function Header({ tabs }: { tabs: Tab[] }) {
       data-tauri-drag-region
       className={clsx([
         "[&::-webkit-scrollbar]:hidden [-ms-overflow-style:none] [scrollbar-width:none]",
-        "w-full border-b overflow-x-auto h-11",
+        "w-full overflow-x-auto h-11",
         !isExpanded && "pl-[72px]",
       ])}
     >
       <div className="flex w-max h-full items-end">
         {!isExpanded && (
-          <div className="flex items-center justify-center h-full px-3 border-r sticky left-0 bg-white z-20">
+          <div className="flex items-center justify-center h-full px-3 sticky left-0 bg-white z-20">
             <PanelLeftOpenIcon
               className="h-5 w-5 cursor-pointer"
               onClick={() => setIsExpanded(true)}
@@ -64,7 +64,7 @@ function Header({ tabs }: { tabs: Tab[] }) {
               value={tab}
               as="div"
               style={{ position: "relative" }}
-              className="h-full border-r border-t z-10"
+              className="h-full z-10"
               layoutScroll
             >
               <TabItem tab={tab} handleClose={close} handleSelect={select} />
diff --git a/apps/desktop2/src/components/main/body/sessions/index.tsx b/apps/desktop2/src/components/main/body/sessions/index.tsx
index bd23f2be7..879945b50 100644
--- a/apps/desktop2/src/components/main/body/sessions/index.tsx
+++ b/apps/desktop2/src/components/main/body/sessions/index.tsx
@@ -49,7 +49,7 @@ export function TabContentNote({ tab }: { tab: Tab }) {
   );
 
   return (
-    <div className="flex flex-col px-4 py-1">
+    <div className="flex flex-col px-4 py-1 rounded-lg border">
       <div className="py-1">
         <OuterHeader sessionRow={sessionRow} sessionId={sessionId} />
       </div>
diff --git a/apps/desktop2/src/components/main/body/shared.tsx b/apps/desktop2/src/components/main/body/shared.tsx
index ae4ef1a9a..52ae142bb 100644
--- a/apps/desktop2/src/components/main/body/shared.tsx
+++ b/apps/desktop2/src/components/main/body/shared.tsx
@@ -24,8 +24,8 @@ export function TabItemBase(
         "flex items-center gap-2 cursor-pointer",
         "min-w-[100px] max-w-[200px] h-full px-2",
         active
-          ? "border-border bg-background text-foreground"
-          : "border-transparent bg-muted/50 hover:bg-muted text-muted-foreground",
+          ? "bg-background text-foreground rounded-lg border"
+          : "bg-muted/50 hover:bg-muted text-muted-foreground rounded-lg border",
       ])}
     >
       <div className="flex flex-row items-center gap-1 text-sm flex-1 min-w-0">
diff --git a/packages/ui/src/components/block/calendar-structure.tsx b/packages/ui/src/components/block/calendar-structure.tsx
index d2e5648bb..aa030746d 100644
--- a/packages/ui/src/components/block/calendar-structure.tsx
+++ b/packages/ui/src/components/block/calendar-structure.tsx
@@ -21,8 +21,8 @@ export const CalendarStructure = ({
   children,
 }: CalendarStructureProps) => {
   return (
-    <div className="flex flex-col h-full">
-      <div className="p-4 pb-2 flex items-center relative">
+    <div className="flex flex-col h-full rounded-lg border">
+      <div className="p-4 pb-2 flex items-center relative ">
         <div className="text-xl font-semibold absolute left-1/2 transform -translate-x-1/2">{monthLabel}</div>
         <div className="flex h-fit rounded-md overflow-clip border border-neutral-200 ml-auto">
           <Button