diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html
index b4e8b2f0c..3584648d4 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html
@@ -49,6 +49,10 @@
                 ></textarea>
             </div>
 
+            <mat-checkbox class="watermark" color="primary" formControlName="watermarkEnabled">
+                {{ 'add-dossier-dialog.form.watermark' | translate }}
+            </mat-checkbox>
+
             <div class="due-date">
                 <mat-checkbox
                     (change)="hasDueDate = !hasDueDate"
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.scss b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.scss
index df7daf698..b42ed8fc9 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.scss
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.scss
@@ -1,7 +1,11 @@
 @import '../../../../../assets/styles/red-variables';
 
+.watermark {
+    margin-top: 24px;
+}
+
 .due-date {
-    margin-top: 16px;
+    margin-top: 8px;
     min-height: 34px;
     display: flex;
     flex-direction: row;
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts
index 25d79c42c..f00e4e4bb 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts
@@ -23,26 +23,32 @@ export class AddDossierDialogComponent {
         public dialogRef: MatDialogRef<AddDossierDialogComponent>
     ) {
         this._filterInvalidDossierTemplates();
-        this.dossierForm = this._formBuilder.group({
-            dossierName: [null, Validators.required],
-            dossierTemplateId: [null, Validators.required],
-            downloadFileTypes: [null],
-            reportTypes: [null, Validators.required],
-            description: [null],
-            dueDate: [null]
-        });
+        this.dossierForm = this._formBuilder.group(
+            {
+                dossierName: [null, Validators.required],
+                dossierTemplateId: [null, Validators.required],
+                downloadFileTypes: [null],
+                reportTypes: [null],
+                description: [null],
+                dueDate: [null],
+                watermarkEnabled: [true]
+            },
+            {
+                validators: control =>
+                    control.value.reportTypes?.length > 0 ||
+                    control.value.downloadFileTypes?.length > 0
+                        ? null
+                        : { downloadPackage: true }
+            }
+        );
     }
 
     get reportTypesLength() {
-        return this.dossierForm.controls['reportTypes']?.value?.length
-            ? this.dossierForm.controls['reportTypes'].value.length
-            : 0;
+        return this.dossierForm.controls['reportTypes']?.value?.length || 0;
     }
 
     get downloadFileTypesLength() {
-        return this.dossierForm.controls['downloadFileTypes']?.value?.length
-            ? this.dossierForm.controls['downloadFileTypes'].value.length
-            : 0;
+        return this.dossierForm.controls['downloadFileTypes']?.value?.length || 0;
     }
 
     get disabled() {
@@ -109,7 +115,8 @@ export class AddDossierDialogComponent {
             dueDate: this.hasDueDate ? this.dossierForm.get('dueDate').value : undefined,
             dossierTemplateId: this.dossierForm.get('dossierTemplateId').value,
             downloadFileTypes: this.dossierForm.get('downloadFileTypes').value,
-            reportTypes: this.dossierForm.get('reportTypes').value
+            reportTypes: this.dossierForm.get('reportTypes').value,
+            watermarkEnabled: this.dossierForm.get('watermarkEnabled').value
         };
     }
 }
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts
index 20743d3e2..2bfa9e70d 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DossierTemplateModel } from '@redaction/red-ui-http';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup } from '@angular/forms';
 import { AppStateService } from '../../../../../state/app-state.service';
 import { DossierWrapper } from '../../../../../state/model/dossier.wrapper';
 import { EditDossierSectionInterface } from '../edit-dossier-section.interface';
@@ -25,15 +25,11 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS
     ) {}
 
     get reportTypesLength() {
-        return this.dossierForm.controls['reportTypes']?.value?.length
-            ? this.dossierForm.controls['reportTypes'].value.length
-            : 0;
+        return this.dossierForm.controls['reportTypes']?.value?.length || 0;
     }
 
     get downloadFileTypesLength() {
-        return this.dossierForm.controls['downloadFileTypes']?.value?.length
-            ? this.dossierForm.controls['downloadFileTypes'].value.length
-            : 0;
+        return this.dossierForm.controls['downloadFileTypes']?.value?.length || 0;
     }
 
     get changed() {
@@ -62,10 +58,19 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS
     }
 
     ngOnInit() {
-        this.dossierForm = this._formBuilder.group({
-            reportTypes: [this.dossierWrapper.dossier.reportTypes, Validators.required],
-            downloadFileTypes: [this.dossierWrapper.dossier.downloadFileTypes]
-        });
+        this.dossierForm = this._formBuilder.group(
+            {
+                reportTypes: [this.dossierWrapper.dossier.reportTypes],
+                downloadFileTypes: [this.dossierWrapper.dossier.downloadFileTypes]
+            },
+            {
+                validators: control =>
+                    control.value.reportTypes?.length > 0 ||
+                    control.value.downloadFileTypes?.length > 0
+                        ? null
+                        : { downloadPackage: true }
+            }
+        );
     }
 
     async save() {
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html
index 79e505ac2..45c01361e 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html
@@ -45,6 +45,10 @@
         ></textarea>
     </div>
 
+    <mat-checkbox class="watermark" color="primary" formControlName="watermarkEnabled">
+        {{ 'edit-dossier-dialog.general-info.form.watermark' | translate }}
+    </mat-checkbox>
+
     <div class="due-date">
         <mat-checkbox
             (change)="hasDueDate = !hasDueDate"
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss
index 1169079cb..5f0dc4fd5 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss
@@ -1,7 +1,11 @@
 @import '../../../../../../assets/styles/red-variables';
 
+.watermark {
+    margin-top: 24px;
+}
+
 .due-date {
-    margin-top: 16px;
+    margin-top: 8px;
     min-height: 34px;
     display: flex;
     flex-direction: row;
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts
index ec64d7538..76838c65a 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts
@@ -67,7 +67,8 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
                 Validators.required
             ],
             description: [this.dossierWrapper.description],
-            dueDate: [this.dossierWrapper.dueDate]
+            dueDate: [this.dossierWrapper.dueDate],
+            watermarkEnabled: [this.dossierWrapper.watermarkEnabled]
         });
         this.hasDueDate = !!this.dossierWrapper.dueDate;
     }
