diff --git a/docs/process-services/apps-list.component.md b/docs/process-services/apps-list.component.md
index 20866816ad..3c59700e44 100644
--- a/docs/process-services/apps-list.component.md
+++ b/docs/process-services/apps-list.component.md
@@ -24,9 +24,9 @@ If we intend to show a custom template if there are no apps present
 ```html
 <adf-apps
     [layoutType]="'GRID'">
-        <adf-empty-list>
-            <div adf-empty-list-header class="adf-empty-list-header">No apps present</div>
-        </adf-empty-list>
+        <adf-empty-custom-content>
+            No Apps present
+        </adf-empty-custom-content>
 </adf-apps>
 ```
 
diff --git a/lib/process-services/app-list/apps-list.component.html b/lib/process-services/app-list/apps-list.component.html
index 89c2d5e65a..8b1be59a67 100644
--- a/lib/process-services/app-list/apps-list.component.html
+++ b/lib/process-services/app-list/apps-list.component.html
@@ -42,14 +42,15 @@
 </ng-container>
 
 <ng-template #empty>
-    
-    <ng-content *ngIf="hasCustomEmptyListTemplate; else defaulEmptyList" class="adf-custom-empty-template"></ng-content>
-    
-    <ng-template #defaulEmptyList>
-        <adf-empty-list *ngIf="isEmpty()">
-            <div adf-empty-list-header class="adf-empty-list-header">
-                {{ 'ADF_TASK_LIST.APPS.NONE' | translate }}
-            </div>
-        </adf-empty-list>
-    </ng-template>
+    <div class="adf-app-list-empty" *ngIf="isEmpty()">
+        <ng-content select="adf-empty-custom-content" *ngIf="hasEmptyCustomContentTemplate; else defaultEmptyTemplate" class="adf-custom-empty-template"></ng-content>
+
+        <ng-template #defaultEmptyTemplate>
+            <adf-empty-content
+                icon="apps"
+                [title]="'ADF_TASK_LIST.APPS.TITLE' | translate"
+                [subtitle]="'ADF_TASK_LIST.APPS.SUBTITLE' | translate">
+            </adf-empty-content>
+        </ng-template>
+    </div>
 </ng-template>
diff --git a/lib/process-services/app-list/apps-list.component.scss b/lib/process-services/app-list/apps-list.component.scss
index 9e5fea7d9c..705b559ae5 100644
--- a/lib/process-services/app-list/apps-list.component.scss
+++ b/lib/process-services/app-list/apps-list.component.scss
@@ -21,7 +21,7 @@
         theme-10: (bg: #cabb33, color: #baab23)
     );
 
