diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index bca1bfd0fdb..9c937fa05e7 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -27,7 +27,7 @@ import { NgxWebstorageModule } from 'ngx-webstorage';
 import { IcuMissingTranslationHandler } from 'app/core/classes/icu-missing-translation-handler';
 import { createTranslateLoader } from 'app/core/classes/icu-translations-loader';
 import { MockEnclosureWebsocketService } from 'app/core/testing/mock-enclosure/mock-enclosure-websocket.service';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { getWindow, WINDOW } from 'app/helpers/window.helper';
 import { DialogModule } from 'app/modules/dialog/dialog.module';
 import { FeedbackModule } from 'app/modules/feedback/feedback.module';
diff --git a/src/app/directives/common/app-let.directive.ts b/src/app/directives/app-let.directive.ts
similarity index 100%
rename from src/app/directives/common/app-let.directive.ts
rename to src/app/directives/app-let.directive.ts
diff --git a/src/app/directives/common/autofocus/autofocus.directive.spec.ts b/src/app/directives/autofocus/autofocus.directive.spec.ts
similarity index 85%
rename from src/app/directives/common/autofocus/autofocus.directive.spec.ts
rename to src/app/directives/autofocus/autofocus.directive.spec.ts
index 1529353fbae..898f591567c 100644
--- a/src/app/directives/common/autofocus/autofocus.directive.spec.ts
+++ b/src/app/directives/autofocus/autofocus.directive.spec.ts
@@ -1,5 +1,5 @@
 import { createDirectiveFactory } from '@ngneat/spectator/jest';
