diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.ts
index 524cd2916..4fa8a622d 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, Inject, ViewChild } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { AddEditEntityComponent } from '../../../shared/components/add-edit-entity/add-edit-entity.component';
+import { AddEditEntityComponent } from '@shared/components/add-edit-entity/add-edit-entity.component';
 import { BaseDialogComponent } from '@iqser/common-ui';
 
 interface DialogData {
diff --git a/apps/red-ui/src/app/modules/file-preview/services/stamp.service.ts b/apps/red-ui/src/app/modules/file-preview/services/stamp.service.ts
index d1ced1889..2ebb48292 100644
--- a/apps/red-ui/src/app/modules/file-preview/services/stamp.service.ts
+++ b/apps/red-ui/src/app/modules/file-preview/services/stamp.service.ts
@@ -69,7 +69,7 @@ export class StampService {
         }
     }
 
-    private async _stampPreview(document: PDFNet.PDFDoc, dossierTemplateId: string, watermarkId: string): Promise<void> {
+    private async _stampPreview(document: PDFNet.PDFDoc, dossierTemplateId: string, watermarkId: number): Promise<void> {
         const watermark = this._watermarksMapService.get(dossierTemplateId, watermarkId);
         await stampPDFPage(
             document,
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts
index 5157d0a45..1db6d6a20 100644
--- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts
+++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts
@@ -47,7 +47,7 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS
 
         for (const key of Object.keys(this.form.getRawValue())) {
             if (key.toLowerCase().includes('watermark')) {
-                if (this._asStringIfSet(this.dossier[key]) !== this.form.get(key).value) {
+                if (this.dossier[key] !== this.form.get(key).value) {
                     return true;
                 }
             } else {
@@ -116,8 +116,8 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS
             {
                 reportTemplateIds: [this.dossier.reportTemplateIds],
                 downloadFileTypes: [this.dossier.downloadFileTypes],
-                watermarkId: [this._asStringIfSet(this.dossier.watermarkId)],
-                previewWatermarkId: [this._asStringIfSet(this.dossier.previewWatermarkId)],
+                watermarkId: [this.dossier.watermarkId],
+                previewWatermarkId: [this.dossier.previewWatermarkId],
             },
             {
                 validators: control =>
@@ -127,11 +127,4 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS
             },
         );
     }
-
-    private _asStringIfSet(value: any): string {
-        if (value === undefined || value === null) {
-            return value;
-        }
-        return `${value}`;
-    }
 }
diff --git a/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.ts b/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.ts
index 85bb4a7f3..7b039f177 100644
--- a/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/dossier-watermark-selector/watermark-selector.component.ts
@@ -25,11 +25,11 @@ import { MatCheckboxChange } from '@angular/material/checkbox';
         },
     ],
 })
-export class WatermarkSelectorComponent extends FormFieldComponent<string> implements OnChanges {
+export class WatermarkSelectorComponent extends FormFieldComponent<number> implements OnChanges {
     @Input() dossierTemplateId: string;
     @Input() label: string;
     readonly watermarks$: Observable<Watermark[]>;
-    watermarksMap = new Map<string, Watermark>();
+    watermarksMap = new Map<number, Watermark>();
     #watermarks: Watermark[] = [];
     readonly #dossierTemplateId$ = new BehaviorSubject<string>(null);
 
@@ -67,7 +67,7 @@ export class WatermarkSelectorComponent extends FormFieldComponent<string> imple
         }
     }
 