-    .adf-app-list-spinner {
+    .adf-app-list-spinner, .adf-app-list-empty {
         display: flex;
         align-items: center;
         justify-content: center;
diff --git a/lib/process-services/app-list/apps-list.component.spec.ts b/lib/process-services/app-list/apps-list.component.spec.ts
index 3621f045ba..dc3fd2e392 100644
--- a/lib/process-services/app-list/apps-list.component.spec.ts
+++ b/lib/process-services/app-list/apps-list.component.spec.ts
@@ -243,9 +243,9 @@ describe('AppsListComponent', () => {
 @Component({
     template: `
     <adf-apps>
-        <adf-empty-list>
-            <div adf-empty-list-header class="adf-empty-list-header">No Apps</div>
-        </adf-empty-list>
+        <adf-empty-custom-content>
+            <p id="custom-id">No Apps</p>
+        </adf-empty-custom-content>
     </adf-apps>
        `
 })
@@ -272,7 +272,7 @@ describe('Custom CustomEmptyAppListTemplateComponent', () => {
     it('should render the custom no-apps template', async(() => {
         fixture.detectChanges();
         fixture.whenStable().then(() => {
-            let title: any = fixture.debugElement.queryAll(By.css('[adf-empty-list-header]'));
+            let title: any = fixture.debugElement.queryAll(By.css('#custom-id'));
             expect(title.length).toBe(1);
             expect(title[0].nativeElement.innerText).toBe('No Apps');
         });
diff --git a/lib/process-services/app-list/apps-list.component.ts b/lib/process-services/app-list/apps-list.component.ts
index a4b028aca1..339efa7adb 100644
--- a/lib/process-services/app-list/apps-list.component.ts
+++ b/lib/process-services/app-list/apps-list.component.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { AppsProcessService, TranslationService, EmptyListComponent } from '@alfresco/adf-core';
+import { AppsProcessService, TranslationService, EmptyCustomContentDirective } from '@alfresco/adf-core';
 import { AfterContentInit, Component, EventEmitter, Input, OnInit, Output, ContentChild } from '@angular/core';
 import { Observable } from 'rxjs/Observable';
 import { Observer } from 'rxjs/Observer';
@@ -37,8 +37,8 @@ export class AppsListComponent implements OnInit, AfterContentInit {
     public static DEFAULT_TASKS_APP_ICON: string = 'glyphicon-asterisk';
     public static DEFAULT_TASKS_APP_MATERIAL_ICON: string = 'favorite_border';
 
-    @ContentChild(EmptyListComponent)
-    emptyTemplate: EmptyListComponent;
+    @ContentChild(EmptyCustomContentDirective)
+    emptyCustomContent: EmptyCustomContentDirective;
 
     /** (**required**) Defines the layout of the apps. There are two possible
      * values, "GRID" and "LIST".
@@ -69,7 +69,7 @@ export class AppsListComponent implements OnInit, AfterContentInit {
 
     loading: boolean = false;
 
-    hasCustomEmptyListTemplate: boolean = false;
+    hasEmptyCustomContentTemplate: boolean = false;
 
     constructor(
         private appsProcessService: AppsProcessService,
@@ -90,8 +90,8 @@ export class AppsListComponent implements OnInit, AfterContentInit {
     }
 
     ngAfterContentInit() {
-        if (this.emptyTemplate) {
-            this.hasCustomEmptyListTemplate = true;
+        if (this.emptyCustomContent) {
+            this.hasEmptyCustomContentTemplate = true;
         }
     }
 
diff --git a/lib/process-services/app-list/apps-list.module.ts b/lib/process-services/app-list/apps-list.module.ts
index 1ff9578646..304455c87c 100644
--- a/lib/process-services/app-list/apps-list.module.ts
+++ b/lib/process-services/app-list/apps-list.module.ts
@@ -20,7 +20,7 @@ import { FlexLayoutModule } from '@angular/flex-layout';
 import { NgModule } from '@angular/core';
 import { MaterialModule } from '../material.module';
 import { TranslateModule } from '@ngx-translate/core';
-import { DataTableModule } from '@alfresco/adf-core';
+import { CoreModule } from '@alfresco/adf-core';
 
 import { AppsListComponent } from './apps-list.component';
 import { SelectAppsDialogComponent } from './select-apps-dialog-component';
@@ -31,7 +31,7 @@ import { SelectAppsDialogComponent } from './select-apps-dialog-component';
         MaterialModule,
         FlexLayoutModule,
         TranslateModule,
-        DataTableModule
+        CoreModule
     ],
     declarations: [
         AppsListComponent,
diff --git a/lib/process-services/i18n/en.json b/lib/process-services/i18n/en.json
index 938bdda1fa..e357a07110 100644
--- a/lib/process-services/i18n/en.json
+++ b/lib/process-services/i18n/en.json
@@ -13,7 +13,8 @@
   },
   "ADF_TASK_LIST": {
     "APPS": {
-      "NONE": "No apps found",
+      "TITLE": "No Applications Found",
+      "SUBTITLE":"Create a new application that you want to easily find later",
       "TASK_APP_NAME": "Task App"
     },
     "LIST": {