-import { AutofocusDirective } from 'app/directives/common/autofocus/autofocus.directive';
+import { AutofocusDirective } from 'app/directives/autofocus/autofocus.directive';
 
 describe('AutofocusDirective', () => {
   const createDirective = createDirectiveFactory({
diff --git a/src/app/directives/common/autofocus/autofocus.directive.ts b/src/app/directives/autofocus/autofocus.directive.ts
similarity index 100%
rename from src/app/directives/common/autofocus/autofocus.directive.ts
rename to src/app/directives/autofocus/autofocus.directive.ts
diff --git a/src/app/directives/common/common-directives.module.ts b/src/app/directives/common-directives.module.ts
similarity index 56%
rename from src/app/directives/common/common-directives.module.ts
rename to src/app/directives/common-directives.module.ts
index 648611e2ebc..97524b20cf4 100644
--- a/src/app/directives/common/common-directives.module.ts
+++ b/src/app/directives/common-directives.module.ts
@@ -5,24 +5,24 @@ import { MatTooltipModule } from '@angular/material/tooltip';
 import { TranslateModule } from '@ngx-translate/core';
 import { Ng2FittextModule } from 'ng2-fittext';
 import { NgxPopperjsModule } from 'ngx-popperjs';
-import { AutofocusDirective } from 'app/directives/common/autofocus/autofocus.directive';
-import { IxDetailsHeightDirective } from 'app/directives/common/details-height/details-height.directive';
-import { DisableFocusableElementsDirective } from 'app/directives/common/disable-focusable-elements/disable-focusable-elements.directive';
-import { HasAccessDirective } from 'app/directives/common/has-access/has-access.directive';
-import { MissingAccessWrapperComponent } from 'app/directives/common/has-access/missing-access-wrapper.component';
-import { HasRoleDirective } from 'app/directives/common/has-role/has-role.directive';
-import { IfNightlyDirective } from 'app/directives/common/if-nightly/if-nightly.directive';
-import { NavigateAndInteractDirective } from 'app/directives/common/navigate-and-interact/navigate-and-interact.directive';
-import { NewFeatureIndicatorWrapperComponent } from 'app/directives/common/new-feature-indicator/new-feature-indicator-wrapper.component';
-import { NewFeatureIndicatorDirective } from 'app/directives/common/new-feature-indicator/new-feature-indicator.directive';
-import { NewFeatureIndicatorService } from 'app/directives/common/new-feature-indicator/new-feature-indicator.service';
-import { RequiresRolesDirective } from 'app/directives/common/requires-roles/requires-roles.directive';
-import { StepActivationDirective } from 'app/directives/common/step-activation.directive';
+import { AutofocusDirective } from 'app/directives/autofocus/autofocus.directive';
+import { IxDetailsHeightDirective } from 'app/directives/details-height/details-height.directive';
+import { DisableFocusableElementsDirective } from 'app/directives/disable-focusable-elements/disable-focusable-elements.directive';
+import { HasAccessDirective } from 'app/directives/has-access/has-access.directive';
+import { MissingAccessWrapperComponent } from 'app/directives/has-access/missing-access-wrapper.component';
+import { HasRoleDirective } from 'app/directives/has-role/has-role.directive';
+import { IfNightlyDirective } from 'app/directives/if-nightly/if-nightly.directive';
+import { NavigateAndInteractDirective } from 'app/directives/navigate-and-interact/navigate-and-interact.directive';
+import { NewFeatureIndicatorWrapperComponent } from 'app/directives/new-feature-indicator/new-feature-indicator-wrapper.component';
+import { NewFeatureIndicatorDirective } from 'app/directives/new-feature-indicator/new-feature-indicator.directive';
+import { NewFeatureIndicatorService } from 'app/directives/new-feature-indicator/new-feature-indicator.service';
+import { RequiresRolesDirective } from 'app/directives/requires-roles/requires-roles.directive';
+import { StepActivationDirective } from 'app/directives/step-activation.directive';
 import {
   TextLimiterTooltipComponent,
-} from 'app/directives/common/text-limiter/text-limiter-tooltip/text-limiter-tooltip.component';
-import { TextLimiterDirective } from 'app/directives/common/text-limiter/text-limiter.directive';
-import { UiSearchDirective } from 'app/directives/common/ui-search.directive';
+} from 'app/directives/text-limiter/text-limiter-tooltip/text-limiter-tooltip.component';
+import { TextLimiterDirective } from 'app/directives/text-limiter/text-limiter.directive';
+import { UiSearchDirective } from 'app/directives/ui-search.directive';
 import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module';
 import { CastPipe } from 'app/modules/pipes/cast/cast.pipe';
 import { TestIdModule } from 'app/modules/test-id/test-id.module';
diff --git a/src/app/directives/common/details-height/details-height.directive.ts b/src/app/directives/details-height/details-height.directive.ts
similarity index 100%
rename from src/app/directives/common/details-height/details-height.directive.ts
rename to src/app/directives/details-height/details-height.directive.ts
diff --git a/src/app/directives/common/disable-focusable-elements/disable-focusable-elements.directive.spec.ts b/src/app/directives/disable-focusable-elements/disable-focusable-elements.directive.spec.ts
similarity index 100%
rename from src/app/directives/common/disable-focusable-elements/disable-focusable-elements.directive.spec.ts
rename to src/app/directives/disable-focusable-elements/disable-focusable-elements.directive.spec.ts
diff --git a/src/app/directives/common/disable-focusable-elements/disable-focusable-elements.directive.ts b/src/app/directives/disable-focusable-elements/disable-focusable-elements.directive.ts
similarity index 100%
rename from src/app/directives/common/disable-focusable-elements/disable-focusable-elements.directive.ts
rename to src/app/directives/disable-focusable-elements/disable-focusable-elements.directive.ts
diff --git a/src/app/directives/common/has-access/has-access.directive.spec.ts b/src/app/directives/has-access/has-access.directive.spec.ts
similarity index 91%
rename from src/app/directives/common/has-access/has-access.directive.spec.ts
rename to src/app/directives/has-access/has-access.directive.spec.ts
index 456ccdafcc1..b03c1024840 100644
--- a/src/app/directives/common/has-access/has-access.directive.spec.ts
+++ b/src/app/directives/has-access/has-access.directive.spec.ts
@@ -1,5 +1,5 @@
 import { createHostFactory } from '@ngneat/spectator/jest';
-import { HasAccessDirective } from 'app/directives/common/has-access/has-access.directive';
+import { HasAccessDirective } from 'app/directives/has-access/has-access.directive';
 
 describe('HasAccessDirective', () => {
   const createDirective = createHostFactory({
diff --git a/src/app/directives/common/has-access/has-access.directive.ts b/src/app/directives/has-access/has-access.directive.ts
similarity index 91%
rename from src/app/directives/common/has-access/has-access.directive.ts
rename to src/app/directives/has-access/has-access.directive.ts
index 95fafa7bc04..9b1f93f8d98 100644
--- a/src/app/directives/common/has-access/has-access.directive.ts
+++ b/src/app/directives/has-access/has-access.directive.ts
@@ -2,7 +2,7 @@ import {
   ComponentRef, Directive, HostBinding, Input, TemplateRef, ViewContainerRef,
 } from '@angular/core';
 import { UntilDestroy } from '@ngneat/until-destroy';
-import { MissingAccessWrapperComponent } from 'app/directives/common/has-access/missing-access-wrapper.component';
+import { MissingAccessWrapperComponent } from 'app/directives/has-access/missing-access-wrapper.component';
 
 @UntilDestroy()
 @Directive({
diff --git a/src/app/directives/common/has-access/missing-access-wrapper.component.html b/src/app/directives/has-access/missing-access-wrapper.component.html
similarity index 100%
rename from src/app/directives/common/has-access/missing-access-wrapper.component.html
rename to src/app/directives/has-access/missing-access-wrapper.component.html
diff --git a/src/app/directives/common/has-access/missing-access-wrapper.component.scss b/src/app/directives/has-access/missing-access-wrapper.component.scss
similarity index 100%
rename from src/app/directives/common/has-access/missing-access-wrapper.component.scss
rename to src/app/directives/has-access/missing-access-wrapper.component.scss
diff --git a/src/app/directives/common/has-access/missing-access-wrapper.component.ts b/src/app/directives/has-access/missing-access-wrapper.component.ts
similarity index 100%
rename from src/app/directives/common/has-access/missing-access-wrapper.component.ts
rename to src/app/directives/has-access/missing-access-wrapper.component.ts
diff --git a/src/app/directives/common/has-role/has-role.directive.spec.ts b/src/app/directives/has-role/has-role.directive.spec.ts
similarity index 95%
rename from src/app/directives/common/has-role/has-role.directive.spec.ts
rename to src/app/directives/has-role/has-role.directive.spec.ts
index 62dd0886e63..e0a9f1711f2 100644
--- a/src/app/directives/common/has-role/has-role.directive.spec.ts
+++ b/src/app/directives/has-role/has-role.directive.spec.ts
@@ -2,7 +2,7 @@ import {
   createHostFactory, mockProvider, SpectatorHost,
 } from '@ngneat/spectator/jest';
 import { BehaviorSubject } from 'rxjs';
-import { HasRoleDirective } from 'app/directives/common/has-role/has-role.directive';
+import { HasRoleDirective } from 'app/directives/has-role/has-role.directive';
 import { Role } from 'app/enums/role.enum';
 import { AuthService } from 'app/services/auth/auth.service';
 
diff --git a/src/app/directives/common/has-role/has-role.directive.ts b/src/app/directives/has-role/has-role.directive.ts
similarity index 100%
rename from src/app/directives/common/has-role/has-role.directive.ts
rename to src/app/directives/has-role/has-role.directive.ts
diff --git a/src/app/directives/common/if-nightly/if-nightly.directive.ts b/src/app/directives/if-nightly/if-nightly.directive.ts
similarity index 100%
rename from src/app/directives/common/if-nightly/if-nightly.directive.ts
rename to src/app/directives/if-nightly/if-nightly.directive.ts
diff --git a/src/app/directives/common/navigate-and-interact/navigate-and-interact.directive.spec.ts b/src/app/directives/navigate-and-interact/navigate-and-interact.directive.spec.ts
similarity index 100%
rename from src/app/directives/common/navigate-and-interact/navigate-and-interact.directive.spec.ts
rename to src/app/directives/navigate-and-interact/navigate-and-interact.directive.spec.ts
diff --git a/src/app/directives/common/navigate-and-interact/navigate-and-interact.directive.ts b/src/app/directives/navigate-and-interact/navigate-and-interact.directive.ts
similarity index 100%
rename from src/app/directives/common/navigate-and-interact/navigate-and-interact.directive.ts
rename to src/app/directives/navigate-and-interact/navigate-and-interact.directive.ts
diff --git a/src/app/directives/common/new-feature-indicator/new-feature-indicator-wrapper.component.html b/src/app/directives/new-feature-indicator/new-feature-indicator-wrapper.component.html
similarity index 100%
rename from src/app/directives/common/new-feature-indicator/new-feature-indicator-wrapper.component.html
rename to src/app/directives/new-feature-indicator/new-feature-indicator-wrapper.component.html
diff --git a/src/app/directives/common/new-feature-indicator/new-feature-indicator-wrapper.component.scss b/src/app/directives/new-feature-indicator/new-feature-indicator-wrapper.component.scss
similarity index 100%
rename from src/app/directives/common/new-feature-indicator/new-feature-indicator-wrapper.component.scss
rename to src/app/directives/new-feature-indicator/new-feature-indicator-wrapper.component.scss
diff --git a/src/app/directives/common/new-feature-indicator/new-feature-indicator-wrapper.component.ts b/src/app/directives/new-feature-indicator/new-feature-indicator-wrapper.component.ts
similarity index 80%
rename from src/app/directives/common/new-feature-indicator/new-feature-indicator-wrapper.component.ts
rename to src/app/directives/new-feature-indicator/new-feature-indicator-wrapper.component.ts
index 4e5a14fa3da..18a6aa41602 100644
--- a/src/app/directives/common/new-feature-indicator/new-feature-indicator-wrapper.component.ts
+++ b/src/app/directives/new-feature-indicator/new-feature-indicator-wrapper.component.ts
@@ -4,8 +4,8 @@ import {
 import {
   ChangeDetectionStrategy, Component, input, TemplateRef,
 } from '@angular/core';
-import { NewFeatureIndicator } from 'app/directives/common/new-feature-indicator/new-feature-indicator.interface';
-import { NewFeatureIndicatorService } from 'app/directives/common/new-feature-indicator/new-feature-indicator.service';
+import { NewFeatureIndicator } from 'app/directives/new-feature-indicator/new-feature-indicator.interface';
+import { NewFeatureIndicatorService } from 'app/directives/new-feature-indicator/new-feature-indicator.service';
 
 @Component({
   selector: 'ix-new-feature-indicator-wrapper',
diff --git a/src/app/directives/common/new-feature-indicator/new-feature-indicator.directive.spec.ts b/src/app/directives/new-feature-indicator/new-feature-indicator.directive.spec.ts
similarity index 80%
rename from src/app/directives/common/new-feature-indicator/new-feature-indicator.directive.spec.ts
rename to src/app/directives/new-feature-indicator/new-feature-indicator.directive.spec.ts
index 8eee070ed19..819736dd7d9 100644
--- a/src/app/directives/common/new-feature-indicator/new-feature-indicator.directive.spec.ts
+++ b/src/app/directives/new-feature-indicator/new-feature-indicator.directive.spec.ts
@@ -1,8 +1,8 @@
 import { createHostFactory, mockProvider } from '@ngneat/spectator/jest';
 import { of } from 'rxjs';
-import { NewFeatureIndicatorDirective } from 'app/directives/common/new-feature-indicator/new-feature-indicator.directive';
-import { NewFeatureIndicator } from 'app/directives/common/new-feature-indicator/new-feature-indicator.interface';
-import { NewFeatureIndicatorService } from 'app/directives/common/new-feature-indicator/new-feature-indicator.service';
+import { NewFeatureIndicatorDirective } from 'app/directives/new-feature-indicator/new-feature-indicator.directive';
+import { NewFeatureIndicator } from 'app/directives/new-feature-indicator/new-feature-indicator.interface';
+import { NewFeatureIndicatorService } from 'app/directives/new-feature-indicator/new-feature-indicator.service';
 
 describe('NewFeatureIndicatorDirective', () => {
   const createDirective = createHostFactory({
diff --git a/src/app/directives/common/new-feature-indicator/new-feature-indicator.directive.ts b/src/app/directives/new-feature-indicator/new-feature-indicator.directive.ts
similarity index 83%
rename from src/app/directives/common/new-feature-indicator/new-feature-indicator.directive.ts
rename to src/app/directives/new-feature-indicator/new-feature-indicator.directive.ts
index 547bb781795..b267ef0b23a 100644
--- a/src/app/directives/common/new-feature-indicator/new-feature-indicator.directive.ts
+++ b/src/app/directives/new-feature-indicator/new-feature-indicator.directive.ts
@@ -2,9 +2,9 @@ import {
   ComponentRef, Directive, Input, TemplateRef, ViewContainerRef,
 } from '@angular/core';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
-import { NewFeatureIndicatorWrapperComponent } from 'app/directives/common/new-feature-indicator/new-feature-indicator-wrapper.component';
-import { NewFeatureIndicator } from 'app/directives/common/new-feature-indicator/new-feature-indicator.interface';
-import { NewFeatureIndicatorService } from 'app/directives/common/new-feature-indicator/new-feature-indicator.service';
+import { NewFeatureIndicatorWrapperComponent } from 'app/directives/new-feature-indicator/new-feature-indicator-wrapper.component';
+import { NewFeatureIndicator } from 'app/directives/new-feature-indicator/new-feature-indicator.interface';
+import { NewFeatureIndicatorService } from 'app/directives/new-feature-indicator/new-feature-indicator.service';
 
 /**
  * Usage: adding an indicator with a hint about a new feature.
diff --git a/src/app/directives/common/new-feature-indicator/new-feature-indicator.interface.ts b/src/app/directives/new-feature-indicator/new-feature-indicator.interface.ts
similarity index 100%
rename from src/app/directives/common/new-feature-indicator/new-feature-indicator.interface.ts
rename to src/app/directives/new-feature-indicator/new-feature-indicator.interface.ts
diff --git a/src/app/directives/common/new-feature-indicator/new-feature-indicator.service.spec.ts b/src/app/directives/new-feature-indicator/new-feature-indicator.service.spec.ts
similarity index 93%
rename from src/app/directives/common/new-feature-indicator/new-feature-indicator.service.spec.ts
rename to src/app/directives/new-feature-indicator/new-feature-indicator.service.spec.ts
index 9a84f776ce4..caded1772e4 100644
--- a/src/app/directives/common/new-feature-indicator/new-feature-indicator.service.spec.ts
+++ b/src/app/directives/new-feature-indicator/new-feature-indicator.service.spec.ts
@@ -1,6 +1,6 @@
 import { createServiceFactory, SpectatorService } from '@ngneat/spectator/jest';
 import { provideMockStore } from '@ngrx/store/testing';
-import { NewFeatureIndicatorService } from 'app/directives/common/new-feature-indicator/new-feature-indicator.service';
+import { NewFeatureIndicatorService } from 'app/directives/new-feature-indicator/new-feature-indicator.service';
 import { Preferences } from 'app/interfaces/preferences.interface';
 import { selectPreferencesState } from 'app/store/preferences/preferences.selectors';
 
diff --git a/src/app/directives/common/new-feature-indicator/new-feature-indicator.service.ts b/src/app/directives/new-feature-indicator/new-feature-indicator.service.ts
similarity index 91%
rename from src/app/directives/common/new-feature-indicator/new-feature-indicator.service.ts
rename to src/app/directives/new-feature-indicator/new-feature-indicator.service.ts
index 48a7b7c7627..1b533a966d0 100644
--- a/src/app/directives/common/new-feature-indicator/new-feature-indicator.service.ts
+++ b/src/app/directives/new-feature-indicator/new-feature-indicator.service.ts
@@ -1,7 +1,7 @@
 import { EventEmitter, Injectable } from '@angular/core';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
 import { Store, select } from '@ngrx/store';
-import { NewFeatureIndicator } from 'app/directives/common/new-feature-indicator/new-feature-indicator.interface';
+import { NewFeatureIndicator } from 'app/directives/new-feature-indicator/new-feature-indicator.interface';
 import { AppState } from 'app/store';
 import { shownNewIndicatorKeysUpdated } from 'app/store/preferences/preferences.actions';
 import { selectPreferencesState } from 'app/store/preferences/preferences.selectors';
diff --git a/src/app/directives/common/requires-roles/requires-roles.directive.ts b/src/app/directives/requires-roles/requires-roles.directive.ts
similarity index 93%
rename from src/app/directives/common/requires-roles/requires-roles.directive.ts
rename to src/app/directives/requires-roles/requires-roles.directive.ts
index 7a22a601f5e..c5728b8bc5e 100644
--- a/src/app/directives/common/requires-roles/requires-roles.directive.ts
+++ b/src/app/directives/requires-roles/requires-roles.directive.ts
@@ -4,7 +4,7 @@ import {
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
 import { isEqual } from 'lodash';
 import { take } from 'rxjs';
-import { HasAccessDirective } from 'app/directives/common/has-access/has-access.directive';
+import { HasAccessDirective } from 'app/directives/has-access/has-access.directive';
 import { Role } from 'app/enums/role.enum';
 import { AuthService } from 'app/services/auth/auth.service';
 
diff --git a/src/app/directives/common/step-activation.directive.ts b/src/app/directives/step-activation.directive.ts
similarity index 100%
rename from src/app/directives/common/step-activation.directive.ts
rename to src/app/directives/step-activation.directive.ts
diff --git a/src/app/directives/common/text-limiter/text-limiter-tooltip/text-limiter-tooltip.component.html b/src/app/directives/text-limiter/text-limiter-tooltip/text-limiter-tooltip.component.html
similarity index 100%
rename from src/app/directives/common/text-limiter/text-limiter-tooltip/text-limiter-tooltip.component.html
rename to src/app/directives/text-limiter/text-limiter-tooltip/text-limiter-tooltip.component.html
diff --git a/src/app/directives/common/text-limiter/text-limiter-tooltip/text-limiter-tooltip.component.scss b/src/app/directives/text-limiter/text-limiter-tooltip/text-limiter-tooltip.component.scss
similarity index 100%
rename from src/app/directives/common/text-limiter/text-limiter-tooltip/text-limiter-tooltip.component.scss
rename to src/app/directives/text-limiter/text-limiter-tooltip/text-limiter-tooltip.component.scss
diff --git a/src/app/directives/common/text-limiter/text-limiter-tooltip/text-limiter-tooltip.component.ts b/src/app/directives/text-limiter/text-limiter-tooltip/text-limiter-tooltip.component.ts
similarity index 100%
rename from src/app/directives/common/text-limiter/text-limiter-tooltip/text-limiter-tooltip.component.ts
rename to src/app/directives/text-limiter/text-limiter-tooltip/text-limiter-tooltip.component.ts
diff --git a/src/app/directives/common/text-limiter/text-limiter.directive.ts b/src/app/directives/text-limiter/text-limiter.directive.ts
similarity index 94%
rename from src/app/directives/common/text-limiter/text-limiter.directive.ts
rename to src/app/directives/text-limiter/text-limiter.directive.ts
index 8f2578859ae..b1f956e407f 100644
--- a/src/app/directives/common/text-limiter/text-limiter.directive.ts
+++ b/src/app/directives/text-limiter/text-limiter.directive.ts
@@ -3,7 +3,9 @@ import { ComponentPortal } from '@angular/cdk/portal';
 import {
   Directive, AfterViewInit, ElementRef, HostListener, ComponentRef, OnChanges, OnDestroy, input,
 } from '@angular/core';
-import { TextLimiterTooltipComponent } from 'app/directives/common/text-limiter/text-limiter-tooltip/text-limiter-tooltip.component';
+import {
+  TextLimiterTooltipComponent,
+} from 'app/directives/text-limiter/text-limiter-tooltip/text-limiter-tooltip.component';
 
 @Directive({
   selector: '[textLimiter]',
diff --git a/src/app/directives/common/ui-search.directive.ts b/src/app/directives/ui-search.directive.ts
similarity index 100%
rename from src/app/directives/common/ui-search.directive.ts
rename to src/app/directives/ui-search.directive.ts
diff --git a/src/app/modules/alerts/alerts.module.ts b/src/app/modules/alerts/alerts.module.ts
index b2f9438d181..c3539c1e104 100644
--- a/src/app/modules/alerts/alerts.module.ts
+++ b/src/app/modules/alerts/alerts.module.ts
@@ -11,7 +11,7 @@ import { RouterModule } from '@angular/router';
 import { EffectsModule } from '@ngrx/effects';
 import { StoreModule } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { AlertComponent } from 'app/modules/alerts/components/alert/alert.component';
 import { AlertsPanelComponent } from 'app/modules/alerts/components/alerts-panel/alerts-panel.component';
 import { AlertEffects } from 'app/modules/alerts/store/alert.effects';
diff --git a/src/app/modules/dialog/dialog.module.ts b/src/app/modules/dialog/dialog.module.ts
index 67138c46956..e40c5225831 100644
--- a/src/app/modules/dialog/dialog.module.ts
+++ b/src/app/modules/dialog/dialog.module.ts
@@ -8,7 +8,7 @@ import { MatDividerModule } from '@angular/material/divider';
 import { MatProgressBarModule } from '@angular/material/progress-bar';
 import { FlexModule } from '@ngbracket/ngx-layout';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { CopyButtonComponent } from 'app/modules/buttons/copy-button/copy-button.component';
 import { ConfirmDialogComponent } from 'app/modules/dialog/components/confirm-dialog/confirm-dialog.component';
 import { ErrorDialogComponent } from 'app/modules/dialog/components/error-dialog/error-dialog.component';
diff --git a/src/app/modules/disk-icon/disk-icon.component.spec.ts b/src/app/modules/disk-icon/disk-icon.component.spec.ts
index 3025e75fc40..620418c6419 100644
--- a/src/app/modules/disk-icon/disk-icon.component.spec.ts
+++ b/src/app/modules/disk-icon/disk-icon.component.spec.ts
@@ -4,14 +4,14 @@ import { DiskType } from 'app/enums/disk-type.enum';
 import {
   DiskIconComponent,
 } from 'app/modules/disk-icon/disk-icon.component';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 
 describe('DiskIconComponent', () => {
   let spectator: Spectator<DiskIconComponent>;
   const createComponent = createComponentFactory({
     component: DiskIconComponent,
     imports: [
-      IxFileSizePipe,
+      FileSizePipe,
     ],
   });
 
diff --git a/src/app/modules/disk-icon/disk-icon.component.ts b/src/app/modules/disk-icon/disk-icon.component.ts
index bc867850c76..2a575c34ff3 100644
--- a/src/app/modules/disk-icon/disk-icon.component.ts
+++ b/src/app/modules/disk-icon/disk-icon.component.ts
@@ -3,7 +3,7 @@ import {
   ChangeDetectionStrategy, Component, input,
 } from '@angular/core';
 import { DiskType } from 'app/enums/disk-type.enum';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 
 @Component({
   selector: 'ix-disk-icon',
@@ -12,7 +12,7 @@ import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe
   standalone: true,
   imports: [
     NgIf,
-    IxFileSizePipe,
+    FileSizePipe,
   ],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
diff --git a/src/app/modules/empty/empty.component.ts b/src/app/modules/empty/empty.component.ts
index 1210446eff5..4510efd45b6 100644
--- a/src/app/modules/empty/empty.component.ts
+++ b/src/app/modules/empty/empty.component.ts
@@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { EmptyType } from 'app/enums/empty-type.enum';
 import { Role } from 'app/enums/role.enum';
 import { EmptyConfig } from 'app/interfaces/empty-config.interface';
diff --git a/src/app/modules/forms/ix-forms/ix-forms.module.ts b/src/app/modules/forms/ix-forms/ix-forms.module.ts
index 4c84546a070..938abc8841e 100644
--- a/src/app/modules/forms/ix-forms/ix-forms.module.ts
+++ b/src/app/modules/forms/ix-forms/ix-forms.module.ts
@@ -22,7 +22,7 @@ import { RouterLink } from '@angular/router';
 import { TreeModule } from '@bugsplat/angular-tree-component';
 import { FlexLayoutModule } from '@ngbracket/ngx-layout';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { OauthButtonModule } from 'app/modules/buttons/oauth-button/oauth-button.module';
 import { IxButtonGroupComponent } from 'app/modules/forms/ix-forms/components/ix-button-group/ix-button-group.component';
 import { IxCheckboxComponent } from 'app/modules/forms/ix-forms/components/ix-checkbox/ix-checkbox.component';
diff --git a/src/app/modules/global-search/services/ui-search-directives.service.spec.ts b/src/app/modules/global-search/services/ui-search-directives.service.spec.ts
index b823ea7a0f0..2bbe57aea17 100644
--- a/src/app/modules/global-search/services/ui-search-directives.service.spec.ts
+++ b/src/app/modules/global-search/services/ui-search-directives.service.spec.ts
@@ -1,7 +1,7 @@
 import { Renderer2, ElementRef } from '@angular/core';
 import { SpectatorService, createServiceFactory } from '@ngneat/spectator';
 import { mockProvider } from '@ngneat/spectator/jest';
-import { UiSearchDirective } from 'app/directives/common/ui-search.directive';
+import { UiSearchDirective } from 'app/directives/ui-search.directive';
 import { UiSearchDirectivesService } from './ui-search-directives.service';
 
 describe('UiSearchDirectivesService', () => {
diff --git a/src/app/modules/global-search/services/ui-search-directives.service.ts b/src/app/modules/global-search/services/ui-search-directives.service.ts
index 4aed3f31065..38be2be2885 100644
--- a/src/app/modules/global-search/services/ui-search-directives.service.ts
+++ b/src/app/modules/global-search/services/ui-search-directives.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
-import { UiSearchDirective } from 'app/directives/common/ui-search.directive';
+import { UiSearchDirective } from 'app/directives/ui-search.directive';
 import { getSearchableElementId } from 'app/modules/global-search/helpers/get-searchable-element-id';
 import { UiSearchableElement } from 'app/modules/global-search/interfaces/ui-searchable-element.interface';
 
diff --git a/src/app/modules/global-search/services/ui-search.service.spec.ts b/src/app/modules/global-search/services/ui-search.service.spec.ts
index 1301c5bd7c5..a84522f0df2 100644
--- a/src/app/modules/global-search/services/ui-search.service.spec.ts
+++ b/src/app/modules/global-search/services/ui-search.service.spec.ts
@@ -1,7 +1,7 @@
 import { createServiceFactory, SpectatorService, mockProvider } from '@ngneat/spectator/jest';
 import { MockDirective } from 'ng-mocks';
 import { of, lastValueFrom } from 'rxjs';
-import { UiSearchDirective } from 'app/directives/common/ui-search.directive';
+import { UiSearchDirective } from 'app/directives/ui-search.directive';
 import { UiSearchDirectivesService } from 'app/modules/global-search/services/ui-search-directives.service';
 import { UiSearchProvider } from 'app/modules/global-search/services/ui-search.service';
 import { AuthService } from 'app/services/auth/auth.service';
diff --git a/src/app/modules/ix-table/ix-table.module.ts b/src/app/modules/ix-table/ix-table.module.ts
index da992345ff7..ea00ba84f92 100644
--- a/src/app/modules/ix-table/ix-table.module.ts
+++ b/src/app/modules/ix-table/ix-table.module.ts
@@ -11,7 +11,7 @@ import { MatSlideToggleModule } from '@angular/material/slide-toggle';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { FlexModule } from '@ngbracket/ngx-layout';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module';
 import { IxTableEmptyRowComponent } from 'app/modules/ix-table/components/ix-empty-row/ix-empty-row.component';
 import { IxTableComponent } from 'app/modules/ix-table/components/ix-table/ix-table.component';
@@ -38,9 +38,9 @@ import { IxTableHeaderCellDirective } from 'app/modules/ix-table/directives/ix-h
 import { IxTableCellDirective } from 'app/modules/ix-table/directives/ix-table-cell.directive';
 import { IxTableDetailsRowDirective } from 'app/modules/ix-table/directives/ix-table-details-row.directive';
 import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe';
-import { IxDateModule } from 'app/modules/pipes/ix-date/ix-date.module';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { IxDateComponent } from 'app/modules/pipes/ix-date/ix-date.component';
 import { ScheduleToCrontabPipe } from 'app/modules/pipes/schedule-to-crontab/schedule-to-crontab.pipe';
 import { YesNoPipe } from 'app/modules/pipes/yes-no/yes-no.pipe';
 import { TestIdModule } from 'app/modules/test-id/test-id.module';
@@ -59,11 +59,11 @@ import { IxTableColumnsSelectorComponent } from './components/ix-table-columns-s
     TranslateModule,
     CommonDirectivesModule,
     TestIdModule,
-    IxDateModule,
+    IxDateComponent,
     MatMenuModule,
     MatDividerModule,
     MatTooltipModule,
-    IxFileSizePipe,
+    FileSizePipe,
     YesNoPipe,
     ScheduleToCrontabPipe,
     CdkPortalOutlet,
diff --git a/src/app/modules/jobs/jobs.module.ts b/src/app/modules/jobs/jobs.module.ts
index 4d8d8c057dc..b4ad21de3d0 100644
--- a/src/app/modules/jobs/jobs.module.ts
+++ b/src/app/modules/jobs/jobs.module.ts
@@ -9,7 +9,7 @@ import { RouterModule } from '@angular/router';
 import { EffectsModule } from '@ngrx/effects';
 import { StoreModule } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module';
 import { JobItemComponent } from 'app/modules/jobs/components/job-item/job-item.component';
 import { JobsPanelComponent } from 'app/modules/jobs/components/jobs-panel/jobs-panel.component';
diff --git a/src/app/modules/layout/layout.module.ts b/src/app/modules/layout/layout.module.ts
index 365fd3deb73..389e6a6c475 100644
--- a/src/app/modules/layout/layout.module.ts
+++ b/src/app/modules/layout/layout.module.ts
@@ -16,7 +16,7 @@ import { MatTooltipModule } from '@angular/material/tooltip';
 import { RouterModule } from '@angular/router';
 import { FlexModule } from '@ngbracket/ngx-layout';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { AlertsModule } from 'app/modules/alerts/alerts.module';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { GlobalSearchModule } from 'app/modules/global-search/global-search.module';
diff --git a/src/app/modules/page-header/page-header.module.ts b/src/app/modules/page-header/page-header.module.ts
index 604e9311c6a..d5e9820b212 100644
--- a/src/app/modules/page-header/page-header.module.ts
+++ b/src/app/modules/page-header/page-header.module.ts
@@ -3,7 +3,7 @@ import { NgModule } from '@angular/core';
 import { MatButton } from '@angular/material/button';
 import { RouterModule } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { AppLoaderModule } from 'app/modules/loader/app-loader.module';
 import { BreadcrumbComponent } from 'app/modules/page-header/breadcrumb/breadcrumb.component';
 import {
diff --git a/src/app/modules/pipes/file-size/file-size.pipe.spec.ts b/src/app/modules/pipes/file-size/file-size.pipe.spec.ts
new file mode 100644
index 00000000000..6864d4aa666
--- /dev/null
+++ b/src/app/modules/pipes/file-size/file-size.pipe.spec.ts
@@ -0,0 +1,15 @@
+import { SpectatorPipe, createPipeFactory } from '@ngneat/spectator/jest';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
+
+describe('FileSizePipe', () => {
+  let spectator: SpectatorPipe<FileSizePipe>;
+  const createPipe = createPipeFactory({
+    pipe: FileSizePipe,
+  });
+
+  it('converts value to IEC units', () => {
+    spectator = createPipe('{{ 1024 | ixFileSize }}');
+
+    expect(spectator.element.innerHTML).toBe('1 KiB');
+  });
+});
diff --git a/src/app/modules/pipes/file-size/file-size.pipe.ts b/src/app/modules/pipes/file-size/file-size.pipe.ts
new file mode 100644
index 00000000000..43771821cb0
--- /dev/null
+++ b/src/app/modules/pipes/file-size/file-size.pipe.ts
@@ -0,0 +1,12 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { buildNormalizedFileSize } from 'app/helpers/file-size.utils';
+
+@Pipe({
+  name: 'ixFileSize',
+  standalone: true,
+})
+export class FileSizePipe implements PipeTransform {
+  transform(value: number): string {
+    return buildNormalizedFileSize(value, 'B', 2);
+  }
+}
diff --git a/src/app/modules/pipes/ix-date/ix-date.component.ts b/src/app/modules/pipes/ix-date/ix-date.component.ts
index e153bcfbf86..593a6fff395 100644
--- a/src/app/modules/pipes/ix-date/ix-date.component.ts
+++ b/src/app/modules/pipes/ix-date/ix-date.component.ts
@@ -1,11 +1,20 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { MatTooltip } from '@angular/material/tooltip';
+import { TranslateModule } from '@ngx-translate/core';
 import { utcToZonedTime, zonedTimeToUtc } from 'date-fns-tz';
+import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe';
 import { LocaleService } from 'app/services/locale.service';
 
 @Component({
   selector: 'ix-date',
   templateUrl: './ix-date.component.html',
+  standalone: true,
   changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [
+    MatTooltip,
+    TranslateModule,
+    FormatDateTimePipe,
+  ],
 })
 export class IxDateComponent {
   /** Date must be in browser timezone */
diff --git a/src/app/modules/pipes/ix-date/ix-date.module.ts b/src/app/modules/pipes/ix-date/ix-date.module.ts
deleted file mode 100644
index c602aedbb6e..00000000000
--- a/src/app/modules/pipes/ix-date/ix-date.module.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { MatTooltipModule } from '@angular/material/tooltip';
-import { TranslateModule } from '@ngx-translate/core';
-import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe';
-import { IxDateComponent } from 'app/modules/pipes/ix-date/ix-date.component';
-import { LocaleService } from 'app/services/locale.service';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    MatTooltipModule,
-    TranslateModule,
-    FormatDateTimePipe,
-  ],
-  declarations: [
-    IxDateComponent,
-  ],
-  exports: [
-    IxDateComponent,
-  ],
-  providers: [
-    LocaleService,
-  ],
-})
-export class IxDateModule { }
diff --git a/src/app/modules/pipes/ix-file-size/ix-file-size.pipe.spec.ts b/src/app/modules/pipes/ix-file-size/ix-file-size.pipe.spec.ts
deleted file mode 100644
index 891741f6b6b..00000000000
--- a/src/app/modules/pipes/ix-file-size/ix-file-size.pipe.spec.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-import { SpectatorPipe, createPipeFactory } from '@ngneat/spectator/jest';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
-
-let spectator: SpectatorPipe<IxFileSizePipe>;
-const createPipe = createPipeFactory({
-  pipe: IxFileSizePipe,
-});
-describe('It converts 1024 bits to 1.02 kb with base 10', () => {
-  beforeEach(() => {
-    spectator = createPipe('{{ inputValue | ixFileSize: { baseUnit: \'b\', base: 10 } }}', {
-      hostProps: {
-        inputValue: 1024,
-      },
-    });
-  });
-
-  it('converts bits to kb', () => {
-    expect(spectator.element.innerHTML).toBe('1.02 kb');
-  });
-});
-
-describe('It converts 1024 bits to 1 Kib with base 2', () => {
-  beforeEach(() => {
-    spectator = createPipe('{{ inputValue | ixFileSize: { baseUnit: \'b\', base: 2 } }}', {
-      hostProps: {
-        inputValue: 1024,
-      },
-    });
-  });
-
-  it('converts bits to kb', () => {
-    expect(spectator.element.innerHTML).toBe('1 Kib');
-  });
-});
-
-describe('It converts 1024 bits to 1 KiB with base 2', () => {
-  beforeEach(() => {
-    spectator = createPipe('{{ inputValue | ixFileSize: { baseUnit: \'B\', base: 2 } }}', {
-      hostProps: {
-        inputValue: 1024,
-      },
-    });
-  });
-
-  it('converts bits to kb', () => {
-    expect(spectator.element.innerHTML).toBe('1 KiB');
-  });
-});
-
-describe('It converts 1000 bits to 1 kB with base 10', () => {
-  beforeEach(() => {
-    spectator = createPipe('{{ inputValue | ixFileSize: { baseUnit: \'B\', base: 10 } }}', {
-      hostProps: {
-        inputValue: 1000,
-      },
-    });
-  });
-
-  it('converts bits to kb', () => {
-    expect(spectator.element.innerHTML).toBe('1 kB');
-  });
-});
-
-describe('It converts 1000 bits to 1 kb with base 10', () => {
-  beforeEach(() => {
-    spectator = createPipe('{{ inputValue | ixFileSize: { baseUnit: \'b\', base: 10 } }}', {
-      hostProps: {
-        inputValue: 1000,
-      },
-    });
-  });
-
-  it('converts bits to kb', () => {
-    expect(spectator.element.innerHTML).toBe('1 kb');
-  });
-});
-
-describe('It converts random bits', () => {
-  beforeEach(() => {
-    spectator = createPipe('{{ inputValue | ixFileSize: { baseUnit: \'b\', base: 10 } }}', {
-      hostProps: {
-        inputValue: 123456789,
-      },
-    });
-  });
-
-  it('converts bits to kb', () => {
-    expect(spectator.element.innerHTML).toBe('123.46 Mb');
-  });
-});
-
-describe('It converts random bytes', () => {
-  beforeEach(() => {
-    spectator = createPipe('{{ inputValue | ixFileSize: { baseUnit: \'B\', base: 2 } }}', {
-      hostProps: {
-        inputValue: 123456789,
-      },
-    });
-  });
-
-  it('converts bits to kb', () => {
-    expect(spectator.element.innerHTML).toBe('117.74 MiB');
-  });
-});
diff --git a/src/app/modules/pipes/ix-file-size/ix-file-size.pipe.ts b/src/app/modules/pipes/ix-file-size/ix-file-size.pipe.ts
deleted file mode 100644
index 7b023a812d9..00000000000
--- a/src/app/modules/pipes/ix-file-size/ix-file-size.pipe.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Pipe, PipeTransform } from '@angular/core';
-import { buildNormalizedFileSize } from 'app/helpers/file-size.utils';
-
-@Pipe({
-  name: 'ixFileSize',
-  standalone: true,
-})
-export class IxFileSizePipe implements PipeTransform {
-  transform(
-    value: number,
-    { baseUnit, base }: { baseUnit: 'b' | 'B'; base: 10 | 2 } = { baseUnit: 'B', base: 2 },
-  ): string {
-    return buildNormalizedFileSize(value, baseUnit, base);
-  }
-}
diff --git a/src/app/modules/pipes/network-speed/network-speed.pipe.spec.ts b/src/app/modules/pipes/network-speed/network-speed.pipe.spec.ts
new file mode 100644
index 00000000000..8169b4b094b
--- /dev/null
+++ b/src/app/modules/pipes/network-speed/network-speed.pipe.spec.ts
@@ -0,0 +1,13 @@
+import { createPipeFactory, SpectatorPipe } from '@ngneat/spectator/jest';
+import { NetworkSpeedPipe } from 'app/modules/pipes/network-speed/network-speed.pipe';
+
+describe('NetworkSpeedPipe', () => {
+  let spectator: SpectatorPipe<NetworkSpeedPipe>;
+  const createPipe = createPipeFactory(NetworkSpeedPipe);
+
+  it('converts values to bits per second', () => {
+    spectator = createPipe('{{ 1000 | ixNetworkSpeed }}');
+
+    expect(spectator.element).toHaveText('1 kb/s');
+  });
+});
diff --git a/src/app/modules/pipes/network-speed/network-speed.pipe.ts b/src/app/modules/pipes/network-speed/network-speed.pipe.ts
new file mode 100644
index 00000000000..25e1994a69a
--- /dev/null
+++ b/src/app/modules/pipes/network-speed/network-speed.pipe.ts
@@ -0,0 +1,19 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import { buildNormalizedFileSize } from 'app/helpers/file-size.utils';
+
+@Pipe({
+  name: 'ixNetworkSpeed',
+  standalone: true,
+})
+export class NetworkSpeedPipe implements PipeTransform {
+  transform(value: number): string {
+    return this.translate.instant('{bits}/s', {
+      bits: buildNormalizedFileSize(value, 'b', 10),
+    });
+  }
+
+  constructor(
+    private translate: TranslateService,
+  ) {}
+}
diff --git a/src/app/modules/scheduler/components/scheduler-modal/scheduler-date-examples/scheduler-date-examples.component.spec.ts b/src/app/modules/scheduler/components/scheduler-modal/scheduler-date-examples/scheduler-date-examples.component.spec.ts
index 411d5a404eb..a926c6e3434 100644
--- a/src/app/modules/scheduler/components/scheduler-modal/scheduler-date-examples/scheduler-date-examples.component.spec.ts
+++ b/src/app/modules/scheduler/components/scheduler-modal/scheduler-date-examples/scheduler-date-examples.component.spec.ts
@@ -1,7 +1,7 @@
 import { createComponentFactory, Spectator, mockProvider } from '@ngneat/spectator/jest';
 import { provideMockStore } from '@ngrx/store/testing';
 import { FakeFormatDateTimePipe } from 'app/core/testing/classes/fake-format-datetime.pipe';
-import { IxDateModule } from 'app/modules/pipes/ix-date/ix-date.module';
+import { IxDateComponent } from 'app/modules/pipes/ix-date/ix-date.component';
 import {
   CronSchedulePreview,
 } from 'app/modules/scheduler/classes/cron-schedule-preview/cron-schedule-preview';
@@ -14,7 +14,7 @@ describe('SchedulerDateExamplesComponent', () => {
   const createComponent = createComponentFactory({
     component: SchedulerDateExamplesComponent,
     imports: [
-      IxDateModule,
+      IxDateComponent,
     ],
     providers: [
       mockProvider(LocaleService, {
diff --git a/src/app/modules/scheduler/scheduler.module.ts b/src/app/modules/scheduler/scheduler.module.ts
index a522563738c..d5dcf145b4f 100644
--- a/src/app/modules/scheduler/scheduler.module.ts
+++ b/src/app/modules/scheduler/scheduler.module.ts
@@ -11,7 +11,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module';
 import { CastPipe } from 'app/modules/pipes/cast/cast.pipe';
-import { IxDateModule } from 'app/modules/pipes/ix-date/ix-date.module';
+import { IxDateComponent } from 'app/modules/pipes/ix-date/ix-date.component';
 import { SchedulerComponent } from 'app/modules/scheduler/components/scheduler/scheduler.component';
 import {
   SchedulerDateExamplesComponent,
@@ -31,7 +31,7 @@ import { TooltipComponent } from 'app/modules/tooltip/tooltip.component';
     CommonModule,
     TranslateModule,
     ReactiveFormsModule,
-    IxDateModule,
+    IxDateComponent,
     IxFormsModule,
     FormsModule,
     MatSelectModule,
diff --git a/src/app/modules/terminal/terminal.module.ts b/src/app/modules/terminal/terminal.module.ts
index ca31b3a5efe..a6143be5f95 100644
--- a/src/app/modules/terminal/terminal.module.ts
+++ b/src/app/modules/terminal/terminal.module.ts
@@ -3,7 +3,7 @@ import { NgModule } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatDialogModule } from '@angular/material/dialog';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { EntityModule } from 'app/modules/entity/entity.module';
 import { ToolbarSliderComponent } from 'app/modules/forms/toolbar-slider/toolbar-slider.component';
 import { LayoutModule } from 'app/modules/layout/layout.module';
diff --git a/src/app/modules/truecommand/truecommand.module.ts b/src/app/modules/truecommand/truecommand.module.ts
index 82cf74138ff..c14dc72f550 100644
--- a/src/app/modules/truecommand/truecommand.module.ts
+++ b/src/app/modules/truecommand/truecommand.module.ts
@@ -9,7 +9,7 @@ import { MatDividerModule } from '@angular/material/divider';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { FlexLayoutModule } from '@ngbracket/ngx-layout';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module';
 import { TestIdModule } from 'app/modules/test-id/test-id.module';
diff --git a/src/app/pages/account/groups/groups.module.ts b/src/app/pages/account/groups/groups.module.ts
index 74607840382..8757c6db83a 100644
--- a/src/app/pages/account/groups/groups.module.ts
+++ b/src/app/pages/account/groups/groups.module.ts
@@ -19,7 +19,7 @@ import { FlexLayoutModule } from '@ngbracket/ngx-layout';
 import { EffectsModule } from '@ngrx/effects';
 import { StoreModule } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { EntityModule } from 'app/modules/entity/entity.module';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { SearchInputModule } from 'app/modules/forms/search-input/search-input.module';
diff --git a/src/app/pages/account/users/users.module.ts b/src/app/pages/account/users/users.module.ts
index 98adcce378f..72363853600 100644
--- a/src/app/pages/account/users/users.module.ts
+++ b/src/app/pages/account/users/users.module.ts
@@ -21,7 +21,7 @@ import { FlexLayoutModule } from '@ngbracket/ngx-layout';
 import { EffectsModule } from '@ngrx/effects';
 import { StoreModule } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { EntityModule } from 'app/modules/entity/entity.module';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component';
diff --git a/src/app/pages/api-keys/api-keys.module.ts b/src/app/pages/api-keys/api-keys.module.ts
index 7a20e5946bd..5caca897933 100644
--- a/src/app/pages/api-keys/api-keys.module.ts
+++ b/src/app/pages/api-keys/api-keys.module.ts
@@ -9,7 +9,7 @@ import { MatMenuModule } from '@angular/material/menu';
 import { MatSortModule } from '@angular/material/sort';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { EntityModule } from 'app/modules/entity/entity.module';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component';
diff --git a/src/app/pages/apps/apps.module.ts b/src/app/pages/apps/apps.module.ts
index ebe8f75e454..9bbd2678834 100644
--- a/src/app/pages/apps/apps.module.ts
+++ b/src/app/pages/apps/apps.module.ts
@@ -20,7 +20,7 @@ import { LazyLoadImageModule } from 'ng-lazyload-image';
 import { ImgFallbackModule } from 'ngx-img-fallback';
 import { MarkdownModule } from 'ngx-markdown';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { EmptyComponent } from 'app/modules/empty/empty.component';
 import { EntityModule } from 'app/modules/entity/entity.module';
 import { IxDynamicFormModule } from 'app/modules/forms/ix-dynamic-form/ix-dynamic-form.module';
@@ -33,9 +33,10 @@ import { BulkListItemComponent } from 'app/modules/lists/bulk-list-item/bulk-lis
 import { AppLoaderModule } from 'app/modules/loader/app-loader.module';
 import { PageHeaderModule } from 'app/modules/page-header/page-header.module';
 import { CleanLinkPipe } from 'app/modules/pipes/clean-link/clean-link.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
 import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe';
+import { NetworkSpeedPipe } from 'app/modules/pipes/network-speed/network-speed.pipe';
 import { TerminalModule } from 'app/modules/terminal/terminal.module';
 import { TestIdModule } from 'app/modules/test-id/test-id.module';
 import { AppsRoutingModule } from 'app/pages/apps/apps-routing.module';
@@ -172,7 +173,8 @@ import { KubernetesStatusComponent } from './components/installed-apps/kubernete
     MapValuePipe,
     CleanLinkPipe,
     BulkListItemComponent,
-    IxFileSizePipe,
+    FileSizePipe,
+    NetworkSpeedPipe,
   ],
 })
 export class AppsModule { }
diff --git a/src/app/pages/apps/components/app-detail-view/app-resources-card/app-resources-card.component.spec.ts b/src/app/pages/apps/components/app-detail-view/app-resources-card/app-resources-card.component.spec.ts
index 689f4982b74..93016c09672 100644
--- a/src/app/pages/apps/components/app-detail-view/app-resources-card/app-resources-card.component.spec.ts
+++ b/src/app/pages/apps/components/app-detail-view/app-resources-card/app-resources-card.component.spec.ts
@@ -3,7 +3,7 @@ import { createComponentFactory, mockProvider } from '@ngneat/spectator/jest';
 import { BehaviorSubject, of } from 'rxjs';
 import { mockCall, mockWebSocket } from 'app/core/testing/utils/mock-websocket.utils';
 import { DatasetDetails } from 'app/interfaces/dataset.interface';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { AppResourcesCardComponent } from 'app/pages/apps/components/app-detail-view/app-resources-card/app-resources-card.component';
 import { KubernetesStore } from 'app/pages/apps/store/kubernetes-store.service';
 import { WebSocketService } from 'app/services/ws.service';
@@ -17,7 +17,7 @@ describe('AppResourcesCardComponent', () => {
   const createComponent = createComponentFactory({
     component: AppResourcesCardComponent,
     imports: [
-      IxFileSizePipe,
+      FileSizePipe,
     ],
     providers: [
       mockWebSocket([
diff --git a/src/app/pages/apps/components/docker-images/docker-images-list/docker-images-list.component.ts b/src/app/pages/apps/components/docker-images/docker-images-list/docker-images-list.component.ts
index 0e73b36672e..e431a60c8b8 100644
--- a/src/app/pages/apps/components/docker-images/docker-images-list/docker-images-list.component.ts
+++ b/src/app/pages/apps/components/docker-images/docker-images-list/docker-images-list.component.ts
@@ -16,7 +16,7 @@ import { actionsColumn } from 'app/modules/ix-table/components/ix-table-body/cel
 import { textColumn } from 'app/modules/ix-table/components/ix-table-body/cells/ix-cell-text/ix-cell-text.component';
 import { yesNoColumn } from 'app/modules/ix-table/components/ix-table-body/cells/ix-cell-yes-no/ix-cell-yes-no.component';
 import { createTable } from 'app/modules/ix-table/utils';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { DockerImageDeleteDialogComponent } from 'app/pages/apps/components/docker-images/docker-image-delete-dialog/docker-image-delete-dialog.component';
 import { DockerImageUpdateDialogComponent } from 'app/pages/apps/components/docker-images/docker-image-update-dialog/docker-image-update-dialog.component';
 import { dockerImagesListElements } from 'app/pages/apps/components/docker-images/docker-images-list/docker-images-list.elements';
@@ -30,7 +30,7 @@ import { WebSocketService } from 'app/services/ws.service';
   templateUrl: './docker-images-list.component.html',
   styleUrls: ['./docker-images-list.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
-  providers: [IxFileSizePipe],
+  providers: [FileSizePipe],
 })
 export class DockerImagesListComponent implements OnInit {
   protected readonly requiredRoles = [Role.AppsWrite];
@@ -93,7 +93,7 @@ export class DockerImagesListComponent implements OnInit {
     private matDialog: MatDialog,
     private slideInService: IxSlideInService,
     private translate: TranslateService,
-    private fileSizePipe: IxFileSizePipe,
+    private fileSizePipe: FileSizePipe,
   ) {
   }
 
diff --git a/src/app/pages/apps/components/installed-apps/app-row/app-row.component.html b/src/app/pages/apps/components/installed-apps/app-row/app-row.component.html
index f5fb25b62ce..580d146bb38 100644
--- a/src/app/pages/apps/components/installed-apps/app-row/app-row.component.html
+++ b/src/app/pages/apps/components/installed-apps/app-row/app-row.component.html
@@ -35,9 +35,9 @@
 </div>
 <div class="cell cell-network" [matTooltip]="'Incoming / Outgoing network traffic' | translate">
   <span *ngIf="stats && stats.network?.incoming !== undefined; else notAvailable">
-    {{ stats.network.incoming | ixFileSize: { baseUnit: 'b', base: 10 } }}/s
+    {{ stats.network.incoming | ixNetworkSpeed }}
     -
-    {{ stats.network.outgoing | ixFileSize: { baseUnit: 'b', base: 10 } }}/s
+    {{ stats.network.outgoing | ixNetworkSpeed }}
   </span>
 </div>
 <div class="cell cell-update">
diff --git a/src/app/pages/apps/components/installed-apps/app-row/app-row.component.spec.ts b/src/app/pages/apps/components/installed-apps/app-row/app-row.component.spec.ts
index a39a838f7ab..4ed622fc329 100644
--- a/src/app/pages/apps/components/installed-apps/app-row/app-row.component.spec.ts
+++ b/src/app/pages/apps/components/installed-apps/app-row/app-row.component.spec.ts
@@ -5,7 +5,8 @@ import { officialCatalog } from 'app/constants/catalog.constants';
 import { mockAuth } from 'app/core/testing/utils/mock-auth.utils';
 import { ChartReleaseStatus } from 'app/enums/chart-release-status.enum';
 import { ChartRelease, ChartReleaseStats } from 'app/interfaces/chart-release.interface';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
+import { NetworkSpeedPipe } from 'app/modules/pipes/network-speed/network-speed.pipe';
 import { AppRowComponent } from 'app/pages/apps/components/installed-apps/app-row/app-row.component';
 import { AppStatusCellComponent } from 'app/pages/apps/components/installed-apps/app-status-cell/app-status-cell.component';
 import { AppUpdateCellComponent } from 'app/pages/apps/components/installed-apps/app-update-cell/app-update-cell.component';
@@ -35,7 +36,8 @@ describe('AppRowComponent', () => {
     component: AppRowComponent,
     imports: [
       ImgFallbackModule,
-      IxFileSizePipe,
+      FileSizePipe,
+      NetworkSpeedPipe,
     ],
     declarations: [
       MockComponents(AppStatusCellComponent, AppUpdateCellComponent),
diff --git a/src/app/pages/audit/audit.module.ts b/src/app/pages/audit/audit.module.ts
index e6d8b0baaa2..9887e200b4b 100644
--- a/src/app/pages/audit/audit.module.ts
+++ b/src/app/pages/audit/audit.module.ts
@@ -6,7 +6,7 @@ import { MatCardModule } from '@angular/material/card';
 import { MatSelectModule } from '@angular/material/select';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { CopyButtonComponent } from 'app/modules/buttons/copy-button/copy-button.component';
 import { ExportButtonComponent } from 'app/modules/buttons/export-button/export-button.component';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
diff --git a/src/app/pages/credentials/certificates-dash/certificate-authority-list/certificate-authority-list.component.spec.ts b/src/app/pages/credentials/certificates-dash/certificate-authority-list/certificate-authority-list.component.spec.ts
index 90f1032d807..366978e319d 100644
--- a/src/app/pages/credentials/certificates-dash/certificate-authority-list/certificate-authority-list.component.spec.ts
+++ b/src/app/pages/credentials/certificates-dash/certificate-authority-list/certificate-authority-list.component.spec.ts
@@ -5,7 +5,6 @@ import { MatDialog } from '@angular/material/dialog';
 import { Spectator } from '@ngneat/spectator';
 import { createComponentFactory, mockProvider } from '@ngneat/spectator/jest';
 import { of } from 'rxjs';
-import { FakeFormatDateTimePipe } from 'app/core/testing/classes/fake-format-datetime.pipe';
 import { mockAuth } from 'app/core/testing/utils/mock-auth.utils';
 import { mockWebSocket, mockCall } from 'app/core/testing/utils/mock-websocket.utils';
 import { CertificateAuthority } from 'app/interfaces/certificate-authority.interface';
@@ -14,6 +13,7 @@ import { IxSlideInRef } from 'app/modules/forms/ix-forms/components/ix-slide-in/
 import { IxIconHarness } from 'app/modules/ix-icon/ix-icon.harness';
 import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-table.harness';
 import { IxTableModule } from 'app/modules/ix-table/ix-table.module';
+import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe';
 import { CertificateAuthorityAddComponent } from 'app/pages/credentials/certificates-dash/certificate-authority-add/certificate-authority-add.component';
 import { CertificateAuthorityEditComponent } from 'app/pages/credentials/certificates-dash/certificate-authority-edit/certificate-authority-edit.component';
 import { CertificateAuthorityListComponent } from 'app/pages/credentials/certificates-dash/certificate-authority-list/certificate-authority-list.component';
@@ -41,8 +41,8 @@ describe('CertificateAuthorityListComponent', () => {
     component: CertificateAuthorityListComponent,
     imports: [
       IxTableModule,
+      FormatDateTimePipe,
     ],
-    declarations: [FakeFormatDateTimePipe],
     providers: [
       mockWebSocket([
         mockCall('certificateauthority.query', certificates),
diff --git a/src/app/pages/credentials/certificates-dash/certificate-list/certificate-list.component.spec.ts b/src/app/pages/credentials/certificates-dash/certificate-list/certificate-list.component.spec.ts
index 545d80791d9..603d3d34051 100644
--- a/src/app/pages/credentials/certificates-dash/certificate-list/certificate-list.component.spec.ts
+++ b/src/app/pages/credentials/certificates-dash/certificate-list/certificate-list.component.spec.ts
@@ -5,7 +5,6 @@ import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { Spectator } from '@ngneat/spectator';
 import { createComponentFactory, mockProvider } from '@ngneat/spectator/jest';
 import { of } from 'rxjs';
-import { FakeFormatDateTimePipe } from 'app/core/testing/classes/fake-format-datetime.pipe';
 import { fakeSuccessfulJob } from 'app/core/testing/utils/fake-job.utils';
 import { mockAuth } from 'app/core/testing/utils/mock-auth.utils';
 import { mockWebSocket, mockCall, mockJob } from 'app/core/testing/utils/mock-websocket.utils';
@@ -15,6 +14,7 @@ import { IxSlideInRef } from 'app/modules/forms/ix-forms/components/ix-slide-in/
 import { IxIconHarness } from 'app/modules/ix-icon/ix-icon.harness';
 import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-table.harness';
 import { IxTableModule } from 'app/modules/ix-table/ix-table.module';
+import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe';
 import { CertificateEditComponent } from 'app/pages/credentials/certificates-dash/certificate-edit/certificate-edit.component';
 import { CertificateAddComponent } from 'app/pages/credentials/certificates-dash/forms/certificate-add/certificate-add.component';
 import { IxSlideInService } from 'app/services/ix-slide-in.service';
@@ -58,9 +58,7 @@ describe('CertificateListComponent', () => {
     component: CertificateListComponent,
     imports: [
       IxTableModule,
-    ],
-    declarations: [
-      FakeFormatDateTimePipe,
+      FormatDateTimePipe,
     ],
     providers: [
       mockWebSocket([
diff --git a/src/app/pages/credentials/credentials.module.ts b/src/app/pages/credentials/credentials.module.ts
index 83f0e91182a..76e3a2c73a2 100644
--- a/src/app/pages/credentials/credentials.module.ts
+++ b/src/app/pages/credentials/credentials.module.ts
@@ -13,7 +13,7 @@ import { MatTooltipModule } from '@angular/material/tooltip';
 import { RouterModule } from '@angular/router';
 import { FlexLayoutModule } from '@ngbracket/ngx-layout';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { CopyButtonComponent } from 'app/modules/buttons/copy-button/copy-button.component';
 import { OauthButtonModule } from 'app/modules/buttons/oauth-button/oauth-button.module';
 import { EntityModule } from 'app/modules/entity/entity.module';
diff --git a/src/app/pages/dashboard-old/components/widget-network/widget-network.component.html b/src/app/pages/dashboard-old/components/widget-network/widget-network.component.html
index 4742c3e82a9..800bb0253a3 100644
--- a/src/app/pages/dashboard-old/components/widget-network/widget-network.component.html
+++ b/src/app/pages/dashboard-old/components/widget-network/widget-network.component.html
@@ -105,20 +105,20 @@ <h4 class="info-header-title">{{ nic.state.name }}</h4>
                                 <ul>
                                   <li>
                                     <span class="label">{{ 'In' | translate }}:</span>
-                                    {{ nicInfoMap.get(nic.state.name)?.bitsIn | ixFileSize: { baseUnit: 'b', base: 10 } }}/s
+                                    {{ nicInfoMap.get(nic.state.name)?.bitsIn | ixNetworkSpeed }}
                                   </li>
                                   <li>
-                                    <span class="label">{{ 'Out' | translate }}:</span
-                                      >{{ nicInfoMap.get(nic.state.name)?.bitsOut | ixFileSize: { baseUnit: 'b', base: 10 } }}/s
-                                    </li>
-                                  </ul>
-                                }
-                                @if (getLinkState(nic) !== LinkState.Up) {
-                                  <span>
-                                    {{ 'No Traffic' | translate }}
-                                  </span>
-                                }
-                              </li>
+                                    <span class="label">{{ 'Out' | translate }}:</span>
+                                    {{ nicInfoMap.get(nic.state.name)?.bitsOut | ixNetworkSpeed }}
+                                  </li>
+                                </ul>
+                              }
+                              @if (getLinkState(nic) !== LinkState.Up) {
+                                <span>
+                                  {{ 'No Traffic' | translate }}
+                                </span>
+                              }
+                            </li>
                               @if (availableNics.length > 1) {
                                 <li class="info-list-item">
                                   <span class="icon address">
diff --git a/src/app/pages/dashboard-old/components/widget-network/widget-network.component.spec.ts b/src/app/pages/dashboard-old/components/widget-network/widget-network.component.spec.ts
index 86a90e6e0dd..c1bd5878c95 100644
--- a/src/app/pages/dashboard-old/components/widget-network/widget-network.component.spec.ts
+++ b/src/app/pages/dashboard-old/components/widget-network/widget-network.component.spec.ts
@@ -12,7 +12,8 @@ import { ProductType } from 'app/enums/product-type.enum';
 import { ViewChartAreaComponent } from 'app/modules/charts/components/view-chart-area/view-chart-area.component';
 import { EmptyComponent } from 'app/modules/empty/empty.component';
 import { InterfaceStatusIconComponent } from 'app/modules/interface-status-icon/interface-status-icon.component';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
+import { NetworkSpeedPipe } from 'app/modules/pipes/network-speed/network-speed.pipe';
 import { DragHandleComponent } from 'app/pages/dashboard-old/components/drag-handle/drag-handle.component';
 import { WidgetNetworkComponent } from 'app/pages/dashboard-old/components/widget-network/widget-network.component';
 import { ResourcesUsageStore } from 'app/pages/dashboard-old/store/resources-usage-store.service';
@@ -30,7 +31,8 @@ describe('WidgetNetworkComponent', () => {
     imports: [
       NgxSkeletonLoaderModule,
       MatGridListModule,
-      IxFileSizePipe,
+      NetworkSpeedPipe,
+      FileSizePipe,
     ],
     declarations: [
       MockComponent(DragHandleComponent),
diff --git a/src/app/pages/dashboard-old/components/widget-nic/widget-nic.component.html b/src/app/pages/dashboard-old/components/widget-nic/widget-nic.component.html
index 30ce33433b0..4b893b16520 100644
--- a/src/app/pages/dashboard-old/components/widget-nic/widget-nic.component.html
+++ b/src/app/pages/dashboard-old/components/widget-nic/widget-nic.component.html
@@ -106,7 +106,7 @@ <h3 class="mat-card-title-text" [class.button-offset]="currentSlide !== '0'">
                               <strong>{{ 'In' | translate }}: &nbsp;</strong>
                             </div>
                             <div class="td value">
-                              <span class="stat">{{ traffic.bitsReceived | ixFileSize: { baseUnit: 'b', base: 10 } }}</span>/s
+                              <span class="stat">{{ traffic.bitsReceived | ixNetworkSpeed }}</span>
                             </div>
                           </div>
                           <div class="tr">
@@ -114,7 +114,7 @@ <h3 class="mat-card-title-text" [class.button-offset]="currentSlide !== '0'">
                               <strong>{{ 'Out' | translate }}: </strong>&nbsp;
                             </div>
                             <div class="td value">
-                              <span class="stat">{{ traffic.bitsSent | ixFileSize: { baseUnit: 'b', base: 10 } }}</span>/s
+                              <span class="stat">{{ traffic.bitsSent | ixFileSize }}</span>/s
                             </div>
                           </div>
                         </div>
diff --git a/src/app/pages/dashboard-old/components/widget-nic/widget-nic.component.spec.ts b/src/app/pages/dashboard-old/components/widget-nic/widget-nic.component.spec.ts
index d482e24bde3..372a3eb8d94 100644
--- a/src/app/pages/dashboard-old/components/widget-nic/widget-nic.component.spec.ts
+++ b/src/app/pages/dashboard-old/components/widget-nic/widget-nic.component.spec.ts
@@ -12,7 +12,8 @@ import { ViewChartAreaComponent } from 'app/modules/charts/components/view-chart
 import { EmptyComponent } from 'app/modules/empty/empty.component';
 import { InterfaceStatusIconComponent } from 'app/modules/interface-status-icon/interface-status-icon.component';
 import { IxIconHarness } from 'app/modules/ix-icon/ix-icon.harness';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
+import { NetworkSpeedPipe } from 'app/modules/pipes/network-speed/network-speed.pipe';
 import { DragHandleComponent } from 'app/pages/dashboard-old/components/drag-handle/drag-handle.component';
 import { WidgetNicComponent } from 'app/pages/dashboard-old/components/widget-nic/widget-nic.component';
 import { ResourcesUsageStore } from 'app/pages/dashboard-old/store/resources-usage-store.service';
@@ -26,7 +27,8 @@ describe('WidgetNicComponent', () => {
     imports: [
       NgxSkeletonLoaderModule,
       MatGridListModule,
-      IxFileSizePipe,
+      FileSizePipe,
+      NetworkSpeedPipe,
     ],
     declarations: [
       MockComponent(DragHandleComponent),
diff --git a/src/app/pages/dashboard-old/dashboard-old.module.ts b/src/app/pages/dashboard-old/dashboard-old.module.ts
index 4fa7437e137..4ceb2511fde 100644
--- a/src/app/pages/dashboard-old/dashboard-old.module.ts
+++ b/src/app/pages/dashboard-old/dashboard-old.module.ts
@@ -13,7 +13,7 @@ import { MatTooltipModule } from '@angular/material/tooltip';
 import { TranslateModule } from '@ngx-translate/core';
 import { ImgFallbackModule } from 'ngx-img-fallback';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { CopyButtonComponent } from 'app/modules/buttons/copy-button/copy-button.component';
 import { ViewChartAreaComponent } from 'app/modules/charts/components/view-chart-area/view-chart-area.component';
 import { ViewChartGaugeComponent } from 'app/modules/charts/components/view-chart-gauge/view-chart-gauge.component';
@@ -25,8 +25,9 @@ import { IxDropGridModule } from 'app/modules/ix-drop-grid/ix-drop-grid.module';
 import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module';
 import { IxTableModule } from 'app/modules/ix-table/ix-table.module';
 import { LayoutModule } from 'app/modules/layout/layout.module';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { NetworkSpeedPipe } from 'app/modules/pipes/network-speed/network-speed.pipe';
 import { TestIdModule } from 'app/modules/test-id/test-id.module';
 import { UptimePipe } from 'app/pages/dashboard/widgets/system/common/uptime.pipe';
 import { DashboardComponent } from 'app/pages/dashboard-old/components/dashboard/dashboard.component';
@@ -77,11 +78,12 @@ import { ResourcesUsageStore } from 'app/pages/dashboard-old/store/resources-usa
     EmptyComponent,
     InterfaceStatusIconComponent,
     UptimePipe,
-    IxFileSizePipe,
+    FileSizePipe,
     FormatDateTimePipe,
     CopyButtonComponent,
     ViewChartAreaComponent,
     ViewChartGaugeComponent,
+    NetworkSpeedPipe,
   ],
   declarations: [
     DashboardComponent,
diff --git a/src/app/pages/dashboard/dashboard.module.ts b/src/app/pages/dashboard/dashboard.module.ts
index c4694094863..2b68059b22f 100644
--- a/src/app/pages/dashboard/dashboard.module.ts
+++ b/src/app/pages/dashboard/dashboard.module.ts
@@ -10,7 +10,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { BaseChartDirective } from 'ng2-charts';
 import { ImgFallbackModule } from 'ngx-img-fallback';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { CopyButtonComponent } from 'app/modules/buttons/copy-button/copy-button.component';
 import { ViewChartAreaComponent } from 'app/modules/charts/components/view-chart-area/view-chart-area.component';
 import { ViewChartGaugeComponent } from 'app/modules/charts/components/view-chart-gauge/view-chart-gauge.component';
@@ -22,9 +22,10 @@ import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module';
 import { LayoutModule } from 'app/modules/layout/layout.module';
 import { AppLoaderModule } from 'app/modules/loader/app-loader.module';
 import { PageHeaderModule } from 'app/modules/page-header/page-header.module';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
 import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe';
+import { NetworkSpeedPipe } from 'app/modules/pipes/network-speed/network-speed.pipe';
 import { TestIdModule } from 'app/modules/test-id/test-id.module';
 import { AppCardLogoComponent } from 'app/pages/apps/components/app-card-logo/app-card-logo.component';
 import { AppStatusCellComponent } from 'app/pages/apps/components/installed-apps/app-status-cell/app-status-cell.component';
@@ -117,11 +118,12 @@ import { UptimePipe } from 'app/pages/dashboard/widgets/system/common/uptime.pip
     AppStatusCellComponent,
     AppUpdateCellComponent,
     FormatDateTimePipe,
-    IxFileSizePipe,
+    FileSizePipe,
     CopyButtonComponent,
     MapValuePipe,
     ViewChartAreaComponent,
     ViewChartGaugeComponent,
+    NetworkSpeedPipe,
   ],
 })
 export class DashboardModule {
diff --git a/src/app/pages/dashboard/widgets/apps/widget-app/widget-app.component.html b/src/app/pages/dashboard/widgets/apps/widget-app/widget-app.component.html
index ff06b5a155c..06c7b9c6ad1 100644
--- a/src/app/pages/dashboard/widgets/apps/widget-app/widget-app.component.html
+++ b/src/app/pages/dashboard/widgets/apps/widget-app/widget-app.component.html
@@ -89,13 +89,13 @@ <h4>{{ 'Network I/O' | translate }}</h4>
                 <div class="in-out-row">
                   <span>{{ 'In' | translate }}:</span>
                   <span *ixWithLoadingState="stats() as stats">
-                    {{ stats.network.incoming | ixFileSize: { baseUnit: 'b', base: 10 } }}/s
+                    {{ stats.network.incoming | ixNetworkSpeed }}
                   </span>
                 </div>
                 <div class="in-out-row">
                   <span>{{ 'Out' | translate }}:</span>
                   <span *ixWithLoadingState="stats() as stats">
-                    {{ stats.network.outgoing | ixFileSize: { baseUnit: 'b', base: 10 } }}/s
+                    {{ stats.network.outgoing | ixNetworkSpeed }}
                   </span>
                 </div>
               </div>
@@ -147,13 +147,13 @@ <h4>{{ 'Disk I/O' | translate }}</h4>
                 <div class="in-out-row">
                   <span>{{ 'In' | translate }}:</span>
                   <span *ixWithLoadingState="stats() as stats">
-                    {{ stats.network.incoming | ixFileSize: { baseUnit: 'b', base: 10 } }}/s
+                    {{ stats.network.incoming | ixNetworkSpeed }}
                   </span>
                 </div>
                 <div class="in-out-row">
                   <span>{{ 'Out' | translate }}:</span>
                   <span *ixWithLoadingState="stats() as stats">
-                    {{ stats.network.outgoing | ixFileSize: { baseUnit: 'b', base: 10 } }}/s
+                    {{ stats.network.outgoing | ixNetworkSpeed }}
                   </span>
                 </div>
               </div>
diff --git a/src/app/pages/dashboard/widgets/apps/widget-app/widget-app.component.spec.ts b/src/app/pages/dashboard/widgets/apps/widget-app/widget-app.component.spec.ts
index 8bf21b6d477..4c5a7628a25 100644
--- a/src/app/pages/dashboard/widgets/apps/widget-app/widget-app.component.spec.ts
+++ b/src/app/pages/dashboard/widgets/apps/widget-app/widget-app.component.spec.ts
@@ -11,8 +11,9 @@ import { ChartRelease } from 'app/interfaces/chart-release.interface';
 import { Job } from 'app/interfaces/job.interface';
 import { DialogService } from 'app/modules/dialog/dialog.service';
 import { IxIconHarness } from 'app/modules/ix-icon/ix-icon.harness';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe';
+import { NetworkSpeedPipe } from 'app/modules/pipes/network-speed/network-speed.pipe';
 import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service';
 import { AppCardLogoComponent } from 'app/pages/apps/components/app-card-logo/app-card-logo.component';
 import { AppStatusCellComponent } from 'app/pages/apps/components/installed-apps/app-status-cell/app-status-cell.component';
@@ -35,7 +36,7 @@ describe('WidgetAppComponent', () => {
     name: 'TestApp',
     portals: {
       web_portal: ['http://test.com'],
-    },
+    } as Record<string, string[]>,
     status: ChartReleaseStatus.Active,
     update_available: true,
     container_images_update_available: false,
@@ -45,11 +46,16 @@ describe('WidgetAppComponent', () => {
     },
     catalog: 'truenas',
     catalog_train: 'charts',
-  } as unknown as ChartRelease;
+  } as ChartRelease;
 
   const createComponent = createComponentFactory({
     component: WidgetAppComponent,
-    imports: [MapValuePipe, IxFileSizePipe, NgxSkeletonLoaderModule],
+    imports: [
+      MapValuePipe,
+      NetworkSpeedPipe,
+      FileSizePipe,
+      NgxSkeletonLoaderModule,
+    ],
     declarations: [
       MockComponent(AppStatusCellComponent),
       MockComponent(AppUpdateCellComponent),
diff --git a/src/app/pages/dashboard/widgets/network/widget-network/widget-network.component.html b/src/app/pages/dashboard/widgets/network/widget-network/widget-network.component.html
index b2b8dfab559..6cee8e52b58 100644
--- a/src/app/pages/dashboard/widgets/network/widget-network/widget-network.component.html
+++ b/src/app/pages/dashboard/widgets/network/widget-network/widget-network.component.html
@@ -38,11 +38,11 @@ <h3 *ixWithLoadingState="interface() as interface" class="info-header-title">{{
               <div class="in-out" [class.loading]="isLoading()">
                 <div *ngIf="!isLoading(); else skeleton" class="info-list-item in">
                   <span>{{ 'In' | translate }}:</span>
-                  <span>{{ bitsIn() | ixFileSize: { baseUnit: 'b', base: 10 } }}/s</span>
+                  <span>{{ bitsIn() | ixNetworkSpeed }}</span>
                 </div>
                 <div *ngIf="!isLoading(); else skeleton" class="info-list-item out">
                   <span>{{ 'Out' | translate }}:</span>
-                  <span>{{ bitsOut() | ixFileSize: { baseUnit: 'b', base: 10 } }}/s</span>
+                  <span>{{ bitsOut() | ixNetworkSpeed }}</span>
                 </div>
               </div>
             </div>
diff --git a/src/app/pages/dashboard/widgets/network/widget-network/widget-network.component.spec.ts b/src/app/pages/dashboard/widgets/network/widget-network/widget-network.component.spec.ts
index dacd08cca0a..b79370867fd 100644
--- a/src/app/pages/dashboard/widgets/network/widget-network/widget-network.component.spec.ts
+++ b/src/app/pages/dashboard/widgets/network/widget-network/widget-network.component.spec.ts
@@ -5,7 +5,7 @@ import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 import { of } from 'rxjs';
 import { NetworkInterfaceType, NetworkInterfaceAliasType, LinkState } from 'app/enums/network-interface.enum';
 import { InterfaceStatusIconComponent } from 'app/modules/interface-status-icon/interface-status-icon.component';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { NetworkSpeedPipe } from 'app/modules/pipes/network-speed/network-speed.pipe';
 import { WidgetResourcesService } from 'app/pages/dashboard/services/widget-resources.service';
 import { SlotSize } from 'app/pages/dashboard/types/widget.interface';
 import { NetworkChartComponent } from 'app/pages/dashboard/widgets/network/common/network-chart/network-chart.component';
@@ -18,7 +18,7 @@ describe('WidgetNetworkComponent', () => {
     component: WidgetNetworkComponent,
     imports: [
       NgxSkeletonLoaderModule,
-      IxFileSizePipe,
+      NetworkSpeedPipe,
     ],
     declarations: [
       MockComponent(NetworkChartComponent),
diff --git a/src/app/pages/dashboard/widgets/storage/widget-pool/widget-pool.component.spec.ts b/src/app/pages/dashboard/widgets/storage/widget-pool/widget-pool.component.spec.ts
index 3b21222ca13..ac8d2531896 100644
--- a/src/app/pages/dashboard/widgets/storage/widget-pool/widget-pool.component.spec.ts
+++ b/src/app/pages/dashboard/widgets/storage/widget-pool/widget-pool.component.spec.ts
@@ -8,7 +8,7 @@ import { PoolStatus } from 'app/enums/pool-status.enum';
 import { TopologyItemType } from 'app/enums/v-dev-type.enum';
 import { Disk } from 'app/interfaces/disk.interface';
 import { Pool } from 'app/interfaces/pool.interface';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { WidgetResourcesService } from 'app/pages/dashboard/services/widget-resources.service';
 import { SlotSize } from 'app/pages/dashboard/types/widget.interface';
 import { GaugeChartComponent } from 'app/pages/dashboard/widgets/storage/widget-pool/gauge-chart/gauge-chart.component';
@@ -21,7 +21,7 @@ describe('WidgetPoolComponent', () => {
     component: WidgetPoolComponent,
     imports: [
       NgxSkeletonLoaderModule,
-      IxFileSizePipe,
+      FileSizePipe,
     ],
     declarations: [
       MockComponent(GaugeChartComponent),
diff --git a/src/app/pages/data-protection/data-protection.module.ts b/src/app/pages/data-protection/data-protection.module.ts
index c9dde676477..60db5b4fec4 100755
--- a/src/app/pages/data-protection/data-protection.module.ts
+++ b/src/app/pages/data-protection/data-protection.module.ts
@@ -13,7 +13,7 @@ import { MatTooltipModule } from '@angular/material/tooltip';
 import { RouterModule } from '@angular/router';
 import { FlexLayoutModule } from '@ngbracket/ngx-layout';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { EntityModule } from 'app/modules/entity/entity.module';
 import { CloudCredentialsSelectModule } from 'app/modules/forms/custom-selects/cloud-credentials-select/cloud-credentials-select.module';
 import { SshCredentialsSelectModule } from 'app/modules/forms/custom-selects/ssh-credentials-select/ssh-credentials-select.module';
diff --git a/src/app/pages/datasets/components/dataset-capacity-management-card/dataset-capacity-management-card.component.spec.ts b/src/app/pages/datasets/components/dataset-capacity-management-card/dataset-capacity-management-card.component.spec.ts
index 99c03245968..a229b3ee7a8 100644
--- a/src/app/pages/datasets/components/dataset-capacity-management-card/dataset-capacity-management-card.component.spec.ts
+++ b/src/app/pages/datasets/components/dataset-capacity-management-card/dataset-capacity-management-card.component.spec.ts
@@ -11,7 +11,7 @@ import { DatasetType } from 'app/enums/dataset.enum';
 import { DatasetQuota } from 'app/interfaces/dataset-quota.interface';
 import { DatasetDetails } from 'app/interfaces/dataset.interface';
 import { DialogService } from 'app/modules/dialog/dialog.service';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { DatasetCapacityManagementCardComponent } from 'app/pages/datasets/components/dataset-capacity-management-card/dataset-capacity-management-card.component';
 import { DatasetCapacitySettingsComponent } from 'app/pages/datasets/components/dataset-capacity-management-card/dataset-capacity-settings/dataset-capacity-settings.component';
 import { SpaceManagementChartComponent } from 'app/pages/datasets/components/dataset-capacity-management-card/space-management-chart/space-management-chart.component';
@@ -58,7 +58,7 @@ describe('DatasetCapacityManagementCardComponent', () => {
   const createComponent = createComponentFactory({
     component: DatasetCapacityManagementCardComponent,
     imports: [
-      IxFileSizePipe,
+      FileSizePipe,
     ],
     declarations: [
       MockComponents(
diff --git a/src/app/pages/datasets/components/dataset-node/dataset-node.component.spec.ts b/src/app/pages/datasets/components/dataset-node/dataset-node.component.spec.ts
index c0a444d15b7..4ce165501c6 100644
--- a/src/app/pages/datasets/components/dataset-node/dataset-node.component.spec.ts
+++ b/src/app/pages/datasets/components/dataset-node/dataset-node.component.spec.ts
@@ -1,7 +1,7 @@
 import { createComponentFactory, Spectator } from '@ngneat/spectator/jest';
 import { DatasetType } from 'app/enums/dataset.enum';
 import { DatasetDetails } from 'app/interfaces/dataset.interface';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { DatasetIconComponent } from 'app/pages/datasets/components/dataset-icon/dataset-icon.component';
 import {
   DatasetEncryptionCellComponent,
@@ -27,7 +27,7 @@ describe('DatasetNodeComponent', () => {
   const createComponent = createComponentFactory({
     component: DatasetNodeComponent,
     imports: [
-      IxFileSizePipe,
+      FileSizePipe,
     ],
     declarations: [
       DatasetIconComponent,
diff --git a/src/app/pages/datasets/datasets.module.ts b/src/app/pages/datasets/datasets.module.ts
index 2900be275aa..184980b4ee0 100644
--- a/src/app/pages/datasets/datasets.module.ts
+++ b/src/app/pages/datasets/datasets.module.ts
@@ -14,7 +14,7 @@ import { FlexLayoutModule } from '@ngbracket/ngx-layout';
 import { TranslateModule } from '@ngx-translate/core';
 import { BaseChartDirective } from 'ng2-charts';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { CopyButtonComponent } from 'app/modules/buttons/copy-button/copy-button.component';
 import { EmptyComponent } from 'app/modules/empty/empty.component';
 import { EntityModule } from 'app/modules/entity/entity.module';
@@ -25,7 +25,7 @@ import { IxTableModule } from 'app/modules/ix-table/ix-table.module';
 import { TreeModule } from 'app/modules/ix-tree/tree.module';
 import { LayoutModule } from 'app/modules/layout/layout.module';
 import { AppLoaderModule } from 'app/modules/loader/app-loader.module';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { TestIdModule } from 'app/modules/test-id/test-id.module';
 import { DataProtectionCardComponent } from 'app/pages/datasets/components/data-protection-card/data-protection-card.component';
 import { DatasetDetailsCardComponent } from 'app/pages/datasets/components/dataset-details-card/dataset-details-card.component';
@@ -88,7 +88,7 @@ import { DatasetNodeComponent } from './components/dataset-node/dataset-node.com
     IxTableModule,
     MatButton,
     MatIconButton,
-    IxFileSizePipe,
+    FileSizePipe,
     CopyButtonComponent,
   ],
   declarations: [
diff --git a/src/app/pages/datasets/modules/encryption/encryption.module.ts b/src/app/pages/datasets/modules/encryption/encryption.module.ts
index 67597228e5a..b319f4806be 100644
--- a/src/app/pages/datasets/modules/encryption/encryption.module.ts
+++ b/src/app/pages/datasets/modules/encryption/encryption.module.ts
@@ -8,7 +8,7 @@ import { MatDividerModule } from '@angular/material/divider';
 import { RouterModule } from '@angular/router';
 import { FlexModule } from '@ngbracket/ngx-layout';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { EntityModule } from 'app/modules/entity/entity.module';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module';
diff --git a/src/app/pages/datasets/modules/permissions/permissions.module.ts b/src/app/pages/datasets/modules/permissions/permissions.module.ts
index b451ffbda17..8c4031fa4ab 100644
--- a/src/app/pages/datasets/modules/permissions/permissions.module.ts
+++ b/src/app/pages/datasets/modules/permissions/permissions.module.ts
@@ -10,7 +10,7 @@ import { MatTooltipModule } from '@angular/material/tooltip';
 import { RouterModule } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { EmptyComponent } from 'app/modules/empty/empty.component';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module';
diff --git a/src/app/pages/datasets/modules/snapshots/snapshot-details-row/snapshot-details-row.component.spec.ts b/src/app/pages/datasets/modules/snapshots/snapshot-details-row/snapshot-details-row.component.spec.ts
index e8a2f0e1207..597a23c0d42 100644
--- a/src/app/pages/datasets/modules/snapshots/snapshot-details-row/snapshot-details-row.component.spec.ts
+++ b/src/app/pages/datasets/modules/snapshots/snapshot-details-row/snapshot-details-row.component.spec.ts
@@ -6,7 +6,6 @@ import { MatDialog } from '@angular/material/dialog';
 import { SpectatorRouting } from '@ngneat/spectator';
 import { mockProvider, createRoutingFactory } from '@ngneat/spectator/jest';
 import { of, pipe } from 'rxjs';
-import { FakeFormatDateTimePipe } from 'app/core/testing/classes/fake-format-datetime.pipe';
 import { mockAuth } from 'app/core/testing/utils/mock-auth.utils';
 import { mockWebSocket, mockCall } from 'app/core/testing/utils/mock-websocket.utils';
 import { DialogService } from 'app/modules/dialog/dialog.service';
@@ -15,7 +14,8 @@ import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { IxTableModule } from 'app/modules/ix-table/ix-table.module';
 import { AppLoaderModule } from 'app/modules/loader/app-loader.module';
 import { AppLoaderService } from 'app/modules/loader/app-loader.service';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
+import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe';
 import { SnapshotCloneDialogComponent } from 'app/pages/datasets/modules/snapshots/snapshot-clone-dialog/snapshot-clone-dialog.component';
 import { SnapshotDetailsRowComponent } from 'app/pages/datasets/modules/snapshots/snapshot-details-row/snapshot-details-row.component';
 import { SnapshotRollbackDialogComponent } from 'app/pages/datasets/modules/snapshots/snapshot-rollback-dialog/snapshot-rollback-dialog.component';
@@ -34,10 +34,8 @@ describe('SnapshotDetailsRowComponent', () => {
       IxFormsModule,
       ReactiveFormsModule,
       IxTableModule,
-      IxFileSizePipe,
-    ],
-    declarations: [
-      FakeFormatDateTimePipe,
+      FileSizePipe,
+      FormatDateTimePipe,
     ],
     providers: [
       mockAuth(),
diff --git a/src/app/pages/datasets/modules/snapshots/snapshots.module.ts b/src/app/pages/datasets/modules/snapshots/snapshots.module.ts
index cb13e7ba838..a635eac2ccc 100644
--- a/src/app/pages/datasets/modules/snapshots/snapshots.module.ts
+++ b/src/app/pages/datasets/modules/snapshots/snapshots.module.ts
@@ -18,15 +18,15 @@ import { EffectsModule } from '@ngrx/effects';
 import { StoreModule } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { EntityModule } from 'app/modules/entity/entity.module';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component';
 import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module';
 import { IxTableModule } from 'app/modules/ix-table/ix-table.module';
 import { LayoutModule } from 'app/modules/layout/layout.module';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
 import { TestIdModule } from 'app/modules/test-id/test-id.module';
 import { SnapshotCloneDialogComponent } from 'app/pages/datasets/modules/snapshots/snapshot-clone-dialog/snapshot-clone-dialog.component';
 import { SnapshotDetailsRowComponent } from 'app/pages/datasets/modules/snapshots/snapshot-details-row/snapshot-details-row.component';
@@ -70,7 +70,7 @@ import { SnapshotBatchDeleteDialogComponent } from './snapshot-batch-delete-dial
     StoreModule.forFeature(snapshotStateKey, snapshotReducer),
     TestIdModule,
     TranslateModule,
-    IxFileSizePipe,
+    FileSizePipe,
     FormatDateTimePipe,
   ],
   declarations: [
diff --git a/src/app/pages/directory-service/directory-service.module.ts b/src/app/pages/directory-service/directory-service.module.ts
index 435b5441c87..7a6973e52c9 100644
--- a/src/app/pages/directory-service/directory-service.module.ts
+++ b/src/app/pages/directory-service/directory-service.module.ts
@@ -9,7 +9,7 @@ import { MatListModule } from '@angular/material/list';
 import { MatToolbarModule } from '@angular/material/toolbar';
 import { FlexLayoutModule } from '@ngbracket/ngx-layout';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { EmptyComponent } from 'app/modules/empty/empty.component';
 import { EntityModule } from 'app/modules/entity/entity.module';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
diff --git a/src/app/pages/jobs/jobs-list.module.ts b/src/app/pages/jobs/jobs-list.module.ts
index 206817bb04d..79a5ceb05c8 100644
--- a/src/app/pages/jobs/jobs-list.module.ts
+++ b/src/app/pages/jobs/jobs-list.module.ts
@@ -9,7 +9,7 @@ import { MatSortModule } from '@angular/material/sort';
 import { MatTabsModule } from '@angular/material/tabs';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { CopyButtonComponent } from 'app/modules/buttons/copy-button/copy-button.component';
 import { EntityModule } from 'app/modules/entity/entity.module';
 import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component';
diff --git a/src/app/pages/network/network.module.ts b/src/app/pages/network/network.module.ts
index 6f20e43bb9f..5c5fd0d2c0f 100644
--- a/src/app/pages/network/network.module.ts
+++ b/src/app/pages/network/network.module.ts
@@ -11,7 +11,7 @@ import { MatToolbarModule } from '@angular/material/toolbar';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { FlexLayoutModule } from '@ngbracket/ngx-layout';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { EmptyComponent } from 'app/modules/empty/empty.component';
 import { EntityModule } from 'app/modules/entity/entity.module';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
diff --git a/src/app/pages/reports-dashboard/reports-dashboard.module.ts b/src/app/pages/reports-dashboard/reports-dashboard.module.ts
index 43f6ff8ada0..0fe36976b08 100644
--- a/src/app/pages/reports-dashboard/reports-dashboard.module.ts
+++ b/src/app/pages/reports-dashboard/reports-dashboard.module.ts
@@ -12,7 +12,7 @@ import { MatToolbarModule } from '@angular/material/toolbar';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { FlexLayoutModule } from '@ngbracket/ngx-layout';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { EmptyComponent } from 'app/modules/empty/empty.component';
 import { EntityModule } from 'app/modules/entity/entity.module';
 import { IxDynamicFormModule } from 'app/modules/forms/ix-dynamic-form/ix-dynamic-form.module';
@@ -23,7 +23,7 @@ import { IxTableModule } from 'app/modules/ix-table/ix-table.module';
 import { LayoutModule } from 'app/modules/layout/layout.module';
 import { AppLoaderModule } from 'app/modules/loader/app-loader.module';
 import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe';
-import { IxDateModule } from 'app/modules/pipes/ix-date/ix-date.module';
+import { IxDateComponent } from 'app/modules/pipes/ix-date/ix-date.component';
 import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe';
 import { TestIdModule } from 'app/modules/test-id/test-id.module';
 import { ReportingExportersFormComponent } from 'app/pages/reports-dashboard/components/exporters/reporting-exporters-form/reporting-exporters-form.component';
@@ -48,7 +48,7 @@ import { ReportsGlobalControlsComponent } from './components/reports-global-cont
     routing,
     ScrollingModule,
     MatButtonModule,
-    IxDateModule,
+    IxDateComponent,
     AppLoaderModule,
     IxTableModule,
     MatToolbarModule,
diff --git a/src/app/pages/services/services.module.ts b/src/app/pages/services/services.module.ts
index 31023707a2a..a3a86fddd56 100644
--- a/src/app/pages/services/services.module.ts
+++ b/src/app/pages/services/services.module.ts
@@ -12,7 +12,7 @@ import { MatTableModule } from '@angular/material/table';
 import { MatTabsModule } from '@angular/material/tabs';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { EntityModule } from 'app/modules/entity/entity.module';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component';
diff --git a/src/app/pages/sharing/sharing.module.ts b/src/app/pages/sharing/sharing.module.ts
index 728eca724b1..ded6ae43b44 100644
--- a/src/app/pages/sharing/sharing.module.ts
+++ b/src/app/pages/sharing/sharing.module.ts
@@ -17,7 +17,7 @@ import { MatToolbarModule } from '@angular/material/toolbar';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { FlexLayoutModule } from '@ngbracket/ngx-layout';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { EntityModule } from 'app/modules/entity/entity.module';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component';
diff --git a/src/app/pages/shell/shell.module.ts b/src/app/pages/shell/shell.module.ts
index 26c9ad415ab..dc415bc2d42 100644
--- a/src/app/pages/shell/shell.module.ts
+++ b/src/app/pages/shell/shell.module.ts
@@ -1,7 +1,7 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { EntityModule } from 'app/modules/entity/entity.module';
 import { TerminalModule } from 'app/modules/terminal/terminal.module';
 import { ShellComponent } from './shell.component';
diff --git a/src/app/pages/storage/components/dashboard-pool/pool-usage-card/pool-usage-card.component.spec.ts b/src/app/pages/storage/components/dashboard-pool/pool-usage-card/pool-usage-card.component.spec.ts
index cdb7105d4fa..27a1d001941 100644
--- a/src/app/pages/storage/components/dashboard-pool/pool-usage-card/pool-usage-card.component.spec.ts
+++ b/src/app/pages/storage/components/dashboard-pool/pool-usage-card/pool-usage-card.component.spec.ts
@@ -8,7 +8,7 @@ import { TopologyItemType } from 'app/enums/v-dev-type.enum';
 import { Dataset } from 'app/interfaces/dataset.interface';
 import { Pool } from 'app/interfaces/pool.interface';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { PoolCardIconComponent } from 'app/pages/storage/components/dashboard-pool/pool-card-icon/pool-card-icon.component';
 import { GaugeChartComponent } from 'app/pages/storage/components/dashboard-pool/pool-usage-card/gauge-chart/gauge-chart.component';
 import { PoolUsageCardComponent } from 'app/pages/storage/components/dashboard-pool/pool-usage-card/pool-usage-card.component';
@@ -22,7 +22,7 @@ describe('PoolUsageCardComponent', () => {
     imports: [
       IxFormsModule,
       ReactiveFormsModule,
-      IxFileSizePipe,
+      FileSizePipe,
     ],
     declarations: [
       MockComponent(GaugeChartComponent),
diff --git a/src/app/pages/storage/modules/devices/components/disk-info-card/disk-info-card.component.spec.ts b/src/app/pages/storage/modules/devices/components/disk-info-card/disk-info-card.component.spec.ts
index fd412de64c1..96d78b703fe 100644
--- a/src/app/pages/storage/modules/devices/components/disk-info-card/disk-info-card.component.spec.ts
+++ b/src/app/pages/storage/modules/devices/components/disk-info-card/disk-info-card.component.spec.ts
@@ -14,7 +14,7 @@ import { DiskType } from 'app/enums/disk-type.enum';
 import { Disk } from 'app/interfaces/disk.interface';
 import { TopologyDisk } from 'app/interfaces/storage.interface';
 import { CopyButtonComponent } from 'app/modules/buttons/copy-button/copy-button.component';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { ReplaceDiskDialogComponent } from 'app/pages/storage/modules/devices/components/disk-info-card/replace-disk-dialog/replace-disk-dialog.component';
 import { DevicesStore } from 'app/pages/storage/modules/devices/stores/devices-store.service';
 import { DiskFormComponent } from 'app/pages/storage/modules/disks/components/disk-form/disk-form.component';
@@ -27,7 +27,7 @@ describe('DiskInfoCardComponent', () => {
   const createComponent = createComponentFactory({
     component: DiskInfoCardComponent,
     imports: [
-      IxFileSizePipe,
+      FileSizePipe,
     ],
     declarations: [
       MockComponents(CopyButtonComponent),
diff --git a/src/app/pages/storage/modules/devices/components/zfs-info-card/raidz-extend-dialog/raidz-extend-dialog.component.html b/src/app/pages/storage/modules/devices/components/zfs-info-card/raidz-extend-dialog/raidz-extend-dialog.component.html
index 442795ff36d..a6b2b54dc02 100644
--- a/src/app/pages/storage/modules/devices/components/zfs-info-card/raidz-extend-dialog/raidz-extend-dialog.component.html
+++ b/src/app/pages/storage/modules/devices/components/zfs-info-card/raidz-extend-dialog/raidz-extend-dialog.component.html
@@ -4,7 +4,7 @@ <h1 matDialogTitle>
 
 <form class="ix-form-container" [formGroup]="form" (submit)="onSubmit($event)">
   <div>{{ 'Only disks that are at least {size} are shown.' | translate: { size: minimumSize() | ixFileSize } }}</div>
-  
+
   <ix-unused-disk-select
     formControlName="newDisk"
     [label]="'New Disk' | translate"
diff --git a/src/app/pages/storage/modules/devices/components/zfs-info-card/raidz-extend-dialog/raidz-extend-dialog.component.spec.ts b/src/app/pages/storage/modules/devices/components/zfs-info-card/raidz-extend-dialog/raidz-extend-dialog.component.spec.ts
index bba0dab6cd1..7b6611eda2f 100644
--- a/src/app/pages/storage/modules/devices/components/zfs-info-card/raidz-extend-dialog/raidz-extend-dialog.component.spec.ts
+++ b/src/app/pages/storage/modules/devices/components/zfs-info-card/raidz-extend-dialog/raidz-extend-dialog.component.spec.ts
@@ -18,7 +18,7 @@ import { UnusedDiskSelectComponent } from 'app/modules/forms/custom-selects/unus
 import { IxComboboxHarness } from 'app/modules/forms/ix-forms/components/ix-combobox/ix-combobox.harness';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service';
 import {
   RaidzExtendDialogComponent, RaidzExtendDialogParams,
@@ -36,7 +36,7 @@ describe('RaidzExtendDialogComponent', () => {
       IxFormsModule,
       ReactiveFormsModule,
       UnusedDiskSelectComponent,
-      IxFileSizePipe,
+      FileSizePipe,
     ],
     providers: [
       mockAuth(),
diff --git a/src/app/pages/storage/modules/devices/devices.module.ts b/src/app/pages/storage/modules/devices/devices.module.ts
index b3f5d13a15f..e353511ab6e 100644
--- a/src/app/pages/storage/modules/devices/devices.module.ts
+++ b/src/app/pages/storage/modules/devices/devices.module.ts
@@ -9,7 +9,7 @@ import { RouterModule } from '@angular/router';
 import { FlexLayoutModule } from '@ngbracket/ngx-layout';
 import { TranslateModule } from '@ngx-translate/core';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { CopyButtonComponent } from 'app/modules/buttons/copy-button/copy-button.component';
 import { EntityModule } from 'app/modules/entity/entity.module';
 import { UnusedDiskSelectComponent } from 'app/modules/forms/custom-selects/unused-disk-select/unused-disk-select.component';
@@ -20,7 +20,7 @@ import { TreeModule } from 'app/modules/ix-tree/tree.module';
 import { LayoutModule } from 'app/modules/layout/layout.module';
 import { AppLoaderModule } from 'app/modules/loader/app-loader.module';
 import { CastPipe } from 'app/modules/pipes/cast/cast.pipe';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { TestIdModule } from 'app/modules/test-id/test-id.module';
 import { DevicesComponent } from 'app/pages/storage/modules/devices/components/devices/devices.component';
 import {
@@ -76,7 +76,7 @@ import { ExtendDialogComponent } from './components/zfs-info-card/extend-dialog/
     SearchInput1Component,
     UnusedDiskSelectComponent,
     CastPipe,
-    IxFileSizePipe,
+    FileSizePipe,
     CopyButtonComponent,
   ],
   declarations: [
diff --git a/src/app/pages/storage/modules/disks/disks.module.ts b/src/app/pages/storage/modules/disks/disks.module.ts
index 7c15c61cf2d..7e327baa227 100644
--- a/src/app/pages/storage/modules/disks/disks.module.ts
+++ b/src/app/pages/storage/modules/disks/disks.module.ts
@@ -8,7 +8,7 @@ import { MatDividerModule } from '@angular/material/divider';
 import { MatProgressBarModule } from '@angular/material/progress-bar';
 import { RouterModule } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { EntityModule } from 'app/modules/entity/entity.module';
 import { UnusedDiskSelectComponent } from 'app/modules/forms/custom-selects/unused-disk-select/unused-disk-select.component';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
diff --git a/src/app/pages/storage/modules/pool-manager/components/configuration-preview/configuration-preview.component.spec.ts b/src/app/pages/storage/modules/pool-manager/components/configuration-preview/configuration-preview.component.spec.ts
index bfac87a5756..bde8b2a22a1 100644
--- a/src/app/pages/storage/modules/pool-manager/components/configuration-preview/configuration-preview.component.spec.ts
+++ b/src/app/pages/storage/modules/pool-manager/components/configuration-preview/configuration-preview.component.spec.ts
@@ -5,7 +5,7 @@ import { GiB } from 'app/constants/bytes.constant';
 import { DiskType } from 'app/enums/disk-type.enum';
 import { CreateVdevLayout, VdevType } from 'app/enums/v-dev-type.enum';
 import { CastPipe } from 'app/modules/pipes/cast/cast.pipe';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe';
 import {
   ConfigurationPreviewComponent,
@@ -24,7 +24,7 @@ describe('ConfigurationPreviewComponent', () => {
   const createComponent = createComponentFactory({
     component: ConfigurationPreviewComponent,
     imports: [
-      IxFileSizePipe,
+      FileSizePipe,
       MapValuePipe,
       CastPipe,
     ],
diff --git a/src/app/pages/storage/modules/pool-manager/components/pool-manager-wizard/steps/9-review-wizard-step/review-wizard-step.component.spec.ts b/src/app/pages/storage/modules/pool-manager/components/pool-manager-wizard/steps/9-review-wizard-step/review-wizard-step.component.spec.ts
index 3bd05532cfb..582dba1fee0 100644
--- a/src/app/pages/storage/modules/pool-manager/components/pool-manager-wizard/steps/9-review-wizard-step/review-wizard-step.component.spec.ts
+++ b/src/app/pages/storage/modules/pool-manager/components/pool-manager-wizard/steps/9-review-wizard-step/review-wizard-step.component.spec.ts
@@ -11,7 +11,7 @@ import { mockAuth } from 'app/core/testing/utils/mock-auth.utils';
 import { DiskType } from 'app/enums/disk-type.enum';
 import { CreateVdevLayout, VdevType } from 'app/enums/v-dev-type.enum';
 import { DialogService } from 'app/modules/dialog/dialog.service';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe';
 import {
   InspectVdevsDialogComponent,
@@ -66,7 +66,7 @@ describe('ReviewWizardStepComponent', () => {
   const createComponent = createComponentFactory({
     component: ReviewWizardStepComponent,
     imports: [
-      IxFileSizePipe,
+      FileSizePipe,
       MapValuePipe,
     ],
     declarations: [
diff --git a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/add-vdev-to-pool.spec.ts b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/add-vdev-to-pool.spec.ts
index d893e9fc423..6a450716f63 100644
--- a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/add-vdev-to-pool.spec.ts
+++ b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/add-vdev-to-pool.spec.ts
@@ -15,7 +15,7 @@ import { Enclosure } from 'app/interfaces/enclosure.interface';
 import { DialogService } from 'app/modules/dialog/dialog.service';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { CastPipe } from 'app/modules/pipes/cast/cast.pipe';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe';
 import { AddVdevsComponent } from 'app/pages/storage/modules/pool-manager/components/add-vdevs/add-vdevs.component';
 import { AddVdevsStore } from 'app/pages/storage/modules/pool-manager/components/add-vdevs/store/add-vdevs-store.service';
@@ -40,7 +40,7 @@ describe('AddVdevsComponent – Add Vdev to existing pool', () => {
       IxFormsModule,
       ReactiveFormsModule,
       MatStepperModule,
-      IxFileSizePipe,
+      FileSizePipe,
       MapValuePipe,
       CastPipe,
     ],
diff --git a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/create-pool.spec.ts b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/create-pool.spec.ts
index 21dea681e70..710a330b921 100644
--- a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/create-pool.spec.ts
+++ b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/create-pool.spec.ts
@@ -13,7 +13,7 @@ import { DetailsDisk } from 'app/interfaces/disk.interface';
 import { Enclosure } from 'app/interfaces/enclosure.interface';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { CastPipe } from 'app/modules/pipes/cast/cast.pipe';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe';
 import {
   PoolManagerComponent,
@@ -37,7 +37,7 @@ describe('PoolManagerComponent – create pool', () => {
       IxFormsModule,
       ReactiveFormsModule,
       MatStepperModule,
-      IxFileSizePipe,
+      FileSizePipe,
       MapValuePipe,
       CastPipe,
     ],
diff --git a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/draid-pool-creation.spec.ts b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/draid-pool-creation.spec.ts
index 292946a3709..8f9d33227cc 100644
--- a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/draid-pool-creation.spec.ts
+++ b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/draid-pool-creation.spec.ts
@@ -15,7 +15,7 @@ import { Enclosure } from 'app/interfaces/enclosure.interface';
 import { DialogService } from 'app/modules/dialog/dialog.service';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { CastPipe } from 'app/modules/pipes/cast/cast.pipe';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe';
 import {
   PoolManagerComponent,
@@ -39,7 +39,7 @@ describe('PoolManagerComponent – creating dRAID pool', () => {
       IxFormsModule,
       ReactiveFormsModule,
       MatStepperModule,
-      IxFileSizePipe,
+      FileSizePipe,
       MapValuePipe,
       CastPipe,
     ],
diff --git a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/unsetting-on-fewer-disks.spec.ts b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/unsetting-on-fewer-disks.spec.ts
index c38188d5003..ddbfbc05e6e 100644
--- a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/unsetting-on-fewer-disks.spec.ts
+++ b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/unsetting-on-fewer-disks.spec.ts
@@ -13,7 +13,7 @@ import { Enclosure } from 'app/interfaces/enclosure.interface';
 import { IxRadioGroupHarness } from 'app/modules/forms/ix-forms/components/ix-radio-group/ix-radio-group.harness';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { CastPipe } from 'app/modules/pipes/cast/cast.pipe';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe';
 import {
   PoolManagerComponent,
@@ -36,7 +36,7 @@ describe('PoolManagerComponent – unsetting on fewer disks', () => {
       IxFormsModule,
       ReactiveFormsModule,
       MatStepperModule,
-      IxFileSizePipe,
+      FileSizePipe,
       MapValuePipe,
       CastPipe,
     ],
diff --git a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/wizard-reset-step.spec.ts b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/wizard-reset-step.spec.ts
index 3f2d1354875..080017bfc80 100644
--- a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/wizard-reset-step.spec.ts
+++ b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/wizard-reset-step.spec.ts
@@ -13,7 +13,7 @@ import { Enclosure } from 'app/interfaces/enclosure.interface';
 import { DialogService } from 'app/modules/dialog/dialog.service';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { CastPipe } from 'app/modules/pipes/cast/cast.pipe';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe';
 import {
   PoolManagerComponent,
@@ -36,7 +36,7 @@ describe('PoolManagerComponent – wizard step reset', () => {
       IxFormsModule,
       ReactiveFormsModule,
       MatStepperModule,
-      IxFileSizePipe,
+      FileSizePipe,
       MapValuePipe,
       CastPipe,
     ],
diff --git a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/wizard-start-over.spec.ts b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/wizard-start-over.spec.ts
index 94808a56ea2..3f9a1cdc8c6 100644
--- a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/wizard-start-over.spec.ts
+++ b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/wizard-start-over.spec.ts
@@ -13,7 +13,7 @@ import { DialogService } from 'app/modules/dialog/dialog.service';
 import { IxRadioGroupHarness } from 'app/modules/forms/ix-forms/components/ix-radio-group/ix-radio-group.harness';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { CastPipe } from 'app/modules/pipes/cast/cast.pipe';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe';
 import {
   PoolManagerComponent,
@@ -36,7 +36,7 @@ describe('PoolManagerComponent – start over functionality', () => {
       IxFormsModule,
       ReactiveFormsModule,
       MatStepperModule,
-      IxFileSizePipe,
+      FileSizePipe,
       MapValuePipe,
       CastPipe,
     ],
diff --git a/src/app/pages/storage/modules/pool-manager/pool-manager.module.ts b/src/app/pages/storage/modules/pool-manager/pool-manager.module.ts
index 6a3994beca5..c93c6ca9cb3 100644
--- a/src/app/pages/storage/modules/pool-manager/pool-manager.module.ts
+++ b/src/app/pages/storage/modules/pool-manager/pool-manager.module.ts
@@ -14,14 +14,14 @@ import { RouterModule } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { DndModule } from 'ngx-drag-drop';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { DiskIconComponent } from 'app/modules/disk-icon/disk-icon.component';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module';
 import { TreeModule } from 'app/modules/ix-tree/tree.module';
 import { AppLoaderModule } from 'app/modules/loader/app-loader.module';
 import { CastPipe } from 'app/modules/pipes/cast/cast.pipe';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe';
 import { TestIdModule } from 'app/modules/test-id/test-id.module';
 import { AddVdevsComponent } from 'app/pages/storage/modules/pool-manager/components/add-vdevs/add-vdevs.component';
@@ -92,7 +92,7 @@ import { DataWizardStepComponent } from './components/pool-manager-wizard/steps/
     CommonDirectivesModule,
     MatTooltipModule,
     CastPipe,
-    IxFileSizePipe,
+    FileSizePipe,
     MapValuePipe,
     DiskIconComponent,
   ],
diff --git a/src/app/pages/storage/storage.module.ts b/src/app/pages/storage/storage.module.ts
index 0ae73f31c0b..4009abaa8ed 100644
--- a/src/app/pages/storage/storage.module.ts
+++ b/src/app/pages/storage/storage.module.ts
@@ -21,15 +21,15 @@ import { FlexLayoutModule, FlexModule } from '@ngbracket/ngx-layout';
 import { TranslateModule } from '@ngx-translate/core';
 import { BaseChartDirective } from 'ng2-charts';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { EmptyComponent } from 'app/modules/empty/empty.component';
 import { EntityModule } from 'app/modules/entity/entity.module';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module';
 import { LayoutModule } from 'app/modules/layout/layout.module';
 import { AppLoaderModule } from 'app/modules/loader/app-loader.module';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
 import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe';
 import { TestIdModule } from 'app/modules/test-id/test-id.module';
 import { PoolCardIconComponent } from 'app/pages/storage/components/dashboard-pool/pool-card-icon/pool-card-icon.component';
@@ -88,7 +88,7 @@ import { ZfsHealthCardComponent } from './components/dashboard-pool/zfs-health-c
     TestIdModule,
     AppLoaderModule,
     EmptyComponent,
-    IxFileSizePipe,
+    FileSizePipe,
     FormatDateTimePipe,
     MapValuePipe,
   ],
diff --git a/src/app/pages/system/bootenv/bootenv-stats-dialog/bootenv-stats-dialog.component.spec.ts b/src/app/pages/system/bootenv/bootenv-stats-dialog/bootenv-stats-dialog.component.spec.ts
index a81af589ffc..4ef738c4514 100644
--- a/src/app/pages/system/bootenv/bootenv-stats-dialog/bootenv-stats-dialog.component.spec.ts
+++ b/src/app/pages/system/bootenv/bootenv-stats-dialog/bootenv-stats-dialog.component.spec.ts
@@ -16,7 +16,7 @@ import { DialogService } from 'app/modules/dialog/dialog.service';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness';
 import { AppLoaderModule } from 'app/modules/loader/app-loader.module';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe';
 import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service';
 import { WebSocketService } from 'app/services/ws.service';
@@ -45,7 +45,7 @@ describe('BootenvStatsDialogComponent', () => {
       IxFormsModule,
       ReactiveFormsModule,
       MapValuePipe,
-      IxFileSizePipe,
+      FileSizePipe,
     ],
     providers: [
       mockProvider(DialogService),
diff --git a/src/app/pages/system/enclosure/components/pages/enclosure-page/enclosure-view/disks-overview/disks-overview.component.spec.ts b/src/app/pages/system/enclosure/components/pages/enclosure-page/enclosure-view/disks-overview/disks-overview.component.spec.ts
index 03df057fe90..676e7dca77c 100644
--- a/src/app/pages/system/enclosure/components/pages/enclosure-page/enclosure-view/disks-overview/disks-overview.component.spec.ts
+++ b/src/app/pages/system/enclosure/components/pages/enclosure-page/enclosure-view/disks-overview/disks-overview.component.spec.ts
@@ -8,7 +8,7 @@ import {
   DashboardEnclosureElements,
   DashboardEnclosureSlot,
 } from 'app/interfaces/enclosure.interface';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { DisksOverviewDetailsComponent } from 'app/pages/system/enclosure/components/pages/enclosure-page/enclosure-view/disks-overview/disks-overview-details/disks-overview-details.component';
 import { DisksOverviewTilesComponent } from 'app/pages/system/enclosure/components/pages/enclosure-page/enclosure-view/disks-overview/disks-overview-tiles/disks-overview-tiles.component';
 import { DisksOverviewComponent } from 'app/pages/system/enclosure/components/pages/enclosure-page/enclosure-view/disks-overview/disks-overview.component';
@@ -72,7 +72,7 @@ describe('DisksOverviewComponent', () => {
   const createComponent = createComponentFactory({
     component: DisksOverviewComponent,
     imports: [
-      IxFileSizePipe,
+      FileSizePipe,
     ],
     providers: [
       mockProvider(EnclosureStore, {
diff --git a/src/app/pages/system/enclosure/enclosure.module.ts b/src/app/pages/system/enclosure/enclosure.module.ts
index 3c119cad1d4..0692757bb15 100644
--- a/src/app/pages/system/enclosure/enclosure.module.ts
+++ b/src/app/pages/system/enclosure/enclosure.module.ts
@@ -8,7 +8,7 @@ import { MatMenu, MatMenuItem, MatMenuTrigger } from '@angular/material/menu';
 import { MatTooltip } from '@angular/material/tooltip';
 import { TranslateModule } from '@ngx-translate/core';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { DiskIconComponent } from 'app/modules/disk-icon/disk-icon.component';
 import { EmptyComponent } from 'app/modules/empty/empty.component';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
@@ -17,7 +17,7 @@ import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module';
 import { IxTableModule } from 'app/modules/ix-table/ix-table.module';
 import { LayoutModule } from 'app/modules/layout/layout.module';
 import { AppLoaderModule } from 'app/modules/loader/app-loader.module';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe';
 import { TestIdModule } from 'app/modules/test-id/test-id.module';
 import { EnclosureDashboardComponent } from 'app/pages/system/enclosure/components/enclosure-dashboard/enclosure-dashboard.component';
@@ -107,7 +107,7 @@ import { SvgCacheService } from 'app/pages/system/enclosure/services/svg-cache.s
     MatDialogClose,
     MatDialogTitle,
     EmptyComponent,
-    IxFileSizePipe,
+    FileSizePipe,
     MapValuePipe,
     NgxSkeletonLoaderModule,
     AppLoaderModule,
diff --git a/src/app/pages/system/old-view-enclosure/components/enclosure-disks-mini/enclosure-disks-mini.component.spec.ts b/src/app/pages/system/old-view-enclosure/components/enclosure-disks-mini/enclosure-disks-mini.component.spec.ts
index ec1dd03038c..c6c52ae5083 100644
--- a/src/app/pages/system/old-view-enclosure/components/enclosure-disks-mini/enclosure-disks-mini.component.spec.ts
+++ b/src/app/pages/system/old-view-enclosure/components/enclosure-disks-mini/enclosure-disks-mini.component.spec.ts
@@ -8,7 +8,7 @@ import { mockAuth } from 'app/core/testing/utils/mock-auth.utils';
 import { mockCall, mockWebSocket } from 'app/core/testing/utils/mock-websocket.utils';
 import { EnclosureDiskStatus } from 'app/enums/enclosure-slot-status.enum';
 import { DashboardEnclosureSlot } from 'app/interfaces/enclosure.interface';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { DriveTray } from 'app/pages/system/old-view-enclosure/classes/drivetray';
 import { DiskComponent } from 'app/pages/system/old-view-enclosure/components/disk-component/disk.component';
 import { EnclosureDisksMiniComponent } from 'app/pages/system/old-view-enclosure/components/enclosure-disks-mini/enclosure-disks-mini.component';
@@ -62,7 +62,7 @@ describe('EnclosureDisksMiniComponent', () => {
   const createComponent = createComponentFactory({
     component: EnclosureDisksMiniComponent,
     imports: [
-      IxFileSizePipe,
+      FileSizePipe,
     ],
     declarations: [
       DiskComponent,
diff --git a/src/app/pages/system/old-view-enclosure/components/enclosure-disks/enclosure-disks.component.spec.ts b/src/app/pages/system/old-view-enclosure/components/enclosure-disks/enclosure-disks.component.spec.ts
index 3fadeb73b6e..dd1e64f17fc 100644
--- a/src/app/pages/system/old-view-enclosure/components/enclosure-disks/enclosure-disks.component.spec.ts
+++ b/src/app/pages/system/old-view-enclosure/components/enclosure-disks/enclosure-disks.component.spec.ts
@@ -8,7 +8,7 @@ import { mockAuth } from 'app/core/testing/utils/mock-auth.utils';
 import { mockCall, mockWebSocket } from 'app/core/testing/utils/mock-websocket.utils';
 import { EnclosureDiskStatus } from 'app/enums/enclosure-slot-status.enum';
 import { DashboardEnclosureSlot } from 'app/interfaces/enclosure.interface';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { DriveTray } from 'app/pages/system/old-view-enclosure/classes/drivetray';
 import { DiskComponent } from 'app/pages/system/old-view-enclosure/components/disk-component/disk.component';
 import { EnclosureDisksComponent } from 'app/pages/system/old-view-enclosure/components/enclosure-disks/enclosure-disks.component';
@@ -64,7 +64,7 @@ describe('EnclosureDisksComponent', () => {
   const createComponent = createComponentFactory({
     component: EnclosureDisksComponent,
     imports: [
-      IxFileSizePipe,
+      FileSizePipe,
     ],
     declarations: [
       DiskComponent,
diff --git a/src/app/pages/system/old-view-enclosure/old-enclosure.module.ts b/src/app/pages/system/old-view-enclosure/old-enclosure.module.ts
index 8e661599453..ddc0a2aca0d 100644
--- a/src/app/pages/system/old-view-enclosure/old-enclosure.module.ts
+++ b/src/app/pages/system/old-view-enclosure/old-enclosure.module.ts
@@ -12,7 +12,7 @@ import { MatToolbarModule } from '@angular/material/toolbar';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { FlexLayoutModule } from '@ngbracket/ngx-layout';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { EntityModule } from 'app/modules/entity/entity.module';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component';
@@ -20,7 +20,7 @@ import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module';
 import { IxTableModule } from 'app/modules/ix-table/ix-table.module';
 import { LayoutModule } from 'app/modules/layout/layout.module';
 import { PageHeaderModule } from 'app/modules/page-header/page-header.module';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { TestIdModule } from 'app/modules/test-id/test-id.module';
 import { TooltipComponent } from 'app/modules/tooltip/tooltip.component';
 import { DiskComponent } from 'app/pages/system/old-view-enclosure/components/disk-component/disk.component';
@@ -60,7 +60,7 @@ import { EnclosureStore } from './stores/enclosure-store.service';
     CommonDirectivesModule,
     IxTableModule,
     SearchInput1Component,
-    IxFileSizePipe,
+    FileSizePipe,
     TooltipComponent,
   ],
   declarations: [
diff --git a/src/app/pages/system/system.module.ts b/src/app/pages/system/system.module.ts
index 1725c81a796..a11dd80f456 100644
--- a/src/app/pages/system/system.module.ts
+++ b/src/app/pages/system/system.module.ts
@@ -17,7 +17,7 @@ import { MatToolbarModule } from '@angular/material/toolbar';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { FlexLayoutModule } from '@ngbracket/ngx-layout';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { OauthButtonModule } from 'app/modules/buttons/oauth-button/oauth-button.module';
 import { EmptyComponent } from 'app/modules/empty/empty.component';
 import { EntityModule } from 'app/modules/entity/entity.module';
@@ -33,8 +33,8 @@ import { JobsModule } from 'app/modules/jobs/jobs.module';
 import { LayoutModule } from 'app/modules/layout/layout.module';
 import { BulkListItemComponent } from 'app/modules/lists/bulk-list-item/bulk-list-item.component';
 import { AppLoaderModule } from 'app/modules/loader/app-loader.module';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
 import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe';
 import { YesNoPipe } from 'app/modules/pipes/yes-no/yes-no.pipe';
 import { SchedulerModule } from 'app/modules/scheduler/scheduler.module';
@@ -181,7 +181,7 @@ import { routing } from './system.routing';
     UnusedDiskSelectComponent,
     SearchInput1Component,
     EmptyComponent,
-    IxFileSizePipe,
+    FileSizePipe,
     TooltipComponent,
     FormatDateTimePipe,
     MapValuePipe,
diff --git a/src/app/pages/two-factor-auth/two-factor-auth.module.ts b/src/app/pages/two-factor-auth/two-factor-auth.module.ts
index f1a5f1a0e22..2c3af66d0bb 100644
--- a/src/app/pages/two-factor-auth/two-factor-auth.module.ts
+++ b/src/app/pages/two-factor-auth/two-factor-auth.module.ts
@@ -10,7 +10,7 @@ import { MatToolbarModule } from '@angular/material/toolbar';
 import { TranslateModule } from '@ngx-translate/core';
 import { QrCodeModule } from 'ng-qrcode';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { AppLoaderModule } from 'app/modules/loader/app-loader.module';
 import { TestIdModule } from 'app/modules/test-id/test-id.module';
diff --git a/src/app/pages/vm/vm-list/vm-list.component.spec.ts b/src/app/pages/vm/vm-list/vm-list.component.spec.ts
index 75917beee98..db6ee78060f 100644
--- a/src/app/pages/vm/vm-list/vm-list.component.spec.ts
+++ b/src/app/pages/vm/vm-list/vm-list.component.spec.ts
@@ -14,7 +14,7 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl
 import { IxTableModule } from 'app/modules/ix-table/ix-table.module';
 import { AppLoaderModule } from 'app/modules/loader/app-loader.module';
 import { PageHeaderModule } from 'app/modules/page-header/page-header.module';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { VmWizardComponent } from 'app/pages/vm/vm-wizard/vm-wizard.component';
 import { IxSlideInService } from 'app/services/ix-slide-in.service';
 import { SystemGeneralService } from 'app/services/system-general.service';
@@ -56,7 +56,7 @@ describe('VmListComponent', () => {
       IxTableModule,
       MockModule(PageHeaderModule),
       SearchInput1Component,
-      IxFileSizePipe,
+      FileSizePipe,
     ],
     declarations: [],
     providers: [
diff --git a/src/app/pages/vm/vm-list/vm-list.component.ts b/src/app/pages/vm/vm-list/vm-list.component.ts
index 619db10a276..dbdaae0f917 100644
--- a/src/app/pages/vm/vm-list/vm-list.component.ts
+++ b/src/app/pages/vm/vm-list/vm-list.component.ts
@@ -21,7 +21,7 @@ import {
 } from 'app/modules/ix-table/components/ix-table-body/cells/ix-cell-toggle/ix-cell-toggle.component';
 import { Column, ColumnComponent } from 'app/modules/ix-table/interfaces/table-column.interface';
 import { createTable } from 'app/modules/ix-table/utils';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { vmListElements } from 'app/pages/vm/vm-list/vm-list.elements';
 import { VmWizardComponent } from 'app/pages/vm/vm-wizard/vm-wizard.component';
 import { IxSlideInService } from 'app/services/ix-slide-in.service';
@@ -35,7 +35,7 @@ import { WebSocketService } from 'app/services/ws.service';
   templateUrl: './vm-list.component.html',
   styleUrls: ['./vm-list.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
-  providers: [IxFileSizePipe],
+  providers: [FileSizePipe],
 })
 export class VmListComponent implements OnInit {
   protected readonly requiredRoles = [Role.VmWrite];
@@ -136,7 +136,7 @@ export class VmListComponent implements OnInit {
     private ws: WebSocketService,
     private cdr: ChangeDetectorRef,
     private vmService: VmService,
-    private fileSizePipe: IxFileSizePipe,
+    private fileSizePipe: FileSizePipe,
     protected emptyService: EmptyService,
   ) {}
 
diff --git a/src/app/pages/vm/vm.module.ts b/src/app/pages/vm/vm.module.ts
index 827222f1d99..607136ff59e 100644
--- a/src/app/pages/vm/vm.module.ts
+++ b/src/app/pages/vm/vm.module.ts
@@ -11,7 +11,7 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { MatStepperModule } from '@angular/material/stepper';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { EmptyComponent } from 'app/modules/empty/empty.component';
 import { EntityModule } from 'app/modules/entity/entity.module';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
@@ -20,7 +20,7 @@ import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module';
 import { IxTableModule } from 'app/modules/ix-table/ix-table.module';
 import { LayoutModule } from 'app/modules/layout/layout.module';
 import { AppLoaderModule } from 'app/modules/loader/app-loader.module';
-import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
+import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
 import { SummaryComponent } from 'app/modules/summary/summary.component';
 import { TerminalModule } from 'app/modules/terminal/terminal.module';
 import { TestIdModule } from 'app/modules/test-id/test-id.module';
@@ -72,7 +72,7 @@ import { routing } from './vm.routing';
     SearchInput1Component,
     SummaryComponent,
     EmptyComponent,
-    IxFileSizePipe,
+    FileSizePipe,
   ],
   declarations: [
     VmSerialShellComponent,
diff --git a/src/app/views/sessions/sessions.module.ts b/src/app/views/sessions/sessions.module.ts
index 36dd4bee92c..c39f5756b21 100644
--- a/src/app/views/sessions/sessions.module.ts
+++ b/src/app/views/sessions/sessions.module.ts
@@ -11,7 +11,7 @@ import { RouterModule } from '@angular/router';
 import { FlexLayoutModule } from '@ngbracket/ngx-layout';
 import { TranslateModule } from '@ngx-translate/core';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
 import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module';
 import { LayoutModule } from 'app/modules/layout/layout.module';
diff --git a/src/assets/i18n/af.json b/src/assets/i18n/af.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/af.json
+++ b/src/assets/i18n/af.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/ar.json
+++ b/src/assets/i18n/ar.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/ast.json b/src/assets/i18n/ast.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/ast.json
+++ b/src/assets/i18n/ast.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/az.json b/src/assets/i18n/az.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/az.json
+++ b/src/assets/i18n/az.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/be.json b/src/assets/i18n/be.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/be.json
+++ b/src/assets/i18n/be.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/bg.json b/src/assets/i18n/bg.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/bg.json
+++ b/src/assets/i18n/bg.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/bn.json b/src/assets/i18n/bn.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/bn.json
+++ b/src/assets/i18n/bn.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/br.json b/src/assets/i18n/br.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/br.json
+++ b/src/assets/i18n/br.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/bs.json b/src/assets/i18n/bs.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/bs.json
+++ b/src/assets/i18n/bs.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/ca.json b/src/assets/i18n/ca.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/ca.json
+++ b/src/assets/i18n/ca.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/cs.json b/src/assets/i18n/cs.json
index 55bff64b55f..723876b3139 100644
--- a/src/assets/i18n/cs.json
+++ b/src/assets/i18n/cs.json
@@ -4598,6 +4598,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/cy.json b/src/assets/i18n/cy.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/cy.json
+++ b/src/assets/i18n/cy.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/da.json b/src/assets/i18n/da.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/da.json
+++ b/src/assets/i18n/da.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
index 58e245eb183..6658e728c7d 100644
--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -3644,6 +3644,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/dsb.json b/src/assets/i18n/dsb.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/dsb.json
+++ b/src/assets/i18n/dsb.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/el.json b/src/assets/i18n/el.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/el.json
+++ b/src/assets/i18n/el.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/en-au.json b/src/assets/i18n/en-au.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/en-au.json
+++ b/src/assets/i18n/en-au.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/en-gb.json b/src/assets/i18n/en-gb.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/en-gb.json
+++ b/src/assets/i18n/en-gb.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/eo.json b/src/assets/i18n/eo.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/eo.json
+++ b/src/assets/i18n/eo.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/es-ar.json b/src/assets/i18n/es-ar.json
index 31367b3bb04..ccb7d2fa98e 100644
--- a/src/assets/i18n/es-ar.json
+++ b/src/assets/i18n/es-ar.json
@@ -2801,6 +2801,7 @@
   "to cloud": "",
   "vdev": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/es-co.json b/src/assets/i18n/es-co.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/es-co.json
+++ b/src/assets/i18n/es-co.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/es-mx.json b/src/assets/i18n/es-mx.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/es-mx.json
+++ b/src/assets/i18n/es-mx.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/es-ni.json b/src/assets/i18n/es-ni.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/es-ni.json
+++ b/src/assets/i18n/es-ni.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/es-ve.json b/src/assets/i18n/es-ve.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/es-ve.json
+++ b/src/assets/i18n/es-ve.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json
index d887ae36986..a4e4cefb77c 100644
--- a/src/assets/i18n/es.json
+++ b/src/assets/i18n/es.json
@@ -4794,6 +4794,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/et.json b/src/assets/i18n/et.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/et.json
+++ b/src/assets/i18n/et.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/eu.json b/src/assets/i18n/eu.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/eu.json
+++ b/src/assets/i18n/eu.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/fa.json b/src/assets/i18n/fa.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/fa.json
+++ b/src/assets/i18n/fa.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/fi.json b/src/assets/i18n/fi.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/fi.json
+++ b/src/assets/i18n/fi.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json
index 9f8928dca99..1433cbd6292 100644
--- a/src/assets/i18n/fr.json
+++ b/src/assets/i18n/fr.json
@@ -1313,6 +1313,7 @@
   "to another TrueNAS": "",
   "to cloud": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/fy.json b/src/assets/i18n/fy.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/fy.json
+++ b/src/assets/i18n/fy.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/ga.json b/src/assets/i18n/ga.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/ga.json
+++ b/src/assets/i18n/ga.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/gd.json b/src/assets/i18n/gd.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/gd.json
+++ b/src/assets/i18n/gd.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/gl.json b/src/assets/i18n/gl.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/gl.json
+++ b/src/assets/i18n/gl.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/he.json b/src/assets/i18n/he.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/he.json
+++ b/src/assets/i18n/he.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/hi.json b/src/assets/i18n/hi.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/hi.json
+++ b/src/assets/i18n/hi.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/hr.json b/src/assets/i18n/hr.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/hr.json
+++ b/src/assets/i18n/hr.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/hsb.json b/src/assets/i18n/hsb.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/hsb.json
+++ b/src/assets/i18n/hsb.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/hu.json b/src/assets/i18n/hu.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/hu.json
+++ b/src/assets/i18n/hu.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/ia.json b/src/assets/i18n/ia.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/ia.json
+++ b/src/assets/i18n/ia.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/id.json b/src/assets/i18n/id.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/id.json
+++ b/src/assets/i18n/id.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/io.json b/src/assets/i18n/io.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/io.json
+++ b/src/assets/i18n/io.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/is.json b/src/assets/i18n/is.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/is.json
+++ b/src/assets/i18n/is.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json
index e256b71c3e9..f0be41b0052 100644
--- a/src/assets/i18n/it.json
+++ b/src/assets/i18n/it.json
@@ -4832,6 +4832,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/ja.json b/src/assets/i18n/ja.json
index 735742505a3..97b2289cf4f 100644
--- a/src/assets/i18n/ja.json
+++ b/src/assets/i18n/ja.json
@@ -4517,6 +4517,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/ka.json b/src/assets/i18n/ka.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/ka.json
+++ b/src/assets/i18n/ka.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/kk.json b/src/assets/i18n/kk.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/kk.json
+++ b/src/assets/i18n/kk.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/km.json b/src/assets/i18n/km.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/km.json
+++ b/src/assets/i18n/km.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/kn.json b/src/assets/i18n/kn.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/kn.json
+++ b/src/assets/i18n/kn.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/ko.json b/src/assets/i18n/ko.json
index 2d012bead7b..9d394ae43cc 100644
--- a/src/assets/i18n/ko.json
+++ b/src/assets/i18n/ko.json
@@ -4596,6 +4596,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/lb.json b/src/assets/i18n/lb.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/lb.json
+++ b/src/assets/i18n/lb.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/lt.json b/src/assets/i18n/lt.json
index c10448799b6..4676e5e6189 100644
--- a/src/assets/i18n/lt.json
+++ b/src/assets/i18n/lt.json
@@ -5007,6 +5007,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/lv.json b/src/assets/i18n/lv.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/lv.json
+++ b/src/assets/i18n/lv.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/mk.json b/src/assets/i18n/mk.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/mk.json
+++ b/src/assets/i18n/mk.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/ml.json b/src/assets/i18n/ml.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/ml.json
+++ b/src/assets/i18n/ml.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/mn.json b/src/assets/i18n/mn.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/mn.json
+++ b/src/assets/i18n/mn.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/mr.json b/src/assets/i18n/mr.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/mr.json
+++ b/src/assets/i18n/mr.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/my.json b/src/assets/i18n/my.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/my.json
+++ b/src/assets/i18n/my.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/nb.json b/src/assets/i18n/nb.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/nb.json
+++ b/src/assets/i18n/nb.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/ne.json b/src/assets/i18n/ne.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/ne.json
+++ b/src/assets/i18n/ne.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/nl.json b/src/assets/i18n/nl.json
index 09a550abffb..01c91da2227 100644
--- a/src/assets/i18n/nl.json
+++ b/src/assets/i18n/nl.json
@@ -1173,6 +1173,7 @@
   "to another TrueNAS": "",
   "to cloud": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{comparator} (Range In)": "",
   "{comparator} (Range Not In)": "",
   "{coreCount, plural, one {# core} other {# cores} }": "",
diff --git a/src/assets/i18n/nn.json b/src/assets/i18n/nn.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/nn.json
+++ b/src/assets/i18n/nn.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/os.json b/src/assets/i18n/os.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/os.json
+++ b/src/assets/i18n/os.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/pa.json b/src/assets/i18n/pa.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/pa.json
+++ b/src/assets/i18n/pa.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/pl.json b/src/assets/i18n/pl.json
index b2d001b4cdf..e78283a3778 100644
--- a/src/assets/i18n/pl.json
+++ b/src/assets/i18n/pl.json
@@ -4943,6 +4943,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/pt-br.json b/src/assets/i18n/pt-br.json
index 0ae6bd79bdb..e7b5ed56f4f 100644
--- a/src/assets/i18n/pt-br.json
+++ b/src/assets/i18n/pt-br.json
@@ -4965,6 +4965,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json
index 502e5621429..1c46d26fdf2 100644
--- a/src/assets/i18n/pt.json
+++ b/src/assets/i18n/pt.json
@@ -3118,6 +3118,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Range In)": "",
   "{comparator} (Range Not In)": "",
diff --git a/src/assets/i18n/ro.json b/src/assets/i18n/ro.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/ro.json
+++ b/src/assets/i18n/ro.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/ru.json b/src/assets/i18n/ru.json
index f39284e6edd..d2301755e5f 100644
--- a/src/assets/i18n/ru.json
+++ b/src/assets/i18n/ru.json
@@ -3258,6 +3258,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/sk.json b/src/assets/i18n/sk.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/sk.json
+++ b/src/assets/i18n/sk.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/sl.json b/src/assets/i18n/sl.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/sl.json
+++ b/src/assets/i18n/sl.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/sq.json b/src/assets/i18n/sq.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/sq.json
+++ b/src/assets/i18n/sq.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/sr-latn.json b/src/assets/i18n/sr-latn.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/sr-latn.json
+++ b/src/assets/i18n/sr-latn.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/sr.json b/src/assets/i18n/sr.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/sr.json
+++ b/src/assets/i18n/sr.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/strings.json b/src/assets/i18n/strings.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/strings.json
+++ b/src/assets/i18n/strings.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/sv.json b/src/assets/i18n/sv.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/sv.json
+++ b/src/assets/i18n/sv.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/sw.json b/src/assets/i18n/sw.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/sw.json
+++ b/src/assets/i18n/sw.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/ta.json b/src/assets/i18n/ta.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/ta.json
+++ b/src/assets/i18n/ta.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/te.json b/src/assets/i18n/te.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/te.json
+++ b/src/assets/i18n/te.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/th.json b/src/assets/i18n/th.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/th.json
+++ b/src/assets/i18n/th.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/tr.json b/src/assets/i18n/tr.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/tr.json
+++ b/src/assets/i18n/tr.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/tt.json b/src/assets/i18n/tt.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/tt.json
+++ b/src/assets/i18n/tt.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/udm.json b/src/assets/i18n/udm.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/udm.json
+++ b/src/assets/i18n/udm.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/uk.json b/src/assets/i18n/uk.json
index c98c808cd8d..d6a9c8a55c8 100644
--- a/src/assets/i18n/uk.json
+++ b/src/assets/i18n/uk.json
@@ -1813,6 +1813,7 @@
   "to another TrueNAS": "",
   "to cloud": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Range In)": "",
   "{comparator} (Range Not In)": "",
diff --git a/src/assets/i18n/vi.json b/src/assets/i18n/vi.json
index ec9180c5aac..c65593a075e 100644
--- a/src/assets/i18n/vi.json
+++ b/src/assets/i18n/vi.json
@@ -5025,6 +5025,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/zh-hans.json b/src/assets/i18n/zh-hans.json
index 5b60a52deed..95a82524217 100644
--- a/src/assets/i18n/zh-hans.json
+++ b/src/assets/i18n/zh-hans.json
@@ -1233,6 +1233,7 @@
   "to another TrueNAS": "",
   "to cloud": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/assets/i18n/zh-hant.json b/src/assets/i18n/zh-hant.json
index 1cc3e1a4f26..a350cdf2e11 100644
--- a/src/assets/i18n/zh-hant.json
+++ b/src/assets/i18n/zh-hant.json
@@ -4235,6 +4235,7 @@
   "zstd-7 (very slow)": "",
   "zstd-fast (default level, 1)": "",
   "{ n, plural, one {# snapshot} other {# snapshots} }": "",
+  "{bits}/s": "",
   "{checked} exporter: {name}": "",
   "{comparator} (Contains)": "",
   "{comparator} (Ends With)": "",
diff --git a/src/setup-jest.ts b/src/setup-jest.ts
index 186db1bd3c8..7dc99035852 100644
--- a/src/setup-jest.ts
+++ b/src/setup-jest.ts
@@ -36,7 +36,7 @@ import {
 import { EmptyAuthService } from 'test-utils/empty-auth.service';
 import { EmptyWebsocketService } from 'test-utils/empty-ws.service';
 import { IcuMissingTranslationHandler } from 'app/core/classes/icu-missing-translation-handler';
-import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
+import { CommonDirectivesModule } from 'app/directives/common-directives.module';
 import { WINDOW } from 'app/helpers/window.helper';
 import { IxIconTestingModule } from 'app/modules/ix-icon/ix-icon-testing.module';
 import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module';
diff --git a/tsconfig.strictNullChecks.json b/tsconfig.strictNullChecks.json
index 24f32a27e15..076ea529fc2 100644
--- a/tsconfig.strictNullChecks.json
+++ b/tsconfig.strictNullChecks.json
@@ -23,8 +23,8 @@
     "./src/app/modules/lists/bulk-list-item/bulk-list-item.component.ts",
     "./src/app/modules/lists/bulk-list-item/bulk-list-item.interface.ts",
     "./src/app/modules/buttons/copy-button/copy-button.component.ts",
-    "./src/app/directives/common/text-limiter/text-limiter-tooltip/text-limiter-tooltip.component.ts",
-    "./src/app/directives/common/text-limiter/text-limiter.directive.ts",
+    "./src/app/directives/text-limiter/text-limiter-tooltip/text-limiter-tooltip.component.ts",
+    "./src/app/directives/text-limiter/text-limiter.directive.ts",
     "./src/app/pages/dashboard-old/components/drag-handle/drag-handle.component.ts",
     "./src/app/modules/pipes/clean-link/clean-link.pipe.spec.ts",
     "./src/app/modules/pipes/clean-link/clean-link.pipe.ts",
@@ -40,9 +40,9 @@
     "./src/app/pages/storage/components/dashboard-pool/topology-card/mock-storage-dashboard.utils.ts",
     "./src/app/core/testing/utils/mock-window.utils.ts",
     "./src/app/core/testing/utils/query-all-nested-directives.utils.ts",
-    "./src/app/directives/common/has-access/missing-access-wrapper.component.ts",
-    "./src/app/directives/common/navigate-and-interact/navigate-and-interact.directive.ts",
-    "./src/app/directives/common/step-activation.directive.ts",
+    "./src/app/directives/has-access/missing-access-wrapper.component.ts",
+    "./src/app/directives/navigate-and-interact/navigate-and-interact.directive.ts",
+    "./src/app/directives/step-activation.directive.ts",
     "./src/app/enums/account-attribute.enum.ts",
     "./src/app/enums/acl-type.enum.ts",
     "./src/app/enums/alert-level.enum.ts",
@@ -322,7 +322,6 @@
     "./src/app/interfaces/failover.interface.ts",
     "./src/app/interfaces/field-relation.interface.ts",
     "./src/app/interfaces/file-record.interface.ts",
-
     "./src/app/interfaces/filesystem-stat.interface.ts",
     "./src/app/interfaces/ftp-config.interface.ts",
     "./src/app/interfaces/group.interface.ts",
@@ -434,8 +433,8 @@
     "./src/app/modules/forms/ix-dynamic-form/components/ix-dynamic-form/classes/custom-untped-form-control.ts",
     "./src/app/modules/forms/ix-dynamic-form/components/ix-dynamic-form/classes/custom-untyped-form-field.ts",
     "./src/app/modules/forms/ix-dynamic-form/components/ix-dynamic-form/classes/custom-untyped-form-group.ts",
-    "./src/app/modules/pipes/ix-file-size/ix-file-size.pipe.spec.ts",
-    "./src/app/modules/pipes/ix-file-size/ix-file-size.pipe.ts",
+    "./src/app/modules/pipes/file-size/file-size.pipe.spec.ts",
+    "./src/app/modules/pipes/file-size/file-size.pipe.ts",
     "./src/app/modules/forms/ix-forms/classes/simple-async-combobox-provider.ts",
     "./src/app/modules/forms/ix-forms/classes/simple-combobox-provider.ts",
     "./src/app/modules/forms/ix-forms/components/form-actions/form-actions.component.ts",