diff --git a/apps/web/src/layout/app-fullscreen-layout.tsx b/apps/web/src/layout/app-fullscreen-layout.tsx
index 405b5120..3f030ba0 100644
--- a/apps/web/src/layout/app-fullscreen-layout.tsx
+++ b/apps/web/src/layout/app-fullscreen-layout.tsx
@@ -12,8 +12,7 @@ export const AppFullscreenLayoutFrame = ({ children }: AppFullscreenLayoutFrameP
 };
 
 /**
- * Shell de aplicación para páginas que ocupan toda el área disponible.
- * Se utiliza en editores y vistas de detalle sin sidebar ni topbar global.
+ * Shell para páginas fullscreen sin sidebar ni topbar global.
  */
 
 export const AppFullscreenLayout = () => {
diff --git a/modules/customer-invoices/src/web/customer-invoice-routes.tsx b/modules/customer-invoices/src/web/customer-invoice-routes.tsx
index a2cdfc98..d7a26aec 100644
--- a/modules/customer-invoices/src/web/customer-invoice-routes.tsx
+++ b/modules/customer-invoices/src/web/customer-invoice-routes.tsx
@@ -2,10 +2,6 @@ import type { ModuleClientParams } from "@erp/core/client";
 import { lazy } from "react";
 import { Outlet, type RouteObject } from "react-router-dom";
 
-const ProformaLayout = lazy(() =>
-  import("./proformas/shared/ui").then((m) => ({ default: m.ProformaLayout }))
-);
-
 const RecurringProformaLayout = lazy(() =>
   import("./recurring-proformas/shared/ui").then((m) => ({ default: m.RecurringProformaLayout }))
 );
@@ -70,11 +66,7 @@ export const CustomerInvoiceRoutes = (params: ModuleClientParams): RouteObject[]
         layout: "app-sidebar",
         protected: true,
       },
-      element: (
-        <ProformaLayout>
-          <Outlet context={params} />
-        </ProformaLayout>
-      ),
+      element: <Outlet context={params} />,
       children: [
         {
           index: true,
@@ -101,11 +93,7 @@ export const CustomerInvoiceRoutes = (params: ModuleClientParams): RouteObject[]
         layout: "app-fullscreen",
         protected: true,
       },
-      element: (
-        <ProformaLayout>
-          <ProformasCreatePage />
-        </ProformaLayout>
-      ),
+      element: <ProformasCreatePage />,
     },
 
     {
@@ -114,11 +102,7 @@ export const CustomerInvoiceRoutes = (params: ModuleClientParams): RouteObject[]
         layout: "app-fullscreen",
         protected: true,
       },
-      element: (
-        <ProformaLayout>
-          <ProformaUpdatePage />
-        </ProformaLayout>
-      ),
+      element: <ProformaUpdatePage />,
     },
 
     {
@@ -127,11 +111,7 @@ export const CustomerInvoiceRoutes = (params: ModuleClientParams): RouteObject[]
         layout: "app-fullscreen",
         protected: true,
       },