@@ -77,6 +78,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
             dossierName: this.dossierWrapper.dossierName,
             dossierTemplateId: this.dossierWrapper.dossierTemplateId,
             description: this.dossierWrapper.description,
+            watermarkEnabled: this.dossierWrapper.watermarkEnabled,
             dueDate: this.dossierWrapper.dueDate
         });
     }
@@ -86,6 +88,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
             ...this.dossierWrapper.dossier,
             dossierName: this.dossierForm.get('dossierName').value,
             description: this.dossierForm.get('description').value,
+            watermarkEnabled: this.dossierForm.get('watermarkEnabled').value,
             dueDate: this.hasDueDate ? this.dossierForm.get('dueDate').value : undefined,
             dossierTemplateId: this.dossierForm.get('dossierTemplateId').value
         };
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.html
index b841aba1f..b3aaa9214 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.html
@@ -56,6 +56,7 @@
             <!--            ></redaction-circle-button>-->
 
             <redaction-file-download-btn
+                [disabled]="areSomeEntitiesSelected"
                 [dossier]="activeDossier"
                 [file]="allEntities"
                 tooltipPosition="below"
@@ -64,9 +65,10 @@
             <redaction-circle-button
                 (action)="reanalyseDossier()"
                 *ngIf="permissionsService.displayReanalyseBtn()"
+                [disabled]="areSomeEntitiesSelected"
+                [tooltipClass]="'small ' + (areSomeEntitiesSelected ? '' : 'warn')"
                 [tooltip]="'dossier-overview.new-rule.toast.actions.reanalyse-all'"
                 icon="red:refresh"
-                tooltipClass="warn small"
                 tooltipPosition="below"
                 type="warn"
             ></redaction-circle-button>
diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.scss b/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.scss
index f2b7a4924..57a6e2097 100644
--- a/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.scss
+++ b/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.scss
@@ -30,7 +30,7 @@ button {
         }
     }
 
-    &.warn {
+    &.warn:not([disabled]) {
         background-color: $yellow-2;
 
         &:hover {
diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.html b/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.html
index 6d4dc37f2..76145c984 100644
--- a/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.html
@@ -1,6 +1,6 @@
 <redaction-circle-button
     (action)="downloadFiles($event)"
-    [disabled]="!canDownloadFiles"
+    [disabled]="disabled || !canDownloadFiles"
     [tooltipClass]="tooltipClass"
     [tooltipPosition]="tooltipPosition"
     [tooltip]="
diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.ts b/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.ts
index 04d942662..edd2602f0 100644
--- a/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.ts
@@ -20,6 +20,7 @@ export class FileDownloadBtnComponent {
     @Input() tooltipPosition: 'above' | 'below' | 'before' | 'after' = 'above';
     @Input() type: 'default' | 'primary' | 'warn' | 'dark-bg' = 'default';
     @Input() tooltipClass: string;
+    @Input() disabled = false;
 
     constructor(
         @Inject(BASE_HREF) private readonly _baseHref: string,
diff --git a/apps/red-ui/src/app/state/model/dossier.wrapper.ts b/apps/red-ui/src/app/state/model/dossier.wrapper.ts
index 586211801..4220c3614 100644
--- a/apps/red-ui/src/app/state/model/dossier.wrapper.ts
+++ b/apps/red-ui/src/app/state/model/dossier.wrapper.ts
@@ -90,6 +90,10 @@ export class DossierWrapper {
         return this.dossier.memberIds.length;
     }
 
+    get watermarkEnabled(): boolean {
+        return this.dossier.watermarkEnabled;
+    }
+
     hasStatus(status: string) {
         return this._files.find(f => f.status === status);
     }
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index 0687bf90e..be872ceec 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -151,6 +151,7 @@
         "label": "Description",
         "placeholder": "Enter Description"
       },
+      "watermark": "Watermark application on redacted documents",
       "due-date": "Due Date",
       "template": "Dossier Template"
     },
@@ -191,6 +192,7 @@
           "label": "Description",
           "placeholder": "Enter Description"
         },
+        "watermark": "Watermark application on redacted documents",
         "due-date": "Due Date",
         "template": "Dossier Template"
       }