From d7b38b2a7871fbf9e4b8ad31d8afee8374928835 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Tue, 24 Jan 2023 08:24:37 +0100
Subject: [PATCH 1/4] Fixed issues with new badges

---
 ...min-search-result-list-element.component.html |  3 +--
 ...stable-object-component-loader.component.html |  8 --------
 ...listable-object-component-loader.component.ts | 16 +---------------
 ...listable-object-component-loader.component.ts |  3 +--
 4 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
index b34868f736..3bf756b9cd 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
@@ -2,6 +2,5 @@
                                      [viewMode]="viewModes.ListElement"
                                      [index]="index"
                                      [linkType]="linkType"
-                                     [listID]="listID"
-                                     [hideBadges]="true"></ds-themed-listable-object-component-loader>
+                                     [listID]="listID"></ds-themed-listable-object-component-loader>
 <ds-item-admin-search-result-actions-element [item]="dso" [small]="false"></ds-item-admin-search-result-actions-element>
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.html b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.html
index 9ed4e9eaa8..58561f0277 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.html
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.html
@@ -1,9 +1 @@
-<div [ngClass]="{'d-none' : hideBadges}" #badges>
-  <div *ngIf="privateBadge" class="private-badge">
-    <span class="badge badge-danger">{{ "item.badge.private" | translate }}</span>
-  </div>
-  <div *ngIf="withdrawnBadge" class="withdrawn-badge">
-    <span class="badge badge-warning">{{ "item.badge.withdrawn" | translate }}</span>
-  </div>
-</div>
 <ng-template dsListableObject></ng-template>
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
index 39183d7fc3..168c696034 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
@@ -74,22 +74,11 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges
    */
   @Input() value: string;
 
-  /**
-   * Whether or not informational badges (e.g. Private, Withdrawn) should be hidden
-   */
-  @Input() hideBadges = false;
-
   /**
    * Directive hook used to place the dynamic child component
    */
   @ViewChild(ListableObjectDirective, {static: true}) listableObjectDirective: ListableObjectDirective;
 
-  /**
-   * View on the badges template, to be passed on to the loaded component (which will place the badges in the desired
-   * location, or on top if not specified)
-   */
-  @ViewChild('badges', { static: true }) badges: ElementRef;
-
   /**
    * Emit when the listable object has been reloaded.
    */
@@ -160,10 +149,7 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges
     this.compRef = viewContainerRef.createComponent(
       componentFactory,
       0,
-      undefined,
-      [
-        [this.badges.nativeElement],
-      ]);
+      undefined);
 
     this.connectInputsAndOutputs();
 
diff --git a/src/app/shared/object-collection/shared/listable-object/themed-listable-object-component-loader.component.ts b/src/app/shared/object-collection/shared/listable-object/themed-listable-object-component-loader.component.ts
index 44836fe2fc..33f8df7030 100644
--- a/src/app/shared/object-collection/shared/listable-object/themed-listable-object-component-loader.component.ts
+++ b/src/app/shared/object-collection/shared/listable-object/themed-listable-object-component-loader.component.ts
@@ -16,7 +16,7 @@ import { CollectionElementLinkType } from '../../collection-element-link.type';
 })
 export class ThemedListableObjectComponentLoaderComponent extends ThemedComponent<ListableObjectComponentLoaderComponent> {
   protected inAndOutputNames: (keyof ListableObjectComponentLoaderComponent & keyof this)[] = [
-    'object', 'index', 'viewMode', 'context', 'linkType', 'listID', 'linkType', 'showLabel', 'value', 'hideBadges', 'contentChange'];
+    'object', 'index', 'viewMode', 'context', 'linkType', 'listID', 'linkType', 'showLabel', 'value', 'contentChange'];
 
   @Input() object: ListableObject;
   @Input() index: number;
@@ -26,7 +26,6 @@ export class ThemedListableObjectComponentLoaderComponent extends ThemedComponen
   @Input() listID: string;
   @Input() showLabel = true;
   @Input() value: string;
