diff --git a/app/components/CapacityBars.tsx b/app/components/CapacityBars.tsx
index b78da863ec..3b59812bf4 100644
--- a/app/components/CapacityBars.tsx
+++ b/app/components/CapacityBars.tsx
@@ -23,7 +23,7 @@ export const CapacityBars = ({
   allocatedLabel: string
 }) => {
   return (
-    <div className="1000:flex-row mb-12 flex min-w-min flex-col gap-3">
+    <div className="1000:flex-row flex min-w-min flex-col gap-3">
       <CapacityBar
         icon={<Cpu16Icon />}
         title="CPU"
diff --git a/app/pages/SiloUtilizationPage.tsx b/app/pages/SiloUtilizationPage.tsx
index d0c768f6a4..0dc7e8ca1d 100644
--- a/app/pages/SiloUtilizationPage.tsx
+++ b/app/pages/SiloUtilizationPage.tsx
@@ -93,9 +93,9 @@ export default function SiloUtilizationPage() {
         allocatedLabel="Quota"
       />
 
-      <Divider className="my-6" />
+      <Divider className="my-8" />
 
-      <div className="mt-8 mb-3 flex flex-wrap justify-between gap-3">
+      <div className="mb-3 flex flex-wrap justify-between gap-3">
         <div className="flex gap-2">
           {intervalPicker}
 
diff --git a/app/pages/project/affinity/AntiAffinityGroupPage.tsx b/app/pages/project/affinity/AntiAffinityGroupPage.tsx
index ba25e03057..a0df20f078 100644
--- a/app/pages/project/affinity/AntiAffinityGroupPage.tsx
+++ b/app/pages/project/affinity/AntiAffinityGroupPage.tsx
@@ -225,7 +225,7 @@ export default function AntiAffinityPage() {
         <PropertiesTable.Row label="Members">{membersCount}</PropertiesTable.Row>
         <PropertiesTable.IdRow id={id} />
       </PropertiesTable>
-      <Divider className="mb-10" />
+      <Divider className="my-8" />
       <CardBlock>
         <CardBlock.Header
           title="Members"
diff --git a/app/pages/project/vpcs/RouterPage.tsx b/app/pages/project/vpcs/RouterPage.tsx
index 281ee03d11..03e7182479 100644
--- a/app/pages/project/vpcs/RouterPage.tsx
+++ b/app/pages/project/vpcs/RouterPage.tsx
@@ -36,11 +36,12 @@ import { addToast } from '~/stores/toast'
 import { TypeValueCell } from '~/table/cells/TypeValueCell'
 import { useColsWithActions, type MenuAction } from '~/table/columns/action-col'
 import { useQueryTable } from '~/table/QueryTable'
+import { CardBlock } from '~/ui/lib/CardBlock'
 import { CreateButton, CreateLink } from '~/ui/lib/CreateButton'
+import { Divider } from '~/ui/lib/Divider'
 import { EmptyMessage } from '~/ui/lib/EmptyMessage'
 import { PageHeader, PageTitle } from '~/ui/lib/PageHeader'
 import { PropertiesTable } from '~/ui/lib/PropertiesTable'
-import { TableControls, TableTitle } from '~/ui/lib/Table'
 import { docLinks } from '~/util/links'
 import { pb } from '~/util/path-builder'
 import type * as PP from '~/util/path-params'
@@ -199,22 +200,24 @@ export default function RouterPage() {
         <PropertiesTable.DateRow date={routerData.timeCreated} label="Created" />
         <PropertiesTable.DateRow date={routerData.timeModified} label="Last Modified" />
       </PropertiesTable>
-      <TableControls className="mb-3">
-        <TableTitle>Routes</TableTitle>
-        {canCreateNewRoute ? (
-          <CreateLink to={pb.vpcRouterRoutesNew({ project, vpc, router })}>
-            New route
-          </CreateLink>
-        ) : (
-          <CreateButton
-            disabled
-            disabledReason={routeFormMessage.noNewRoutesOnSystemRouter}
-          >
-            New route
-          </CreateButton>
-        )}
-      </TableControls>
-      {table}
+      <Divider className="my-8" />
+      <CardBlock>
+        <CardBlock.Header title="Routes" description="Rules for directing network traffic">
+          {canCreateNewRoute ? (
+            <CreateLink to={pb.vpcRouterRoutesNew({ project, vpc, router })}>
+              New route
+            </CreateLink>
+          ) : (
+            <CreateButton
+              disabled
+              disabledReason={routeFormMessage.noNewRoutesOnSystemRouter}
+            >
+              New route
+            </CreateButton>
+          )}
+        </CardBlock.Header>
+        <CardBlock.Body>{table}</CardBlock.Body>
+      </CardBlock>
       <Outlet />
     </>
   )
diff --git a/app/ui/lib/Table.tsx b/app/ui/lib/Table.tsx
index 56e198b8c6..b31cc930ab 100644
--- a/app/ui/lib/Table.tsx
+++ b/app/ui/lib/Table.tsx
@@ -131,9 +131,4 @@ export const TableEmptyBox = ({ children, border = true }: TableEmptyBoxProps) =
   </div>
 )
 
-/**
- * Used _outside_ of the `Table`, this element includes a soon-to-be-removed description of the resource inside the table,
- * along with a link to more info, and a button to take action on the resource listed in the table.
- */
-export const TableControls = classed.div`mb-4 flex items-end justify-between space-x-8`
 export const TableTitle = classed.div`text-sans-lg text-raise`
diff --git a/app/ui/styles/components/Tabs.css b/app/ui/styles/components/Tabs.css
index ca3bef01b4..7e64191dd2 100644
--- a/app/ui/styles/components/Tabs.css
+++ b/app/ui/styles/components/Tabs.css
@@ -8,7 +8,7 @@
 
 /* Tab list container styles */
 .ox-tabs-list {
-  @apply mb-10 flex bg-transparent;
+  @apply mb-8 flex bg-transparent;
 }
 
 .ox-tabs-list:after {
diff --git a/app/ui/styles/components/form.css b/app/ui/styles/components/form.css
index 98d74b7798..e594ffdda4 100644
--- a/app/ui/styles/components/form.css
+++ b/app/ui/styles/components/form.css
@@ -23,5 +23,5 @@
 }
 
 .ox-form .ox-divider {
-  @apply !my-10; /* important overrides space-y-* on .ox-form */
+  @apply !my-8; /* important overrides space-y-* on .ox-form */
 }