diff --git a/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts b/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts
index 9ccbba5be..4a455bf39 100644
--- a/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts
@@ -8,6 +8,7 @@ import { EntityInfoComponent } from './screens/entity-info/entity-info.component
 import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor';
 import { SharedAdminModule } from '../../shared/shared-admin.module';
 import { TranslateModule } from '@ngx-translate/core';
+import { IqserScrollbarModule } from '@iqser/common-ui';
 
 const routes: Routes = [
     { path: '', redirectTo: 'info', pathMatch: 'full' },
@@ -35,6 +36,14 @@ const routes: Routes = [
 
 @NgModule({
     declarations: [DictionaryScreenComponent, EntityInfoComponent],
-    imports: [RouterModule.forChild(routes), SharedAdminModule, CommonModule, SharedModule, MonacoEditorModule, TranslateModule],
+    imports: [
+        RouterModule.forChild(routes),
+        SharedAdminModule,
+        CommonModule,
+        SharedModule,
+        MonacoEditorModule,
+        TranslateModule,
+        IqserScrollbarModule,
+    ],
 })
 export class EntitiesModule {}
diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts
index 5bc50e910..a578e1d2e 100644
--- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts
@@ -4,7 +4,14 @@ import { RouterModule } from '@angular/router';
 import { SharedModule } from '@shared/shared.module';
 import { WatermarkScreenComponent } from './watermark-screen/watermark-screen.component';
 import { WatermarksListingScreenComponent } from './watermarks-listing/watermarks-listing-screen.component';
-import { CompositeRouteGuard, IqserAuthGuard, IqserButtonsModule, IqserListingModule, IqserUsersModule } from '@iqser/common-ui';
+import {
+    CompositeRouteGuard,
+    IqserAuthGuard,
+    IqserButtonsModule,
+    IqserListingModule,
+    IqserScrollbarModule,
+    IqserUsersModule,
+} from '@iqser/common-ui';
 import { RedRoleGuard } from '@users/red-role.guard';
 import { WATERMARK_ID } from '@red/domain';
 import { WatermarkExistsGuard } from '@guards/watermark-exists.guard';
@@ -47,6 +54,7 @@ const routes = [
         TranslateModule,
         IqserButtonsModule,
         IqserListingModule,
+        IqserScrollbarModule,
     ],
 })
 export class WatermarkModule {}
diff --git a/apps/red-ui/src/app/modules/archive/archive.module.ts b/apps/red-ui/src/app/modules/archive/archive.module.ts
index d67910dfe..0189447e8 100644
--- a/apps/red-ui/src/app/modules/archive/archive.module.ts
+++ b/apps/red-ui/src/app/modules/archive/archive.module.ts
@@ -6,7 +6,7 @@ import { TableItemComponent } from './components/table-item/table-item.component
 import { SharedModule } from '@shared/shared.module';
 import { ConfigService } from './services/config.service';
 import { SharedDossiersModule } from '../shared-dossiers/shared-dossiers.module';
-import { IqserHelpModeModule, IqserListingModule, IqserUsersModule } from '@iqser/common-ui';
+import { IqserButtonsModule, IqserHelpModeModule, IqserListingModule, IqserUsersModule } from '@iqser/common-ui';
 import { TranslateModule } from '@ngx-translate/core';
 
 const components = [TableItemComponent];
@@ -23,6 +23,7 @@ const screens = [ArchivedDossiersScreenComponent];
         IqserUsersModule,
         TranslateModule,
         IqserListingModule,
+        IqserButtonsModule,
     ],
     providers: [ConfigService],
 })
diff --git a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts
index a77129f1d..179573a10 100644
--- a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts
+++ b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts
@@ -8,6 +8,7 @@ import {
     IqserIconsModule,
     IqserListingModule,
     IqserLoadingModule,
+    IqserScrollbarModule,
     IqserSharedModule,
     IqserUsersModule,
 } from '@iqser/common-ui';
@@ -59,6 +60,7 @@ const routes: Routes = [
         IqserButtonsModule,
         IqserLoadingModule,
         IqserSharedModule,
+        IqserScrollbarModule,
     ],
 })
 export class DossierOverviewModule {}
diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview.module.ts b/apps/red-ui/src/app/modules/file-preview/file-preview.module.ts
index 4df9b975e..df268de84 100644
--- a/apps/red-ui/src/app/modules/file-preview/file-preview.module.ts
+++ b/apps/red-ui/src/app/modules/file-preview/file-preview.module.ts
@@ -8,6 +8,7 @@ import {
     IqserHelpModeModule,
     IqserIconsModule,
     IqserInputsModule,
+    IqserScrollbarModule,
     IqserSharedModule,
     IqserUploadFileModule,
     IqserUsersModule,
@@ -113,6 +114,7 @@ const components = [
         IqserUploadFileModule,
         IqserEmptyStatesModule,
         IqserFiltersModule,
+        IqserScrollbarModule,
     ],
     providers: [FilePreviewDialogService, ManualRedactionService, DocumentUnloadedGuard],
 })
diff --git a/apps/red-ui/src/app/modules/shared/shared.module.ts b/apps/red-ui/src/app/modules/shared/shared.module.ts
index c5c2ae283..a7488077c 100644
--- a/apps/red-ui/src/app/modules/shared/shared.module.ts
+++ b/apps/red-ui/src/app/modules/shared/shared.module.ts
@@ -8,7 +8,7 @@ import { IconsModule } from '../icons/icons.module';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { AnnotationIconComponent } from './components/annotation-icon/annotation-icon.component';
 import { DonutChartComponent } from './components/donut-chart/donut-chart.component';
-import { IqserButtonsModule, IqserHelpModeModule, IqserSharedModule, IqserUsersModule } from '@iqser/common-ui';
+import { IqserButtonsModule, IqserHelpModeModule, IqserScrollbarModule, IqserSharedModule, IqserUsersModule } from '@iqser/common-ui';
 import { SelectComponent } from './components/select/select.component';
 import { NavigateLastDossiersScreenDirective } from './directives/navigate-last-dossiers-screen.directive';
 import { DictionaryManagerComponent } from './components/dictionary-manager/dictionary-manager.component';
@@ -78,6 +78,7 @@ const modules = [MatConfigModule, ScrollingModule, IconsModule, FormsModule, Rea
         IqserUsersModule,
         IqserButtonsModule,
         IqserSharedModule,
+        IqserScrollbarModule,
     ],
     exports: [...modules, ...components, ...utils],
     providers: [
diff --git a/libs/common-ui b/libs/common-ui
index 9280ea8e5..3117c83d7 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 9280ea8e525c2f4e2ee6e5b5b81900d02c8fc662
+Subproject commit 3117c83d772b950ea36656a266136b5d1612869a