diff --git a/frontend/src/lib/components/dashboard/invoices/edit/invoice-top-fields.svelte b/frontend/src/lib/components/dashboard/invoices/edit/invoice-top-fields.svelte
index 99e49e88..d80e919a 100644
--- a/frontend/src/lib/components/dashboard/invoices/edit/invoice-top-fields.svelte
+++ b/frontend/src/lib/components/dashboard/invoices/edit/invoice-top-fields.svelte
@@ -294,7 +294,7 @@
 		</div>
 		<div class="min-w-[75px] flex-[2] space-y-1">
 			<Label for="pedimento" class="text-xs">{m.invoice_edit_form_pedimento_label()}</Label>
-		<Select.Root
+			<Select.Root
 				type="single"
 				value={formData.pedimento_id ? String(formData.pedimento_id) : ''}
 				disabled={formData.is_pedimento_pending}
@@ -322,61 +322,68 @@
 				</Select.Content>
 			</Select.Root>
 		</div>
+	{/if}
 
+	<!-- Parámetros legados: NÚMERO FACTURA (prefijo + consecutivo).
+	     Visible en configuración para todos los tipos de factura (incl. MEX). -->
+	{#if isSettings}
+		<div class="flex min-w-[220px] flex-col gap-1">
+			<span class="text-xs font-semibold text-muted-foreground">Número Factura</span>
+			<div class="flex flex-wrap items-end gap-3">
+				<div class="min-w-[100px] flex-1 space-y-1">
+					<Label for="invoice_prefix" class="text-xs">Prefijo</Label>
+					<Input id="invoice_prefix" bind:value={formData.invoice_prefix} class="h-8 text-sm" />
+				</div>
+
+				<div class="min-w-[100px] flex-1 space-y-1">
+					<Label for="invoice_initial_number" class="text-xs">Número Inicial</Label>
+					<Input
+						id="invoice_initial_number"
+						bind:value={formData.invoice_initial_number}
+						class="h-8 text-sm"
+					/>
+				</div>
+			</div>
+		</div>
+	{/if}
+
+	{#if invoiceType !== 'MEX'}
 		<div class="min-w-[80px] flex-1 space-y-1">
 			<Label for="remesa" class="text-xs">{m.invoice_edit_form_remesa_label()}</Label>
 			<Input id="remesa" bind:value={formData.remesa} class={cn('h-8 text-sm', hl('remesa'))} />
 		</div>
 	{/if}
 
-	<!-- Parámetros legados: NÚMERO FACTURA (prefijo + consecutivo) y datos derivados del pedimento.
-	     Solo visibles en el formulario de parámetros/configuración. -->
-	{#if isSettings}
-		<div class="min-w-[100px] flex-1 space-y-1">
-			<Label for="invoice_prefix" class="text-xs">Prefijo</Label>
-			<Input id="invoice_prefix" bind:value={formData.invoice_prefix} class="h-8 text-sm" />
+	{#if isSettings && invoiceType !== 'MEX'}
+		<div class="min-w-[90px] flex-1 space-y-1">
+			<Label for="clave_pedimento" class="text-xs">Clave</Label>
+			<Input id="clave_pedimento" bind:value={formData.clave_pedimento} class="h-8 text-sm" />
 		</div>
 
-		<div class="min-w-[100px] flex-1 space-y-1">
-			<Label for="invoice_initial_number" class="text-xs">Número Inicial</Label>
+		<div class="min-w-[90px] flex-1 space-y-1">
+			<Label for="regimen_pedimento" class="text-xs">Régimen</Label>
+			<Input id="regimen_pedimento" bind:value={formData.regimen_pedimento} class="h-8 text-sm" />
+		</div>
+
+		<div class="min-w-[140px] flex-[1.5] space-y-1">
+			<Label for="fecha_pedimento_del" class="text-xs">Rango de Fechas (Del)</Label>
 			<Input
-				id="invoice_initial_number"
-				bind:value={formData.invoice_initial_number}
+				id="fecha_pedimento_del"
+				type="date"
+				bind:value={formData.fecha_pedimento_del}
 				class="h-8 text-sm"
 			/>
 		</div>
 
-		{#if invoiceType !== 'MEX'}
-			<div class="min-w-[90px] flex-1 space-y-1">
-				<Label for="clave_pedimento" class="text-xs">Clave</Label>
-				<Input id="clave_pedimento" bind:value={formData.clave_pedimento} class="h-8 text-sm" />
-			</div>
-
-			<div class="min-w-[90px] flex-1 space-y-1">
-				<Label for="regimen_pedimento" class="text-xs">Régimen</Label>
-				<Input id="regimen_pedimento" bind:value={formData.regimen_pedimento} class="h-8 text-sm" />
-			</div>
-
-			<div class="min-w-[140px] flex-[1.5] space-y-1">
-				<Label for="fecha_pedimento_del" class="text-xs">Rango de Fechas (Del)</Label>
-				<Input
-					id="fecha_pedimento_del"
-					type="date"
-					bind:value={formData.fecha_pedimento_del}
-					class="h-8 text-sm"
-				/>
-			</div>
-
-			<div class="min-w-[140px] flex-[1.5] space-y-1">
-				<Label for="fecha_pedimento_al" class="text-xs">Rango de Fechas (al)</Label>
-				<Input
-					id="fecha_pedimento_al"
-					type="date"
-					bind:value={formData.fecha_pedimento_al}
-					class="h-8 text-sm"
-				/>
-			</div>
-		{/if}
+		<div class="min-w-[140px] flex-[1.5] space-y-1">
+			<Label for="fecha_pedimento_al" class="text-xs">Rango de Fechas (al)</Label>
+			<Input
+				id="fecha_pedimento_al"
+				type="date"
+				bind:value={formData.fecha_pedimento_al}
+				class="h-8 text-sm"
+			/>
+		</div>
 	{/if}
 
 	{#if !isSettings}