diff --git a/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html b/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html
index 1872fac50..10defa401 100644
--- a/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html
+++ b/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html
@@ -22,7 +22,7 @@
                 <div class="scrollbar-placeholder"></div>
             </div>
 
-            <div *ngIf="noData" class="no-data heading-l" translate="downloads-list.no-data"></div>
+            <redaction-empty-state *ngIf="noData" icon="red:download" screen="downloads-list"></redaction-empty-state>
 
             <cdk-virtual-scroll-viewport [itemSize]="80" redactionHasScrollbar>
                 <!--      Table lines -->
diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html
index 805efd4e7..901c81dc0 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html
@@ -81,6 +81,12 @@
                 screen="dictionary-listing"
             ></redaction-empty-state>
 
+            <redaction-empty-state
+                *ngIf="dictionaries.length && !displayedDictionaries.length"
+                screen="dictionary-listing"
+                type="no-match"
+            ></redaction-empty-state>
+
             <cdk-virtual-scroll-viewport [itemSize]="80" redactionHasScrollbar>
                 <div
                     class="table-item pointer"
diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
index 1e0b16e56..80090a43a 100644
--- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
@@ -91,6 +91,12 @@
 
             <redaction-empty-state *ngIf="!attributes.length" screen="file-attributes-listing" icon="red:attribute"></redaction-empty-state>
 
+            <redaction-empty-state
+                *ngIf="attributes.length && !displayedAttributes.length"
+                screen="file-attributes-listing"
+                type="no-match"
+            ></redaction-empty-state>
+
             <cdk-virtual-scroll-viewport [itemSize]="80" redactionHasScrollbar>
                 <!--      Table lines -->
                 <div class="table-item" *cdkVirtualFor="let attribute of displayedAttributes | sortBy: sortingOption.order:sortingOption.column">
diff --git a/apps/red-ui/src/app/modules/admin/screens/rule-sets-listing/rule-sets-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/rule-sets-listing/rule-sets-listing-screen.component.html
index 3e74c56a7..05c8f550c 100644
--- a/apps/red-ui/src/app/modules/admin/screens/rule-sets-listing/rule-sets-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/rule-sets-listing/rule-sets-listing-screen.component.html
@@ -78,6 +78,12 @@
 
             <redaction-empty-state *ngIf="!ruleSets.length" icon="red:template" screen="project-templates-listing"></redaction-empty-state>
 
+            <redaction-empty-state
+                *ngIf="ruleSets.length && !displayedRuleSets.length"
+                screen="project-templates-listing"
+                type="no-match"
+            ></redaction-empty-state>
+
             <cdk-virtual-scroll-viewport [itemSize]="100" redactionHasScrollbar>
                 <div
                     class="table-item pointer"
diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html
index c18bb3151..912f3f12c 100644
--- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html
@@ -73,7 +73,7 @@
                 <div class="scrollbar-placeholder"></div>
             </div>
 
-            <!--No empty state necessary because there will always be at least the current user.-->
+            <redaction-empty-state *ngIf="!displayedUsers.length" screen="user-listing" type="no-match"></redaction-empty-state>
 
             <cdk-virtual-scroll-viewport [itemSize]="80" redactionHasScrollbar>
                 <!--      Table lines -->
diff --git a/apps/red-ui/src/app/modules/projects/screens/project-listing-screen/project-listing-screen.component.html b/apps/red-ui/src/app/modules/projects/screens/project-listing-screen/project-listing-screen.component.html
index 513d8fba3..80f7a2c2f 100644
--- a/apps/red-ui/src/app/modules/projects/screens/project-listing-screen/project-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/projects/screens/project-listing-screen/project-listing-screen.component.html
@@ -77,7 +77,11 @@
                 [showButton]="permissionsService.isManager()"
             ></redaction-empty-state>
 
-            <div *ngIf="appStateService.hasProjects && !displayedProjects.length" class="no-data heading-l" translate="project-listing.no-projects-match"></div>
+            <redaction-empty-state
+                *ngIf="appStateService.hasProjects && !displayedProjects.length"
+                screen="project-listing"
+                type="no-match"
+            ></redaction-empty-state>
 
             <cdk-virtual-scroll-viewport [itemSize]="85" redactionHasScrollbar>
                 <div
diff --git a/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.html b/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.html
index e0b80de48..8a5c1ccff 100644
--- a/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.html
+++ b/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.html
@@ -167,11 +167,11 @@
                 buttonIcon="red:upload"
             ></redaction-empty-state>
 