-      element: (
-        <ProformaLayout>
-          <ProformaDetailPage />
-        </ProformaLayout>
-      ),
+      element: <ProformaDetailPage />,
     },
     {
       path: "recurring-proformas",
diff --git a/modules/customer-invoices/src/web/proformas/create/ui/blocks/proforma-create-customer-field.tsx b/modules/customer-invoices/src/web/proformas/create/ui/blocks/proforma-create-customer-field.tsx
index 64d98fd3..86555973 100644
--- a/modules/customer-invoices/src/web/proformas/create/ui/blocks/proforma-create-customer-field.tsx
+++ b/modules/customer-invoices/src/web/proformas/create/ui/blocks/proforma-create-customer-field.tsx
@@ -38,7 +38,7 @@ export const ProformaCreateCustomerField = ({
           <div className="relative">
             <Button
               className={cn(
-                "h-10 w-full justify-between border bg-muted/50 px-3 font-normal text-left text-foreground hover:bg-muted/50",
+                "h-10 w-full justify-between border bg-muted/20 px-3 font-normal text-left text-foreground hover:bg-muted/50",
                 !selectedCustomer && "text-muted-foreground"
               )}
               disabled={isDisabled}
diff --git a/modules/customer-invoices/src/web/proformas/create/ui/blocks/proforma-create-header.tsx b/modules/customer-invoices/src/web/proformas/create/ui/blocks/proforma-create-header.tsx
index b76011b8..74e1740e 100644
--- a/modules/customer-invoices/src/web/proformas/create/ui/blocks/proforma-create-header.tsx
+++ b/modules/customer-invoices/src/web/proformas/create/ui/blocks/proforma-create-header.tsx
@@ -22,7 +22,7 @@ export const ProformaCreateHeader = ({
       actions={
         <FormActionsBar align="end" reverseOnMobile={false}>
           <PageKeyboardShortcutsButton
-            className="hidden sm:flex"
+            className="hidden"
             label="Ver atajos de teclado"
             shortcuts={[
               { keys: "Ctrl+S", label: "Crear y continuar" },
diff --git a/modules/customer-invoices/src/web/proformas/create/ui/blocks/proforma-create-initial-info-card.tsx b/modules/customer-invoices/src/web/proformas/create/ui/blocks/proforma-create-initial-info-card.tsx
index 10d1e3e4..2a487ed7 100644
--- a/modules/customer-invoices/src/web/proformas/create/ui/blocks/proforma-create-initial-info-card.tsx
+++ b/modules/customer-invoices/src/web/proformas/create/ui/blocks/proforma-create-initial-info-card.tsx
@@ -1,8 +1,8 @@
 import type { CustomerSelectionOption } from "@erp/customers";
 import {
   DatePickerField,
-  FormSectionCard,
-  FormSectionGrid,
+  RdxFormGrid,
+  RdxPanel,
   SelectField,
   type SelectFieldItem,
 } from "@repo/rdx-ui/components";
@@ -43,13 +43,14 @@ export const ProformaCreateInitialInfoCard = ({
   const { t } = useTranslation();
 
   return (
-    <FormSectionCard
+    <RdxPanel
       icon={<FileTextIcon className="size-5" />}
       title={t("proformas.create.initial_info.title", "Información inicial")}
+      variant="card"
     >
-      <FormSectionGrid className="md:grid-cols-6 2xl:grid-cols-12">
+      <RdxFormGrid className="md:grid-cols-6 2xl:grid-cols-12">
         <ProformaCreateCustomerField
-          className="md:col-span-4"
+          className="md:col-span-8"
           disabled={disabled}
           onClearCustomer={onClearCustomer}
           onSelectCustomer={onSelectCustomer}
@@ -57,7 +58,7 @@ export const ProformaCreateInitialInfoCard = ({
         />
 
         <DatePickerField<ProformaCreateForm>
-          className="md:col-span-2"
+          className="md:col-span-4"
           disabled={disabled}
           label={t("proformas.create.initial_info.proforma_date.label", "Fecha")}
           name="proformaDate"
@@ -69,7 +70,7 @@ export const ProformaCreateInitialInfoCard = ({
         />
 
         <SelectField<ProformaCreateForm>
-          className="md:col-span-2"
+          className="md:col-span-3"
           disabled={disabled || isProformaSeriesLoading}
           items={proformaSeriesOptions}
           label={t("proformas.create.initial_info.proforma_series.label", "Serie de esta proforma")}
@@ -87,7 +88,7 @@ export const ProformaCreateInitialInfoCard = ({
         />
 
         <SelectField<ProformaCreateForm>
-          className="md:col-span-2"
+          className="md:col-span-3"
           disabled={disabled || isTargetInvoiceSeriesLoading}
           items={targetInvoiceSeriesOptions}
           label={t("proformas.create.initial_info.invoice_series.label", "Serie de la factura")}
@@ -100,7 +101,7 @@ export const ProformaCreateInitialInfoCard = ({
         />
 
         <SelectField<ProformaCreateForm>
-          className="md:col-span-4"
+          className="md:col-span-6"
           clearable
           clearLabel={t("form_fields.proformas.payment_term.clear_label", "Sin plazo de pago")}
           disabled={disabled || isPaymentTermsLoading}
@@ -115,7 +116,7 @@ export const ProformaCreateInitialInfoCard = ({
               : t("form_fields.proformas.payment_term.placeholder", "Selecciona un plazo de pago")
           }
         />
-      </FormSectionGrid>
-    </FormSectionCard>
+      </RdxFormGrid>
+    </RdxPanel>
   );
 };
diff --git a/modules/customer-invoices/src/web/proformas/create/ui/pages/proforma-create-page.tsx b/modules/customer-invoices/src/web/proformas/create/ui/pages/proforma-create-page.tsx
index 3c4c1f97..75870dcc 100644
--- a/modules/customer-invoices/src/web/proformas/create/ui/pages/proforma-create-page.tsx
+++ b/modules/customer-invoices/src/web/proformas/create/ui/pages/proforma-create-page.tsx
@@ -1,7 +1,12 @@
 import { ErrorAlert } from "@erp/core/components";
 import { UnsavedChangesProvider, useReturnToNavigation } from "@erp/core/hooks";
 import { QuickCreateCustomerDialog, SelectCustomerDialog } from "@erp/customers";
-import { RdxEditorPageLayout, RdxPageContainer, RdxPageStack } from "@repo/rdx-ui/components";
+import {
+  RdxEditorLayout,
+  RdxPageContainer,
+  RdxPageFrame,
+  RdxPageStack,
+} from "@repo/rdx-ui/components";
 import { FormProvider } from "react-hook-form";
 
 import { ProformaInfoAlert } from "../../../update/ui/components";
@@ -16,26 +21,25 @@ export const ProformaCreatePage = () => {
   });
 
   return (
-    <RdxPageStack className="fixed inset-0 min-h-0 overflow-hidden" spacing="none">
-      <FormProvider {...createCtrl.form}>
-        <UnsavedChangesProvider isDirty={createCtrl.form.formState.isDirty}>
-          <ProformaCreateHeader
-            formId={createCtrl.formId}
-            isSaving={createCtrl.isCreating}
-            onCancel={navigateBack}
-          >
-            <ProformaInfoAlert>
-              <span className="font-semibold">Importante: </span>Las proformas no tienen validez
-              fiscal. Puedes convertirlas en facturas cuando sean aceptadas por el cliente.
-            </ProformaInfoAlert>
-          </ProformaCreateHeader>
-
-          <RdxPageContainer
-            className="min-h-0 flex-1 overflow-y-auto bg-muted/20"
-            padding="none"
-            width="full"
-          >
-            <RdxEditorPageLayout width="simple">
+    <FormProvider {...createCtrl.form}>
+      <UnsavedChangesProvider isDirty={createCtrl.form.formState.isDirty}>
+        <RdxPageFrame
+          contentClassName="bg-muted/20"
+          header={
+            <ProformaCreateHeader
+              formId={createCtrl.formId}
+              isSaving={createCtrl.isCreating}
+              onCancel={navigateBack}
+            >
+              <ProformaInfoAlert>
+                <span className="font-semibold">Importante: </span>Las proformas no tienen validez
+                fiscal. Puedes convertirlas en facturas cuando sean aceptadas por el cliente.
+              </ProformaInfoAlert>
+            </ProformaCreateHeader>
+          }
+        >
+          <RdxPageContainer width="content">
+            <RdxEditorLayout>
               <RdxPageStack spacing="default">
                 {createCtrl.isCreateError && (
                   <ErrorAlert
@@ -75,16 +79,16 @@ export const ProformaCreatePage = () => {
                   targetInvoiceSeriesOptions={createCtrl.targetInvoiceSeriesOptions}
                 />
               </RdxPageStack>
-            </RdxEditorPageLayout>
+            </RdxEditorLayout>
           </RdxPageContainer>
+        </RdxPageFrame>
 
-          <SelectCustomerDialog
-            ctrl={selectCustomerCtrl.selectCtrl}
-            onCreateNewCustomerClick={selectCustomerCtrl.openQuickCreateFromSelection}
-          />
-          <QuickCreateCustomerDialog ctrl={selectCustomerCtrl.createCtrl} />
-        </UnsavedChangesProvider>
-      </FormProvider>
-    </RdxPageStack>
+        <SelectCustomerDialog
+          ctrl={selectCustomerCtrl.selectCtrl}
+          onCreateNewCustomerClick={selectCustomerCtrl.openQuickCreateFromSelection}
+        />
+        <QuickCreateCustomerDialog ctrl={selectCustomerCtrl.createCtrl} />
+      </UnsavedChangesProvider>
+    </FormProvider>
   );
 };
diff --git a/modules/customer-invoices/src/web/proformas/detail/ui/blocks/proforma-detail-content.tsx b/modules/customer-invoices/src/web/proformas/detail/ui/blocks/proforma-detail-content.tsx
index 8da43061..b5f5e670 100644
--- a/modules/customer-invoices/src/web/proformas/detail/ui/blocks/proforma-detail-content.tsx
+++ b/modules/customer-invoices/src/web/proformas/detail/ui/blocks/proforma-detail-content.tsx
@@ -7,7 +7,7 @@ type ProformaDetailContentProps = {
 
 export const ProformaDetailContent = ({ documentPane, inspector }: ProformaDetailContentProps) => {
   return (
-    <div className="min-h-0 flex-1 overflow-auto lg:overflow-hidden ">
+    <div className="min-h-full lg:h-full lg:min-h-0 lg:overflow-hidden">
       <div className="grid min-h-full grid-cols-1 lg:h-full lg:min-h-0 lg:overflow-hidden lg:grid-cols-[minmax(0,1fr)_340px] xl:grid-cols-[minmax(0,1fr)_380px]">
         {documentPane}
         {inspector}
diff --git a/modules/customer-invoices/src/web/proformas/detail/ui/pages/proforma-detail-page.tsx b/modules/customer-invoices/src/web/proformas/detail/ui/pages/proforma-detail-page.tsx
index 68725fd9..171895e0 100644
--- a/modules/customer-invoices/src/web/proformas/detail/ui/pages/proforma-detail-page.tsx
+++ b/modules/customer-invoices/src/web/proformas/detail/ui/pages/proforma-detail-page.tsx
@@ -1,5 +1,5 @@
 import { PageErrorState } from "@erp/core/components";
-import { RdxPageStack } from "@repo/rdx-ui/components";
+import { RdxPageFrame } from "@repo/rdx-ui/components";
 
 import { ChangeProformaStatusDialog } from "../../../change-status";
 import { IssueProformaDialog } from "../../../issue-proforma";
@@ -41,14 +41,17 @@ export const ProformaDetailPage = () => {
   }
 
   return (
-    <RdxPageStack className="fixed inset-0 min-h-0 overflow-hidden" spacing="none">
-      <ProformaDetailHeader
-        actions={ctrl.actions}
-        header={ctrl.header}
-        onBack={ctrl.navigation.navigateBack}
-        onExecuteAction={ctrl.handlers.executeAction}
-      />
-
+    <RdxPageFrame
+      contentClassName="lg:overflow-hidden"
+      header={
+        <ProformaDetailHeader
+          actions={ctrl.actions}
+          header={ctrl.header}
+          onBack={ctrl.navigation.navigateBack}
+          onExecuteAction={ctrl.handlers.executeAction}
+        />
+      }
+    >
       <ProformaDetailContent
         documentPane={
           <ProformaDocumentPane
@@ -114,6 +117,6 @@ export const ProformaDetailPage = () => {
         open={ctrl.dialogs.createRecurring.open}
         unit={ctrl.dialogs.createRecurring.unit}
       />
-    </RdxPageStack>
+    </RdxPageFrame>
   );
 };
diff --git a/modules/customer-invoices/src/web/proformas/list/ui/pages/scoped-list-proformas-page-view.tsx b/modules/customer-invoices/src/web/proformas/list/ui/pages/scoped-list-proformas-page-view.tsx
index ba02ee37..a51f1c0c 100644
--- a/modules/customer-invoices/src/web/proformas/list/ui/pages/scoped-list-proformas-page-view.tsx
+++ b/modules/customer-invoices/src/web/proformas/list/ui/pages/scoped-list-proformas-page-view.tsx
@@ -2,6 +2,7 @@ import { ErrorAlert } from "@erp/core/components";
 import {
   RdxPageActions,
   RdxPageContainer,
+  RdxPageFrame,
   RdxPageHeader,
   RdxPageStack,
 } from "@repo/rdx-ui/components";
@@ -30,22 +31,24 @@ export const ScopedListProformasPageView = ({
   dialogs,
 }: ScopedListProformasPageViewProps) => {
   return (
-    <RdxPageContainer width="full">
-      <RdxPageStack spacing="default">
-        <RdxPageHeader
-          actions={primaryAction ? <RdxPageActions primary={primaryAction} /> : undefined}
-          description={description}
-          title={title}
-        />
+    <RdxPageFrame>
+      <RdxPageContainer width="full">
+        <RdxPageStack spacing="default">
+          <RdxPageHeader
+            actions={primaryAction ? <RdxPageActions primary={primaryAction} /> : undefined}
+            description={description}
+            title={title}
+          />
 
-        {refreshError ? (
-          <ErrorAlert message={refreshError.message} title={refreshError.title} />
-        ) : null}
+          {refreshError ? (
+            <ErrorAlert message={refreshError.message} title={refreshError.title} />
+          ) : null}
 
-        {content}
-      </RdxPageStack>
+          {content}
+        </RdxPageStack>
 
-      {dialogs}
-    </RdxPageContainer>
+        {dialogs}
+      </RdxPageContainer>
+    </RdxPageFrame>
   );
 };
diff --git a/modules/customer-invoices/src/web/proformas/shared/ui/blocks/index.ts b/modules/customer-invoices/src/web/proformas/shared/ui/blocks/index.ts
index 66511a07..1baf784c 100644
--- a/modules/customer-invoices/src/web/proformas/shared/ui/blocks/index.ts
+++ b/modules/customer-invoices/src/web/proformas/shared/ui/blocks/index.ts
@@ -1,3 +1,2 @@
-export * from "./proforma-layout";
 export * from "./proforma-issuance-readiness-alert";
 export * from "./proforma-page-header";
diff --git a/modules/customer-invoices/src/web/proformas/shared/ui/blocks/proforma-layout.tsx b/modules/customer-invoices/src/web/proformas/shared/ui/blocks/proforma-layout.tsx
deleted file mode 100644
index bc7a8aab..00000000
--- a/modules/customer-invoices/src/web/proformas/shared/ui/blocks/proforma-layout.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { PropsWithChildren } from "react";
-
-export function ProformaLayout({ children }: PropsWithChildren) {
-  return (
-    <div className="flex flex-col h-full w-full" id="proformas ">
-      {children}
-    </div>
-  );
-}
diff --git a/modules/customer-invoices/src/web/proformas/update/ui/editors/proforma-update-editor-form.tsx b/modules/customer-invoices/src/web/proformas/update/ui/editors/proforma-update-editor-form.tsx
index a87ba11b..883d23f9 100644
--- a/modules/customer-invoices/src/web/proformas/update/ui/editors/proforma-update-editor-form.tsx
+++ b/modules/customer-invoices/src/web/proformas/update/ui/editors/proforma-update-editor-form.tsx
@@ -1,5 +1,5 @@
 import type { CustomerSelectionOption } from "@erp/customers";
-import { RdxEditorPageLayout, type SelectFieldItem } from "@repo/rdx-ui/components";
+import { RdxEditorLayout, type SelectFieldItem } from "@repo/rdx-ui/components";
 import { preventEnterKeySubmitForm } from "@repo/rdx-ui/helpers";
 import type { SubmitEventHandler } from "react";
 
@@ -53,7 +53,7 @@ export const ProformaUpdateEditorForm = ({
   className,
 }: ProformaUpdateEditorProps) => {
   return (
-    <RdxEditorPageLayout
+    <RdxEditorLayout
       aside={
         <div className="flex min-w-0 flex-col gap-6">
           <ProformaUpdateRecipientEditor
@@ -75,7 +75,6 @@ export const ProformaUpdateEditorForm = ({
         </div>
       }
       className={className}
-      width="full"
     >
       <div className="min-w-0">
         <form id={formId} noValidate onKeyDown={preventEnterKeySubmitForm} onSubmit={onSubmit}>
@@ -91,6 +90,6 @@ export const ProformaUpdateEditorForm = ({
           </div>
         </form>
       </div>
-    </RdxEditorPageLayout>
+    </RdxEditorLayout>
   );
 };
diff --git a/modules/customer-invoices/src/web/proformas/update/ui/pages/proforma-update-page.test.tsx b/modules/customer-invoices/src/web/proformas/update/ui/pages/proforma-update-page.test.tsx
index b91cd856..c6d4e507 100644
--- a/modules/customer-invoices/src/web/proformas/update/ui/pages/proforma-update-page.test.tsx
+++ b/modules/customer-invoices/src/web/proformas/update/ui/pages/proforma-update-page.test.tsx
@@ -52,6 +52,21 @@ test("conecta la alta rápida directa y la alta rápida desde selector con callb
       PercentageField: () => null,
       RdxEditorStickyFooter: () => null,
       RdxPageContainer: ({ children }: { children: ReactNode }) => children,
+      RdxPageFrame: ({
+        children,
+        footer,
+        header,
+      }: {
+        children: ReactNode;
+        footer?: ReactNode;
+        header?: ReactNode;
+      }) => (
+        <>
+          {header}
+          {children}
+          {footer}
+        </>
+      ),
       RdxPageStack: ({ children }: { children: ReactNode }) => children,
       RhfSubmitActionButton: () => null,
     },
diff --git a/modules/customer-invoices/src/web/proformas/update/ui/pages/proforma-update-page.tsx b/modules/customer-invoices/src/web/proformas/update/ui/pages/proforma-update-page.tsx
index d35d6cf5..e54ab401 100644
--- a/modules/customer-invoices/src/web/proformas/update/ui/pages/proforma-update-page.tsx
+++ b/modules/customer-invoices/src/web/proformas/update/ui/pages/proforma-update-page.tsx
@@ -7,6 +7,7 @@ import {
   RdxBadge,
   RdxEditorActionBar,
   RdxPageContainer,
+  RdxPageFrame,
   RdxPageStack,
   RhfSubmitActionButton,
 } from "@repo/rdx-ui/components";
@@ -94,178 +95,174 @@ export const ProformaUpdatePage = () => {
   }
 
   const hasPageAlerts = updateCtrl.isUpdateError || updateCtrl.isSeriesLoadError;
+  const actionBar = (
+    <RdxEditorActionBar
+      leading={
+        <ProformaCompactTotals
+          currency={updateCtrl.currencyCode}
+          globalDiscountField={
+            <PercentageField
+              className="md:col-span-4 md:col-start-1"
+              disabled={updateCtrl.isUpdating}
+              inputClassName="bg-background"
+              label={t("proformas.update.totals.globalDiscountPercentage", "Descuento global")}
+              name="globalDiscountPercentage"
+            />
+          }
+          showRec={updateCtrl.taxCtrl.hasRecPercentage}
+          showRetention={updateCtrl.taxCtrl.hasRetentionPercentage}
+          totals={updateCtrl.totalsCtrl.totals}
+          variant="embedded"
+        />
+      }
+      primary={
+        <RhfSubmitActionButton
+          busyLabel="Guardando..."
+          disabled={updateCtrl.isUpdating}
+          formId={updateCtrl.formId}
+          isBusy={updateCtrl.form.formState.isSubmitting}
+          label="Guardar"
+        />
+      }
+      secondary={
+        <CancelActionButton
+          disabled={updateCtrl.isUpdating}
+          label="Cancelar"
+          onCancel={handleCancel}
+          variant="outline"
+        />
+      }
+    />
+  );
 
   return (
-    <RdxPageStack className="fixed inset-0 min-h-0 overflow-hidden" spacing="none">
-      <FormProvider {...updateCtrl.form}>
-        <UnsavedChangesProvider isDirty={updateCtrl.form.formState.isDirty}>
-          <ProformaUpdateHeader
-            formId={updateCtrl.formId}
-            hasChanges={updateCtrl.form.formState.isDirty}
-            helpAction={
-              <ProformaUpdateHelpPopover
-                isDirty={updateCtrl.form.formState.isDirty}
-                isReadinessLoading={ctrl.isIssuanceReadinessLoading}
-                onRetryReadiness={handleRetryIssuanceReadiness}
-                readiness={ctrl.issuanceReadiness}
-                readinessError={ctrl.issuanceReadinessError}
-              />
-            }
-            isSaving={updateCtrl.form.formState.isSubmitting}
-            labels={{
-              title: proforma ? (
-                <span className="inline-flex max-w-full items-center gap-3">
-                  <span>{t("pages.proformas.update.title", "Editar proforma")}</span>
-                  <RdxBadge className="border-border/80 bg-muted text-muted-foreground">
-                    {proforma.proformaReference}
-                  </RdxBadge>
-                  <ProformaStatusBadge status={proforma.status} />
-                </span>
-              ) : (
-                t("pages.proformas.update.title", "Editar proforma")
-              ),
-              back: "Volver",
-              modified: "Modificada",
-              cancel: "Cancelar",
-              save: "Guardar",
-              saving: "Guardando...",
-              moreActions: "Más acciones",
-              keyboardShortcuts: "Ver atajos de teclado",
-              duplicate: "Duplicar proforma",
-              exportPdf: "Exportar PDF",
-              delete: "Eliminar",
-            }}
-            onCancel={handleCancel}
-            //onDelete={openDeleteDialog}
-            //onDuplicate={handleDuplicate}
-            //onExportPdf={handleExportPdf}
-          />
-
-          <div className="flex min-h-0 flex-1 flex-col bg-muted/20">
-            <RdxPageContainer
-              className="min-h-0 flex-1 overflow-y-auto"
-              padding="default"
-              width="full"
-            >
-              {hasPageAlerts ? (
-                <RdxPageContainer className="pb-0" width="full">
-                  <RdxPageStack spacing="compact">
-                    {updateCtrl.isUpdateError && (
-                      <ErrorAlert
-                        message={
-                          (updateCtrl.updateError as Error)?.message ??
-                          t(
-                            "pages.proformas.update.error_msg",
-                            "Revisa los datos e inténtalo de nuevo."
-                          )
-                        }
-                        title={t(
-                          "pages.proformas.update.error_title",
-                          "No se pudo guardar los cambios"
-                        )}
-                      />
-                    )}
-
-                    {updateCtrl.isSeriesLoadError && (
-                      <ErrorAlert
-                        message={
-                          updateCtrl.seriesLoadError instanceof Error
-                            ? updateCtrl.seriesLoadError.message
-                            : t(
-                                "pages.proformas.update.series_load_error.message",
-                                "Inténtalo de nuevo más tarde."
-                              )
-                        }
-                        title={t(
-                          "pages.proformas.update.series_load_error.title",
-                          "No se pudieron cargar las series de facturación"
-                        )}
-                      />
-                    )}
-                  </RdxPageStack>
-                </RdxPageContainer>
-              ) : null}
-
-              <ProformaUpdateEditorForm
-                className={hasPageAlerts ? "pt-0" : undefined}
-                formId={updateCtrl.formId}
-                isSubmitting={updateCtrl.isUpdating}
-                itemsCtrl={updateCtrl.itemsCtrl}
-                onChangeCustomerClick={selectCustomerCtrl.selectCtrl.openDialog}
-                onCreateCustomerClick={selectCustomerCtrl.openQuickCreateDialog}
-                onPaymentTermChange={updateCtrl.handlePaymentTermChange}
-                onReset={updateCtrl.resetForm}
-                onSubmit={updateCtrl.onSubmit}
-                paymentCtrl={updateCtrl.paymentCtrl}
-                selectedCustomer={updateCtrl.selectedCustomer}
-                seriesOptions={updateCtrl.seriesOptions}
-                taxCtrl={updateCtrl.taxCtrl}
-                totalsCtrl={updateCtrl.totalsCtrl}
-              />
-            </RdxPageContainer>
-
-            <RdxEditorActionBar
-              leading={
-                <ProformaCompactTotals
-                  currency={updateCtrl.currencyCode}
-                  globalDiscountField={
-                    <PercentageField
-                      className="md:col-span-4 md:col-start-1"
-                      disabled={updateCtrl.isUpdating}
-                      inputClassName="bg-background"
-                      label={t(
-                        "proformas.update.totals.globalDiscountPercentage",
-                        "Descuento global"
-                      )}
-                      name="globalDiscountPercentage"
-                    />
-                  }
-                  showRec={updateCtrl.taxCtrl.hasRecPercentage}
-                  showRetention={updateCtrl.taxCtrl.hasRetentionPercentage}
-                  totals={updateCtrl.totalsCtrl.totals}
-                  variant="embedded"
-                />
-              }
-              primary={
-                <RhfSubmitActionButton
-                  busyLabel="Guardando..."
-                  disabled={updateCtrl.isUpdating}
-                  formId={updateCtrl.formId}
-                  isBusy={updateCtrl.form.formState.isSubmitting}
-                  label="Guardar"
-                />
-              }
-              secondary={
-                <CancelActionButton
-                  disabled={updateCtrl.isUpdating}
-                  label="Cancelar"
-                  onCancel={handleCancel}
-                  variant="outline"
+    <FormProvider {...updateCtrl.form}>
+      <UnsavedChangesProvider isDirty={updateCtrl.form.formState.isDirty}>
+        <RdxPageFrame
+          contentClassName="bg-muted/20"
+          footer={actionBar}
+          header={
+            <ProformaUpdateHeader
+              formId={updateCtrl.formId}
+              hasChanges={updateCtrl.form.formState.isDirty}
+              helpAction={
+                <ProformaUpdateHelpPopover
+                  isDirty={updateCtrl.form.formState.isDirty}
+                  isReadinessLoading={ctrl.isIssuanceReadinessLoading}
+                  onRetryReadiness={handleRetryIssuanceReadiness}
+                  readiness={ctrl.issuanceReadiness}
+                  readinessError={ctrl.issuanceReadinessError}
                 />
               }
+              isSaving={updateCtrl.form.formState.isSubmitting}
+              labels={{
+                title: proforma ? (
+                  <span className="inline-flex max-w-full items-center gap-3">
+                    <span>{t("pages.proformas.update.title", "Editar proforma")}</span>
+                    <RdxBadge className="border-border/80 bg-muted text-muted-foreground">
+                      {proforma.proformaReference}
+                    </RdxBadge>
+                    <ProformaStatusBadge status={proforma.status} />
+                  </span>
+                ) : (
+                  t("pages.proformas.update.title", "Editar proforma")
+                ),
+                back: "Volver",
+                modified: "Modificada",
+                cancel: "Cancelar",
+                save: "Guardar",
+                saving: "Guardando...",
+                moreActions: "Más acciones",
+                keyboardShortcuts: "Ver atajos de teclado",
+                duplicate: "Duplicar proforma",
+                exportPdf: "Exportar PDF",
+                delete: "Eliminar",
+              }}
+              onCancel={handleCancel}
+              //onDelete={openDeleteDialog}
+              //onDuplicate={handleDuplicate}
+              //onExportPdf={handleExportPdf}
             />
-          </div>
+          }
+        >
+          <RdxPageContainer padding="default" width="full">
+            {hasPageAlerts ? (
+              <RdxPageContainer className="pb-0" width="full">
+                <RdxPageStack spacing="compact">
+                  {updateCtrl.isUpdateError && (
+                    <ErrorAlert
+                      message={
+                        (updateCtrl.updateError as Error)?.message ??
+                        t(
+                          "pages.proformas.update.error_msg",
+                          "Revisa los datos e inténtalo de nuevo."
+                        )
+                      }
+                      title={t(
+                        "pages.proformas.update.error_title",
+                        "No se pudo guardar los cambios"
+                      )}
+                    />
+                  )}
 
-          <SelectCustomerDialog
-            ctrl={selectCustomerCtrl.selectCtrl}
-            onCreateNewCustomerClick={selectCustomerCtrl.openQuickCreateFromSelection}
-          />
-          <QuickCreateCustomerDialog ctrl={selectCustomerCtrl.createCtrl} />
-          <ProformaUpdateCustomerChangeDialog
-            evaluation={customerChangeCtrl.evaluation}
-            isSubmitting={customerChangeCtrl.isApplying}
-            loadError={customerChangeCtrl.loadError as Error | null}
-            onConfirm={customerChangeCtrl.confirmChange}
-            onOpenChange={(open) => {
-              if (!open) {
-                customerChangeCtrl.closeDialog();
-              }
-            }}
-            open={customerChangeCtrl.open}
-            status={customerChangeCtrl.candidateStatus}
-          />
-        </UnsavedChangesProvider>
-      </FormProvider>
-    </RdxPageStack>
+                  {updateCtrl.isSeriesLoadError && (
+                    <ErrorAlert
+                      message={
+                        updateCtrl.seriesLoadError instanceof Error
+                          ? updateCtrl.seriesLoadError.message
+                          : t(
+                              "pages.proformas.update.series_load_error.message",
+                              "Inténtalo de nuevo más tarde."
+                            )
+                      }
+                      title={t(
+                        "pages.proformas.update.series_load_error.title",
+                        "No se pudieron cargar las series de facturación"
+                      )}
+                    />
+                  )}
+                </RdxPageStack>
+              </RdxPageContainer>
+            ) : null}
+
+            <ProformaUpdateEditorForm
+              className={hasPageAlerts ? "pt-0" : undefined}
+              formId={updateCtrl.formId}
+              isSubmitting={updateCtrl.isUpdating}
+              itemsCtrl={updateCtrl.itemsCtrl}
+              onChangeCustomerClick={selectCustomerCtrl.selectCtrl.openDialog}
+              onCreateCustomerClick={selectCustomerCtrl.openQuickCreateDialog}
+              onPaymentTermChange={updateCtrl.handlePaymentTermChange}
+              onReset={updateCtrl.resetForm}
+              onSubmit={updateCtrl.onSubmit}
+              paymentCtrl={updateCtrl.paymentCtrl}
+              selectedCustomer={updateCtrl.selectedCustomer}
+              seriesOptions={updateCtrl.seriesOptions}
+              taxCtrl={updateCtrl.taxCtrl}
+              totalsCtrl={updateCtrl.totalsCtrl}
+            />
+          </RdxPageContainer>
+        </RdxPageFrame>
+
+        <SelectCustomerDialog
+          ctrl={selectCustomerCtrl.selectCtrl}
+          onCreateNewCustomerClick={selectCustomerCtrl.openQuickCreateFromSelection}
+        />
+        <QuickCreateCustomerDialog ctrl={selectCustomerCtrl.createCtrl} />
+        <ProformaUpdateCustomerChangeDialog
+          evaluation={customerChangeCtrl.evaluation}
+          isSubmitting={customerChangeCtrl.isApplying}
+          loadError={customerChangeCtrl.loadError as Error | null}
+          onConfirm={customerChangeCtrl.confirmChange}
+          onOpenChange={(open) => {
+            if (!open) {
+              customerChangeCtrl.closeDialog();
+            }
+          }}
+          open={customerChangeCtrl.open}
+          status={customerChangeCtrl.candidateStatus}
+        />
+      </UnsavedChangesProvider>
+    </FormProvider>
   );
 };
diff --git a/modules/customer-invoices/src/web/recurring-proformas/detail/ui/pages/recurring-proforma-detail-page.tsx b/modules/customer-invoices/src/web/recurring-proformas/detail/ui/pages/recurring-proforma-detail-page.tsx
index b839efe0..694ea49b 100644
--- a/modules/customer-invoices/src/web/recurring-proformas/detail/ui/pages/recurring-proforma-detail-page.tsx
+++ b/modules/customer-invoices/src/web/recurring-proformas/detail/ui/pages/recurring-proforma-detail-page.tsx
@@ -133,7 +133,7 @@ export const RecurringProformaDetailPage = () => {
       />
 
       <RdxPageContainer className="min-h-0 flex-1 overflow-y-auto" padding="none" width="wide">
-        <RdxEditorPageLayout width="simple">
+        <RdxEditorPageLayout width="wide">
           <RecurringProformaOperationalSummary
             locale={dateLocale}
             recurringProforma={recurringProforma}
diff --git a/modules/customer-invoices/src/web/recurring-proformas/list/list-recurring-proformas-page.tsx b/modules/customer-invoices/src/web/recurring-proformas/list/list-recurring-proformas-page.tsx
index bb8e4304..2f4af814 100644
--- a/modules/customer-invoices/src/web/recurring-proformas/list/list-recurring-proformas-page.tsx
+++ b/modules/customer-invoices/src/web/recurring-proformas/list/list-recurring-proformas-page.tsx
@@ -16,6 +16,7 @@ import {
   CircleIcon,
   CirclePauseIcon,
   CopyIcon,
+  PencilIcon,
   PlayCircleIcon,
   Trash2Icon,
 } from "lucide-react";
@@ -63,6 +64,7 @@ const actionIcons = {
   complete: CheckCircle2Icon,
   archive: ArchiveIcon,
   duplicate: CopyIcon,
+  edit: PencilIcon,
   delete: Trash2Icon,
 } as const;
 
diff --git a/packages/rdx-ui/src/components/editor-page/index.ts b/packages/rdx-ui/src/components/editor-page/index.ts
index b450e339..7e621d5c 100644
--- a/packages/rdx-ui/src/components/editor-page/index.ts
+++ b/packages/rdx-ui/src/components/editor-page/index.ts
@@ -1,3 +1,4 @@
 export * from "./rdx-editor-action-bar.tsx";
+export * from "./rdx-editor-layout.tsx";
 export * from "./rdx-editor-page-layout.tsx";
 export * from "./rdx-panel.tsx";
diff --git a/packages/rdx-ui/src/components/editor-page/rdx-editor-action-bar.tsx b/packages/rdx-ui/src/components/editor-page/rdx-editor-action-bar.tsx
index 442fe1db..2d165bd2 100644
--- a/packages/rdx-ui/src/components/editor-page/rdx-editor-action-bar.tsx
+++ b/packages/rdx-ui/src/components/editor-page/rdx-editor-action-bar.tsx
@@ -10,7 +10,7 @@ export interface RdxEditorActionBarProps extends Omit<ComponentPropsWithoutRef<"
 }
 
 /**
- * Barra inferior de acciones de una pantalla de edición.
+ * Barra inferior de acciones de un editor.
  *
  * Puede mostrar:
  * - contenido auxiliar a la izquierda
diff --git a/packages/rdx-ui/src/components/editor-page/rdx-editor-foundations.test.tsx b/packages/rdx-ui/src/components/editor-page/rdx-editor-foundations.test.tsx
index 97b5ff39..7902632f 100644
--- a/packages/rdx-ui/src/components/editor-page/rdx-editor-foundations.test.tsx
+++ b/packages/rdx-ui/src/components/editor-page/rdx-editor-foundations.test.tsx
@@ -6,7 +6,20 @@ import { renderToStaticMarkup } from "react-dom/server";
 import { RdxFormGrid } from "../form/rdx-form-grid.tsx";
 
 import { RdxEditorActionBar } from "./rdx-editor-action-bar.tsx";
+import { RdxEditorLayout } from "./rdx-editor-layout.tsx";
 import { RdxEditorPageLayout } from "./rdx-editor-page-layout.tsx";
+
+test("RdxEditorLayout only distributes main content and an optional aside", () => {
+  const html = renderToStaticMarkup(
+    <RdxEditorLayout aside={<span>Aside</span>}>Main</RdxEditorLayout>
+  );
+
+  assert.match(html, /grid/);
+  assert.match(html, /<aside/);
+  assert.doesNotMatch(html, /overflow/);
+  assert.doesNotMatch(html, /px-4/);
+});
+
 import { RdxPanel } from "./rdx-panel.tsx";
 
 test("RdxEditorPageLayout aplica complejidad simple por defecto y renderiza children", () => {
diff --git a/packages/rdx-ui/src/components/editor-page/rdx-editor-layout.tsx b/packages/rdx-ui/src/components/editor-page/rdx-editor-layout.tsx
new file mode 100644
index 00000000..6ce29ad9
--- /dev/null
+++ b/packages/rdx-ui/src/components/editor-page/rdx-editor-layout.tsx
@@ -0,0 +1,31 @@
+import { cn } from "@repo/shadcn-ui/lib/utils";
+import type { ComponentPropsWithoutRef, ReactNode } from "react";
+
+export interface RdxEditorLayoutProps extends Omit<ComponentPropsWithoutRef<"div">, "children"> {
+  children: ReactNode;
+  aside?: ReactNode;
+}
+
+/**
+ * Distribuye el contenido interno de un editor entre una región principal
+ * y un aside opcional.
+ */
+export const RdxEditorLayout = ({ children, aside, className, ...props }: RdxEditorLayoutProps) => {
+  if (!aside) {
+    return (
+      <div className={cn("min-w-0", className)} {...props}>
+        {children}
+      </div>
+    );
+  }
+
+  return (
+    <div
+      className={cn("grid min-w-0 gap-6 xl:grid-cols-[minmax(0,1fr)_22rem]", className)}
+      {...props}
+    >
+      <div className="min-w-0">{children}</div>
+      <aside className="min-w-0">{aside}</aside>
+    </div>
+  );
+};
diff --git a/packages/rdx-ui/src/components/editor-page/rdx-panel.tsx b/packages/rdx-ui/src/components/editor-page/rdx-panel.tsx
index 6fcf5dcd..3b9bb5b8 100644
--- a/packages/rdx-ui/src/components/editor-page/rdx-panel.tsx
+++ b/packages/rdx-ui/src/components/editor-page/rdx-panel.tsx
@@ -43,7 +43,6 @@ export const RdxPanel = ({
   ...props
 }: RdxPanelProps) => {
   const titleId = useId();
-  const hasHeader = Boolean(title || description || icon || actions);
 
   return (
     <section
@@ -51,34 +50,30 @@ export const RdxPanel = ({
       className={cn(VARIANT_CLASSNAME[variant], className)}
       {...props}
     >
-      {hasHeader ? (
-        <div className={cn("flex flex-col gap-4", variant === "plain" ? "pb-4" : "pb-5")}>
-          <div className="flex items-start justify-between gap-4">
-            <div className="flex min-w-0 items-start gap-3">
-              {icon ? (
-                <div className="flex size-6 shrink-0 items-center justify-center text-primary">
-                  {icon}
-                </div>
-              ) : null}
-
-              <div className="min-w-0 space-y-1">
-                <h2
-                  className="min-w-0 text-base font-semibold tracking-tight text-foreground"
-                  id={titleId}
-                >
-                  {title}
-                </h2>
-
-                {description ? (
-                  <p className="text-sm text-muted-foreground">{description}</p>
-                ) : null}
+      <div className={cn("flex flex-col gap-4", variant === "plain" ? "pb-4" : "pb-5")}>
+        <div className="flex items-start justify-between gap-4">
+          <div className="flex min-w-0 items-start gap-3">
+            {icon ? (
+              <div className="flex size-6 shrink-0 items-center justify-center text-primary">
+                {icon}
               </div>
-            </div>
+            ) : null}
 
-            {actions ? <div className="flex shrink-0 items-center gap-2">{actions}</div> : null}
+            <div className="min-w-0 space-y-1">
+              <h2
+                className="min-w-0 text-base font-semibold tracking-tight text-foreground"
+                id={titleId}
+              >
+                {title}
+              </h2>
+
+              {description ? <p className="text-sm text-muted-foreground">{description}</p> : null}
+            </div>
           </div>
+
+          {actions ? <div className="flex shrink-0 items-center gap-2">{actions}</div> : null}
         </div>
-      ) : null}
+      </div>
 
       <div className="min-w-0">{children}</div>
     </section>
diff --git a/packages/rdx-ui/src/components/layout/index.ts b/packages/rdx-ui/src/components/layout/index.ts
index b0d2b8b5..99ddb453 100644
--- a/packages/rdx-ui/src/components/layout/index.ts
+++ b/packages/rdx-ui/src/components/layout/index.ts
@@ -3,5 +3,6 @@ export * from "./app-header.tsx";
 export * from "./app-layout.tsx";
 export * from "./rdx-page-actions.tsx";
 export * from "./rdx-page-container.tsx";
+export * from "./rdx-page-frame.tsx";
 export * from "./rdx-page-header.tsx";
 export * from "./rdx-page-stack.tsx";
diff --git a/packages/rdx-ui/src/components/layout/rdx-page-foundations.test.tsx b/packages/rdx-ui/src/components/layout/rdx-page-foundations.test.tsx
index 97c64074..4668b59a 100644
--- a/packages/rdx-ui/src/components/layout/rdx-page-foundations.test.tsx
+++ b/packages/rdx-ui/src/components/layout/rdx-page-foundations.test.tsx
@@ -1,12 +1,27 @@
 import assert from "node:assert/strict";
 import test from "node:test";
+
 import { renderToStaticMarkup } from "react-dom/server";
 
 import { RdxPageActions } from "./rdx-page-actions.tsx";
 import { RdxPageContainer } from "./rdx-page-container.tsx";
+import { RdxPageFrame } from "./rdx-page-frame.tsx";
 import { RdxPageHeader } from "./rdx-page-header.tsx";
 import { RdxPageStack } from "./rdx-page-stack.tsx";
 
+test("RdxPageFrame separates fixed regions from the scrollable content", () => {
+  const html = renderToStaticMarkup(
+    <RdxPageFrame footer={<span>Footer</span>} header={<span>Header</span>}>
+      Content
+    </RdxPageFrame>
+  );
+
+  assert.match(html, /overflow-hidden/);
+  assert.match(html, /overflow-y-auto/);
+  assert.ok(html.indexOf("Header") < html.indexOf("Content"));
+  assert.ok(html.indexOf("Content") < html.indexOf("Footer"));
+});
+
 test("RdxPageContainer renders children with full width by default", () => {
   const html = renderToStaticMarkup(<RdxPageContainer>Content</RdxPageContainer>);
 
diff --git a/packages/rdx-ui/src/components/layout/rdx-page-frame.tsx b/packages/rdx-ui/src/components/layout/rdx-page-frame.tsx
new file mode 100644
index 00000000..a3783428
--- /dev/null
+++ b/packages/rdx-ui/src/components/layout/rdx-page-frame.tsx
@@ -0,0 +1,35 @@
+import { cn } from "@repo/shadcn-ui/lib/utils";
+import type { ComponentPropsWithoutRef, ReactNode } from "react";
+
+export interface RdxPageFrameProps extends Omit<ComponentPropsWithoutRef<"div">, "children"> {
+  children: ReactNode;
+  header?: ReactNode;
+  footer?: ReactNode;
+  contentClassName?: string;
+}
+
+/**
+ * Estructura una página en cabecera, contenido scrollable y pie opcional.
+ * Centraliza el control del scroll principal de la página.
+ */
+export const RdxPageFrame = ({
+  children,
+  header,
+  footer,
+  contentClassName,
+  className,
+  ...props
+}: RdxPageFrameProps) => {
+  return (
+    <div
+      className={cn("flex min-h-0 min-w-0 flex-1 flex-col overflow-hidden", className)}
+      {...props}
+    >
+      {header ? <div className="shrink-0">{header}</div> : null}
+      <div className={cn("min-h-0 min-w-0 flex-1 overflow-y-auto", contentClassName)}>
+        {children}
+      </div>
+      {footer ? <div className="shrink-0">{footer}</div> : null}
+    </div>
+  );
+};
diff --git a/packages/rdx-ui/src/components/layout/rdx-page-stack.tsx b/packages/rdx-ui/src/components/layout/rdx-page-stack.tsx
index f3c0c3c3..0708d2dc 100644
--- a/packages/rdx-ui/src/components/layout/rdx-page-stack.tsx
+++ b/packages/rdx-ui/src/components/layout/rdx-page-stack.tsx
@@ -16,8 +16,8 @@ const SPACING_CLASSNAME: Record<RdxPageStackSpacing, string> = {
 };
 
 /**
- * Contenedor para layout para apilar contenido verticalmente.
- * No proporciona estructura de página ni controla scroll.
+ * Apila contenido verticalmente aplicando un espaciado consistente.
+ * No controla viewport, scroll ni estructura de página.
  */
 
 export const RdxPageStack = ({