-  @Input() hideBadges = false;
   @Output() contentChange = new EventEmitter<ListableObject>();
 
   protected getComponentName(): string {

From 1f2897664a18a741fac1cd1a88c345e73bba0d7e Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Tue, 24 Jan 2023 09:30:45 +0100
Subject: [PATCH 2/4] Fixing tests

---
 ...arch-result-grid-element.component.spec.ts |  5 +-
 ...top-level-community-list.component.spec.ts |  3 +-
 ...-object-component-loader.component.spec.ts | 58 -------------
 .../object-list/badges/badges.component.html  |  8 +-
 .../status-badge/status-badge.component.html  |  8 +-
 .../status-badge.component.spec.ts            | 87 +++++++++++--------
 .../type-badge/type-badge.component.html      |  4 +-
 .../item-list-preview.component.spec.ts       |  4 +-
 .../search-form/search-form.component.spec.ts | 32 ++++---
 9 files changed, 84 insertions(+), 125 deletions(-)

diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
index 2cb0413bbc..9a28fd745f 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
@@ -14,6 +14,8 @@ import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths';
 import { LinkService } from '../../../../../core/cache/builders/link.service';
+import { ThemeService } from '../../../../../shared/theme-support/theme.service';
+import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock';
 
 describe('CollectionAdminSearchResultGridElementComponent', () => {
   let component: CollectionAdminSearchResultGridElementComponent;
@@ -45,7 +47,8 @@ describe('CollectionAdminSearchResultGridElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: mockTruncatableService },
         { provide: BitstreamDataService, useValue: {} },
-        { provide: LinkService, useValue: linkService }
+        { provide: LinkService, useValue: linkService },
+        { provide: ThemeService, useValue: getMockThemeService() },
       ]
     })
       .compileComponents();
diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts b/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts
index 00408e4696..c9e8f37ee9 100644
--- a/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts
+++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts
@@ -26,7 +26,7 @@ import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
 import { ThemeService } from '../../shared/theme-support/theme.service';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 
-describe('TopLevelCommunityList Component', () => {
+fdescribe('TopLevelCommunityList Component', () => {
   let comp: TopLevelCommunityListComponent;
   let fixture: ComponentFixture<TopLevelCommunityListComponent>;
   let communityDataServiceStub: any;
@@ -131,7 +131,6 @@ describe('TopLevelCommunityList Component', () => {
         { provide: SelectableListService, useValue: {} },
         { provide: ThemeService, useValue: themeService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
index edf0b3ea7c..4a63a256b6 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
@@ -72,64 +72,6 @@ describe('ListableObjectComponentLoaderComponent', () => {
     });
   });
 
-  describe('when the object is an item and viewMode is a list', () => {
-    beforeEach(() => {
-      comp.object = Object.assign(new Item());
-      comp.viewMode = ViewMode.ListElement;
-    });
-
-    describe('when the item is not withdrawn', () => {
-      beforeEach(() => {
-        (comp.object as any).isWithdrawn = false;
-        comp.initBadges();
-        fixture.detectChanges();
-      });
-
-      it('should not show the withdrawn badge', () => {
-        const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
-        expect(badge).toBeNull();
-      });
-    });
-
-    describe('when the item is withdrawn', () => {
-      beforeEach(() => {
-        (comp.object as any).isWithdrawn = true;
-        comp.initBadges();
-        fixture.detectChanges();
-      });
-
-      it('should show the withdrawn badge', () => {
-        const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
-        expect(badge).not.toBeNull();
-      });
-    });
-
-    describe('when the item is not private', () => {
-      beforeEach(() => {
-        (comp.object as any).isDiscoverable = true;
-        comp.initBadges();
-        fixture.detectChanges();
-      });
-      it('should not show the private badge', () => {
-        const badge = fixture.debugElement.query(By.css('div.private-badge'));
-        expect(badge).toBeNull();
-      });
-    });
-
-    describe('when the item is private', () => {
-      beforeEach(() => {
-        (comp.object as any).isDiscoverable = false;
-        comp.initBadges();
-        fixture.detectChanges();
-      });
-
-      it('should show the private badge', () => {
-        const badge = fixture.debugElement.query(By.css('div.private-badge'));
-        expect(badge).not.toBeNull();
-      });
-    });
-  });
-
   describe('When a reloadedObject is emitted', () => {
     let listableComponent;
     let reloadedObject: any;
diff --git a/src/app/shared/object-list/badges/badges.component.html b/src/app/shared/object-list/badges/badges.component.html
index 2a5704970c..1e59ca3660 100644
--- a/src/app/shared/object-list/badges/badges.component.html
+++ b/src/app/shared/object-list/badges/badges.component.html
@@ -1,6 +1,2 @@
-<div>
-    <ds-themed-status-badge [object]="object"></ds-themed-status-badge>
-</div>
-<div>
-    <ds-themed-type-badge [object]="object"></ds-themed-type-badge>
-</div>
+<ds-themed-status-badge [object]="object"></ds-themed-status-badge>
+<ds-themed-type-badge [object]="object"></ds-themed-type-badge>
diff --git a/src/app/shared/object-list/badges/status-badge/status-badge.component.html b/src/app/shared/object-list/badges/status-badge/status-badge.component.html
index 1f28aedf34..c864f22afa 100644
--- a/src/app/shared/object-list/badges/status-badge/status-badge.component.html
+++ b/src/app/shared/object-list/badges/status-badge/status-badge.component.html
@@ -1,6 +1,6 @@
-<span *ngIf="privateBadge" class="private-badge">
+<div *ngIf="privateBadge" class="private-badge">
     <span class="badge badge-danger">{{ "item.badge.private" | translate }}</span>
-</span>
-<span *ngIf="withdrawnBadge" class="withdrawn-badge">
+</div>
+<div *ngIf="withdrawnBadge" class="withdrawn-badge">
     <span class="badge badge-warning">{{ "item.badge.withdrawn" | translate }}</span>
-</span>
+</div>
diff --git a/src/app/shared/object-list/badges/status-badge/status-badge.component.spec.ts b/src/app/shared/object-list/badges/status-badge/status-badge.component.spec.ts
index 09bc7ea585..4cfa0e2341 100644
--- a/src/app/shared/object-list/badges/status-badge/status-badge.component.spec.ts
+++ b/src/app/shared/object-list/badges/status-badge/status-badge.component.spec.ts
@@ -6,37 +6,17 @@ import { TruncatePipe } from '../../../utils/truncate.pipe';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { StatusBadgeComponent } from './status-badge.component';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
 
 let comp: StatusBadgeComponent;
 let fixture: ComponentFixture<StatusBadgeComponent>;
 
-const type = 'authorOfPublication';
+let withdrawnItem = Object.assign(new Item(), { isWithdrawn: true });
+let notWithdrawnItem = Object.assign(new Item(), { isWithdrawn: false });
+let privateItem = Object.assign(new Item(), { isDiscoverable: false });
+let notPrivateItem = Object.assign(new Item(), { isDiscoverable: true });
 
-const mockItemWithEntityType = Object.assign(new Item(), {
-  bundles: observableOf({}),
-  metadata: {
-    'dspace.entity.type': [
-      {
-        language: 'en_US',
-        value: type
-      }
-    ]
-  }
-});
-
-const mockItemWithoutEntityType = Object.assign(new Item(), {
-  bundles: observableOf({}),
-  metadata: {
-    'dc.title': [
-      {
-        language: 'en_US',
-        value: 'This is just another title'
-      }
-    ]
-  }
-});
-
-describe('ItemTypeBadgeComponent', () => {
+describe('ItemStatusBadgeComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
@@ -45,34 +25,69 @@ describe('ItemTypeBadgeComponent', () => {
     }).overrideComponent(StatusBadgeComponent, {
       set: { changeDetection: ChangeDetectionStrategy.Default }
     }).compileComponents();
+    init();
   }));
 
+  function init() {
+    withdrawnItem = Object.assign(new Item(), { isWithdrawn: true });
+    notWithdrawnItem = Object.assign(new Item(), { isWithdrawn: false });
+    privateItem = Object.assign(new Item(), { isDiscoverable: false });
+    notPrivateItem = Object.assign(new Item(), { isDiscoverable: true });
+  }
   beforeEach(waitForAsync(() => {
     fixture = TestBed.createComponent(StatusBadgeComponent);
     comp = fixture.componentInstance;
   }));
 
-  describe('When the item has an entity type', () => {
+
+  describe('when the item is not withdrawn', () => {
     beforeEach(() => {
-      comp.object = mockItemWithEntityType;
+      comp.object = notWithdrawnItem;
+      comp.ngOnInit();
       fixture.detectChanges();
     });
 
-    it('should show the entity type badge', () => {
-      const badge = fixture.debugElement.query(By.css('span.badge'));
-      expect(badge.nativeElement.textContent).toContain(type.toLowerCase());
+    it('should not show the withdrawn badge', () => {
+      const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
+      expect(badge).toBeNull();
     });
   });
 
-  describe('When the item has no entity type', () => {
+  describe('when the item is withdrawn', () => {
     beforeEach(() => {
-      comp.object = mockItemWithoutEntityType;
+      comp.object = withdrawnItem;
+      comp.ngOnInit();
       fixture.detectChanges();
     });
 
-    it('should show an item badge', () => {
-      const badge = fixture.debugElement.query(By.css('span.badge'));
-      expect(badge.nativeElement.textContent).toContain('item');
+    it('should show the withdrawn badge', () => {
+      const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
+      expect(badge).not.toBeNull();
+    });
+  });
+
+  describe('when the item is not private', () => {
+    beforeEach(() => {
+      comp.object = notPrivateItem;
+      comp.ngOnInit();
+      fixture.detectChanges();
+    });
+    it('should not show the private badge', () => {
+      const badge = fixture.debugElement.query(By.css('div.private-badge'));
+      expect(badge).toBeNull();
+    });
+  });
+
+  describe('when the item is private', () => {
+    beforeEach(() => {
+      comp.object = privateItem;
+      comp.ngOnInit();
+      fixture.detectChanges();
+    });
+
+    it('should show the private badge', () => {
+      const badge = fixture.debugElement.query(By.css('div.private-badge'));
+      expect(badge).not.toBeNull();
     });
   });
 });
diff --git a/src/app/shared/object-list/badges/type-badge/type-badge.component.html b/src/app/shared/object-list/badges/type-badge/type-badge.component.html
index 119702c375..0c2bd7544e 100644
--- a/src/app/shared/object-list/badges/type-badge/type-badge.component.html
+++ b/src/app/shared/object-list/badges/type-badge/type-badge.component.html
@@ -1,3 +1,3 @@
-<span *ngIf="typeMessage">
+<div *ngIf="typeMessage">
   <span class="badge badge-info">{{ typeMessage | translate }}</span>
-</span>
+</div>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
index 023b51a8dd..65147f17d4 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
@@ -154,8 +154,8 @@ describe('ItemListPreviewComponent', () => {
       fixture.detectChanges();
     });
 
-    it('should show the entity type span', () => {
-      const entityField = fixture.debugElement.query(By.css('ds-type-badge'));
+    it('should show the badges', () => {
+      const entityField = fixture.debugElement.query(By.css('ds-themed-badges'));
       expect(entityField).not.toBeNull();
     });
   });
diff --git a/src/app/shared/search-form/search-form.component.spec.ts b/src/app/shared/search-form/search-form.component.spec.ts
index 20c9435eb4..f1c05d47df 100644
--- a/src/app/shared/search-form/search-form.component.spec.ts
+++ b/src/app/shared/search-form/search-form.component.spec.ts
@@ -36,7 +36,9 @@ describe('SearchFormComponent', () => {
         { provide: SearchConfigurationService, useValue: searchConfigService },
         { provide: DSpaceObjectDataService, useValue: { findById: () => createSuccessfulRemoteDataObject$(undefined)} }
       ],
-      declarations: [SearchFormComponent]
+      declarations: [
+        SearchFormComponent,
+      ]
     }).compileComponents();
   }));
 
@@ -47,21 +49,23 @@ describe('SearchFormComponent', () => {
     el = de.nativeElement;
   });
 
-  it('should not display scopes when empty', () => {
-    fixture.detectChanges();
-    const select = de.query(By.css('select'));
-    expect(select).toBeNull();
-  });
-
-  it('should not display scopes when scopeSelectable is false', () => {
-    comp.scopeSelectable = false;
-    comp.scopes = objects;
-    comp.scope = objects[1].id;
+  it('should not display scopes when showScopeSelector is false', fakeAsync(() => {
+    comp.showScopeSelector = false;
 
     fixture.detectChanges();
-    const select = de.query(By.css('select'));
-    expect(select).toBeNull();
-  });
+    tick();
+
+    expect(de.query(By.css('.scope-button'))).toBeFalsy();
+  }));
+
+  it('should display scopes when showScopeSelector is true', fakeAsync(() => {
+    comp.showScopeSelector = true;
+
+    fixture.detectChanges();
+    tick();
+
+    expect(de.query(By.css('.scope-button'))).toBeTruthy();
+  }));
 
   it('should display set query value in input field', fakeAsync(() => {
     const testString = 'This is a test query';

From 906c26bbe4d816a9e34a77a238c8ef8fee524b0d Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Tue, 24 Jan 2023 09:51:33 +0100
Subject: [PATCH 3/4] Revert "Made ListableObjectComponentLoaderComponent
 themeable"

This reverts commit a4679ca7
---
 ...-search-result-list-element.component.html |  4 +-
 ...admin-workflow-list-element.component.html |  4 +-
 .../item-delete/item-delete.component.html    |  8 ++--
 .../edit-relationship.component.html          |  4 +-
 .../virtual-metadata.component.html           |  4 +-
 .../item-page/simple/item-page.component.html |  2 +-
 .../related-items.component.html              |  4 +-
 .../related-items.component.spec.ts           |  2 +-
 .../shared/browse-by/browse-by.component.html |  2 +-
 .../dso-selector/dso-selector.component.html  |  4 +-
 ...sting-relation-list-element.component.html |  2 +-
 .../dso-input-suggestions.component.html      |  2 +-
 ...table-object-component-loader.component.ts | 42 -------------------
 .../object-detail.component.html              |  2 +-
 .../object-grid/object-grid.component.html    |  2 +-
 .../item-metadata-list-element.component.html |  2 +-
 ...em-metadata-list-element.component.spec.ts |  2 +-
 .../object-list/object-list.component.html    |  4 +-
 src/app/shared/shared.module.ts               |  2 -
 ...ble-object-component-loader.component.html |  0
 ...ble-object-component-loader.component.scss |  0
 ...table-object-component-loader.component.ts | 13 ------
 src/themes/custom/theme.module.ts             |  2 -
 23 files changed, 27 insertions(+), 86 deletions(-)
 delete mode 100644 src/app/shared/object-collection/shared/listable-object/themed-listable-object-component-loader.component.ts
 delete mode 100644 src/themes/custom/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.html
 delete mode 100644 src/themes/custom/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.scss
 delete mode 100644 src/themes/custom/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts

diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
index 3bf756b9cd..991508335f 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
@@ -1,6 +1,6 @@
-<ds-themed-listable-object-component-loader [object]="object"
+<ds-listable-object-component-loader [object]="object"
                                      [viewMode]="viewModes.ListElement"
                                      [index]="index"
                                      [linkType]="linkType"
-                                     [listID]="listID"></ds-themed-listable-object-component-loader>
+                                     [listID]="listID"></ds-listable-object-component-loader>
 <ds-item-admin-search-result-actions-element [item]="dso" [small]="false"></ds-item-admin-search-result-actions-element>
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html
index 909882361a..192cc751f2 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html
@@ -1,10 +1,10 @@
 <div class="workflow-badge">
     <span class="badge badge-info">{{ "admin.workflow.item.workflow" | translate }}</span>
 </div>
-<ds-themed-listable-object-component-loader *ngIf="item$ | async"
+<ds-listable-object-component-loader *ngIf="item$ | async"
                                      [object]="item$ | async"
                                      [viewMode]="viewModes.ListElement"
                                      [index]="index"
                                      [linkType]="linkType"
-                                     [listID]="listID"></ds-themed-listable-object-component-loader>
+                                     [listID]="listID"></ds-listable-object-component-loader>
 <ds-workflow-item-admin-workflow-actions-element [wfi]="dso" [small]="false"></ds-workflow-item-admin-workflow-actions-element>
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
index fb8acb61f3..df50e13b48 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
@@ -31,11 +31,11 @@
                                      class="d-flex flex-row">
                                     <ng-container *ngVar="(getRelatedItem(relationship) | async) as relatedItem">
 
-                                        <ds-themed-listable-object-component-loader
+                                        <ds-listable-object-component-loader
                                                 *ngIf="relatedItem"
                                                 [object]="relatedItem"
                                                 [viewMode]="viewMode">
-                                        </ds-themed-listable-object-component-loader>
+                                        </ds-listable-object-component-loader>
                                         <div class="ml-auto">
                                             <div class="btn-group">
                                                 <button class="btn btn-outline-info btn-sm"
@@ -55,11 +55,11 @@
                                                     </button>
                                                 </div>
                                                 <div class="modal-body">
-                                                    <ds-themed-listable-object-component-loader
+                                                    <ds-listable-object-component-loader
                                                             *ngIf="relatedItem"
                                                             [object]="relatedItem"
                                                             [viewMode]="viewMode">
-                                                    </ds-themed-listable-object-component-loader>
+                                                    </ds-listable-object-component-loader>
                                                     <div *ngFor="let metadata of (getVirtualMetadata(relationship) | async)">
                                                         <div>
                                                             <div class="font-weight-bold">
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
index ec9d96a6de..e65cd237a3 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
@@ -1,11 +1,11 @@
 <div class="row" *ngIf="relatedItem$ | async">
   <div class="col-10 relationship">
-    <ds-themed-listable-object-component-loader
+    <ds-listable-object-component-loader
       [object]="relatedItem$ | async"
       [viewMode]="viewMode"
       [value]="nameVariant"
     >
-    </ds-themed-listable-object-component-loader>
+    </ds-listable-object-component-loader>
   </div>
   <div class="col-2">
     <div class="btn-group relationship-action-buttons">
diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
index 0ebd111461..c103d83c71 100644
--- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
+++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
@@ -15,8 +15,8 @@
                     </label>
                 </div>
                 <div class="flex-column">
-                    <ds-themed-listable-object-component-loader [object]="item">
-                    </ds-themed-listable-object-component-loader>
+                    <ds-listable-object-component-loader [object]="item">
+                    </ds-listable-object-component-loader>
                     <div *ngFor="let metadata of virtualMetadata.get(item.uuid)">
                         <div class="font-weight-bold">
                             {{metadata.metadataField}}
diff --git a/src/app/item-page/simple/item-page.component.html b/src/app/item-page/simple/item-page.component.html
index 95dfbb6b94..74b61fd976 100644
--- a/src/app/item-page/simple/item-page.component.html
+++ b/src/app/item-page/simple/item-page.component.html
@@ -4,7 +4,7 @@
       <ds-item-alerts [item]="item"></ds-item-alerts>
       <ds-item-versions-notice [item]="item"></ds-item-versions-notice>
       <ds-view-tracker [object]="item"></ds-view-tracker>
-      <ds-themed-listable-object-component-loader [object]="item" [viewMode]="viewMode"></ds-themed-listable-object-component-loader>
+      <ds-listable-object-component-loader [object]="item" [viewMode]="viewMode"></ds-listable-object-component-loader>
       <ds-item-versions class="mt-2" [item]="item" [displayActions]="false"></ds-item-versions>
     </div>
   </div>
diff --git a/src/app/item-page/simple/related-items/related-items.component.html b/src/app/item-page/simple/related-items/related-items.component.html
index 4be82d8f4b..11cedc4040 100644
--- a/src/app/item-page/simple/related-items/related-items.component.html
+++ b/src/app/item-page/simple/related-items/related-items.component.html
@@ -1,9 +1,9 @@
 <ds-metadata-field-wrapper [label]="label">
   <ng-container *ngFor="let objectPage of objects; let i = index">
     <ng-container *ngVar="(objectPage | async) as itemsRD">
-      <ds-themed-listable-object-component-loader *ngFor="let item of itemsRD?.payload?.page"
+      <ds-listable-object-component-loader *ngFor="let item of itemsRD?.payload?.page"
                                            [object]="item" [viewMode]="viewMode">
-      </ds-themed-listable-object-component-loader>
+      </ds-listable-object-component-loader>
       <ds-loading *ngIf="(i + 1) === objects.length && (itemsRD || i > 0) && !(itemsRD?.hasSucceeded && itemsRD?.payload && itemsRD?.payload?.page?.length > 0)" message="{{'loading.default' | translate}}"></ds-loading>
       <div class="d-inline-block w-100 mt-2" *ngIf="(i + 1) === objects.length && itemsRD?.payload?.page?.length > 0">
         <div *ngIf="itemsRD?.payload?.totalPages > objects.length" class="float-left" id="view-more">
diff --git a/src/app/item-page/simple/related-items/related-items.component.spec.ts b/src/app/item-page/simple/related-items/related-items.component.spec.ts
index b84d1fce76..751acb316a 100644
--- a/src/app/item-page/simple/related-items/related-items.component.spec.ts
+++ b/src/app/item-page/simple/related-items/related-items.component.spec.ts
@@ -62,7 +62,7 @@ describe('RelatedItemsComponent', () => {
   }));
 
   it(`should load ${mockItems.length} item-type-switcher components`, () => {
-    const fields = fixture.debugElement.queryAll(By.css('ds-themed-listable-object-component-loader'));
+    const fields = fixture.debugElement.queryAll(By.css('ds-listable-object-component-loader'));
     expect(fields.length).toBe(mockItems.length);
   });
 
diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
index 324cacbeff..6d1422293d 100644
--- a/src/app/shared/browse-by/browse-by.component.html
+++ b/src/app/shared/browse-by/browse-by.component.html
@@ -25,7 +25,7 @@
       </div>
       <ul class="list-unstyled">
         <li *ngFor="let object of objects?.payload?.page" class="mt-4 mb-4">
-          <ds-themed-listable-object-component-loader [object]="object" [viewMode]="viewMode"></ds-themed-listable-object-component-loader>
+          <ds-listable-object-component-loader [object]="object" [viewMode]="viewMode"></ds-listable-object-component-loader>
         </li>
       </ul>
       <div>
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
index 29c6d5ef61..198da8d3ed 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
@@ -25,8 +25,8 @@
               title="{{ getName(listEntry) }}"
               dsHoverClass="ds-hover"
               (click)="onSelect.emit(listEntry.indexableObject)" #listEntryElement>
-        <ds-themed-listable-object-component-loader [object]="listEntry" [viewMode]="viewMode"
-                                             [linkType]=linkTypes.None [context]="getContext(listEntry.indexableObject.id)"></ds-themed-listable-object-component-loader>
+        <ds-listable-object-component-loader [object]="listEntry" [viewMode]="viewMode"
+                                             [linkType]=linkTypes.None [context]="getContext(listEntry.indexableObject.id)"></ds-listable-object-component-loader>
       </button>
     </ng-container>
     <button *ngIf="loading"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
index 07e72544ca..15087d2553 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
@@ -4,7 +4,7 @@
             <ds-loading [showMessage]="false"></ds-loading>
         </ng-container>
         <ng-container *ngIf="(relatedItem$ | async)">
-            <ds-themed-listable-object-component-loader [showLabel]="false" [viewMode]="viewType" [object]="(relatedItem$ | async)"></ds-themed-listable-object-component-loader>
+            <ds-listable-object-component-loader [showLabel]="false" [viewMode]="viewType" [object]="(relatedItem$ | async)"></ds-listable-object-component-loader>
         </ng-container>
     </span>
     <button type="button" class="btn btn-secondary"
diff --git a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html
index e106bc1395..7515b830b9 100644
--- a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html
@@ -14,7 +14,7 @@
         <div class="dropdown-list">
             <div *ngFor="let suggestionOption of suggestions">
                 <button class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption)" #suggestion>
-                    <ds-themed-listable-object-component-loader [object]="suggestionOption" [viewMode]="viewMode" [linkType]="linkTypes.None"></ds-themed-listable-object-component-loader>
+                    <ds-listable-object-component-loader [object]="suggestionOption" [viewMode]="viewMode" [linkType]="linkTypes.None"></ds-listable-object-component-loader>
                 </button>
             </div>
         </div>
diff --git a/src/app/shared/object-collection/shared/listable-object/themed-listable-object-component-loader.component.ts b/src/app/shared/object-collection/shared/listable-object/themed-listable-object-component-loader.component.ts
deleted file mode 100644
index 33f8df7030..0000000000
--- a/src/app/shared/object-collection/shared/listable-object/themed-listable-object-component-loader.component.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core';
-import { ListableObjectComponentLoaderComponent } from './listable-object-component-loader.component';
-import { ThemedComponent } from '../../../theme-support/themed.component';
-import { ListableObject } from '../listable-object.model';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { Context } from '../../../../core/shared/context.model';
-import { CollectionElementLinkType } from '../../collection-element-link.type';
-
-/**
- * Themed wrapper for ListableObjectComponentLoaderComponent
- */
-@Component({
-  selector: 'ds-themed-listable-object-component-loader',
-  styleUrls: [],
-  templateUrl: '../../../theme-support/themed.component.html',
-})
-export class ThemedListableObjectComponentLoaderComponent extends ThemedComponent<ListableObjectComponentLoaderComponent> {
-  protected inAndOutputNames: (keyof ListableObjectComponentLoaderComponent & keyof this)[] = [
-    'object', 'index', 'viewMode', 'context', 'linkType', 'listID', 'linkType', 'showLabel', 'value', 'contentChange'];
-
-  @Input() object: ListableObject;
-  @Input() index: number;
-  @Input() viewMode: ViewMode;
-  @Input() context: Context;
-  @Input() linkType: CollectionElementLinkType;
-  @Input() listID: string;
-  @Input() showLabel = true;
-  @Input() value: string;
-  @Output() contentChange = new EventEmitter<ListableObject>();
-
-  protected getComponentName(): string {
-    return 'ListableObjectComponentLoaderComponent';
-  }
-
-  protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../../../themes/${themeName}/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component`);
-  }
-
-  protected importUnthemedComponent(): Promise<any> {
-    return import('./listable-object-component-loader.component');
-  }
-}
diff --git a/src/app/shared/object-detail/object-detail.component.html b/src/app/shared/object-detail/object-detail.component.html
index 11a6ac62c8..7fef7d9689 100644
--- a/src/app/shared/object-detail/object-detail.component.html
+++ b/src/app/shared/object-detail/object-detail.component.html
@@ -14,7 +14,7 @@
     <div class="row mt-2" *ngIf="objects?.hasSucceeded" @fadeIn>
       <div class="col"
            *ngFor="let object of objects?.payload?.page">
-        <ds-themed-listable-object-component-loader [object]="object" [viewMode]="viewMode" [context]="context"></ds-themed-listable-object-component-loader>
+        <ds-listable-object-component-loader [object]="object" [viewMode]="viewMode" [context]="context"></ds-listable-object-component-loader>
       </div>
     </div>
   <ds-error *ngIf="objects.hasFailed" message="{{'error.objects' | translate}}"></ds-error>
diff --git a/src/app/shared/object-grid/object-grid.component.html b/src/app/shared/object-grid/object-grid.component.html
index 86615be896..0afd623d86 100644
--- a/src/app/shared/object-grid/object-grid.component.html
+++ b/src/app/shared/object-grid/object-grid.component.html
@@ -14,7 +14,7 @@
     <div class="card-columns row" *ngIf="objects?.hasSucceeded">
       <div class="card-column col col-sm-6 col-lg-4" *ngFor="let column of (columns$ | async)" @fadeIn>
         <div class="card-element" *ngFor="let object of column">
-          <ds-themed-listable-object-component-loader [object]="object" [viewMode]="viewMode" [context]="context" [linkType]="linkType"></ds-themed-listable-object-component-loader>
+          <ds-listable-object-component-loader [object]="object" [viewMode]="viewMode" [context]="context" [linkType]="linkType"></ds-listable-object-component-loader>
         </div>
       </div>
     </div>
diff --git a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.html b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.html
index 8ed6dc0e0a..91219c7189 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.html
+++ b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.html
@@ -1 +1 @@
-<ds-themed-listable-object-component-loader [object]="metadataRepresentation" [viewMode]="viewMode"></ds-themed-listable-object-component-loader>
+<ds-listable-object-component-loader [object]="metadataRepresentation" [viewMode]="viewMode"></ds-listable-object-component-loader>
diff --git a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.spec.ts b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.spec.ts
index 3b84a539f4..6e48ba3a6f 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.spec.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.spec.ts
@@ -28,7 +28,7 @@ describe('ItemMetadataListElementComponent', () => {
   }));
 
   it('should call a listable-object-component-loader component and pass the item-metadata-representation', () => {
-    const objectLoader = fixture.debugElement.query(By.css('ds-themed-listable-object-component-loader')).nativeElement;
+    const objectLoader = fixture.debugElement.query(By.css('ds-listable-object-component-loader')).nativeElement;
     expect(objectLoader.object).toBe(mockItemMetadataRepresentation);
   });
 
diff --git a/src/app/shared/object-list/object-list.component.html b/src/app/shared/object-list/object-list.component.html
index bf17717b9d..331ff1cb28 100644
--- a/src/app/shared/object-list/object-list.component.html
+++ b/src/app/shared/object-list/object-list.component.html
@@ -21,10 +21,10 @@
           <ds-importable-list-item-control *ngIf="importable" [object]="object"
                                            [importConfig]="importConfig"
                                            (importObject)="importObject.emit($event)"></ds-importable-list-item-control>
-          <ds-themed-listable-object-component-loader [object]="object" [viewMode]="viewMode" [index]="i" [context]="context" [linkType]="linkType"
+          <ds-listable-object-component-loader [object]="object" [viewMode]="viewMode" [index]="i" [context]="context" [linkType]="linkType"
                                                [listID]="selectionConfig?.listId"
                                                (contentChange)="contentChange.emit()"
-          ></ds-themed-listable-object-component-loader>
+          ></ds-listable-object-component-loader>
         </li>
     </ul>
 </ds-pagination>
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 20b6981f88..bc20d02f02 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -173,7 +173,6 @@ import { BitstreamRequestACopyPageComponent } from './bitstream-request-a-copy-p
 import { DsSelectComponent } from './ds-select/ds-select.component';
 import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component';
 import { ThemedItemListPreviewComponent } from './object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component';
-import { ThemedListableObjectComponentLoaderComponent } from './object-collection/shared/listable-object/themed-listable-object-component-loader.component';
 import { StatusBadgeComponent } from './object-list/badges/status-badge/status-badge.component';
 import { BadgesComponent } from './object-list/badges/badges.component';
 import { ThemedBadgesComponent } from './object-list/badges/themed-badges.component';
@@ -292,7 +291,6 @@ const COMPONENTS = [
   CommunitySearchResultGridElementComponent,
   PageSizeSelectorComponent,
   ListableObjectComponentLoaderComponent,
-  ThemedListableObjectComponentLoaderComponent,
   CollectionListElementComponent,
   CommunityListElementComponent,
   CollectionGridElementComponent,
diff --git a/src/themes/custom/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.html b/src/themes/custom/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.html
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/themes/custom/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.scss b/src/themes/custom/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/themes/custom/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts b/src/themes/custom/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
deleted file mode 100644
index 49d79a7cbd..0000000000
--- a/src/themes/custom/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Component } from '@angular/core';
-import { ListableObjectComponentLoaderComponent as BaseComponent } from 'src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component';
-
-@Component({
-  selector: 'ds-listable-object-component-loader',
-  // styleUrls: ['./listable-object-component-loader.component.scss'],
-  styleUrls: ['../../../../../../../app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.scss'],
-  // templateUrl: './listable-object-component-loader.component.html'
-  templateUrl: '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.html'
-})
-
-export class ListableObjectComponentLoaderComponent extends BaseComponent {
-}
diff --git a/src/themes/custom/theme.module.ts b/src/themes/custom/theme.module.ts
index 9da48db722..4c4829e132 100644
--- a/src/themes/custom/theme.module.ts
+++ b/src/themes/custom/theme.module.ts
@@ -86,7 +86,6 @@ import { ComcolModule } from '../../app/shared/comcol/comcol.module';
 import { FeedbackComponent } from './app/info/feedback/feedback.component';
 import { SearchFiltersComponent } from './app/shared/search/search-filters/search-filters.component';
 import { SearchSidebarComponent } from './app/shared/search/search-sidebar/search-sidebar.component';
-import { ListableObjectComponentLoaderComponent } from './app/shared/object-collection/shared/listable-object/listable-object-component-loader.component';
 import { BadgesComponent } from './app/shared/object-list/badges/badges.component';
 import { StatusBadgeComponent } from './app/shared/object-list/badges/status-badge/status-badge.component';
 import { TypeBadgeComponent } from './app/shared/object-list/badges/type-badge/type-badge.component';
@@ -135,7 +134,6 @@ const DECLARATIONS = [
   FeedbackComponent,
   SearchFiltersComponent,
   SearchSidebarComponent,
-  ListableObjectComponentLoaderComponent,
   BadgesComponent,
   StatusBadgeComponent,
   TypeBadgeComponent,

From a475fa10bee74628f5431d31d0ec52cdc86732d9 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Tue, 24 Jan 2023 13:28:02 +0100
Subject: [PATCH 4/4] Fixed more tests and imports

---
 ...arch-result-grid-element.component.spec.ts |  5 +++-
 ...top-level-community-list.component.spec.ts |  6 ++--
 .../browse-by/browse-by.component.spec.ts     |  1 +
 .../shared/badges/badges.component.html       |  5 ++++
 .../shared}/badges/badges.component.scss      |  0
 .../shared}/badges/badges.component.spec.ts   |  7 ++++-
 .../shared}/badges/badges.component.ts        |  4 ++-
 .../my-dspace-item-status-type.ts             |  0
 .../my-dspace-status-badge.component.html}    |  0
 .../my-dspace-status-badge.component.scss}    |  0
 .../my-dspace-status-badge.component.spec.ts} | 22 +++++++-------
 .../my-dspace-status-badge.component.ts}      |  8 ++---
 ...themed-my-dspace-status-badge.component.ts | 30 +++++++++++++++++++
 .../status-badge/status-badge.component.html  |  0
 .../status-badge.component.spec.ts            |  6 ++--
 .../status-badge/status-badge.component.ts    |  4 +--
 .../themed-status-badge.component.ts          |  9 +++---
 .../shared}/badges/themed-badges.component.ts | 14 ++++-----
 .../type-badge/themed-type-badge.component.ts |  9 +++---
 .../type-badge/type-badge.component.html      |  0
 .../type-badge/type-badge.component.spec.ts   |  4 +--
 .../badges/type-badge/type-badge.component.ts |  6 ++--
 ...ch-result-detail-element.component.spec.ts |  2 +-
 ...-search-result-detail-element.component.ts |  2 +-
 .../item-detail-preview.component.html        |  4 +--
 .../item-detail-preview.component.ts          |  2 +-
 ...ch-result-detail-element.component.spec.ts |  2 +-
 ...-search-result-detail-element.component.ts |  2 +-
 ...ch-result-detail-element.component.spec.ts |  2 +-
 ...-search-result-detail-element.component.ts |  2 +-
 ...ch-result-detail-element.component.spec.ts |  2 +-
 ...-search-result-detail-element.component.ts |  2 +-
 ...ch-result-detail-element.component.spec.ts |  2 +-
 ...-search-result-detail-element.component.ts |  2 +-
 .../object-list/badges/badges.component.html  |  2 --
 ...arch-result-list-element.component.spec.ts |  2 +-
 ...ed-search-result-list-element.component.ts |  2 +-
 ...arch-result-list-element.component.spec.ts |  2 +-
 ...ed-search-result-list-element.component.ts |  2 +-
 ...arch-result-list-element.component.spec.ts |  2 +-
 ...ed-search-result-list-element.component.ts |  2 +-
 .../item-list-preview.component.html          |  5 +---
 .../item-list-preview.component.ts            |  2 +-
 .../themed-item-list-preview.component.ts     |  2 +-
 ...-list-element-submission.component.spec.ts |  2 +-
 ...esult-list-element-submission.component.ts |  2 +-
 ...arch-result-list-element.component.spec.ts |  2 +-
 ...ol-search-result-list-element.component.ts |  2 +-
 ...arch-result-list-element.component.spec.ts |  2 +-
 ...em-search-result-list-element.component.ts |  2 +-
 ...arch-result-list-element.component.spec.ts |  2 +-
 ...em-search-result-list-element.component.ts |  2 +-
 src/app/shared/shared.module.ts               | 18 ++++++-----
 .../shared}/badges/badges.component.html      |  0
 .../shared}/badges/badges.component.scss      |  0
 .../shared}/badges/badges.component.ts        |  4 +--
 .../my-dspace-status-badge.component.html}    |  0
 .../my-dspace-status-badge.component.scss}    |  0
 .../my-dspace-status-badge.component.ts       | 12 ++++++++
 .../status-badge/status-badge.component.html} |  0
 .../status-badge/status-badge.component.scss} |  0
 .../status-badge/status-badge.component.ts    |  4 +--
 .../type-badge/type-badge.component.html      |  0
 .../type-badge/type-badge.component.scss      |  0
 .../badges/type-badge/type-badge.component.ts |  4 +--
 src/themes/custom/theme.module.ts             |  8 +++--
 66 files changed, 152 insertions(+), 103 deletions(-)
 create mode 100644 src/app/shared/object-collection/shared/badges/badges.component.html
 rename src/app/shared/{object-list => object-collection/shared}/badges/badges.component.scss (100%)
 rename src/app/shared/{object-list => object-collection/shared}/badges/badges.component.spec.ts (63%)
 rename src/app/shared/{object-list => object-collection/shared}/badges/badges.component.ts (52%)
 rename src/app/shared/object-collection/shared/{mydspace-item-status => badges/my-dspace-status-badge}/my-dspace-item-status-type.ts (100%)
 rename src/app/shared/object-collection/shared/{mydspace-item-status/my-dspace-item-status.component.html => badges/my-dspace-status-badge/my-dspace-status-badge.component.html} (100%)
 rename src/app/shared/object-collection/shared/{mydspace-item-status/my-dspace-item-status.component.scss => badges/my-dspace-status-badge/my-dspace-status-badge.component.scss} (100%)
 rename src/app/shared/object-collection/shared/{mydspace-item-status/my-dspace-item-status.component.spec.ts => badges/my-dspace-status-badge/my-dspace-status-badge.component.spec.ts} (79%)
 rename src/app/shared/object-collection/shared/{mydspace-item-status/my-dspace-item-status.component.ts => badges/my-dspace-status-badge/my-dspace-status-badge.component.ts} (84%)
 create mode 100644 src/app/shared/object-collection/shared/badges/my-dspace-status-badge/themed-my-dspace-status-badge.component.ts
 rename src/app/shared/{object-list => object-collection/shared}/badges/status-badge/status-badge.component.html (100%)
 rename src/app/shared/{object-list => object-collection/shared}/badges/status-badge/status-badge.component.spec.ts (92%)
 rename src/app/shared/{object-list => object-collection/shared}/badges/status-badge/status-badge.component.ts (89%)
 rename src/app/shared/{object-list => object-collection/shared}/badges/status-badge/themed-status-badge.component.ts (62%)
 rename src/app/shared/{object-list => object-collection/shared}/badges/themed-badges.component.ts (55%)
 rename src/app/shared/{object-list => object-collection/shared}/badges/type-badge/themed-type-badge.component.ts (63%)
 rename src/app/shared/{object-list => object-collection/shared}/badges/type-badge/type-badge.component.html (100%)
 rename src/app/shared/{object-list => object-collection/shared}/badges/type-badge/type-badge.component.spec.ts (94%)
 rename src/app/shared/{object-list => object-collection/shared}/badges/type-badge/type-badge.component.ts (83%)
 delete mode 100644 src/app/shared/object-list/badges/badges.component.html
 rename src/themes/custom/app/shared/{object-list => object-collection/shared}/badges/badges.component.html (100%)
 rename src/themes/custom/app/shared/{object-list => object-collection/shared}/badges/badges.component.scss (100%)
 rename src/themes/custom/app/shared/{object-list => object-collection/shared}/badges/badges.component.ts (65%)
 rename src/themes/custom/app/shared/{object-list/badges/status-badge/status-badge.component.html => object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html} (100%)
 rename src/themes/custom/app/shared/{object-list/badges/status-badge/status-badge.component.scss => object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.scss} (100%)
 create mode 100644 src/themes/custom/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.ts
 rename src/themes/custom/app/shared/{object-list/badges/type-badge/type-badge.component.html => object-collection/shared/badges/status-badge/status-badge.component.html} (100%)
 rename src/themes/custom/app/shared/{object-list/badges/type-badge/type-badge.component.scss => object-collection/shared/badges/status-badge/status-badge.component.scss} (100%)
 rename src/themes/custom/app/shared/{object-list => object-collection/shared}/badges/status-badge/status-badge.component.ts (61%)
 create mode 100644 src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html
 create mode 100644 src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.scss
 rename src/themes/custom/app/shared/{object-list => object-collection/shared}/badges/type-badge/type-badge.component.ts (61%)

diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
index 17ce2cd7a1..cdb91d3b13 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
@@ -16,6 +16,8 @@ import { CommunitySearchResult } from '../../../../../shared/object-collection/s
 import { Community } from '../../../../../core/shared/community.model';
 import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths';
 import { LinkService } from '../../../../../core/cache/builders/link.service';
+import { ThemeService } from '../../../../../shared/theme-support/theme.service';
+import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock';
 
 describe('CommunityAdminSearchResultGridElementComponent', () => {
   let component: CommunityAdminSearchResultGridElementComponent;
@@ -47,7 +49,8 @@ describe('CommunityAdminSearchResultGridElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: mockTruncatableService },
         { provide: BitstreamDataService, useValue: {} },
-        { provide: LinkService, useValue: linkService }
+        { provide: LinkService, useValue: linkService },
+        { provide: ThemeService, useValue: getMockThemeService() }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     })
diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts b/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts
index c9e8f37ee9..e111c858bf 100644
--- a/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts
+++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts
@@ -18,15 +18,12 @@ import { HostWindowService } from '../../shared/host-window.service';
 import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
-import { of as observableOf } from 'rxjs';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
 import { ThemeService } from '../../shared/theme-support/theme.service';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 
-fdescribe('TopLevelCommunityList Component', () => {
+describe('TopLevelCommunityList Component', () => {
   let comp: TopLevelCommunityListComponent;
   let fixture: ComponentFixture<TopLevelCommunityListComponent>;
   let communityDataServiceStub: any;
@@ -131,6 +128,7 @@ fdescribe('TopLevelCommunityList Component', () => {
         { provide: SelectableListService, useValue: {} },
         { provide: ThemeService, useValue: themeService },
       ],
+      schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/browse-by/browse-by.component.spec.ts b/src/app/shared/browse-by/browse-by.component.spec.ts
index 896537b63a..3f26b0ad9c 100644
--- a/src/app/shared/browse-by/browse-by.component.spec.ts
+++ b/src/app/shared/browse-by/browse-by.component.spec.ts
@@ -79,6 +79,7 @@ describe('BrowseByComponent', () => {
     themeService = jasmine.createSpyObj('themeService', {
       getThemeName: 'dspace',
       getThemeName$: observableOf('dspace'),
+      getThemeConfigFor: undefined,
     });
     TestBed.configureTestingModule({
       imports: [
diff --git a/src/app/shared/object-collection/shared/badges/badges.component.html b/src/app/shared/object-collection/shared/badges/badges.component.html
new file mode 100644
index 0000000000..b10c723fca
--- /dev/null
+++ b/src/app/shared/object-collection/shared/badges/badges.component.html
@@ -0,0 +1,5 @@
+<ds-themed-status-badge [object]="object"></ds-themed-status-badge>
+<ng-container *ngIf="myDSpaceStatus">
+    <ds-themed-my-dspace-status-badge [status]="myDSpaceStatus"></ds-themed-my-dspace-status-badge>
+</ng-container>
+<ds-themed-type-badge [object]="object"></ds-themed-type-badge>
diff --git a/src/app/shared/object-list/badges/badges.component.scss b/src/app/shared/object-collection/shared/badges/badges.component.scss
similarity index 100%
rename from src/app/shared/object-list/badges/badges.component.scss
rename to src/app/shared/object-collection/shared/badges/badges.component.scss
diff --git a/src/app/shared/object-list/badges/badges.component.spec.ts b/src/app/shared/object-collection/shared/badges/badges.component.spec.ts
similarity index 63%
rename from src/app/shared/object-list/badges/badges.component.spec.ts
rename to src/app/shared/object-collection/shared/badges/badges.component.spec.ts
index 1ca24639f8..9e0c277a08 100644
--- a/src/app/shared/object-list/badges/badges.component.spec.ts
+++ b/src/app/shared/object-collection/shared/badges/badges.component.spec.ts
@@ -1,6 +1,9 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { BadgesComponent } from './badges.component';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { ThemeService } from '../../../theme-support/theme.service';
+import { getMockThemeService } from '../../../mocks/theme-service.mock';
 
 describe('BadgesComponent', () => {
   let component: BadgesComponent;
@@ -8,7 +11,9 @@ describe('BadgesComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ BadgesComponent ]
+      declarations: [ BadgesComponent ],
+      providers: [{provide: ThemeService, useValue: getMockThemeService()}],
+      schemas: [NO_ERRORS_SCHEMA]
     })
     .compileComponents();
   });
diff --git a/src/app/shared/object-list/badges/badges.component.ts b/src/app/shared/object-collection/shared/badges/badges.component.ts
similarity index 52%
rename from src/app/shared/object-list/badges/badges.component.ts
rename to src/app/shared/object-collection/shared/badges/badges.component.ts
index 31baba1d2c..1d7df0002e 100644
--- a/src/app/shared/object-list/badges/badges.component.ts
+++ b/src/app/shared/object-collection/shared/badges/badges.component.ts
@@ -1,5 +1,6 @@
 import { Component, Input } from '@angular/core';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { MyDspaceItemStatusType } from './my-dspace-status-badge/my-dspace-item-status-type';
 
 @Component({
   selector: 'ds-badges',
@@ -8,4 +9,5 @@ import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 })
 export class BadgesComponent {
   @Input() object: DSpaceObject;
+  @Input() myDSpaceStatus?: MyDspaceItemStatusType;
 }
diff --git a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status-type.ts b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type.ts
similarity index 100%
rename from src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status-type.ts
rename to src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type.ts
diff --git a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.html b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html
similarity index 100%
rename from src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.html
rename to src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html
diff --git a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.scss b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.scss
similarity index 100%
rename from src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.scss
rename to src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.scss
diff --git a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.spec.ts b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.spec.ts
similarity index 79%
rename from src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.spec.ts
rename to src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.spec.ts
index 44e6a44b70..788774c9bb 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.spec.ts
+++ b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.spec.ts
@@ -4,17 +4,17 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { of as observableOf } from 'rxjs';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
-import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
-import { EPersonMock } from '../../../testing/eperson.mock';
-import { MyDSpaceItemStatusComponent } from './my-dspace-item-status.component';
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { PoolTask } from '../../../../../core/tasks/models/pool-task-object.model';
+import { EPersonMock } from '../../../../testing/eperson.mock';
+import { MyDSpaceStatusBadgeComponent } from './my-dspace-status-badge.component';
 import { MyDspaceItemStatusType } from './my-dspace-item-status-type';
-import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
+import { TranslateLoaderMock } from '../../../../mocks/translate-loader.mock';
 import { By } from '@angular/platform-browser';
-import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { createSuccessfulRemoteDataObject } from '../../../../remote-data.utils';
 
-let component: MyDSpaceItemStatusComponent;
-let fixture: ComponentFixture<MyDSpaceItemStatusComponent>;
+let component: MyDSpaceStatusBadgeComponent;
+let fixture: ComponentFixture<MyDSpaceStatusBadgeComponent>;
 
 let mockResultObject: PoolTask;
 
@@ -34,15 +34,15 @@ describe('MyDSpaceItemStatusComponent', () => {
           }
         })
       ],
-      declarations: [MyDSpaceItemStatusComponent],
+      declarations: [MyDSpaceStatusBadgeComponent],
       schemas: [NO_ERRORS_SCHEMA]
-    }).overrideComponent(MyDSpaceItemStatusComponent, {
+    }).overrideComponent(MyDSpaceStatusBadgeComponent, {
       set: { changeDetection: ChangeDetectionStrategy.Default }
     }).compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(MyDSpaceItemStatusComponent);
+    fixture = TestBed.createComponent(MyDSpaceStatusBadgeComponent);
     component = fixture.componentInstance;
   });
 
diff --git a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.ts b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.ts
similarity index 84%
rename from src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.ts
rename to src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.ts
index 917dd45acc..6a1678a45a 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.ts
+++ b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.ts
@@ -5,11 +5,11 @@ import { MyDspaceItemStatusType } from './my-dspace-item-status-type';
  * This component represents a badge with mydspace item status
  */
 @Component({
-  selector: 'ds-mydspace-item-status',
-  styleUrls: ['./my-dspace-item-status.component.scss'],
-  templateUrl: './my-dspace-item-status.component.html'
+  selector: 'ds-my-dspace-status-badge',
+  styleUrls: ['./my-dspace-status-badge.component.scss'],
+  templateUrl: './my-dspace-status-badge.component.html'
 })
-export class MyDSpaceItemStatusComponent implements OnInit {
+export class MyDSpaceStatusBadgeComponent implements OnInit {
 
   /**
    * This mydspace item status
diff --git a/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/themed-my-dspace-status-badge.component.ts b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/themed-my-dspace-status-badge.component.ts
new file mode 100644
index 0000000000..9f7bb16853
--- /dev/null
+++ b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/themed-my-dspace-status-badge.component.ts
@@ -0,0 +1,30 @@
+import { Component, Input } from '@angular/core';
+import { ThemedComponent } from '../../../../theme-support/themed.component';
+import { MyDspaceItemStatusType } from './my-dspace-item-status-type';
+import { MyDSpaceStatusBadgeComponent } from './my-dspace-status-badge.component';
+
+/**
+ * Themed wrapper for MyDSpaceStatusBadge
+ */
+@Component({
+  selector: 'ds-themed-my-dspace-status-badge',
+  styleUrls: [],
+  templateUrl: '../../../../theme-support/themed.component.html',
+})
+export class ThemedMyDSpaceStatusBadgeComponent extends ThemedComponent<MyDSpaceStatusBadgeComponent> {
+  @Input() status: MyDspaceItemStatusType;
+
+  protected inAndOutputNames: (keyof MyDSpaceStatusBadgeComponent & keyof this)[] = ['status'];
+
+  protected getComponentName(): string {
+    return 'MyDSpaceStatusBadgeComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../../themes/${themeName}/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./my-dspace-status-badge.component`);
+  }
+}
diff --git a/src/app/shared/object-list/badges/status-badge/status-badge.component.html b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html
similarity index 100%
rename from src/app/shared/object-list/badges/status-badge/status-badge.component.html
rename to src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html
diff --git a/src/app/shared/object-list/badges/status-badge/status-badge.component.spec.ts b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.spec.ts
similarity index 92%
rename from src/app/shared/object-list/badges/status-badge/status-badge.component.spec.ts
rename to src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.spec.ts
index 4cfa0e2341..f3115073c3 100644
--- a/src/app/shared/object-list/badges/status-badge/status-badge.component.spec.ts
+++ b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.spec.ts
@@ -1,12 +1,10 @@
-import { Item } from '../../../../core/shared/item.model';
-import { of as observableOf } from 'rxjs';
+import { Item } from '../../../../../core/shared/item.model';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { TruncatePipe } from '../../../utils/truncate.pipe';
+import { TruncatePipe } from '../../../../utils/truncate.pipe';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { StatusBadgeComponent } from './status-badge.component';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
 
 let comp: StatusBadgeComponent;
 let fixture: ComponentFixture<StatusBadgeComponent>;
diff --git a/src/app/shared/object-list/badges/status-badge/status-badge.component.ts b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
similarity index 89%
rename from src/app/shared/object-list/badges/status-badge/status-badge.component.ts
rename to src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
index 7f52741c51..a52f3f6f32 100644
--- a/src/app/shared/object-list/badges/status-badge/status-badge.component.ts
+++ b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import { hasValue } from '../../../empty.util';
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import { hasValue } from '../../../../empty.util';
 
 @Component({
   selector: 'ds-status-badge',
diff --git a/src/app/shared/object-list/badges/status-badge/themed-status-badge.component.ts b/src/app/shared/object-collection/shared/badges/status-badge/themed-status-badge.component.ts
similarity index 62%
rename from src/app/shared/object-list/badges/status-badge/themed-status-badge.component.ts
rename to src/app/shared/object-collection/shared/badges/status-badge/themed-status-badge.component.ts
index d855fda555..f50d029fff 100644
--- a/src/app/shared/object-list/badges/status-badge/themed-status-badge.component.ts
+++ b/src/app/shared/object-collection/shared/badges/status-badge/themed-status-badge.component.ts
@@ -1,8 +1,7 @@
 import { Component, Input } from '@angular/core';
-import { ThemedComponent } from '../../../theme-support/themed.component';
+import { ThemedComponent } from '../../../../theme-support/themed.component';
 import { StatusBadgeComponent } from './status-badge.component';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import { TypeBadgeComponent } from '../type-badge/type-badge.component';
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
 
 /**
  * Themed wrapper for StatusBadgeComponent
@@ -10,7 +9,7 @@ import { TypeBadgeComponent } from '../type-badge/type-badge.component';
 @Component({
   selector: 'ds-themed-status-badge',
   styleUrls: [],
-  templateUrl: '../../../../shared/theme-support/themed.component.html',
+  templateUrl: '../../../../theme-support/themed.component.html',
 })
 export class ThemedStatusBadgeComponent extends ThemedComponent<StatusBadgeComponent> {
   @Input() object: DSpaceObject;
@@ -22,7 +21,7 @@ export class ThemedStatusBadgeComponent extends ThemedComponent<StatusBadgeCompo
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../../../themes/${themeName}/app/shared/object-list/badges/status-badge/status-badge.component`);
+    return import(`../../../../../../themes/${themeName}/app/shared/object-collection/shared/badges/status-badge/status-badge.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {
diff --git a/src/app/shared/object-list/badges/themed-badges.component.ts b/src/app/shared/object-collection/shared/badges/themed-badges.component.ts
similarity index 55%
rename from src/app/shared/object-list/badges/themed-badges.component.ts
rename to src/app/shared/object-collection/shared/badges/themed-badges.component.ts
index 8682e33e2e..05f519e09d 100644
--- a/src/app/shared/object-list/badges/themed-badges.component.ts
+++ b/src/app/shared/object-collection/shared/badges/themed-badges.component.ts
@@ -1,9 +1,8 @@
 import { Component, Input } from '@angular/core';
 import { BadgesComponent } from './badges.component';
-import { ThemedComponent } from '../../theme-support/themed.component';
-import { Observable } from 'rxjs/internal/Observable';
-import { SearchFiltersComponent } from '../../search/search-filters/search-filters.component';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { ThemedComponent } from '../../../theme-support/themed.component';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { MyDspaceItemStatusType } from './my-dspace-status-badge/my-dspace-item-status-type';
 
 /**
  * Themed wrapper for BadgesComponent
@@ -11,19 +10,20 @@ import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 @Component({
   selector: 'ds-themed-badges',
   styleUrls: [],
-  templateUrl: '../../../shared/theme-support/themed.component.html',
+  templateUrl: '../../../theme-support/themed.component.html',
 })
 export class ThemedBadgesComponent extends ThemedComponent<BadgesComponent> {
   @Input() object: DSpaceObject;
+  @Input() myDSpaceStatus: MyDspaceItemStatusType;
 
-  protected inAndOutputNames: (keyof BadgesComponent & keyof this)[] = ['object'];
+  protected inAndOutputNames: (keyof BadgesComponent & keyof this)[] = ['object', 'myDSpaceStatus'];
 
   protected getComponentName(): string {
     return 'BadgesComponent';
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../../themes/${themeName}/app/shared/object-list/badges/badges.component`);
+    return import(`../../../../../themes/${themeName}/app/shared/object-collection/shared/badges/badges.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {
diff --git a/src/app/shared/object-list/badges/type-badge/themed-type-badge.component.ts b/src/app/shared/object-collection/shared/badges/type-badge/themed-type-badge.component.ts
similarity index 63%
rename from src/app/shared/object-list/badges/type-badge/themed-type-badge.component.ts
rename to src/app/shared/object-collection/shared/badges/type-badge/themed-type-badge.component.ts
index 58e56dbe88..a8dd0ee04c 100644
--- a/src/app/shared/object-list/badges/type-badge/themed-type-badge.component.ts
+++ b/src/app/shared/object-collection/shared/badges/type-badge/themed-type-badge.component.ts
@@ -1,8 +1,7 @@
 import { Component, Input } from '@angular/core';
-import { ThemedComponent } from '../../../theme-support/themed.component';
+import { ThemedComponent } from '../../../../theme-support/themed.component';
 import { TypeBadgeComponent } from './type-badge.component';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import { BadgesComponent } from '../badges.component';
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
 
 /**
  * Themed wrapper for TypeBadgeComponent
@@ -10,7 +9,7 @@ import { BadgesComponent } from '../badges.component';
 @Component({
   selector: 'ds-themed-type-badge',
   styleUrls: [],
-  templateUrl: '../../../../shared/theme-support/themed.component.html',
+  templateUrl: '../../../../theme-support/themed.component.html',
 })
 export class ThemedTypeBadgeComponent extends ThemedComponent<TypeBadgeComponent> {
   @Input() object: DSpaceObject;
@@ -22,7 +21,7 @@ export class ThemedTypeBadgeComponent extends ThemedComponent<TypeBadgeComponent
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../../../themes/${themeName}/app/shared/object-list/badges/type-badge/type-badge.component`);
+    return import(`../../../../../../themes/${themeName}/app/shared/object-collection/shared/badges/type-badge/type-badge.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {
diff --git a/src/app/shared/object-list/badges/type-badge/type-badge.component.html b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html
similarity index 100%
rename from src/app/shared/object-list/badges/type-badge/type-badge.component.html
rename to src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html
diff --git a/src/app/shared/object-list/badges/type-badge/type-badge.component.spec.ts b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.spec.ts
similarity index 94%
rename from src/app/shared/object-list/badges/type-badge/type-badge.component.spec.ts
rename to src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.spec.ts
index 21c12ec372..87adc3761a 100644
--- a/src/app/shared/object-list/badges/type-badge/type-badge.component.spec.ts
+++ b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.spec.ts
@@ -1,8 +1,8 @@
-import { Item } from '../../../../core/shared/item.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { of as observableOf } from 'rxjs';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { TruncatePipe } from '../../../utils/truncate.pipe';
+import { TruncatePipe } from '../../../../utils/truncate.pipe';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { TypeBadgeComponent } from './type-badge.component';
diff --git a/src/app/shared/object-list/badges/type-badge/type-badge.component.ts b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
similarity index 83%
rename from src/app/shared/object-list/badges/type-badge/type-badge.component.ts
rename to src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
index 2fba2515a9..ea912063b6 100644
--- a/src/app/shared/object-list/badges/type-badge/type-badge.component.ts
+++ b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import { hasValue, isEmpty } from '../../../empty.util';
-import { getResourceTypeValueFor } from '../../../../core/cache/object-cache.reducer';
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import { hasValue, isEmpty } from '../../../../empty.util';
+import { getResourceTypeValueFor } from '../../../../../core/cache/object-cache.reducer';
 
 @Component({
   selector: 'ds-type-badge',
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.spec.ts
index a6a3e2020b..9cf282da1c 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.spec.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.spec.ts
@@ -7,7 +7,7 @@ import { of as observableOf } from 'rxjs';
 import { Item } from '../../../../core/shared/item.model';
 import { ClaimedTaskSearchResultDetailElementComponent } from './claimed-task-search-result-detail-element.component';
 import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
 import { ClaimedTaskSearchResult } from '../../../object-collection/shared/claimed-task-search-result.model';
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts
index 74411d2341..a380133bc9 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts
@@ -7,7 +7,7 @@ import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
 import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { ClaimedTaskSearchResult } from '../../../object-collection/shared/claimed-task-search-result.model';
 import { followLink } from '../../../utils/follow-link-config.model';
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
index 61e2955deb..46e1a06ada 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
@@ -1,7 +1,5 @@
 <div *ngIf="item" class="item-page" @fadeInOut>
-  <ng-container *ngIf="status">
-    <ds-mydspace-item-status [status]="status"></ds-mydspace-item-status>
-  </ng-container>
+  <ds-themed-badges [object]="object" [myDSpaceStatus]="status"></ds-themed-badges>
   <div *ngIf="item">
     <h2 class="item-page-title-field">
       <ds-metadata-values *ngIf="item.hasMetadata('dc.title')" [mdValues]="item?.allMetadata('dc.title')"></ds-metadata-values>
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
index 778e455004..e7c316579c 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
@@ -6,7 +6,7 @@ import { BitstreamDataService } from '../../../../core/data/bitstream-data.servi
 
 import { Item } from '../../../../core/shared/item.model';
 import { getFirstSucceededRemoteListPayload } from '../../../../core/shared/operators';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { fadeInOut } from '../../../animations/fade';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { FileService } from '../../../../core/shared/file.service';
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.spec.ts
index 8d602d5eb2..0e9fe29cd7 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.spec.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.spec.ts
@@ -6,7 +6,7 @@ import { of as observableOf } from 'rxjs';
 
 import { Item } from '../../../../core/shared/item.model';
 import { ItemSearchResultDetailElementComponent } from './item-search-result-detail-element.component';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
 
 let component: ItemSearchResultDetailElementComponent;
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.ts
index 7e611ec3c8..8e52ebbd3e 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.ts
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { Item } from '../../../../core/shared/item.model';
 import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
 
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts
index 8e0458d49f..6e62d9087a 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts
@@ -6,7 +6,7 @@ import { of as observableOf } from 'rxjs';
 
 import { Item } from '../../../../core/shared/item.model';
 import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
 import { PoolSearchResultDetailElementComponent } from './pool-search-result-detail-element.component';
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts
index df27abd42e..dc48a8a27a 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts
@@ -4,7 +4,7 @@ import { Observable } from 'rxjs';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
 import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.spec.ts
index 536bd6d0bb..345860485a 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.spec.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.spec.ts
@@ -7,7 +7,7 @@ import { of as observableOf } from 'rxjs';
 import { Item } from '../../../../core/shared/item.model';
 import { WorkflowItemSearchResultDetailElementComponent } from './workflow-item-search-result-detail-element.component';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
 import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
 import { getMockLinkService } from '../../../mocks/link-service.mock';
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts
index 8dc510d2aa..614045dd7d 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts
@@ -4,7 +4,7 @@ import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { Item } from '../../../../core/shared/item.model';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { Observable } from 'rxjs';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { find } from 'rxjs/operators';
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts
index 00a20b006a..0d5b18919f 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts
@@ -7,7 +7,7 @@ import { of as observableOf } from 'rxjs';
 import { Item } from '../../../../core/shared/item.model';
 import { WorkspaceItemSearchResultDetailElementComponent } from './workspace-item-search-result-detail-element.component';
 import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
 import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
 import { getMockLinkService } from '../../../mocks/link-service.mock';
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts
index e4781fe0b2..c314678e89 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts
@@ -8,7 +8,7 @@ import { Item } from '../../../../core/shared/item.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { isNotUndefined } from '../../../empty.util';
 import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { WorkspaceItemSearchResult } from '../../../object-collection/shared/workspace-item-search-result.model';
diff --git a/src/app/shared/object-list/badges/badges.component.html b/src/app/shared/object-list/badges/badges.component.html
deleted file mode 100644
index 1e59ca3660..0000000000
--- a/src/app/shared/object-list/badges/badges.component.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<ds-themed-status-badge [object]="object"></ds-themed-status-badge>
-<ds-themed-type-badge [object]="object"></ds-themed-type-badge>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts
index c2b106c76a..0d1505333e 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts
@@ -12,7 +12,7 @@ import { getMockLinkService } from '../../../../mocks/link-service.mock';
 import { VarDirective } from '../../../../utils/var.directive';
 import { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { MyDspaceItemStatusType } from '../../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { ClaimedApprovedTaskSearchResult } from '../../../../object-collection/shared/claimed-approved-task-search-result.model';
 import { ClaimedApprovedSearchResultListElementComponent } from './claimed-approved-search-result-list-element.component';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
index eaf407d787..fbe718f2a5 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
@@ -4,7 +4,7 @@ import { ClaimedApprovedTaskSearchResult } from '../../../../object-collection/s
 import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
 import { LinkService } from '../../../../../core/cache/builders/link.service';
 import { TruncatableService } from '../../../../truncatable/truncatable.service';
-import { MyDspaceItemStatusType } from '../../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { Observable } from 'rxjs';
 import { RemoteData } from '../../../../../core/data/remote-data';
 import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declided-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declided-search-result-list-element.component.spec.ts
index 15b5a5345d..df4703ef1d 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declided-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declided-search-result-list-element.component.spec.ts
@@ -14,7 +14,7 @@ import { getMockLinkService } from '../../../../mocks/link-service.mock';
 import { VarDirective } from '../../../../utils/var.directive';
 import { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { MyDspaceItemStatusType } from '../../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
 
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
index 0b9a925dbf..fa590c0891 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
@@ -5,7 +5,7 @@ import { ClaimedDeclinedTaskSearchResult } from '../../../../object-collection/s
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { LinkService } from '../../../../../core/cache/builders/link.service';
 import { TruncatableService } from '../../../../truncatable/truncatable.service';
-import { MyDspaceItemStatusType } from '../../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { Observable } from 'rxjs';
 import { RemoteData } from '../../../../../core/data/remote-data';
 import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts
index 7896061a73..77609e2111 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts
@@ -7,7 +7,7 @@ import { of as observableOf } from 'rxjs';
 import { Item } from '../../../../core/shared/item.model';
 import { ClaimedSearchResultListElementComponent } from './claimed-search-result-list-element.component';
 import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
 import { ClaimedTaskSearchResult } from '../../../object-collection/shared/claimed-task-search-result.model';
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
index 2cf8f9a231..fd4f6938f6 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
@@ -5,7 +5,7 @@ import { listableObjectComponent } from '../../../object-collection/shared/lista
 import { ClaimedTaskSearchResult } from '../../../object-collection/shared/claimed-task-search-result.model';
 import { LinkService } from '../../../../core/cache/builders/link.service';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { Observable } from 'rxjs';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
index 31f48475a6..4b7ee25533 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
@@ -1,8 +1,5 @@
 <div *ngIf="item" @fadeInOut>
-  <ng-container *ngIf="status">
-    <ds-mydspace-item-status [status]="status"></ds-mydspace-item-status>
-  </ng-container>
-  <ds-themed-badges [object]="item"></ds-themed-badges>
+  <ds-themed-badges [object]="item" [myDSpaceStatus]="status"></ds-themed-badges>
   <ds-truncatable [id]="item.id">
     <h3 [innerHTML]="item.firstMetadataValue('dc.title') || ('mydspace.results.no-title' | translate)" [ngClass]="{'lead': true,'text-muted': !item.firstMetadataValue('dc.title')}"></h3>
     <div>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
index 840960d51f..455fd204ca 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
@@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core';
 
 import { Item } from '../../../../core/shared/item.model';
 import { fadeInOut } from '../../../animations/fade';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { SearchResult } from '../../../search/models/search-result.model';
 
 /**
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts
index 982a04207f..cb27b6bc12 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts
@@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core';
 import { ThemedComponent } from '../../../theme-support/themed.component';
 import { ItemListPreviewComponent } from './item-list-preview.component';
 import { Item } from '../../../../core/shared/item.model';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { SearchResult } from '../../../search/models/search-result.model';
 
 /**
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts
index d1871d0996..8fb3aaf48e 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts
@@ -5,7 +5,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { of as observableOf } from 'rxjs';
 
 import { Item } from '../../../../core/shared/item.model';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
 import { ItemSearchResultListElementSubmissionComponent } from './item-search-result-list-element-submission.component';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts
index 3ef45d1c47..a6d435a98b 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 
 import { Item } from '../../../../core/shared/item.model';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { Context } from '../../../../core/shared/context.model';
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts
index 18db9abd67..506c958fba 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts
@@ -7,7 +7,7 @@ import { of as observableOf } from 'rxjs';
 import { Item } from '../../../../core/shared/item.model';
 import { PoolSearchResultListElementComponent } from './pool-search-result-list-element.component';
 import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
 import { PoolTaskSearchResult } from '../../../object-collection/shared/pool-task-search-result.model';
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
index e9d64db572..e33cc60c16 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
@@ -6,7 +6,7 @@ import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { PoolTaskSearchResult } from '../../../object-collection/shared/pool-task-search-result.model';
 import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component';
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts
index 61337b0cb3..31adb90cd1 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts
@@ -10,7 +10,7 @@ import { ItemDataService } from '../../../../core/data/item-data.service';
 import { Item } from '../../../../core/shared/item.model';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { getMockLinkService } from '../../../mocks/link-service.mock';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
index 836a3ee268..8991ac2f0a 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
@@ -10,7 +10,7 @@ import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { isNotUndefined } from '../../../empty.util';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { followLink } from '../../../utils/follow-link-config.model';
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts
index 87f5fd3733..e3402e4bff 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts
@@ -10,7 +10,7 @@ import { ItemDataService } from '../../../../core/data/item-data.service';
 import { Item } from '../../../../core/shared/item.model';
 import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
 import { getMockLinkService } from '../../../mocks/link-service.mock';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
index 5edfc1929e..55d245dbf9 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
@@ -10,7 +10,7 @@ import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
 import { isNotUndefined } from '../../../empty.util';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { MyDspaceItemStatusType } from '../../../object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type';
 import { WorkspaceItemSearchResult } from '../../../object-collection/shared/workspace-item-search-result.model';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { followLink } from '../../../utils/follow-link-config.model';
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index bc20d02f02..4d1ca19aa9 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -59,7 +59,7 @@ import { ClaimedTaskActionsComponent } from './mydspace-actions/claimed-task/cla
 import { PoolTaskActionsComponent } from './mydspace-actions/pool-task/pool-task-actions.component';
 import { ObjectDetailComponent } from './object-detail/object-detail.component';
 import { ItemDetailPreviewComponent } from './object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component';
-import { MyDSpaceItemStatusComponent } from './object-collection/shared/mydspace-item-status/my-dspace-item-status.component';
+import { MyDSpaceStatusBadgeComponent } from './object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component';
 import { WorkspaceitemActionsComponent } from './mydspace-actions/workspaceitem/workspaceitem-actions.component';
 import { WorkflowitemActionsComponent } from './mydspace-actions/workflowitem/workflowitem-actions.component';
 import { ItemSubmitterComponent } from './object-collection/shared/mydspace-item-submitter/item-submitter.component';
@@ -111,7 +111,7 @@ import { CollectionSelectComponent } from './object-select/collection-select/col
 import { FilterInputSuggestionsComponent } from './input-suggestions/filter-suggestions/filter-input-suggestions.component';
 import { DsoInputSuggestionsComponent } from './input-suggestions/dso-input-suggestions/dso-input-suggestions.component';
 import { ItemGridElementComponent } from './object-grid/item-grid-element/item-types/item/item-grid-element.component';
-import { TypeBadgeComponent } from './object-list/badges/type-badge/type-badge.component';
+import { TypeBadgeComponent } from './object-collection/shared/badges/type-badge/type-badge.component';
 import { MetadataRepresentationLoaderComponent } from './metadata-representation/metadata-representation-loader.component';
 import { MetadataRepresentationDirective } from './metadata-representation/metadata-representation.directive';
 import { ListableObjectComponentLoaderComponent } from './object-collection/shared/listable-object/listable-object-component-loader.component';
@@ -173,11 +173,12 @@ import { BitstreamRequestACopyPageComponent } from './bitstream-request-a-copy-p
 import { DsSelectComponent } from './ds-select/ds-select.component';
 import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component';
 import { ThemedItemListPreviewComponent } from './object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component';
-import { StatusBadgeComponent } from './object-list/badges/status-badge/status-badge.component';
-import { BadgesComponent } from './object-list/badges/badges.component';
-import { ThemedBadgesComponent } from './object-list/badges/themed-badges.component';
-import { ThemedStatusBadgeComponent } from './object-list/badges/status-badge/themed-status-badge.component';
-import { ThemedTypeBadgeComponent } from './object-list/badges/type-badge/themed-type-badge.component';
+import { StatusBadgeComponent } from './object-collection/shared/badges/status-badge/status-badge.component';
+import { BadgesComponent } from './object-collection/shared/badges/badges.component';
+import { ThemedBadgesComponent } from './object-collection/shared/badges/themed-badges.component';
+import { ThemedStatusBadgeComponent } from './object-collection/shared/badges/status-badge/themed-status-badge.component';
+import { ThemedTypeBadgeComponent } from './object-collection/shared/badges/type-badge/themed-type-badge.component';
+import { ThemedMyDSpaceStatusBadgeComponent } from './object-collection/shared/badges/my-dspace-status-badge/themed-my-dspace-status-badge.component';
 
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -254,7 +255,8 @@ const COMPONENTS = [
   FileDropzoneNoUploaderComponent,
   ItemListPreviewComponent,
   ThemedItemListPreviewComponent,
-  MyDSpaceItemStatusComponent,
+  MyDSpaceStatusBadgeComponent,
+  ThemedMyDSpaceStatusBadgeComponent,
   ItemSubmitterComponent,
   ItemDetailPreviewComponent,
   ItemDetailPreviewFieldComponent,
diff --git a/src/themes/custom/app/shared/object-list/badges/badges.component.html b/src/themes/custom/app/shared/object-collection/shared/badges/badges.component.html
similarity index 100%
rename from src/themes/custom/app/shared/object-list/badges/badges.component.html
rename to src/themes/custom/app/shared/object-collection/shared/badges/badges.component.html
diff --git a/src/themes/custom/app/shared/object-list/badges/badges.component.scss b/src/themes/custom/app/shared/object-collection/shared/badges/badges.component.scss
similarity index 100%
rename from src/themes/custom/app/shared/object-list/badges/badges.component.scss
rename to src/themes/custom/app/shared/object-collection/shared/badges/badges.component.scss
diff --git a/src/themes/custom/app/shared/object-list/badges/badges.component.ts b/src/themes/custom/app/shared/object-collection/shared/badges/badges.component.ts
similarity index 65%
rename from src/themes/custom/app/shared/object-list/badges/badges.component.ts
rename to src/themes/custom/app/shared/object-collection/shared/badges/badges.component.ts
index e3946823f3..8cdbf32d36 100644
--- a/src/themes/custom/app/shared/object-list/badges/badges.component.ts
+++ b/src/themes/custom/app/shared/object-collection/shared/badges/badges.component.ts
@@ -1,11 +1,11 @@
 import { Component } from '@angular/core';
-import { BadgesComponent as BaseComponent } from 'src/app/shared/object-list/badges/badges.component';
+import { BadgesComponent as BaseComponent } from 'src/app/shared/object-collection/shared/badges/badges.component';
 
 @Component({
   selector: 'ds-badges',
   // styleUrls: ['./badges.component.scss'],
   // templateUrl: './badges.component.html',
-  templateUrl: '../../../../../../app/shared/object-list/badges/badges.component.html',
+  templateUrl: '../../../../../../../app/shared/object-collection/shared/badges/badges.component.html',
 })
 export class BadgesComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/object-list/badges/status-badge/status-badge.component.html b/src/themes/custom/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html
similarity index 100%
rename from src/themes/custom/app/shared/object-list/badges/status-badge/status-badge.component.html
rename to src/themes/custom/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html
diff --git a/src/themes/custom/app/shared/object-list/badges/status-badge/status-badge.component.scss b/src/themes/custom/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.scss
similarity index 100%
rename from src/themes/custom/app/shared/object-list/badges/status-badge/status-badge.component.scss
rename to src/themes/custom/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.scss
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.ts b/src/themes/custom/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.ts
new file mode 100644
index 0000000000..eadd9a9ad4
--- /dev/null
+++ b/src/themes/custom/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+import { MyDSpaceStatusBadgeComponent as BaseComponent } from 'src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component';
+
+@Component({
+  selector: 'ds-my-dspace-status-badge',
+  // styleUrls: ['./my-dspace-status-badge.component.scss'],
+  styleUrls: ['../../../../../../../../app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.scss'],
+  // templateUrl: './my-dspace-status-badge.component.html',
+  templateUrl: '../../../../../../../../app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html',
+})
+export class MyDSpaceStatusBadgeComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/object-list/badges/type-badge/type-badge.component.html b/src/themes/custom/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html
similarity index 100%
rename from src/themes/custom/app/shared/object-list/badges/type-badge/type-badge.component.html
rename to src/themes/custom/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html
diff --git a/src/themes/custom/app/shared/object-list/badges/type-badge/type-badge.component.scss b/src/themes/custom/app/shared/object-collection/shared/badges/status-badge/status-badge.component.scss
similarity index 100%
rename from src/themes/custom/app/shared/object-list/badges/type-badge/type-badge.component.scss
rename to src/themes/custom/app/shared/object-collection/shared/badges/status-badge/status-badge.component.scss
diff --git a/src/themes/custom/app/shared/object-list/badges/status-badge/status-badge.component.ts b/src/themes/custom/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
similarity index 61%
rename from src/themes/custom/app/shared/object-list/badges/status-badge/status-badge.component.ts
rename to src/themes/custom/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
index 99c5f24b1a..8b0f6b27f5 100644
--- a/src/themes/custom/app/shared/object-list/badges/status-badge/status-badge.component.ts
+++ b/src/themes/custom/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
@@ -1,11 +1,11 @@
 import { Component } from '@angular/core';
-import { StatusBadgeComponent as BaseComponent } from 'src/app/shared/object-list/badges/status-badge/status-badge.component';
+import { StatusBadgeComponent as BaseComponent } from 'src/app/shared/object-collection/shared/badges/status-badge/status-badge.component';
 
 @Component({
   selector: 'ds-status-badge',
   // styleUrls: ['./status-badge.component.scss'],
   // templateUrl: './status-badge.component.html',
-  templateUrl: '../../../../../../../app/shared/object-list/badges/status-badge/status-badge.component.html',
+  templateUrl: '../../../../../../../../app/shared/object-collection/shared/badges/status-badge/status-badge.component.html',
 })
 export class StatusBadgeComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html b/src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.scss b/src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/object-list/badges/type-badge/type-badge.component.ts b/src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
similarity index 61%
rename from src/themes/custom/app/shared/object-list/badges/type-badge/type-badge.component.ts
rename to src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
index b304dfed92..11e50b4d08 100644
--- a/src/themes/custom/app/shared/object-list/badges/type-badge/type-badge.component.ts
+++ b/src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
@@ -1,11 +1,11 @@
 import { Component } from '@angular/core';
-import { TypeBadgeComponent as BaseComponent } from 'src/app/shared/object-list/badges/type-badge/type-badge.component';
+import { TypeBadgeComponent as BaseComponent } from 'src/app/shared/object-collection/shared/badges/type-badge/type-badge.component';
 
 @Component({
   selector: 'ds-type-badge',
   // styleUrls: ['./type-badge.component.scss'],
   // templateUrl: './type-badge.component.html',
-  templateUrl: '../../../../../../../app/shared/object-list/badges/type-badge/type-badge.component.html',
+  templateUrl: '../../../../../../../../app/shared/object-collection/shared/badges/type-badge/type-badge.component.html',
 })
 export class TypeBadgeComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/theme.module.ts b/src/themes/custom/theme.module.ts
index 4c4829e132..96ed12c53e 100644
--- a/src/themes/custom/theme.module.ts
+++ b/src/themes/custom/theme.module.ts
@@ -86,9 +86,10 @@ import { ComcolModule } from '../../app/shared/comcol/comcol.module';
 import { FeedbackComponent } from './app/info/feedback/feedback.component';
 import { SearchFiltersComponent } from './app/shared/search/search-filters/search-filters.component';
 import { SearchSidebarComponent } from './app/shared/search/search-sidebar/search-sidebar.component';
-import { BadgesComponent } from './app/shared/object-list/badges/badges.component';
-import { StatusBadgeComponent } from './app/shared/object-list/badges/status-badge/status-badge.component';
-import { TypeBadgeComponent } from './app/shared/object-list/badges/type-badge/type-badge.component';
+import { MyDSpaceStatusBadgeComponent } from './app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component';
+import { TypeBadgeComponent } from './app/shared/object-collection/shared/badges/type-badge/type-badge.component';
+import { StatusBadgeComponent } from './app/shared/object-collection/shared/badges/status-badge/status-badge.component';
+import { BadgesComponent } from './app/shared/object-collection/shared/badges/badges.component';
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -137,6 +138,7 @@ const DECLARATIONS = [
   BadgesComponent,
   StatusBadgeComponent,
   TypeBadgeComponent,
+  MyDSpaceStatusBadgeComponent,
 ];
 
 @NgModule({