diff --git a/projects/aca-content/src/lib/components/context-menu/context-menu-item.component.ts b/projects/aca-content/src/lib/components/context-menu/context-menu-item.component.ts
index 6bb7c2a423..c42f516a37 100644
--- a/projects/aca-content/src/lib/components/context-menu/context-menu-item.component.ts
+++ b/projects/aca-content/src/lib/components/context-menu/context-menu-item.component.ts
@@ -23,17 +23,17 @@
  */
 
 import { Component, Input, ViewEncapsulation } from '@angular/core';
-import { ContentActionRef, ExtensionsModule } from '@alfresco/adf-extensions';
+import { ContentActionRef, DynamicExtensionComponent } from '@alfresco/adf-extensions';
 import { AppExtensionService } from '@alfresco/aca-shared';
 import { CommonModule } from '@angular/common';
 import { MatMenuModule } from '@angular/material/menu';
 import { TranslateModule } from '@ngx-translate/core';
-import { IconModule } from '@alfresco/adf-core';
 import { MatDividerModule } from '@angular/material/divider';
+import { IconComponent } from '@alfresco/adf-core';
 
 @Component({
   standalone: true,
-  imports: [CommonModule, TranslateModule, MatMenuModule, IconModule, MatDividerModule, ExtensionsModule],
+  imports: [CommonModule, TranslateModule, MatMenuModule, MatDividerModule, IconComponent, DynamicExtensionComponent],
   selector: 'app-context-menu-item',
   templateUrl: './context-menu-item.component.html',
   encapsulation: ViewEncapsulation.None,
diff --git a/projects/aca-content/src/lib/components/context-menu/context-menu.component.ts b/projects/aca-content/src/lib/components/context-menu/context-menu.component.ts
index f466516fdf..01321cd966 100644
--- a/projects/aca-content/src/lib/components/context-menu/context-menu.component.ts
+++ b/projects/aca-content/src/lib/components/context-menu/context-menu.component.ts
@@ -26,7 +26,7 @@ import { Component, ViewEncapsulation, OnInit, OnDestroy, HostListener, ViewChil
 import { MatMenuModule, MatMenuTrigger } from '@angular/material/menu';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
-import { ContentActionRef, ExtensionsModule } from '@alfresco/adf-extensions';
+import { ContentActionRef, DynamicExtensionComponent } from '@alfresco/adf-extensions';
 import { ContextMenuOverlayRef } from './context-menu-overlay';
 import { CONTEXT_MENU_DIRECTION } from './direction.token';
 import { Direction } from '@angular/cdk/bidi';
@@ -34,7 +34,7 @@ import { AppExtensionService } from '@alfresco/aca-shared';
 import { CommonModule } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
 import { MatDividerModule } from '@angular/material/divider';
-import { IconModule } from '@alfresco/adf-core';
+import { IconComponent } from '@alfresco/adf-core';
 import { ContextMenuItemComponent } from './context-menu-item.component';
 import { OutsideEventDirective } from './context-menu-outside-event.directive';
 
@@ -45,10 +45,10 @@ import { OutsideEventDirective } from './context-menu-outside-event.directive';
     TranslateModule,
     MatMenuModule,
     MatDividerModule,
-    IconModule,
     ContextMenuItemComponent,
-    ExtensionsModule,
-    OutsideEventDirective
+    OutsideEventDirective,
+    IconComponent,
+    DynamicExtensionComponent
   ],
   selector: 'aca-context-menu',
   templateUrl: './context-menu.component.html',
diff --git a/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.ts b/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.ts
index 3b7fb6c73b..c85da82c43 100644
--- a/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.ts
+++ b/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.ts
@@ -22,7 +22,7 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { ContentPipeModule, NameColumnComponent, NodesApiService } from '@alfresco/adf-content-services';
+import { NameColumnComponent, NodeNameTooltipPipe, NodesApiService } from '@alfresco/adf-content-services';
 import { ChangeDetectorRef, Component, ElementRef, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
 import { Actions, ofType } from '@ngrx/effects';
 import { Subject } from 'rxjs';
@@ -31,12 +31,12 @@ import { NodeActionTypes } from '@alfresco/aca-shared/store';
 import { LockedByComponent, isLocked, AppExtensionService, Badge } from '@alfresco/aca-shared';
 import { CommonModule } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
-import { IconModule } from '@alfresco/adf-core';
-import { ExtensionsModule } from '@alfresco/adf-extensions';
+import { IconComponent } from '@alfresco/adf-core';
+import { DynamicExtensionComponent } from '@alfresco/adf-extensions';
 
 @Component({
   standalone: true,
-  imports: [CommonModule, TranslateModule, LockedByComponent, ContentPipeModule, IconModule, ExtensionsModule],
+  imports: [CommonModule, TranslateModule, LockedByComponent, IconComponent, NodeNameTooltipPipe, DynamicExtensionComponent],
   selector: 'aca-custom-name-column',
   templateUrl: './name-column.component.html',
   styleUrls: ['./name-column.component.scss'],
diff --git a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.ts b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.ts
index 382e56b8c1..5e3f848041 100644
--- a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.ts
+++ b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.ts
@@ -34,8 +34,8 @@ import {
   ToolbarComponent
 } from '@alfresco/aca-shared';
 import { NavigateLibraryAction } from '@alfresco/aca-shared/store';
-import { DataTableModule, PaginationComponent, TemplateModule, UserPreferencesService } from '@alfresco/adf-core';
-import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions';
+import { DataTableModule, EmptyContentComponent, PaginationComponent, UserPreferencesService } from '@alfresco/adf-core';
+import { DocumentListPresetRef, DynamicColumnComponent } from '@alfresco/adf-extensions';
 import { CommonModule } from '@angular/common';
 import { DocumentListModule } from '@alfresco/adf-content-services';
 import { DocumentListDirective } from '../../directives/document-list.directive';
@@ -48,14 +48,14 @@ import { TranslateModule } from '@ngx-translate/core';
     DocumentListModule,
     DocumentListDirective,
     ContextActionsDirective,
-    TemplateModule,
     DataTableModule,
-    ExtensionsModule,
     PaginationComponent,
     InfoDrawerComponent,
     PageLayoutComponent,
     TranslateModule,
-    ToolbarComponent
+    ToolbarComponent,
+    EmptyContentComponent,
+    DynamicColumnComponent
   ],
   templateUrl: './favorite-libraries.component.html',
   encapsulation: ViewEncapsulation.None
diff --git a/projects/aca-content/src/lib/components/favorites/favorites.component.ts b/projects/aca-content/src/lib/components/favorites/favorites.component.ts
index 131f2874dd..c0be53d421 100644
--- a/projects/aca-content/src/lib/components/favorites/favorites.component.ts
+++ b/projects/aca-content/src/lib/components/favorites/favorites.component.ts
@@ -34,10 +34,10 @@ import {
 import { NodeEntry, Node, PathElement, PathInfo } from '@alfresco/js-api';
 import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { debounceTime, map } from 'rxjs/operators';
-import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions';
+import { DocumentListPresetRef, DynamicColumnComponent } from '@alfresco/adf-extensions';
 import { CommonModule } from '@angular/common';
 import { DocumentListModule } from '@alfresco/adf-content-services';
-import { DataTableModule, PaginationComponent, TemplateModule } from '@alfresco/adf-core';
+import { DataTableModule, EmptyContentComponent, PaginationComponent } from '@alfresco/adf-core';
 import { DocumentListDirective } from '../../directives/document-list.directive';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -48,15 +48,15 @@ import { TranslateModule } from '@ngx-translate/core';
     DocumentListModule,
     DocumentListDirective,
     ContextActionsDirective,
-    TemplateModule,
     DataTableModule,
-    ExtensionsModule,
     PaginationComponent,
     PaginationDirective,
     InfoDrawerComponent,
     PageLayoutComponent,
     TranslateModule,
-    ToolbarComponent
+    ToolbarComponent,
+    EmptyContentComponent,
+    DynamicColumnComponent
   ],
   templateUrl: './favorites.component.html',
   encapsulation: ViewEncapsulation.None
diff --git a/projects/aca-content/src/lib/components/files/files.component.html b/projects/aca-content/src/lib/components/files/files.component.html
index af6d4ec325..d3d377852f 100644
--- a/projects/aca-content/src/lib/components/files/files.component.html
+++ b/projects/aca-content/src/lib/components/files/files.component.html
@@ -51,7 +51,7 @@
                   [resizable]="column.resizable"
                 >
                   <ng-template let-context>
-                    <adf-dynamic-column [id]="column.template" [context]="context"> </adf-dynamic-column>
+                    <adf-dynamic-column [id]="column.template" [context]="context"></adf-dynamic-column>
                   </ng-template>
                 </data-column>
               </ng-container>
diff --git a/projects/aca-content/src/lib/components/files/files.component.ts b/projects/aca-content/src/lib/components/files/files.component.ts
index 4826809776..71be16e0d5 100644
--- a/projects/aca-content/src/lib/components/files/files.component.ts
+++ b/projects/aca-content/src/lib/components/files/files.component.ts
@@ -40,7 +40,7 @@ import {
 import { SetCurrentFolderAction, isAdmin, UploadFileVersionAction, showLoaderSelector } from '@alfresco/aca-shared/store';
 import { debounceTime, takeUntil } from 'rxjs/operators';
 import { BreadcrumbModule, DocumentListModule, FileUploadEvent, FilterSearch, ShareDataRow, UploadModule } from '@alfresco/adf-content-services';
-import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions';
+import { DocumentListPresetRef, DynamicColumnComponent } from '@alfresco/adf-extensions';
 import { CommonModule } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
 import { DocumentListDirective } from '../../directives/document-list.directive';
@@ -58,13 +58,13 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
     DocumentListDirective,
     ContextActionsDirective,
     DataTableModule,
-    ExtensionsModule,
     PaginationComponent,
     MatProgressSpinnerModule,
     InfoDrawerComponent,
     PaginationDirective,
     PageLayoutComponent,
-    ToolbarComponent
+    ToolbarComponent,
+    DynamicColumnComponent
   ],
   templateUrl: './files.component.html',
   encapsulation: ViewEncapsulation.None
diff --git a/projects/aca-content/src/lib/components/libraries/libraries.component.ts b/projects/aca-content/src/lib/components/libraries/libraries.component.ts
index 194c93c2d9..f0d81d9089 100644
--- a/projects/aca-content/src/lib/components/libraries/libraries.component.ts
+++ b/projects/aca-content/src/lib/components/libraries/libraries.component.ts
@@ -34,10 +34,10 @@ import {
   PaginationDirective,
   ToolbarComponent
 } from '@alfresco/aca-shared';
-import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions';
+import { DocumentListPresetRef, DynamicColumnComponent } from '@alfresco/adf-extensions';
 import { CommonModule } from '@angular/common';
 import { DocumentListModule } from '@alfresco/adf-content-services';
-import { DataTableModule, PaginationComponent, TemplateModule } from '@alfresco/adf-core';
+import { DataTableModule, EmptyContentComponent, PaginationComponent } from '@alfresco/adf-core';
 import { DocumentListDirective } from '../../directives/document-list.directive';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -48,15 +48,15 @@ import { TranslateModule } from '@ngx-translate/core';
     DocumentListModule,
     DocumentListDirective,
     ContextActionsDirective,
-    TemplateModule,
     DataTableModule,
-    ExtensionsModule,
     PaginationComponent,
     PaginationDirective,
     InfoDrawerComponent,
     PageLayoutComponent,
     TranslateModule,
-    ToolbarComponent
+    ToolbarComponent,
+    EmptyContentComponent,
+    DynamicColumnComponent
   ],
   templateUrl: './libraries.component.html',
   encapsulation: ViewEncapsulation.None
diff --git a/projects/aca-content/src/lib/components/recent-files/recent-files.component.ts b/projects/aca-content/src/lib/components/recent-files/recent-files.component.ts
index 2080af920b..8db29b52c5 100644
--- a/projects/aca-content/src/lib/components/recent-files/recent-files.component.ts
+++ b/projects/aca-content/src/lib/components/recent-files/recent-files.component.ts
@@ -33,10 +33,10 @@ import {
   PaginationDirective,
   ToolbarComponent
 } from '@alfresco/aca-shared';
-import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions';
+import { DocumentListPresetRef, DynamicColumnComponent } from '@alfresco/adf-extensions';
 import { CommonModule } from '@angular/common';
 import { DocumentListModule } from '@alfresco/adf-content-services';
-import { DataTableModule, PaginationComponent, TemplateModule } from '@alfresco/adf-core';
+import { DataTableModule, EmptyContentComponent, PaginationComponent } from '@alfresco/adf-core';
 import { DocumentListDirective } from '../../directives/document-list.directive';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -47,15 +47,15 @@ import { TranslateModule } from '@ngx-translate/core';
     DocumentListModule,
     DocumentListDirective,
     ContextActionsDirective,
-    TemplateModule,
     DataTableModule,
-    ExtensionsModule,
     PaginationComponent,
     PaginationDirective,
     InfoDrawerComponent,
     PageLayoutComponent,
     TranslateModule,
-    ToolbarComponent
+    ToolbarComponent,
+    EmptyContentComponent,
+    DynamicColumnComponent
   ],
   templateUrl: './recent-files.component.html',
   encapsulation: ViewEncapsulation.None
diff --git a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.ts b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.ts
index 48bf8866bd..3b3114ec81 100644
--- a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.ts
+++ b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.ts
@@ -37,7 +37,7 @@ import {
   PaginationDirective,
   ToolbarComponent
 } from '@alfresco/aca-shared';
-import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions';
+import { DocumentListPresetRef, DynamicColumnComponent } from '@alfresco/adf-extensions';
 import { CommonModule } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
 import { SearchInputComponent } from '../search-input/search-input.component';
@@ -55,14 +55,14 @@ import { DocumentListDirective } from '../../../directives/document-list.directi
     MatProgressBarModule,
     DocumentListModule,
     DataTableModule,
-    ExtensionsModule,
     PaginationComponent,
     InfoDrawerComponent,
     ContextActionsDirective,
     DocumentListDirective,
     PaginationDirective,
     PageLayoutComponent,
-    ToolbarComponent
+    ToolbarComponent,
+    DynamicColumnComponent
   ],
   selector: 'aca-search-results',
   templateUrl: './search-libraries-results.component.html',
diff --git a/projects/aca-content/src/lib/components/search/search-results/search-results.component.ts b/projects/aca-content/src/lib/components/search/search-results/search-results.component.ts
index c1fe70c0e2..981e97b499 100644
--- a/projects/aca-content/src/lib/components/search/search-results/search-results.component.ts
+++ b/projects/aca-content/src/lib/components/search/search-results/search-results.component.ts
@@ -25,7 +25,7 @@
 import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { NodeEntry, Pagination, ResultSetPaging } from '@alfresco/js-api';
 import { ActivatedRoute, Params } from '@angular/router';
-import { AlfrescoViewerModule, DocumentListModule, SearchModule, SearchQueryBuilderService, TagService } from '@alfresco/adf-content-services';
+import { AlfrescoViewerComponent, DocumentListModule, SearchModule, SearchQueryBuilderService, TagService } from '@alfresco/adf-content-services';
 import {
   infoDrawerPreview,
   NavigateToFolder,
@@ -59,7 +59,7 @@ import { SearchActionMenuComponent } from '../search-action-menu/search-action-m
 import { TagsColumnComponent } from '../../dl-custom-components/tags-column/tags-column.component';
 import { MatIconModule } from '@angular/material/icon';
 import { SearchResultsRowComponent } from '../search-results-row/search-results-row.component';
-import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions';
+import { DocumentListPresetRef, DynamicColumnComponent } from '@alfresco/adf-extensions';
 
 @Component({
   standalone: true,
@@ -79,7 +79,6 @@ import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extension
     SearchActionMenuComponent,
     TagsColumnComponent,
     PaginationComponent,
-    AlfrescoViewerModule,
     MatIconModule,
     InfoDrawerComponent,
     SearchResultsRowComponent,
@@ -87,7 +86,8 @@ import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extension
     ViewerModule,
     PageLayoutComponent,
     ToolbarComponent,
-    ExtensionsModule
+    AlfrescoViewerComponent,
+    DynamicColumnComponent
   ],
   selector: 'aca-search-results',
   templateUrl: './search-results.component.html',
diff --git a/projects/aca-content/src/lib/components/shared-files/shared-files.component.ts b/projects/aca-content/src/lib/components/shared-files/shared-files.component.ts
index 5e71b2bbf8..3c8793aadf 100644
--- a/projects/aca-content/src/lib/components/shared-files/shared-files.component.ts
+++ b/projects/aca-content/src/lib/components/shared-files/shared-files.component.ts
@@ -34,10 +34,10 @@ import {
   PaginationDirective,
   ToolbarComponent
 } from '@alfresco/aca-shared';
-import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions';
+import { DocumentListPresetRef, DynamicColumnComponent } from '@alfresco/adf-extensions';
 import { CommonModule } from '@angular/common';
 import { DocumentListModule } from '@alfresco/adf-content-services';
-import { DataTableModule, PaginationComponent, TemplateModule } from '@alfresco/adf-core';
+import { DataTableModule, EmptyContentComponent, PaginationComponent } from '@alfresco/adf-core';
 import { DocumentListDirective } from '../../directives/document-list.directive';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -48,15 +48,15 @@ import { TranslateModule } from '@ngx-translate/core';
     DocumentListModule,
     DocumentListDirective,
     ContextActionsDirective,
-    TemplateModule,
     DataTableModule,
-    ExtensionsModule,
     PaginationComponent,
     InfoDrawerComponent,
     PaginationDirective,
     PageLayoutComponent,
     TranslateModule,
-    ToolbarComponent
+    ToolbarComponent,
+    EmptyContentComponent,
+    DynamicColumnComponent
   ],
   templateUrl: './shared-files.component.html',
   encapsulation: ViewEncapsulation.None
diff --git a/projects/aca-content/src/lib/components/sidenav/sidenav.component.ts b/projects/aca-content/src/lib/components/sidenav/sidenav.component.ts
index 690465a264..3a306d5848 100755
--- a/projects/aca-content/src/lib/components/sidenav/sidenav.component.ts
+++ b/projects/aca-content/src/lib/components/sidenav/sidenav.component.ts
@@ -23,7 +23,7 @@
  */
 
 import { Component, Input, OnInit, ViewEncapsulation, OnDestroy } from '@angular/core';
-import { ExtensionsModule, NavBarGroupRef, NavBarLinkRef } from '@alfresco/adf-extensions';
+import { DynamicExtensionComponent, NavBarGroupRef, NavBarLinkRef } from '@alfresco/adf-extensions';
 import { Store } from '@ngrx/store';
 import { AppStore, getSideNavState } from '@alfresco/aca-shared/store';
 import { Subject } from 'rxjs';
@@ -37,7 +37,7 @@ import { ExpandMenuComponent } from './components/expand-menu.component';
 
 @Component({
   standalone: true,
-  imports: [CommonModule, SidenavHeaderComponent, MatListModule, ExpandMenuComponent, ExtensionsModule],
+  imports: [CommonModule, SidenavHeaderComponent, MatListModule, ExpandMenuComponent, DynamicExtensionComponent],
   selector: 'app-sidenav',
   templateUrl: './sidenav.component.html',
   styleUrls: ['./sidenav.component.scss'],
diff --git a/projects/aca-content/src/lib/components/toolbar/toggle-favorite-library/toggle-favorite-library.component.ts b/projects/aca-content/src/lib/components/toolbar/toggle-favorite-library/toggle-favorite-library.component.ts
index 9ab6f6dbd6..b36c7a0e65 100644
--- a/projects/aca-content/src/lib/components/toolbar/toggle-favorite-library/toggle-favorite-library.component.ts
+++ b/projects/aca-content/src/lib/components/toolbar/toggle-favorite-library/toggle-favorite-library.component.ts
@@ -32,13 +32,13 @@ import { Router } from '@angular/router';
 import { Subject } from 'rxjs';
 import { CommonModule } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
-import { ContentDirectiveModule } from '@alfresco/adf-content-services';
+import { LibraryFavoriteDirective } from '@alfresco/adf-content-services';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
 
 @Component({
   standalone: true,
-  imports: [CommonModule, TranslateModule, ContentDirectiveModule, MatIconModule, MatMenuModule],
+  imports: [CommonModule, TranslateModule, MatIconModule, MatMenuModule, LibraryFavoriteDirective],
   selector: 'app-toggle-favorite-library',
   template: `
     <button
diff --git a/projects/aca-content/src/lib/components/toolbar/toggle-favorite/toggle-favorite.component.ts b/projects/aca-content/src/lib/components/toolbar/toggle-favorite/toggle-favorite.component.ts
index 259d37446b..a95e0d329c 100644
--- a/projects/aca-content/src/lib/components/toolbar/toggle-favorite/toggle-favorite.component.ts
+++ b/projects/aca-content/src/lib/components/toolbar/toggle-favorite/toggle-favorite.component.ts
@@ -29,14 +29,14 @@ import { SelectionState } from '@alfresco/adf-extensions';
 import { AppStore, ReloadDocumentListAction, getAppSelection } from '@alfresco/aca-shared/store';
 import { Router } from '@angular/router';
 import { CommonModule } from '@angular/common';
-import { ContentDirectiveModule } from '@alfresco/adf-content-services';
+import { NodeFavoriteDirective } from '@alfresco/adf-content-services';
 import { MatIconModule } from '@angular/material/icon';
 import { TranslateModule } from '@ngx-translate/core';
 import { MatMenuModule } from '@angular/material/menu';
 
 @Component({
   standalone: true,
-  imports: [CommonModule, TranslateModule, ContentDirectiveModule, MatIconModule, MatMenuModule],
+  imports: [CommonModule, TranslateModule, MatIconModule, MatMenuModule, NodeFavoriteDirective],
   selector: 'app-toggle-favorite',
   template: `
     <button mat-menu-item #favorites="adfFavorite" (toggle)="onToggleEvent()" [adf-node-favorite]="(selection$ | async).nodes">
diff --git a/projects/aca-content/src/lib/components/toolbar/toggle-join-library/toggle-join-library-button.component.ts b/projects/aca-content/src/lib/components/toolbar/toggle-join-library/toggle-join-library-button.component.ts
index e6b6955ae4..97f7ac0e85 100644
--- a/projects/aca-content/src/lib/components/toolbar/toggle-join-library/toggle-join-library-button.component.ts
+++ b/projects/aca-content/src/lib/components/toolbar/toggle-join-library/toggle-join-library-button.component.ts
@@ -35,7 +35,7 @@ import { ProfileState, SelectionState } from '@alfresco/adf-extensions';
 import { Component, ViewEncapsulation } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { ContentDirectiveModule, LibraryMembershipErrorEvent, LibraryMembershipToggleEvent } from '@alfresco/adf-content-services';
+import { LibraryMembershipDirective, LibraryMembershipErrorEvent, LibraryMembershipToggleEvent } from '@alfresco/adf-content-services';
 import { CommonModule } from '@angular/common';
 import { MatButtonModule } from '@angular/material/button';
 import { TranslateModule } from '@ngx-translate/core';
@@ -43,7 +43,7 @@ import { MatIconModule } from '@angular/material/icon';
 
 @Component({
   standalone: true,
-  imports: [CommonModule, TranslateModule, MatButtonModule, ContentDirectiveModule, MatIconModule],
+  imports: [CommonModule, TranslateModule, MatButtonModule, MatIconModule, LibraryMembershipDirective],
   selector: 'app-toggle-join-library-button',
   template: `
     <button
diff --git a/projects/aca-content/src/lib/components/toolbar/toggle-join-library/toggle-join-library-menu.component.ts b/projects/aca-content/src/lib/components/toolbar/toggle-join-library/toggle-join-library-menu.component.ts
index d554aaac97..62391af710 100644
--- a/projects/aca-content/src/lib/components/toolbar/toggle-join-library/toggle-join-library-menu.component.ts
+++ b/projects/aca-content/src/lib/components/toolbar/toggle-join-library/toggle-join-library-menu.component.ts
@@ -29,13 +29,13 @@ import { AppStore } from '@alfresco/aca-shared/store';
 import { ToggleJoinLibraryButtonComponent } from './toggle-join-library-button.component';
 import { CommonModule } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
-import { ContentDirectiveModule } from '@alfresco/adf-content-services';
+import { LibraryMembershipDirective } from '@alfresco/adf-content-services';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
 
 @Component({
   standalone: true,
-  imports: [CommonModule, TranslateModule, ContentDirectiveModule, MatIconModule, MatMenuModule],
+  imports: [CommonModule, TranslateModule, MatIconModule, MatMenuModule, LibraryMembershipDirective],
   selector: 'app-toggle-join-library-menu',
   template: `
     <button
diff --git a/projects/aca-content/src/lib/components/trashcan/trashcan.component.ts b/projects/aca-content/src/lib/components/trashcan/trashcan.component.ts
index 941bc0baba..d1b4cc7fb7 100644
--- a/projects/aca-content/src/lib/components/trashcan/trashcan.component.ts
+++ b/projects/aca-content/src/lib/components/trashcan/trashcan.component.ts
@@ -23,13 +23,13 @@
  */
 
 import { getUserProfile } from '@alfresco/aca-shared/store';
-import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions';
+import { DocumentListPresetRef, DynamicColumnComponent } from '@alfresco/adf-extensions';
 import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { ContextActionsDirective, PageComponent, PageLayoutComponent, PaginationDirective, ToolbarComponent } from '@alfresco/aca-shared';
 import { CommonModule } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
 import { DocumentListModule } from '@alfresco/adf-content-services';
-import { DataTableModule, PaginationComponent, TemplateModule } from '@alfresco/adf-core';
+import { DataTableModule, EmptyContentComponent, PaginationComponent } from '@alfresco/adf-core';
 import { DocumentListDirective } from '../../directives/document-list.directive';
 
 @Component({
@@ -38,15 +38,15 @@ import { DocumentListDirective } from '../../directives/document-list.directive'
     CommonModule,
     TranslateModule,
     DocumentListModule,
-    TemplateModule,
     PaginationComponent,
     DataTableModule,
-    ExtensionsModule,
     DocumentListDirective,
     ContextActionsDirective,
     PaginationDirective,
     PageLayoutComponent,
-    ToolbarComponent
+    ToolbarComponent,
+    EmptyContentComponent,
+    DynamicColumnComponent
   ],
   templateUrl: './trashcan.component.html',
   encapsulation: ViewEncapsulation.None
diff --git a/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.ts b/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.ts
index cf2c39bec1..10851d0242 100644
--- a/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.ts
+++ b/projects/aca-shared/src/lib/components/toolbar/toolbar-action/toolbar-action.component.ts
@@ -23,7 +23,7 @@
  */
 
 import { Component, ViewEncapsulation, ChangeDetectionStrategy, Input, DoCheck, ChangeDetectorRef } from '@angular/core';
-import { ContentActionRef, ExtensionsModule } from '@alfresco/adf-extensions';
+import { ContentActionRef, DynamicExtensionComponent } from '@alfresco/adf-extensions';
 import { ToolbarButtonComponent, ToolbarButtonType } from '../toolbar-button/toolbar-button.component';
 import { ThemePalette } from '@angular/material/core';
 import { CommonModule } from '@angular/common';
@@ -31,7 +31,7 @@ import { ToolbarMenuComponent } from '../toolbar-menu/toolbar-menu.component';
 
 @Component({
   standalone: true,
-  imports: [CommonModule, ExtensionsModule, ToolbarButtonComponent, ToolbarMenuComponent],
+  imports: [CommonModule, ToolbarButtonComponent, ToolbarMenuComponent, DynamicExtensionComponent],
   selector: 'aca-toolbar-action',
   templateUrl: './toolbar-action.component.html',
   styleUrls: ['./toolbar-action.component.scss'],
diff --git a/projects/aca-shared/src/lib/components/toolbar/toolbar-menu-item/toolbar-menu-item.component.ts b/projects/aca-shared/src/lib/components/toolbar/toolbar-menu-item/toolbar-menu-item.component.ts
index 5fe509dd17..d37546902f 100644
--- a/projects/aca-shared/src/lib/components/toolbar/toolbar-menu-item/toolbar-menu-item.component.ts
+++ b/projects/aca-shared/src/lib/components/toolbar/toolbar-menu-item/toolbar-menu-item.component.ts
@@ -23,17 +23,17 @@
  */
 
 import { Component, Input, ViewChild, ViewEncapsulation } from '@angular/core';
-import { ContentActionRef, ExtensionsModule } from '@alfresco/adf-extensions';
+import { ContentActionRef, DynamicExtensionComponent } from '@alfresco/adf-extensions';
 import { AppExtensionService } from '../../../services/app.extension.service';
 import { MatMenuItem, MatMenuModule } from '@angular/material/menu';
 import { CommonModule } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
-import { IconModule } from '@alfresco/adf-core';
 import { MatDividerModule } from '@angular/material/divider';
+import { IconComponent } from '@alfresco/adf-core';
 
 @Component({
   standalone: true,
-  imports: [CommonModule, TranslateModule, IconModule, MatMenuModule, MatDividerModule, ExtensionsModule],
+  imports: [CommonModule, TranslateModule, MatMenuModule, MatDividerModule, IconComponent, DynamicExtensionComponent],
   selector: 'app-toolbar-menu-item',
   templateUrl: './toolbar-menu-item.component.html',
   styles: [
diff --git a/projects/aca-shared/src/lib/components/toolbar/toolbar-menu/toolbar-menu.component.ts b/projects/aca-shared/src/lib/components/toolbar/toolbar-menu/toolbar-menu.component.ts
index 6a430424e1..4ddb0f7a0d 100644
--- a/projects/aca-shared/src/lib/components/toolbar/toolbar-menu/toolbar-menu.component.ts
+++ b/projects/aca-shared/src/lib/components/toolbar/toolbar-menu/toolbar-menu.component.ts
@@ -23,18 +23,18 @@
  */
 
 import { Component, Input, ViewEncapsulation, HostListener, ViewChild, ViewChildren, QueryList, AfterViewInit, OnInit } from '@angular/core';
-import { ContentActionRef, ExtensionsModule } from '@alfresco/adf-extensions';
+import { ContentActionRef, DynamicExtensionComponent } from '@alfresco/adf-extensions';
 import { MatMenu, MatMenuItem, MatMenuModule, MatMenuTrigger } from '@angular/material/menu';
 import { ThemePalette } from '@angular/material/core';
 import { ToolbarMenuItemComponent } from '../toolbar-menu-item/toolbar-menu-item.component';
 import { CommonModule } from '@angular/common';
 import { MatButtonModule } from '@angular/material/button';
 import { TranslateModule } from '@ngx-translate/core';
-import { IconModule } from '@alfresco/adf-core';
+import { IconComponent } from '@alfresco/adf-core';
 
 @Component({
   standalone: true,
-  imports: [CommonModule, TranslateModule, MatButtonModule, MatMenuModule, IconModule, ExtensionsModule, ToolbarMenuItemComponent],
+  imports: [CommonModule, TranslateModule, MatButtonModule, MatMenuModule, ToolbarMenuItemComponent, IconComponent, DynamicExtensionComponent],
   selector: 'app-toolbar-menu',
   templateUrl: './toolbar-menu.component.html',
   encapsulation: ViewEncapsulation.None,
diff --git a/projects/aca-shared/src/lib/deprecated/shared-toolbar.module.ts b/projects/aca-shared/src/lib/deprecated/shared-toolbar.module.ts
index 9a94737db2..09f27f9e0e 100644
--- a/projects/aca-shared/src/lib/deprecated/shared-toolbar.module.ts
+++ b/projects/aca-shared/src/lib/deprecated/shared-toolbar.module.ts
@@ -23,9 +23,6 @@
  */
 
 import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { CoreModule } from '@alfresco/adf-core';
-import { ExtensionsModule } from '@alfresco/adf-extensions';
 import { ToolbarButtonComponent } from '../components/toolbar/toolbar-button/toolbar-button.component';
 import { ToolbarActionComponent } from '../components/toolbar/toolbar-action/toolbar-action.component';
 import { ToolbarMenuItemComponent } from '../components/toolbar/toolbar-menu-item/toolbar-menu-item.component';
@@ -33,15 +30,7 @@ import { ToolbarMenuComponent } from '../components/toolbar/toolbar-menu/toolbar
 
 // @deprecated
 @NgModule({
-  imports: [
-    CommonModule,
-    CoreModule,
-    ExtensionsModule,
-    ToolbarButtonComponent,
-    ToolbarActionComponent,
-    ToolbarMenuItemComponent,
-    ToolbarMenuComponent
-  ],
+  imports: [ToolbarButtonComponent, ToolbarActionComponent, ToolbarMenuItemComponent, ToolbarMenuComponent],
   exports: [ToolbarButtonComponent, ToolbarActionComponent, ToolbarMenuItemComponent, ToolbarMenuComponent]
 })
 export class SharedToolbarModule {}