diff --git a/demo-shell/src/app/components/trashcan/trashcan.component.html b/demo-shell/src/app/components/trashcan/trashcan.component.html
index 7fe5280b67..505778b790 100644
--- a/demo-shell/src/app/components/trashcan/trashcan.component.html
+++ b/demo-shell/src/app/components/trashcan/trashcan.component.html
@@ -42,8 +42,8 @@
                 <adf-empty-content
                     icon="delete"
                     [title]="'TRASHCAN.EMPTY_STATE.TITLE'">
-                    <p class="adf-empty-content__text">{{ 'TRASHCAN.EMPTY_STATE.FIRST_TEXT' | translate }}</p>
-                    <p class="adf-empty-content__text">{{ 'TRASHCAN.EMPTY_STATE.SECOND_TEXT' | translate }}</p>
+                    <div class="adf-empty-content__text">{{ 'TRASHCAN.EMPTY_STATE.FIRST_TEXT' | translate }}</div>
+                    <div class="adf-empty-content__text">{{ 'TRASHCAN.EMPTY_STATE.SECOND_TEXT' | translate }}</div>
                 </adf-empty-content>
             </adf-custom-empty-content-template>
 
diff --git a/e2e/pages/adf/process-cloud/processListCloudComponent.ts b/e2e/pages/adf/process-cloud/processListCloudComponent.ts
index 35ffc44063..ab4e24ea0b 100644
--- a/e2e/pages/adf/process-cloud/processListCloudComponent.ts
+++ b/e2e/pages/adf/process-cloud/processListCloudComponent.ts
@@ -22,7 +22,7 @@ import { element, by } from 'protractor';
 export class ProcessListCloudComponent {
 
     processList = element(by.css('adf-cloud-process-list'));
-    noProcessFound = element.all(by.css("p[class='adf-empty-content__title']")).first();
+    noProcessFound = element.all(by.css("div[class='adf-empty-content__title']")).first();
 
     dataTable = new DataTableComponentPage(this.processList);
 
diff --git a/e2e/pages/adf/process-cloud/taskListCloudComponent.ts b/e2e/pages/adf/process-cloud/taskListCloudComponent.ts
index bcdfefe8e3..bb3bfffc94 100644
--- a/e2e/pages/adf/process-cloud/taskListCloudComponent.ts
+++ b/e2e/pages/adf/process-cloud/taskListCloudComponent.ts
@@ -26,7 +26,7 @@ let column = {
 export class TaskListCloudComponent {
 
     taskList = element(by.css('adf-cloud-task-list'));
-    noTasksFound = element.all(by.css("p[class='adf-empty-content__title']")).first();
+    noTasksFound = element.all(by.css("div[class='adf-empty-content__title']")).first();
 
     dataTable = new DataTableComponentPage(this.taskList);
 
diff --git a/e2e/pages/adf/process-services/processFiltersPage.ts b/e2e/pages/adf/process-services/processFiltersPage.ts
index 5eb54c4186..70df30722b 100644
--- a/e2e/pages/adf/process-services/processFiltersPage.ts
+++ b/e2e/pages/adf/process-services/processFiltersPage.ts
@@ -31,7 +31,7 @@ export class ProcessFiltersPage {
     processesPage = element(by.css('div[class="adf-grid"] > div[class="adf-grid-item adf-processes-menu"]'));
     accordionMenu = element(by.css('.adf-processes-menu mat-accordion'));
     buttonWindow = element(by.css('div > button[data-automation-id="btn-start-process"] > div'));
-    noContentMessage = element.all(by.css('p[class="adf-empty-content__title"]')).first();
+    noContentMessage = element.all(by.css('div[class="adf-empty-content__title"]')).first();
     rows = by.css('adf-process-instance-list div[class="adf-datatable-body"] div[class*="adf-datatable-row"]');
     tableBody = element.all(by.css('adf-datatable div[class="adf-datatable-body"]')).first();
     nameColumn = by.css('div[class*="adf-datatable-body"] div[class*="adf-datatable-row"] div[title="Name"] span');
diff --git a/e2e/pages/adf/process-services/processListPage.ts b/e2e/pages/adf/process-services/processListPage.ts
index 1c2a2be6a5..ae161b1571 100644
--- a/e2e/pages/adf/process-services/processListPage.ts
+++ b/e2e/pages/adf/process-services/processListPage.ts
@@ -20,7 +20,7 @@ import { element, by } from 'protractor';
 
 export class ProcessListPage {
 
-    processListTitle = element.all(by.css("p[class='adf-empty-content__title']")).first();
+    processListTitle = element.all(by.css("div[class='adf-empty-content__title']")).first();
     processInstanceList = element(by.css('adf-process-instance-list'));
 
     checkProcessListTitleIsDisplayed() {
diff --git a/e2e/pages/adf/process-services/tasksListPage.ts b/e2e/pages/adf/process-services/tasksListPage.ts
index 801a0e03f9..ecd5338af6 100644
--- a/e2e/pages/adf/process-services/tasksListPage.ts
+++ b/e2e/pages/adf/process-services/tasksListPage.ts
@@ -22,7 +22,7 @@ import { by, element } from 'protractor';
 export class TasksListPage {
 
     taskList = element(by.css('adf-tasklist'));
-    noTasksFound = element.all(by.css("p[class='adf-empty-content__title']")).first();
+    noTasksFound = element.all(by.css("div[class='adf-empty-content__title']")).first();
     dataTable = new DataTableComponentPage(this.taskList);
 
     getDataTable() {
diff --git a/lib/core/templates/empty-content/empty-content.component.html b/lib/core/templates/empty-content/empty-content.component.html
index 67ac339d12..e16282db2e 100644
--- a/lib/core/templates/empty-content/empty-content.component.html
+++ b/lib/core/templates/empty-content/empty-content.component.html
@@ -1,6 +1,6 @@
 <div class="adf-empty-content">
     <mat-icon class="adf-empty-content__icon">{{ icon }}</mat-icon>
-    <p class="adf-empty-content__title">{{ title | translate }}</p>
-    <p class="adf-empty-content__subtitle">{{ subtitle | translate }}</p>
+    <div class="adf-empty-content__title">{{ title | translate }}</div>
+    <div class="adf-empty-content__subtitle">{{ subtitle | translate }}</div>
     <ng-content></ng-content>
 </div>
diff --git a/lib/core/templates/empty-content/empty-content.component.scss b/lib/core/templates/empty-content/empty-content.component.scss
index 8001f856bd..8c63bdadff 100644
--- a/lib/core/templates/empty-content/empty-content.component.scss
+++ b/lib/core/templates/empty-content/empty-content.component.scss
@@ -19,6 +19,9 @@
             font-size: 18px;
             font-weight: 600;
             line-height: 0;
+            white-space: normal;
+            text-align: center;
+            margin: 10px 0;
         }
 
         &__subtitle,
@@ -26,6 +29,8 @@
             font-size: 14px;
             font-weight: 300;
             line-height: inherit;
+            white-space: normal;
+            text-align: center;
         }
     }
 }