diff --git a/demo-shell/src/app/components/form/form-list.component.html b/demo-shell/src/app/components/form/form-list.component.html
index b5a2673e32..fff163766e 100644
--- a/demo-shell/src/app/components/form/form-list.component.html
+++ b/demo-shell/src/app/components/form/form-list.component.html
@@ -1,8 +1,13 @@
 <adf-form-list [forms]="formList" (row-dblclick)="onRowDblClick($event)">
 </adf-form-list>
 <div class="form-container" *ngIf="!isEmptyForm()">
-    <adf-form #adfForm [form]="form" [data]="restoredData">
+    <adf-form #adfForm [form]="form" [data]="restoredData" [showValidationIcon]="showValidationIcon">
     </adf-form>
 </div>
 <button mat-button (click)="store()" color="primary">{{'FORM-LIST.STORE' | translate }}</button>
 <button mat-button (click)="restore()" color="primary">{{'FORM-LIST.RESTORE' | translate }}</button>
+<section class="form-list-margin">
+    <mat-slide-toggle color="primary" [(ngModel)]="showValidationIcon">
+        Show Validation Icon
+    </mat-slide-toggle>
+</section>
diff --git a/demo-shell/src/app/components/form/form-list.component.scss b/demo-shell/src/app/components/form/form-list.component.scss
index ee6f7a61fb..1c89b60541 100644
--- a/demo-shell/src/app/components/form/form-list.component.scss
+++ b/demo-shell/src/app/components/form/form-list.component.scss
@@ -6,3 +6,7 @@
     width: 80%;
     height: 80%;
 }
+
+.form-list-margin {
+    margin-left: 26px;
+}
diff --git a/demo-shell/src/app/components/form/form-list.component.ts b/demo-shell/src/app/components/form/form-list.component.ts
index b78435bd70..04316eb0bf 100644
--- a/demo-shell/src/app/components/form/form-list.component.ts
+++ b/demo-shell/src/app/components/form/form-list.component.ts
@@ -36,6 +36,8 @@ export class FormListComponent {
     storedData: any = {};
     restoredData: any = {};
 
+    showValidationIcon = false;
+
     constructor(private formService: FormService, private logService: LogService) {
         // Prevent default outcome actions
         formService.executeOutcome.subscribe(e => {