diff --git a/e2e/utilities/repo-client/apis/sites/sites-api.ts b/e2e/utilities/repo-client/apis/sites/sites-api.ts
index cfff6c340..13f4b915b 100755
--- a/e2e/utilities/repo-client/apis/sites/sites-api.ts
+++ b/e2e/utilities/repo-client/apis/sites/sites-api.ts
@@ -24,10 +24,9 @@
  */
 
 import { RepoApi } from '../repo-api';
-import { SiteBody, SiteMemberRoleBody, SiteMemberBody, SiteEntry, SiteMembershipRequestEntry } from '@alfresco/js-api';
+import { SiteBody, SiteMemberRoleBody, SiteMemberBody, SiteEntry, SiteMembershipRequestEntry, SitesApi as AdfSiteApi } from '@alfresco/js-api';
 import { SITE_VISIBILITY } from '../../../../configs';
 import { Utils } from '../../../../utilities/utils';
-import { SitesApi as AdfSiteApi } from '@alfresco/js-api';
 
 export class SitesApi extends RepoApi {
   sitesApi = new AdfSiteApi(this.alfrescoJsApi);
diff --git a/projects/aca-shared/src/lib/routing/shared.guard.ts b/projects/aca-shared/src/lib/routing/shared.guard.ts
index bb491f7c4..f2f06bb63 100644
--- a/projects/aca-shared/src/lib/routing/shared.guard.ts
+++ b/projects/aca-shared/src/lib/routing/shared.guard.ts
@@ -24,9 +24,8 @@
  */
 
 import { Injectable } from '@angular/core';
-import { CanActivate } from '@angular/router';
+import { CanActivate, ActivatedRouteSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
-import { ActivatedRouteSnapshot } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { AppStore, isQuickShareEnabled } from '@alfresco/aca-shared/store';
 
diff --git a/src/app/components/context-menu/context-menu.service.spec.ts b/src/app/components/context-menu/context-menu.service.spec.ts
index a21d19e39..db0c30fb3 100644
--- a/src/app/components/context-menu/context-menu.service.spec.ts
+++ b/src/app/components/context-menu/context-menu.service.spec.ts
@@ -28,10 +28,9 @@ import { Overlay } from '@angular/cdk/overlay';
 import { Injector } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { of } from 'rxjs';
-import { CoreModule } from '@alfresco/adf-core';
+import { CoreModule, UserPreferencesService } from '@alfresco/adf-core';
 import { ContextMenuService } from './context-menu.service';
 import { ContextMenuModule } from './context-menu.module';
-import { UserPreferencesService } from '@alfresco/adf-core';
 
 describe('ContextMenuService', () => {
   let contextMenuService;
diff --git a/src/app/components/favorite-libraries/favorite-libraries.component.spec.ts b/src/app/components/favorite-libraries/favorite-libraries.component.spec.ts
index 3671bb482..50601b881 100644
--- a/src/app/components/favorite-libraries/favorite-libraries.component.spec.ts
+++ b/src/app/components/favorite-libraries/favorite-libraries.component.spec.ts
@@ -25,13 +25,13 @@
 
 import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { UserPreferencesService } from '@alfresco/adf-core';
 import { Router } from '@angular/router';
 import {
   AlfrescoApiService,
   NodeFavoriteDirective,
   DataTableComponent,
-  AppConfigPipe
+  AppConfigPipe,
+  UserPreferencesService
 } from '@alfresco/adf-core';
 import { DocumentListComponent } from '@alfresco/adf-content-services';
 import { FavoriteLibrariesComponent } from './favorite-libraries.component';
diff --git a/src/app/components/files/files.component.ts b/src/app/components/files/files.component.ts
index 1e9424175..b8c4f1766 100644
--- a/src/app/components/files/files.component.ts
+++ b/src/app/components/files/files.component.ts
@@ -35,11 +35,14 @@ import {
 } from '@alfresco/js-api';
 import { ContentManagementService } from '../../services/content-management.service';
 import { NodeActionsService } from '../../services/node-actions.service';
-import { AppStore } from '@alfresco/aca-shared/store';
 import { PageComponent } from '../page.component';
 import { ContentApiService } from '@alfresco/aca-shared';
 import { AppExtensionService } from '../../extensions/extension.service';
-import { SetCurrentFolderAction, isAdmin } from '@alfresco/aca-shared/store';
+import {
+  SetCurrentFolderAction,
+  isAdmin,
+  AppStore
+} from '@alfresco/aca-shared/store';
 import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
 import { debounceTime, takeUntil } from 'rxjs/operators';
 import { ShareDataRow } from '@alfresco/adf-content-services';
diff --git a/src/app/components/layout/app-layout/app-layout.component.spec.ts b/src/app/components/layout/app-layout/app-layout.component.spec.ts
index bef3918cd..9ed6baa1b 100644
--- a/src/app/components/layout/app-layout/app-layout.component.spec.ts
+++ b/src/app/components/layout/app-layout/app-layout.component.spec.ts
@@ -29,10 +29,13 @@ import { AppConfigService, UserPreferencesService } from '@alfresco/adf-core';
 import { AppLayoutComponent } from './app-layout.component';
 import { AppTestingModule } from '../../../testing/app-testing.module';
 import { Store } from '@ngrx/store';
-import { AppStore, SetSelectedNodesAction } from '@alfresco/aca-shared/store';
+import {
+  AppStore,
+  SetSelectedNodesAction,
+  ResetSelectionAction
+} from '@alfresco/aca-shared/store';
 import { Router, NavigationStart } from '@angular/router';
 import { Subject } from 'rxjs';
-import { ResetSelectionAction } from '@alfresco/aca-shared/store';
 
 class MockRouter {
   private url = 'some-url';
diff --git a/src/app/components/preview/preview.component.ts b/src/app/components/preview/preview.component.ts
index f2224cac6..e0211aa4b 100644
--- a/src/app/components/preview/preview.component.ts
+++ b/src/app/components/preview/preview.component.ts
@@ -49,9 +49,9 @@ import { Store } from '@ngrx/store';
 import {
   AppStore,
   ClosePreviewAction,
-  ViewerActionTypes
+  ViewerActionTypes,
+  SetSelectedNodesAction
 } from '@alfresco/aca-shared/store';
-import { SetSelectedNodesAction } from '@alfresco/aca-shared/store';
 import { PageComponent } from '../page.component';
 import { ContentApiService } from '@alfresco/aca-shared';
 import { AppExtensionService } from '../../extensions/extension.service';
diff --git a/src/app/components/search/search-libraries-results/search-libraries-results.component.ts b/src/app/components/search/search-libraries-results/search-libraries-results.component.ts
index 87afb8513..691591dd7 100644
--- a/src/app/components/search/search-libraries-results/search-libraries-results.component.ts
+++ b/src/app/components/search/search-libraries-results/search-libraries-results.component.ts
@@ -23,7 +23,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { NavigateLibraryAction } from '@alfresco/aca-shared/store';
+import { NavigateLibraryAction, AppStore } from '@alfresco/aca-shared/store';
 import { NodePaging, Pagination, SiteEntry } from '@alfresco/js-api';
 import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
 import { Component, OnInit } from '@angular/core';
@@ -31,7 +31,6 @@ import { ActivatedRoute, Params } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { AppExtensionService } from '../../../extensions/extension.service';
 import { ContentManagementService } from '../../../services/content-management.service';
-import { AppStore } from '@alfresco/aca-shared/store';
 import { PageComponent } from '../../page.component';
 import { SearchLibrariesQueryBuilderService } from './search-libraries-query-builder.service';
 
diff --git a/src/app/components/viewer/viewer.component.ts b/src/app/components/viewer/viewer.component.ts
index 69b4d0764..46d62e8e0 100644
--- a/src/app/components/viewer/viewer.component.ts
+++ b/src/app/components/viewer/viewer.component.ts
@@ -31,10 +31,11 @@ import {
   SetSelectedNodesAction,
   ClosePreviewAction,
   ViewerActionTypes,
-  ViewNodeAction
+  ViewNodeAction,
+  ReloadDocumentListAction
 } from '@alfresco/aca-shared/store';
 import { ContentActionRef, SelectionState } from '@alfresco/adf-extensions';
-import { MinimalNodeEntryEntity } from '@alfresco/js-api';
+import { MinimalNodeEntryEntity, SearchRequest } from '@alfresco/js-api';
 import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
 import { ActivatedRoute, Router, PRIMARY_OUTLET } from '@angular/router';
 import {
@@ -49,8 +50,6 @@ import { from, Observable, Subject } from 'rxjs';
 import { takeUntil, debounceTime } from 'rxjs/operators';
 import { AppExtensionService } from '../../extensions/extension.service';
 import { Actions, ofType } from '@ngrx/effects';
-import { SearchRequest } from '@alfresco/js-api';
-import { ReloadDocumentListAction } from '@alfresco/aca-shared/store';
 @Component({
   selector: 'app-viewer',
   templateUrl: './viewer.component.html',
diff --git a/src/app/services/content-management.service.ts b/src/app/services/content-management.service.ts
index 35a2864b5..63ecf1e3e 100644
--- a/src/app/services/content-management.service.ts
+++ b/src/app/services/content-management.service.ts
@@ -23,7 +23,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { ContentApiService } from '@alfresco/aca-shared';
+import { ContentApiService, NodePermissionService } from '@alfresco/aca-shared';
 import {
   AppStore,
   DeletedNodeInfo,
@@ -69,7 +69,6 @@ import { NodePermissionsDialogComponent } from '../components/permissions/permis
 import { NodeVersionUploadDialogComponent } from '../dialogs/node-version-upload/node-version-upload.dialog';
 import { NodeVersionsDialogComponent } from '../dialogs/node-versions/node-versions.dialog';
 import { NodeActionsService } from './node-actions.service';
-import { NodePermissionService } from '@alfresco/aca-shared';
 
 interface RestoredNode {
   status: number;
diff --git a/tslint.json b/tslint.json
index eec9b8003..56115bf1a 100644
--- a/tslint.json
+++ b/tslint.json
@@ -36,6 +36,7 @@
     "no-console": [true, "debug", "info", "time", "timeEnd", "trace"],
     "no-construct": true,
     "no-debugger": true,
+    "no-duplicate-imports": true,
     "no-duplicate-super": true,
     "no-empty": false,
     "no-empty-interface": true,