-            <div
+            <redaction-empty-state
                 *ngIf="appStateService.activeProject?.hasFiles && !displayedFiles.length"
-                class="no-data heading-l"
-                translate="project-overview.no-files-match"
-            ></div>
+                screen="project-overview"
+                type="no-match"
+            ></redaction-empty-state>
 
             <cdk-virtual-scroll-viewport [itemSize]="80" redactionHasScrollbar>
                 <div
diff --git a/apps/red-ui/src/app/modules/shared/components/empty-state/empty-state.component.html b/apps/red-ui/src/app/modules/shared/components/empty-state/empty-state.component.html
index abe0454a8..a8126d468 100644
--- a/apps/red-ui/src/app/modules/shared/components/empty-state/empty-state.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/empty-state/empty-state.component.html
@@ -1,6 +1,6 @@
 <div class="empty-state" [ngStyle]="{ 'padding-left': horizontalPadding + 'px', 'padding-right': horizontalPadding + 'px' }">
     <mat-icon [svgIcon]="icon"></mat-icon>
-    <div class="heading-l" [translate]="text || screen + '.no-data.title'"></div>
+    <div class="heading-l" [translate]="text || screen + '.' + type + '.title'"></div>
     <redaction-icon-button *ngIf="showButton" (action)="action.emit()" [icon]="buttonIcon" [text]="screen + '.no-data.action'" type="primary">
     </redaction-icon-button>
 </div>
diff --git a/apps/red-ui/src/app/modules/shared/components/empty-state/empty-state.component.ts b/apps/red-ui/src/app/modules/shared/components/empty-state/empty-state.component.ts
index b94baa062..5a1a0c9e5 100644
--- a/apps/red-ui/src/app/modules/shared/components/empty-state/empty-state.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/empty-state/empty-state.component.ts
@@ -12,6 +12,7 @@ export class EmptyStateComponent implements OnInit {
     @Input() showButton = true;
     @Input() buttonIcon = 'red:plus';
     @Input() horizontalPadding = 100;
+    @Input() type: 'no-data' | 'no-match' = 'no-data';
     @Output() action = new EventEmitter();
 
     constructor() {}
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index 36e4b62af..fb7999a45 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -169,7 +169,9 @@
             "action": "Delete Project",
             "delete-failed": "Failed to delete project: {{projectName}}"
         },
-        "no-projects-match": "No Projects match your current filters"
+        "no-match": {
+            "title": "No projects match your current filters."
+        }
     },
     "project-details": {
         "title": "Project Details",
@@ -194,6 +196,9 @@
             "title": "There are no documents yet.",
             "action": "Upload Document"
         },
+        "no-match": {
+            "title": "No documents match your current filters."
+        },
         "search": "Document name...",
         "header-actions": {
             "edit": "Edit",
@@ -209,7 +214,6 @@
         "approve": "Approve",
         "approve-disabled": "File can only be approved once it has been analysed with the latest dictionaries and all suggestions have been processed",
         "under-review": "Under Review",
-        "no-files-match": "No File match your current filters",
         "upload-files": "Drag & Drop files anywhere",
         "upload-files-btn": "Upload Files",
         "new-rule": {
@@ -731,6 +735,9 @@
         "no-data": {
             "title": "There are no dictionaries yet.",
             "action": "New Dictionary"
+        },
+        "no-match": {
+            "title": "No dictionaries match your current filters."
         }
     },
     "digital-signature": "Digital Signature",
@@ -755,6 +762,9 @@
         },
         "no-data": {
             "title": "There are no project templates yet."
+        },
+        "no-match": {
+            "title": "No project templates match your current filters."
         }
     },
     "file-attributes-listing": {
@@ -775,6 +785,9 @@
         "no-data": {
             "title": "There are no file attributes yet."
         },
+        "no-match": {
+            "title": "No file attributes match your current filters."
+        },
         "read-only": "Read-only",
         "action": {
             "edit": "Edit Attribute",
@@ -859,7 +872,10 @@
             "delete-disabled": "You cannot delete your own account."
         },
         "search": "Search...",
-        "add-new": "New User"
+        "add-new": "New User",
+        "no-match": {
+            "title": "No users match your current filters."
+        }
     },
     "add-edit-user": {
         "title": {
@@ -1083,7 +1099,9 @@
         "table-header": {
             "title": "{{length}} downloads"
         },
-        "no-data": "No active downloads.",
+        "no-data": {
+            "title": "No active downloads."
+        },
         "table-col-names": {
             "name": "Name",
             "size": "Size",