-    selectWatermark(watermarkId: string): void {
+    selectWatermark(watermarkId: number): void {
         this.markAsTouched();
         this._value = watermarkId;
         this.onChange(this._value);
diff --git a/apps/red-ui/src/app/services/entity-services/watermark.service.ts b/apps/red-ui/src/app/services/entity-services/watermark.service.ts
index 5d296d215..eeb8a062c 100644
--- a/apps/red-ui/src/app/services/entity-services/watermark.service.ts
+++ b/apps/red-ui/src/app/services/entity-services/watermark.service.ts
@@ -20,7 +20,7 @@ export class WatermarkService extends GenericService<IWatermark> {
     }
 
     @Validate()
-    deleteWatermark(@RequiredParam() dossierTemplateId: string, @RequiredParam() watermarkId: string): Observable<Watermark[]> {
+    deleteWatermark(@RequiredParam() dossierTemplateId: string, @RequiredParam() watermarkId: number): Observable<Watermark[]> {
         return super
             .delete(null, `${this._defaultModelPath}/${watermarkId}`)
             .pipe(switchMap(() => this.loadForDossierTemplate(dossierTemplateId)));
@@ -31,7 +31,7 @@ export class WatermarkService extends GenericService<IWatermark> {
         return this._post(body, `${this._defaultModelPath}`).pipe(
             switchMap(watermark =>
                 this.loadForDossierTemplate(watermark.dossierTemplateId).pipe(
-                    map(() => this._watermarksMapService.get(watermark.dossierTemplateId, watermark.id.toString())),
+                    map(() => this._watermarksMapService.get(watermark.dossierTemplateId, watermark.id)),
                 ),
             ),
         );
@@ -52,7 +52,7 @@ export class WatermarkService extends GenericService<IWatermark> {
     }
 
     @Validate()
-    isWatermarkUsed(@RequiredParam() watermarkId: string): Observable<boolean> {
+    isWatermarkUsed(@RequiredParam() watermarkId: number): Observable<boolean> {
         const queryParams: QueryParam[] = [{ key: 'watermarkId', value: watermarkId }];
         return this.getAll<IsUsedResponse>(`${this._defaultModelPath}/used`, queryParams).pipe(map(result => result.value));
     }
diff --git a/libs/common-ui b/libs/common-ui
index b1f8de6ea..7875f99a0 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit b1f8de6ea1b12f1d3973bfd479b58ae4a480bda1
+Subproject commit 7875f99a074704eaa3252258d7efd83c39a355b7
diff --git a/libs/red-domain/src/lib/dossiers/dossier.model.ts b/libs/red-domain/src/lib/dossiers/dossier.model.ts
index bd0a8d8aa..fd2eb2757 100644
--- a/libs/red-domain/src/lib/dossiers/dossier.model.ts
+++ b/libs/red-domain/src/lib/dossiers/dossier.model.ts
@@ -19,8 +19,8 @@ export class Dossier implements IDossier, IListable {
     readonly hardDeletedTime?: string;
     readonly softDeletedTime?: string;
     readonly startDate?: string;
-    readonly watermarkId: string;
-    readonly previewWatermarkId: string;
+    readonly watermarkId?: number;
+    readonly previewWatermarkId?: number;
     readonly archivedTime: string;
     readonly hasReviewers: boolean;
     readonly routerLink: string;
diff --git a/libs/red-domain/src/lib/dossiers/dossier.request.ts b/libs/red-domain/src/lib/dossiers/dossier.request.ts
index 2e65c95ba..d31e01c90 100644
--- a/libs/red-domain/src/lib/dossiers/dossier.request.ts
+++ b/libs/red-domain/src/lib/dossiers/dossier.request.ts
@@ -56,9 +56,9 @@ export interface IDossierRequest {
     /**
      * Watermark id that will be applied  to the redacted files.
      */
-    readonly watermarkId?: string;
+    readonly watermarkId?: number;
     /**
      * Watermark id that will be applied  to the preview files.
      */
-    readonly previewWatermarkId?: string;
+    readonly previewWatermarkId?: number;
 }
diff --git a/libs/red-domain/src/lib/dossiers/dossier.ts b/libs/red-domain/src/lib/dossiers/dossier.ts
index d8ebe113b..b99bebb6b 100644
--- a/libs/red-domain/src/lib/dossiers/dossier.ts
+++ b/libs/red-domain/src/lib/dossiers/dossier.ts
@@ -17,7 +17,7 @@ export interface IDossier {
     readonly reportTemplateIds: List;
     readonly softDeletedTime?: string;
     readonly startDate?: string;
-    readonly watermarkId: string;
-    readonly previewWatermarkId: string;
+    readonly watermarkId?: number;
+    readonly previewWatermarkId?: number;
     readonly archivedTime: string;
 }
diff --git a/libs/red-domain/src/lib/watermarks/watermark.model.ts b/libs/red-domain/src/lib/watermarks/watermark.model.ts
index e63a8072c..d4d7a11ae 100644
--- a/libs/red-domain/src/lib/watermarks/watermark.model.ts
+++ b/libs/red-domain/src/lib/watermarks/watermark.model.ts
@@ -2,7 +2,7 @@ import { IWatermark, WatermarkOrientation } from './watermark';
 import { Entity } from '@iqser/common-ui';
 
 export class Watermark extends Entity<IWatermark> {
-    readonly id: string;
+    readonly id: number;
     readonly dossierTemplateId: string;
     readonly enabled: boolean;
     readonly fontSize: number;
@@ -20,7 +20,7 @@ export class Watermark extends Entity<IWatermark> {
 
     constructor(watermark: IWatermark) {
         super(watermark);
-        this.id = watermark.id.toString();
+        this.id = watermark.id;
         this.dossierTemplateId = watermark.dossierTemplateId;
         this.enabled = watermark.enabled;
         this.fontSize = watermark.fontSize;
diff --git a/libs/red-domain/src/lib/watermarks/watermark.ts b/libs/red-domain/src/lib/watermarks/watermark.ts
index deba31803..27270bb51 100644
--- a/libs/red-domain/src/lib/watermarks/watermark.ts
+++ b/libs/red-domain/src/lib/watermarks/watermark.ts
@@ -1,5 +1,5 @@
 export interface IWatermark {
-    id: string;
+    id: number;
     dossierTemplateId: string;
     enabled: boolean;
     fontSize: number;